Cleaning up 3.4 series, Replacing opts parameter with extra_commands, thanks to Billy DeVincentis <billydv1@verizon.net> bug 381527

Package-Manager: portage-2.1.10.3/cvs/Linux i686

18 files changed, 19 insertions, 1332 deletions

diff --git a/net-fs/samba/ChangeLog b/net-fs/samba/ChangeLog
index e6e89329b3c8..00fb8de2503d 100644
--- a/net-fs/samba/ChangeLog
+++ b/net-fs/samba/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-fs/samba
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-fs/samba/ChangeLog,v 1.487 2011/08/27 11:27:07 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-fs/samba/ChangeLog,v 1.488 2011/09/11 19:43:56 vostorga Exp $
+
+  11 Sep 2011; Víctor Ostorga <vostorga@gentoo.org> files/3.5/samba.initd,
+  -samba-3.4.12.ebuild, files/3.6/samba.initd, -samba-3.4.14.ebuild,
+  files/samba4.initd:
+  Cleaning up 3.4 series, Replacing opts parameter with extra_commands, thanks
+  to Billy DeVincentis <billydv1@verizon.net> bug 381527
 
   27 Aug 2011; Raúl Porcel <armin76@gentoo.org> samba-3.5.11.ebuild:
   alpha/ia64/s390/sh/sparc stable wrt #377909
diff --git a/net-fs/samba/Manifest b/net-fs/samba/Manifest
index dca0af1a584d..41e3aa0852e6 100644
--- a/net-fs/samba/Manifest
+++ b/net-fs/samba/Manifest
@@ -1,24 +1,10 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-AUX 3.4/lmhosts 126 RMD160 c4ff63cf01158809311c97c768463826aa02127b SHA1 2d5be4b38357287050b25bbd9fdc3263801676ce SHA256 b4b9cad6cd728dac260f4716270bb5df09da5c84c76526ccbe6cccdb8818c56c
-AUX 3.4/nsswitch.conf-winbind 406 RMD160 7bbc3f7a4bdc4907bc45ad71fc0e17cc376d4e1e SHA1 0cd4966690d98802de94f0353ecf760c1a6d5245 SHA256 342657852ec465f78b1450a522211c2102ee07a65f8cb167a19ca5e277220867
-AUX 3.4/nsswitch.conf-wins 392 RMD160 bf1c0b6c3128be82a3f901eb3ef70d6d621df334 SHA1 2742757c188bfeae94d272eed66405e1a5417540 SHA256 508f76bc1abe15b49ef97b6033ae873f6d630bbcb99cd69b9babe55dc2554ea0
-AUX 3.4/samba-3.4.9-kerberos-dummy.patch 1564 RMD160 2c191039ced000dee21196022bacab9aca28484d SHA1 8fe01a09c2843cc98b1b4d6215242ca978771e1b SHA256 bd211b06000c9ba7cc2e454333d6c5bbf70702f26056481c4ec0e50e98c0cbe4
-AUX 3.4/samba.confd 1210 RMD160 78ecc93c7481b7df2f63a237ae952ceb44373fd3 SHA1 01a725cfea8039bfab5de695984f089e48eb739b SHA256 02ab523d695b5ae044b871923ad817f8931a6c20c5bfefad98a4369d7b3742e3
-AUX 3.4/samba.initd 1228 RMD160 9d6b0c510277f0430562175752b128e6b078b0c1 SHA1 2a7cd4852d73ce378e3f051c11fd1ae509c70b96 SHA256 a827bdeeff845f495bcf573bf51937c7988eb651fef69aeaa1752a808c08a97d
-AUX 3.4/samba.pam 397 RMD160 8f64b09e17e0c458a8156db3cc92a0413513e4fc SHA1 f39d48e07be8069885b51253c5b891a856b7b41e SHA256 86634f2d541370518d0958a73c04776ed5df2a3716ef128ff384459acce9cd38
-AUX 3.4/smb.conf.default 9660 RMD160 049024e0b489027a44e3ae7b03216ebba8a2d716 SHA1 00954aa58287ef49e9eb0f9f6a04dd509f8835f3 SHA256 8f4fc4d137a32f92b9bc1b64f76ea25a690881cf6f385b9ce9eb0c98f2b0b297
-AUX 3.4/smbusers 218 RMD160 6a8acc59ff824419c9f10db432ae8ed9d0ec5651 SHA1 5bad77d5e82f914b716722b4d5fa5126236b73ef SHA256 97562315c02ed571aca99ba857a1fab7550fa8dbbf3eebcb41157b2d5deb57b3
-AUX 3.4/swat.xinetd 527 RMD160 a4b3d8c6fef6417007fe17bba7737bf6c6821696 SHA1 706cfa524e14f16237f6f6a8039236b59e1beddc SHA256 f59fe771e6804296ac3a0a7c3ad88dd3ae2cd59b89c64af8924f6e0f2ad30cd0
-AUX 3.4/system-auth-winbind.pam 705 RMD160 f6275a470e06dc168cf39ef144ccc190901978ee SHA1 a8e4946fc4dd24b00b9ce7d8574795e987350462 SHA256 046ba3a997328eeeaffa65d662b90dc415a27c8a77f9e4402d2a979aace97dd7
 AUX 3.5/lmhosts 126 RMD160 485c480c5d3203e5f6c3d769ea36d04682a4ce39 SHA1 149e536986bddaf961d77e73f3bf04f39212333d SHA256 f959c6e6b4179de24b2268c13b7cd8a8e400e43d0852f91dfb8dc8e48f56f80e
 AUX 3.5/nsswitch.conf-winbind 406 RMD160 43175297fb2ca9e364a7e07e6b1f7cec367f36f5 SHA1 16c57e5ba8d07ecc50d0e1a93df5bc82c4063764 SHA256 c6d461204201143f874f460df35f7fbb2345f93ed0d6c20b280c15864011e893
 AUX 3.5/nsswitch.conf-wins 392 RMD160 58b135036c4a7ecab97bf532b35da3d50693c4bf SHA1 7945e42a4d72e4604678add14ecdbb9bde8e9894 SHA256 3dbd18dc82371ef6f427dea1f626ee027d9d7be86036e2e10991f52f7041b5c8
 AUX 3.5/samba-3.5.6-kerberos-dummy.patch 1660 RMD160 a1077508f2a6a7ec2c9fb14f563be1baacdee4ed SHA1 708299aefaa213269065328475e5580925ace548 SHA256 bcc2b4ad1a4ff92221b4620cb1cf2915db19c527fb28308db7ef633c0e1f596e
 AUX 3.5/samba-3.5.8-uclib-build.patch 1750 RMD160 88cfa51290324bc71d7c7d982928f55ec5e8b354 SHA1 47a21922c1f5d78b881026ebf91b0583eead6f56 SHA256 ec3d8a21fcc41a65b0dd6ae8312b3da0705628ea1002e9e79574c5e20cbe689b
 AUX 3.5/samba.confd 1210 RMD160 78ecc93c7481b7df2f63a237ae952ceb44373fd3 SHA1 01a725cfea8039bfab5de695984f089e48eb739b SHA256 02ab523d695b5ae044b871923ad817f8931a6c20c5bfefad98a4369d7b3742e3
-AUX 3.5/samba.initd 1228 RMD160 a4c5502dc1234d18eb7810899e171987ad33262b SHA1 b1d6d1ff47e3d2c0f96dfb2743915404ae6d59c1 SHA256 691b7389b87a5b413487443e3569e95b99208bd8d9f7dfaf9d54b42a5fc2d41a
+AUX 3.5/samba.initd 1238 RMD160 72399ae56c861d184fc451015dfc5448d60a2410 SHA1 8d11959b5c138ace55c7b54d37ad7d9c67ff1bf2 SHA256 f175cefdfe7e300f137ead8be5e9ad97ad3a97c8e0d7cfa59ac5b22e82ca246e
 AUX 3.5/samba.pam 397 RMD160 8f64b09e17e0c458a8156db3cc92a0413513e4fc SHA1 f39d48e07be8069885b51253c5b891a856b7b41e SHA256 86634f2d541370518d0958a73c04776ed5df2a3716ef128ff384459acce9cd38
 AUX 3.5/smb.conf.default 9660 RMD160 049024e0b489027a44e3ae7b03216ebba8a2d716 SHA1 00954aa58287ef49e9eb0f9f6a04dd509f8835f3 SHA256 8f4fc4d137a32f92b9bc1b64f76ea25a690881cf6f385b9ce9eb0c98f2b0b297
 AUX 3.5/smb.conf.default.patch 2873 RMD160 f0e7ae6a41959dacdf9f71a14e3c9477f07bbf1b SHA1 e1066dc4db5566d2b5accac4febf46e449866557 SHA256 b617b011fa8be51d1f6da18dcede5bf0fc96d50551028aa2b3a5521322b4c8c7
