sci-visualization/pyxplot: Version Bump, #430104; drop old

(Portage version: 2.2.0_alpha120/cvs/Linux x86_64)

4 files changed, 37 insertions, 38 deletions

diff --git a/sci-visualization/pyxplot/ChangeLog b/sci-visualization/pyxplot/ChangeLog
index 6bef224240b3..99cde10035ab 100644
--- a/sci-visualization/pyxplot/ChangeLog
+++ b/sci-visualization/pyxplot/ChangeLog
@@ -1,6 +1,12 @@
 # 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.25 2012/05/04 08:07:00 jdhore Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-visualization/pyxplot/ChangeLog,v 1.26 2012/08/06 09:05:18 jlec Exp $
+
+*pyxplot-0.9.0 (06 Aug 2012)
+
+  06 Aug 2012; Justin Lecher <jlec@gentoo.org> -pyxplot-0.8.3.ebuild,
+  pyxplot-0.8.4.ebuild, +pyxplot-0.9.0.ebuild, metadata.xml:
+  Version Bump, #430104; drop old
 
   04 May 2012; Jeff Horelick <jdhore@gentoo.org> pyxplot-0.8.3.ebuild,
   pyxplot-0.8.4.ebuild:
diff --git a/sci-visualization/pyxplot/metadata.xml b/sci-visualization/pyxplot/metadata.xml
index c38405e71531..abd2f649db45 100644
--- a/sci-visualization/pyxplot/metadata.xml
+++ b/sci-visualization/pyxplot/metadata.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>sci</herd>
-<longdescription lang="en">
+	<herd>sci</herd>
+	<longdescription lang="en">
   PyXPlot is a command-line graphing package with a simple interface
   that produces publication-quality output. Its command line interface is very
   gnuplot oriented and has actually some compatibility. The output
diff --git a/sci-visualization/pyxplot/pyxplot-0.8.4.ebuild b/sci-visualization/pyxplot/pyxplot-0.8.4.ebuild
index b1ec45a1e1ba..59e6e6fe3fe5 100644
--- a/sci-visualization/pyxplot/pyxplot-0.8.4.ebuild
+++ b/sci-visualization/pyxplot/pyxplot-0.8.4.ebuild
@@ -1,28 +1,31 @@
 # 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.4 2012/05/04 08:07:00 jdhore Exp $
+# $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
 
-EAPI="2"
 PYTHON_DEPEND="2"
 
-inherit eutils multilib python
+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="virtual/latex-base
+RDEPEND="
+	app-text/gv
+	dev-libs/libxml2:2
+	media-libs/libpng
 	sci-libs/cfitsio
 	sci-libs/fftw:3.0
-	>=sci-libs/gsl-1.10
+	sci-libs/gsl
 	sci-libs/scipy
-	media-libs/libpng
-	dev-libs/libxml2:2
-	app-text/gv
+	virtual/latex-base
 	|| ( media-gfx/imagemagick media-gfx/graphicsmagick[imagemagick] )"
 DEPEND="${RDEPEND}
 	virtual/pkgconfig"
@@ -33,16 +36,11 @@ pkg_setup() {
 }
 
 src_prepare() {
-	sed -i \
+	sed \
 		-e 's:/local:/:' \
 		-e "s:/lib/:/$(get_libdir)/:" \
 		-e "s:\${USRDIR}/share/${PN}:/$(python_get_sitedir)/${PN}:" \
 		-e "s:/doc/${PN}:/doc/${PF}:" \
-		Makefile.skel || die "sed Makefile.skel failed"
-	sed -i -e 's/-ltermcap//' configure
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed"
-	dodoc README AUTHORS ChangeLog
+		-i Makefile.skel || die "sed Makefile.skel failed"
+	sed -i -e 's/-ltermcap//' configure || die
 }
diff --git a/sci-visualization/pyxplot/pyxplot-0.8.3.ebuild b/sci-visualization/pyxplot/pyxplot-0.9.0.ebuild
index 267e4ba4058c..6d33011badd9 100644
--- a/sci-visualization/pyxplot/pyxplot-0.8.3.ebuild
+++ b/sci-visualization/pyxplot/pyxplot-0.9.0.ebuild
@@ -1,28 +1,31 @@
 # 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.3.ebuild,v 1.4 2012/05/04 08:07:00 jdhore Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-visualization/pyxplot/pyxplot-0.9.0.ebuild,v 1.1 2012/08/06 09:05:18 jlec Exp $
+
+EAPI=4
 
-EAPI="2"
 PYTHON_DEPEND="2"
 
-inherit eutils multilib python flag-o-matic
+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="virtual/latex-base
+RDEPEND="
+	app-text/gv
+	dev-libs/libxml2:2
+	media-libs/libpng
 	sci-libs/cfitsio
 	sci-libs/fftw:3.0
-	>=sci-libs/gsl-1.10
+	sci-libs/gsl
 	sci-libs/scipy
-	media-libs/libpng
-	dev-libs/libxml2:2
-	app-text/gv
+	virtual/latex-base
 	|| ( media-gfx/imagemagick media-gfx/graphicsmagick[imagemagick] )"
 DEPEND="${RDEPEND}
 	virtual/pkgconfig"
@@ -33,19 +36,11 @@ pkg_setup() {
 }
 
 src_prepare() {
-	epatch "${FILESDIR}"/${PN}-0.8.3-as-needed.patch
-	# upstream: does not work with -O1 and above
-	replace-flags -O? -O0
-	sed -i \
+	sed \
 		-e 's:/local:/:' \
 		-e "s:/lib/:/$(get_libdir)/:" \
 		-e "s:\${USRDIR}/share/${PN}:/$(python_get_sitedir)/${PN}:" \
 		-e "s:/doc/${PN}:/doc/${PF}:" \
-		Makefile.skel || die "sed Makefile.skel failed"
-	sed -i -e 's/-ltermcap//' configure
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed"
-	dodoc README AUTHORS ChangeLog
+		-i Makefile.skel || die "sed Makefile.skel failed"
+	sed -i -e 's/-ltermcap//' configure || die
 }