Merge branch 'master' of git+ssh://git.overlays.gentoo.org/proj/sci

* 'master' of git+ssh://git.overlays.gentoo.org/proj/sci: (58 commits)
  media-gfx/librecad: version bump: 1.0.3, 2.0.0beta5
  sci-chemistry/mgltools-stride: Fix license, thanks ulm looking for correct licensing
  sci-chemistry/mgltools-webservices: Correct license
  sci-chemistry/mgltools-volume: Correct license
  sci-chemistry/mgltools-visionlib: Correct license
  sci-chemistry/mgltools-vision: Correct license
  sci-chemistry/mgltools-viewer-framework: Correct license
  sci-chemistry/mgltools-utpackages: Correct license
  sci-chemistry/mgltools-symserv: Correct license
  sci-chemistry/mgltools-support: Correct license
  sci-chemistry/mgltools-stride: Correct license
  sci-chemistry/mgltools-sff: Correct license
  sci-chemistry/mgltools-scenario2: Correct license
  sci-chemistry/mgltools-scenario: Correct license
  sci-chemistry/mgltools-qslimlib: Correct license
  sci-chemistry/mgltools-pyglf: Correct license
  sci-chemistry/mgltools-pybabel: Correct license
  sci-chemistry/mgltools-pyautodock: Correct license
  sci-chemistry/mgltools-pmv: Correct license
  sci-chemistry/mgltools-opengltk: Correct license
  ...

Signed-off-by: Justin Lecher <jlec@gentoo.org>

Conflicts:
	sci-chemistry/mgltools-symserv/ChangeLog
	sci-chemistry/mgltools-webservices/ChangeLog

83 files changed, 306 insertions, 137 deletions

diff --git a/sci-chemistry/mgltools-autodocktools/ChangeLog b/sci-chemistry/mgltools-autodocktools/ChangeLog
index aa8e5093c..3927a58e6 100644
--- a/sci-chemistry/mgltools-autodocktools/ChangeLog
+++ b/sci-chemistry/mgltools-autodocktools/ChangeLog
@@ -2,6 +2,14 @@
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  14 Apr 2013; Justin Lecher <jlec@gentoo.org>
+  mgltools-autodocktools-1.5.4-r2.ebuild, mgltools-autodocktools-1.5.6.ebuild:
+  Correct license
+
+  14 Apr 2013; Justin Lecher <jlec@gentoo.org>
+  mgltools-autodocktools-1.5.6.ebuild:
+  Fix SRC_URI
+
 *mgltools-autodocktools-1.5.6 (12 Apr 2013)
 
   12 Apr 2013; Justin Lecher <jlec@gentoo.org>
diff --git a/sci-chemistry/mgltools-autodocktools/mgltools-autodocktools-1.5.4-r2.ebuild b/sci-chemistry/mgltools-autodocktools/mgltools-autodocktools-1.5.4-r2.ebuild
index a69245ee8..036ecd6f6 100644
--- a/sci-chemistry/mgltools-autodocktools/mgltools-autodocktools-1.5.4-r2.ebuild
+++ b/sci-chemistry/mgltools-autodocktools/mgltools-autodocktools-1.5.4-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
@@ -17,7 +17,7 @@ HOMEPAGE="http://mgltools.scripps.edu"
 #SRC_URI="http://mgltools.scripps.edu/downloads/tars/releases/REL${PV}/mgltools_source_${PV}.tar.gz"
 SRC_URI="http://dev.gentooexperimental.org/~jlec/distfiles/mgltools_source_${PV}.tar.gz"
 
-LICENSE="MGLTOOLS"
+LICENSE="MGLTOOLS MPL-1.1"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE=""
diff --git a/sci-chemistry/mgltools-autodocktools/mgltools-autodocktools-1.5.6.ebuild b/sci-chemistry/mgltools-autodocktools/mgltools-autodocktools-1.5.6.ebuild
index 63ad430e8..ced5edffd 100644
--- a/sci-chemistry/mgltools-autodocktools/mgltools-autodocktools-1.5.6.ebuild
+++ b/sci-chemistry/mgltools-autodocktools/mgltools-autodocktools-1.5.6.ebuild
@@ -16,10 +16,9 @@ PYTHON_MODNAME="${MY_PN}"
 
 DESCRIPTION="MGLTools Plugin -- AutoDockTools"
 HOMEPAGE="http://mgltools.scripps.edu"
-#SRC_URI="http://mgltools.scripps.edu/downloads/tars/releases/REL${PV}/mgltools_source_${PV}.tar.gz"
-SRC_URI="http://dev.gentoo.org/~jlec/distfiles/mgltools_source_${PV/_/}.tar.gz"
+SRC_URI="http://mgltools.scripps.edu/downloads/tars/releases/REL${PV}/mgltools_source_${PV}.tar.gz"
 
-LICENSE="MGLTOOLS"
+LICENSE="MGLTOOLS MPL-1.1"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE=""
diff --git a/sci-chemistry/mgltools-bhtree/ChangeLog b/sci-chemistry/mgltools-bhtree/ChangeLog
index 8c8eaa750..f5357ba4c 100644
--- a/sci-chemistry/mgltools-bhtree/ChangeLog
+++ b/sci-chemistry/mgltools-bhtree/ChangeLog
@@ -2,6 +2,13 @@
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  14 Apr 2013; Justin Lecher <jlec@gentoo.org> mgltools-bhtree-1.5.4-r1.ebuild,
+  mgltools-bhtree-1.5.6.ebuild:
+  Correct license
+
+  14 Apr 2013; Justin Lecher <jlec@gentoo.org> mgltools-bhtree-1.5.6.ebuild:
+  Fix SRC_URI
+
 *mgltools-bhtree-1.5.6 (12 Apr 2013)
 
   12 Apr 2013; Justin Lecher <jlec@gentoo.org>
diff --git a/sci-chemistry/mgltools-bhtree/mgltools-bhtree-1.5.4-r1.ebuild b/sci-chemistry/mgltools-bhtree/mgltools-bhtree-1.5.4-r1.ebuild
index f3c9fe1e9..24bc7ed79 100644
--- a/sci-chemistry/mgltools-bhtree/mgltools-bhtree-1.5.4-r1.ebuild
+++ b/sci-chemistry/mgltools-bhtree/mgltools-bhtree-1.5.4-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
@@ -16,7 +16,7 @@ HOMEPAGE="http://mgltools.scripps.edu"
 #SRC_URI="http://mgltools.scripps.edu/downloads/tars/releases/REL${PV}/mgltools_source_${PV}.tar.gz"
 SRC_URI="http://dev.gentooexperimental.org/~jlec/distfiles/mgltools_source_${PV}.tar.gz"
 
-LICENSE="MGLTOOLS"
+LICENSE="MGLTOOLS MPL-1.1"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE=""
diff --git a/sci-chemistry/mgltools-bhtree/mgltools-bhtree-1.5.6.ebuild b/sci-chemistry/mgltools-bhtree/mgltools-bhtree-1.5.6.ebuild
index 21d880267..678bb4af1 100644
--- a/sci-chemistry/mgltools-bhtree/mgltools-bhtree-1.5.6.ebuild
+++ b/sci-chemistry/mgltools-bhtree/mgltools-bhtree-1.5.6.ebuild
@@ -16,10 +16,9 @@ PYTHON_MODNAME="${MY_PN}"
 
 DESCRIPTION="MGLTools Plugin -- bhtree"
 HOMEPAGE="http://mgltools.scripps.edu"
-#SRC_URI="http://mgltools.scripps.edu/downloads/tars/releases/REL${PV}/mgltools_source_${PV}.tar.gz"
-SRC_URI="http://dev.gentoo.org/~jlec/distfiles/mgltools_source_${PV/_/}.tar.gz"
+SRC_URI="http://mgltools.scripps.edu/downloads/tars/releases/REL${PV}/mgltools_source_${PV}.tar.gz"
 
-LICENSE="MGLTOOLS"
+LICENSE="MGLTOOLS MPL-1.1"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE=""
diff --git a/sci-chemistry/mgltools-cadd/ChangeLog b/sci-chemistry/mgltools-cadd/ChangeLog
index 0969acd5e..bffe9d5bb 100644
--- a/sci-chemistry/mgltools-cadd/ChangeLog
+++ b/sci-chemistry/mgltools-cadd/ChangeLog
@@ -2,6 +2,12 @@
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  14 Apr 2013; Justin Lecher <jlec@gentoo.org> mgltools-cadd-1.5.6.ebuild:
+  Correct license
+
+  14 Apr 2013; Justin Lecher <jlec@gentoo.org> mgltools-cadd-1.5.6.ebuild:
+  Fix SRC_URI
+
 *mgltools-cadd-1.5.6 (12 Apr 2013)
 
   12 Apr 2013; Justin Lecher <jlec@gentoo.org> -mgltools-cadd-1.5.6_rc2.ebuild,
diff --git a/sci-chemistry/mgltools-cadd/mgltools-cadd-1.5.6.ebuild b/sci-chemistry/mgltools-cadd/mgltools-cadd-1.5.6.ebuild
index a1cd05f06..d077aff3b 100644
--- a/sci-chemistry/mgltools-cadd/mgltools-cadd-1.5.6.ebuild
+++ b/sci-chemistry/mgltools-cadd/mgltools-cadd-1.5.6.ebuild
@@ -15,10 +15,9 @@ PYTHON_MODNAME="${MY_PN}"
 
 DESCRIPTION="MGLTools Plugin -- CADD"
 HOMEPAGE="http://mgltools.scripps.edu"
-#SRC_URI="http://mgltools.scripps.edu/downloads/tars/releases/REL${PV}/mgltools_source_${PV}.tar.gz"
-SRC_URI="http://dev.gentoo.org/~jlec/distfiles/mgltools_source_${PV/_/}.tar.gz"
+SRC_URI="http://mgltools.scripps.edu/downloads/tars/releases/REL${PV}/mgltools_source_${PV}.tar.gz"
 
-LICENSE="MGLTOOLS"
+LICENSE="MGLTOOLS MPL-1.1"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE=""
diff --git a/sci-chemistry/mgltools-cmolkit/ChangeLog b/sci-chemistry/mgltools-cmolkit/ChangeLog
index f85916c80..f42475295 100644
--- a/sci-chemistry/mgltools-cmolkit/ChangeLog
+++ b/sci-chemistry/mgltools-cmolkit/ChangeLog
@@ -2,6 +2,13 @@
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  14 Apr 2013; Justin Lecher <jlec@gentoo.org>
+  mgltools-cmolkit-1.5.4-r1.ebuild, mgltools-cmolkit-1.5.6.ebuild:
+  Correct license
+
+  14 Apr 2013; Justin Lecher <jlec@gentoo.org> mgltools-cmolkit-1.5.6.ebuild:
+  Fix SRC_URI
+
 *mgltools-cmolkit-1.5.6 (12 Apr 2013)
 
   12 Apr 2013; Justin Lecher <jlec@gentoo.org>
