Version bump

(Portage version: 2.1.9.35/cvs/Linux x86_64)

4 files changed, 14 insertions, 225 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/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() {