Switch to python-r1, removed old

Package-Manager: portage-2.2.01.22124-prefix/cvs/Linux x86_64
Manifest-Sign-Key: 0x13CB1360

5 files changed, 18 insertions, 116 deletions

diff --git a/sci-visualization/pyxplot/ChangeLog b/sci-visualization/pyxplot/ChangeLog
index c0463fc72b38..e864d6f7b316 100644
--- a/sci-visualization/pyxplot/ChangeLog
+++ b/sci-visualization/pyxplot/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sci-visualization/pyxplot
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-visualization/pyxplot/ChangeLog,v 1.28 2012/12/06 20:42:44 bicatali Exp $
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sci-visualization/pyxplot/ChangeLog,v 1.29 2013/07/16 17:56:57 bicatali Exp $
+
+  16 Jul 2013; Sébastien Fabbro <bicatali@gentoo.org> -pyxplot-0.8.4.ebuild,
+  -pyxplot-0.9.0.ebuild, pyxplot-0.9.2.ebuild:
+  Switch to python-r1, removed old
 
 *pyxplot-0.9.2 (06 Dec 2012)
 
diff --git a/sci-visualization/pyxplot/Manifest b/sci-visualization/pyxplot/Manifest
index bb0e89012fee..707ef9d3bd72 100644
--- a/sci-visualization/pyxplot/Manifest
+++ b/sci-visualization/pyxplot/Manifest
@@ -3,19 +3,15 @@ Hash: SHA256
 
 AUX pyxplot-0.8.3-as-needed.patch 3050 SHA256 28371284923c92f308f16739a101a2c101349e308a5f6fb462b5045c2ad1f930 SHA512 0e8a0f8f42b001cd285262f3f6aae74a951da6ebd219adf3479ca8e91b6b8a7d81a393e07931461959e4c53eba84de859145f1e7459aada56f82fc952baa094b WHIRLPOOL 1752fda3e3db2864466d4a919809ea6ec835dcd28b162565bd70b5f23103a2078cdab7d3d75bca00d1cc1b0de36cb6a062fd625f1858b24e6854e9ace5256818
 DIST pyxplot_0.7.1.tar.gz 2439857 SHA256 262b4337c1fdb8e54c11eb76415b814243f6dbab28163fd1e208378d860d2a84
-DIST pyxplot_0.8.4.tar.gz 3847286 SHA256 3658a36c8167e558e06b6ce288d384cd3354414281cb68fda4ee41f87b84dee3 SHA512 5783ca7b6895c774d3833ef7371c49b1211e076dcb0e52dbe592f40d5c4e475a5551e749c1569bb845742a1c1a8fd9cf202f071fe325c1532ed3138bc401005d WHIRLPOOL 2c767b2d5c745bd50fe823797c5fd32b1971812749f327791b7a36b5cc8858add2b3013889cc21137385c90c45439f9e42a7f0d093d614d4330f73a9e28e03b2
-DIST pyxplot_0.9.0.tar.gz 4118759 SHA256 cec4097d185ad8e9f892bd7e3b4b97e92cdfe1f993ef82e2c102d674d96ceeda SHA512 009ec684ff9faa1349cca3f4d312e5118bc4028ba2dba52129a5cb4c49659589223a8c6621fd33ededaef8e2db1de2d96bfbd6d991ff6554fc91cd3d344a7a74 WHIRLPOOL 41d9339d51cbd93239ed8a622386c11ad272eb68eb7d62f34622762d4545340054655df23021809f56491be64320e2fd4829da9613519cf7c974440addd6f6b3
 DIST pyxplot_0.9.2.tar.gz 4131841 SHA256 1c592a0bc77caec445a8d72534471c01d66ca1806309e6c983847c2e0b95e689 SHA512 34c43fec36dd579161c7adb9f0bab012c5d3e59c904526f82a70a31685b88a231c300ab4dbdff376b29fdd5698c376d55f7a2f2786d7960c4de7e6e0776fa844 WHIRLPOOL f380489231f01ad81f983bb7fe11fb0323ca3d5dedeb60c84739e122c567e3581bb04962ecf83f21751d49a773d129b2b332b0aed4e9192ec064b5ee14714881
 EBUILD pyxplot-0.7.1.ebuild 1251 SHA256 8433a6a128e3a3033b8f2e9a861ee9c34758c587da2869ec15d09632b5acd0b0 SHA512 b814bade5b2c2ec0d3423f7db312ff784b84e1388bdaf3a58c74cbd6d154dd807c38bf59560ba759f5751aef545c0c5a6171a35504b5f5ac59f6b3a24d03a360 WHIRLPOOL dadcbffa6d183c188d7c0aa2ee6d5aa52550bcc6ca5e6332765b892744902985e2623665b4f6987c26177d0f1c2cb1d1c46cbfda812df34cb738c01b62312e2e