diff --git a/sci-chemistry/mgltools-cmolkit/mgltools-cmolkit-1.5.4-r1.ebuild b/sci-chemistry/mgltools-cmolkit/mgltools-cmolkit-1.5.4-r1.ebuild
index bf75b82ad..f052e0061 100644
--- a/sci-chemistry/mgltools-cmolkit/mgltools-cmolkit-1.5.4-r1.ebuild
+++ b/sci-chemistry/mgltools-cmolkit/mgltools-cmolkit-1.5.4-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
@@ -17,7 +17,7 @@ HOMEPAGE="http://mgltools.scripps.edu"
 #SRC_URI="http://mgltools.scripps.edu/downloads/tars/releases/REL${PV}/mgltools_source_${PV}.tar.gz"
 SRC_URI="http://dev.gentooexperimental.org/~jlec/distfiles/mgltools_source_${PV}.tar.gz"
 
-LICENSE="MGLTOOLS"
+LICENSE="MGLTOOLS MPL-1.1"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE=""
diff --git a/sci-chemistry/mgltools-cmolkit/mgltools-cmolkit-1.5.6.ebuild b/sci-chemistry/mgltools-cmolkit/mgltools-cmolkit-1.5.6.ebuild
index d360b83ee..b221a10a4 100644
--- a/sci-chemistry/mgltools-cmolkit/mgltools-cmolkit-1.5.6.ebuild
+++ b/sci-chemistry/mgltools-cmolkit/mgltools-cmolkit-1.5.6.ebuild
@@ -15,10 +15,9 @@ PYTHON_MODNAME="${MY_PN}"
 
 DESCRIPTION="MGLTools Plugin -- cMolKit"
 HOMEPAGE="http://mgltools.scripps.edu"
-#SRC_URI="http://mgltools.scripps.edu/downloads/tars/releases/REL${PV}/mgltools_source_${PV}.tar.gz"
-SRC_URI="http://dev.gentoo.org/~jlec/distfiles/mgltools_source_${PV/_/}.tar.gz"
+SRC_URI="http://mgltools.scripps.edu/downloads/tars/releases/REL${PV}/mgltools_source_${PV}.tar.gz"
 
-LICENSE="MGLTOOLS"
+LICENSE="MGLTOOLS MPL-1.1"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE=""
diff --git a/sci-chemistry/mgltools-dejavu/ChangeLog b/sci-chemistry/mgltools-dejavu/ChangeLog
index 14efdb8fa..ab3a0ebdf 100644
--- a/sci-chemistry/mgltools-dejavu/ChangeLog
+++ b/sci-chemistry/mgltools-dejavu/ChangeLog
@@ -2,6 +2,13 @@
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  14 Apr 2013; Justin Lecher <jlec@gentoo.org> mgltools-dejavu-1.5.4-r1.ebuild,
+  mgltools-dejavu-1.5.6.ebuild:
+  Correct license
+
+  14 Apr 2013; Justin Lecher <jlec@gentoo.org> mgltools-dejavu-1.5.6.ebuild:
+  Fix SRC_URI
+
 *mgltools-dejavu-1.5.6 (12 Apr 2013)
 
   12 Apr 2013; Justin Lecher <jlec@gentoo.org>
diff --git a/sci-chemistry/mgltools-dejavu/mgltools-dejavu-1.5.4-r1.ebuild b/sci-chemistry/mgltools-dejavu/mgltools-dejavu-1.5.4-r1.ebuild
index 96134bef9..5a5aa7c0e 100644
--- a/sci-chemistry/mgltools-dejavu/mgltools-dejavu-1.5.4-r1.ebuild
+++ b/sci-chemistry/mgltools-dejavu/mgltools-dejavu-1.5.4-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
@@ -16,7 +16,7 @@ HOMEPAGE="http://mgltools.scripps.edu"
 #SRC_URI="http://mgltools.scripps.edu/downloads/tars/releases/REL${PV}/mgltools_source_${PV}.tar.gz"
 SRC_URI="http://dev.gentooexperimental.org/~jlec/distfiles/mgltools_source_${PV}.tar.gz"
 
-LICENSE="MGLTOOLS"
+LICENSE="MGLTOOLS MPL-1.1"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE=""
diff --git a/sci-chemistry/mgltools-dejavu/mgltools-dejavu-1.5.6.ebuild b/sci-chemistry/mgltools-dejavu/mgltools-dejavu-1.5.6.ebuild
index ddfdee855..8e4ba4b99 100644
--- a/sci-chemistry/mgltools-dejavu/mgltools-dejavu-1.5.6.ebuild
+++ b/sci-chemistry/mgltools-dejavu/mgltools-dejavu-1.5.6.ebuild
@@ -16,10 +16,9 @@ PYTHON_MODNAME="${MY_PN}"
 
 DESCRIPTION="MGLTools Plugin -- DejaVu"
 HOMEPAGE="http://mgltools.scripps.edu"
-#SRC_URI="http://mgltools.scripps.edu/downloads/tars/releases/REL${PV}/mgltools_source_${PV}.tar.gz"
-SRC_URI="http://dev.gentoo.org/~jlec/distfiles/mgltools_source_${PV/_/}.tar.gz"
+SRC_URI="http://mgltools.scripps.edu/downloads/tars/releases/REL${PV}/mgltools_source_${PV}.tar.gz"
 
-LICENSE="MGLTOOLS"
+LICENSE="MGLTOOLS MPL-1.1"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE=""
diff --git a/sci-chemistry/mgltools-geomutils/ChangeLog b/sci-chemistry/mgltools-geomutils/ChangeLog
index e4fcaa6d5..be10833d4 100644
--- a/sci-chemistry/mgltools-geomutils/ChangeLog
+++ b/sci-chemistry/mgltools-geomutils/ChangeLog
@@ -2,6 +2,13 @@
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  14 Apr 2013; Justin Lecher <jlec@gentoo.org>
+  mgltools-geomutils-1.5.4-r1.ebuild, mgltools-geomutils-1.5.6.ebuild:
+  Correct license
+
+  14 Apr 2013; Justin Lecher <jlec@gentoo.org> mgltools-geomutils-1.5.6.ebuild:
+  Fix SRC_URI
+
 *mgltools-geomutils-1.5.6 (12 Apr 2013)
 
   12 Apr 2013; Justin Lecher <jlec@gentoo.org>
diff --git a/sci-chemistry/mgltools-geomutils/mgltools-geomutils-1.5.4-r1.ebuild b/sci-chemistry/mgltools-geomutils/mgltools-geomutils-1.5.4-r1.ebuild
index e5ce32ac3..9aec0b4a2 100644
--- a/sci-chemistry/mgltools-geomutils/mgltools-geomutils-1.5.4-r1.ebuild
+++ b/sci-chemistry/mgltools-geomutils/mgltools-geomutils-1.5.4-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
@@ -17,7 +17,7 @@ HOMEPAGE="http://mgltools.scripps.edu"
 #SRC_URI="http://mgltools.scripps.edu/downloads/tars/releases/REL${PV}/mgltools_source_${PV}.tar.gz"
 SRC_URI="http://dev.gentooexperimental.org/~jlec/distfiles/mgltools_source_${PV}.tar.gz"
 
-LICENSE="MGLTOOLS"
+LICENSE="MGLTOOLS MPL-1.1"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE=""
diff --git a/sci-chemistry/mgltools-geomutils/mgltools-geomutils-1.5.6.ebuild b/sci-chemistry/mgltools-geomutils/mgltools-geomutils-1.5.6.ebuild
index 6bda7ec72..60f40940e 100644
--- a/sci-chemistry/mgltools-geomutils/mgltools-geomutils-1.5.6.ebuild
+++ b/sci-chemistry/mgltools-geomutils/mgltools-geomutils-1.5.6.ebuild
@@ -15,10 +15,9 @@ PYTHON_MODNAME="${MY_PN}"
 
 DESCRIPTION="MGLTools Plugin -- geomutils"
 HOMEPAGE="http://mgltools.scripps.edu"
-#SRC_URI="http://mgltools.scripps.edu/downloads/tars/releases/REL${PV}/mgltools_source_${PV}.tar.gz"
-SRC_URI="http://dev.gentoo.org/~jlec/distfiles/mgltools_source_${PV/_/}.tar.gz"
+SRC_URI="http://mgltools.scripps.edu/downloads/tars/releases/REL${PV}/mgltools_source_${PV}.tar.gz"
 
-LICENSE="MGLTOOLS"
+LICENSE="MGLTOOLS MPL-1.1"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE=""
diff --git a/sci-chemistry/mgltools-gle/ChangeLog b/sci-chemistry/mgltools-gle/ChangeLog
index 36be5f822..5204a097d 100644
--- a/sci-chemistry/mgltools-gle/ChangeLog
+++ b/sci-chemistry/mgltools-gle/ChangeLog
@@ -2,6 +2,13 @@
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  14 Apr 2013; Justin Lecher <jlec@gentoo.org> mgltools-gle-1.5.4-r1.ebuild,
+  mgltools-gle-1.5.6.ebuild:
+  Correct license
+
+  14 Apr 2013; Justin Lecher <jlec@gentoo.org> mgltools-gle-1.5.6.ebuild:
+  Fix SRC_URI
+
 *mgltools-gle-1.5.6 (12 Apr 2013)
 
   12 Apr 2013; Justin Lecher <jlec@gentoo.org> -mgltools-gle-1.5.6_rc2.ebuild,
diff --git a/sci-chemistry/mgltools-gle/mgltools-gle-1.5.4-r1.ebuild b/sci-chemistry/mgltools-gle/mgltools-gle-1.5.4-r1.ebuild
index 97ae3dfd8..2dce9a540 100644
--- a/sci-chemistry/mgltools-gle/mgltools-gle-1.5.4-r1.ebuild
+++ b/sci-chemistry/mgltools-gle/mgltools-gle-1.5.4-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
@@ -16,7 +16,7 @@ HOMEPAGE="http://mgltools.scripps.edu"
 #SRC_URI="http://mgltools.scripps.edu/downloads/tars/releases/REL${PV}/mgltools_source_${PV}.tar.gz"
 SRC_URI="http://dev.gentooexperimental.org/~jlec/distfiles/mgltools_source_${PV}.tar.gz"
 
-LICENSE="MGLTOOLS"
+LICENSE="MGLTOOLS MPL-1.1"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE=""
diff --git a/sci-chemistry/mgltools-gle/mgltools-gle-1.5.6.ebuild b/sci-chemistry/mgltools-gle/mgltools-gle-1.5.6.ebuild
index 73328fb09..ab0c68e0d 100644
--- a/sci-chemistry/mgltools-gle/mgltools-gle-1.5.6.ebuild
+++ b/sci-chemistry/mgltools-gle/mgltools-gle-1.5.6.ebuild
@@ -16,10 +16,9 @@ PYTHON_MODNAME="${MY_PN}"
 
 DESCRIPTION="MGLTools Plugin -- gle"
 HOMEPAGE="http://mgltools.scripps.edu"
