Version bump + quotes cleaning.

Package-Manager: portage-2.1.3.12

9 files changed, 110 insertions, 80 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/Manifest b/sci-visualization/pyxplot/Manifest
index fe63379a68ef..14d6541fe787 100644
--- a/sci-visualization/pyxplot/Manifest
+++ b/sci-visualization/pyxplot/Manifest
@@ -1,14 +1,6 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-AUX 0.5.8-dont-build-pyx.patch 809 RMD160 587b9670f4080cb3bf76d78bb51db60197ab2ef5 SHA1 7e93e5e1f75c60b667f9307e6822be47b9bed9cb SHA256 f3dd064e51010dbccee58be53c9996be530ab7fc1647b1290c414bf08871af21
-MD5 7435d1ac6361cae0937be1d4053c5873 files/0.5.8-dont-build-pyx.patch 809
-RMD160 587b9670f4080cb3bf76d78bb51db60197ab2ef5 files/0.5.8-dont-build-pyx.patch 809
-SHA256 f3dd064e51010dbccee58be53c9996be530ab7fc1647b1290c414bf08871af21 files/0.5.8-dont-build-pyx.patch 809
-AUX 0.5.8-respect-destdir.patch 1796 RMD160 42f8e30c3d3eb547dc85b2e13995fb200145c31e SHA1 7d0d89556ba1adb15640f77273fde2402e4492fb SHA256 1e3b9ed3fc624b6e34a83162afc12af91c1e62ac4ff9e9cd51ce7f50a03ef596
-MD5 27e4cb012a619ec03b535ee820c14a80 files/0.5.8-respect-destdir.patch 1796
-RMD160 42f8e30c3d3eb547dc85b2e13995fb200145c31e files/0.5.8-respect-destdir.patch 1796
-SHA256 1e3b9ed3fc624b6e34a83162afc12af91c1e62ac4ff9e9cd51ce7f50a03ef596 files/0.5.8-respect-destdir.patch 1796
 AUX 0.6.3-dont-build-pyx.patch 880 RMD160 50cdf4c2020f03ccaac723087b0407e95434dd1f SHA1 67d0c141e332b119600faa5de416f4b6ad794444 SHA256 b266a749756653445c8917d5224cc6b39815335328ffcb5c26879a8319a81a76
 MD5 7dfc52c196795bce6510b598c26a51b9 files/0.6.3-dont-build-pyx.patch 880
 RMD160 50cdf4c2020f03ccaac723087b0407e95434dd1f files/0.6.3-dont-build-pyx.patch 880
@@ -17,34 +9,42 @@ AUX 0.6.3-respect-destdir.patch 2009 RMD160 d587d455ca6c6ece14d9c4fbdaa98bd674a1
 MD5 ad3e5d6211aa9406262818f0e3f76883 files/0.6.3-respect-destdir.patch 2009
 RMD160 d587d455ca6c6ece14d9c4fbdaa98bd674a188f7 files/0.6.3-respect-destdir.patch 2009
 SHA256 e76f52c59b50501f6a5e7cd498b8a9ff7219f6b0456d3837f28d7bb5f355640c files/0.6.3-respect-destdir.patch 2009
