sci-chemistry/avogadro: Punt base.eclass; bump to python-single-r1.eclass

Package-Manager: portage-2.2.8/cvs/Linux x86_64
Manifest-Sign-Key: 0xB9D4F231BD1558AB!

4 files changed, 58 insertions, 60 deletions

diff --git a/sci-chemistry/avogadro/ChangeLog b/sci-chemistry/avogadro/ChangeLog
index fe46703c3c2f..1084eb2da0fa 100644
--- a/sci-chemistry/avogadro/ChangeLog
+++ b/sci-chemistry/avogadro/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sci-chemistry/avogadro
-# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/avogadro/ChangeLog,v 1.47 2013/03/02 23:17:15 hwoarang Exp $
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/avogadro/ChangeLog,v 1.48 2014/01/06 09:50:11 jlec Exp $
+
+*avogadro-1.0.3-r2 (06 Jan 2014)
+
+  06 Jan 2014; Justin Lecher <jlec@gentoo.org> -avogadro-1.0.3-r1.ebuild,
+  +avogadro-1.0.3-r2.ebuild, avogadro-1.1.0.ebuild:
+  Punt base.eclass; bump to python-single-r1.eclass
 
   02 Mar 2013; Markos Chandras <hwoarang@gentoo.org> avogadro-1.0.3-r1.ebuild,
   avogadro-1.1.0.ebuild:
diff --git a/sci-chemistry/avogadro/Manifest b/sci-chemistry/avogadro/Manifest
index a8933183417a..f7efb30c094c 100644
--- a/sci-chemistry/avogadro/Manifest
+++ b/sci-chemistry/avogadro/Manifest
@@ -1,30 +1,28 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA512
 
 AUX 1.0.1-gl2ps.patch 1511 SHA256 0aae5556233c8e413739fdd890b5d8453d9a1e39dd3251a5a7a7705227a13e7b SHA512 b4a8d0138bffa7c018e2125e16a47cefefba01f19ce3d460488f36e44f55b212cea9c9875429e7c0c596388366adea045b50ace579b6352d2b7e0b073420c67f WHIRLPOOL 015420a79e56b5f3da238d73d12e28573636161e4edcdc94db80149aa84621de05b84f08332d701b5ed89dadb414a30e33badc686788698dd539603d2eeb5a05
 AUX avogadro-1.1.0-textrel.patch 1535 SHA256 55a58d29f47d441a5877e32acf9f9a8ad1e408a75a6629ccdc23ebec8f4d40f8 SHA512 5872a773668cb38b27ab0dbaf14d947eff4cb3d4ae99410c8968cafe576a9df5d3b0937d028b9ffd076c212c5f9b8e213cda74a63afff6caa713346ee338be77 WHIRLPOOL f5478f34db2d20ae08c26b3db4c9334c7794c5948652c0199e78ea760054932297c00b5ff4c001ed3eed98e050c6970766d8c117748d5dc6a43ed0cc15ab5651
 DIST avogadro-1.0.3.tar.bz2 4971989 SHA256 efb6fda223da3c027436f0c218a47ce804f7469c58b41134230e9ebad1c98468 SHA512 49e7b8ca43f0f52a65efc7bf9dc45670ae5a5de5d1aa6bf7b58b8368e816be30fe6529c45fa658d7337d4a69327bb0aa8799d8d4b4805860aace28011cc74210 WHIRLPOOL c835ac24b317a1fa310bf3ea75bae4002d01f364d4754e6a7d841594dcce321435c827d60e125d9410f05670a94c887cc250bf49759d02cde34a5839d2324c92
 DIST avogadro-1.1.0.tar.bz2 10741835 SHA256 6b4eaf57ae52bf43df9b103c77e6abae71e067053d5c99f82acbce9855ecceb0 SHA512 d621dd3ea9e9223d3a29c6b0c0eec89a935837d0c587fcaaa549f91274a76f78a8c60c2a68a67d2f3aa2e107826befb6658be601c46c5bc0760c95bf7284540a WHIRLPOOL c81e866e60b3383a58de515317c754e3982e716c27974ce43ca0c1209d24544949361a7f2f93a4a940d73fd7a18b184f68c7a1856fea89ae5eba75db74b1012d