@@ -27,31 +13,20 @@ AUX 3.5/swat.xinetd 527 RMD160 8b2364e6fda8cecc75feef8129347ebc545ecc43 SHA1 98f
 AUX 3.5/system-auth-winbind.pam 705 RMD160 666533e99283449d60a97fd4fcd704d72212b871 SHA1 a1fe11d7a4f7501c938c03121e4ad950c515f75e SHA256 eca81593dc1b3e2be19bba7a128d71474243216a7783ed788320ca51cf6ea6c7
 AUX 3.6/lmhosts 125 RMD160 352d66c815ec164196bc9daf70b08b36d1447972 SHA1 ee122d2e006c8dc1e1f0a72db76bb6b3c326d849 SHA256 0bcbc9c3cfb44e31ccdc0930a1bcacc4e2b0fd96e5d38a56234a5133707a1826
 AUX 3.6/samba.confd 1210 RMD160 78ecc93c7481b7df2f63a237ae952ceb44373fd3 SHA1 01a725cfea8039bfab5de695984f089e48eb739b SHA256 02ab523d695b5ae044b871923ad817f8931a6c20c5bfefad98a4369d7b3742e3
-AUX 3.6/samba.initd 1226 RMD160 6e4b32fe49d319dd8e80c6695bd2111c9c51622d SHA1 19ddcec9155a5408a5233e0bed3571ee622859a3 SHA256 9ca1ca4d2af609675f049f296f1573746481c91a522a505c1b2ee80eb5726d9b
+AUX 3.6/samba.initd 1238 RMD160 bdb49ad44528f053597dd963203d728450fcd4ed SHA1 056ea2a3026392c3e2a0853866f11ad9fea71174 SHA256 0b5440347e595cdcfbf064b70194f89f0af426620d194fa5e8587b17eb03e251
 AUX 3.6/samba.pam 397 RMD160 8f64b09e17e0c458a8156db3cc92a0413513e4fc SHA1 f39d48e07be8069885b51253c5b891a856b7b41e SHA256 86634f2d541370518d0958a73c04776ed5df2a3716ef128ff384459acce9cd38
 AUX 3.6/smb.conf.default.patch 2385 RMD160 807cc1e9d18e41d4f15fec2ef675bc8bbbdeab92 SHA1 d3244cf26702945fb686a0fbf75be8adc161f379 SHA256 2140436e553e5dfc0b472e3a09a597de61f15847f23e8f92b9f561a6b9164034
 AUX 3.6/smbusers 217 RMD160 3dd2a60bbaf206ad7343ea80509b44a84459a72a SHA1 a8114a2ff5b03e3c8f23104a9bd28381044ce413 SHA256 c4e808dc0d0a397e777225c6f2b4008d52979b2a4969ceee3211a8bd9d58703f
 AUX 3.6/swat.xinetd 526 RMD160 2a407763cfacfbe9b31c0901e43b4d227ea02a12 SHA1 88c6db599a1463dfd4c69392fc7374453c50ad00 SHA256 59dbb1e4669cfd5c72dacc8d8aed269f169e827338e6d6e92fa2a8e445a3ceac
 AUX 3.6/system-auth-winbind.pam 704 RMD160 4b9220ea16830f6ccb3afbcd2bef9b074c02f749 SHA1 d8ab709fb750300bcf642064015fddd1a9c3ed23 SHA256 42c80d953da2472d789c3de1311045285428a15562f7ad2371ef214d8ea7bf56
 AUX samba-3.4.2-lib.tevent.python.mk 177 RMD160 3ed0264790f5ce15106528cd485c83611f6ebeb5 SHA1 ab048fb7ba236621d82cc305ce85d129d38d32a8 SHA256 3eab52d42a0cbc070d011a131f9a56f4b3da10b2791fec514948fd8d2d013153
-AUX samba4.initd 634 RMD160 0d1028c3520102a7a2c4a7dd73723b66295db740 SHA1 cf2e0bcdb1783f1fb2ed256442f051b98ad70d64 SHA256 df553df5cfb8d8305566accd62bff23dac4772ad4a2eb7d3b1328a5651113cad
-DIST samba-3.4.12.tar.gz 34842685 RMD160 b78ae82371fce179cddb8dfd508d8075788082d0 SHA1 89c18711cf585de415c4e7e50e83596dc583cc3e SHA256 89c0862a683d1c5f0b8710df1ae6f628aa4530bbe5cbb11cf7415b1b0446f028
-DIST samba-3.4.14.tar.gz 34803817 RMD160 54fdadbcfa9e40a5b057a317ac39ed4882c87bd6 SHA1 b7a0d3f10eacdfde6fbf6753b65917de0099ba0f SHA256 0c44883213859c7e45c89471194f8cab04917b1610213df5df0986913b1b99be
+AUX samba4.initd 645 RMD160 2508155d7d2433d2063f5ca513212417e6bdb2a8 SHA1 6059190d5a7c797d8f20210915030d5e1cb8b6f2 SHA256 b32954a04fdf6061dc6a9a6cc72207b3ba77708cfdba656e5a5b312c15eb0a4c
 DIST samba-3.5.11.tar.gz 30752782 RMD160 b3ee1e044e9df417b0dcaf954a6a137db742cba3 SHA1 0801871ab6a11f7d8eb8bf32ff0b87896d263441 SHA256 fba5b7bced99a0651148d74f40031ac3ca3fc7869e2998bc85bf6fb3ddb16597
 DIST samba-3.6.0.tar.gz 28990069 RMD160 8e17800466443bd6529c2312eeec8acfab1d7f63 SHA1 c87e2481d755f3a7f22bae44ef2f22ca64b9d173 SHA256 e1c14569e4785758838e77852bc1e958c15405146cface568c25c5726802f53f
 DIST samba-4.0.0alpha11.tar.gz 13917363 RMD160 3ec5597de6a2c80eaa426712101777fa92786b5c SHA1 8ed2befbbd45f6501d9e6036bcdfb332431a7b4f SHA256 ec9f4a9153b9e2c233420642ee98a8b944322e8b39a9b6912430fb24e88b81b9
 DIST smb_traffic_analyzer_v2.diff.bz2 12226 RMD160 82f6d443d289253a184e5f5dda17d865cb79b2b5 SHA1 1dd5100447cb827aacb8bb18bf88b7b10955a38c SHA256 1bae7eafbe8ac2382313d5ab9d43d73ba64b63a714f0f588516952d476fb868d
-EBUILD samba-3.4.12.ebuild 11868 RMD160 f4a947beec3cceb95e1241991a827e673913aee3 SHA1 76ef9617d3604eb6941a13bae2f92e2816bdc223 SHA256 b72494103bf6f78691ec952bd878687b56671a1914e305a56a4728d22a410bb1
-EBUILD samba-3.4.14.ebuild 11879 RMD160 3a4d7efbacac572151763c6e9f9e74e9738f969d SHA1 0147125a72bc06fbea0e01f416b6ab0d9707b2dc SHA256 8210ed5c7a21f7e01f29cc92679a451a31e98d84f0eab44c26e30aaa80576e69
 EBUILD samba-3.5.11.ebuild 12035 RMD160 4694eae59c965bddfe1f05c905193d7c6666249c SHA1 8569b7ca068323525087e57d49b6db59bfe65dfb SHA256 f68798341db54a9f023aefc89797a03b374be792ab03af71ce13031c0352172e
 EBUILD samba-3.6.0.ebuild 11300 RMD160 3fd945a8330839a61ee266c1e6f5482e70471fe2 SHA1 7237a324a76e9560629460afdd368339343c0042 SHA256 430bf06dc0aa8ae1dc2a52cccaa445a013af2da42ede16bc75f08c72830efa0d
 EBUILD samba-4.0.0_alpha11.ebuild 4231 RMD160 efebbeed51868bf0cf51f6151b531f3e65834db2 SHA1 49169a33b69d1a69ecc102d8010c7b11f9256117 SHA256 02427fccf34de0f6aea8960d664b85a51fb80cce7bd107bc53111df386fb0660
