Removed virtual/tetex dependency (included in dev-python/pyx, removed old version

(Portage version: 2.1.4.4)

5 files changed, 9 insertions, 144 deletions

diff --git a/sci-visualization/pyxplot/ChangeLog b/sci-visualization/pyxplot/ChangeLog
index 7a2f1f4267a4..54ebc0ed0fe3 100644
--- a/sci-visualization/pyxplot/ChangeLog
+++ b/sci-visualization/pyxplot/ChangeLog
@@ -1,6 +1,12 @@
 # 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.9 2008/05/29 17:56:29 hawking Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-visualization/pyxplot/ChangeLog,v 1.10 2008/07/02 14:19:00 bicatali Exp $
+
+  02 Jul 2008; Sébastien Fabbro <bicatali@gentoo.org>
+  -files/0.6.3-dont-build-pyx.patch, -files/0.6.3-respect-destdir.patch,
+  -pyxplot-0.6.3.ebuild, pyxplot-0.6.3.1.ebuild:
+  Removed virtual/tetex dependency (included in dev-python/pyx, removed old
+  version
 
   29 May 2008; Ali Polatel <hawking@gentoo.org> pyxplot-0.6.3.ebuild,
   pyxplot-0.6.3.1.ebuild:
diff --git a/sci-visualization/pyxplot/files/0.6.3-dont-build-pyx.patch b/sci-visualization/pyxplot/files/0.6.3-dont-build-pyx.patch
deleted file mode 100644
index 5925b76fd1bb..000000000000
--- a/sci-visualization/pyxplot/files/0.6.3-dont-build-pyx.patch
+++ /dev/null
@@ -1,23 +0,0 @@
---- Makefile.skel.orig	2007-02-26 19:07:09.000000000 +0000
-+++ Makefile.skel	2007-03-01 22:01:06.000000000 +0000
-@@ -64,10 +64,6 @@
- 	echo "SRCDIR='${SRCDIR}'"          >> src/gp_version_install.py
- 	echo "DOCDIR='${DOCDIR}'"          >> src/gp_version_install.py
- 	echo "GHOSTVIEW='${GV_COMMAND}'"   >> 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
-@@ -78,9 +74,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-respect-destdir.patch b/sci-visualization/pyxplot/files/0.6.3-respect-destdir.patch
deleted file mode 100644
index 9d6a1ae8d7e7..000000000000
--- a/sci-visualization/pyxplot/files/0.6.3-respect-destdir.patch
+++ /dev/null
@@ -1,38 +0,0 @@
---- Makefile.skel.orig	2007-03-01 22:01:06.000000000 +0000
-+++ Makefile.skel	2007-03-02 15:23:06.000000000 +0000
-@@ -73,19 +73,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} ${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 ${SRCDIR}/__init__.py ${DESTDIR}/${BINDIR}/pyxplot
-+	rm -f ${DESTDIR}/${BINDIR}/pyxplot_watch
-+	ln -s ${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
index ea829af77495..b17959fa149a 100644
--- a/sci-visualization/pyxplot/pyxplot-0.6.3.1.ebuild
+++ b/sci-visualization/pyxplot/pyxplot-0.6.3.1.ebuild
@@ -1,6 +1,6 @@
 # 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.5 2008/05/29 17:56:29 hawking Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-visualization/pyxplot/pyxplot-0.6.3.1.ebuild,v 1.6 2008/07/02 14:19:00 bicatali Exp $
 
 inherit eutils python
 
@@ -17,11 +17,11 @@ RESTRICT="test"
 # should use xdg-utils once those are working for postcript viewers
 RDEPEND=">=dev-python/pyx-0.9
 	sci-libs/scipy
-	virtual/tetex
 	virtual/ghostscript
 	|| ( app-text/gv app-text/ggv )
 	media-gfx/imagemagick"
 DEPEND="${RDEPEND}"
+
 S="${WORKDIR}/${PN}"
 
 src_unpack() {
@@ -54,7 +54,6 @@ src_unpack() {
 	sed -i \
 		-e 's/ex_\*/{ex_,fig}\*/' \
 		Makefile.skel || die "sed examples failed"
-
 }
 
 src_compile() {
diff --git a/sci-visualization/pyxplot/pyxplot-0.6.3.ebuild b/sci-visualization/pyxplot/pyxplot-0.6.3.ebuild
deleted file mode 100644
index e826fc0aacf1..000000000000
--- a/sci-visualization/pyxplot/pyxplot-0.6.3.ebuild
+++ /dev/null
@@ -1,79 +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.ebuild,v 1.5 2008/05/29 17:56:29 hawking 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/tetex
-	virtual/ghostscript
-	|| ( app-text/gv app-text/ggv )
-	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" \
-		"${S}"/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" \
-		"${S}"/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" \
-		"${S}"/Makefile.skel || die "sed commands failed"
-
-	# install fig_init for examples to work once installed
-	sed -i \
-		-e 's/ex_\*/{ex_,fig}\*/' \
-		"${S}"/Makefile.skel || die "sed examples failed"
-
-}
-
-src_compile() {
-	# latex...
-	addwrite /var/cache/fonts
-
-	econf || die "econf failed"
-	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}
-}