-EBUILD avogadro-1.0.3-r1.ebuild 1308 SHA256 44977ea732188940438907a78e23ce205135be40977174707d9419ccff37eef5 SHA512 75364bb15c4010c5a2b349bb4187f8b6b2f19fe68e1176fd746efde2f57c2d5bc55b203ea5a8a9a99bc343675151491c96318bdd0f4a7dd70e4facda30470aaa WHIRLPOOL 4e26f80c7f306944c9b4aa749602be26e2f4c827d056c7862e0edaaaa0252311325d4b16e22b3cd3b2ae803c4c171a11ee8c7d800f6c33a61d1c1e743e0e11b0
-EBUILD avogadro-1.1.0.ebuild 1438 SHA256 875b61277541a2b82d7267433cc122cfecc91252894707df1d02344bdd455b8d SHA512 8904f92fa43e5a3885e9f23626a4591d7abeb93765baffdebf771f5857fc2dfe27080c13c500f0e74bf2a42adc3ecf64df1c684708f87a5170ad46a9400c81d9 WHIRLPOOL 7905f5e71f2499aa4f1765a13bc7460a5220acb913db33bd7d2c55e1361f5f3e1d933436bbad844f20a60d93fd73b7363aa59608e19e89d495b7699ce9333b29
-MISC ChangeLog 7380 SHA256 ace39bf5536aef6c90f91ecc3d507dcda5d46c5a52eded4a70aa4873e163011a SHA512 b912bd9d47fdd27d3764630726e7220d993f68d2f00310596d6fbfd580134321ece31499d2b5e6914ff5af3bc025bb45a69a987bb845d66c4eaab9d45f7d5084 WHIRLPOOL 1445e605cb34a17f19de883289b8866b69029ad3aa18a7a3cfa124bf9bbef554c78f1dde823120eff4f9ef62133ff0aa40c4cdfcb6756f4ce73e4294ba1c06db
+EBUILD avogadro-1.0.3-r2.ebuild 1338 SHA256 b78f8c3865200e06fe0317cdcf7ef3cbc463e63f0dce584faefb699a7d045843 SHA512 2ec00b8676998e242d26f7ccd5bc78fc2094c29dd38d5a2e7b8a44d2896042e6af9e59d33e223fac16ce55aa340c78dbf8cee3cb9c87d6281e0fbebe8aa73311 WHIRLPOOL c79e455aa3164f5520c0e7db421e8e812bf841330460d31b9c462f0ce5a09960ef0e4df005805d1596b5d7703afbc396e11e5f96d77981075384fc1747ecc7ee
+EBUILD avogadro-1.1.0.ebuild 1432 SHA256 5cd64bc68e938350ce6a071171c0dca8da7f5c23208b49526f336cff76d81f31 SHA512 e71cfd92c85e24c0b75678e644bfe8be0de3429b494fc835dd47b7b331b3967d2051ee1b42bdb3c314a686c0a1cd48a2837bbe26b100743b9e12ad246ae76765 WHIRLPOOL 7b518c2d8bc1d78399fa6269fdb3cd4e45427ac8e03350880889217edcd602f1906a70e1bade0c1b4d45795fde9ec9713afe029b3ccc1ed3db3aaf37c84b192f
+MISC ChangeLog 7589 SHA256 6e5ba31e39ce8c9414a44d2da5d587612f26b6c908586f238d808eef260f6292 SHA512 b2d331bda4273b4f30aa0fabed7097b87d244a79a662d40ba9e678d630f1b8a1749adf803071114eff8ca71bc6bfea0536e83e99ece4a76b868610b04bfc06ef WHIRLPOOL 01bcb25a85ae98bbc4fccbbe7d7c3d03e2b51eca1645ec4c551fe84420b47602d05477f51dbc51af20b04bc08d02ce95caf0c2ce9aa4a87df2d2bb00ae980da2
 MISC metadata.xml 533 SHA256 f0c611c081821a1a7e7ba42af53fc9bb4318119da01ae593c6fb96d866c31c8a SHA512 f1b061fa7a00034b9fd99a571c1371168fda35a746fdd8bd4008e6ce467d4d1ea1e9279621e5cc3ac749f43ca9e73a16ac9cc6cff48a3d5a181efde74da50a19 WHIRLPOOL 3b30945b5b2eddab07f5270257b1de35287d2e3e9d605ace285cc7d1f7473059b31b757c163329c53bda80a6d47d5faf0b240218767eca503fb22ad79a362d2b
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
+Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQJ8BAEBCABmBQJRMoh6XxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
-ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQzNTVDNDczOUYzRjJEMTRGNDRGMzU2RkMw
-OUJGNEY1NEMyQkE3RjNDAAoJEAm/T1TCun88jVAP/A3r67/OuGDipuDF1lXL1MMe
-jMIqMr4q1lhLQqJVTf7KlAO5qDcCEWEJR4ByDcNrMkBSQsj044EWm0KVAAk9BPg+
-0PBehq8fd2H7ktHS122H21kJ0etnHgH3HnIe2qAFq7XeGMjVl48CuPDliVV9/SYC
-UJ9Qmr+yofUDIl2rJzmvpDcRXf1sK4jSQIhTNPSoblcOEPW6NCf2n6KEimDZI073
-Y/6nj4ET/dNpyZ7c4w1Jyk3uf/6TeNKYZGzfgYR1vjvsCZJT79u2wRabi7aBFlJi
-yzgOjlQrzlr4vRdf8XKb4SyzhvRmu9Hu+yoxEHczYfI1Jclb6bTjMWPEcLI906Dt
-8F5/2qpjhsDkYZ9FTWdRjYZ+shEqm+fkzHCq3pxi6D/dpDC/vNKmnkQlYa6SIYpa
-YhYUNDUpENqSWxwYPdamLC0llFd0tgFYw+ubxxZBLt3vz7KAcEAK/v1uEhtScwFb
-k0QcjQJuYKrl+KxdWpKzt/8jNizghL4E0ej7Ssdry3p5xAibj4h8uOw+cbc1mzDM
-xw8MuTUz/1iO1g/eEUE4wunrY/ZWHZNcM1C93CCqNCkDwOR24hzY9eJ0PcIQJoiU
-geUPinpiQlITjFbefV43npfyTib6aoj+0YWF3RgVOBdU+jLuI4x+w4vPf4lb3qs9
-zoqCKIvOoKKxwYY3Epum
-=wCGE
+iQIcBAEBCgAGBQJSynxUAAoJELnU8jG9FVirRwAP/1hx2sePAqLq+YRElAOHXGB8
+ruGkUVl1hxUvRY5rLfLgyPsFSazbYJq+hiDm3nOX9uCGj+JRVp9poRKnlIXHCzaE
+6FLT91Hfsdy4SiqwlndARHjrymZ+UPUXNHBIr+WTEJVOCagM6nDrNnMcTTJPl6Yv
+9RfLwDl5DJhJle51Un8/ftp6CNfNNv3g8S7/kS306HEjVLw9LMS4skON97XvdLbw
+oMej2uCp3wluVAaeTxnWXtdVGnKfogCXrvXgigCua8AwriHsMHjxjjOe/Psz8WDd
+Hyx1NQQnlHUhtxI/bJaTr9G20zOYzK2IPEujN7/BjOfK0Pt/Vw2cqMutxkvFoUZJ
+LN5aeHR5f5GrQ64fIlQ1WKQoVnvdOKsykBimkhGWV03H47vJS+yt+NMNKyUNcJS8
+uUtXPQmJS12p7s6ZiElFaItmvftYmYibQlsoezMpPqN+dsLlqOp1XR5MEu8LZUWs
+up2zNRQksIR+txlwQXrGXBD5yGmmuWzTrb2G+DR12vk1+8eYnVB+mjH0Pf74BgV1
+nctdt91Ke74RMpJK1UfoDIOdFtWJdjuX+xz80AJ3E+SBYQxYLr0purLCb1wcobnk
+OmUSRgo3LWxruCFklyqzug+ox2coyKS0SPua0J3whv//jp0+QhAOL303BjPN+CM8
+ZzlBIc01zcjrDURKf2bP
+=FsX5
 -----END PGP SIGNATURE-----
