Bump

(Portage version: 2.2_rc86/cvs/Linux x86_64)

3 files changed, 71 insertions, 5 deletions

diff --git a/sci-visualization/pyxplot/ChangeLog b/sci-visualization/pyxplot/ChangeLog
index 05c6f3ed92ac..a1bda2e902f5 100644
--- a/sci-visualization/pyxplot/ChangeLog
+++ b/sci-visualization/pyxplot/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for sci-visualization/pyxplot
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-visualization/pyxplot/ChangeLog,v 1.20 2010/08/24 20:45:49 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-visualization/pyxplot/ChangeLog,v 1.21 2010/09/25 19:38:40 bicatali Exp $
+
+*pyxplot-0.8.3 (25 Sep 2010)
+
+  25 Sep 2010; Sébastien Fabbro <bicatali@gentoo.org>
+  -pyxplot-0.8.1.ebuild, +pyxplot-0.8.3.ebuild,
+  +files/pyxplot-0.8.3-as-needed.patch:
+  Bump
 
 *pyxplot-0.8.2 (24 Aug 2010)
 
diff --git a/sci-visualization/pyxplot/files/pyxplot-0.8.3-as-needed.patch b/sci-visualization/pyxplot/files/pyxplot-0.8.3-as-needed.patch
new file mode 100644
index 000000000000..bdb1507a888e
--- /dev/null
+++ b/sci-visualization/pyxplot/files/pyxplot-0.8.3-as-needed.patch
@@ -0,0 +1,56 @@
+--- Makefile.skel.orig	2010-09-24 14:54:19.000000000 +0100
++++ Makefile.skel	2010-09-25 20:35:30.000000000 +0100
+@@ -120,17 +120,17 @@
+ 
+ $(LOCAL_BINDIR)/pyxplot:         $(PPL_OBJECTS)
+ 	mkdir -p $(LOCAL_BINDIR)
+-	$(LINK) $(LDFLAGS) $(LIBS) $(PPL_OBJECTS)         -o $(LOCAL_BINDIR)/pyxplot
++	$(LINK) $(LDFLAGS) $(PPL_OBJECTS) $(LIBS)        -o $(LOCAL_BINDIR)/pyxplot
+ 
+ $(LOCAL_BINDIR)/debug/pyxplot:   $(PPL_OBJECTS_DEBUG)
+ 	mkdir -p $(LOCAL_BINDIR)/debug
+ 	echo "The files in this directory are binaries with debugging options enabled: they produce activity logs called 'pyxplot.log'. It should be noted that these binaries can up to ten times slower than non-debugging versions." > $(LOCAL_BINDIR)/debug/README
+-	$(LINK) $(LDFLAGS) $(LIBS) $(PPL_OBJECTS_DEBUG)   -o $(LOCAL_BINDIR)/debug/pyxplot
++	$(LINK) $(LDFLAGS) $(PPL_OBJECTS_DEBUG) $(LIBS)   -o $(LOCAL_BINDIR)/debug/pyxplot
+ 
+ $(LOCAL_BINDIR)/install/pyxplot: $(PPL_OBJECTS_INSTALL)
+ 	mkdir -p $(LOCAL_BINDIR)/install
+ 	echo "The files in this directory are binaries intended to be installed with 'make install'. They should not be used in their present location, as they contain hard-coded links to files which are created by the 'make install' step." > $(LOCAL_BINDIR)/debug/README
+-	$(LINK) $(LDFLAGS) $(LIBS) $(PPL_OBJECTS_INSTALL) -o $(LOCAL_BINDIR)/install/pyxplot
++	$(LINK) $(LDFLAGS) $(PPL_OBJECTS_INSTALL) $(LIBS) -o $(LOCAL_BINDIR)/install/pyxplot
+ 
+ #
+ # Make the pyxplot_watch binaries
+@@ -138,15 +138,15 @@
+ 
+ $(LOCAL_BINDIR)/pyxplot_watch:         $(PPLW_OBJECTS)
+ 	mkdir -p $(LOCAL_BINDIR)
+-	$(LINK) $(LDFLAGS) $(LIBS) $(PPLW_OBJECTS)         -o $(LOCAL_BINDIR)/pyxplot_watch
++	$(LINK) $(LDFLAGS) $(PPLW_OBJECTS) $(LIBS)         -o $(LOCAL_BINDIR)/pyxplot_watch
+ 
+ $(LOCAL_BINDIR)/debug/pyxplot_watch:   $(PPLW_OBJECTS_DEBUG)
+ 	mkdir -p $(LOCAL_BINDIR)/debug
+-	$(LINK) $(LDFLAGS) $(LIBS) $(PPLW_OBJECTS_DEBUG)   -o $(LOCAL_BINDIR)/debug/pyxplot_watch
++	$(LINK) $(LDFLAGS) $(PPLW_OBJECTS_DEBUG) $(LIBS)   -o $(LOCAL_BINDIR)/debug/pyxplot_watch
+ 
+ $(LOCAL_BINDIR)/install/pyxplot_watch: $(PPLW_OBJECTS_INSTALL)
+ 	mkdir -p $(LOCAL_BINDIR)/install
+-	$(LINK) $(LDFLAGS) $(LIBS) $(PPLW_OBJECTS_INSTALL) -o $(LOCAL_BINDIR)/install/pyxplot_watch
++	$(LINK) $(LDFLAGS) $(PPLW_OBJECTS_INSTALL) $(LIBS) -o $(LOCAL_BINDIR)/install/pyxplot_watch
+ 
+ #
+ # Make fits helper binaries
+@@ -154,11 +154,11 @@
+ 
+ $(LOCAL_BINDIR)/pyxplot_fitshelper:         $(FITSHELP_OBJECTS)
+ 	mkdir -p $(LOCAL_BINDIR)
+-	$(LINK) $(LDFLAGS) $(LINK_FITSIO) $(LIBS) $(FITSHELP_OBJECTS)         -o $(LOCAL_BINDIR)/pyxplot_fitshelper
++	$(LINK) $(LDFLAGS) $(FITSHELP_OBJECTS) $(LIBS) $(LINK_FITSIO)        -o $(LOCAL_BINDIR)/pyxplot_fitshelper
+ 
+ $(LOCAL_BINDIR)/install/pyxplot_fitshelper: $(FITSHELP_OBJECTS_INSTALL)
+ 	mkdir -p $(LOCAL_BINDIR)/install
+-	$(LINK) $(LDFLAGS) $(LINK_FITSIO) $(LIBS) $(FITSHELP_OBJECTS_INSTALL) -o $(LOCAL_BINDIR)/install/pyxplot_fitshelper
++	$(LINK) $(LDFLAGS) $(FITSHELP_OBJECTS_INSTALL) $(LIBS) $(LINK_FITSIO) -o $(LOCAL_BINDIR)/install/pyxplot_fitshelper
+ 
+ #
+ # Make time helper
diff --git a/sci-visualization/pyxplot/pyxplot-0.8.1.ebuild b/sci-visualization/pyxplot/pyxplot-0.8.3.ebuild
index c71b38d2a3be..2f91e8b2189b 100644
--- a/sci-visualization/pyxplot/pyxplot-0.8.1.ebuild
+++ b/sci-visualization/pyxplot/pyxplot-0.8.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-visualization/pyxplot/pyxplot-0.8.1.ebuild,v 1.2 2010/06/18 16:57:26 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-visualization/pyxplot/pyxplot-0.8.3.ebuild,v 1.1 2010/09/25 19:38:40 bicatali Exp $
 
 EAPI="2"
 PYTHON_DEPEND="2"
