empty dirs disappearance fixed (bug #53976)

3 files changed, 37 insertions, 39 deletions

diff --git a/net-fs/samba/ChangeLog b/net-fs/samba/ChangeLog
index f11bf9403e36..a0447f86d9f8 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.93 2004/07/28 05:04:37 kumba Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-fs/samba/ChangeLog,v 1.94 2004/07/30 10:07:38 satya Exp $
+
+  30 Jul 2004; Christian Andreetta <satya@gentoo.org> samba-3.0.5-r1.ebuild:
+  empty dirs disappearance fixed (bug #53976)
 
   28 Jul 2004; Joshua Kinard <kumba@gentoo.org> samba-3.0.5-r1.ebuild,
   samba-3.0.5.ebuild:
diff --git a/net-fs/samba/Manifest b/net-fs/samba/Manifest
index 9635f229e291..a71214ba6841 100644
--- a/net-fs/samba/Manifest
+++ b/net-fs/samba/Manifest
@@ -1,51 +1,41 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 ea7dfbf31185b5984cae1c8300a0f03e ChangeLog 18207
-MD5 41299f246433a1a55c8fccc77ccd709e metadata.xml 491
 MD5 7d7c900829bc2bdf39895d5890a0d20d samba-3.0.4-r1.ebuild 11146
-MD5 631e7b8e2b12e959e327a07e1e1e78f4 samba-3.0.5-r1.ebuild 13434
-MD5 4505c7b9cd715168b75a4dfb5c4ac294 samba-3.0.5.ebuild 11142
+MD5 6db11abb14715e2cf819a986bb1b1d7c samba-3.0.5-r1.ebuild 13680
 MD5 633511d04d7a7d7702c17089c85ba697 samba-3.0.1-r1.ebuild 11333
 MD5 df4f73693b725799675e37ba3f90643f samba-3.0.2a-r2.ebuild 12249
+MD5 ea7dfbf31185b5984cae1c8300a0f03e ChangeLog 18207
+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 83b384d6b47ecbf20525cc9a7baaa77a files/samba-init 1093
 MD5 fd2382184b6a07e63cb07ff26b578fd2 files/config-svc-smbd+nmbd 784
-MD5 a86336201c2eced7a6e5a5138514e2f7 files/digest-samba-3.0.4-r1 203
-MD5 de43ff30dd5f1431590fd62a997e71b4 files/samba-3.0.4-python-setup.patch 833
-MD5 519576a9448b86f1a7baab18204533a5 files/lmhosts 126
 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 de43ff30dd5f1431590fd62a997e71b4 files/samba-3.0.x-python-setup.patch 833
 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 8ea7b443dd580aaaaf7e9e896eba54f2 files/samba-3.0.x-smbumount-uid32.patch 425
+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 8c1f1e3655e12b85102ce257f3efad62 files/smb.conf.example-samba3 20762
-MD5 a7cc90ba23d86b1d90f65645826dde19 files/smbldap_conf.pm 7095
+MD5 9560b7e29d3a65db029fc1800e84abcc files/samba-pdb_ldap-exop.patch 3921
 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 fcebd975211fecf647f6cecf26ba5c96 files/samba-3.0.4.patch 8086
-MD5 f3a4b3b0a8162ae87779846d7e6adbbf files/digest-samba-3.0.1-r1 202
-MD5 341521b710d02d57a70acd49b1d4c06b files/samba-conf 1291
 MD5 990fe15ff8a0e79f39069fff6475536d files/samba-3.0.2a-smbprint.patch 1224
+MD5 6acf6a5e92ff2cfc5f09b88f5d01b63e files/samba-svc 975
+MD5 b6cdc1468e45f92f19873e0c6c5b6e94 files/samba.pam 332
 MD5 81931e1d9764390841dec0d0f327a114 files/digest-samba-3.0.2a-r2 204
-MD5 43a38a5331805a2fa61e899f18413ccd files/digest-samba-3.0.5 203
-MD5 4356a18128f7107bb7a2270bea78b3aa files/digest-samba-3.0.5-r1 203
-MD5 de43ff30dd5f1431590fd62a997e71b4 files/samba-3.0.x-python-setup.patch 833
-MD5 8ea7b443dd580aaaaf7e9e896eba54f2 files/samba-3.0.x-smbumount-uid32.patch 425
+MD5 de43ff30dd5f1431590fd62a997e71b4 files/samba-3.0.4-python-setup.patch 833
 MD5 fcebd975211fecf647f6cecf26ba5c96 files/samba-3.0.x.patch 8086
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.9.8 (GNU/Linux)
-
-iD8DBQFBCHdkHTu7gpaalycRAnZPAJ4r4a9q5hjzPA+dFN7VozH6PuQOcACeLgku
-2nD4TdK5qDyLXHLOGhWtnXk=
-=eIOP
------END PGP SIGNATURE-----
+MD5 8289eda694b35875eec6df5cc3f50c86 files/samba-2.2.6-libresolv.patch 540
diff --git a/net-fs/samba/samba-3.0.5-r1.ebuild b/net-fs/samba/samba-3.0.5-r1.ebuild
index d9afd9ee5cb0..74b31c928257 100644
--- a/net-fs/samba/samba-3.0.5-r1.ebuild
+++ b/net-fs/samba/samba-3.0.5-r1.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.5-r1.ebuild,v 1.5 2004/07/29 04:04:40 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-fs/samba/samba-3.0.5-r1.ebuild,v 1.6 2004/07/30 10:07:38 satya Exp $
 
 inherit eutils flag-o-matic
 
@@ -301,12 +301,17 @@ src_install() {
 	# dirs -----------------------------------------------------------------
 	diropts -m0700
 	dodir /etc/samba/private
+	touch ${D}/etc/samba/private/.keep
 	diropts -m1777
 	dodir /var/spool/samba
+	touch ${D}/var/spool/samba/.keep
 	diropts -m0755
 	dodir /var/{log,run,cache}/samba
 	dodir /var/lib/samba/{netlogon,profiles}
 	dodir /var/lib/samba/printers/{W32X86,WIN40,W32ALPHA,W32MIPS,W32PPC}
+	touch ${D}/var/{log,run,cache}/samba/.keep
+	touch ${D}/var/lib/samba/{netlogon,profiles}/.keep
+	touch ${D}/var/lib/samba/printers/{W32X86,WIN40,W32ALPHA,W32MIPS,W32PPC}/.keep
 	# docs -----------------------------------------------------------------
 	docinto ""
 	dodoc ${S}/COPYING ${S}/Manifest ${S}/README ${S}/Roadmap ${S}/WHATSNEW.txt