clean up + fix depend (bug #474720)

Package-Manager: portage-2.2.0_alpha185/cvs/Linux x86_64
Manifest-Sign-Key: 0xC2000586

5 files changed, 35 insertions, 30 deletions

diff --git a/sci-libs/openmm/ChangeLog b/sci-libs/openmm/ChangeLog
index 3eef037a14e4..b276f251e870 100644
--- a/sci-libs/openmm/ChangeLog
+++ b/sci-libs/openmm/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for sci-libs/openmm
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/openmm/ChangeLog,v 1.10 2013/05/22 02:09:22 ottxor Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/openmm/ChangeLog,v 1.11 2013/06/25 23:51:19 ottxor Exp $
+
+*openmm-5.1-r1 (25 Jun 2013)
+*openmm-5.0.1-r1 (25 Jun 2013)
+
+  25 Jun 2013; Christoph Junghans <ottxor@gentoo.org> +openmm-5.0.1-r1.ebuild,
+  +openmm-5.1-r1.ebuild, -openmm-5.0.1.ebuild, -openmm-5.1.ebuild, metadata.xml:
+  clean up + fix depend (bug #474720)
 
 *openmm-5.1 (22 May 2013)
 
diff --git a/sci-libs/openmm/Manifest b/sci-libs/openmm/Manifest
index 7a573096970a..c0cf640517a5 100644
--- a/sci-libs/openmm/Manifest
+++ b/sci-libs/openmm/Manifest
@@ -3,18 +3,18 @@ Hash: SHA256
 
 DIST OpenMM5.0.1-Source.zip 15201507 SHA256 8fe0cc75ec2b7e6edd7f69d64772edb6535e97bec4c2445831716239371b4af4 SHA512 6d480f424fbf18bf150d68ae21fa71cf39399de2183ee80ac73bac41e8486764833346dd173e976f133525abf51f91f47cce4dc6343693a8d489069c2202e316 WHIRLPOOL a3ece2015de51e5296de2c79267aa0527a79b124a1f4998f0093ef06ef848b098791209429b647fd27f137cc7f8e5ba97bdd86dfcaeea540ff0c274bee5be318
 DIST OpenMM5.1-Source.zip 15582536 SHA256 5f011bfbc51f48635384a05ab0e6adeb8a8d0db96a9714a792534547db30bf45 SHA512 90ecfc42d9b4a494cb160f414695cbff200203170353babf9e9bed3d3895a6fda86524e9dac83c6afec0abb440342d3077719c83c2f8bc0866931d0a8b08b0e5 WHIRLPOOL dca8173e460df7351b35712b35dd1b7151f215a9d06de68f0fc27d6cabace2488e32975dbcb03fd54ad0675a6cbc9f162e6a9d383b91598754db5a5cf9973dc6
-EBUILD openmm-5.0.1.ebuild 1636 SHA256 f2d185b11bf3b48ed54abea4ce46e600d1fbdfd241367a64b5f83a1fa853c312 SHA512 53ab3eab49afe4960ce7e9cbfd59d903b7ec0139eb47f86a17f40de36e5b1e2f58b6053a3aedb9fcf3075718bbd094c6c0022e3c6ae7b4f9620a462845c43ccc WHIRLPOOL ae8d0bba666cce8a2f49050df4fbef0f5e96712b3affd6ef2d18a23793b36fb1bfcef6f8a96643bfaf68813e91a909b0e86e47f91a82aa77ca960b8aa408caba
-EBUILD openmm-5.1.ebuild 1634 SHA256 5577a62e8b7afa65ba0bad84da67d424ab890b85b10cca095076b173f2875c1b SHA512 24cfed5fdd6a5d9950858521274e3dc9a5fe3721c0d049ee8758e3d46c144578406e7750a7519b52b20c50991b7cddf8e6ea6a7ca47e844231fce986ddc38690 WHIRLPOOL c3d73d326c3924737b890ca1655b1542ae8cf6a7c183089ff5631cbda81f1c1057d002865a6713c55ff1b83a7b40225eb02878fa5c2fcef5b0363ca8bcfa9a22
-MISC ChangeLog 1433 SHA256 7b86193ec158b6e001499e978cbd676086930cacf63ab4795a3b44259d3c4bee SHA512 5314afcdfc6783201fddc6dc0135bee3becf4232ea77b0749bfc73dfe22631e1c3f1729679da4cb90fa98b59ae1172a52ab7c23d596a36d84367f6d47f184269 WHIRLPOOL db91696776e9314ef33ab278e7937d163ca180c46b43cb770715079bf80580bda99627da053885e0919639d06a34a77a39fd5a7824abe5cd8413eee254a7f022
-MISC metadata.xml 444 SHA256 829ec5e9d727c6017890467a1e2505435c64364bb6ab3c1d0bfc41d7403a8e77 SHA512 9a40b9800aa9940b787e45194da8df2b3a7df0f2a212480fc3c86ec37a99eb532778679454000ca6ce670c1298a246fbc5bf1956717aae8d2f12eddf157b20d7 WHIRLPOOL c7189f2680f574b7e978c1d6850b8b25ddb7d276bc9f553bba9a15d91c2b711669022958d7546aeca9e7eadc7d78a87ae6eb194a39395afa0047fe66be1262b6
+EBUILD openmm-5.0.1-r1.ebuild 1690 SHA256 22b292a1657d105c058f491da461b67e7d18c6633592a8dcff69e3b08e8657ae SHA512 6e192bfc515d7e4fbbfa0db3e7705f87a3535cf55d3f61904cd9ed4a8fadccb229825537795c38085cda9f82ea378c112a5366d8ef5544eaae8f803125e77ddd WHIRLPOOL f6464ae139f32b67616683ef9b47a4b37db5fbab2bcffdc6a526aaa74164d62023d1f2c4d4b6ff55fc0f93982b845d1d9aaf7da0000671b330b7d6770b4b0e7d
+EBUILD openmm-5.1-r1.ebuild 1688 SHA256 9bb098da5638833cd431552fa595de98ea47b6176bbadae49f7eb86f2f32b92a SHA512 f7b88cee5aa450978f322822b4ac7ef69891c32b49db22d3993a016bd76c0fd85de7ab845e1e138636eabdb803a4627940d4769820acce4bcaa181ae9b547998 WHIRLPOOL 76f544005a9ee001978ffcbe87972216e42a87145b2abf6549f89bf27a951bdc9e518865337a33e71742858ad594b83453e1e022683a64a2b66c0a6141661bfd
+MISC ChangeLog 1693 SHA256 6e9ef0ef49584a9a64878226f9a16281dddd45d24842d66aee02ac01634081b2 SHA512 6f10cfefaaa585d5887b8e0749652a2739b7f09d133dd5aa3fbf7a2fd099f91432862d69fabd5ed645b64d7a16c28c2abba852f73e8f41f365dc50b0cc72b260 WHIRLPOOL 7c2676ec7fffb183d085b21d9888dea170bf66126a50ab7af51d2c3faf2727228d14753bb196f2bc728d9f7b66775def559ad92e980ec1813656b0d456d9df5c
+MISC metadata.xml 452 SHA256 902f554cc4cc8394837f3e55cdbfd295d5750bc21f579ed8a96ce9096c89b086 SHA512 a0d896ae48ff7d3e0b32278aa986010410d958a977628200a3aa13643f8429d2e8e13b1a3245578c90411fc1b68ce0e693a9fc4d45b81d94e3e8fbf8d0f2728a WHIRLPOOL b184a0cb2376de47d60e98622480019a09255c000fa3b77b40513e03f53a2274c42ebee5911ffcefd1e5526c248479607b1a992505f8296b0e8fcd512d4d1cfb
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
+Version: GnuPG v2.0.20 (GNU/Linux)
 
-iQEcBAEBCAAGBQJRnCjhAAoJEOeBhlrCAAWGGR0H/35LmXTzU6Pf9z+rfbSvgori
-nVQYDKq7OleYinHIOp8PzvPosxFjFt0zte9G9Dtc+YPlYKkFUfA6IocdIKG2DJ26
-iwt6fBYmK+JnyupwaBkmvbvFLbh7GY89YtYJf7FZrjj3DYr+LmO7ShEe4+jTha43
-d59UXjc/JSD3E+KXRmbRB8QQiU85p+GJTbp8InEJp1VZPrKf0TxDGrGDpScp5cY6
-vGjMNBKmpsoCMgzG6TVFisS8AtB+etSDd/YFotnKvWcSqix0iQMXTEdJ0YO+eIwu
-h8uegPRsBUqQXFISb6GXaCGC9j0jKUcraZJ2mJ6ihLNS8nyV+qxsMNplq7398d0=
-=v+92
+iQEcBAEBCAAGBQJRyi0CAAoJEOeBhlrCAAWGx3cH/0sNtfONNRbOa9dL02cTRf/9
+mxCncs8WIqc82ad5xW2LEkst/0R24012K2sb2e8s2FNyYjkwRRbhWjEFa/UPMC8s
+szOJXEGXHNAwz9CjngGnHmC/rn1Z4NnEBysxecHbYdOlLYzRcYzYgLtaXKjcYiU0
+5CKFiTKOu+mhqRyhSx1wL2KDMVBNKZF8hmGGlgnOSBA9yvudqdUrC0Rc8ea1N8as
+DdAAkyH7tMMih3IBNloCB6hUDn4T9aHDlCr2OOZ/D2BUxr6iZFJDCZ0D0tEyFsEW
+ZxsAnwlLJ2+/GBzbwwNgEXehqQxOvD6VP5gKQNVXSu+IUadtNBbyxD2tBiYtvpg=
+=8ab/
 -----END PGP SIGNATURE-----
diff --git a/sci-libs/openmm/metadata.xml b/sci-libs/openmm/metadata.xml
index 770c6c8fc3f1..ed59fda20176 100644
--- a/sci-libs/openmm/metadata.xml
+++ b/sci-libs/openmm/metadata.xml
@@ -9,6 +9,6 @@
 	<use>
 		<flag name="cuda">enable cuda back-end</flag>
 		<flag name="opencl">enable opencl back-end</flag>
-		<flag name="wrappers">build wrappers for C and Fortran</flag>
+		<flag name="wrappers">build wrappers for Python, C and Fortran</flag>
 	</use>
 </pkgmetadata>
diff --git a/sci-libs/openmm/openmm-5.1.ebuild b/sci-libs/openmm/openmm-5.0.1-r1.ebuild
index fc96bf017e6d..6fd5ef53c9c6 100644
--- a/sci-libs/openmm/openmm-5.1.ebuild
+++ b/sci-libs/openmm/openmm-5.0.1-r1.ebuild
@@ -1,12 +1,12 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/openmm/openmm-5.1.ebuild,v 1.1 2013/05/22 02:09:22 ottxor Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/openmm/openmm-5.0.1-r1.ebuild,v 1.1 2013/06/25 23:51:19 ottxor Exp $
 
 EAPI="5"
 
-PYTHON_DEPEND="2:2.6"
+PYTHON_COMPAT=( python{2_6,2_7} )
 
-inherit cmake-utils cuda python
+inherit cmake-utils cuda python-any-r1
 
 MY_P="${PN^^[om]}${PV}-Source"
 DESCRIPTION="provides tools for modern molecular modeling simulation"
@@ -24,15 +24,13 @@ RDEPEND="
 DEPEND="${RDEPEND}
 	doc? ( app-doc/doxygen )
 	wrappers? (
-		dev-cpp/gccxml virtual/jre
+		dev-cpp/gccxml
+		virtual/jre
+		${PYTHON_DEPS}
 		app-doc/doxygen )" # wrappers need doxygen #470706
 
 S="${WORKDIR}/${MY_P}"
 
-pkg_setup() {
-	python_set_active_version 2
-}
-
 src_prepare() {
 	use cuda && cuda_src_prepare
 	default
@@ -44,6 +42,7 @@ src_configure() {
 		$(cmake-utils_use opencl OPENMM_BUILD_OPENCL_LIB)
 		$(cmake-utils_use doc OPENMM_GENERATE_API_DOCS)
 		$(cmake-utils_use wrappers OPENMM_BUILD_C_AND_FORTRAN_WRAPPERS)
+		$(cmake-utils_use wrappers OPENMM_BUILD_PYTHON_WRAPPERS)
 	)
 
 	cmake-utils_src_configure
diff --git a/sci-libs/openmm/openmm-5.0.1.ebuild b/sci-libs/openmm/openmm-5.1-r1.ebuild
index 3606f819f0d1..d7919a4e1150 100644
--- a/sci-libs/openmm/openmm-5.0.1.ebuild
+++ b/sci-libs/openmm/openmm-5.1-r1.ebuild
@@ -1,12 +1,12 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/openmm/openmm-5.0.1.ebuild,v 1.2 2013/05/22 00:56:34 ottxor Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/openmm/openmm-5.1-r1.ebuild,v 1.1 2013/06/25 23:51:19 ottxor Exp $
 
 EAPI="5"
 
-PYTHON_DEPEND="2:2.6"
+PYTHON_COMPAT=( python{2_6,2_7} )
 
-inherit cmake-utils cuda python
+inherit cmake-utils cuda python-any-r1
 
 MY_P="${PN^^[om]}${PV}-Source"
 DESCRIPTION="provides tools for modern molecular modeling simulation"
@@ -24,15 +24,13 @@ RDEPEND="
 DEPEND="${RDEPEND}
 	doc? ( app-doc/doxygen )
 	wrappers? (
-		dev-cpp/gccxml virtual/jre
+		dev-cpp/gccxml
+		virtual/jre
+		${PYTHON_DEPS}
 		app-doc/doxygen )" # wrappers need doxygen #470706
 
 S="${WORKDIR}/${MY_P}"
 
-pkg_setup() {
-	python_set_active_version 2
-}
-
 src_prepare() {
 	use cuda && cuda_src_prepare
 	default
@@ -44,6 +42,7 @@ src_configure() {
 		$(cmake-utils_use opencl OPENMM_BUILD_OPENCL_LIB)
 		$(cmake-utils_use doc OPENMM_GENERATE_API_DOCS)
 		$(cmake-utils_use wrappers OPENMM_BUILD_C_AND_FORTRAN_WRAPPERS)
+		$(cmake-utils_use wrappers OPENMM_BUILD_PYTHON_WRAPPERS)
 	)
 
 	cmake-utils_src_configure