-MISC ChangeLog 81880 RMD160 a1c048027924d3a3b68c08ddf09e8eb6d94ac7e1 SHA1 a6f3b6d4c6b3f48af852bddd882ff782005a4725 SHA256 8ee0dd51b752ead18b3a6b67b174ad1c382227b6a43a795b86d03d18fd2217a2
+MISC ChangeLog 82185 RMD160 7305d95ffcbfb141931aebc5c307306f2bd3cc8a SHA1 5d3bc40ebdbf399ec1da2045df67a494ccdbac0d SHA256 91174782d22f4edbad6708495a67f8ec2961fd21304b09afff77745b0a96d7f5
 MISC metadata.xml 1435 RMD160 cbeae62707473b88127daa6170e8ca58861ef38b SHA1 32ff9e4f94646cc85bca64f208ea19faae1e2075 SHA256 bdff2271efdf94275d1a6096c48407c0372e088b10f85f19b989b18d50c2a5f0
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
-
-iEYEARECAAYFAk5Y1JEACgkQuQc30/atMkD7vgCfRItqeoV9IjNweOCyIx3Ma/ly
-NEYAnj2Bt+9GQ/dO0BrLbyz0FZCrguHj
-=YxJl
------END PGP SIGNATURE-----
diff --git a/net-fs/samba/files/3.4/lmhosts b/net-fs/samba/files/3.4/lmhosts
deleted file mode 100644
index a43ef438dce9..000000000000
--- a/net-fs/samba/files/3.4/lmhosts
+++ /dev/null
@@ -1,2 +0,0 @@
-# $Header: /var/cvsroot/gentoo-x86/net-fs/samba/files/3.4/lmhosts,v 1.1 2010/02/26 20:11:18 patrick Exp $
-127.0.0.1 localhost
diff --git a/net-fs/samba/files/3.4/nsswitch.conf-winbind b/net-fs/samba/files/3.4/nsswitch.conf-winbind
deleted file mode 100644
index 1b2523413045..000000000000
--- a/net-fs/samba/files/3.4/nsswitch.conf-winbind
+++ /dev/null
@@ -1,17 +0,0 @@
-# $Header: /var/cvsroot/gentoo-x86/net-fs/samba/files/3.4/nsswitch.conf-winbind,v 1.1 2010/02/26 20:11:18 patrick Exp $
-passwd:      files winbind
-group:       files winbind
-
-hosts:       files dns
-networks:    files dns
-
-services:    db files
-protocols:   db files
-rpc:         db files
-ethers:      db files
-netmasks:    files
-netgroup:    files
-bootparams:  files
-
-automount:   files
-aliases:     files
diff --git a/net-fs/samba/files/3.4/nsswitch.conf-wins b/net-fs/samba/files/3.4/nsswitch.conf-wins
deleted file mode 100644
index 48fc6c2e780c..000000000000
--- a/net-fs/samba/files/3.4/nsswitch.conf-wins
+++ /dev/null
@@ -1,17 +0,0 @@
-# $Header: /var/cvsroot/gentoo-x86/net-fs/samba/files/3.4/nsswitch.conf-wins,v 1.1 2010/02/26 20:11:18 patrick Exp $
-passwd:      files
-group:       files
-
-hosts:       files dns wins
-networks:    files dns
-
-services:    db files
-protocols:   db files
-rpc:         db files
-ethers:      db files
-netmasks:    files
-netgroup:    files
-bootparams:  files
-
-automount:   files
-aliases:     files
diff --git a/net-fs/samba/files/3.4/samba-3.4.9-kerberos-dummy.patch b/net-fs/samba/files/3.4/samba-3.4.9-kerberos-dummy.patch
deleted file mode 100644
index fa52c589f6c7..000000000000
--- a/net-fs/samba/files/3.4/samba-3.4.9-kerberos-dummy.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-diff -NrU5 samba-3.4.9.original/source3/include/krb5_protos.h samba-3.4.9/source3/include/krb5_protos.h
---- samba-3.4.9.original/source3/include/krb5_protos.h	2010-09-09 08:23:21.000000000 -0600
-+++ samba-3.4.9/source3/include/krb5_protos.h	2010-12-23 08:39:02.000000000 -0600
-@@ -86,14 +86,10 @@
- 					    const char *name,
- 					    krb5_principal *principal);
- bool smb_krb5_principal_compare_any_realm(krb5_context context,
- 					  krb5_const_principal princ1,
- 					  krb5_const_principal princ2);
--int cli_krb5_get_ticket(const char *principal, time_t time_offset,
--			DATA_BLOB *ticket, DATA_BLOB *session_key_krb5,
--			uint32 extra_ap_opts, const char *ccname,
--			time_t *tgs_expire);
- krb5_error_code smb_krb5_renew_ticket(const char *ccache_string, const char *client_string, const char *service_string, time_t *expire_time);
- krb5_error_code kpasswd_err_to_krb5_err(krb5_error_code res_code);
- krb5_error_code smb_krb5_gen_netbios_krb5_address(smb_krb5_addresses **kerb_addr);
- krb5_error_code smb_krb5_free_addresses(krb5_context context, smb_krb5_addresses *addr);
- NTSTATUS krb5_to_nt_status(krb5_error_code kerberos_error);
-@@ -143,5 +139,9 @@
- 				   krb5_creds **creds_p);
- char *smb_krb5_principal_get_realm(krb5_context context,
- 				   krb5_principal principal);
- #endif /* HAVE_KRB5 */
- 
-+int cli_krb5_get_ticket(const char *principal, time_t time_offset,
-+                        DATA_BLOB *ticket, DATA_BLOB *session_key_krb5,
-+                        uint32 extra_ap_opts, const char *ccname,
-+                        time_t *tgs_expire);
diff --git a/net-fs/samba/files/3.4/samba.confd b/net-fs/samba/files/3.4/samba.confd
deleted file mode 100644
index 1b329dae6b18..000000000000
--- a/net-fs/samba/files/3.4/samba.confd
+++ /dev/null
@@ -1,28 +0,0 @@
-#add "winbind" to the daemon_list if you also want winbind to start
-daemon_list="smbd nmbd"
-
-#----------------------------------------------------------------------------
-# Daemons calls: <daemon_name>_<command_option>
-#----------------------------------------------------------------------------
-my_service_name="samba"
-my_service_PRE="unset TMP TMPDIR"
-my_service_POST=""
-
-#----------------------------------------------------------------------------
-# Daemons calls: <daemon_name>_<command_option>
-#----------------------------------------------------------------------------
-smbd_start_options="-D"
-smbd_start="start-stop-daemon --start --exec /usr/sbin/smbd -- ${smbd_start_options}"
-smbd_stop="start-stop-daemon --stop --exec /usr/sbin/smbd"
-smbd_reload="killall -HUP smbd"
-
-nmbd_start_options="-D"
-nmbd_start="start-stop-daemon --start --exec /usr/sbin/nmbd -- ${nmbd_start_options}"
-nmbd_stop="start-stop-daemon --stop --exec /usr/sbin/nmbd"
-nmbd_reload="killall -HUP nmbd"
-
-winbind_start_options=""
-winbind_start="start-stop-daemon --start --exec /usr/sbin/winbindd -- ${winbind_start_options}"
-winbind_stop="start-stop-daemon --stop --exec /usr/sbin/winbindd"
-winbind_reload="killall -HUP winbindd"
-
diff --git a/net-fs/samba/files/3.4/samba.initd b/net-fs/samba/files/3.4/samba.initd
deleted file mode 100644
index 2815e4ecfbe6..000000000000
--- a/net-fs/samba/files/3.4/samba.initd
+++ /dev/null
@@ -1,59 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License, v2 or later
-# $Header: /var/cvsroot/gentoo-x86/net-fs/samba/files/3.4/samba.initd,v 1.2 2010/12/20 20:35:07 vostorga Exp $
-
-opts="reload"
-
-depend() {
-	after slapd
-	need net
-	use cupsd
-}
-
-DAEMONNAME="${SVCNAME##samba.}"
-[ "${DAEMONNAME}" != "samba" ] && daemon_list=${DAEMONNAME}
-
-signal_do() {
-	local signal="$1"
-	[ -z "${signal}" ] && return 0
-
-	local result=0 last_result=0 daemon= cmd_exec=
-	for daemon in ${daemon_list} ; do
-		eval cmd_exec=\$${daemon}_${signal}
-		if [ -n "${cmd_exec}" ]; then
-			ebegin "${my_service_name} -> ${signal}: ${daemon}"
-			#echo ${cmd} '->' ${!cmd}
-			${cmd_exec} > /dev/null
-			last_result=$?
-			eend ${last_result}
-		fi
-		result=$(( ${result} + ${last_result} ))
-	done
-	return ${result}
-}
-
-mkdir_sambadirs() {
-	[ -d /var/run/samba ] || mkdir -p /var/run/samba
-}
-
-start() {
-	${my_service_PRE}
-	mkdir_sambadirs
-	signal_do start && return 0
-	
-	eerror "Error: starting services (see system logs)"
-	signal_do stop
-	return 1
-}
-stop() {
-	${my_service_PRE}
-	if signal_do stop ; then
-	    ${my_service_POST}
-	    return 0
-	fi
-}
-reload() {
-	${my_service_PRE}
-	signal_do reload
-}
diff --git a/net-fs/samba/files/3.4/samba.pam b/net-fs/samba/files/3.4/samba.pam
deleted file mode 100644
index 91beadd478a4..000000000000
--- a/net-fs/samba/files/3.4/samba.pam
+++ /dev/null
@@ -1,8 +0,0 @@
-#%PAM-1.0
-# * pam_smbpass.so authenticates against the smbpasswd file
-# * changed Redhat's 'pam_stack' with 'include' for *BSD compatibility
-#    (Diego "Flameeyes" Petteno'): enable with pam>=0.78 only
-auth       required     pam_smbpass.so nodelay
-account    include      system-auth
-session    include      system-auth
-password   required     pam_smbpass.so nodelay smbconf=/etc/samba/smb.conf
diff --git a/net-fs/samba/files/3.4/smb.conf.default b/net-fs/samba/files/3.4/smb.conf.default
deleted file mode 100644
index 4c9a4a6d529f..000000000000
--- a/net-fs/samba/files/3.4/smb.conf.default
+++ /dev/null
@@ -1,271 +0,0 @@
-# This is the main Samba configuration file. You should read the
-# smb.conf(5) manual page in order to understand the options listed
-# here. Samba has a huge number of configurable options (perhaps too
-# many!) most of which are not shown in this example
-#
-# For a step to step guide on installing, configuring and using samba, 
-# read the Samba-HOWTO-Collection. This may be obtained from:
-#  http://www.samba.org/samba/docs/Samba-HOWTO-Collection.pdf
-#
-# Many working examples of smb.conf files can be found in the 
-# Samba-Guide which is generated daily and can be downloaded from: 
-#  http://www.samba.org/samba/docs/Samba-Guide.pdf
-#
-# Any line which starts with a ; (semi-colon) or a # (hash) 
-# is a comment and is ignored. In this example we will use a #
-# for commentry and a ; for parts of the config file that you
-# may wish to enable
-#
-# NOTE: Whenever you modify this file you should run the command "testparm"
-# to check that you have not made any basic syntactic errors. 
-#
-#======================= Global Settings =====================================
-[global]
-
-# workgroup = NT-Domain-Name or Workgroup-Name, eg: MIDEARTH
-   workgroup = MYGROUP
-
-# server string is the equivalent of the NT Description field
-   server string = Samba Server
-
-# Security mode. Defines in which mode Samba will operate. Possible 
-# values are share, user, server, domain and ads. Most people will want 
-# user level security. See the Samba-HOWTO-Collection for details.
-   security = user
-
-# This option is important for security. It allows you to restrict
-# connections to machines which are on your local network. The
-# following example restricts access to two C class networks and
-# the "loopback" interface. For more examples of the syntax see
-# the smb.conf man page
-;   hosts allow = 192.168.1. 192.168.2. 127.
-
-# If you want to automatically load your printer list rather
-# than setting them up individually then you'll need this
-   load printers = yes
-
-# you may wish to override the location of the printcap file
-;   printcap name = /etc/printcap
-
-# on SystemV system setting printcap name to lpstat should allow
-# you to automatically obtain a printer list from the SystemV spool
-# system
-;   printcap name = lpstat
-
-# It should not be necessary to specify the print system type unless
-# it is non-standard. Currently supported print systems include:
-# bsd, cups, sysv, plp, lprng, aix, hpux, qnx
-;   printing = cups
-
-# Uncomment this if you want a guest account, you must add this to /etc/passwd
-# otherwise the user "nobody" is used
-;  guest account = pcguest
-
-# this tells Samba to use a separate log file for each machine
-# that connects
-   log file = /var/log/samba/log.%m
-
-# Put a capping on the size of the log files (in Kb).
-   max log size = 50
-
-# Use password server option only with security = server
-# The argument list may include:
-#   password server = My_PDC_Name [My_BDC_Name] [My_Next_BDC_Name]
-# or to auto-locate the domain controller/s
-#   password server = *
-;   password server = <NT-Server-Name>
-
-# Use the realm option only with security = ads
-# Specifies the Active Directory realm the host is part of
-;   realm = MY_REALM
-
-# Backend to store user information in. New installations should 
-# use either tdbsam or ldapsam. smbpasswd is available for backwards 
-# compatibility. tdbsam requires no further configuration.
-;   passdb backend = tdbsam
-
-# Using the following line enables you to customise your configuration
-# on a per machine basis. The %m gets replaced with the netbios name
-# of the machine that is connecting.
-# Note: Consider carefully the location in the configuration file of
-#       this line.  The included file is read at that point.
-;   include = /etc/samba/smb.conf.%m
-
-# Configure Samba to use multiple interfaces
-# If you have multiple network interfaces then you must list them
-# here. See the man page for details.
-;   interfaces = 192.168.12.2/24 192.168.13.2/24 
-
-# Browser Control Options:
-# set local master to no if you don't want Samba to become a master
-# browser on your network. Otherwise the normal election rules apply
-;   local master = no
-
-# OS Level determines the precedence of this server in master browser
-# elections. The default value should be reasonable
-;   os level = 33
-
-# Domain Master specifies Samba to be the Domain Master Browser. This
-# allows Samba to collate browse lists between subnets. Don't use this
-# if you already have a Windows NT domain controller doing this job
-;   domain master = yes 
-
-# Preferred Master causes Samba to force a local browser election on startup
-# and gives it a slightly higher chance of winning the election
-;   preferred master = yes
-
-# Enable this if you want Samba to be a domain logon server for 
-# Windows95 workstations. 
-;   domain logons = yes
-
-# if you enable domain logons then you may want a per-machine or
-# per user logon script
-# run a specific logon batch file per workstation (machine)
-;   logon script = %m.bat
-# run a specific logon batch file per username
-;   logon script = %U.bat
-
-# Where to store roving profiles (only for Win95 and WinNT)
-#        %L substitutes for this servers netbios name, %U is username
-#        You must uncomment the [Profiles] share below
-;   logon path = \\%L\Profiles\%U
-
-# Windows Internet Name Serving Support Section:
-# WINS Support - Tells the NMBD component of Samba to enable it's WINS Server
-;   wins support = yes
-
-# WINS Server - Tells the NMBD components of Samba to be a WINS Client
-#	Note: Samba can be either a WINS Server, or a WINS Client, but NOT both
-;   wins server = w.x.y.z
-
-# WINS Proxy - Tells Samba to answer name resolution queries on
-# behalf of a non WINS capable client, for this to work there must be
-# at least one	WINS Server on the network. The default is NO.
-;   wins proxy = yes
-
-# DNS Proxy - tells Samba whether or not to try to resolve NetBIOS names
-# via DNS nslookups. The default is NO.
-   dns proxy = no 
-
-# These scripts are used on a domain controller or stand-alone 
-# machine to add or delete corresponding unix accounts
-;  add user script = /usr/sbin/useradd %u
-;  add group script = /usr/sbin/groupadd %g
-;  add machine script = /usr/sbin/adduser -n -g machines -c Machine -d /dev/null -s /bin/false %u
-;  delete user script = /usr/sbin/userdel %u
-;  delete user from group script = /usr/sbin/deluser %u %g
-;  delete group script = /usr/sbin/groupdel %g
-
-
-#============================ Share Definitions ==============================
-[homes]
-   comment = Home Directories
-   browseable = no
-   writable = yes
-
-# Un-comment the following and create the netlogon directory for Domain Logons
-; [netlogon]
-;   comment = Network Logon Service
-;   path = /var/lib/samba/netlogon
-;   guest ok = yes
-;   writable = no
-;   share modes = no
-
-
-# Un-comment the following to provide a specific roving profile share
-# the default is to use the user's home directory
-;[Profiles]
-;    path = /var/lib/samba/profiles
-;    browseable = no
-;    guest ok = yes
-
-
-# NOTE: If you have a BSD-style print system there is no need to 
-# specifically define each individual printer
-[printers]
-   comment = All Printers
-   path = /var/spool/samba
-   browseable = no
-# Set public = yes to allow user 'guest account' to print
-   guest ok = no
-   writable = no
-   printable = yes
-
-# This one is useful for people to share files
-;[tmp]
-;   comment = Temporary file space
-;   path = /tmp
-;   read only = no
-;   public = yes
-
-# A publicly accessible directory, but read only, except for people in
-# the "staff" group
-;[public]
-;   comment = Public Stuff
-;   path = /home/samba
-;   public = yes
-;   writable = yes
-;   printable = no
-;   write list = @staff
-
-# Other examples. 
-#
-# A private printer, usable only by fred. Spool data will be placed in fred's
-# home directory. Note that fred must have write access to the spool directory,
-# wherever it is.
-;[fredsprn]
-;   comment = Fred's Printer
-;   valid users = fred
-;   path = /homes/fred
-;   printer = freds_printer
-;   public = no
-;   writable = no
-;   printable = yes
-
-# A private directory, usable only by fred. Note that fred requires write
-# access to the directory.
-;[fredsdir]
-;   comment = Fred's Service
-;   path = /usr/somewhere/private
-;   valid users = fred
-;   public = no
-;   writable = yes
-;   printable = no
-
-# a service which has a different directory for each machine that connects
-# this allows you to tailor configurations to incoming machines. You could
-# also use the %U option to tailor it by user name.
-# The %m gets replaced with the machine name that is connecting.
-;[pchome]
-;  comment = PC Directories
-;  path = /usr/pc/%m
-;  public = no
-;  writable = yes
-
-# A publicly accessible directory, read/write to all users. Note that all files
-# created in the directory by users will be owned by the default user, so
-# any user with access can delete any other user's files. Obviously this
-# directory must be writable by the default user. Another user could of course
-# be specified, in which case all files would be owned by that user instead.
-;[public]
-;   path = /usr/somewhere/else/public
-;   public = yes
-;   only guest = yes
-;   writable = yes
-;   printable = no
-
-# The following two entries demonstrate how to share a directory so that two
-# users can place files there that will be owned by the specific users. In this
-# setup, the directory should be writable by both users and should have the
-# sticky bit set on it to prevent abuse. Obviously this could be extended to
-# as many users as required.
-;[myshare]
-;   comment = Mary's and Fred's stuff
-;   path = /usr/somewhere/shared
-;   valid users = mary fred
-;   public = no
-;   writable = yes
-;   printable = no
-;   create mask = 0765
-
-
diff --git a/net-fs/samba/files/3.4/smbusers b/net-fs/samba/files/3.4/smbusers
deleted file mode 100644
index 3e9d75c153c0..000000000000
--- a/net-fs/samba/files/3.4/smbusers
+++ /dev/null
@@ -1,7 +0,0 @@
-# $Header: /var/cvsroot/gentoo-x86/net-fs/samba/files/3.4/smbusers,v 1.1 2010/02/26 20:11:18 patrick Exp $
-
-# Syntax:
-#   Unix_name = SMB_name1 SMB_name2 ...
-
-root = Administrator admin
-nobody = guest pcguest smbguest
diff --git a/net-fs/samba/files/3.4/swat.xinetd b/net-fs/samba/files/3.4/swat.xinetd
deleted file mode 100644
index 8f2dd4046007..000000000000
--- a/net-fs/samba/files/3.4/swat.xinetd
+++ /dev/null
@@ -1,17 +0,0 @@
-# default: off
-# description: SWAT is the Samba Web Admin Tool. Use swat \
-#	       to configure your Samba server. To use SWAT, \
-#	       connect to port 901 with your favorite web browser.
-# $Header: /var/cvsroot/gentoo-x86/net-fs/samba/files/3.4/swat.xinetd,v 1.1 2010/02/26 20:11:18 patrick Exp $
-
-service swat
-{
-	port            = 901
-	socket_type     = stream
-	wait            = no
-	only_from       = localhost
-	user            = root
-	server          = /usr/sbin/swat
-	log_on_failure += USERID
-	disable         = yes
-}
diff --git a/net-fs/samba/files/3.4/system-auth-winbind.pam b/net-fs/samba/files/3.4/system-auth-winbind.pam
deleted file mode 100644
index 65850901455d..000000000000
--- a/net-fs/samba/files/3.4/system-auth-winbind.pam
+++ /dev/null
@@ -1,18 +0,0 @@
-#%PAM-1.0
-# $Header: /var/cvsroot/gentoo-x86/net-fs/samba/files/3.4/system-auth-winbind.pam,v 1.1 2010/02/26 20:11:18 patrick Exp $
-
-auth        required      pam_env.so
-auth        sufficient    pam_winbind.so
-auth        sufficient    pam_unix.so likeauth nullok use_first_pass
-auth        required      pam_deny.so
-
-account     sufficient    pam_winbind.so
-account     required      pam_unix.so
-
-password    required      pam_cracklib.so retry=3
-password    sufficient    pam_unix.so nullok use_authtok md5 shadow
-password    required      pam_deny.so
-
-session     required      pam_mkhomedir.so skel=/etc/skel/ umask=0022 
-session     required      pam_limits.so
-session     required      pam_unix.so
diff --git a/net-fs/samba/files/3.5/samba.initd b/net-fs/samba/files/3.5/samba.initd
index a1a2fae1a973..fe6e87240faa 100644
--- a/net-fs/samba/files/3.5/samba.initd
+++ b/net-fs/samba/files/3.5/samba.initd
@@ -1,9 +1,9 @@
 #!/sbin/runscript
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License, v2 or later
-# $Header: /var/cvsroot/gentoo-x86/net-fs/samba/files/3.5/samba.initd,v 1.2 2010/12/20 20:35:07 vostorga Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-fs/samba/files/3.5/samba.initd,v 1.3 2011/09/11 19:43:56 vostorga Exp $
 
