Version bump

Package-Manager: portage-2.1.9.35/cvs/Linux x86_64

5 files changed, 21 insertions, 234 deletions

diff --git a/sci-visualization/pyxplot/ChangeLog b/sci-visualization/pyxplot/ChangeLog
index a1bda2e902f5..207d66347632 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.21 2010/09/25 19:38:40 bicatali Exp $
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sci-visualization/pyxplot/ChangeLog,v 1.22 2011/01/26 22:49:47 bicatali Exp $
+
+*pyxplot-0.8.4 (26 Jan 2011)
+
+  26 Jan 2011; Sébastien Fabbro <bicatali@gentoo.org>
+  -files/pyxplot-0.8.1-linking.patch, -pyxplot-0.8.2.ebuild,
+  -files/pyxplot-0.8.2-flags.patch, +pyxplot-0.8.4.ebuild:
+  Version bump
 
 *pyxplot-0.8.3 (25 Sep 2010)
 
diff --git a/sci-visualization/pyxplot/Manifest b/sci-visualization/pyxplot/Manifest
index bdc467b62074..efa196382c90 100644
--- a/sci-visualization/pyxplot/Manifest
+++ b/sci-visualization/pyxplot/Manifest
@@ -1,21 +1,19 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 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.2.tar.gz 3698885 RMD160 d962983624ab136bc4392fd42b20ebd5c870401d SHA1 a3ecb758f26ef3ceb2e7b750a77d50bdc675605b SHA256 ea6acc896a70ca4aca0effe0133be45d3e09f2077bea50dd7abd716233f5af2a
 DIST pyxplot_0.8.3.tar.gz 3478817 RMD160 73550746c463e7a5072182177aade31ac45c7429 SHA1 7698b7024f99b593239ff20331809aae6bd9ca64 SHA256 13dd3fdf2769eee682b0ee05beb9d5b5364cbf125ea85216776b7296986fe835
+DIST pyxplot_0.8.4.tar.gz 3847286 RMD160 4d7aa44c8e10446df236b4367512fd452e4a42e3 SHA1 bb606df7bbc9bb19245636c42cd5550b14d30d94 SHA256 3658a36c8167e558e06b6ce288d384cd3354414281cb68fda4ee41f87b84dee3
 EBUILD pyxplot-0.7.1.ebuild 1251 RMD160 15dcde6632e90c09dd35052bf6e1857de137667b SHA1 039766369303a646b6083df72761c7661a363083 SHA256 8433a6a128e3a3033b8f2e9a861ee9c34758c587da2869ec15d09632b5acd0b0
-EBUILD pyxplot-0.8.2.ebuild 1297 RMD160 3ebd26579e979cd0c3ad50c1fffa90c3edeae62c SHA1 0e5a8a68a568b921bd1095f254750a6b43a93f57 SHA256 c9d3857dab08990b8400933aa95714e7f685c4d554592f20cd18145d38ef0df6
 EBUILD pyxplot-0.8.3.ebuild 1342 RMD160 2dc6eb502c3487788783ef2c3bd5b2a77cc4cd8c SHA1 70a15dd6b88f84a9d224ab36cdac951383cab25a SHA256 a274889d49bb39e06dddcd838af82521f8f492e053d5dc4c79cd51e4b5119b1f
-MISC ChangeLog 3700 RMD160 1140ff6da440adbaeb0b2a3817c043523287da73 SHA1 ee681fdd3c7de126b1f701d8f8f293b36be3fc93 SHA256 669215af03299acf3d5a38db7aeb0850455c59a39b989728f4da46aec45bb0ac
+EBUILD pyxplot-0.8.4.ebuild 1210 RMD160 af5d0dc713ad0dfad50d4299b488ef339acae7cf SHA1 07e5f3fe1fb036b0ef38b8f45b73274692281e06 SHA256 de9de428ccbb4094b1bd7b26ca54fd51933ce78ae59378e32a7b7bbfdc42731f
+MISC ChangeLog 3921 RMD160 fcacefc160a7d8b663e9a4e5a530a101971cf132 SHA1 1191c9433eda32baafcf77cf2b890c4a3c94501d SHA256 59b97d3233587d1f6baf5365d95634258df38572f6a29441d22067130d40a62d
 MISC metadata.xml 463 RMD160 9002790a044085c85a9ef8f94e310a3f0602b667 SHA1 3f2b28ca789f28fdca734821c144549edf23ed26 SHA256 af4c2cc250cdbadddb1c217fb2e1feec6da9f7b7247f84c1cc760de4ed8f67fb
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.16 (GNU/Linux)
+Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEARECAAYFAkyeT8oACgkQ1ycZbhPLE2AT2ACfTkkR0AzvMFHhDajgNVmHJuof
-9DUAoJ805IWXhiwl829+kpEeP0mxz/7e
-=k4nm
+iEYEARECAAYFAk1ApRQACgkQ1ycZbhPLE2DI6ACeMHbVvTl3KN1gJhzyjRlPXUUm
+U94AnR+M5qpY1IBYA+HPXMPb/Sx3LkWk
+=jeZm
 -----END PGP SIGNATURE-----
