Fixed breakage in USE due to screwy amd64? () : constructs

5 files changed, 18 insertions, 14 deletions

diff --git a/net-fs/samba/ChangeLog b/net-fs/samba/ChangeLog
index 8e3a6111bc63..77a0c9ba7dde 100644
--- a/net-fs/samba/ChangeLog
+++ b/net-fs/samba/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-fs/samba
 # Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-fs/samba/ChangeLog,v 1.62 2004/03/23 10:02:20 kumba Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-fs/samba/ChangeLog,v 1.63 2004/03/23 15:11:14 avenj Exp $
+
+  23 Mar 2004; Jon Portnoy <avenj@gentoo.org> samba-3.0.0-r1.ebuild,
+  samba-3.0.1-r1.ebuild, samba-3.0.1.ebuild, samba-3.0.2a.ebuild :
+  Fix broken USE constructs with 'amd64? () :'
 
   23 Mar 2004; Joshua Kinard <kumba@gentoo.org> samba-2.2.8a.ebuild,
   samba-3.0.2a.ebuild:
diff --git a/net-fs/samba/Manifest b/net-fs/samba/Manifest
index f50427dc8e78..e292f0415b9e 100644
--- a/net-fs/samba/Manifest
+++ b/net-fs/samba/Manifest
@@ -1,16 +1,14 @@
-MD5 b436b26eebf655db95892d120f88cfed ChangeLog 13893
+MD5 09619ad03cd84ba4338e576bf5ad2a96 ChangeLog 14077
 MD5 eeb3ec0ae25e9d4f7ce62c32b52d5996 metadata.xml 466
 MD5 a14d55690d52d6770c50855d7fd48efd samba-2.2.8a.ebuild 10853
-MD5 c0dd9a8670a8bd156867d224d1b96ad4 samba-3.0.0-r1.ebuild 10877
+MD5 e49613d30093a41ce2883cf670cbe11f samba-3.0.0-r1.ebuild 10860
 MD5 483cb58ee7c9b9a5a3dbf5e0537148b2 samba-3.0.1-r1.ebuild 11356
-MD5 cf36f0753ae9d75cf3aea5b531bb5b39 samba-3.0.1.ebuild 11337
-MD5 1233ea17064d404aee31a59133fee60f samba-3.0.2a.ebuild 11459
+MD5 d5164790d64a6f7b353475b65104f1ea samba-3.0.1.ebuild 11320
+MD5 7611c5a39940659e72735aa53860277f samba-3.0.2a.ebuild 11442
 MD5 fd2382184b6a07e63cb07ff26b578fd2 files/config-svc-smbd+nmbd 784
 MD5 9780745de080ee53a34c1b2f9fb1f228 files/digest-samba-2.2.8a 135
-MD5 9ad118eb4f2d3eff69927ab1ab1913be files/digest-samba-3.0.0-r1 202
 MD5 f3a4b3b0a8162ae87779846d7e6adbbf files/digest-samba-3.0.1 202
-MD5 f3a4b3b0a8162ae87779846d7e6adbbf files/digest-samba-3.0.1-r1 202
-MD5 89ef79072e3e08e4caada278e2c3b280 files/digest-samba-3.0.2a 204
+MD5 9ad118eb4f2d3eff69927ab1ab1913be files/digest-samba-3.0.0-r1 202
 MD5 b610fd35d7a0a9de510e31d85345d14a files/lmhosts 124
 MD5 f402c2c4103f4c13ac3cc5fa165940db files/nonroot-bind.diff 757
 MD5 5d3129a0f6bcbec6ec91d217881a34e1 files/nsswitch.conf-winbind 298
@@ -32,3 +30,5 @@ MD5 3721b81198a029319546e6ef56e5c493 files/smbusers 202
 MD5 ba636412fdffb621dcd28e79fb247d7c files/swat.xinetd 525
 MD5 ce5400ed75143be061711d2c1d51a081 files/system-auth-winbind 867
 MD5 d95c7a841071087246ef23a1f72b890f files/winbind-init 491
+MD5 f3a4b3b0a8162ae87779846d7e6adbbf files/digest-samba-3.0.1-r1 202
+MD5 89ef79072e3e08e4caada278e2c3b280 files/digest-samba-3.0.2a 204
diff --git a/net-fs/samba/samba-3.0.0-r1.ebuild b/net-fs/samba/samba-3.0.0-r1.ebuild
index f51279870753..94e2a355e36a 100644
--- a/net-fs/samba/samba-3.0.0-r1.ebuild
+++ b/net-fs/samba/samba-3.0.0-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-fs/samba/samba-3.0.0-r1.ebuild,v 1.8 2004/03/14 21:18:10 tgall Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-fs/samba/samba-3.0.0-r1.ebuild,v 1.9 2004/03/23 15:11:15 avenj Exp $
 
 inherit eutils
 
@@ -25,7 +25,7 @@ SRC_URI="mirror://samba/${PN}${_CVS}.tar.bz2
 
 _COMMON_DEPS="dev-libs/popt
 	readline? sys-libs/readline
-	amd64? ( ) : ( kerberos? ( app-crypt/mit-krb5 ) )
+	kerberos? ( app-crypt/mit-krb5 )
 	mysql? ( dev-db/mysql sys-libs/zlib )
 	acl? sys-apps/acl
 	cups? net-print/cups
diff --git a/net-fs/samba/samba-3.0.1.ebuild b/net-fs/samba/samba-3.0.1.ebuild
index 0f78dbe5144d..b6a2706b94fe 100644
--- a/net-fs/samba/samba-3.0.1.ebuild
+++ b/net-fs/samba/samba-3.0.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-fs/samba/samba-3.0.1.ebuild,v 1.3 2004/03/14 21:18:10 tgall Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-fs/samba/samba-3.0.1.ebuild,v 1.4 2004/03/23 15:11:15 avenj Exp $
 
 inherit eutils
 
@@ -25,7 +25,7 @@ SRC_URI="mirror://samba/${PN}${_CVS}.tar.bz2
 
 _COMMON_DEPS="dev-libs/popt
 	readline? sys-libs/readline
-	amd64? ( ) : ( kerberos? ( app-crypt/mit-krb5 ) )
+	kerberos? ( app-crypt/mit-krb5 )
 	mysql? ( dev-db/mysql sys-libs/zlib )
 	acl? sys-apps/acl
 	cups? net-print/cups
diff --git a/net-fs/samba/samba-3.0.2a.ebuild b/net-fs/samba/samba-3.0.2a.ebuild
index afc5015a14d5..98d05ee37b9f 100644
--- a/net-fs/samba/samba-3.0.2a.ebuild
+++ b/net-fs/samba/samba-3.0.2a.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-fs/samba/samba-3.0.2a.ebuild,v 1.4 2004/03/23 10:02:20 kumba Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-fs/samba/samba-3.0.2a.ebuild,v 1.5 2004/03/23 15:11:15 avenj Exp $
 
 inherit eutils
 
@@ -25,7 +25,7 @@ SRC_URI="mirror://samba/${PN}${_CVS}.tar.bz2
 
 _COMMON_DEPS="dev-libs/popt
 	readline? sys-libs/readline
-	amd64? ( ) : ( ldap? ( kerberos? ( app-crypt/mit-krb5 ) ) )
+	ldap? ( kerberos? ( app-crypt/mit-krb5 ) )
 	mysql? ( dev-db/mysql sys-libs/zlib )
 	xml? ( dev-libs/libxml2 sys-libs/zlib )
 	acl? sys-apps/acl