diff --git a/sci-chemistry/avogadro/avogadro-1.0.3-r1.ebuild b/sci-chemistry/avogadro/avogadro-1.0.3-r2.ebuild
index e6c166275ffa..e91f073e876f 100644
--- a/sci-chemistry/avogadro/avogadro-1.0.3-r1.ebuild
+++ b/sci-chemistry/avogadro/avogadro-1.0.3-r2.ebuild
@@ -1,12 +1,12 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/avogadro/avogadro-1.0.3-r1.ebuild,v 1.5 2013/03/02 23:17:15 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/avogadro/avogadro-1.0.3-r2.ebuild,v 1.1 2014/01/06 09:50:11 jlec Exp $
 
-EAPI=3
+EAPI=5
 
-PYTHON_DEPEND="python? 2:2.5"
+PYTHON_COMPAT=( python{2_6,2_7} )
 
-inherit base cmake-utils eutils python
+inherit cmake-utils eutils python-single-r1
 
 DESCRIPTION="Advanced molecular editor that uses Qt4 and OpenGL"
 HOMEPAGE="http://avogadro.openmolecules.net/"
@@ -24,10 +24,9 @@ RDEPEND="
 	x11-libs/gl2ps
 	glsl? ( >=media-libs/glew-1.5.0 )
 	python? (
-		>=dev-libs/boost-1.35
-		>=dev-libs/boost-1.35.0-r5[python]
-		dev-python/numpy
-		dev-python/sip
+		>=dev-libs/boost-1.35.0-r5[${PYTHON_USEDEP}]
+		dev-python/numpy[${PYTHON_USEDEP}]
+		dev-python/sip[${PYTHON_USEDEP}]
 	)"
 DEPEND="${RDEPEND}
 	dev-cpp/eigen:2"