-#SRC_URI="http://mgltools.scripps.edu/downloads/tars/releases/REL${PV}/mgltools_source_${PV}.tar.gz"
-SRC_URI="http://dev.gentoo.org/~jlec/distfiles/mgltools_source_${PV/_/}.tar.gz"
+SRC_URI="http://mgltools.scripps.edu/downloads/tars/releases/REL${PV}/mgltools_source_${PV}.tar.gz"
 
-LICENSE="MGLTOOLS"
+LICENSE="MGLTOOLS MPL-1.1"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE=""
diff --git a/sci-chemistry/mgltools-mglutil/ChangeLog b/sci-chemistry/mgltools-mglutil/ChangeLog
index 71fb4a5e3..968d37963 100644
--- a/sci-chemistry/mgltools-mglutil/ChangeLog
+++ b/sci-chemistry/mgltools-mglutil/ChangeLog
@@ -2,6 +2,13 @@
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  14 Apr 2013; Justin Lecher <jlec@gentoo.org>
+  mgltools-mglutil-1.5.4-r1.ebuild, mgltools-mglutil-1.5.6.ebuild:
+  Correct license
+
+  14 Apr 2013; Justin Lecher <jlec@gentoo.org> mgltools-mglutil-1.5.6.ebuild:
+  Fix SRC_URI
+
 *mgltools-mglutil-1.5.6 (12 Apr 2013)
 
   12 Apr 2013; Justin Lecher <jlec@gentoo.org>
diff --git a/sci-chemistry/mgltools-mglutil/mgltools-mglutil-1.5.4-r1.ebuild b/sci-chemistry/mgltools-mglutil/mgltools-mglutil-1.5.4-r1.ebuild
index d1733f567..73d3d70fa 100644
--- a/sci-chemistry/mgltools-mglutil/mgltools-mglutil-1.5.4-r1.ebuild
+++ b/sci-chemistry/mgltools-mglutil/mgltools-mglutil-1.5.4-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
@@ -17,7 +17,7 @@ HOMEPAGE="http://mgltools.scripps.edu"
 #SRC_URI="http://mgltools.scripps.edu/downloads/tars/releases/REL${PV}/mgltools_source_${PV}.tar.gz"
 SRC_URI="http://dev.gentooexperimental.org/~jlec/distfiles/mgltools_source_${PV}.tar.gz"
 
-LICENSE="MGLTOOLS"
+LICENSE="MGLTOOLS MPL-1.1"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE=""
diff --git a/sci-chemistry/mgltools-mglutil/mgltools-mglutil-1.5.6.ebuild b/sci-chemistry/mgltools-mglutil/mgltools-mglutil-1.5.6.ebuild
index 534cb5d2f..5e4c97cad 100644
--- a/sci-chemistry/mgltools-mglutil/mgltools-mglutil-1.5.6.ebuild
+++ b/sci-chemistry/mgltools-mglutil/mgltools-mglutil-1.5.6.ebuild
@@ -15,10 +15,9 @@ PYTHON_MODNAME="${MY_PN}"
 
 DESCRIPTION="MGLTools Plugin -- mglutil"
 HOMEPAGE="http://mgltools.scripps.edu"
-#SRC_URI="http://mgltools.scripps.edu/downloads/tars/releases/REL${PV}/mgltools_source_${PV}.tar.gz"
-SRC_URI="http://dev.gentoo.org/~jlec/distfiles/mgltools_source_${PV/_/}.tar.gz"
+SRC_URI="http://mgltools.scripps.edu/downloads/tars/releases/REL${PV}/mgltools_source_${PV}.tar.gz"
 
-LICENSE="MGLTOOLS"
+LICENSE="MGLTOOLS MPL-1.1"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE=""
diff --git a/sci-chemistry/mgltools-molkit/ChangeLog b/sci-chemistry/mgltools-molkit/ChangeLog
index ad51ce51b..3c3324ca4 100644
--- a/sci-chemistry/mgltools-molkit/ChangeLog
+++ b/sci-chemistry/mgltools-molkit/ChangeLog
@@ -2,6 +2,13 @@
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  14 Apr 2013; Justin Lecher <jlec@gentoo.org> mgltools-molkit-1.5.4-r1.ebuild,
+  mgltools-molkit-1.5.6.ebuild:
+  Correct license
+
+  14 Apr 2013; Justin Lecher <jlec@gentoo.org> mgltools-molkit-1.5.6.ebuild:
+  Fix SRC_URI
+
 *mgltools-molkit-1.5.6 (12 Apr 2013)
 
   12 Apr 2013; Justin Lecher <jlec@gentoo.org>
diff --git a/sci-chemistry/mgltools-molkit/mgltools-molkit-1.5.4-r1.ebuild b/sci-chemistry/mgltools-molkit/mgltools-molkit-1.5.4-r1.ebuild
index 459981bfb..7fa2454c5 100644
--- a/sci-chemistry/mgltools-molkit/mgltools-molkit-1.5.4-r1.ebuild
+++ b/sci-chemistry/mgltools-molkit/mgltools-molkit-1.5.4-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
@@ -17,7 +17,7 @@ HOMEPAGE="http://mgltools.scripps.edu"
 #SRC_URI="http://mgltools.scripps.edu/downloads/tars/releases/REL${PV}/mgltools_source_${PV}.tar.gz"
 SRC_URI="http://dev.gentooexperimental.org/~jlec/distfiles/mgltools_source_${PV}.tar.gz"
 
-LICENSE="MGLTOOLS"
+LICENSE="MGLTOOLS MPL-1.1"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE=""
diff --git a/sci-chemistry/mgltools-molkit/mgltools-molkit-1.5.6.ebuild b/sci-chemistry/mgltools-molkit/mgltools-molkit-1.5.6.ebuild
index 5b7eca48b..64af2d293 100644
--- a/sci-chemistry/mgltools-molkit/mgltools-molkit-1.5.6.ebuild
+++ b/sci-chemistry/mgltools-molkit/mgltools-molkit-1.5.6.ebuild
@@ -15,10 +15,9 @@ PYTHON_MODNAME="${MY_PN}"
 
 DESCRIPTION="MGLTools Plugin -- MolKit"
 HOMEPAGE="http://mgltools.scripps.edu"
-#SRC_URI="http://mgltools.scripps.edu/downloads/tars/releases/REL${PV}/mgltools_source_${PV}.tar.gz"
-SRC_URI="http://dev.gentoo.org/~jlec/distfiles/mgltools_source_${PV/_/}.tar.gz"
+SRC_URI="http://mgltools.scripps.edu/downloads/tars/releases/REL${PV}/mgltools_source_${PV}.tar.gz"
 
-LICENSE="MGLTOOLS"
+LICENSE="MGLTOOLS MPL-1.1"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE=""
diff --git a/sci-chemistry/mgltools-networkeditor/ChangeLog b/sci-chemistry/mgltools-networkeditor/ChangeLog
index b1a5ab87b..e8f065f91 100644
--- a/sci-chemistry/mgltools-networkeditor/ChangeLog
+++ b/sci-chemistry/mgltools-networkeditor/ChangeLog
@@ -2,6 +2,14 @@
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  14 Apr 2013; Justin Lecher <jlec@gentoo.org>
+  mgltools-networkeditor-1.5.4-r1.ebuild, mgltools-networkeditor-1.5.6.ebuild:
+  Correct license
+
+  14 Apr 2013; Justin Lecher <jlec@gentoo.org>
+  mgltools-networkeditor-1.5.6.ebuild:
+  Fix SRC_URI
+
 *mgltools-networkeditor-1.5.6 (12 Apr 2013)
 
   12 Apr 2013; Justin Lecher <jlec@gentoo.org>
diff --git a/sci-chemistry/mgltools-networkeditor/mgltools-networkeditor-1.5.4-r1.ebuild b/sci-chemistry/mgltools-networkeditor/mgltools-networkeditor-1.5.4-r1.ebuild
index a41d7f59a..c20aed025 100644
--- a/sci-chemistry/mgltools-networkeditor/mgltools-networkeditor-1.5.4-r1.ebuild
+++ b/sci-chemistry/mgltools-networkeditor/mgltools-networkeditor-1.5.4-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
@@ -17,7 +17,7 @@ HOMEPAGE="http://mgltools.scripps.edu"
 #SRC_URI="http://mgltools.scripps.edu/downloads/tars/releases/REL${PV}/mgltools_source_${PV}.tar.gz"
 SRC_URI="http://dev.gentooexperimental.org/~jlec/distfiles/mgltools_source_${PV}.tar.gz"
 
-LICENSE="MGLTOOLS"
+LICENSE="MGLTOOLS MPL-1.1"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE=""
diff --git a/sci-chemistry/mgltools-networkeditor/mgltools-networkeditor-1.5.6.ebuild b/sci-chemistry/mgltools-networkeditor/mgltools-networkeditor-1.5.6.ebuild
index 273848ccf..bee202d28 100644
--- a/sci-chemistry/mgltools-networkeditor/mgltools-networkeditor-1.5.6.ebuild
+++ b/sci-chemistry/mgltools-networkeditor/mgltools-networkeditor-1.5.6.ebuild
@@ -15,10 +15,9 @@ PYTHON_MODNAME="${MY_PN}"
 
 DESCRIPTION="MGLTools Plugin -- NetworkEditor"
 HOMEPAGE="http://mgltools.scripps.edu"
-#SRC_URI="http://mgltools.scripps.edu/downloads/tars/releases/REL${PV}/mgltools_source_${PV}.tar.gz"
-SRC_URI="http://dev.gentoo.org/~jlec/distfiles/mgltools_source_${PV/_/}.tar.gz"
+SRC_URI="http://mgltools.scripps.edu/downloads/tars/releases/REL${PV}/mgltools_source_${PV}.tar.gz"
 
-LICENSE="MGLTOOLS"
+LICENSE="MGLTOOLS MPL-1.1"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE=""
diff --git a/sci-chemistry/mgltools-opengltk/ChangeLog b/sci-chemistry/mgltools-opengltk/ChangeLog
index 4908fef82..78439f484 100644
--- a/sci-chemistry/mgltools-opengltk/ChangeLog
+++ b/sci-chemistry/mgltools-opengltk/ChangeLog
@@ -2,6 +2,13 @@
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  14 Apr 2013; Justin Lecher <jlec@gentoo.org>
+  mgltools-opengltk-1.5.4-r2.ebuild, mgltools-opengltk-1.5.6.ebuild:
+  Correct license
+
+  14 Apr 2013; Justin Lecher <jlec@gentoo.org> mgltools-opengltk-1.5.6.ebuild:
+  Fix SRC_URI
+
 *mgltools-opengltk-1.5.6 (12 Apr 2013)
 
   12 Apr 2013; Justin Lecher <jlec@gentoo.org>
