Version bump

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

5 files changed, 49 insertions, 139 deletions

diff --git a/sci-visualization/pyxplot/ChangeLog b/sci-visualization/pyxplot/ChangeLog
index dc7f109f0091..0fd2d5e986f4 100644
--- a/sci-visualization/pyxplot/ChangeLog
+++ b/sci-visualization/pyxplot/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for sci-visualization/pyxplot
-# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-visualization/pyxplot/ChangeLog,v 1.12 2008/12/08 22:03:56 bicatali Exp $
+# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sci-visualization/pyxplot/ChangeLog,v 1.13 2009/11/26 20:07:50 bicatali Exp $
+
+*pyxplot-0.7.1 (26 Nov 2009)
+
+  26 Nov 2009; Sébastien Fabbro <bicatali@gentoo.org>
+  -files/0.6.3.1-dont-build-pyx.patch, -pyxplot-0.6.3.1.ebuild,
+  -files/0.6.3.1-respect-destdir.patch, +pyxplot-0.7.1.ebuild:
+  Version bump
 
   08 Dec 2008; Sébastien Fabbro <bicatali@gentoo.org>
   pyxplot-0.6.3.1.ebuild, pyxplot-0.7.0.ebuild:
diff --git a/sci-visualization/pyxplot/files/0.6.3.1-dont-build-pyx.patch b/sci-visualization/pyxplot/files/0.6.3.1-dont-build-pyx.patch
deleted file mode 100644
index ca3c94a4a7c1..000000000000
--- a/sci-visualization/pyxplot/files/0.6.3.1-dont-build-pyx.patch
+++ /dev/null
@@ -1,23 +0,0 @@
---- Makefile.skel.orig	2007-10-11 15:23:42.037242960 +0100
-+++ Makefile.skel	2007-10-11 15:27:00.832571660 +0100
-@@ -66,10 +66,6 @@
- 	echo "DOCDIR='${DOCDIR}'"          >> src/gp_version_install.py
- 	echo "GHOSTVIEW='${GV_COMMAND}'"   >> src/gp_version_install.py
- 	echo "GHOSTVIEW_OPT='${GV_OPT}'"   >> src/gp_version_install.py
--	rm -rf src/pyx
--	gzip -dc PyX-0.9.tar.gz | tar xf -
--	mv -f PyX-0.9/pyx src
--	rm -rf PyX-0.9
- 	chmod 755 src/__init__.py
- 	${MAKE_COMMAND} -s -C doc PYXPLOT=../src/__init__.py
- 	echo "exit" | src/__init__.py
-@@ -80,9 +76,6 @@
- 
- install:
- 	install -d ${SRCDIR} ${BINDIR} ${DOCDIR} ${MANDIR} ${DOCDIR}/examples ${DOCDIR}/examples/eps
--	rm -rf ${SRCDIR}/pyx
--	cp -r src/pyx ${SRCDIR}
--	chmod -R 755 ${SRCDIR}/pyx
- 	install -m644 src/*.py ${SRCDIR}
- 	install -m644 src/gp_version_install.py ${SRCDIR}/gp_version.py
- 	install -m644 src/*.pyc ${SRCDIR}
diff --git a/sci-visualization/pyxplot/files/0.6.3.1-respect-destdir.patch b/sci-visualization/pyxplot/files/0.6.3.1-respect-destdir.patch
deleted file mode 100644
index 3e3c82439a61..000000000000
--- a/sci-visualization/pyxplot/files/0.6.3.1-respect-destdir.patch
+++ /dev/null
@@ -1,38 +0,0 @@
---- Makefile.skel.orig	2007-10-11 15:52:39.973789373 +0100
-+++ Makefile.skel	2007-10-11 15:54:08.970345535 +0100
-@@ -75,19 +75,19 @@
- 	ln -s src/__init__.py pyxplot
- 
- install:
--	install -d ${SRCDIR} ${BINDIR} ${DOCDIR} ${MANDIR} ${DOCDIR}/examples ${DOCDIR}/examples/eps
--	install -m644 src/*.py ${SRCDIR}
--	install -m644 src/gp_version_install.py ${SRCDIR}/gp_version.py
--	install -m644 src/*.pyc ${SRCDIR}
--	install -m644 src/*.xml ${SRCDIR}
--	install -m755 src/__init__.py ${SRCDIR}
--	install -m755 src/pyxplot_watch ${SRCDIR}
--	rm -f ${BINDIR}/pyxplot
--	ln -s ${SRCDIR}/__init__.py ${BINDIR}/pyxplot
--	rm -f ${BINDIR}/pyxplot_watch
--	ln -s ${SRCDIR}/pyxplot_watch ${BINDIR}/pyxplot_watch
--	install -m644 doc/pyxplot.tex doc/pyxplot.pdf ${DOCDIR}
--	install -m644 doc/examples/ex_* ${DOCDIR}/examples
--	install -m644 doc/examples/eps/* ${DOCDIR}/examples/eps
--	install -m644 pyxplot.1       ${MANDIR}/pyxplot.1
--	install -m644 pyxplot_watch.1 ${MANDIR}/pyxplot_watch.1
-+	install -d ${DESTDIR}/${SRCDIR} ${DESTDIR}/${BINDIR} ${DESTDIR}/${DOCDIR} ${DESTDIR}/${MANDIR} ${DESTDIR}/${DOCDIR}/examples ${DESTDIR}/${DOCDIR}/examples/eps
-+	install -m644 src/*.py ${DESTDIR}/${SRCDIR}
-+	install -m644 src/gp_version_install.py ${DESTDIR}/${SRCDIR}/gp_version.py
-+	install -m644 src/*.pyc ${DESTDIR}/${SRCDIR}
-+	install -m644 src/*.xml ${DESTDIR}/${SRCDIR}
-+	install -m755 src/__init__.py ${DESTDIR}/${SRCDIR}
-+	install -m755 src/pyxplot_watch ${DESTDIR}/${SRCDIR}
-+	rm -f ${DESTDIR}/${BINDIR}/pyxplot
-+	ln -s ${DESTDIR}/${SRCDIR}/__init__.py ${DESTDIR}/${BINDIR}/pyxplot
-+	rm -f ${DESTDIR}/${BINDIR}/pyxplot_watch
-+	ln -s ${DESTDIR}/${SRCDIR}/pyxplot_watch ${DESTDIR}/${BINDIR}/pyxplot_watch
-+	install -m644 doc/pyxplot.tex doc/pyxplot.pdf ${DESTDIR}/${DOCDIR}
-+	install -m644 doc/examples/ex_* ${DESTDIR}/${DOCDIR}/examples
-+	install -m644 doc/examples/eps/* ${DESTDIR}/${DOCDIR}/examples/eps
-+	install -m644 pyxplot.1       ${DESTDIR}/${MANDIR}/pyxplot.1
-+	install -m644 pyxplot_watch.1 ${DESTDIR}/${MANDIR}/pyxplot_watch.1
diff --git a/sci-visualization/pyxplot/pyxplot-0.6.3.1.ebuild b/sci-visualization/pyxplot/pyxplot-0.6.3.1.ebuild
deleted file mode 100644
index 3ac78b24329c..000000000000
--- a/sci-visualization/pyxplot/pyxplot-0.6.3.1.ebuild
+++ /dev/null
@@ -1,76 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-visualization/pyxplot/pyxplot-0.6.3.1.ebuild,v 1.7 2008/12/08 22:03:56 bicatali Exp $
-
-inherit eutils python
-
-DESCRIPTION="Graphing program similar to gnuplot to produce 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=""
-# test is actually done during emake in src_compile
-RESTRICT="test"
-
-# should use xdg-utils once those are working for postcript viewers
-RDEPEND=">=dev-python/pyx-0.9
-	sci-libs/scipy
-	virtual/latex-base
-	app-text/gv
-	media-gfx/imagemagick"
-DEPEND="${RDEPEND}"
-
-S="${WORKDIR}/${PN}"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	sed -i \
-		-e "s:^\(USRDIR=\).*:\1/usr:g" \
-		-e 's:^\(MANDIR=\).*:\1${USRDIR}/share/man/man1:g' \
-		-e "s:^\(DOCDIR=\).*:\1\${USRDIR}/share/doc/${PF}:g" \
-		Makefile.skel || die "sed Makefile.skel failed"
-
-	epatch "${FILESDIR}"/${PV}-dont-build-pyx.patch
-	# Depends on dont-build-pyx.patch
-	epatch "${FILESDIR}"/${PV}-respect-destdir.patch
-
-	# It doesn't come with precompiled .pyc files,
-	# so fails if we try to install them.
-	sed -i \
-		-e "/pyc/d" \
-		Makefile.skel || die "sed pyx failed"
-
-	# allows proper commands
-	sed -i \
-		-e 's/${MAKE_COMMAND}/$(MAKE)/g' \
-		-e "s:\${PYTHON_COMMAND}:/usr/bin/python$(python_version):g" \
-		Makefile.skel || die "sed commands failed"
-
-	# install fig_init for examples to work once installed
-	sed -i \
-		-e 's/ex_\*/{ex_,fig}\*/' \
-		Makefile.skel || die "sed examples failed"
-}
-
-src_compile() {
-	econf || die "econf failed"
-	# To prevent sandbox violations by metafont
-	VARTEXFONTS="${T}"/fonts emake -j1 || die "emake failed"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed"
-	dodoc README AUTHORS ChangeLog || die "dodoc failed"
-}
-
-pkg_postinst() {
-	python_mod_optimize /usr/share/${PN}
-}
-
-pkg_postrm() {
-	python_mod_cleanup /usr/share/${PN}
-}
diff --git a/sci-visualization/pyxplot/pyxplot-0.7.1.ebuild b/sci-visualization/pyxplot/pyxplot-0.7.1.ebuild
new file mode 100644
index 000000000000..53075e005a7e
--- /dev/null
+++ b/sci-visualization/pyxplot/pyxplot-0.7.1.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sci-visualization/pyxplot/pyxplot-0.7.1.ebuild,v 1.1 2009/11/26 20:07:50 bicatali Exp $
+
+EAPI=2
+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"
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="virtual/latex-base
+	sci-libs/scipy
+	app-text/gv
+	|| ( media-gfx/imagemagick media-gfx/graphicsmagick[imagemagick] )"
+DEPEND="${RDEPEND}"
+
+S="${WORKDIR}/${PN}"
+
+src_prepare() {
+	python_version
+	sed -i \
+		-e "s:^\(USRDIR=\).*:\1/usr:g" \
+		-e "s:^\(SRCDIR=\).*:\1/usr/$(get_libdir)/python${PYVER}/${PN}:g" \
+		-e 's:^\(MANDIR=\).*:\1${USRDIR}/share/man/man1:g' \
+		-e "s:^\(DOCDIR=\).*:\1\${USRDIR}/share/doc/${PF}:g" \
+		-e '/install:/,$s:${\(SRC\|BIN\|DOC\|MAN\)DIR:${DESTDIR}/${\1DIR:g' \
+		-e "/pyc/d" \
+		-e 's/ex_\*/{ex_,fig}\*/' \
+		Makefile.skel || die "sed Makefile.skel failed"
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die "emake install failed"
+	dodoc README AUTHORS ChangeLog
+}