@@ -9,7 +9,7 @@ inherit eutils python flag-o-matic
 
 DESCRIPTION="Gnuplot like graphing program publication-quality figures"
 HOMEPAGE="http://www.pyxplot.org.uk/"
-SRC_URI="http://www.pyxplot.org.uk/src/${PN}_${PV}.tar.gz"
+SRC_URI="mirror://sourceforge/${PN}/${PN}_${PV}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
@@ -18,8 +18,10 @@ IUSE=""
 RDEPEND="virtual/latex-base
 	sci-libs/cfitsio
 	sci-libs/fftw:3.0
-	sci-libs/gsl
+	>=sci-libs/gsl-1.10
 	sci-libs/scipy
+	media-libs/libpng
+	dev-libs/libxml2
 	app-text/gv
 	|| ( media-gfx/imagemagick media-gfx/graphicsmagick[imagemagick] )"
 DEPEND="${RDEPEND}
@@ -31,7 +33,7 @@ pkg_setup() {
 }
 
 src_prepare() {
-	epatch "${FILESDIR}"/${P}-linking.patch
+	epatch "${FILESDIR}"/${PN}-0.8.3-as-needed.patch
 	# upstream: does not work with -O1 and above
 	replace-flags -O? -O0
 	sed -i \
@@ -40,6 +42,7 @@ src_prepare() {
 		-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() {