Bump

Package-Manager: portage-2.2_rc86/cvs/Linux x86_64

4 files changed, 78 insertions, 11 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/Manifest b/sci-visualization/pyxplot/Manifest
index 1b5b9186905e..bdc467b62074 100644
--- a/sci-visualization/pyxplot/Manifest
+++ b/sci-visualization/pyxplot/Manifest
@@ -3,18 +3,19 @@ Hash: SHA1
 
 AUX pyxplot-0.8.1-linking.patch 5470 RMD160 cc1b45baa23f34f90466b8b3098efef27129b494 SHA1 c46af1c5ed2087c06f78a9f07f0caf92d73658c9 SHA256 dd5952c90269a3d7ee291b9d0bf2ccd06dfe5d5d4f1324119c1a6f96eb358071
 AUX pyxplot-0.8.2-flags.patch 5228 RMD160 aeb98af44773a5cea3ea6da3e3212c044ee0159c SHA1 77c34c1a86ef6f41779a753a0187031e3f3a7e2b SHA256 a490e3856d2b56270fbc130f7f46313206e5a4c28fcb4a050e87b6f2b51337b0
+AUX pyxplot-0.8.3-as-needed.patch 3050 RMD160 cb0143dcad8be5dad822903b34959aa0fab56e18 SHA1 71ec6c70bb09b6a1078eeddf0acd6361f618806b SHA256 28371284923c92f308f16739a101a2c101349e308a5f6fb462b5045c2ad1f930
 DIST pyxplot_0.7.1.tar.gz 2439857 RMD160 f1383bbdb0b92ca0197614e835f6690475e140bf SHA1 ad69725bb6a545acd786a5084a9f29d7728d1ecc SHA256 262b4337c1fdb8e54c11eb76415b814243f6dbab28163fd1e208378d860d2a84
-DIST pyxplot_0.8.1.tar.gz 3417286 RMD160 16566263d762b8c7f9b05979b34ca077c67a3dc3 SHA1 941456676e5eb5805adc2f805f800a60ef089854 SHA256 ca8a1362b9942485e9d1b04c1b6c9e9198b64b5a414ad6d8f38c589739e65c20
 DIST pyxplot_0.8.2.tar.gz 3698885 RMD160 d962983624ab136bc4392fd42b20ebd5c870401d SHA1 a3ecb758f26ef3ceb2e7b750a77d50bdc675605b SHA256 ea6acc896a70ca4aca0effe0133be45d3e09f2077bea50dd7abd716233f5af2a
+DIST pyxplot_0.8.3.tar.gz 3478817 RMD160 73550746c463e7a5072182177aade31ac45c7429 SHA1 7698b7024f99b593239ff20331809aae6bd9ca64 SHA256 13dd3fdf2769eee682b0ee05beb9d5b5364cbf125ea85216776b7296986fe835
 EBUILD pyxplot-0.7.1.ebuild 1251 RMD160 15dcde6632e90c09dd35052bf6e1857de137667b SHA1 039766369303a646b6083df72761c7661a363083 SHA256 8433a6a128e3a3033b8f2e9a861ee9c34758c587da2869ec15d09632b5acd0b0
-EBUILD pyxplot-0.8.1.ebuild 1255 RMD160 198287ce7c7af3f2a76b881a4a67f2cbebac33f6 SHA1 20ee68f4b10b9d92b7a420efbe72c437fddc1b89 SHA256 b570a5f45ff7d13cf09e9772f47e29d4e3135284eee9f7dd3fdc5a1eb61cdeec
 EBUILD pyxplot-0.8.2.ebuild 1297 RMD160 3ebd26579e979cd0c3ad50c1fffa90c3edeae62c SHA1 0e5a8a68a568b921bd1095f254750a6b43a93f57 SHA256 c9d3857dab08990b8400933aa95714e7f685c4d554592f20cd18145d38ef0df6
-MISC ChangeLog 3519 RMD160 a6070557db41d7f9721db3f6f2ca97db0dbdd269 SHA1 075b1d2a5bfc2991fe417e11826c260ade284673 SHA256 1147585787ffd25951fa6bd101279ddf3ffaccd2556f27fd152750be0dd8d665
+EBUILD pyxplot-0.8.3.ebuild 1342 RMD160 2dc6eb502c3487788783ef2c3bd5b2a77cc4cd8c SHA1 70a15dd6b88f84a9d224ab36cdac951383cab25a SHA256 a274889d49bb39e06dddcd838af82521f8f492e053d5dc4c79cd51e4b5119b1f
+MISC ChangeLog 3700 RMD160 1140ff6da440adbaeb0b2a3817c043523287da73 SHA1 ee681fdd3c7de126b1f701d8f8f293b36be3fc93 SHA256 669215af03299acf3d5a38db7aeb0850455c59a39b989728f4da46aec45bb0ac
 MISC metadata.xml 463 RMD160 9002790a044085c85a9ef8f94e310a3f0602b667 SHA1 3f2b28ca789f28fdca734821c144549edf23ed26 SHA256 af4c2cc250cdbadddb1c217fb2e1feec6da9f7b7247f84c1cc760de4ed8f67fb
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.16 (GNU/Linux)
 
-iEYEARECAAYFAkx0OtgACgkQ1ycZbhPLE2CsSQCfVTfS8cnrpDjrAb7bZCksDnda
-vGYAoKHfnXyDWeZ2K27HVAlIQ65UVWWN
-=DZpS
+iEYEARECAAYFAkyeT8oACgkQ1ycZbhPLE2AT2ACfTkkR0AzvMFHhDajgNVmHJuof
+9DUAoJ805IWXhiwl829+kpEeP0mxz/7e
+=k4nm
 -----END PGP SIGNATURE-----
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() {