minor ebuild fixes.

3 files changed, 28 insertions, 30 deletions

diff --git a/net-fs/samba/ChangeLog b/net-fs/samba/ChangeLog
index 314cfaa4cdef..a9f2760fff77 100644
--- a/net-fs/samba/ChangeLog
+++ b/net-fs/samba/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for net-fs/samba
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-fs/samba/ChangeLog,v 1.46 2003/09/25 10:39:51 phosphan Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-fs/samba/ChangeLog,v 1.47 2003/09/25 19:08:26 mholzer Exp $
+
+  26 Sep 2003; Martin Holzer <mholzer@gentoo.org> samba-3.0.0.ebuild:
+  minor ebuild fixes.
 
 *samba-3.0.0 (25 Sep 2003)
 
diff --git a/net-fs/samba/Manifest b/net-fs/samba/Manifest
index 1fa4422736f6..6e8335051c71 100644
--- a/net-fs/samba/Manifest
+++ b/net-fs/samba/Manifest
@@ -1,30 +1,30 @@
+MD5 7f02574e620d836fd3c0d88df746bfbf ChangeLog 11119
 MD5 b4f7c9e6b05c610bf52033ed430de265 samba-2.2.8.ebuild 10688
-MD5 eb3b540cc665551c42cae5d04e84cba5 samba-3.0.0_rc4.ebuild 9605
 MD5 c6ca541cd6ede56525c6b8f2c02eb60d samba-2.2.8a.ebuild 10847
-MD5 83dd5f74c4fb66d697648ec38148b80a ChangeLog 11027
-MD5 90ef6452bd6964a087a05073d1591cd0 samba-3.0.0.ebuild 9606
-MD5 23bf9d13bd13e51abb07688b00cab9b6 files/winbind-init 896
+MD5 f9ae9b62d92d4006947fea94e0dd8db2 samba-3.0.0.ebuild 9474
+MD5 eb3b540cc665551c42cae5d04e84cba5 samba-3.0.0_rc4.ebuild 9605
+MD5 fd2382184b6a07e63cb07ff26b578fd2 files/config-svc-smbd+nmbd 784
+MD5 f81075bc9908642f554abe7b46124a00 files/digest-samba-2.2.8 134
 MD5 9780745de080ee53a34c1b2f9fb1f228 files/digest-samba-2.2.8a 135
-MD5 ba636412fdffb621dcd28e79fb247d7c files/swat.xinetd 525
+MD5 b610fd35d7a0a9de510e31d85345d14a files/lmhosts 124
+MD5 f402c2c4103f4c13ac3cc5fa165940db files/nonroot-bind.diff 757
+MD5 5d3129a0f6bcbec6ec91d217881a34e1 files/nsswitch.conf-winbind 298
+MD5 092f8dd0b4f6f5da13ce2daafb534978 files/nsswitch.conf-wins 390
 MD5 20997c75e29fec20efbb2cd6695cd3a9 files/recycle.conf 776
-MD5 cf9aae0d1cf55f47d1434f6bf1cee52e files/smbldap_conf.pm 7093
 MD5 cbaa5a39d9bd67b13f8131b426a4256b files/samba-2.2.5-gp-reloc-fix.patch 431
-MD5 092f8dd0b4f6f5da13ce2daafb534978 files/nsswitch.conf-wins 390
+MD5 8289eda694b35875eec6df5cc3f50c86 files/samba-2.2.6-libresolv.patch 540
 MD5 e66c856d458f6ded226460c605854547 files/samba-init 892
-MD5 fd2382184b6a07e63cb07ff26b578fd2 files/config-svc-smbd+nmbd 784
-MD5 f402c2c4103f4c13ac3cc5fa165940db files/nonroot-bind.diff 757
-MD5 5d3129a0f6bcbec6ec91d217881a34e1 files/nsswitch.conf-winbind 298
-MD5 b610fd35d7a0a9de510e31d85345d14a files/lmhosts 124
-MD5 516ca38dfc67b7cd7356f93ad2cf75b9 files/samba-3.0.0-python-setup.patch 767
-MD5 2a8e771c143fc19819c4b6bd022f12ed files/smb.conf.example 16181
 MD5 9faccd0fa1bfb58b4ffa0e9dd01e1ec6 files/samba-slapd-include.conf 497