-EBUILD pyxplot-0.8.4.ebuild 1100 SHA256 074ce4d2b1ef41361a153126a79a4910bd830047652b47b90c1c858d395d26bb SHA512 61e94aa6aadd92f0cd39b179f31f99d6fd5c0ff15278e3261bb4accf71fde66fff7dc643e11ca0d873fc51d89864f0230eab9c5ee99463609494551ae157acdf WHIRLPOOL 8b7e8458e3e0e17ff89fa5a592b51ca991b7c83c28c346fda089e3f59e46647a8fadac257ad34701b0ebf27bd2c2d293a272ed4e3bc6776f1cbdaefcc4b1ae34
-EBUILD pyxplot-0.9.0.ebuild 1153 SHA256 b4d4bd776198b421478a7718042d9dc774d0cefab77878ee3ac35ac0208ca9fb SHA512 473216eccbff14701b21eef1c92085a496b43eda3406a057b15c20cc8f4fb017534bc8d512043d2b79dce5ea53d56d629cae53bd6897375650efba4b3aa570d2 WHIRLPOOL 0897c14d0cc5f8114051243835ea2a08035b04834c12d77fc75abcf06cd18c85701cc523c36cd6bfa6f6807d28d5b3807b74cc07bc4baebbc9ae24f7dc1cf270
-EBUILD pyxplot-0.9.2.ebuild 1153 SHA256 527f331a11627f46ecba58f52678f53a4b398b003b1765cdc792cdd6e3af1b96 SHA512 7274537eee0723e1eb96a71de2ac4aec174d4f41c2c4e87c742c990fcf4420f50befd1192756e78afc5e352ce2b80f171f911161ff20d1582dd7c3caeaa1ba0f WHIRLPOOL 431eb44704d4c2b0ceca8787246b5335ed62ff027d134aab9a5eec7118de0f2209177664eda5f14388adf18fce7654d8220b64e560655ad3fe284ba827b0fab2
-MISC ChangeLog 4787 SHA256 40eb22a6c8f8230bcb724ef9bb0ab3979e25de67e6b922394e786bd8b20c7053 SHA512 76460388c728f5956a8d058f552715f99925cc3133aee4e4b9ca92679752f551d38e13799c258299b42416f734a28fcd26ce4e87faab0573bf97d59691789d20 WHIRLPOOL 2b14f5fade291f4068c0ed9ecb1cd5e3e2c84ac1af1d2b1208412344465476236758812c9f4853caa8feb58952a3fe4ba9a3426398324cc560cb79ac54a7dfd0
+EBUILD pyxplot-0.9.2.ebuild 1059 SHA256 af3e0a675244cdec31dab2647acc52b23b4d7ceaed958a2aa57ae4a1c38fc9ef SHA512 d4686f0653878cf19809f9f4a29501a6c700b9946f349258d0d6716c50cecdf7b03b20c73540b0e7db9730888b1cf90920d2706226c65478ed10e83502aa9f02 WHIRLPOOL d3ecb7b4337e3caed80a233e54d24d1df9b6c7df4e19028b63cb6567f697b0551eeebfad909867d2ee69f098ca0342f630836131c62c89bd6f84e8bf3add576f
+MISC ChangeLog 4948 SHA256 7b6723478d33a59e4ab6a6e09861241117572d125f8f28836741760b6c2eb38b SHA512 f901a11143d50a352c55d345fb04e3e378b983243396e9c30fed07232b789881e8323f9433d38c65e5e712e03d1afe5fc3b09cc9584b066eb3d3165f132223c5 WHIRLPOOL bc271279534ac5c7a2dc53937f39269ae62237951770312407176deaa6b8691dfb423611a34dd6b12ddf001919cf636c198b0c471b593f064a86375b2d93f0b5
 MISC metadata.xml 463 SHA256 af4c2cc250cdbadddb1c217fb2e1feec6da9f7b7247f84c1cc760de4ed8f67fb SHA512 027509d00f61bf293d858a18280aebef6197b8c8542c0e2427ebfa20cdd1e39ae2e31f626fd518ee93c6858ef8cf131a63b7adbbe97a4320dcd4ba4924d0e31c WHIRLPOOL 31a8af68c46aad091a9761ecbab7a4361441c4b69ffdc0adc99a97c343fff614d62d73eb673126b4347a9780d6fa78a67c782c6c1b7070d2cd67249ea734fd08
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
+Version: GnuPG v2.0.20 (GNU/Linux)
 