diff --git a/sci-chemistry/mgltools-opengltk/mgltools-opengltk-1.5.4-r2.ebuild b/sci-chemistry/mgltools-opengltk/mgltools-opengltk-1.5.4-r2.ebuild
index ce2266f96..3158d916a 100644
--- a/sci-chemistry/mgltools-opengltk/mgltools-opengltk-1.5.4-r2.ebuild
+++ b/sci-chemistry/mgltools-opengltk/mgltools-opengltk-1.5.4-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
@@ -19,7 +19,7 @@ HOMEPAGE="http://mgltools.scripps.edu"
 #SRC_URI="http://mgltools.scripps.edu/downloads/tars/releases/REL${PV}/mgltools_source_${PV}.tar.gz"
 SRC_URI="http://dev.gentooexperimental.org/~jlec/distfiles/mgltools_source_${PV}.tar.gz"
 
-LICENSE="MGLTOOLS"
+LICENSE="MGLTOOLS MPL-1.1"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE=""
diff --git a/sci-chemistry/mgltools-opengltk/mgltools-opengltk-1.5.6.ebuild b/sci-chemistry/mgltools-opengltk/mgltools-opengltk-1.5.6.ebuild
index 2d0cd0efb..35c017dd0 100644
--- a/sci-chemistry/mgltools-opengltk/mgltools-opengltk-1.5.6.ebuild
+++ b/sci-chemistry/mgltools-opengltk/mgltools-opengltk-1.5.6.ebuild
@@ -15,10 +15,9 @@ PYTHON_MODNAME="${MY_PN}"
 
 DESCRIPTION="MGLTools Plugin -- opengltk"
 HOMEPAGE="http://mgltools.scripps.edu"
-#SRC_URI="http://mgltools.scripps.edu/downloads/tars/releases/REL${PV}/mgltools_source_${PV}.tar.gz"
-SRC_URI="http://dev.gentoo.org/~jlec/distfiles/mgltools_source_${PV/_/}.tar.gz"
+SRC_URI="http://mgltools.scripps.edu/downloads/tars/releases/REL${PV}/mgltools_source_${PV}.tar.gz"
 
-LICENSE="MGLTOOLS"
+LICENSE="MGLTOOLS MPL-1.1"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE=""
diff --git a/sci-chemistry/mgltools-pmv/ChangeLog b/sci-chemistry/mgltools-pmv/ChangeLog
index 5e9a6f3cd..3fad2154d 100644
--- a/sci-chemistry/mgltools-pmv/ChangeLog
+++ b/sci-chemistry/mgltools-pmv/ChangeLog
@@ -2,6 +2,13 @@
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  14 Apr 2013; Justin Lecher <jlec@gentoo.org> mgltools-pmv-1.5.4-r1.ebuild,
+  mgltools-pmv-1.5.6.ebuild:
+  Correct license
+
+  14 Apr 2013; Justin Lecher <jlec@gentoo.org> mgltools-pmv-1.5.6.ebuild:
+  Fix SRC_URI
+
 *mgltools-pmv-1.5.6 (12 Apr 2013)
 
   12 Apr 2013; Justin Lecher <jlec@gentoo.org> -mgltools-pmv-1.5.6_rc2.ebuild,
diff --git a/sci-chemistry/mgltools-pmv/mgltools-pmv-1.5.4-r1.ebuild b/sci-chemistry/mgltools-pmv/mgltools-pmv-1.5.4-r1.ebuild
index d7b32a120..d23889222 100644
--- a/sci-chemistry/mgltools-pmv/mgltools-pmv-1.5.4-r1.ebuild
+++ b/sci-chemistry/mgltools-pmv/mgltools-pmv-1.5.4-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
@@ -17,7 +17,7 @@ HOMEPAGE="http://mgltools.scripps.edu"
 #SRC_URI="http://mgltools.scripps.edu/downloads/tars/releases/REL${PV}/mgltools_source_${PV}.tar.gz"
 SRC_URI="http://dev.gentooexperimental.org/~jlec/distfiles/mgltools_source_${PV}.tar.gz"
 
-LICENSE="MGLTOOLS"
+LICENSE="MGLTOOLS MPL-1.1"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE=""
diff --git a/sci-chemistry/mgltools-pmv/mgltools-pmv-1.5.6.ebuild b/sci-chemistry/mgltools-pmv/mgltools-pmv-1.5.6.ebuild
index 9576307ad..d5b716085 100644
--- a/sci-chemistry/mgltools-pmv/mgltools-pmv-1.5.6.ebuild
+++ b/sci-chemistry/mgltools-pmv/mgltools-pmv-1.5.6.ebuild
@@ -15,10 +15,9 @@ PYTHON_MODNAME="${MY_PN}"
 
 DESCRIPTION="MGLTools Plugin -- Pmv"
 HOMEPAGE="http://mgltools.scripps.edu"
-#SRC_URI="http://mgltools.scripps.edu/downloads/tars/releases/REL${PV}/mgltools_source_${PV}.tar.gz"
-SRC_URI="http://dev.gentoo.org/~jlec/distfiles/mgltools_source_${PV/_/}.tar.gz"
+SRC_URI="http://mgltools.scripps.edu/downloads/tars/releases/REL${PV}/mgltools_source_${PV}.tar.gz"
 
-LICENSE="MGLTOOLS"
+LICENSE="MGLTOOLS MPL-1.1"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE=""
diff --git a/sci-chemistry/mgltools-pyautodock/ChangeLog b/sci-chemistry/mgltools-pyautodock/ChangeLog
index 3965d136b..e94b4fa2c 100644
--- a/sci-chemistry/mgltools-pyautodock/ChangeLog
+++ b/sci-chemistry/mgltools-pyautodock/ChangeLog
@@ -2,6 +2,14 @@
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  14 Apr 2013; Justin Lecher <jlec@gentoo.org>
+  mgltools-pyautodock-1.5.4-r1.ebuild, mgltools-pyautodock-1.5.6.ebuild:
+  Correct license
+
+  14 Apr 2013; Justin Lecher <jlec@gentoo.org>
+  mgltools-pyautodock-1.5.6.ebuild:
+  Fix SRC_URI
+
 *mgltools-pyautodock-1.5.6 (12 Apr 2013)
 
   12 Apr 2013; Justin Lecher <jlec@gentoo.org>
diff --git a/sci-chemistry/mgltools-pyautodock/mgltools-pyautodock-1.5.4-r1.ebuild b/sci-chemistry/mgltools-pyautodock/mgltools-pyautodock-1.5.4-r1.ebuild
index 34c298c0f..704e3335d 100644
--- a/sci-chemistry/mgltools-pyautodock/mgltools-pyautodock-1.5.4-r1.ebuild
+++ b/sci-chemistry/mgltools-pyautodock/mgltools-pyautodock-1.5.4-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
@@ -17,7 +17,7 @@ HOMEPAGE="http://mgltools.scripps.edu"
 #SRC_URI="http://mgltools.scripps.edu/downloads/tars/releases/REL${PV}/mgltools_source_${PV}.tar.gz"
 SRC_URI="http://dev.gentooexperimental.org/~jlec/distfiles/mgltools_source_${PV}.tar.gz"
 
-LICENSE="MGLTOOLS"
+LICENSE="MGLTOOLS MPL-1.1"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE=""
diff --git a/sci-chemistry/mgltools-pyautodock/mgltools-pyautodock-1.5.6.ebuild b/sci-chemistry/mgltools-pyautodock/mgltools-pyautodock-1.5.6.ebuild
index 27ef7fe52..635902e55 100644
--- a/sci-chemistry/mgltools-pyautodock/mgltools-pyautodock-1.5.6.ebuild
+++ b/sci-chemistry/mgltools-pyautodock/mgltools-pyautodock-1.5.6.ebuild
@@ -15,10 +15,9 @@ PYTHON_MODNAME="${MY_PN}"
 
 DESCRIPTION="MGLTools Plugin -- PyAutoDock"
 HOMEPAGE="http://mgltools.scripps.edu"
-#SRC_URI="http://mgltools.scripps.edu/downloads/tars/releases/REL${PV}/mgltools_source_${PV}.tar.gz"
-SRC_URI="http://dev.gentoo.org/~jlec/distfiles/mgltools_source_${PV/_/}.tar.gz"
+SRC_URI="http://mgltools.scripps.edu/downloads/tars/releases/REL${PV}/mgltools_source_${PV}.tar.gz"
 
-LICENSE="MGLTOOLS"
+LICENSE="MGLTOOLS MPL-1.1"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE=""
diff --git a/sci-chemistry/mgltools-pybabel/ChangeLog b/sci-chemistry/mgltools-pybabel/ChangeLog
index 372c572bd..6fce89992 100644
--- a/sci-chemistry/mgltools-pybabel/ChangeLog
+++ b/sci-chemistry/mgltools-pybabel/ChangeLog
@@ -2,6 +2,13 @@
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  14 Apr 2013; Justin Lecher <jlec@gentoo.org>
+  mgltools-pybabel-1.5.4-r1.ebuild, mgltools-pybabel-1.5.6.ebuild:
+  Correct license
+
+  14 Apr 2013; Justin Lecher <jlec@gentoo.org> mgltools-pybabel-1.5.6.ebuild:
+  Fix SRC_URI
+
 *mgltools-pybabel-1.5.6 (12 Apr 2013)
 
   12 Apr 2013; Justin Lecher <jlec@gentoo.org>
diff --git a/sci-chemistry/mgltools-pybabel/mgltools-pybabel-1.5.4-r1.ebuild b/sci-chemistry/mgltools-pybabel/mgltools-pybabel-1.5.4-r1.ebuild
index f2cfa0d94..c1f6f618a 100644
--- a/sci-chemistry/mgltools-pybabel/mgltools-pybabel-1.5.4-r1.ebuild
+++ b/sci-chemistry/mgltools-pybabel/mgltools-pybabel-1.5.4-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
@@ -17,7 +17,7 @@ HOMEPAGE="http://mgltools.scripps.edu"
 #SRC_URI="http://mgltools.scripps.edu/downloads/tars/releases/REL${PV}/mgltools_source_${PV}.tar.gz"
 SRC_URI="http://dev.gentooexperimental.org/~jlec/distfiles/mgltools_source_${PV}.tar.gz"
 