-MD5 60e527174c1b2c53126dbbedb3cae0f7 files/samba-2.2.8-statfs.patch 209
-MD5 f81075bc9908642f554abe7b46124a00 files/digest-samba-2.2.8 134
-MD5 00dd502e04f67e67fbb6164b6b4669c7 files/digest-samba-3.0.0 135
-MD5 9560b7e29d3a65db029fc1800e84abcc files/samba-pdb_ldap-exop.patch 3921
-MD5 3721b81198a029319546e6ef56e5c493 files/smbusers 202
-MD5 ce5400ed75143be061711d2c1d51a081 files/system-auth-winbind 867
 MD5 16a0f8dc632f6701c1fe5832488cc43e files/samba-svc 994
 MD5 b6cdc1468e45f92f19873e0c6c5b6e94 files/samba.pam 332
+MD5 2a8e771c143fc19819c4b6bd022f12ed files/smb.conf.example 16181
+MD5 cf9aae0d1cf55f47d1434f6bf1cee52e files/smbldap_conf.pm 7093
+MD5 3721b81198a029319546e6ef56e5c493 files/smbusers 202
+MD5 ba636412fdffb621dcd28e79fb247d7c files/swat.xinetd 525
+MD5 ce5400ed75143be061711d2c1d51a081 files/system-auth-winbind 867
+MD5 23bf9d13bd13e51abb07688b00cab9b6 files/winbind-init 896
+MD5 9560b7e29d3a65db029fc1800e84abcc files/samba-pdb_ldap-exop.patch 3921
+MD5 00dd502e04f67e67fbb6164b6b4669c7 files/digest-samba-3.0.0 135
+MD5 516ca38dfc67b7cd7356f93ad2cf75b9 files/samba-3.0.0-python-setup.patch 767
+MD5 60e527174c1b2c53126dbbedb3cae0f7 files/samba-2.2.8-statfs.patch 209
 MD5 800c440c35d319c5243d944683759acf files/digest-samba-3.0.0_rc4 138
-MD5 8289eda694b35875eec6df5cc3f50c86 files/samba-2.2.6-libresolv.patch 540
diff --git a/net-fs/samba/samba-3.0.0.ebuild b/net-fs/samba/samba-3.0.0.ebuild
index d33257faeb7e..6f4df40428af 100644
--- a/net-fs/samba/samba-3.0.0.ebuild
+++ b/net-fs/samba/samba-3.0.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 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.ebuild,v 1.1 2003/09/25 10:39:51 phosphan Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-fs/samba/samba-3.0.0.ebuild,v 1.2 2003/09/25 19:08:26 mholzer Exp $
 
 inherit eutils
 
@@ -15,10 +15,9 @@ VSCAN_VER=0.3.4
 VSCAN_MODS=${VSCAN_MODS:=fprot mks openantivirus sophos trend icap} #kapersky
 # To build the "kapersky" plugin, the kapersky lib must be installed.
 
-_CVS="-${PV/_/}"
-S=${WORKDIR}/${PN}${_CVS}
+S=${WORKDIR}/${P}
 
-SRC_URI="mirror://samba/rc/${PN}${_CVS}.tar.bz2
+SRC_URI="mirror://samba/${P}.tar.bz2
 	oav? mirror://sourceforge/openantivirus/${PN}-vscan-${VSCAN_VER}.tar.bz2"
 #	oav? http://www.openantivirus.org/snapshots/${PN}-vscan-${VSCAN_VER}.tar.gz"
 
@@ -42,13 +41,9 @@ src_unpack() {
 	unpack ${A} || die
 	cd ${S} || die
 
-	# Clean up CVS
-	#find . -name .cvsignore | xargs rm -f
-	#find . -name CVS | xargs rm -rf
-
 	# Add patch(es)
 	#Next one is from eger@cc.gatech.edu :)
-	patch -p1 <${FILESDIR}/samba-3.0.0-python-setup.patch || die
+	epatch ${FILESDIR}/samba-3.0.0-python-setup.patch || die
 	#Fix for bug #27858
 	if [ "${ARCH}" = "sparc" ]
 	then