-iEYEAREIAAYFAlDBA0UACgkQ1ycZbhPLE2Bs3gCeKNjq5SPqzoAXs+dnuwM4Kbrq
-iHQAn3jvdekf9GtWsYRvDHZuLSs6sV+W
-=tCjw
+iEYEAREIAAYFAlHliW4ACgkQ1ycZbhPLE2DMswCgn3kICvy5WFdp/r4z5U2MTv9Q
+Xi0An2md++M0IRkjR/6y8irfGktSXTl5
+=3txg
 -----END PGP SIGNATURE-----
diff --git a/sci-visualization/pyxplot/pyxplot-0.8.4.ebuild b/sci-visualization/pyxplot/pyxplot-0.8.4.ebuild
deleted file mode 100644
index 59e6e6fe3fe5..000000000000
--- a/sci-visualization/pyxplot/pyxplot-0.8.4.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-visualization/pyxplot/pyxplot-0.8.4.ebuild,v 1.5 2012/08/06 09:05:18 jlec Exp $
-
-EAPI=4
-
-PYTHON_DEPEND="2"
-
-inherit multilib python
-
-DESCRIPTION="Gnuplot like graphing program publication-quality figures"
-HOMEPAGE="http://www.pyxplot.org.uk/"
-SRC_URI="mirror://sourceforge/${PN}/${PN}_${PV}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="
-	app-text/gv
-	dev-libs/libxml2:2
-	media-libs/libpng
-	sci-libs/cfitsio
-	sci-libs/fftw:3.0
-	sci-libs/gsl
-	sci-libs/scipy
-	virtual/latex-base
-	|| ( media-gfx/imagemagick media-gfx/graphicsmagick[imagemagick] )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-pkg_setup() {
-	python_set_active_version 2
-	python_pkg_setup
-}
-
-src_prepare() {
-	sed \
-		-e 's:/local:/:' \
-		-e "s:/lib/:/$(get_libdir)/:" \
-		-e "s:\${USRDIR}/share/${PN}:/$(python_get_sitedir)/${PN}:" \
-		-e "s:/doc/${PN}:/doc/${PF}:" \
-		-i Makefile.skel || die "sed Makefile.skel failed"
-	sed -i -e 's/-ltermcap//' configure || die
-}
diff --git a/sci-visualization/pyxplot/pyxplot-0.9.0.ebuild b/sci-visualization/pyxplot/pyxplot-0.9.0.ebuild
deleted file mode 100644
index 803c3d7d9f0c..000000000000
--- a/sci-visualization/pyxplot/pyxplot-0.9.0.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-visualization/pyxplot/pyxplot-0.9.0.ebuild,v 1.2 2012/08/06 20:34:31 bicatali Exp $
-
-EAPI=4
-
-PYTHON_DEPEND="2"
-
-inherit multilib python
-
-DESCRIPTION="Gnuplot like graphing program publication-quality figures"
-HOMEPAGE="http://www.pyxplot.org.uk/"
-SRC_URI="mirror://sourceforge/${PN}/${PN}_${PV}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE=""
-
-RDEPEND="
-	app-text/gv
-	dev-libs/libxml2:2
-	media-libs/libpng
-	sci-libs/cfitsio
-	sci-libs/fftw:3.0
-	sci-libs/gsl
-	sci-libs/scipy
-	virtual/latex-base
-	|| ( media-gfx/imagemagick media-gfx/graphicsmagick[imagemagick] )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-pkg_setup() {
-	python_set_active_version 2
-	python_pkg_setup
-}
-
-src_prepare() {
-	sed \
-		-e "s:/usr/local:${EROOT}usr/:" \
-		-e "s:/lib/:/$(get_libdir)/:" \
-		-e "s:\${USRDIR}/share/${PN}:${EPREFIX}/$(python_get_sitedir)/${PN}:" \
-		-e "s:/doc/${PN}:/doc/${PF}:" \
-		-i Makefile.skel || die "sed Makefile.skel failed"
-	sed -i -e 's/-ltermcap//' configure || die
-}
diff --git a/sci-visualization/pyxplot/pyxplot-0.9.2.ebuild b/sci-visualization/pyxplot/pyxplot-0.9.2.ebuild
index c466031bcfd4..bb0518e80bde 100644
--- a/sci-visualization/pyxplot/pyxplot-0.9.2.ebuild
+++ b/sci-visualization/pyxplot/pyxplot-0.9.2.ebuild
@@ -1,12 +1,12 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-visualization/pyxplot/pyxplot-0.9.2.ebuild,v 1.1 2012/12/06 20:42:44 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-visualization/pyxplot/pyxplot-0.9.2.ebuild,v 1.2 2013/07/16 17:56:57 bicatali Exp $
 
