Simplify test for static, no need to special case darwin.

Package-Manager: portage-2.1

3 files changed, 18 insertions, 25 deletions

diff --git a/app-arch/bsdtar/ChangeLog b/app-arch/bsdtar/ChangeLog
index 8bb12c0a3103..af649974d43c 100644
--- a/app-arch/bsdtar/ChangeLog
+++ b/app-arch/bsdtar/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for app-arch/bsdtar
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-arch/bsdtar/ChangeLog,v 1.28 2006/05/14 22:01:03 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-arch/bsdtar/ChangeLog,v 1.29 2006/06/09 20:15:28 exg Exp $
+
+  09 Jun 2006; Emanuele Giaquinta <exg@gentoo.org> bsdtar-1.2.53.ebuild:
+  Simplify test for static, no need to special case darwin.
 
   14 May 2006; Diego Pettenò <flameeyes@gentoo.org>
   -files/bsdtar-1.02.027-osx.patch, -bsdtar-1.02.027-r1.ebuild,
diff --git a/app-arch/bsdtar/Manifest b/app-arch/bsdtar/Manifest
index 524d2ed14f28..3a413287c353 100644
--- a/app-arch/bsdtar/Manifest
+++ b/app-arch/bsdtar/Manifest
@@ -1,34 +1,24 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-AUX libarchive-1.2.51-acl.patch 2740 RMD160 307439bd45948f57c68aaa581ee2728ba9582b2a SHA1 30476981d9c4861cfbef07d4288665861e135aeb SHA256 9953e4ecfd7c905920a48ae66d35bf901f8ba89765a8b51c51065c1c01a15ec2 size 2740
+AUX libarchive-1.2.51-acl.patch 2740 RMD160 307439bd45948f57c68aaa581ee2728ba9582b2a SHA1 30476981d9c4861cfbef07d4288665861e135aeb SHA256 9953e4ecfd7c905920a48ae66d35bf901f8ba89765a8b51c51065c1c01a15ec2
 MD5 1728ebab5ae7315f1ca463ab5448474c files/libarchive-1.2.51-acl.patch 2740
 RMD160 307439bd45948f57c68aaa581ee2728ba9582b2a files/libarchive-1.2.51-acl.patch 2740
 SHA256 9953e4ecfd7c905920a48ae66d35bf901f8ba89765a8b51c51065c1c01a15ec2 files/libarchive-1.2.51-acl.patch 2740
-AUX libarchive-1.2.51-linking.patch 1234 RMD160 ace6aed10691c0cf240bc2f76f8182ffcbb5a3be SHA1 038bd23e04c98cc226c2646ca380b162306f6b65 SHA256 88095bb5782102108f3048d900b23fe7746ae5fb881b268463bdbcf3512964a7 size 1234
+AUX libarchive-1.2.51-linking.patch 1234 RMD160 ace6aed10691c0cf240bc2f76f8182ffcbb5a3be SHA1 038bd23e04c98cc226c2646ca380b162306f6b65 SHA256 88095bb5782102108f3048d900b23fe7746ae5fb881b268463bdbcf3512964a7
 MD5 70231828a2a2269c2f912708d80226ed files/libarchive-1.2.51-linking.patch 1234
 RMD160 ace6aed10691c0cf240bc2f76f8182ffcbb5a3be files/libarchive-1.2.51-linking.patch 1234
 SHA256 88095bb5782102108f3048d900b23fe7746ae5fb881b268463bdbcf3512964a7 files/libarchive-1.2.51-linking.patch 1234
