Thanks to xarthisius for reviewing, move S higher in file and fix missing || on cd

Package-Manager: portage-2.1.10.44/cvs/Linux x86_64

diff --git a/sci-mathematics/p9m4/ChangeLog b/sci-mathematics/p9m4/ChangeLog
index 077f6418e21bda23b1d0eb63c9495bbb7c84ddab..6971388fe1661538626129499f21acb7440ed4b5 100644 (file)
--- a/sci-mathematics/p9m4/ChangeLog
+++ b/sci-mathematics/p9m4/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sci-mathematics/p9m4
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/p9m4/ChangeLog,v 1.1 2012/01/08 14:48:52 gienah Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/p9m4/ChangeLog,v 1.2 2012/01/08 15:14:11 gienah Exp $
+
+  08 Jan 2012; Mark Wright <gienah@gentoo.org> p9m4-05.ebuild:
+  Thanks to xarthisius for reviewing, move S higher in file and fix missing ||
+  on cd
 
 *p9m4-05 (08 Jan 2012)
 

diff --git a/sci-mathematics/p9m4/Manifest b/sci-mathematics/p9m4/Manifest
index ab2c296bf4e0f1b4fda34e64a30781420792a5c7..a32a8c099dd03e8abb34737c3cf1287d022703a2 100644 (file)
--- a/sci-mathematics/p9m4/Manifest
+++ b/sci-mathematics/p9m4/Manifest
@@ -6,13 +6,13 @@ AUX p9m4-v05-python2.6.patch 1909 RMD160 fb7d591117027b838dd661562689918c89beefc
 AUX p9m4-v05-use-inst-paths.patch 1151 RMD160 0d09e9bbcc40871487ac24229fc00523b9de4e50 SHA1 af0514a66f10654c21b93ee32e0b3f076d50b1da SHA256 67e84e86bd6af5ee972cd45b22df0c4c3c517345d144d6e960cd377d7168471b
 DIST p9m4-v05-64bit.patch.bz2 5095 RMD160 9b432f1990fd1ccbed5f383882d841e8be7e16f7 SHA1 593c1d38ef3c9ca7276454362fa8ac0415b04e5d SHA256 038eafb0198deabb358e3b9aabe19052970730e7cace2b7dbbbc09947d901d6f
 DIST p9m4-v05.tar.gz 889707 RMD160 00f64fd5dc07adeb0752218c319e1dfa130b51e1 SHA1 c9ce24400b96faaec23a0b83d33d3e283aaf4c67 SHA256 451a05179fcb025b666ec992cd45e0d71dac26e43c1fca814747bef541a040b4
-EBUILD p9m4-05.ebuild 2980 RMD160 9a99c70a74d029ddf1c0ffc5d4334a5bbff9337f SHA1 8b32f53af8242b21aaaa081e2680e4afb7ec3809 SHA256 c4f33d45f987167147f5c653885ce5e7818ad1c45708cffe8cceb93023ba9fc8
-MISC ChangeLog 479 RMD160 66a99d87325081e5ef831c6356e458c53cc67dc6 SHA1 39c15bb3109c27c35773c85509872866ae521ca5 SHA256 8f0353b2bf4b1941e6689edbb410537e3b01a6d6f8c01ed6683d5eac1565f92b
+EBUILD p9m4-05.ebuild 2983 RMD160 8e345a5a3c93874a078d4151f1c2bb841b9221e6 SHA1 a186534d4e2ecaba6f3a038f72a292e29687cf84 SHA256 d7d29c6b1f01993adc08b0d43bee4af09213d2549d8c1af6dc44a68b079c4dcf
+MISC ChangeLog 630 RMD160 728c474d7b8d44703c1c4bc79071fa0b5ee4cf66 SHA1 196046b3805e9e30f6df9be9d046bd5e5ad82897 SHA256 df01a7e1f078c162842cb038bc92f9df6981db24944549da726f47219000a8a6
 MISC metadata.xml 462 RMD160 926c8b017cb544c2ad52effa16d3b30e98502bc2 SHA1 02c0acd10acd158aa05108ea59d3a0303472139f SHA256 ae4d76ff5d6564e732a99eda291abf75d587d957c4052875fe0ba03f4a207d8b
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iF4EAREIAAYFAk8JrOsACgkQoBEVQmGOlx86MgEAjwK4lZ0/hYvhEBYEO9EUNSQt
-VosZkhHhPbRSVhSTYe8A/i3vf+iYJe3q57/PO09UPro3J86jo/gW2091cnGB01I9
-=dCu7
+iF4EAREIAAYFAk8JsuAACgkQoBEVQmGOlx+mrAEAk2AS771uw3Qlx00AuxPGwweG
+4kc9tnowCYqS5LdaIloBALsQr9ZnS1ZE9ywjBATRvVDcFcwkDl1iTk+V+vJeiRaQ
+=ePEs
 -----END PGP SIGNATURE-----

diff --git a/sci-mathematics/p9m4/p9m4-05.ebuild b/sci-mathematics/p9m4/p9m4-05.ebuild
index 2f1ef8620859817de9a19a75a5961a167aa41e2b..036f32619da52a02a6827c9f14745836d8ea5313 100644 (file)
--- a/sci-mathematics/p9m4/p9m4-05.ebuild
+++ b/sci-mathematics/p9m4/p9m4-05.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/p9m4/p9m4-05.ebuild,v 1.1 2012/01/08 14:48:52 gienah Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/p9m4/p9m4-05.ebuild,v 1.2 2012/01/08 15:14:11 gienah Exp $
 
 EAPI="4"
 PYTHON_DEPEND="2:2.5"
@@ -30,6 +30,8 @@ PATCHES=("${DISTDIR}/${MY_PN}05-64bit.patch.bz2"
                "${FILESDIR}/${MY_PN}05-package.patch"
                "${FILESDIR}/${MY_PN}05-python2.6.patch")
 
+S="${WORKDIR}/${MY_P}/"
+
 pkg_setup() {
        python_set_active_version 2
        python_pkg_setup
@@ -68,7 +70,7 @@ src_install() {
        dodir /usr/share/${PN}/Images
        insinto /usr/share/${PN}/Images
        cd "${S}/Images" \
-               die "Could not cd to Images"
+               || die "Could not cd to Images"
        doins *.gif *.ico
        if use examples; then
                dodir /usr/share/${PN}/Samples
@@ -106,5 +108,3 @@ src_install() {
 pkg_postinst() {
        distutils_pkg_postinst
 }
-
-S="${WORKDIR}/${MY_P}/"