-EAPI=4
+EAPI=5
 
-PYTHON_DEPEND="2"
+PYTHON_COMPAT=( python{2_6,2_7} )
 
-inherit multilib python
+inherit multilib python-single-r1
 
 DESCRIPTION="Gnuplot like graphing program publication-quality figures"
 HOMEPAGE="http://www.pyxplot.org.uk/"
@@ -24,22 +24,16 @@ RDEPEND="
 	sci-libs/cfitsio
 	sci-libs/fftw:3.0
 	sci-libs/gsl
-	sci-libs/scipy
+	sci-libs/scipy[${PYTHON_USEDEP}]
 	virtual/latex-base
 	|| ( media-gfx/imagemagick media-gfx/graphicsmagick[imagemagick] )"
 DEPEND="${RDEPEND}
 	virtual/pkgconfig"
 
-pkg_setup() {
-	python_set_active_version 2
-	python_pkg_setup
-}
-
 src_prepare() {
 	sed \
 		-e "s:/usr/local:${EROOT}usr/:" \
 		-e "s:/lib/:/$(get_libdir)/:" \
-		-e "s:\${USRDIR}/share/${PN}:${EPREFIX}/$(python_get_sitedir)/${PN}:" \
 		-e "s:/doc/${PN}:/doc/${PF}:" \
 		-i Makefile.skel || die "sed Makefile.skel failed"
 	sed -i -e 's/-ltermcap//' configure || die