convert test statement to if;fi block because || die does not work on a subshell

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

diff --git a/sci-biology/primer3/ChangeLog b/sci-biology/primer3/ChangeLog
index 2b62d5036391614d3e3eee86666976b2961f5116..5b9a2dab0ce0b019741efee348fa0e074561bb19 100644 (file)
--- a/sci-biology/primer3/ChangeLog
+++ b/sci-biology/primer3/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sci-biology/primer3
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-biology/primer3/ChangeLog,v 1.28 2011/12/02 22:12:55 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-biology/primer3/ChangeLog,v 1.29 2011/12/03 10:58:16 hwoarang Exp $
+
+  03 Dec 2011; Markos Chandras <hwoarang@gentoo.org> primer3-2.2.3.ebuild:
+  convert test statement to if;fi block because || die does not work on a
+  subshell
 
   02 Dec 2011; Markos Chandras <hwoarang@gentoo.org> primer3-2.2.3.ebuild:
   add missing sed. stable on amd64. bug #391531

diff --git a/sci-biology/primer3/Manifest b/sci-biology/primer3/Manifest
index 94d51b02fef8ad781a6a8317ec10fc8e36433320..1656e56bdce03e982109ec9680cada00825eb3ce 100644 (file)
--- a/sci-biology/primer3/Manifest
+++ b/sci-biology/primer3/Manifest
@@ -6,23 +6,23 @@ DIST primer3-1.1.4.tar.gz 974628 RMD160 87535d123d4c00b64eb763e4e567c5c83fde6b54
 DIST primer3-2.2.3.tar.gz 2284282 RMD160 040b41649f5bfc17214502b2ba5e98d1a5afd73f SHA1 20c6a00455b86a5712c1e297930f2624fca45881 SHA256 2e68d638119bfcac12571da351cf261e28a3dd4b32c89074ce17065931a98774
 EBUILD primer3-1.1.4-r2.ebuild 966 RMD160 36ddb7a39f54ee2650bcb2300ee7d14f594f7ae0 SHA1 2fe782c9bac2232e286439728ac1d55bffdf0c97 SHA256 fb2ea764406931476ae46e9878aa3591b8a23f972be52b57a76ae4fa2085347a
 EBUILD primer3-1.1.4.ebuild 777 RMD160 a7f7d260c80b4899568b11ec28a0431b215db2d1 SHA1 45485dafce00b8500267350041bc66c7c480b4e2 SHA256 cab7435d84362f2dd3b56d85db348662baa22e8ec5757acdffe45ecb08be7a74
