diff options
Diffstat (limited to 'sci-visualization/pyxplot')
-rw-r--r-- | sci-visualization/pyxplot/ChangeLog | 10 | ||||
-rw-r--r-- | sci-visualization/pyxplot/files/0.5.8-dont-build-pyx.patch | 23 | ||||
-rw-r--r-- | sci-visualization/pyxplot/files/0.6.3.1-dont-build-pyx.patch | 23 | ||||
-rw-r--r-- | sci-visualization/pyxplot/files/0.6.3.1-respect-destdir.patch (renamed from sci-visualization/pyxplot/files/0.5.8-respect-destdir.patch) | 28 | ||||
-rw-r--r-- | sci-visualization/pyxplot/files/digest-pyxplot-0.5.8 | 3 | ||||
-rw-r--r-- | sci-visualization/pyxplot/files/digest-pyxplot-0.6.3.1 | 3 | ||||
-rw-r--r-- | sci-visualization/pyxplot/pyxplot-0.6.3.1.ebuild (renamed from sci-visualization/pyxplot/pyxplot-0.5.8.ebuild) | 32 | ||||
-rw-r--r-- | sci-visualization/pyxplot/pyxplot-0.6.3.ebuild | 12 |
8 files changed, 82 insertions, 52 deletions
diff --git a/sci-visualization/pyxplot/ChangeLog b/sci-visualization/pyxplot/ChangeLog index 2ebbdfb30e39..12b5eedbbb7a 100644 --- a/sci-visualization/pyxplot/ChangeLog +++ b/sci-visualization/pyxplot/ChangeLog @@ -1,6 +1,14 @@ # ChangeLog for sci-visualization/pyxplot # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sci-visualization/pyxplot/ChangeLog,v 1.5 2007/03/14 11:02:56 bicatali Exp $ +# $Header: /var/cvsroot/gentoo-x86/sci-visualization/pyxplot/ChangeLog,v 1.6 2007/10/11 15:21:51 bicatali Exp $ + +*pyxplot-0.6.3.1 (11 Oct 2007) + + 11 Oct 2007; Sébastien Fabbro <bicatali@gentoo.org> + -files/0.5.8-respect-destdir.patch, +files/0.6.3.1-dont-build-pyx.patch, + -files/0.5.8-dont-build-pyx.patch, +files/0.6.3.1-respect-destdir.patch, + -pyxplot-0.5.8.ebuild, pyxplot-0.6.3.ebuild, +pyxplot-0.6.3.1.ebuild: + Version bump + quotes cleaning. *pyxplot-0.6.3 (02 Mar 2007) diff --git a/sci-visualization/pyxplot/files/0.5.8-dont-build-pyx.patch b/sci-visualization/pyxplot/files/0.5.8-dont-build-pyx.patch deleted file mode 100644 index 6f17ce70a3c3..000000000000 --- a/sci-visualization/pyxplot/files/0.5.8-dont-build-pyx.patch +++ /dev/null @@ -1,23 +0,0 @@ ---- Makefile.skel.orig 2006-09-20 21:57:01.000000000 -0700 -+++ Makefile.skel 2006-09-20 21:57:17.000000000 -0700 -@@ -35,10 +35,6 @@ - echo -e "DATE='${DATE}'" >> src/gp_version.py - echo -e "SRCDIR='${SRCDIR}'" >> src/gp_version.py - echo -e "GHOSTVIEW='${GV_COMMAND}'" >> src/gp_version.py -- rm -rf src/pyx -- tar xzf PyX-0.9.tar.gz -- mv PyX-0.9/pyx src -- rm -rf PyX-0.9 - chmod 755 src/__init__.py - make -s -C doc PYXPLOT=../src/__init__.py - echo "exit" | src/__init__.py -@@ -46,9 +42,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/*.pyc ${SRCDIR} - install -m644 src/*.xml ${SRCDIR} 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 new file mode 100644 index 000000000000..ca3c94a4a7c1 --- /dev/null +++ b/sci-visualization/pyxplot/files/0.6.3.1-dont-build-pyx.patch @@ -0,0 +1,23 @@ +--- 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.5.8-respect-destdir.patch b/sci-visualization/pyxplot/files/0.6.3.1-respect-destdir.patch index 76c645887a41..3e3c82439a61 100644 --- a/sci-visualization/pyxplot/files/0.5.8-respect-destdir.patch +++ b/sci-visualization/pyxplot/files/0.6.3.1-respect-destdir.patch @@ -1,13 +1,12 @@ -Depends on 0.5.8-dont-build-pyx.patch - ---- Makefile.skel.orig 2006-09-20 22:04:50.000000000 -0700 -+++ Makefile.skel 2006-09-20 22:04:22.000000000 -0700 -@@ -41,17 +41,17 @@ - python manpage.py ${DOCDIR}/pyxplot.pdf > pyxplot.1 +--- 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} @@ -17,20 +16,23 @@ Depends on 0.5.8-dont-build-pyx.patch - 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/example* ${DOCDIR}/examples +- install -m644 doc/examples/ex_* ${DOCDIR}/examples - install -m644 doc/examples/eps/* ${DOCDIR}/examples/eps -- install -m644 pyxplot.1 ${MANDIR}/pyxplot.1 -+ install -d ${DESTDIR} ${DESTDIR}/${SRCDIR} ${DESTDIR}/${BINDIR} ${DESTDIR}/${DOCDIR} ${DESTDIR}/${MANDIR} ${DESTDIR}/${DOCDIR}/examples ${DESTDIR}/${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 ${SRCDIR}/__init__.py ${DESTDIR}/${BINDIR}/pyxplot ++ ln -s ${DESTDIR}/${SRCDIR}/__init__.py ${DESTDIR}/${BINDIR}/pyxplot + rm -f ${DESTDIR}/${BINDIR}/pyxplot_watch -+ ln -s ${SRCDIR}/pyxplot_watch ${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/example* ${DESTDIR}/${DOCDIR}/examples ++ 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.1 ${DESTDIR}/${MANDIR}/pyxplot.1 ++ install -m644 pyxplot_watch.1 ${DESTDIR}/${MANDIR}/pyxplot_watch.1 diff --git a/sci-visualization/pyxplot/files/digest-pyxplot-0.5.8 b/sci-visualization/pyxplot/files/digest-pyxplot-0.5.8 deleted file mode 100644 index e3df53484b14..000000000000 --- a/sci-visualization/pyxplot/files/digest-pyxplot-0.5.8 +++ /dev/null @@ -1,3 +0,0 @@ -MD5 80cc02e734cc586dcb381c9d14d47248 pyxplot_0.5.8.tar.gz 519766 -RMD160 6b94e740412da9ef48f5002372421fc4994759e8 pyxplot_0.5.8.tar.gz 519766 -SHA256 7d9cbdfeca913ca7ca439f87818aed7e08dc182772cd58e9474bf913b0be5d8f pyxplot_0.5.8.tar.gz 519766 diff --git a/sci-visualization/pyxplot/files/digest-pyxplot-0.6.3.1 b/sci-visualization/pyxplot/files/digest-pyxplot-0.6.3.1 new file mode 100644 index 000000000000..946a7b3477b7 --- /dev/null +++ b/sci-visualization/pyxplot/files/digest-pyxplot-0.6.3.1 @@ -0,0 +1,3 @@ +MD5 925fdd4c7f4ad72826da828b04639a95 pyxplot_0.6.3.1.tar.gz 838500 +RMD160 a4010822ed223e045fa248b4f6cb84c579106313 pyxplot_0.6.3.1.tar.gz 838500 +SHA256 9dab7ea79e7fcbe800ea682915b685d47267a19ce09a6ffa9850ebafc8800b79 pyxplot_0.6.3.1.tar.gz 838500 diff --git a/sci-visualization/pyxplot/pyxplot-0.5.8.ebuild b/sci-visualization/pyxplot/pyxplot-0.6.3.1.ebuild index adb0030d2c75..71b00fb3432a 100644 --- a/sci-visualization/pyxplot/pyxplot-0.5.8.ebuild +++ b/sci-visualization/pyxplot/pyxplot-0.6.3.1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2007 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sci-visualization/pyxplot/pyxplot-0.5.8.ebuild,v 1.3 2007/02/19 12:53:16 bicatali Exp $ +# $Header: /var/cvsroot/gentoo-x86/sci-visualization/pyxplot/pyxplot-0.6.3.1.ebuild,v 1.1 2007/10/11 15:21:51 bicatali Exp $ inherit eutils python @@ -11,6 +11,10 @@ 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 @@ -23,11 +27,13 @@ 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 + 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 @@ -36,7 +42,19 @@ src_unpack() { # so fails if we try to install them. sed -i \ -e "/pyc/d" \ - "${S}"/Makefile.skel + 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() { @@ -44,18 +62,18 @@ src_compile() { addwrite /var/cache/fonts econf || die "econf failed" - emake || die "emake failed" + emake -j1 || die "emake failed" } src_install() { emake DESTDIR="${D}" install || die "emake install failed" - dodoc README AUTHORS ChangeLog + dodoc README AUTHORS ChangeLog || die "dodoc failed" } pkg_postinst() { - python_mod_optimize ${ROOT}usr/share/pyxplot + python_mod_optimize "${ROOT}"/usr/share/${PN} } pkg_postrm() { - python_mod_cleanup ${ROOT}usr/share/pyxplot + python_mod_cleanup "${ROOT}"/usr/share/${PN} } diff --git a/sci-visualization/pyxplot/pyxplot-0.6.3.ebuild b/sci-visualization/pyxplot/pyxplot-0.6.3.ebuild index 4a43bc3438c5..b5f62c3ccc39 100644 --- a/sci-visualization/pyxplot/pyxplot-0.6.3.ebuild +++ b/sci-visualization/pyxplot/pyxplot-0.6.3.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2007 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.1 2007/03/02 15:30:07 bicatali Exp $ +# $Header: /var/cvsroot/gentoo-x86/sci-visualization/pyxplot/pyxplot-0.6.3.ebuild,v 1.2 2007/10/11 15:21:51 bicatali Exp $ inherit eutils python @@ -27,11 +27,13 @@ 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 + "${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 @@ -65,13 +67,13 @@ src_compile() { src_install() { emake DESTDIR="${D}" install || die "emake install failed" - dodoc README AUTHORS ChangeLog + dodoc README AUTHORS ChangeLog || die "dodoc failed" } pkg_postinst() { - python_mod_optimize ${ROOT}usr/share/pyxplot + python_mod_optimize "${ROOT}"/usr/share/${PN} } pkg_postrm() { - python_mod_cleanup ${ROOT}usr/share/pyxplot + python_mod_cleanup "${ROOT}"/usr/share/${PN} } |