-DIST pyxplot_0.5.8.tar.gz 519766 RMD160 6b94e740412da9ef48f5002372421fc4994759e8 SHA1 658d64614222f87c044c47cc79b19989dc78d7fc SHA256 7d9cbdfeca913ca7ca439f87818aed7e08dc182772cd58e9474bf913b0be5d8f
+AUX 0.6.3.1-dont-build-pyx.patch 880 RMD160 a30aa0452cf77bc770ab61d8e530a4d13196788a SHA1 6d1e0507861dfa85dd6da1771dd40abf682cd533 SHA256 3c06ca34929c68592317f4a8c267c02679d7e28a5ab81f16da07aa8f144ed854
+MD5 1da0625e9109eacee6b1dc5591d9f907 files/0.6.3.1-dont-build-pyx.patch 880
+RMD160 a30aa0452cf77bc770ab61d8e530a4d13196788a files/0.6.3.1-dont-build-pyx.patch 880
+SHA256 3c06ca34929c68592317f4a8c267c02679d7e28a5ab81f16da07aa8f144ed854 files/0.6.3.1-dont-build-pyx.patch 880
+AUX 0.6.3.1-respect-destdir.patch 2020 RMD160 f45943c12d8799c0437c28c91cccd77e93097766 SHA1 ae164c78b776ae90cabf55ba1dc1493f892eef56 SHA256 969ccc9269e02514ea37dabddb1b44a0d174a1bb4a0df05c4430298fe7ccd432
+MD5 ce5c7a1333ee78739bc88c8f3215628a files/0.6.3.1-respect-destdir.patch 2020
+RMD160 f45943c12d8799c0437c28c91cccd77e93097766 files/0.6.3.1-respect-destdir.patch 2020
+SHA256 969ccc9269e02514ea37dabddb1b44a0d174a1bb4a0df05c4430298fe7ccd432 files/0.6.3.1-respect-destdir.patch 2020
+DIST pyxplot_0.6.3.1.tar.gz 838500 RMD160 a4010822ed223e045fa248b4f6cb84c579106313 SHA1 1f2fd567bb9107e3981b2d3fc2a96cc05f72fc28 SHA256 9dab7ea79e7fcbe800ea682915b685d47267a19ce09a6ffa9850ebafc8800b79
 DIST pyxplot_0.6.3.tar.gz 859075 RMD160 064b9394ceb09be931d32c0563319c899ff16ba7 SHA1 6d520e668b01b5ffd0f09887e7387cb8906b9cf6 SHA256 05a617eaae96a1b496274d664ffc1cd99756897ced0db1a1944bb61552c9206f
-EBUILD pyxplot-0.5.8.ebuild 1526 RMD160 adbda32fe4ee1a735614a1c4108c089c2a64b0bc SHA1 fe725b36c6dcb4fc997de731c1f91144700f722a SHA256 a597fda75fa27341da1133177db5301a812779c5bca618bdacf8f290d2774a5a
-MD5 7f11f6110f4ad4e8a3bfe42667376821 pyxplot-0.5.8.ebuild 1526
-RMD160 adbda32fe4ee1a735614a1c4108c089c2a64b0bc pyxplot-0.5.8.ebuild 1526
-SHA256 a597fda75fa27341da1133177db5301a812779c5bca618bdacf8f290d2774a5a pyxplot-0.5.8.ebuild 1526
-EBUILD pyxplot-0.6.3.ebuild 2032 RMD160 4ae5e175078dd2c298fdc0992b5a63d014c5a695 SHA1 f985bdea8fcd5726820957efdbc0367b763afba2 SHA256 47f7871e6d227a085026bf71d6c47973e7f829c42a64865ac3b0f846ae4d33c2
-MD5 9246e2f4981147108edd6e7e5b3d61dc pyxplot-0.6.3.ebuild 2032
-RMD160 4ae5e175078dd2c298fdc0992b5a63d014c5a695 pyxplot-0.6.3.ebuild 2032
-SHA256 47f7871e6d227a085026bf71d6c47973e7f829c42a64865ac3b0f846ae4d33c2 pyxplot-0.6.3.ebuild 2032
-MISC ChangeLog 976 RMD160 3a89f5c21e02da3bb0824f2ef36d0c2a97a18bdd SHA1 4ceae4334c976236f57b3b3cc27ee535c9ed5094 SHA256 63aeedcf1f9b442813ff601a0c0e364c1c56c3676da432a72e05cbab3a7f15db
-MD5 b434ce10f62c6fd074467b45a75e3f93 ChangeLog 976
-RMD160 3a89f5c21e02da3bb0824f2ef36d0c2a97a18bdd ChangeLog 976
-SHA256 63aeedcf1f9b442813ff601a0c0e364c1c56c3676da432a72e05cbab3a7f15db ChangeLog 976
+EBUILD pyxplot-0.6.3.1.ebuild 2066 RMD160 594e0a9a33835e73eff8e1dd57dff3b3b91f107b SHA1 33c68750ec3279d4436cbd9e5ecb6c99464463c4 SHA256 649f136473eb89620a8592c6e64e7d482678d7c97054abb0e5e65cbcf76a75fe
+MD5 4f8d638f458d412c58543cb1cc81fd8d pyxplot-0.6.3.1.ebuild 2066
+RMD160 594e0a9a33835e73eff8e1dd57dff3b3b91f107b pyxplot-0.6.3.1.ebuild 2066
+SHA256 649f136473eb89620a8592c6e64e7d482678d7c97054abb0e5e65cbcf76a75fe pyxplot-0.6.3.1.ebuild 2066
+EBUILD pyxplot-0.6.3.ebuild 2092 RMD160 1e2d31a01b59fd0dd08380ffb8b6a1741d2e80b5 SHA1 ef793e9d869adfdf22df5447db01da0b04002d46 SHA256 1bcd4e26bde35c84b0d6b531798e0f77ffb47007207b5b7abaa0a0905a046b9e
+MD5 061424837b2df02e91e9a56f7a5ce526 pyxplot-0.6.3.ebuild 2092
+RMD160 1e2d31a01b59fd0dd08380ffb8b6a1741d2e80b5 pyxplot-0.6.3.ebuild 2092
+SHA256 1bcd4e26bde35c84b0d6b531798e0f77ffb47007207b5b7abaa0a0905a046b9e pyxplot-0.6.3.ebuild 2092
+MISC ChangeLog 1320 RMD160 0266ab2c10c4ade0b22aacb9034852c990bee105 SHA1 ae754bdae63e7633533eeb9b019b39e59f68a4f4 SHA256 83bfa2c7019bb7dda588e8549a0993a0824aafc0007e1c729ebf612bc8052b88
+MD5 cd36c117d7d1a4e20f0f4c8a3c774b4c ChangeLog 1320
+RMD160 0266ab2c10c4ade0b22aacb9034852c990bee105 ChangeLog 1320
+SHA256 83bfa2c7019bb7dda588e8549a0993a0824aafc0007e1c729ebf612bc8052b88 ChangeLog 1320
 MISC metadata.xml 455 RMD160 19894cb59adef186838eece64dc7586de87b36af SHA1 9a9ebeb35973deb6b462962f64b4b9c1406ff274 SHA256 412da2e3730aa03670e3a9cbde734bbbed99ac51a21b769a25eba2759e113c98
 MD5 bfc60aeb3e8cfd738f7c7f4ca2ccc8e7 metadata.xml 455
 RMD160 19894cb59adef186838eece64dc7586de87b36af metadata.xml 455
 SHA256 412da2e3730aa03670e3a9cbde734bbbed99ac51a21b769a25eba2759e113c98 metadata.xml 455
