Version bump

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

3 files changed, 160 insertions, 1 deletions

diff --git a/sci-visualization/pyxplot/ChangeLog b/sci-visualization/pyxplot/ChangeLog
index 44f38c42140d..05c6f3ed92ac 100644
--- a/sci-visualization/pyxplot/ChangeLog
+++ b/sci-visualization/pyxplot/ChangeLog
@@ -1,6 +1,12 @@
 # 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.19 2010/06/18 16:57:26 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-visualization/pyxplot/ChangeLog,v 1.20 2010/08/24 20:45:49 bicatali Exp $
+
+*pyxplot-0.8.2 (24 Aug 2010)
+
+  24 Aug 2010; Sébastien Fabbro <bicatali@gentoo.org>
+  +pyxplot-0.8.2.ebuild, +files/pyxplot-0.8.2-flags.patch:
+  Version bump
 
   18 Jun 2010; Sébastien Fabbro <bicatali@gentoo.org> pyxplot-0.8.1.ebuild:
   Filtering -O0 and above from upstream recommendation
diff --git a/sci-visualization/pyxplot/files/pyxplot-0.8.2-flags.patch b/sci-visualization/pyxplot/files/pyxplot-0.8.2-flags.patch
new file mode 100644
index 000000000000..85a2f7a90f38
--- /dev/null
+++ b/sci-visualization/pyxplot/files/pyxplot-0.8.2-flags.patch
@@ -0,0 +1,103 @@
+--- 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.2.ebuild
new file mode 100644
index 000000000000..4333ae550c71
--- /dev/null
+++ b/sci-visualization/pyxplot/pyxplot-0.8.2.ebuild
@@ -0,0 +1,50 @@
+# 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.2.ebuild,v 1.1 2010/08/24 20:45:49 bicatali Exp $
+
+EAPI="2"
+PYTHON_DEPEND="2"
+
+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"
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="virtual/latex-base
+	sci-libs/cfitsio
+	sci-libs/fftw:3.0
+	>=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}
+	dev-util/pkgconfig"
+
+pkg_setup() {
+	python_set_active_version 2
+	python_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"
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die "emake install failed"
+	dodoc README AUTHORS ChangeLog
+}