diff --git a/sci-visualization/pyxplot/files/pyxplot-0.8.1-linking.patch b/sci-visualization/pyxplot/files/pyxplot-0.8.1-linking.patch
deleted file mode 100644
index cc96de257889..000000000000
--- a/sci-visualization/pyxplot/files/pyxplot-0.8.1-linking.patch
+++ /dev/null
@@ -1,113 +0,0 @@
---- Makefile.skel.orig	2010-06-12 16:42:31.000000000 +0100
-+++ Makefile.skel	2010-06-12 16:54:10.000000000 +0100
-@@ -39,12 +39,10 @@
- VERSION = 0.8.1
- DATE    = 01/06/2010
- 
--COMPILE = $(CC) -Wall -g `xml2-config --cflags` `gsl-config --cflags` -c -I $(CWD)/src
--LINK    = $(CC) -Wall -g `xml2-config --libs`   `gsl-config --libs`   -lm $(LINK_FFTW) $(LINK_READLINE) -lz -lpng -lkpathsea
-+COMPILE = $(CC) -Wall `xml2-config --cflags` `pkg-config --cflags gsl cfitsio` -c -I $(CWD)/src
-+LIBS    = `xml2-config --libs` `pkg-config --libs gsl` $(LINK_FFTW) $(LINK_READLINE) -lm -lz -lpng -lkpathsea
- 
--OPTIMISATION = -O0
--
--DEBUG   = -D DEBUG=1 -D MEMDEBUG1=1 -D MEMDEBUG2=0
-+DEBUG   = -g -D DEBUG=1 -D MEMDEBUG1=1 -D MEMDEBUG2=0
- NODEBUG = -D DEBUG=0 -D MEMDEBUG1=0 -D MEMDEBUG2=0
- 
- LOCAL_SRCDIR = src
-@@ -101,15 +99,15 @@
- 
- $(LOCAL_OBJDIR)/%.o:         $(LOCAL_SRCDIR)/%.c $(ALL_HFILES)
- 	mkdir -p $(LOCAL_OBJDIR) $(LOCAL_OBJDIR)/EPSMaker $(LOCAL_OBJDIR)/Helpers $(LOCAL_OBJDIR)/ListTools $(LOCAL_OBJDIR)/MathsTools $(LOCAL_OBJDIR)/StringTools 
--	$(COMPILE) $(OPTIMISATION) $(NODEBUG) $(NOINSTALL_SWITCHES) $< -o $@
-+	$(COMPILE) $(CFLAGS) $(NODEBUG) $(NOINSTALL_SWITCHES) $< -o $@
- 
- $(LOCAL_OBJDIR)/%.debug.o:   $(LOCAL_SRCDIR)/%.c $(ALL_HFILES)
- 	mkdir -p $(LOCAL_OBJDIR) $(LOCAL_OBJDIR)/EPSMaker $(LOCAL_OBJDIR)/Helpers $(LOCAL_OBJDIR)/ListTools $(LOCAL_OBJDIR)/MathsTools $(LOCAL_OBJDIR)/StringTools
--	$(COMPILE) $(OPTIMISATION) $(DEBUG)   $(DEBUG_SWITCHES)     $< -o $@
-+	$(COMPILE) $(CFLAGS) $(DEBUG)   $(DEBUG_SWITCHES)     $< -o $@
- 
- $(LOCAL_OBJDIR)/%.install.o: $(LOCAL_SRCDIR)/%.c $(ALL_HFILES)
- 	mkdir -p $(LOCAL_OBJDIR) $(LOCAL_OBJDIR)/EPSMaker $(LOCAL_OBJDIR)/Helpers $(LOCAL_OBJDIR)/ListTools $(LOCAL_OBJDIR)/MathsTools $(LOCAL_OBJDIR)/StringTools
--	$(COMPILE) $(OPTIMISATION) $(NODEBUG) $(INSTALL_SWITCHES)   $< -o $@
-+	$(COMPILE) $(CFLAGS) $(NODEBUG) $(INSTALL_SWITCHES)   $< -o $@
- 
- #
- # Make the pyxplot binaries
-@@ -117,17 +115,17 @@
- 
- $(LOCAL_BINDIR)/pyxplot:         $(PPL_OBJECTS)
- 	mkdir -p $(LOCAL_BINDIR)
--	$(LINK) $(OPTIMISATION) $(PPL_OBJECTS)         -o $(LOCAL_BINDIR)/pyxplot
-+	$(CC) $(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) $(OPTIMISATION) $(PPL_OBJECTS_DEBUG)   -o $(LOCAL_BINDIR)/debug/pyxplot
-+	$(CC) $(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) $(OPTIMISATION) $(PPL_OBJECTS_INSTALL) -o $(LOCAL_BINDIR)/install/pyxplot
-+	$(CC) $(LDFLAGS) $(PPL_OBJECTS_INSTALL) $(LIBS) -o $(LOCAL_BINDIR)/install/pyxplot
- 
- #
- # Make the pyxplot_watch binaries
-@@ -135,15 +133,15 @@
- 
- $(LOCAL_BINDIR)/pyxplot_watch:         $(PPLW_OBJECTS)
- 	mkdir -p $(LOCAL_BINDIR)
--	$(LINK) $(OPTIMISATION) $(PPLW_OBJECTS)         -o $(LOCAL_BINDIR)/pyxplot_watch
-+	$(CC) $(LDFLAGS) $(PPLW_OBJECTS) $(LIBS) -o $(LOCAL_BINDIR)/pyxplot_watch
- 
- $(LOCAL_BINDIR)/debug/pyxplot_watch:   $(PPLW_OBJECTS_DEBUG)
- 	mkdir -p $(LOCAL_BINDIR)/debug
--	$(LINK) $(OPTIMISATION) $(PPLW_OBJECTS_DEBUG)   -o $(LOCAL_BINDIR)/debug/pyxplot_watch
-+	$(CC) $(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) $(OPTIMISATION) $(PPLW_OBJECTS_INSTALL) -o $(LOCAL_BINDIR)/install/pyxplot_watch
-+	$(CC) $(LDFLAGS) $(PPLW_OBJECTS_INSTALL) $(LIBS) -o $(LOCAL_BINDIR)/install/pyxplot_watch
- 
- #
- # Make fits helper binaries
-@@ -151,11 +149,11 @@
- 
- $(LOCAL_BINDIR)/pyxplot_fitshelper:         $(FITSHELP_OBJECTS)
- 	mkdir -p $(LOCAL_BINDIR)
--	$(LINK) $(LINK_FITSIO) $(OPTIMISATION) $(FITSHELP_OBJECTS)         -o $(LOCAL_BINDIR)/pyxplot_fitshelper
-+	$(CC) $(LDFLAGS) $(FITSHELP_OBJECTS) $(LINK_FITSIO) $(LIBS) -o $(LOCAL_BINDIR)/pyxplot_fitshelper
- 
- $(LOCAL_BINDIR)/install/pyxplot_fitshelper: $(FITSHELP_OBJECTS_INSTALL)
- 	mkdir -p $(LOCAL_BINDIR)/install
--	$(LINK) $(LINK_FITSIO) $(OPTIMISATION) $(FITSHELP_OBJECTS_INSTALL) -o $(LOCAL_BINDIR)/install/pyxplot_fitshelper
-+	$(CC) $(LDFLAGS) $(FITSHELP_OBJECTS_INSTALL) $(LINK_FITSIO) $(LIBS) -o $(LOCAL_BINDIR)/install/pyxplot_fitshelper
- 
- #
- # Make time helper
---- configure.orig	2010-06-12 16:42:24.000000000 +0100
-+++ configure	2010-06-12 16:55:52.000000000 +0100
-@@ -185,7 +185,7 @@
-  rm -f conf.*
-  echo "YES"
-  echo "HAVE_READLINE=-D HAVE_READLINE=1" >> Makefile
-- echo "LINK_READLINE=-ltermcap -lreadline" >> Makefile
-+ echo "LINK_READLINE=-lreadline" >> Makefile
- else
-  rm -f conf.*
-  echo "NO"
-@@ -200,8 +200,8 @@
- then
-  rm -f conf.*
-  echo "YES"
-- echo "HAVE_FITSIO=-D HAVE_FITSIO=1" >> Makefile
-- echo "LINK_FITSIO=-lcfitsio" >> Makefile
-+ echo "HAVE_FITSIO=-D HAVE_FITSIO=1 `pkg-config --cflags cfitsio`" >> Makefile
-+ echo "LINK_FITSIO=`pkg-config --libs cfitsio`" >> Makefile
- else
-  rm -f conf.*
-  echo "NO"
diff --git a/sci-visualization/pyxplot/files/pyxplot-0.8.2-flags.patch b/sci-visualization/pyxplot/files/pyxplot-0.8.2-flags.patch
deleted file mode 100644
index 85a2f7a90f38..000000000000
--- a/sci-visualization/pyxplot/files/pyxplot-0.8.2-flags.patch
+++ /dev/null
@@ -1,103 +0,0 @@
---- Makefile.skel.orig	2010-08-24 22:15:23.000000000 +0100
-+++ Makefile.skel	2010-08-24 22:29:21.000000000 +0100
-@@ -39,12 +39,13 @@
- VERSION = 0.8.2
- DATE    = 04/08/2010
- 
--COMPILE = $(CC) -Wall -g `xml2-config --cflags` `gsl-config --cflags` -c -I $(CWD)/src
--LINK    = $(CC) -Wall -g `xml2-config --libs`   `gsl-config --libs`   -lm $(LINK_FFTW) $(LINK_READLINE) -lz -lpng $(LINK_KPATHSEA)
-+COMPILE = $(CC) -Wall `xml2-config --cflags` `pkg-config --cflags cfitsio gsl` -c -I $(CWD)/src
-+LIBS    = `xml2-config --libs`   `pkg-config --libs cfitsio gsl`   -lm $(LINK_FFTW) $(LINK_READLINE) -lz -lpng $(LINK_KPATHSEA)
-+LINK = $(CC)
- 
- OPTIMISATION = -O0
- 
--DEBUG   = -D DEBUG=1 -D MEMDEBUG1=1 -D MEMDEBUG2=0
-+DEBUG   = -g -D DEBUG=1 -D MEMDEBUG1=1 -D MEMDEBUG2=0
- NODEBUG = -D DEBUG=0 -D MEMDEBUG1=0 -D MEMDEBUG2=0
- 
- LOCAL_SRCDIR = src
-@@ -101,15 +102,15 @@
- 
- $(LOCAL_OBJDIR)/%.o:         $(LOCAL_SRCDIR)/%.c $(ALL_HFILES)
- 	mkdir -p $(LOCAL_OBJDIR) $(LOCAL_OBJDIR)/EPSMaker $(LOCAL_OBJDIR)/Helpers $(LOCAL_OBJDIR)/ListTools $(LOCAL_OBJDIR)/MathsTools $(LOCAL_OBJDIR)/StringTools 
--	$(COMPILE) $(OPTIMISATION) $(NODEBUG) $(NOINSTALL_SWITCHES) $< -o $@
-+	$(COMPILE) $(CFLAGS) $(NODEBUG) $(NOINSTALL_SWITCHES) $< -o $@
- 
- $(LOCAL_OBJDIR)/%.debug.o:   $(LOCAL_SRCDIR)/%.c $(ALL_HFILES)
- 	mkdir -p $(LOCAL_OBJDIR) $(LOCAL_OBJDIR)/EPSMaker $(LOCAL_OBJDIR)/Helpers $(LOCAL_OBJDIR)/ListTools $(LOCAL_OBJDIR)/MathsTools $(LOCAL_OBJDIR)/StringTools
--	$(COMPILE) $(OPTIMISATION) $(DEBUG)   $(DEBUG_SWITCHES)     $< -o $@
-+	$(COMPILE) $(CFLAGS) $(DEBUG)   $(DEBUG_SWITCHES)     $< -o $@
- 
- $(LOCAL_OBJDIR)/%.install.o: $(LOCAL_SRCDIR)/%.c $(ALL_HFILES)
- 	mkdir -p $(LOCAL_OBJDIR) $(LOCAL_OBJDIR)/EPSMaker $(LOCAL_OBJDIR)/Helpers $(LOCAL_OBJDIR)/ListTools $(LOCAL_OBJDIR)/MathsTools $(LOCAL_OBJDIR)/StringTools
--	$(COMPILE) $(OPTIMISATION) $(NODEBUG) $(INSTALL_SWITCHES)   $< -o $@
-+	$(COMPILE) $(CFLAGS) $(NODEBUG) $(INSTALL_SWITCHES)   $< -o $@
- 
- #
- # Make the pyxplot binaries
-@@ -117,17 +118,17 @@
- 
- $(LOCAL_BINDIR)/pyxplot:         $(PPL_OBJECTS)
- 	mkdir -p $(LOCAL_BINDIR)
--	$(LINK) $(OPTIMISATION) $(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) $(OPTIMISATION) $(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) $(OPTIMISATION) $(PPL_OBJECTS_INSTALL) -o $(LOCAL_BINDIR)/install/pyxplot
-+	$(LINK) $(LDFLAGS) $(PPL_OBJECTS_INSTALL) $(LIBS) -o $(LOCAL_BINDIR)/install/pyxplot
- 
- #
- # Make the pyxplot_watch binaries
-@@ -135,15 +136,15 @@
- 
- $(LOCAL_BINDIR)/pyxplot_watch:         $(PPLW_OBJECTS)
- 	mkdir -p $(LOCAL_BINDIR)
--	$(LINK) $(OPTIMISATION) $(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) $(OPTIMISATION) $(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) $(OPTIMISATION) $(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
-@@ -151,11 +152,11 @@
- 
- $(LOCAL_BINDIR)/pyxplot_fitshelper:         $(FITSHELP_OBJECTS)
- 	mkdir -p $(LOCAL_BINDIR)
--	$(LINK) $(LINK_FITSIO) $(OPTIMISATION) $(FITSHELP_OBJECTS)         -o $(LOCAL_BINDIR)/pyxplot_fitshelper
-+	$(LINK) $(LDFLAGS) $(FITSHELP_OBJECTS) $(LINK_FITSIO) $(LIBS)          -o $(LOCAL_BINDIR)/pyxplot_fitshelper
- 
- $(LOCAL_BINDIR)/install/pyxplot_fitshelper: $(FITSHELP_OBJECTS_INSTALL)
- 	mkdir -p $(LOCAL_BINDIR)/install
--	$(LINK) $(LINK_FITSIO) $(OPTIMISATION) $(FITSHELP_OBJECTS_INSTALL) -o $(LOCAL_BINDIR)/install/pyxplot_fitshelper
-+	$(LINK) $(LDFLAGS) $(FITSHELP_OBJECTS_INSTALL) $(LINK_FITSIO) $(LIBS) -o $(LOCAL_BINDIR)/install/pyxplot_fitshelper
- 
- #
- # Make time helper
---- configure.orig	2010-08-24 22:29:10.000000000 +0100
-+++ configure	2010-08-24 22:29:37.000000000 +0100
-@@ -197,7 +197,7 @@
-  rm -f conf.*
-  echo "YES"
-  echo "HAVE_READLINE=-D HAVE_READLINE=1" >> Makefile
-- echo "LINK_READLINE=-ltermcap -lreadline" >> Makefile
-+ echo "LINK_READLINE=-lreadline" >> Makefile
- else
-  rm -f conf.*
-  echo "NO"
diff --git a/sci-visualization/pyxplot/pyxplot-0.8.2.ebuild b/sci-visualization/pyxplot/pyxplot-0.8.4.ebuild
index 4333ae550c71..d369c5032957 100644
--- a/sci-visualization/pyxplot/pyxplot-0.8.2.ebuild
+++ b/sci-visualization/pyxplot/pyxplot-0.8.4.ebuild
@@ -1,15 +1,15 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-visualization/pyxplot/pyxplot-0.8.2.ebuild,v 1.1 2010/08/24 20:45:49 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-visualization/pyxplot/pyxplot-0.8.4.ebuild,v 1.1 2011/01/26 22:49:47 bicatali Exp $
 
 EAPI="2"
 PYTHON_DEPEND="2"
 
-inherit eutils python flag-o-matic
+inherit eutils python
 
 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"
@@ -33,15 +33,13 @@ pkg_setup() {
 }
 
 src_prepare() {
-	epatch "${FILESDIR}"/${P}-flags.patch
-	# upstream: does not work with -O1 and above
-	replace-flags -O? -O0
 	sed -i \
 		-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() {