-LICENSE="MGLTOOLS"
+LICENSE="MGLTOOLS MPL-1.1"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE=""
diff --git a/sci-chemistry/mgltools-pybabel/mgltools-pybabel-1.5.6.ebuild b/sci-chemistry/mgltools-pybabel/mgltools-pybabel-1.5.6.ebuild
index 37be25374..3dfa6ef2d 100644
--- a/sci-chemistry/mgltools-pybabel/mgltools-pybabel-1.5.6.ebuild
+++ b/sci-chemistry/mgltools-pybabel/mgltools-pybabel-1.5.6.ebuild
@@ -15,10 +15,9 @@ PYTHON_MODNAME="${MY_PN}"
 
 DESCRIPTION="MGLTools Plugin -- PyBabel"
 HOMEPAGE="http://mgltools.scripps.edu"
-#SRC_URI="http://mgltools.scripps.edu/downloads/tars/releases/REL${PV}/mgltools_source_${PV}.tar.gz"
-SRC_URI="http://dev.gentoo.org/~jlec/distfiles/mgltools_source_${PV/_/}.tar.gz"
+SRC_URI="http://mgltools.scripps.edu/downloads/tars/releases/REL${PV}/mgltools_source_${PV}.tar.gz"
 
-LICENSE="MGLTOOLS"
+LICENSE="MGLTOOLS MPL-1.1"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE=""
diff --git a/sci-chemistry/mgltools-pyglf/ChangeLog b/sci-chemistry/mgltools-pyglf/ChangeLog
index 51c806793..0290b0a7a 100644
--- a/sci-chemistry/mgltools-pyglf/ChangeLog
+++ b/sci-chemistry/mgltools-pyglf/ChangeLog
@@ -2,6 +2,13 @@
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  14 Apr 2013; Justin Lecher <jlec@gentoo.org> mgltools-pyglf-1.5.4-r1.ebuild,
+  mgltools-pyglf-1.5.6.ebuild:
+  Correct license
+
+  14 Apr 2013; Justin Lecher <jlec@gentoo.org> mgltools-pyglf-1.5.6.ebuild:
+  Fix SRC_URI
+
 *mgltools-pyglf-1.5.6 (12 Apr 2013)
 
   12 Apr 2013; Justin Lecher <jlec@gentoo.org>
diff --git a/sci-chemistry/mgltools-pyglf/mgltools-pyglf-1.5.4-r1.ebuild b/sci-chemistry/mgltools-pyglf/mgltools-pyglf-1.5.4-r1.ebuild
index 127ab7cde..d74853ffd 100644
--- a/sci-chemistry/mgltools-pyglf/mgltools-pyglf-1.5.4-r1.ebuild
+++ b/sci-chemistry/mgltools-pyglf/mgltools-pyglf-1.5.4-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
@@ -17,7 +17,7 @@ HOMEPAGE="http://mgltools.scripps.edu"
 #SRC_URI="http://mgltools.scripps.edu/downloads/tars/releases/REL${PV}/mgltools_source_${PV}.tar.gz"
 SRC_URI="http://dev.gentooexperimental.org/~jlec/distfiles/mgltools_source_${PV}.tar.gz"
 
-LICENSE="MGLTOOLS"
+LICENSE="MGLTOOLS MPL-1.1"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE=""
diff --git a/sci-chemistry/mgltools-pyglf/mgltools-pyglf-1.5.6.ebuild b/sci-chemistry/mgltools-pyglf/mgltools-pyglf-1.5.6.ebuild
index 476ce8658..6c5699c70 100644
--- a/sci-chemistry/mgltools-pyglf/mgltools-pyglf-1.5.6.ebuild
+++ b/sci-chemistry/mgltools-pyglf/mgltools-pyglf-1.5.6.ebuild
@@ -15,10 +15,9 @@ PYTHON_MODNAME="${MY_PN}"
 
 DESCRIPTION="MGLTools Plugin -- pyglf"
 HOMEPAGE="http://mgltools.scripps.edu"
-#SRC_URI="http://mgltools.scripps.edu/downloads/tars/releases/REL${PV}/mgltools_source_${PV}.tar.gz"
-SRC_URI="http://dev.gentoo.org/~jlec/distfiles/mgltools_source_${PV/_/}.tar.gz"
+SRC_URI="http://mgltools.scripps.edu/downloads/tars/releases/REL${PV}/mgltools_source_${PV}.tar.gz"
 
-LICENSE="MGLTOOLS"
+LICENSE="MGLTOOLS MPL-1.1"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE=""
diff --git a/sci-chemistry/mgltools-qslimlib/ChangeLog b/sci-chemistry/mgltools-qslimlib/ChangeLog
index 4d38a6e9a..e7758f680 100644
--- a/sci-chemistry/mgltools-qslimlib/ChangeLog
+++ b/sci-chemistry/mgltools-qslimlib/ChangeLog
@@ -2,6 +2,13 @@
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  14 Apr 2013; Justin Lecher <jlec@gentoo.org>
+  mgltools-qslimlib-1.5.4-r1.ebuild, mgltools-qslimlib-1.5.6.ebuild:
+  Correct license
+
+  14 Apr 2013; Justin Lecher <jlec@gentoo.org> mgltools-qslimlib-1.5.6.ebuild:
+  Fix SRC_URI
+
 *mgltools-qslimlib-1.5.6 (12 Apr 2013)
 
   12 Apr 2013; Justin Lecher <jlec@gentoo.org>
diff --git a/sci-chemistry/mgltools-qslimlib/mgltools-qslimlib-1.5.4-r1.ebuild b/sci-chemistry/mgltools-qslimlib/mgltools-qslimlib-1.5.4-r1.ebuild
index 56a9b026c..f601a9342 100644
--- a/sci-chemistry/mgltools-qslimlib/mgltools-qslimlib-1.5.4-r1.ebuild
+++ b/sci-chemistry/mgltools-qslimlib/mgltools-qslimlib-1.5.4-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
@@ -17,7 +17,7 @@ HOMEPAGE="http://mgltools.scripps.edu"
 #SRC_URI="http://mgltools.scripps.edu/downloads/tars/releases/REL${PV}/mgltools_source_${PV}.tar.gz"
 SRC_URI="http://dev.gentooexperimental.org/~jlec/distfiles/mgltools_source_${PV}.tar.gz"
 
-LICENSE="MGLTOOLS"
+LICENSE="MGLTOOLS MPL-1.1"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE=""
diff --git a/sci-chemistry/mgltools-qslimlib/mgltools-qslimlib-1.5.6.ebuild b/sci-chemistry/mgltools-qslimlib/mgltools-qslimlib-1.5.6.ebuild
index d7518f97c..2df555928 100644
--- a/sci-chemistry/mgltools-qslimlib/mgltools-qslimlib-1.5.6.ebuild
+++ b/sci-chemistry/mgltools-qslimlib/mgltools-qslimlib-1.5.6.ebuild
@@ -15,10 +15,9 @@ PYTHON_MODNAME="${MY_PN}"
 
 DESCRIPTION="MGLTools Plugin -- QSlimLib"
 HOMEPAGE="http://mgltools.scripps.edu"
-#SRC_URI="http://mgltools.scripps.edu/downloads/tars/releases/REL${PV}/mgltools_source_${PV}.tar.gz"
-SRC_URI="http://dev.gentoo.org/~jlec/distfiles/mgltools_source_${PV/_/}.tar.gz"
+SRC_URI="http://mgltools.scripps.edu/downloads/tars/releases/REL${PV}/mgltools_source_${PV}.tar.gz"
 
-LICENSE="MGLTOOLS"
+LICENSE="MGLTOOLS MPL-1.1"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE=""
diff --git a/sci-chemistry/mgltools-scenario/ChangeLog b/sci-chemistry/mgltools-scenario/ChangeLog
index 91b09afa7..17f6d1643 100644
--- a/sci-chemistry/mgltools-scenario/ChangeLog
+++ b/sci-chemistry/mgltools-scenario/ChangeLog
@@ -2,6 +2,10 @@
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  14 Apr 2013; Justin Lecher <jlec@gentoo.org>
+  mgltools-scenario-1.5.4-r1.ebuild:
+  Correct license
+
   27 Jan 2013; Justin Lecher <jlec@gentoo.org> metadata.xml:
   Version Bump; move to distutils-r1.eclass
 
diff --git a/sci-chemistry/mgltools-scenario/mgltools-scenario-1.5.4-r1.ebuild b/sci-chemistry/mgltools-scenario/mgltools-scenario-1.5.4-r1.ebuild
index d1fb67e92..d715b882f 100644
--- a/sci-chemistry/mgltools-scenario/mgltools-scenario-1.5.4-r1.ebuild
+++ b/sci-chemistry/mgltools-scenario/mgltools-scenario-1.5.4-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
@@ -17,7 +17,7 @@ HOMEPAGE="http://mgltools.scripps.edu"
 #SRC_URI="http://mgltools.scripps.edu/downloads/tars/releases/REL${PV}/mgltools_source_${PV}.tar.gz"
 SRC_URI="http://dev.gentooexperimental.org/~jlec/distfiles/mgltools_source_${PV}.tar.gz"
 
-LICENSE="MGLTOOLS"
+LICENSE="MGLTOOLS MPL-1.1"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE=""
diff --git a/sci-chemistry/mgltools-scenario2/ChangeLog b/sci-chemistry/mgltools-scenario2/ChangeLog
index f15bb1b30..a56b2915d 100644
--- a/sci-chemistry/mgltools-scenario2/ChangeLog
+++ b/sci-chemistry/mgltools-scenario2/ChangeLog
@@ -2,6 +2,12 @@
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  14 Apr 2013; Justin Lecher <jlec@gentoo.org> mgltools-scenario2-1.5.6.ebuild:
+  Correct license
+
+  14 Apr 2013; Justin Lecher <jlec@gentoo.org> mgltools-scenario2-1.5.6.ebuild:
+  Fix SRC_URI
+
 *mgltools-scenario2-1.5.6 (12 Apr 2013)
 
   12 Apr 2013; Justin Lecher <jlec@gentoo.org>
diff --git a/sci-chemistry/mgltools-scenario2/mgltools-scenario2-1.5.6.ebuild b/sci-chemistry/mgltools-scenario2/mgltools-scenario2-1.5.6.ebuild
index c905f4064..d62b151da 100644
--- a/sci-chemistry/mgltools-scenario2/mgltools-scenario2-1.5.6.ebuild
+++ b/sci-chemistry/mgltools-scenario2/mgltools-scenario2-1.5.6.ebuild
@@ -15,10 +15,9 @@ PYTHON_MODNAME="${MY_PN}"
 
 DESCRIPTION="MGLTools Plugin -- Scenario2"
 HOMEPAGE="http://mgltools.scripps.edu"
-#SRC_URI="http://mgltools.scripps.edu/downloads/tars/releases/REL${PV}/mgltools_source_${PV}.tar.gz"
-SRC_URI="http://dev.gentoo.org/~jlec/distfiles/mgltools_source_${PV/_/}.tar.gz"
+SRC_URI="http://mgltools.scripps.edu/downloads/tars/releases/REL${PV}/mgltools_source_${PV}.tar.gz"
 
