sci-chemistry/ccp4-apps: add missing die, don't rely on lapack -> blas dep chain

Package-Manager: portage-2.2.0_alpha108/cvs/Linux x86_64

4 files changed, 16 insertions, 11 deletions

diff --git a/sci-chemistry/ccp4-apps/ChangeLog b/sci-chemistry/ccp4-apps/ChangeLog
index b42e379a1627..679bf9b96603 100644
--- a/sci-chemistry/ccp4-apps/ChangeLog
+++ b/sci-chemistry/ccp4-apps/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sci-chemistry/ccp4-apps
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/ccp4-apps/ChangeLog,v 1.36 2012/04/26 15:46:31 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/ccp4-apps/ChangeLog,v 1.37 2012/06/01 09:06:21 jlec Exp $
+
+  01 Jun 2012; Justin Lecher <jlec@gentoo.org> files/6.1.3-lapack.patch,
+  ccp4-apps-6.1.3-r10.ebuild:
+  add missing die, don't rely on lapack -> blas dep chain
 
   26 Apr 2012; Justin Lecher <jlec@gentoo.org> -ccp4-apps-6.1.3-r9.ebuild,
   ccp4-apps-6.1.3-r10.ebuild:
diff --git a/sci-chemistry/ccp4-apps/Manifest b/sci-chemistry/ccp4-apps/Manifest
index 56752bf7bbcd..b7bbac8cd8cd 100644
--- a/sci-chemistry/ccp4-apps/Manifest
+++ b/sci-chemistry/ccp4-apps/Manifest
@@ -12,20 +12,21 @@ AUX 6.1.3-dont-build-xia.patch 712 RMD160 dd3f8bcf309b7d84c31bf4cf829d1d9f95618d
 AUX 6.1.3-dont-configure.patch 4592 RMD160 301eeb912704ff01ab7e324e951c2d5770739f88 SHA1 66e61f7d2979cfd6d304238ae665d4e114368279 SHA256 817e37a623a74cc06017c5cd7b10fc5afb75242a519820825610c09ad4c91741
 AUX 6.1.3-dont-make-dirs-in-configure.patch 2866 RMD160 ba49e45ab609a42a2d93b96f55af913bf9625610 SHA1 36c9329c3768c08687ef062c9ab649d32833b422 SHA256 1b5997f17526a4fd60ffa9eccf4b765aadf3a78c9394657000e0454f364240ca
 AUX 6.1.3-impl-dec.patch 4302 RMD160 2b69341db71699504e4444d18db7db1d4fc10ddd SHA1 b3a9b71355063fbe34b0d3db4163d7e3689cb0a1 SHA256 73c3137ab8e20c25d1dfcfc65011a055f90eb902eede697c7dfbc5f37948eb18
-AUX 6.1.3-lapack.patch 21635 RMD160 a1243e5a7fb1f9982171b8362b764ccbd1799747 SHA1 a4090422ba12bddc1cf9797d02fa6f6cab127f72 SHA256 f6eaf5dac5e5b6fce26eb1106c11de366e325179e82e70d69c174c969ac43c6d
+AUX 6.1.3-lapack.patch 21633 RMD160 a5887b65d78c49ce5226c25bb5e50e78b4318c6e SHA1 084249fabfd86f168e3b2b6fc164a1196d662fbe SHA256 988ca5463baab2979d4c4c713cf6cb8148123df38205083cea179767c739e71a
 AUX 6.1.3-pisa.patch 714 RMD160 9923901ec82dc0c7cd2a13f1eb6362a11576abd8 SHA1 8d7e0b730b9969d2d59a6b9441b7c3709b397e16 SHA256 42a581d2a9747239c1b129dbeffc76a2532de320629dd58112a42ffde669bf12
 AUX 6.1.3-pythonpath.patch 2716 RMD160 f46963e6c4c48cfab76062aaff8d58189f9d590b SHA1 24f6c9a051f97d9e5db5c4fb9ef457114fa7a951 SHA256 41ca8ed3fc1701caa18b30f44af7475d49fc0042ee058bae3d8c8617a6d9bcc2
 AUX 6.1.3-rename-rapper-ng.patch 2241 RMD160 63cda7686f10316f2a9d0a12346de9d41c95d6cc SHA1 a08d3176e8939619893d1007685dda9be5fc78be SHA256 7a476133860463b91b39189aa5628607f0404224cae1273b4da1c500a845dfdb
 AUX 6.1.3-unbundle.patch 5736 RMD160 5e1416c26a6ddb61f5d3aaa7a5d199dfdc6112ba SHA1 985e5e84d01329d7671a63d030337d77cc7a4bb7 SHA256 1d50917bdd3733d099cf64df651c8743ab40ce1ea19416bfacf806e324b2bea2
 DIST 6.1.3-oasis4.0.patch.bz2 946 RMD160 b448376114ba41e6999d533929fdb79812476f87 SHA1 7667aca14d28cec01bfa7d2eee9cbce11624f4fa SHA256 12d7c5965e0c46b0f482514d9083d6be94d65eeb14ba29c17d507d5f9669f84b
 DIST ccp4-6.1.3-core-src.tar.gz 242134076 RMD160 e9b7deb0766fb95d5e8946881f20e086f0896fe9 SHA1 ee5ada892694db5dc9b2d7d2330b4ac694f56580 SHA256 1e529c660e7f390ec0feca9d45caa00a2813d23156c10a2747c427117293c324