-MD5 dc7bc2c19919ede4b0e947d44e2ee343 files/digest-pyxplot-0.5.8 241
-RMD160 b046b96e95b09381d0d692c3e0297724e78608be files/digest-pyxplot-0.5.8 241
-SHA256 9523bb7ed5ef2f23e69f9be051628d6173b91a30b5910eaea1f0d7e9b2706605 files/digest-pyxplot-0.5.8 241
 MD5 480d903cd4ff91184810b05693e0c525 files/digest-pyxplot-0.6.3 241
 RMD160 cff6c6f71bd8ef066b6f88c99eeb2da06b87e002 files/digest-pyxplot-0.6.3 241
 SHA256 d1a5d266e17610707e254a4925c10df9b930fb8fcc7b588f0cb356ad1aa3de6a files/digest-pyxplot-0.6.3 241
+MD5 3a91e3a30751f52a9aaeb17d8ea73e90 files/digest-pyxplot-0.6.3.1 247
+RMD160 b88ba4b12a08b39c1f5dca6f021cbda3b8bf76d3 files/digest-pyxplot-0.6.3.1 247
+SHA256 ca94082b41e6874edb87a50b7b4115fdb1383c121c5b8671c45b10a9ad28b485 files/digest-pyxplot-0.6.3.1 247
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.6 (GNU/Linux)
+Version: GnuPG v1.4.7 (GNU/Linux)
 
-iD8DBQFF99ZoWc/Ciu+QQGkRAouVAJ9aF08p6ZC5n/2iCMoHc10+4hs5sQCcDTLX
-cj22xQV5EefugEiu6/ycdiY=
-=2tXk
+iD8DBQFHDj+V1ycZbhPLE2ARAlclAKCGkJKxBkRvBLMzNjl5fp8IkLcifgCcDXHv
+LSyuItnEOFlkUVkc9miQz0A=
+=tLbm
 -----END PGP SIGNATURE-----
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}
 }