Switch to python-r1, removed old

(Portage version: 2.2.01.22124-prefix/cvs/Linux x86_64, signed Manifest commit with key 0x13CB1360)

4 files changed, 12 insertions, 106 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/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