-EBUILD ccp4-apps-6.1.3-r10.ebuild 10145 RMD160 c5c4feef7cb20c80ac52c8a906d3b985d200c63a SHA1 4f3c4a6cedbee363c952181c60070737d0590298 SHA256 007c2eefa444c1ae43b8d9946b5c88e59f7cc2d2161d5009b362662042356a24
-MISC ChangeLog 6656 RMD160 c028b840fd18fd3f9c190feb322e8d8562ccc169 SHA1 c3a881083c23cad36a2e3729756d970eaaa5115f SHA256 9b8c8a814f0151df3315a58144c83fade9427a530b856c368f75d141cef0d495
+EBUILD ccp4-apps-6.1.3-r10.ebuild 10160 RMD160 93de299e3a7ce7f671b66553054e714d5a30e21b SHA1 42529b3c34ae9edb09bcc45e0f96d1591651a1c1 SHA256 dbe3f26c7875d90ad16a42626b4402a9627beeec7d459c54303307d22f57ae59
+MISC ChangeLog 6818 RMD160 30c05bda0cba2ade150c3365b8e9ed780cbb4be6 SHA1 ca228abedce4e9a49b25021bc50800536a9dc2f4 SHA256 3b575b5227ade3cc30d39f524ae349cfb4a7761989e7c6cb940fa3867d0ba4a0
 MISC metadata.xml 167 RMD160 ea4003a55d6e2079381a540c441fc59cde29025a SHA1 3bc6dc4dd68f7de22828138e62aa117387b1765d SHA256 f313eeec4ebffac500b57a98a225e32c77489fc826a50494749b6cdeec28e3e8
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
+Comment: GPGTools - http://gpgtools.org
 
-iEYEAREKAAYFAk+Zbd0ACgkQgAnW8HDreRasxQCcCmxIjEJ+reK1DvWt900vI9lS
-hV4AoKouae0wUFBXIThDz99NZw3O8jqH
-=A8FU
+iEYEAREKAAYFAk/IhhMACgkQgAnW8HDreRYdHgCgqmJ2RAJmNv+Q5nyoF0tFKgtH
+itkAoJvz919J+nqAKWbdnlSUho6FHqlL
+=Ih+t
 -----END PGP SIGNATURE-----
diff --git a/sci-chemistry/ccp4-apps/ccp4-apps-6.1.3-r10.ebuild b/sci-chemistry/ccp4-apps/ccp4-apps-6.1.3-r10.ebuild
index cafa6ea88691..dd8fe0a14aa9 100644
--- a/sci-chemistry/ccp4-apps/ccp4-apps-6.1.3-r10.ebuild
+++ b/sci-chemistry/ccp4-apps/ccp4-apps-6.1.3-r10.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-chemistry/ccp4-apps/ccp4-apps-6.1.3-r10.ebuild,v 1.9 2012/04/26 15:46:31 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/ccp4-apps/ccp4-apps-6.1.3-r10.ebuild,v 1.10 2012/06/01 09:06:21 jlec Exp $
 
 EAPI=3
 
@@ -227,7 +227,7 @@ src_configure() {
 	# We agree to the license by emerging this, set in LICENSE
 	sed -i \
 		-e "s~^\(^agreed=\).*~\1yes~g" \
-		"${S}"/configure
+		"${S}"/configure || die
 
 	# Fix up variables -- need to reset CCP4_MASTER at install-time
 	sed -i \
@@ -236,7 +236,7 @@ src_configure() {
 		-e "s~^\(.*export CBIN=.*\)\$CCP4.*~\1\$CCP4/libexec/ccp4/bin/~g" \
 		-e "s~^\(.*setenv CBIN .*\)\$CCP4.*~\1\$CCP4/libexec/ccp4/bin/~g" \
 		-e "s~^\(setenv CCP4I_TCLTK.*\)/usr/local/bin~\1${EPREFIX}/usr/bin~g" \
-		"${S}"/include/ccp4.setup*
+		"${S}"/include/ccp4.setup* || die
 
 	# Set up variables for build
 	source "${S}"/include/ccp4.setup-sh
diff --git a/sci-chemistry/ccp4-apps/files/6.1.3-lapack.patch b/sci-chemistry/ccp4-apps/files/6.1.3-lapack.patch
index 2514733f876d..cef286b16b7c 100644
--- a/sci-chemistry/ccp4-apps/files/6.1.3-lapack.patch
+++ b/sci-chemistry/ccp4-apps/files/6.1.3-lapack.patch
@@ -567,7 +567,7 @@ index 833f483..bcfa62d 100755
 +  # gentoo is clever
 +  make_blas=
 +  make_lapack=
-+  BLASLIB=$(pkg-config --libs lapack)
++  BLASLIB=$(pkg-config --libs blas)
 +  LAPACKLIB=$(pkg-config --libs lapack)
 +  XLAPACK_LIB="${BLASLIB} ${LAPACKLIB}"
 +  XFFLAGS_LAPACK="$(pkg-config --cflags lapack blas)"