-LICENSE="MGLTOOLS"
+LICENSE="MGLTOOLS MPL-1.1"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE=""
diff --git a/sci-chemistry/mgltools-sff/ChangeLog b/sci-chemistry/mgltools-sff/ChangeLog
index 7b9a88de3..274b1dbdd 100644
--- a/sci-chemistry/mgltools-sff/ChangeLog
+++ b/sci-chemistry/mgltools-sff/ChangeLog
@@ -2,6 +2,13 @@
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  14 Apr 2013; Justin Lecher <jlec@gentoo.org> mgltools-sff-1.5.4-r1.ebuild,
+  mgltools-sff-1.5.6.ebuild:
+  Correct license
+
+  14 Apr 2013; Justin Lecher <jlec@gentoo.org> mgltools-sff-1.5.6.ebuild:
+  Fix SRC_URI
+
 *mgltools-sff-1.5.6 (12 Apr 2013)
 
   12 Apr 2013; Justin Lecher <jlec@gentoo.org> -mgltools-sff-1.5.6_rc2.ebuild,
diff --git a/sci-chemistry/mgltools-sff/mgltools-sff-1.5.4-r1.ebuild b/sci-chemistry/mgltools-sff/mgltools-sff-1.5.4-r1.ebuild
index 9db8664cf..de55dd212 100644
--- a/sci-chemistry/mgltools-sff/mgltools-sff-1.5.4-r1.ebuild
+++ b/sci-chemistry/mgltools-sff/mgltools-sff-1.5.4-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
@@ -17,7 +17,7 @@ HOMEPAGE="http://mgltools.scripps.edu"
 #SRC_URI="http://mgltools.scripps.edu/downloads/tars/releases/REL${PV}/mgltools_source_${PV}.tar.gz"
 SRC_URI="http://dev.gentooexperimental.org/~jlec/distfiles/mgltools_source_${PV}.tar.gz"
 
-LICENSE="MGLTOOLS"
+LICENSE="MGLTOOLS MPL-1.1"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE=""
diff --git a/sci-chemistry/mgltools-sff/mgltools-sff-1.5.6.ebuild b/sci-chemistry/mgltools-sff/mgltools-sff-1.5.6.ebuild
index 6f9f27851..9b18fc981 100644
--- a/sci-chemistry/mgltools-sff/mgltools-sff-1.5.6.ebuild
+++ b/sci-chemistry/mgltools-sff/mgltools-sff-1.5.6.ebuild
@@ -15,10 +15,9 @@ PYTHON_MODNAME="${MY_PN}"
 
 DESCRIPTION="MGLTools Plugin -- sff"
 HOMEPAGE="http://mgltools.scripps.edu"
-#SRC_URI="http://mgltools.scripps.edu/downloads/tars/releases/REL${PV}/mgltools_source_${PV}.tar.gz"
-SRC_URI="http://dev.gentoo.org/~jlec/distfiles/mgltools_source_${PV/_/}.tar.gz"
+SRC_URI="http://mgltools.scripps.edu/downloads/tars/releases/REL${PV}/mgltools_source_${PV}.tar.gz"
 
-LICENSE="MGLTOOLS"
+LICENSE="MGLTOOLS MPL-1.1"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE=""
diff --git a/sci-chemistry/mgltools-stride/ChangeLog b/sci-chemistry/mgltools-stride/ChangeLog
index d17f782dd..af19a313f 100644
--- a/sci-chemistry/mgltools-stride/ChangeLog
+++ b/sci-chemistry/mgltools-stride/ChangeLog
@@ -2,6 +2,12 @@
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  14 Apr 2013; Justin Lecher <jlec@gentoo.org> mgltools-stride-1.5.4-r1.ebuild:
+  Fix license, thanks ulm looking for correct licensing
+
+  14 Apr 2013; Justin Lecher <jlec@gentoo.org> mgltools-stride-1.5.4-r1.ebuild:
+  Correct license
+
   27 Jan 2013; Justin Lecher <jlec@gentoo.org> metadata.xml:
   Version Bump; move to distutils-r1.eclass
 
diff --git a/sci-chemistry/mgltools-stride/mgltools-stride-1.5.4-r1.ebuild b/sci-chemistry/mgltools-stride/mgltools-stride-1.5.4-r1.ebuild
index fc561a51f..9bf85ae7d 100644
--- a/sci-chemistry/mgltools-stride/mgltools-stride-1.5.4-r1.ebuild
+++ b/sci-chemistry/mgltools-stride/mgltools-stride-1.5.4-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
@@ -17,7 +17,7 @@ HOMEPAGE="http://mgltools.scripps.edu/"
 #SRC_URI="http://mgltools.scripps.edu/downloads/tars/releases/REL${PV}/mgltools_source_${PV}.tar.gz"
 SRC_URI="http://dev.gentooexperimental.org/~jlec/distfiles/mgltools_source_${PV}.tar.gz"
 
-LICENSE="MGLTOOLS as-is"
+LICENSE="MGLTOOLS MPL-1.1 STRIDE"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE=""
diff --git a/sci-chemistry/mgltools-support/ChangeLog b/sci-chemistry/mgltools-support/ChangeLog
index 97ffeb664..bef55fb14 100644
--- a/sci-chemistry/mgltools-support/ChangeLog
+++ b/sci-chemistry/mgltools-support/ChangeLog
@@ -2,6 +2,13 @@
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  14 Apr 2013; Justin Lecher <jlec@gentoo.org>
+  mgltools-support-1.5.4-r1.ebuild, mgltools-support-1.5.6.ebuild:
+  Correct license
+
+  14 Apr 2013; Justin Lecher <jlec@gentoo.org> mgltools-support-1.5.6.ebuild:
+  Fix SRC_URI
+
 *mgltools-support-1.5.6 (12 Apr 2013)
 
   12 Apr 2013; Justin Lecher <jlec@gentoo.org>
diff --git a/sci-chemistry/mgltools-support/mgltools-support-1.5.4-r1.ebuild b/sci-chemistry/mgltools-support/mgltools-support-1.5.4-r1.ebuild
index 44d93959f..7b7adbdf3 100644
--- a/sci-chemistry/mgltools-support/mgltools-support-1.5.4-r1.ebuild
+++ b/sci-chemistry/mgltools-support/mgltools-support-1.5.4-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
@@ -18,7 +18,7 @@ HOMEPAGE="http://mgltools.scripps.edu"
 #SRC_URI="http://mgltools.scripps.edu/downloads/tars/releases/REL${PV}/mgltools_source_${PV}.tar.gz"
 SRC_URI="http://dev.gentooexperimental.org/~jlec/distfiles/mgltools_source_${PV}.tar.gz"
 
-LICENSE="MGLTOOLS"
+LICENSE="MGLTOOLS MPL-1.1"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE=""
diff --git a/sci-chemistry/mgltools-support/mgltools-support-1.5.6.ebuild b/sci-chemistry/mgltools-support/mgltools-support-1.5.6.ebuild
index fe73cc562..73eacbbec 100644
--- a/sci-chemistry/mgltools-support/mgltools-support-1.5.6.ebuild
+++ b/sci-chemistry/mgltools-support/mgltools-support-1.5.6.ebuild
@@ -15,10 +15,9 @@ PYTHON_MODNAME="${MY_PN}"
 
 DESCRIPTION="MGLTools Plugin -- Support"
 HOMEPAGE="http://mgltools.scripps.edu"
-#SRC_URI="http://mgltools.scripps.edu/downloads/tars/releases/REL${PV}/mgltools_source_${PV}.tar.gz"
-SRC_URI="http://dev.gentoo.org/~jlec/distfiles/mgltools_source_${PV/_/}.tar.gz"
+SRC_URI="http://mgltools.scripps.edu/downloads/tars/releases/REL${PV}/mgltools_source_${PV}.tar.gz"
 
-LICENSE="MGLTOOLS"
+LICENSE="MGLTOOLS MPL-1.1"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE=""
diff --git a/sci-chemistry/mgltools-symserv/ChangeLog b/sci-chemistry/mgltools-symserv/ChangeLog
index b500bf52b..8d878447d 100644
--- a/sci-chemistry/mgltools-symserv/ChangeLog
+++ b/sci-chemistry/mgltools-symserv/ChangeLog
@@ -2,13 +2,18 @@
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
-*mgltools-symserv-1.5.6 (15 Apr 2013)
-
   15 Apr 2013; Justin Lecher <jlec@gentoo.org>
   -mgltools-symserv-1.5.6_rc2.ebuild, -mgltools-symserv-1.5.6_rc3.ebuild,
   +mgltools-symserv-1.5.6.ebuild:
   Version Bump, drop old
 
+*mgltools-symserv-1.5.6 (14 Apr 2013)
+
+  14 Apr 2013; Justin Lecher <jlec@gentoo.org>
+  -mgltools-symserv-1.5.6_rc2.ebuild, -mgltools-symserv-1.5.6_rc3.ebuild,
+  +mgltools-symserv-1.5.6.ebuild:
+  Fix SRC_URI
+
 *mgltools-symserv-1.5.6_rc3 (27 Jan 2013)
 
   27 Jan 2013; Justin Lecher <jlec@gentoo.org>
diff --git a/sci-chemistry/mgltools-symserv/mgltools-symserv-1.5.4-r1.ebuild b/sci-chemistry/mgltools-symserv/mgltools-symserv-1.5.4-r1.ebuild
index 7b33daa01..4fac4e2ca 100644
--- a/sci-chemistry/mgltools-symserv/mgltools-symserv-1.5.4-r1.ebuild
+++ b/sci-chemistry/mgltools-symserv/mgltools-symserv-1.5.4-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
@@ -17,7 +17,7 @@ HOMEPAGE="http://mgltools.scripps.edu"
 #SRC_URI="http://mgltools.scripps.edu/downloads/tars/releases/REL${PV}/mgltools_source_${PV}.tar.gz"
 SRC_URI="http://dev.gentooexperimental.org/~jlec/distfiles/mgltools_source_${PV}.tar.gz"
 
-LICENSE="MGLTOOLS"
+LICENSE="MGLTOOLS MPL-1.1"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE=""
diff --git a/sci-chemistry/mgltools-symserv/mgltools-symserv-1.5.6.ebuild b/sci-chemistry/mgltools-symserv/mgltools-symserv-1.5.6.ebuild
index 4588d58e8..60a303b59 100644
--- a/sci-chemistry/mgltools-symserv/mgltools-symserv-1.5.6.ebuild
+++ b/sci-chemistry/mgltools-symserv/mgltools-symserv-1.5.6.ebuild
@@ -15,10 +15,9 @@ PYTHON_MODNAME="${MY_PN}"
 
 DESCRIPTION="MGLTools Plugin -- symserv"
 HOMEPAGE="http://mgltools.scripps.edu"