-opts="reload"
+extra_commands="reload"
 
 depend() {
 	after slapd
diff --git a/net-fs/samba/files/3.6/samba.initd b/net-fs/samba/files/3.6/samba.initd
index 10bc4d4b2f93..b371225f8666 100644
--- a/net-fs/samba/files/3.6/samba.initd
+++ b/net-fs/samba/files/3.6/samba.initd
@@ -1,9 +1,9 @@
 #!/sbin/runscript
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License, v2 or later
-# $Header: /var/cvsroot/gentoo-x86/net-fs/samba/files/3.6/samba.initd,v 1.1 2011/06/30 15:50:28 dagger Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-fs/samba/files/3.6/samba.initd,v 1.2 2011/09/11 19:43:56 vostorga Exp $
 
-opts="reload"
+extra_commands="reload"
 
 depend() {
 	after slapd
diff --git a/net-fs/samba/files/samba4.initd b/net-fs/samba/files/samba4.initd
index f7b8ff7f7871..96de2cee08e1 100644
--- a/net-fs/samba/files/samba4.initd
+++ b/net-fs/samba/files/samba4.initd
@@ -1,9 +1,9 @@
 #!/sbin/runscript
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-fs/samba/files/samba4.initd,v 1.1 2010/02/28 16:03:04 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-fs/samba/files/samba4.initd,v 1.2 2011/09/11 19:43:56 vostorga Exp $
 
-opts="reload"
+extra_commands="reload"
 
 description="The samba daemon init script"
 description_reload="Reloads the samba daemon"
diff --git a/net-fs/samba/samba-3.4.12.ebuild b/net-fs/samba/samba-3.4.12.ebuild
deleted file mode 100644
index b971bdd42ea5..000000000000
--- a/net-fs/samba/samba-3.4.12.ebuild
+++ /dev/null
@@ -1,411 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-fs/samba/samba-3.4.12.ebuild,v 1.7 2011/05/05 17:24:10 vostorga Exp $
-
-EAPI="2"
-
-inherit pam confutils versionator multilib
-
-MY_PV=${PV/_/}
-MY_P="${PN}-${MY_PV}"
-
-DESCRIPTION="Library bits of the samba network filesystem"
-HOMEPAGE="http://www.samba.org/"
-SRC_URI="mirror://samba/${P}.tar.gz"
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 s390 sh sparc x86"
-IUSE="acl addns ads aio avahi caps +client cluster cups debug doc examples fam
-	ldap ldb +netapi pam quota +readline +server +smbclient smbsharemodes swat
-	syslog winbind "
-
-DEPEND="dev-libs/popt
-	!net-fs/samba-client
-	!net-fs/samba-libs
-	!net-fs/samba-server
-	!net-fs/cifs-utils
-	sys-libs/talloc
-	sys-libs/tdb
-	virtual/libiconv
-	ads? ( virtual/krb5 sys-fs/e2fsprogs
-		client? ( sys-apps/keyutils ) )
-	avahi? ( net-dns/avahi[dbus] )
-	caps? ( sys-libs/libcap )
-	client? ( !net-fs/mount-cifs
-		dev-libs/iniparser )
-	cluster? ( dev-db/ctdb )
-	cups? ( net-print/cups )
-	debug? ( dev-libs/dmalloc )
-	fam? ( virtual/fam )
-	ldap? ( net-nds/openldap )
-	pam? ( virtual/pam
-		winbind? ( dev-libs/iniparser ) )
-	readline? ( >=sys-libs/readline-5.2 )
-	syslog? ( virtual/logger )"
-
-RDEPEND="${DEPEND}"
-
-# Disable tests since we don't want to build that much here
-RESTRICT="test"
-
-SBINPROGS=""
-BINPROGS=""
-
-if use server ; then
-	SBINPROGS="${SBINPROGS} bin/smbd bin/nmbd"
-	BINPROGS="${BINPROGS} bin/testparm bin/smbstatus bin/smbcontrol bin/pdbedit
-		bin/profiles bin/sharesec bin/eventlogadm"
-
-	use swat && SBINPROGS="${SBINPROGS} bin/swat"
-	use winbind && SBINPROGS="${SBINPROGS} bin/winbindd"
-	use ads && use winbind && SBIN_PROGS="${SBINPROGS} bin/winbind_krb5_locator"
-fi
-
-if use client ; then
-	BINPROGS="${BINPROGS} bin/smbclient bin/net bin/smbget bin/smbtree
-		bin/nmblookup bin/smbpasswd bin/rpcclient bin/smbcacls bin/smbcquotas
-		bin/ntlm_auth"
-
-	use ads && SBINPROGS="${SBINPROGS} bin/cifs.upcall"
-fi
-
-use cups && BINPROGS="${BINPROGS} bin/smbspool"
-use ldb && BINPROGS="${BINPROGS} bin/ldbedit bin/ldbsearch bin/ldbadd bin/ldbdel bin/ldbmodify bin/ldbrename";
-
-if use winbind ; then
-	BINPROGS="${BINPROGS} bin/wbinfo"
-	mymod_shared="--with-shared-modules=idmap_rid,idmap_hash"
-	use ldap && mymod_shared="${mymod_shared},idmap_adex,idmap_ldap"
-	use ads && mymod_shared="${mymod_shared},idmap_ad"
-fi
-
-S="${WORKDIR}/${MY_P}/source3"
-
-# TODO:
-# - enable iPrint on Prefix/OSX and Darwin?
-# - selftest-prefix? selftest?
-# - AFS?
-
-CONFDIR="${FILESDIR}/$(get_version_component_range 1-2)"
-
-pkg_setup() {
-	if use winbind &&
-		[[ $(tc-getCC)$ == *gcc* ]] &&
-		[[ $(gcc-major-version)$(gcc-minor-version) -lt 43 ]]
-	then
-		eerror "It is a known issue that ${P} will not build with "
-		eerror "winbind use flag enabled when using gcc < 4.3 ."
-		eerror "Please use at least the latest stable gcc version."
-		die "Using sys-devel/gcc < 4.3 with winbind use flag."
-	fi
-
-	confutils_use_depend_all ads ldap
-	confutils_use_depend_all swat server
-	confutils_use_depend_all client netapi
-}
-
-src_prepare() {
-	cp "${FILESDIR}/samba-3.4.2-lib.tevent.python.mk" "../lib/tevent/python.mk"
-
-	# ensure that winbind has correct ldflags (QA notice)
-	sed -i \
-		-e 's|LDSHFLAGS="|LDSHFLAGS="\\${LDFLAGS} |g' \
-		configure || die "sed failed"
-
-	epatch "${CONFDIR}"/${PN}-3.4.9-kerberos-dummy.patch
-}
-
-src_configure() {
-	local myconf
-
-	# Filter out -fPIE
-	[[ ${CHOST} == *-*bsd* ]] && myconf="${myconf} --disable-pie"
-
-	# Upstream refuses to make this configurable
-	use caps && export ac_cv_header_sys_capability_h=yes || export ac_cv_header_sys_capability_h=no
-
-	# use_with doesn't accept 2 USE-flags
-	if use client && use ads ; then
-		myconf="${myconf} --with-cifsupcall"
-	else
-		myconf="${myconf} --without-cifsupcall"
-	fi
-
-	# Notes:
-	# - automount is only needed in conjunction with NIS and we don't have that
-	# anymore => LDAP?
-	# - --without-dce-dfs and --without-nisplus-home can't be passed to configure but are disabled by default
-	econf ${myconf} \
-		--with-piddir=/var/run/samba \
-		--sysconfdir=/etc/samba \
-		--localstatedir=/var \
-		$(use_enable debug developer) \
-		--enable-largefile \
-		--enable-socket-wrapper \
-		--enable-nss-wrapper \
-		$(use_enable swat) \
-		$(use_enable debug dmalloc) \
-		$(use_enable cups) \
-		--disable-iprint \
-		$(use_enable fam) \
-		--enable-shared-libs \
-		--disable-dnssd \
-		$(use_enable avahi) \
-		--with-fhs \
-		--with-privatedir=/var/lib/samba/private \
-		--with-rootsbindir=/var/cache/samba \
-		--with-lockdir=/var/cache/samba \
-		--with-swatdir=/usr/share/doc/${PF}/swat \
-		--with-configdir=/etc/samba \
-		--with-logfilebase=/var/log/samba \
-		--with-pammodulesdir=$(getpam_mod_dir) \
-		--without-afs \
-		--without-fake-kaserver \
-		--without-vfs-afsacl \
-		$(use_with ldap) \
-		$(use_with ads) \
-		$(use_with ads krb5 /usr) \
-		$(use_with ads dnsupdate) \
-		--without-automount \
-		$(use_with client cifsmount) \
-		$(use_with pam) \
-		$(use_with pam pam_smbpass) \
-		$(use_with syslog) \
-		$(use_with quota quotas) \
-		$(use_with quota sys-quotas) \
-		--without-utmp \
-		--without-lib{talloc,tdb} \
-		$(use_with netapi libnetapi) \
-		$(use_with smbclient libsmbclient) \
-		$(use_with smbsharemodes libsmbsharemodes) \
-		$(use_with addns libaddns) \
-		$(use_with cluster ctdb /usr) \
-		$(use_with cluster cluster-support) \
-		$(use_with acl acl-support) \
-		$(use_with aio aio-support) \
-		--with-sendfile-support \
-		$(use_with winbind) \
-		${mymod_shared} \
-		--without-included-popt \
-		--without-included-iniparser
-}
-
-src_compile() {
-	# compile libs
-	if use addns ; then
-		einfo "make addns library"
-		emake libaddns || die "emake libaddns failed"
-	fi
-	if use netapi ; then
-		einfo "make netapi library"
-		emake libnetapi || die "emake libnetapi failed"
-	fi
-	if use smbclient ; then
-		einfo "make smbclient library"
-		emake libsmbclient || die "emake libsmbclient failed"
-	fi
-	if use smbsharemodes ; then
-		einfo "make smbsharemodes library"
-		emake libsmbsharemodes || die "emake libsmbsharemodes failed"
-	fi
-
-	# compile modules
-	emake modules || die "building modules failed"
-
-	# compile pam moudles
-	if use pam ; then
-		einfo "make pam modules"
-		emake pam_modules || die "emake pam_modules failed";
-	fi
-
-	# compile winbind nss modules
-	if use winbind ; then
-		einfo "make nss modules"
-		emake nss_modules || die "emake nss_modules failed";
-	fi
-
-	# compile utilities
-	if [ -n "${BINPROGS}" ] ; then
-		einfo "make binprogs"
-		emake ${BINPROGS} || die "emake binprogs failed";
-	fi
-	if [ -n "${SBINPROGS}" ] ; then
-		einfo "make sbinprogs"
-		emake ${SBINPROGS} || die "emake sbinprogs failed";
-	fi
-
-	if use client ; then
-		einfo "make {,u}mount.cifs"
-		emake bin/{,u}mount.cifs || die "emake {,u}mount.cifs failed"
-	fi
-}
-
-src_install() {
-	# install libs
-	if use addns ; then
-		einfo "install addns library"
-		emake installlibaddns DESTDIR="${D}" || die "emake install libaddns failed"
-	fi
-	if use netapi ; then
-		einfo "install netapi library"
-		emake installlibnetapi DESTDIR="${D}" || die "emake install libnetapi failed"
-	fi
-	if use smbclient ; then
-		einfo "install smbclient library"
-		emake installlibsmbclient DESTDIR="${D}" || die "emake install libsmbclient failed"
-	fi
-	if use smbsharemodes ; then
-		einfo "install smbsharemodes library"
-		emake installlibsmbsharemodes DESTDIR="${D}" || die "emake install libsmbsharemodes failed"
-	fi
-
-	# install modules
-	emake installmodules DESTDIR="${D}" || die "installing modules failed"
-
-	if use pam ; then
-		einfo "install pam modules"
-		emake installpammodules DESTDIR="${D}" || die "emake installpammodules failed"
-
-		if use winbind ; then
-			newpamd "${CONFDIR}/system-auth-winbind.pam" system-auth-winbind
-			doman ../docs/manpages/pam_winbind.8
-		fi
-
-		newpamd "${CONFDIR}/samba.pam" samba
-		dodoc pam_smbpass/README
-	fi
-
-	# Nsswitch extensions. Make link for wins and winbind resolvers
-	if use winbind ; then
-		einfo "install libwbclient"
-		emake installlibwbclient DESTDIR="${D}" || die "emake installlibwbclient failed"
-		dolib.so ../nsswitch/libnss_wins.so
-		dosym libnss_wins.so /usr/$(get_libdir)/libnss_wins.so.2
-		dolib.so ../nsswitch/libnss_winbind.so
-		dosym libnss_winbind.so /usr/$(get_libdir)/libnss_winbind.so.2
-		einfo "install libwbclient related manpages"
-		doman ../docs/manpages/idmap_rid.8
-		doman ../docs/manpages/idmap_hash.8
-		if use ldap ; then
-			doman ../docs/manpages/idmap_adex.8
-			doman ../docs/manpages/idmap_ldap.8
-		fi
-		if use ads ; then
-			doman ../docs/manpages/idmap_ad.8
-		fi
-	fi
-
-	# install binaries
-	insinto /usr
-	for prog in ${SBINPROGS} ; do
-		dosbin ${prog} || die "installing ${prog} failed"
-		doman ../docs/manpages/${prog/bin\/}* || die "doman failed"
-	done
-
-	for prog in ${BINPROGS} ; do
-		dobin ${prog} || die "installing ${prog} failed"
-		doman ../docs/manpages/${prog/bin\/}* || die "doman failed"
-	done
-
-	# install server components
-	if use server ; then
-		doman ../docs/manpages/vfs* ../docs/manpages/samba.7
-
-		diropts -m0700
-		keepdir /var/lib/samba/private
-
-		diropts -m1777
-		keepdir /var/spool/samba
-
-		diropts -m0755
-		keepdir /var/{cache,log}/samba
-		keepdir /var/lib/samba/{netlogon,profiles}
-		keepdir /var/lib/samba/printers/{W32X86,WIN40,W32ALPHA,W32MIPS,W32PPC,X64,IA64,COLOR}
-		keepdir /usr/$(get_libdir)/samba/{auth,pdb,rpc,idmap,nss_info,gpext}
-
-		newconfd "${CONFDIR}/samba.confd" samba
-		newinitd "${CONFDIR}/samba.initd" samba
-
-		insinto /etc/samba
-		doins "${CONFDIR}"/{smbusers,lmhosts}
-
-		if use ldap ; then
-			insinto /etc/openldap/schema
-			doins ../examples/LDAP/samba.schema
-		fi
-
-		if use swat ; then
-			insinto /etc/xinetd.d
-			newins "${CONFDIR}/swat.xinetd" swat
-			script/installswat.sh "${D}" "${ROOT}/usr/share/doc/${PF}/swat" "${S}" \
-				|| die "installing swat failed"
-		fi
-
-		dodoc ../MAINTAINERS ../README* ../Roadmap ../WHATSNEW.txt ../docs/THANKS
-	fi
-
-	# install client files ({u,}mount.cifs into /)
-	if use client ; then
-		into /
-		dosbin bin/{u,}mount.cifs || die "u/mount.cifs not around"
-		doman ../docs/manpages/{u,}mount.cifs.8 || die "can't create man pages"
-	fi
-
-	# install the spooler to cups
-	use cups && dosym /usr/bin/smbspool $(cups-config --serverbin)/backend/smb
-
-	# install misc files
-	insinto /etc/samba
-	doins "${CONFDIR}"/smb.conf.default
-	doman  ../docs/manpages/smb.conf.5
-
-	insinto /usr/"$(get_libdir)"/samba
-	doins ../codepages/{valid.dat,upcase.dat,lowcase.dat}
-
-	# install docs
-	if use doc ; then
-		dohtml -r ../docs/htmldocs/*
-		dodoc ../docs/*.pdf
-	fi
-
-	# install examples
-	if use examples ; then
-		einfo "install examples"
-		insinto /usr/share/doc/${PF}/examples
-
-		if use smbclient ; then
-			doins -r ../examples/libsmbclient
-		fi
-
-		if use winbind ; then
-			doins -r ../examples/pam_winbind ../examples/nss
-		fi
-
-		if use server ; then
-			doins -r \
-				../examples/{auth,autofs,dce-dfs,LDAP,logon,misc} \
-				../examples/{pdb,perfcounter,printer-accounting} \
-				../examples/{printing,scripts,tridge,validchars,VFS}
-		fi
-	fi
-
-	# Remove empty installation directories
-	rmdir --ignore-fail-on-non-empty \
-		"${D}/usr/$(get_libdir)/samba" \
-		"${D}/usr"/{sbin,bin} \
-		"${D}/usr/share"/{man,locale,} \
-		"${D}/var"/{run,lib/samba/private,lib/samba,lib,cache/samba,cache,} \
-	#	|| die "tried to remove non-empty dirs, this seems like a bug in the ebuild"
-}
-
-pkg_postinst() {
-	elog "The default passdb backend has been changed to 'tdbsam' in samba 3.4!"
-	elog "That breaks existing setups using the 'smbpasswd' backend without"
-	elog "explicit declaration!"
-	elog "Please use 'passdb backend = smbpasswd' if you would like to stick to the"
-	elog "'smbpasswd' backend or convert your smbpasswd entries using e.g. "
-	elog "'pdbedit -i smbpasswd -e tdbsam'."
-	elog "For further information make sure to read the release notes at"
-	elog "http://samba.org/samba/history/${P}.html and "
-	elog "http://samba.org/samba/history/${PN}-3.4.0.html"
-}
diff --git a/net-fs/samba/samba-3.4.14.ebuild b/net-fs/samba/samba-3.4.14.ebuild
deleted file mode 100644
index aa0f4b3c2f91..000000000000
--- a/net-fs/samba/samba-3.4.14.ebuild
+++ /dev/null
@@ -1,411 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-fs/samba/samba-3.4.14.ebuild,v 1.1 2011/08/09 17:14:39 vostorga Exp $
-
-EAPI="2"
-
-inherit pam confutils versionator multilib
-
-MY_PV=${PV/_/}
-MY_P="${PN}-${MY_PV}"
-
-DESCRIPTION="Library bits of the samba network filesystem"
-HOMEPAGE="http://www.samba.org/"
-SRC_URI="mirror://samba/${P}.tar.gz"
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
-IUSE="acl addns ads aio avahi caps +client cluster cups debug doc examples fam
-	ldap ldb +netapi pam quota +readline +server +smbclient smbsharemodes swat
-	syslog winbind "
-
-DEPEND="dev-libs/popt
-	!net-fs/samba-client
-	!net-fs/samba-libs
-	!net-fs/samba-server
-	!net-fs/cifs-utils
-	sys-libs/talloc
-	sys-libs/tdb
-	virtual/libiconv
-	ads? ( virtual/krb5 sys-fs/e2fsprogs
-		client? ( sys-apps/keyutils ) )
-	avahi? ( net-dns/avahi[dbus] )
-	caps? ( sys-libs/libcap )
-	client? ( !net-fs/mount-cifs
-		dev-libs/iniparser )
-	cluster? ( dev-db/ctdb )
-	cups? ( net-print/cups )
-	debug? ( dev-libs/dmalloc )
-	fam? ( virtual/fam )
-	ldap? ( net-nds/openldap )
-	pam? ( virtual/pam
-		winbind? ( dev-libs/iniparser ) )
-	readline? ( >=sys-libs/readline-5.2 )
-	syslog? ( virtual/logger )"
-
-RDEPEND="${DEPEND}"
-
-# Disable tests since we don't want to build that much here
-RESTRICT="test"
-
-SBINPROGS=""
-BINPROGS=""
-
-if use server ; then
-	SBINPROGS="${SBINPROGS} bin/smbd bin/nmbd"
-	BINPROGS="${BINPROGS} bin/testparm bin/smbstatus bin/smbcontrol bin/pdbedit
-		bin/profiles bin/sharesec bin/eventlogadm"
-
-	use swat && SBINPROGS="${SBINPROGS} bin/swat"
-	use winbind && SBINPROGS="${SBINPROGS} bin/winbindd"
-	use ads && use winbind && SBIN_PROGS="${SBINPROGS} bin/winbind_krb5_locator"
-fi
-
-if use client ; then
-	BINPROGS="${BINPROGS} bin/smbclient bin/net bin/smbget bin/smbtree
-		bin/nmblookup bin/smbpasswd bin/rpcclient bin/smbcacls bin/smbcquotas
-		bin/ntlm_auth"
-
-	use ads && SBINPROGS="${SBINPROGS} bin/cifs.upcall"
-fi
-
-use cups && BINPROGS="${BINPROGS} bin/smbspool"
-use ldb && BINPROGS="${BINPROGS} bin/ldbedit bin/ldbsearch bin/ldbadd bin/ldbdel bin/ldbmodify bin/ldbrename";
-
-if use winbind ; then
-	BINPROGS="${BINPROGS} bin/wbinfo"
-	mymod_shared="--with-shared-modules=idmap_rid,idmap_hash"
-	use ldap && mymod_shared="${mymod_shared},idmap_adex,idmap_ldap"
-	use ads && mymod_shared="${mymod_shared},idmap_ad"
-fi
-
-S="${WORKDIR}/${MY_P}/source3"
-
-# TODO:
-# - enable iPrint on Prefix/OSX and Darwin?
-# - selftest-prefix? selftest?
-# - AFS?
-
-CONFDIR="${FILESDIR}/$(get_version_component_range 1-2)"
-
-pkg_setup() {
-	if use winbind &&
-		[[ $(tc-getCC)$ == *gcc* ]] &&
-		[[ $(gcc-major-version)$(gcc-minor-version) -lt 43 ]]
-	then
-		eerror "It is a known issue that ${P} will not build with "
-		eerror "winbind use flag enabled when using gcc < 4.3 ."
-		eerror "Please use at least the latest stable gcc version."
-		die "Using sys-devel/gcc < 4.3 with winbind use flag."
-	fi
-
-	confutils_use_depend_all ads ldap
-	confutils_use_depend_all swat server
-	confutils_use_depend_all client netapi
-}
-
-src_prepare() {
-	cp "${FILESDIR}/samba-3.4.2-lib.tevent.python.mk" "../lib/tevent/python.mk"
-
-	# ensure that winbind has correct ldflags (QA notice)
-	sed -i \
-		-e 's|LDSHFLAGS="|LDSHFLAGS="\\${LDFLAGS} |g' \
-		configure || die "sed failed"
-
-	epatch "${CONFDIR}"/${PN}-3.4.9-kerberos-dummy.patch
-}
-
-src_configure() {
-	local myconf
-
-	# Filter out -fPIE
-	[[ ${CHOST} == *-*bsd* ]] && myconf="${myconf} --disable-pie"
-
-	# Upstream refuses to make this configurable
-	use caps && export ac_cv_header_sys_capability_h=yes || export ac_cv_header_sys_capability_h=no
-
-	# use_with doesn't accept 2 USE-flags
-	if use client && use ads ; then
-		myconf="${myconf} --with-cifsupcall"
-	else
-		myconf="${myconf} --without-cifsupcall"
-	fi
-
-	# Notes:
-	# - automount is only needed in conjunction with NIS and we don't have that
-	# anymore => LDAP?
-	# - --without-dce-dfs and --without-nisplus-home can't be passed to configure but are disabled by default
-	econf ${myconf} \
-		--with-piddir=/var/run/samba \
-		--sysconfdir=/etc/samba \
-		--localstatedir=/var \
-		$(use_enable debug developer) \
-		--enable-largefile \
-		--enable-socket-wrapper \
-		--enable-nss-wrapper \
-		$(use_enable swat) \
-		$(use_enable debug dmalloc) \
-		$(use_enable cups) \
-		--disable-iprint \
-		$(use_enable fam) \
-		--enable-shared-libs \
-		--disable-dnssd \
-		$(use_enable avahi) \
-		--with-fhs \
-		--with-privatedir=/var/lib/samba/private \
-		--with-rootsbindir=/var/cache/samba \
-		--with-lockdir=/var/cache/samba \
-		--with-swatdir=/usr/share/doc/${PF}/swat \
-		--with-configdir=/etc/samba \
-		--with-logfilebase=/var/log/samba \
-		--with-pammodulesdir=$(getpam_mod_dir) \
-		--without-afs \
-		--without-fake-kaserver \
-		--without-vfs-afsacl \
-		$(use_with ldap) \
-		$(use_with ads) \
-		$(use_with ads krb5 /usr) \
-		$(use_with ads dnsupdate) \
-		--without-automount \
-		$(use_with client cifsmount) \
-		$(use_with pam) \
-		$(use_with pam pam_smbpass) \
-		$(use_with syslog) \
-		$(use_with quota quotas) \
-		$(use_with quota sys-quotas) \
-		--without-utmp \
-		--without-lib{talloc,tdb} \
-		$(use_with netapi libnetapi) \
-		$(use_with smbclient libsmbclient) \
-		$(use_with smbsharemodes libsmbsharemodes) \
-		$(use_with addns libaddns) \
-		$(use_with cluster ctdb /usr) \
-		$(use_with cluster cluster-support) \
-		$(use_with acl acl-support) \
-		$(use_with aio aio-support) \
-		--with-sendfile-support \
-		$(use_with winbind) \
-		${mymod_shared} \
-		--without-included-popt \
-		--without-included-iniparser
-}
-
-src_compile() {
-	# compile libs
-	if use addns ; then
-		einfo "make addns library"
-		emake libaddns || die "emake libaddns failed"
-	fi
-	if use netapi ; then
-		einfo "make netapi library"
-		emake libnetapi || die "emake libnetapi failed"
-	fi
-	if use smbclient ; then
-		einfo "make smbclient library"
-		emake libsmbclient || die "emake libsmbclient failed"
-	fi
-	if use smbsharemodes ; then
-		einfo "make smbsharemodes library"
-		emake libsmbsharemodes || die "emake libsmbsharemodes failed"
-	fi
-
-	# compile modules
-	emake modules || die "building modules failed"
-
-	# compile pam moudles
-	if use pam ; then
-		einfo "make pam modules"
-		emake pam_modules || die "emake pam_modules failed";
-	fi
-
-	# compile winbind nss modules
-	if use winbind ; then
-		einfo "make nss modules"
-		emake nss_modules || die "emake nss_modules failed";
-	fi
-
-	# compile utilities
-	if [ -n "${BINPROGS}" ] ; then
-		einfo "make binprogs"
-		emake ${BINPROGS} || die "emake binprogs failed";
-	fi
-	if [ -n "${SBINPROGS}" ] ; then
-		einfo "make sbinprogs"
-		emake ${SBINPROGS} || die "emake sbinprogs failed";
-	fi
-
-	if use client ; then
-		einfo "make {,u}mount.cifs"
-		emake bin/{,u}mount.cifs || die "emake {,u}mount.cifs failed"
-	fi
-}
-
-src_install() {
-	# install libs
-	if use addns ; then
-		einfo "install addns library"
-		emake installlibaddns DESTDIR="${D}" || die "emake install libaddns failed"
-	fi
-	if use netapi ; then
-		einfo "install netapi library"
-		emake installlibnetapi DESTDIR="${D}" || die "emake install libnetapi failed"
-	fi
-	if use smbclient ; then
-		einfo "install smbclient library"
-		emake installlibsmbclient DESTDIR="${D}" || die "emake install libsmbclient failed"
-	fi
-	if use smbsharemodes ; then
-		einfo "install smbsharemodes library"
-		emake installlibsmbsharemodes DESTDIR="${D}" || die "emake install libsmbsharemodes failed"
-	fi
-
-	# install modules
-	emake installmodules DESTDIR="${D}" || die "installing modules failed"
-
-	if use pam ; then
-		einfo "install pam modules"
-		emake installpammodules DESTDIR="${D}" || die "emake installpammodules failed"
-
-		if use winbind ; then
-			newpamd "${CONFDIR}/system-auth-winbind.pam" system-auth-winbind
-			doman ../docs/manpages/pam_winbind.8
-		fi
-
-		newpamd "${CONFDIR}/samba.pam" samba
-		dodoc pam_smbpass/README
-	fi
-
-	# Nsswitch extensions. Make link for wins and winbind resolvers
-	if use winbind ; then
-		einfo "install libwbclient"
-		emake installlibwbclient DESTDIR="${D}" || die "emake installlibwbclient failed"
-		dolib.so ../nsswitch/libnss_wins.so
-		dosym libnss_wins.so /usr/$(get_libdir)/libnss_wins.so.2
-		dolib.so ../nsswitch/libnss_winbind.so
-		dosym libnss_winbind.so /usr/$(get_libdir)/libnss_winbind.so.2
-		einfo "install libwbclient related manpages"
-		doman ../docs/manpages/idmap_rid.8
-		doman ../docs/manpages/idmap_hash.8
-		if use ldap ; then
-			doman ../docs/manpages/idmap_adex.8
-			doman ../docs/manpages/idmap_ldap.8
-		fi
-		if use ads ; then
-			doman ../docs/manpages/idmap_ad.8
-		fi
-	fi
-
-	# install binaries
-	insinto /usr
-	for prog in ${SBINPROGS} ; do
-		dosbin ${prog} || die "installing ${prog} failed"
-		doman ../docs/manpages/${prog/bin\/}* || die "doman failed"
-	done
-
-	for prog in ${BINPROGS} ; do
-		dobin ${prog} || die "installing ${prog} failed"
-		doman ../docs/manpages/${prog/bin\/}* || die "doman failed"
-	done
-
-	# install server components
-	if use server ; then
-		doman ../docs/manpages/vfs* ../docs/manpages/samba.7
-
-		diropts -m0700
-		keepdir /var/lib/samba/private
-
-		diropts -m1777
-		keepdir /var/spool/samba
-
-		diropts -m0755
-		keepdir /var/{cache,log}/samba
-		keepdir /var/lib/samba/{netlogon,profiles}
-		keepdir /var/lib/samba/printers/{W32X86,WIN40,W32ALPHA,W32MIPS,W32PPC,X64,IA64,COLOR}
-		keepdir /usr/$(get_libdir)/samba/{auth,pdb,rpc,idmap,nss_info,gpext}
-
-		newconfd "${CONFDIR}/samba.confd" samba
-		newinitd "${CONFDIR}/samba.initd" samba
-
-		insinto /etc/samba
-		doins "${CONFDIR}"/{smbusers,lmhosts}
-
-		if use ldap ; then
-			insinto /etc/openldap/schema
-			doins ../examples/LDAP/samba.schema
-		fi
-
-		if use swat ; then
-			insinto /etc/xinetd.d
-			newins "${CONFDIR}/swat.xinetd" swat
-			script/installswat.sh "${D}" "${ROOT}/usr/share/doc/${PF}/swat" "${S}" \
-				|| die "installing swat failed"
-		fi
-
-		dodoc ../MAINTAINERS ../README* ../Roadmap ../WHATSNEW.txt ../docs/THANKS
-	fi
-
-	# install client files ({u,}mount.cifs into /)
-	if use client ; then
-		into /
-		dosbin bin/{u,}mount.cifs || die "u/mount.cifs not around"
-		doman ../docs/manpages/{u,}mount.cifs.8 || die "can't create man pages"
-	fi
-
-	# install the spooler to cups
-	use cups && dosym /usr/bin/smbspool $(cups-config --serverbin)/backend/smb
-
-	# install misc files
-	insinto /etc/samba
-	doins "${CONFDIR}"/smb.conf.default
-	doman  ../docs/manpages/smb.conf.5
-
-	insinto /usr/"$(get_libdir)"/samba
-	doins ../codepages/{valid.dat,upcase.dat,lowcase.dat}
-
-	# install docs
-	if use doc ; then
-		dohtml -r ../docs/htmldocs/*
-		dodoc ../docs/*.pdf
-	fi
-
-	# install examples
-	if use examples ; then
-		einfo "install examples"
-		insinto /usr/share/doc/${PF}/examples
-
-		if use smbclient ; then
-			doins -r ../examples/libsmbclient
-		fi
-
-		if use winbind ; then
-			doins -r ../examples/pam_winbind ../examples/nss
-		fi
-
-		if use server ; then
-			doins -r \
-				../examples/{auth,autofs,dce-dfs,LDAP,logon,misc} \
-				../examples/{pdb,perfcounter,printer-accounting} \
-				../examples/{printing,scripts,tridge,validchars,VFS}
-		fi
-	fi
-
-	# Remove empty installation directories
-	rmdir --ignore-fail-on-non-empty \
-		"${D}/usr/$(get_libdir)/samba" \
-		"${D}/usr"/{sbin,bin} \
-		"${D}/usr/share"/{man,locale,} \
-		"${D}/var"/{run,lib/samba/private,lib/samba,lib,cache/samba,cache,} \
-	#	|| die "tried to remove non-empty dirs, this seems like a bug in the ebuild"
-}
-
-pkg_postinst() {
-	elog "The default passdb backend has been changed to 'tdbsam' in samba 3.4!"
-	elog "That breaks existing setups using the 'smbpasswd' backend without"
-	elog "explicit declaration!"
-	elog "Please use 'passdb backend = smbpasswd' if you would like to stick to the"
-	elog "'smbpasswd' backend or convert your smbpasswd entries using e.g. "
-	elog "'pdbedit -i smbpasswd -e tdbsam'."
-	elog "For further information make sure to read the release notes at"
-	elog "http://samba.org/samba/history/${P}.html and "
-	elog "http://samba.org/samba/history/${PN}-3.4.0.html"
-}