-EBUILD primer3-2.2.3.ebuild 1327 RMD160 ab550c7c5276a90fe085c550349736f297964749 SHA1 17908e3517ed0a66843e4786c6d3cb8f9f900f0b SHA256 5079c628e8847de07fd8d64d9e74704bc9890f64a8c8ad8ea924f7611759a727
-MISC ChangeLog 4438 RMD160 813c2942334b735bcf1f13ad423e085dd6d9ea3f SHA1 920d4fbcbe8529b5287ec80b3a6b14215c729134 SHA256 8a85c29bced68d0b8b5d2afe5cf91b1d02faa80c6041ce6b0cc30bce8188e37b
+EBUILD primer3-2.2.3.ebuild 1335 RMD160 36c9a36ab5fa0fa3408432b9da7083abe437c794 SHA1 75015b4058a8b8c2268ca81a7365b0a5c6b699a4 SHA256 ed8de7c2dc7e7250de0e73f8af2298e6d8b385155c6a3605f1a539c20ec7dedd
+MISC ChangeLog 4599 RMD160 a42386e4bf7e25f160f482f4496b5292bd06ef3f SHA1 4172180b47c686765e1c38a851f2c8ed609cdc14 SHA256 6c8bf0edafc1833089f97b23defedb3c7e4f8730331f5ad7e4bf9e6654575279
 MISC metadata.xml 624 RMD160 b9c9f7ed6eb37504dbe39d7fd2c12ea7c0e2b557 SHA1 ecbd008512496eeefae63e1d36bdbe66e71e63fc SHA256 f612edc94f6538c9acf99caadc2a7d6e33cac6f933db9deafae777c7a45505bb
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iQIcBAEBCgAGBQJO2U1qAAoJEPqDWhW0r/LC2FQP/01Azp1FC7609b9D5zNPbKt0
-mQ1dyjas0fQDnS69S8a/7bdgvi44fvXSOc2fOfIOAHmCJgE9u4Egv88P9Zvh5WCO
-Myd7AY5rXLA8idd3a+d1ODtyhhVTQgO/76sB1c7IU0EKpcJ7KvcDII/C6xNokN5f
-ARSmQnOyqGFmsRrBn8BgbKDRMDbVQdprmwWjigBYA+gqtINPEOOMG6TOg1fB7T6S
-Y5tBgZxDbR1ilpCF1DSjlznKKGy0tME92I0ufud/AajDh1c6CYyJV08d/chaIaNC
-LAlOKhFyiQCggbqbnH+sKjbYQj/B+NO3hWsB0R7F3GukV7ZufbSL0zlGHLCAiw3R
-rfkD9EEviuYGr69Fkx0qDjq6BvvsUB1pAu8dHcuh60P5U6X963cTk9AYTfqUsGTF
-OEWQk0VYrrsJJtlW6RC83MUDkoilOruwF4vifgMu8ktVBXmd+kHYOlmdGK2arJxy
-wu01ys4bMAbYkKIItxW2IUp8CrM1zImIBA31huh0X4u9MaosjeE1S4HEplh44nH5
-3cm1FnO5+wGwkQbSqsFWtuBCcqhlonNT31+6ECRn2hFDQBH2OKFiDRswwT4hyJUP
-1WCad5pV8LQ4Uk/KZ70jzB0/K5wfR1UIDtQbwB+MnuxwcrRdZWvFWfQ5C8D47A9v
-3kL5vGojq5qAllPFWuM7
-=sySN
+iQIcBAEBCgAGBQJO2gBVAAoJEPqDWhW0r/LCWBwP/0pBXPdB745guKaDn88tmBto
+Lmm/g40clgrGaY8Y/AEnv6GQ1LenQJw/v4QmCYCm7ZAadOp+ERxx4d5BSsuTZI+R
+VH6fOBvRMR6XYnGGKj4dF+d04FlRHW7xBb69bxkqExX8iNFoovMArfCIHiJGJ+ch
+BalWKnBkTK+6kETJUrGGac+6fm4EsIIWJVShKb04TSRIzuGDiuh0u5AHihRZ3+Rg
+issy1mQfJ12yXvta6cUrq0wqYwaL8To6hbVMJFDyWa2lBKucWaJdLigpUguy6EZX
+jXg889fq/aG32ywo7eRVWhAHqxYoHoOXuWxwzrZl2fFkoIF8OGfaJ+kKBl3WHXOj
++SjNABhRmQj6lzEdJM/e1ThS0lL4xqD1Jq23f2jtLq8eb6bq562F0FtilVhUw0t5
+zNY5mF1x3/pyT5NYC3tkVcsS5obkdMpQ31FE7bsonGdZ7wXlKt3e0v4WG8OQr+/I
+hBk+BX/++nglkcCGo+2QIFL2jZEmMDhswfHiSWctKET5T43m14N186FgIXA4Z8MG
+v05Xy/Wl/BhIVmrzpz3Ut0jGVX2qzJ25mDJ/trA/kd6RbTYrxe45e7qw5xRhm+Vl
+nO08JoKksk2hSt5fRS9Ht0a5e0/j4ClZKJxyIEIRLKhUcqvoN4vyOlzSxB2ENZrW
+K0TyrMVLmM4thTC8d4el
+=a/fT
 -----END PGP SIGNATURE-----

diff --git a/sci-biology/primer3/primer3-2.2.3.ebuild b/sci-biology/primer3/primer3-2.2.3.ebuild
index 057fd4fa2525c29ff14fe5f7359710b8ea8cd082..e11dfd6c6bb2973ae180a28b23da3bf561ff4336 100644 (file)
--- a/sci-biology/primer3/primer3-2.2.3.ebuild
+++ b/sci-biology/primer3/primer3-2.2.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-biology/primer3/primer3-2.2.3.ebuild,v 1.4 2011/12/02 22:12:55 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-biology/primer3/primer3-2.2.3.ebuild,v 1.5 2011/12/03 10:58:16 hwoarang Exp $
 
 EAPI="3"
 
@@ -19,8 +19,9 @@ DEPEND="dev-lang/perl"
 RDEPEND=""
 
 src_prepare() {
-       [[ ${CHOST} == *-darwin* ]] && \
+       if [[ ${CHOST} == *-darwin* ]]; then
                sed -e "s:LIBOPTS ='-static':LIBOPTS =:" -i Makefile || die
+       fi
        perl -i -ne 's/\$\(CPP\)/'$(tc-getCXX)'/; print unless /^(CC|CPP|CFLAGS|LDFLAGS)\s*=/' src/Makefile || die
        sed \
                -e '/oligotm/s:-o $@:$(LDFLAGS) -o $@:g' \