-DIST libarchive-1.2.53.tar.gz 522540 RMD160 651d5b93d36b2a2c3f3cb781669e368e83a73964 SHA256 7ea32dcf542471d48464bad4e408fbb3b7dbea7d6594a01df73236ae3dc378e8 size 522540
-EBUILD bsdtar-1.2.53.ebuild 1587 RMD160 cbd6305ab95ae79ce62b1964366e645ba21b16aa SHA1 39bfc0d16ee4203c5243b4ddecfc87c6981f015e SHA256 efea45f49b8f1c0f746641bc9d9420cc032fbbe822ebd0a9e2f37b692206ebda size 1587
-MD5 11ddb8cfe0f4f6c62b7561bd5055b601 bsdtar-1.2.53.ebuild 1587
-RMD160 cbd6305ab95ae79ce62b1964366e645ba21b16aa bsdtar-1.2.53.ebuild 1587
-SHA256 efea45f49b8f1c0f746641bc9d9420cc032fbbe822ebd0a9e2f37b692206ebda bsdtar-1.2.53.ebuild 1587
-MISC ChangeLog 5137 RMD160 f6acbe48e2be4f86a38e37c039f9d3b2d2d978f3 SHA1 c0c27dfd29b9dd1fc912a9b1c7993be1bf2da040 SHA256 fbfcb7edaaa685b84564f486c45ff11401e3ae2f98dd0a632549d67fc94a0fd8 size 5137
-MD5 f30a67956c4fa3594edccf2ea6f02c72 ChangeLog 5137
-RMD160 f6acbe48e2be4f86a38e37c039f9d3b2d2d978f3 ChangeLog 5137
-SHA256 fbfcb7edaaa685b84564f486c45ff11401e3ae2f98dd0a632549d67fc94a0fd8 ChangeLog 5137
-MISC metadata.xml 428 RMD160 b1ff6b3d84ad489dc4f5ab5f1d9ee9b60266c2ff SHA1 a45d1c0b222b298767f08a2df8d4d84fdecc8434 SHA256 236fee13551e3785be53bd3f70c0784803827edf245c913851f239689e3278f4 size 428
+DIST libarchive-1.2.53.tar.gz 522540 RMD160 651d5b93d36b2a2c3f3cb781669e368e83a73964 SHA1 24c960b57ac7502944c95daedf265a333ee347af SHA256 7ea32dcf542471d48464bad4e408fbb3b7dbea7d6594a01df73236ae3dc378e8
+EBUILD bsdtar-1.2.53.ebuild 1553 RMD160 c8e6c554266f156d673e8f2d0a1b4bdc43af6523 SHA1 1ac49f337bc60477d345c9345fc4dd943dae0d82 SHA256 d088f472d3f42a805ba5f7e42456478375d2251a0ebf14f63fa9a37a89ea4ed9
+MD5 7681e71b67ad1a92b9f1fa5f42dfcf0f bsdtar-1.2.53.ebuild 1553
+RMD160 c8e6c554266f156d673e8f2d0a1b4bdc43af6523 bsdtar-1.2.53.ebuild 1553
+SHA256 d088f472d3f42a805ba5f7e42456478375d2251a0ebf14f63fa9a37a89ea4ed9 bsdtar-1.2.53.ebuild 1553
+MISC ChangeLog 5265 RMD160 0275a74c5f2a222707548e31467fba46ee08e17c SHA1 f5b518781f8bc86daa5e1403ff0b047b714c06c0 SHA256 6cd0755490e1aaa42604bf3d7cc3f470991ed41c2440652c5f4f0349e339a656
+MD5 154e44d9c4d75473d368d198cd6840a9 ChangeLog 5265
+RMD160 0275a74c5f2a222707548e31467fba46ee08e17c ChangeLog 5265
+SHA256 6cd0755490e1aaa42604bf3d7cc3f470991ed41c2440652c5f4f0349e339a656 ChangeLog 5265
+MISC metadata.xml 428 RMD160 b1ff6b3d84ad489dc4f5ab5f1d9ee9b60266c2ff SHA1 a45d1c0b222b298767f08a2df8d4d84fdecc8434 SHA256 236fee13551e3785be53bd3f70c0784803827edf245c913851f239689e3278f4
 MD5 afec809b169074e5d5b0803e4f8f5ec8 metadata.xml 428
 RMD160 b1ff6b3d84ad489dc4f5ab5f1d9ee9b60266c2ff metadata.xml 428
 SHA256 236fee13551e3785be53bd3f70c0784803827edf245c913851f239689e3278f4 metadata.xml 428
 MD5 72610f8c99a21763a948e9a145bdbab9 files/digest-bsdtar-1.2.53 253
 RMD160 07410a6b17c6336da8b8b3f56e6148046a660023 files/digest-bsdtar-1.2.53 253
 SHA256 201b8a1f8f7573230fb2d6570235725889268096f6ef0643bfa794c055dd2d39 files/digest-bsdtar-1.2.53 253
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.3 (GNU/Linux)
-
-iD8DBQFEZ6jSAiZjviIA2XgRAtfWAKDL9SocRnTyEv5f3TjleWjNgipFDACfWju0
-Z15C4/ey52eiKjCHNOZWvYg=
-=iSX3
------END PGP SIGNATURE-----
diff --git a/app-arch/bsdtar/bsdtar-1.2.53.ebuild b/app-arch/bsdtar/bsdtar-1.2.53.ebuild
index dc82d181b402..43779bc10f16 100644
--- a/app-arch/bsdtar/bsdtar-1.2.53.ebuild
+++ b/app-arch/bsdtar/bsdtar-1.2.53.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-arch/bsdtar/bsdtar-1.2.53.ebuild,v 1.3 2006/05/14 21:46:06 metalgod Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-arch/bsdtar/bsdtar-1.2.53.ebuild,v 1.4 2006/06/09 20:15:28 exg Exp $
 
 inherit eutils autotools
 
@@ -39,7 +39,7 @@ src_unpack() {
 src_compile() {
 	local myconf
 
-	if ! use userland_Darwin && ( use static || use build ); then
+	if use static || use build; then
 		myconf="${myconf} --enable-static-bsdtar"
 	else
 		myconf="${myconf} --disable-static-bsdtar"