-#SRC_URI="http://mgltools.scripps.edu/downloads/tars/releases/REL${PV}/mgltools_source_${PV}.tar.gz"
-SRC_URI="http://dev.gentoo.org/~jlec/distfiles/mgltools_source_${PV/_/}.tar.gz"
+SRC_URI="http://mgltools.scripps.edu/downloads/tars/releases/REL${PV}/mgltools_source_${PV}.tar.gz"
 
-LICENSE="MGLTOOLS"
+LICENSE="MGLTOOLS MPL-1.1"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE=""
diff --git a/sci-chemistry/mgltools-utpackages/ChangeLog b/sci-chemistry/mgltools-utpackages/ChangeLog
index c29fb608f..6273670b7 100644
--- a/sci-chemistry/mgltools-utpackages/ChangeLog
+++ b/sci-chemistry/mgltools-utpackages/ChangeLog
@@ -2,6 +2,14 @@
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  14 Apr 2013; Justin Lecher <jlec@gentoo.org>
+  mgltools-utpackages-1.5.4-r1.ebuild, mgltools-utpackages-1.5.6.ebuild:
+  Correct license
+
+  14 Apr 2013; Justin Lecher <jlec@gentoo.org>
+  mgltools-utpackages-1.5.6.ebuild:
+  Fix SRC_URI
+
 *mgltools-utpackages-1.5.6 (12 Apr 2013)
 
   12 Apr 2013; Justin Lecher <jlec@gentoo.org>
diff --git a/sci-chemistry/mgltools-utpackages/mgltools-utpackages-1.5.4-r1.ebuild b/sci-chemistry/mgltools-utpackages/mgltools-utpackages-1.5.4-r1.ebuild
index a30d0f551..9a4d6dffb 100644
--- a/sci-chemistry/mgltools-utpackages/mgltools-utpackages-1.5.4-r1.ebuild
+++ b/sci-chemistry/mgltools-utpackages/mgltools-utpackages-1.5.4-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
@@ -17,7 +17,7 @@ HOMEPAGE="http://mgltools.scripps.edu"
 #SRC_URI="http://mgltools.scripps.edu/downloads/tars/releases/REL${PV}/mgltools_source_${PV}.tar.gz"
 SRC_URI="http://dev.gentooexperimental.org/~jlec/distfiles/mgltools_source_${PV}.tar.gz"
 
-LICENSE="MGLTOOLS UTPackages"
+LICENSE="MGLTOOLS MPL-1.1 UTPackages"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE=""
diff --git a/sci-chemistry/mgltools-utpackages/mgltools-utpackages-1.5.6.ebuild b/sci-chemistry/mgltools-utpackages/mgltools-utpackages-1.5.6.ebuild
index 11d253c37..cf729317d 100644
--- a/sci-chemistry/mgltools-utpackages/mgltools-utpackages-1.5.6.ebuild
+++ b/sci-chemistry/mgltools-utpackages/mgltools-utpackages-1.5.6.ebuild
@@ -15,10 +15,9 @@ PYTHON_MODNAME="${MY_PN}"
 
 DESCRIPTION="MGLTools Plugin -- UTpackages"
 HOMEPAGE="http://mgltools.scripps.edu"
-#SRC_URI="http://mgltools.scripps.edu/downloads/tars/releases/REL${PV}/mgltools_source_${PV}.tar.gz"
-SRC_URI="http://dev.gentoo.org/~jlec/distfiles/mgltools_source_${PV/_/}.tar.gz"
+SRC_URI="http://mgltools.scripps.edu/downloads/tars/releases/REL${PV}/mgltools_source_${PV}.tar.gz"
 
-LICENSE="MGLTOOLS UTPackages"
+LICENSE="MGLTOOLS MPL-1.1 UTPackages"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE=""
diff --git a/sci-chemistry/mgltools-viewer-framework/ChangeLog b/sci-chemistry/mgltools-viewer-framework/ChangeLog
index fa4764a2c..c4d01e162 100644
--- a/sci-chemistry/mgltools-viewer-framework/ChangeLog
+++ b/sci-chemistry/mgltools-viewer-framework/ChangeLog
@@ -2,6 +2,15 @@
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  14 Apr 2013; Justin Lecher <jlec@gentoo.org>
+  mgltools-viewer-framework-1.5.4-r2.ebuild,
+  mgltools-viewer-framework-1.5.6.ebuild:
+  Correct license
+
+  14 Apr 2013; Justin Lecher <jlec@gentoo.org>
+  mgltools-viewer-framework-1.5.6.ebuild:
+  Fix SRC_URI
+
 *mgltools-viewer-framework-1.5.6 (12 Apr 2013)
 
   12 Apr 2013; Justin Lecher <jlec@gentoo.org>
diff --git a/sci-chemistry/mgltools-viewer-framework/mgltools-viewer-framework-1.5.4-r2.ebuild b/sci-chemistry/mgltools-viewer-framework/mgltools-viewer-framework-1.5.4-r2.ebuild
index 7033ffa9f..673b381e6 100644
--- a/sci-chemistry/mgltools-viewer-framework/mgltools-viewer-framework-1.5.4-r2.ebuild
+++ b/sci-chemistry/mgltools-viewer-framework/mgltools-viewer-framework-1.5.4-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
@@ -16,7 +16,7 @@ HOMEPAGE="http://mgltools.scripps.edu"
 #SRC_URI="http://mgltools.scripps.edu/downloads/tars/releases/REL${PV}/mgltools_source_${PV}.tar.gz"
 SRC_URI="http://dev.gentooexperimental.org/~jlec/distfiles/mgltools_source_${PV}.tar.gz"
 
-LICENSE="MGLTOOLS"
+LICENSE="MGLTOOLS MPL-1.1"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE=""
diff --git a/sci-chemistry/mgltools-viewer-framework/mgltools-viewer-framework-1.5.6.ebuild b/sci-chemistry/mgltools-viewer-framework/mgltools-viewer-framework-1.5.6.ebuild
index 30831fc22..352b4dca5 100644
--- a/sci-chemistry/mgltools-viewer-framework/mgltools-viewer-framework-1.5.6.ebuild
+++ b/sci-chemistry/mgltools-viewer-framework/mgltools-viewer-framework-1.5.6.ebuild
@@ -15,10 +15,9 @@ PYTHON_MODNAME="${MY_PN}"
 
 DESCRIPTION="MGLTools Plugin -- ViewerFramework"
 HOMEPAGE="http://mgltools.scripps.edu"
-#SRC_URI="http://mgltools.scripps.edu/downloads/tars/releases/REL${PV}/mgltools_source_${PV}.tar.gz"
-SRC_URI="http://dev.gentoo.org/~jlec/distfiles/mgltools_source_${PV/_/}.tar.gz"
+SRC_URI="http://mgltools.scripps.edu/downloads/tars/releases/REL${PV}/mgltools_source_${PV}.tar.gz"
 
-LICENSE="MGLTOOLS"
+LICENSE="MGLTOOLS MPL-1.1"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE=""
diff --git a/sci-chemistry/mgltools-vision/ChangeLog b/sci-chemistry/mgltools-vision/ChangeLog
index eeedc4a99..df1033870 100644
--- a/sci-chemistry/mgltools-vision/ChangeLog
+++ b/sci-chemistry/mgltools-vision/ChangeLog
@@ -2,6 +2,13 @@
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  14 Apr 2013; Justin Lecher <jlec@gentoo.org> mgltools-vision-1.5.4-r1.ebuild,
+  mgltools-vision-1.5.6.ebuild:
+  Correct license
+
+  14 Apr 2013; Justin Lecher <jlec@gentoo.org> mgltools-vision-1.5.6.ebuild:
+  Fix SRC_URI
+
 *mgltools-vision-1.5.6 (12 Apr 2013)
 
   12 Apr 2013; Justin Lecher <jlec@gentoo.org>
diff --git a/sci-chemistry/mgltools-vision/mgltools-vision-1.5.4-r1.ebuild b/sci-chemistry/mgltools-vision/mgltools-vision-1.5.4-r1.ebuild
index 32421dfea..3ca82c9e3 100644
--- a/sci-chemistry/mgltools-vision/mgltools-vision-1.5.4-r1.ebuild
+++ b/sci-chemistry/mgltools-vision/mgltools-vision-1.5.4-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
@@ -16,7 +16,7 @@ HOMEPAGE="http://mgltools.scripps.edu"
 #SRC_URI="http://mgltools.scripps.edu/downloads/tars/releases/REL${PV}/mgltools_source_${PV}.tar.gz"
 SRC_URI="http://dev.gentooexperimental.org/~jlec/distfiles/mgltools_source_${PV}.tar.gz"
 
-LICENSE="MGLTOOLS"
+LICENSE="MGLTOOLS MPL-1.1"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE=""
diff --git a/sci-chemistry/mgltools-vision/mgltools-vision-1.5.6.ebuild b/sci-chemistry/mgltools-vision/mgltools-vision-1.5.6.ebuild
index e5b8bb799..b7a4f786d 100644
--- a/sci-chemistry/mgltools-vision/mgltools-vision-1.5.6.ebuild
+++ b/sci-chemistry/mgltools-vision/mgltools-vision-1.5.6.ebuild
@@ -15,10 +15,9 @@ PYTHON_MODNAME="${MY_PN}"
 
 DESCRIPTION="MGLTools Plugin -- Vision"
 HOMEPAGE="http://mgltools.scripps.edu"
-#SRC_URI="http://mgltools.scripps.edu/downloads/tars/releases/REL${PV}/mgltools_source_${PV}.tar.gz"
-SRC_URI="http://dev.gentoo.org/~jlec/distfiles/mgltools_source_${PV/_/}.tar.gz"
+SRC_URI="http://mgltools.scripps.edu/downloads/tars/releases/REL${PV}/mgltools_source_${PV}.tar.gz"
 
-LICENSE="MGLTOOLS"
+LICENSE="MGLTOOLS MPL-1.1"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE=""
diff --git a/sci-chemistry/mgltools-visionlib/ChangeLog b/sci-chemistry/mgltools-visionlib/ChangeLog
index 12a10b197..9ad4418cb 100644
--- a/sci-chemistry/mgltools-visionlib/ChangeLog
+++ b/sci-chemistry/mgltools-visionlib/ChangeLog
@@ -2,6 +2,13 @@
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  14 Apr 2013; Justin Lecher <jlec@gentoo.org>
+  mgltools-visionlib-1.5.4-r1.ebuild, mgltools-visionlib-1.5.6.ebuild:
+  Correct license
+
+  14 Apr 2013; Justin Lecher <jlec@gentoo.org> mgltools-visionlib-1.5.6.ebuild:
+  Fix SRC_URI
+
 *mgltools-visionlib-1.5.6 (12 Apr 2013)
 
   12 Apr 2013; Justin Lecher <jlec@gentoo.org>
