fixed amd64 patch typo (bug #63542)

3 files changed, 49 insertions, 46 deletions

diff --git a/net-fs/samba/ChangeLog b/net-fs/samba/ChangeLog
index daeab7d4b93f..2c8b3e50c4f9 100644
--- a/net-fs/samba/ChangeLog
+++ b/net-fs/samba/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for net-fs/samba
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-fs/samba/ChangeLog,v 1.105 2004/09/09 20:35:47 kugelfang Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-fs/samba/ChangeLog,v 1.106 2004/09/10 14:12:00 satya Exp $
+
+  10 Sep 2004; Christian Andreetta <satya@gentoo.org> samba-3.0.6-r4.ebuild:
+  fixed amd64 patch typo (bug #63542)
 
   09 Sep 2004; Danny van Dyk <kugelfang@gentoo.org> samba-3.0.6-r4.ebuild:
   Marked ~amd64 now. GLSA has been taken back.
diff --git a/net-fs/samba/Manifest b/net-fs/samba/Manifest
index f649ca326397..02991b8b52c0 100644
--- a/net-fs/samba/Manifest
+++ b/net-fs/samba/Manifest
@@ -1,57 +1,57 @@
-MD5 41299f246433a1a55c8fccc77ccd709e metadata.xml 491
-MD5 3ca40dd1eea0e4015f805446f33902c1 ChangeLog 20230
-MD5 df4f73693b725799675e37ba3f90643f samba-3.0.2a-r2.ebuild 12249
-MD5 633511d04d7a7d7702c17089c85ba697 samba-3.0.1-r1.ebuild 11333
 MD5 7d7c900829bc2bdf39895d5890a0d20d samba-3.0.4-r1.ebuild 11146
-MD5 3351b25b7b1bd6afa22023463a51ceb8 samba-3.0.5-r1.ebuild 13685
-MD5 4505c7b9cd715168b75a4dfb5c4ac294 samba-3.0.5.ebuild 11142
-MD5 b8ef78eeab7e9982b8c3459e1792747f samba-3.0.6-r1.ebuild 13867
 MD5 55c08f2d48b50d7af452664decd8793a samba-3.0.6-r2.ebuild 13989
-MD5 fb357b885ebd5c7e7c6093156812efb1 samba-3.0.6-r3.ebuild 14194
-MD5 b476c01afa3961b5a0c594d6d297b91b samba-3.0.6-r4.ebuild 14239
+MD5 64a8650d49c3501b083cb53d6cfe948f samba-3.0.6-r4.ebuild 14236
+MD5 b8ef78eeab7e9982b8c3459e1792747f samba-3.0.6-r1.ebuild 13867
 MD5 045d2504d92e3846f34e35c094721c44 samba-3.0.6.ebuild 13730
-MD5 fd2382184b6a07e63cb07ff26b578fd2 files/config-svc-smbd+nmbd 784
-MD5 81931e1d9764390841dec0d0f327a114 files/digest-samba-3.0.2a-r2 204
-MD5 a86336201c2eced7a6e5a5138514e2f7 files/digest-samba-3.0.4-r1 203
+MD5 fb357b885ebd5c7e7c6093156812efb1 samba-3.0.6-r3.ebuild 14194
+MD5 3351b25b7b1bd6afa22023463a51ceb8 samba-3.0.5-r1.ebuild 13685
+MD5 633511d04d7a7d7702c17089c85ba697 samba-3.0.1-r1.ebuild 11333
+MD5 df4f73693b725799675e37ba3f90643f samba-3.0.2a-r2.ebuild 12249
+MD5 ee4e04279f24a13a04cdb5900e925be1 ChangeLog 20342
+MD5 41299f246433a1a55c8fccc77ccd709e metadata.xml 491
+MD5 4505c7b9cd715168b75a4dfb5c4ac294 samba-3.0.5.ebuild 11142
+MD5 ccc96fcdc7493be42da52364061c6c17 files/winbind-init 484
+MD5 fcebd975211fecf647f6cecf26ba5c96 files/samba-3.0.4.patch 8086
+MD5 e89b19f1e62e257cbaa23a44a0362a58 files/swat.xinetd 527
+MD5 20997c75e29fec20efbb2cd6695cd3a9 files/recycle.conf 776
+MD5 a7cc90ba23d86b1d90f65645826dde19 files/smbldap_conf.pm 7095
+MD5 cbaa5a39d9bd67b13f8131b426a4256b files/samba-2.2.5-gp-reloc-fix.patch 431
+MD5 7ee5edc70bf80888c776f5808f865996 files/nsswitch.conf-wins 392
 MD5 341521b710d02d57a70acd49b1d4c06b files/samba-conf 1291
-MD5 f3a4b3b0a8162ae87779846d7e6adbbf files/digest-samba-3.0.1-r1 202
-MD5 43a38a5331805a2fa61e899f18413ccd files/digest-samba-3.0.5 203
-MD5 519576a9448b86f1a7baab18204533a5 files/lmhosts 126
+MD5 83b384d6b47ecbf20525cc9a7baaa77a files/samba-init 1093
+MD5 fd2382184b6a07e63cb07ff26b578fd2 files/config-svc-smbd+nmbd 784
+MD5 e5dbea6345ee39a97bc8783f5772bf49 files/samba-3.0.6-winbind_getpwnam_v1.patch 2521
 MD5 f402c2c4103f4c13ac3cc5fa165940db files/nonroot-bind.diff 757
 MD5 5d3129a0f6bcbec6ec91d217881a34e1 files/nsswitch.conf-winbind 298
-MD5 7ee5edc70bf80888c776f5808f865996 files/nsswitch.conf-wins 392
-MD5 20997c75e29fec20efbb2cd6695cd3a9 files/recycle.conf 776
-MD5 cbaa5a39d9bd67b13f8131b426a4256b files/samba-2.2.5-gp-reloc-fix.patch 431
-MD5 8289eda694b35875eec6df5cc3f50c86 files/samba-2.2.6-libresolv.patch 540
-MD5 60e527174c1b2c53126dbbedb3cae0f7 files/samba-2.2.8-statfs.patch 209
+MD5 519576a9448b86f1a7baab18204533a5 files/lmhosts 126
 MD5 516ca38dfc67b7cd7356f93ad2cf75b9 files/samba-3.0.0-python-setup.patch 767
-MD5 83b384d6b47ecbf20525cc9a7baaa77a files/samba-init 1093
-MD5 9560b7e29d3a65db029fc1800e84abcc files/samba-pdb_ldap-exop.patch 3921
-MD5 6b6683448cdc01d013bd2c61b4ed8e1e files/samba-slapd-include.conf 499
-MD5 6acf6a5e92ff2cfc5f09b88f5d01b63e files/samba-svc 975
-MD5 b6cdc1468e45f92f19873e0c6c5b6e94 files/samba.pam 332
-MD5 1eec486ab39a239e25a76b16a6fcd460 files/smb.conf.example 16183
-MD5 8c1f1e3655e12b85102ce257f3efad62 files/smb.conf.example-samba3 20762
-MD5 a7cc90ba23d86b1d90f65645826dde19 files/smbldap_conf.pm 7095
-MD5 3685eadb817d185b06476eca6c0c15c4 files/smbusers 204
-MD5 e89b19f1e62e257cbaa23a44a0362a58 files/swat.xinetd 527
-MD5 09195dd8ab25ce77ac51c0c05b4ab93c files/system-auth-winbind 869
-MD5 ccc96fcdc7493be42da52364061c6c17 files/winbind-init 484
-MD5 4356a18128f7107bb7a2270bea78b3aa files/digest-samba-3.0.5-r1 203
-MD5 990fe15ff8a0e79f39069fff6475536d files/samba-3.0.2a-smbprint.patch 1224
-MD5 de43ff30dd5f1431590fd62a997e71b4 files/samba-3.0.4-python-setup.patch 833
-MD5 fcebd975211fecf647f6cecf26ba5c96 files/samba-3.0.4.patch 8086
 MD5 de43ff30dd5f1431590fd62a997e71b4 files/samba-3.0.x-python-setup.patch 833
-MD5 8ea7b443dd580aaaaf7e9e896eba54f2 files/samba-3.0.x-smbumount-uid32.patch 425
-MD5 fcebd975211fecf647f6cecf26ba5c96 files/samba-3.0.x.patch 8086
+MD5 1eec486ab39a239e25a76b16a6fcd460 files/smb.conf.example 16183
+MD5 6b6683448cdc01d013bd2c61b4ed8e1e files/samba-slapd-include.conf 499
+MD5 60e527174c1b2c53126dbbedb3cae0f7 files/samba-2.2.8-statfs.patch 209
+MD5 43a38a5331805a2fa61e899f18413ccd files/digest-samba-3.0.5 203
 MD5 d83497b5a50e8d6bd9c93b1c661634bb files/digest-samba-3.0.6 203
+MD5 8ea7b443dd580aaaaf7e9e896eba54f2 files/samba-3.0.x-smbumount-uid32.patch 425
+MD5 bf268fdddc8ef677b6fa78661a094eac files/samba.schema 16044
+MD5 2539fea7a9f177544b05ee84f7dac0e2 files/smb.conf.example-samba3.gz 7840
+MD5 bf268fdddc8ef677b6fa78661a094eac files/samba-3.0.6-samba.schema 16044
+MD5 f3a4b3b0a8162ae87779846d7e6adbbf files/digest-samba-3.0.1-r1 202
+MD5 a86336201c2eced7a6e5a5138514e2f7 files/digest-samba-3.0.4-r1 203
+MD5 4356a18128f7107bb7a2270bea78b3aa files/digest-samba-3.0.5-r1 203
 MD5 d83497b5a50e8d6bd9c93b1c661634bb files/digest-samba-3.0.6-r1 203
 MD5 d83497b5a50e8d6bd9c93b1c661634bb files/digest-samba-3.0.6-r2 203
 MD5 d83497b5a50e8d6bd9c93b1c661634bb files/digest-samba-3.0.6-r3 203
 MD5 d83497b5a50e8d6bd9c93b1c661634bb files/digest-samba-3.0.6-r4 203
+MD5 8c1f1e3655e12b85102ce257f3efad62 files/smb.conf.example-samba3 20762
+MD5 9560b7e29d3a65db029fc1800e84abcc files/samba-pdb_ldap-exop.patch 3921
+MD5 3685eadb817d185b06476eca6c0c15c4 files/smbusers 204
+MD5 09195dd8ab25ce77ac51c0c05b4ab93c files/system-auth-winbind 869
 MD5 579303048a39e504238ff8e658413452 files/samba-3.0.6-homes-reuse_v2.patch 2411
-MD5 bf268fdddc8ef677b6fa78661a094eac files/samba-3.0.6-samba.schema 16044
-MD5 e5dbea6345ee39a97bc8783f5772bf49 files/samba-3.0.6-winbind_getpwnam_v1.patch 2521
-MD5 bf268fdddc8ef677b6fa78661a094eac files/samba.schema 16044
-MD5 2539fea7a9f177544b05ee84f7dac0e2 files/smb.conf.example-samba3.gz 7840
+MD5 990fe15ff8a0e79f39069fff6475536d files/samba-3.0.2a-smbprint.patch 1224
 MD5 b836e258befae9d6c66cb3f158769b25 files/samba-3.0.6-libdirsymlink.patch 592
+MD5 6acf6a5e92ff2cfc5f09b88f5d01b63e files/samba-svc 975
+MD5 b6cdc1468e45f92f19873e0c6c5b6e94 files/samba.pam 332
+MD5 81931e1d9764390841dec0d0f327a114 files/digest-samba-3.0.2a-r2 204
+MD5 de43ff30dd5f1431590fd62a997e71b4 files/samba-3.0.4-python-setup.patch 833
+MD5 fcebd975211fecf647f6cecf26ba5c96 files/samba-3.0.x.patch 8086
+MD5 8289eda694b35875eec6df5cc3f50c86 files/samba-2.2.6-libresolv.patch 540
diff --git a/net-fs/samba/samba-3.0.6-r4.ebuild b/net-fs/samba/samba-3.0.6-r4.ebuild
index 65a6bd1399e4..3c4f42c85b1b 100644
--- a/net-fs/samba/samba-3.0.6-r4.ebuild
+++ b/net-fs/samba/samba-3.0.6-r4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-fs/samba/samba-3.0.6-r4.ebuild,v 1.10 2004/09/09 21:57:55 kugelfang Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-fs/samba/samba-3.0.6-r4.ebuild,v 1.11 2004/09/10 14:12:00 satya Exp $
 
 inherit eutils flag-o-matic
 
@@ -49,7 +49,7 @@ SLOT="0"
 # some archs are removed due to dependency tree integrity for ldap and
 #   dev-perl/Crypt-SmbHash flags
 #   should be: KEYWORDS="~arm ~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
-KEYWORDS="~amd64 arm hppa ia64 ~mips ppc sparc x86 alpha"
+KEYWORDS="alpha ~amd64 arm hppa ia64 ~mips ppc sparc x86"
 
 src_unpack() {
 	local i
@@ -83,12 +83,12 @@ src_unpack() {
 	epatch ${FILESDIR}/samba-3.0.6-winbind_getpwnam_v1.patch || die
 	cp ${FILESDIR}/samba-3.0.6-samba.schema ${S}/examples/LDAP/samba.schema
 	cd ${S} || die
+	use amd64 && epatch ${FILESDIR}/${P}-libdirsymlink.patch
 	# examples: to be copied as docs ---------------------------------------
 	rm -rf ${S}/examples.ORIG
 	cp -a ${S}/examples ${S}/examples.ORIG
 	# Prep samba-vscan source.
 	use oav && cp -a ${WORKDIR}/${PN}-vscan-${VSCAN_VER} ${S}/examples/VFS
-	use amd64 && epatch ${FILEDIR}/${P}-libdirsymlink.patch
 	#-----------------------------------------------------------------------
 	cd ${S}/source
 	echo "Running autoconf ..."