@@ -37,16 +36,16 @@ PATCHES=(
 )
 
 pkg_setup() {
-	python_set_active_version 2
+	use python && python-single-r1_pkg_setup
 }
 
 src_configure() {
 	local mycmakeargs=(
-		"-DENABLE_THREADGL=FALSE"
-		"-DENABLE_RPATH=OFF"
-		"-DENABLE_UPDATE_CHECKER=OFF"
-		"-DQT_MKSPECS_DIR=${EPREFIX}/usr/share/qt4/mkspecs"
-		"-DQT_MKSPECS_RELATIVE=share/qt4/mkspecs"
+		-DENABLE_THREADGL=OFF
+		-DENABLE_RPATH=OFF
+		-DENABLE_UPDATE_CHECKER=OFF
+		-DQT_MKSPECS_DIR="${EPREFIX}/usr/share/qt4/mkspecs"
+		-DQT_MKSPECS_RELATIVE=share/qt4/mkspecs
 		$(cmake-utils_use_enable glsl)
 		$(cmake-utils_use_with sse2 SSE2)
 		$(cmake-utils_use_enable python)
diff --git a/sci-chemistry/avogadro/avogadro-1.1.0.ebuild b/sci-chemistry/avogadro/avogadro-1.1.0.ebuild
index dc6d301de709..9556bc7fdf8f 100644
--- a/sci-chemistry/avogadro/avogadro-1.1.0.ebuild
+++ b/sci-chemistry/avogadro/avogadro-1.1.0.ebuild
@@ -1,12 +1,12 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/avogadro/avogadro-1.1.0.ebuild,v 1.3 2013/03/02 23:17:15 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/avogadro/avogadro-1.1.0.ebuild,v 1.4 2014/01/06 09:50:11 jlec Exp $
 
 EAPI=5
 
-PYTHON_DEPEND="python? 2:2.5"
+PYTHON_COMPAT=( python{2_6,2_7} )
 
-inherit cmake-utils eutils python
+inherit cmake-utils eutils python-single-r1
 
 DESCRIPTION="Advanced molecular editor that uses Qt4 and OpenGL"
 HOMEPAGE="http://avogadro.openmolecules.net/"
@@ -24,32 +24,31 @@ RDEPEND="
 	x11-libs/gl2ps
 	glsl? ( >=media-libs/glew-1.5.0 )
 	python? (
-		>=dev-libs/boost-1.35.0-r5[python]
-		dev-python/numpy
-		dev-python/sip
+		>=dev-libs/boost-1.35.0-r5[${PYTHON_USEDEP}]
+		dev-python/numpy[${PYTHON_USEDEP}]
+		dev-python/sip[${PYTHON_USEDEP}]
 	)"
 DEPEND="${RDEPEND}
-	dev-cpp/eigen:2
-	dev-util/cmake"
+	dev-cpp/eigen:2"
 
 # https://sourceforge.net/p/avogadro/bugs/653/
 RESTRICT="test"
 
-pkg_setup() {
-	python_set_active_version 2
-}
+PATCHES=(
+	"${FILESDIR}"/${P}-textrel.patch
+)
 
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-textrel.patch
+pkg_setup() {
+	use python && python-single-r1_pkg_setup
 }
 
 src_configure() {
 	local mycmakeargs=(
-		"-DENABLE_THREADGL=OFF"
-		"-DENABLE_RPATH=OFF"
-		"-DENABLE_UPDATE_CHECKER=OFF"
-		"-DQT_MKSPECS_DIR=${EPREFIX}/usr/share/qt4/mkspecs"
-		"-DQT_MKSPECS_RELATIVE=share/qt4/mkspecs"
+		-DENABLE_THREADGL=OFF
+		-DENABLE_RPATH=OFF
+		-DENABLE_UPDATE_CHECKER=OFF
+		-DQT_MKSPECS_DIR="${EPREFIX}/usr/share/qt4/mkspecs"
+		-DQT_MKSPECS_RELATIVE=share/qt4/mkspecs
 		$(cmake-utils_use_enable glsl)
 		$(cmake-utils_use_enable test TESTS)
 		$(cmake-utils_use_with sse2 SSE2)
@@ -58,7 +57,3 @@ src_configure() {
 
 	cmake-utils_src_configure
 }
-
-src_test() {
-	cmake-utils_src_test
-}