diff --git a/sci-chemistry/mgltools-visionlib/mgltools-visionlib-1.5.4-r1.ebuild b/sci-chemistry/mgltools-visionlib/mgltools-visionlib-1.5.4-r1.ebuild
index 3bb26b99d..7c353a4f9 100644
--- a/sci-chemistry/mgltools-visionlib/mgltools-visionlib-1.5.4-r1.ebuild
+++ b/sci-chemistry/mgltools-visionlib/mgltools-visionlib-1.5.4-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
@@ -16,7 +16,7 @@ HOMEPAGE="http://mgltools.scripps.edu"
 #SRC_URI="http://mgltools.scripps.edu/downloads/tars/releases/REL${PV}/mgltools_source_${PV}.tar.gz"
 SRC_URI="http://dev.gentooexperimental.org/~jlec/distfiles/mgltools_source_${PV}.tar.gz"
 
-LICENSE="MGLTOOLS"
+LICENSE="MGLTOOLS MPL-1.1"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE=""
diff --git a/sci-chemistry/mgltools-visionlib/mgltools-visionlib-1.5.6.ebuild b/sci-chemistry/mgltools-visionlib/mgltools-visionlib-1.5.6.ebuild
index 7511432aa..a6c822c97 100644
--- a/sci-chemistry/mgltools-visionlib/mgltools-visionlib-1.5.6.ebuild
+++ b/sci-chemistry/mgltools-visionlib/mgltools-visionlib-1.5.6.ebuild
@@ -15,10 +15,9 @@ PYTHON_MODNAME="${MY_PN}"
 
 DESCRIPTION="MGLTools Plugin -- VisionLibraries"
 HOMEPAGE="http://mgltools.scripps.edu"
-#SRC_URI="http://mgltools.scripps.edu/downloads/tars/releases/REL${PV}/mgltools_source_${PV}.tar.gz"
-SRC_URI="http://dev.gentoo.org/~jlec/distfiles/mgltools_source_${PV/_/}.tar.gz"
+SRC_URI="http://mgltools.scripps.edu/downloads/tars/releases/REL${PV}/mgltools_source_${PV}.tar.gz"
 
-LICENSE="MGLTOOLS"
+LICENSE="MGLTOOLS MPL-1.1"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE=""
diff --git a/sci-chemistry/mgltools-volume/ChangeLog b/sci-chemistry/mgltools-volume/ChangeLog
index a6c5fa941..12c41500a 100644
--- a/sci-chemistry/mgltools-volume/ChangeLog
+++ b/sci-chemistry/mgltools-volume/ChangeLog
@@ -2,6 +2,13 @@
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  14 Apr 2013; Justin Lecher <jlec@gentoo.org> mgltools-volume-1.5.4-r1.ebuild,
+  mgltools-volume-1.5.6.ebuild:
+  Correct license
+
+  14 Apr 2013; Justin Lecher <jlec@gentoo.org> mgltools-volume-1.5.6.ebuild:
+  Fix SRC_URI
+
 *mgltools-volume-1.5.6 (12 Apr 2013)
 
   12 Apr 2013; Justin Lecher <jlec@gentoo.org>
diff --git a/sci-chemistry/mgltools-volume/mgltools-volume-1.5.4-r1.ebuild b/sci-chemistry/mgltools-volume/mgltools-volume-1.5.4-r1.ebuild
index 57d41b4c4..c22c9f253 100644
--- a/sci-chemistry/mgltools-volume/mgltools-volume-1.5.4-r1.ebuild
+++ b/sci-chemistry/mgltools-volume/mgltools-volume-1.5.4-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
@@ -16,7 +16,7 @@ HOMEPAGE="http://mgltools.scripps.edu"
 #SRC_URI="http://mgltools.scripps.edu/downloads/tars/releases/REL${PV}/mgltools_source_${PV}.tar.gz"
 SRC_URI="http://dev.gentooexperimental.org/~jlec/distfiles/mgltools_source_${PV}.tar.gz"
 
-LICENSE="MGLTOOLS"
+LICENSE="MGLTOOLS MPL-1.1"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE=""
diff --git a/sci-chemistry/mgltools-volume/mgltools-volume-1.5.6.ebuild b/sci-chemistry/mgltools-volume/mgltools-volume-1.5.6.ebuild
index 4a40bb025..c78203f8e 100644
--- a/sci-chemistry/mgltools-volume/mgltools-volume-1.5.6.ebuild
+++ b/sci-chemistry/mgltools-volume/mgltools-volume-1.5.6.ebuild
@@ -15,10 +15,9 @@ PYTHON_MODNAME="${MY_PN}"
 
 DESCRIPTION="MGLTools Plugin -- Volume"
 HOMEPAGE="http://mgltools.scripps.edu"
-#SRC_URI="http://mgltools.scripps.edu/downloads/tars/releases/REL${PV}/mgltools_source_${PV}.tar.gz"
-SRC_URI="http://dev.gentoo.org/~jlec/distfiles/mgltools_source_${PV/_/}.tar.gz"
+SRC_URI="http://mgltools.scripps.edu/downloads/tars/releases/REL${PV}/mgltools_source_${PV}.tar.gz"
 
-LICENSE="MGLTOOLS"
+LICENSE="MGLTOOLS MPL-1.1"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE=""
diff --git a/sci-chemistry/mgltools-webservices/ChangeLog b/sci-chemistry/mgltools-webservices/ChangeLog
index 5ca89580b..b5c612088 100644
--- a/sci-chemistry/mgltools-webservices/ChangeLog
+++ b/sci-chemistry/mgltools-webservices/ChangeLog
@@ -2,9 +2,13 @@
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
-*mgltools-webservices-1.5.6 (15 Apr 2013)
+  14 Apr 2013; Justin Lecher <jlec@gentoo.org>
+  mgltools-webservices-1.5.4-r2.ebuild, mgltools-webservices-1.5.6.ebuild:
+  Correct license
 
-  15 Apr 2013; Justin Lecher <jlec@gentoo.org>
+*mgltools-webservices-1.5.6 (14 Apr 2013)
+
+  14 Apr 2013; Justin Lecher <jlec@gentoo.org>
   -mgltools-webservices-1.5.6_rc2.ebuild,
   -mgltools-webservices-1.5.6_rc3.ebuild, +mgltools-webservices-1.5.6.ebuild:
   Version Bump, drop old
diff --git a/sci-chemistry/mgltools-webservices/mgltools-webservices-1.5.4-r2.ebuild b/sci-chemistry/mgltools-webservices/mgltools-webservices-1.5.4-r2.ebuild
index 6fde05924..0777542a6 100644
--- a/sci-chemistry/mgltools-webservices/mgltools-webservices-1.5.4-r2.ebuild
+++ b/sci-chemistry/mgltools-webservices/mgltools-webservices-1.5.4-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
@@ -16,7 +16,7 @@ HOMEPAGE="http://mgltools.scripps.edu"
 #SRC_URI="http://mgltools.scripps.edu/downloads/tars/releases/REL${PV}/mgltools_source_${PV}.tar.gz"
 SRC_URI="http://dev.gentooexperimental.org/~jlec/distfiles/mgltools_source_${PV}.tar.gz"
 
-LICENSE="MGLTOOLS"
+LICENSE="MGLTOOLS MPL-1.1"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE=""
diff --git a/sci-chemistry/mgltools-webservices/mgltools-webservices-1.5.6.ebuild b/sci-chemistry/mgltools-webservices/mgltools-webservices-1.5.6.ebuild
index ef9f61748..39062c5de 100644
--- a/sci-chemistry/mgltools-webservices/mgltools-webservices-1.5.6.ebuild
+++ b/sci-chemistry/mgltools-webservices/mgltools-webservices-1.5.6.ebuild
@@ -15,10 +15,9 @@ PYTHON_MODNAME="${MY_PN}"
 
 DESCRIPTION="MGLTools Plugin -- WebServices"
 HOMEPAGE="http://mgltools.scripps.edu"
-#SRC_URI="http://mgltools.scripps.edu/downloads/tars/releases/REL${PV}/mgltools_source_${PV}.tar.gz"
-SRC_URI="http://dev.gentoo.org/~jlec/distfiles/mgltools_source_${PV/_/}.tar.gz"
+SRC_URI="http://mgltools.scripps.edu/downloads/tars/releases/REL${PV}/mgltools_source_${PV}.tar.gz"
 
-LICENSE="MGLTOOLS"
+LICENSE="MGLTOOLS MPL-1.1"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE=""
diff --git a/sci-chemistry/mgltools/ChangeLog b/sci-chemistry/mgltools/ChangeLog
index d789c62cf..0d7e926ff 100644
--- a/sci-chemistry/mgltools/ChangeLog
+++ b/sci-chemistry/mgltools/ChangeLog
@@ -2,6 +2,10 @@
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  14 Apr 2013; Justin Lecher <jlec@gentoo.org> mgltools-1.5.4.ebuild,
+  mgltools-1.5.6.ebuild:
+  Correct license
+
 *mgltools-1.5.6 (12 Apr 2013)
 
   12 Apr 2013; Justin Lecher <jlec@gentoo.org> -mgltools-1.5.6_rc2.ebuild,
diff --git a/sci-chemistry/mgltools/mgltools-1.5.4.ebuild b/sci-chemistry/mgltools/mgltools-1.5.4.ebuild
index 3efc4d74f..31aef1ed1 100644
--- a/sci-chemistry/mgltools/mgltools-1.5.4.ebuild
+++ b/sci-chemistry/mgltools/mgltools-1.5.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
@@ -16,7 +16,7 @@ SRC_URI="
 	http://91.191.147.225/~jlec/distfiles/mgltools_source_${PV}.tar.gz
 	http://dev.gentoo.org/~jlec/distfiles/mgltools_source_${PV}.tar.gz"
 
-LICENSE="MGLTOOLS"
+LICENSE="MGLTOOLS MPL-1.1"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE=""
diff --git a/sci-chemistry/mgltools/mgltools-1.5.6.ebuild b/sci-chemistry/mgltools/mgltools-1.5.6.ebuild
index 4b2bed2f3..250b8b04d 100644
--- a/sci-chemistry/mgltools/mgltools-1.5.6.ebuild
+++ b/sci-chemistry/mgltools/mgltools-1.5.6.ebuild
@@ -17,7 +17,7 @@ DESCRIPTION="Software to visualization and analysis of molecular structures"
 HOMEPAGE="http://mgltools.scripps.edu/"
 SRC_URI="http://mgltools.scripps.edu/downloads/downloads/tars/releases/REL${PV}/${PN}_source_${PV}.tar.gz"
 
-LICENSE="MGLTOOLS"
+LICENSE="MGLTOOLS MPL-1.1"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE=""