Fixed cups dependency in samba-3.5.15.ebuild (bug #451026). Added latest 3.5 version. Adjusted SRC_URI so source packages can still be found when they got superseded by newer versions. Removed obsolete version. Removed unused USE flag description from metadata.xml file

Package-Manager: portage-2.2.0_alpha149/cvs/Linux x86_64
Manifest-Sign-Key: 0x981CA6FC

9 files changed, 508 insertions, 183 deletions

diff --git a/net-fs/samba/ChangeLog b/net-fs/samba/ChangeLog
index 7cd90bb66613..947ae2e827d8 100644
--- a/net-fs/samba/ChangeLog
+++ b/net-fs/samba/ChangeLog
@@ -1,6 +1,16 @@
 # ChangeLog for net-fs/samba
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-fs/samba/ChangeLog,v 1.550 2013/01/01 09:03:08 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-fs/samba/ChangeLog,v 1.551 2013/01/09 11:42:30 polynomial-c Exp $
+
+*samba-3.5.20 (09 Jan 2013)
+
+  09 Jan 2013; Lars Wendler <polynomial-c@gentoo.org> samba-3.5.15.ebuild,
+  +samba-3.5.20.ebuild, samba-3.6.9.ebuild, samba-3.6.10.ebuild,
+  -samba-4.0.0_rc5.ebuild, samba-4.0.0.ebuild, metadata.xml:
+  Non-maintainer commit: Fixed cups dependency in samba-3.5.15.ebuild (bug
+  #451026). Added latest 3.5 version. Adjusted SRC_URI so source packages can
+  still be found when they got superseded by newer versions. Removed obsolete
+  version. Removed unused USE flag description from metadata.xml file.
 
   01 Jan 2013; Agostino Sarubbo <ago@gentoo.org> samba-3.6.10.ebuild:
   Add ~ia64, wrt bug #444688
diff --git a/net-fs/samba/Manifest b/net-fs/samba/Manifest
index bf0b42b1332b..98e9fa4e87bd 100644
--- a/net-fs/samba/Manifest
+++ b/net-fs/samba/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
 AUX 3.5/lmhosts 126 SHA256 f959c6e6b4179de24b2268c13b7cd8a8e400e43d0852f91dfb8dc8e48f56f80e SHA512 d9bc9c67b3f4bb128fee620550f46576a5554233bce2b2a0300645f6d60a40c25f88caf91057472b0cd1908c31d5494ce1c21a112535f91460cc97a75e0cfa69 WHIRLPOOL c691eb8df9272d5404a073e0507b16d7b8b6750af79090340733ebfb3428b1a106f6099cfb3c75e768da1e6adc2e6b89f4e7b9640144a5519a9cf8e6add321e1
 AUX 3.5/nsswitch.conf-winbind 406 SHA256 c6d461204201143f874f460df35f7fbb2345f93ed0d6c20b280c15864011e893 SHA512 15e42519630c8dc03fe5eed233c707be57290c79aa45085cde5dcaca2ea56ad9939bc981815f9fe832e4a8965cedcf61f451c9e89fe213b167af4a773b58a04d WHIRLPOOL afe807c64abcd1383872751d2cbed1e43a8f7c717a0b047022c890909484d9ab5559c0a260dcfa04313424bfcc0b64411a318f6f0a43975e846acffef2a49c63
 AUX 3.5/nsswitch.conf-wins 392 SHA256 3dbd18dc82371ef6f427dea1f626ee027d9d7be86036e2e10991f52f7041b5c8 SHA512 9cf4116d21531cb783af952ff891f0f70482aef10545f963efc9f86d281e7f03606b8607ef379bc257f51481f24aacc13ae44ad42048937d54caeae7e1f25db4 WHIRLPOOL a6ed5123aac2e125abbecbbbdf5897015aea9258258982a5b4fc585636d3810ee6cc4de0cdcfc2e9817d3a98178959771c95a40874e867de24c35a2f8fee8e5a
@@ -26,16 +29,33 @@ AUX samba-3.4.2-lib.tevent.python.mk 177 SHA256 3eab52d42a0cbc070d011a131f9a56f4
 AUX samba4.initd 657 SHA256 4c8d1ecf42d58bfa1a2087ba9da55ed410ad238a0050272cb84c2e8d50b034d9 SHA512 3373f2ad30938dd8c2d68d19af4e248470e0b6d749b53257c97d3a0792df54f9ad61a33175ae3e576b728cc11a6ae5fd8803c22188382c7b50ca041b98b84ce7 WHIRLPOOL 25f6a313323b3076ad2a5ff733b1ed4bae1833bf5d4d1aaf9c75449e578ca479998b526a1fdfefbe5d5436c94cbcf6b38934bda1ddff8587f8820a2ccb5ce1e9
 DIST samba-3.5.15.tar.gz 30368870 SHA256 c23c67c1212b7ff2e68a9e047a22200e1ad447d5ac1bd3cf24363f4b5875d396 SHA512 917864ba014a3180583bf8ce9d89a61c17e5d8b19256a603420481eaf69208600e0e525b9036570dabc1136b2dc0e125627b6f495ad4292f68c1722f6865cada WHIRLPOOL c02d16056baf0dff0783b6f8593e80cbe21144cbf26ef0c15a806ef6520d2d8d263a052e41eba2c66fee1dd47c0385eda119c356665fae2978dcb64accc44981
 DIST samba-3.5.19.tar.gz 35379330 SHA256 96f64f3869408b6eb28d776a2c31035dd8b9966f485889a7a056f7ac2ccece8b SHA512 dd0492b0a85b23025f5378178b6f8c654a72a72ea8ad8bfab50b14be6826496fab922d1015853cb0871929b2427b109bf2881af04d135c3aa73a26eba4c5a53a WHIRLPOOL 47d7312a3f58b20572a0bc0ac3018e402bcfe3e76f07f99b31c45cec80a557b6a99dbb8e7c3b210df3c8f304e3b284ba2263512293c9278f87610188c8783c49
+DIST samba-3.5.20.tar.gz 35377976 SHA256 e76d81d119dd587d9187368ba020514525ededbce19da3605ce7d9a1b130dc22 SHA512 3d169bca193b0e97fe626f6a4bd39f36d357c5d4ce9ac80888343a91121617327a7e895d5abfde1a4914fc8dd418192268b633e8b1ebccb3f1a90a52a60ff56c WHIRLPOOL 1ba033d8b2b3a3cf6247c1b52e3a50b8faa5b092d7658a7a77de15d93e3ed3cb03439a180f9659a041d331260110f5ae342ea741ad82ebec9384d53dcd08c88e
 DIST samba-3.6.10.tar.gz 34076720 SHA256 4af53840773b5768b620e8afb66e081b84f8639b1a0a92fb40e55ec8556fae74 SHA512 9600a9830b8d4d6735b48429fe4d056b97136d765ad6b1dfbc35cf828bbd19af6ec78d886ad8388140e9028a90c201a969edf33e4d79fd5c6ca1cc68448ffd2e WHIRLPOOL 0dba477bd4a17a908100308c38cdc5070e7156e10a877e0fda8a465773521787245ca9a4d2b4a41c2cb5563c71a30f7507ed37ae88707dd30be34d98c381086e
 DIST samba-3.6.9.tar.gz 34077002 SHA256 9714b50c1bbdb0d3521bdbf403bb112b5405040685cb0b4ff3f9a370d1e84020 SHA512 be0c9d2a51a524015a1210d96c775c754101a2906dc054f3ecae97d18d4e0d50de2ac48a85af62a30d020259ff91068947831e44963925efe3cc48c8051a3be7 WHIRLPOOL 4e4f091329517872117160e167cb60ce71cfd441a0b6eb46157aa48b16369e887b7373b9c2bada8751de62db10f8db748f53ecc28a90b70aaf38df3af2649b1e
 DIST samba-4.0.0.tar.gz 22030480 SHA256 bc4edfaf919cd9742b0c1fc75818f58497a51acd280aad0d28b4f41b5b2f287f SHA512 dd4896217522b36dc3ad72971cd42eca7f8bd1a6e6a9f5dd78435cf757a8a6a3c85504dae88d8105fd32c4ddcad8f9d68a25fb1b30947605d8885f4e9eb01e5f WHIRLPOOL ad3fe51a52bc57429d5dbab2b4f765c984ce7865cb1e9d1b1bfb9c5f85eb37f527eae0e09710244a8b9511d25aecf5e87ab29830f065a1a38215d668ab8200ec
-DIST samba-4.0.0rc5.tar.gz 22017812 SHA256 d0179e8288d42e93e1fd35ceaa46b881e816bd57732928b8a4227c87f8a76074 SHA512 e744ceb11e521a5bb90e9a6507ef3aea1b7d0380a85dfffca1009b26fe111316b8ff35f1cb28315b85fdccd583c1ad9869d1b0b2bd84ed7195cafb293e797a51 WHIRLPOOL cd2eea538876fe109606507e78e94d520f5ea9afe3c042aa063eb310d5a03a9e281e6a9b9a947327890c6205413cd7610c7f5a33acfca32d856fdc8c245834f1
 DIST smb_traffic_analyzer_v2.diff.bz2 12226 SHA256 1bae7eafbe8ac2382313d5ab9d43d73ba64b63a714f0f588516952d476fb868d SHA512 aa0e457a0dd282e61e6dfcd5705c29b319832dca9711b1b5baf8373e2f079991399c3537c050219ccb861a93f86353ebff677a5c625d2e3f1f3a13ee5c4087d0 WHIRLPOOL 85ee72a360f67ebe71be5cd400ecd635280a0d7c64ebb8b94656a5ef1a94f74a987de86408af00ce1b81cc8363b1b3cf14726860d29b72ee610d4bab73d6b139
-EBUILD samba-3.5.15.ebuild 12388 SHA256 df87120eb18e960cc2d77d5158ef81d3dbf34a475e6a717ee12aea4965b98d0b SHA512 e581ec0818df37616df8a9aca4cb9efc14ec8a726ced6b1de4a541a44361febfaf83395a00bd481a846c4dc3c5b8cea03ccdc80fbd5b6d0990cc9014061c857a WHIRLPOOL cc44215e004d8b89223d553bfc9006ff3feac8ab640b26e41911041d7dc5ed6339451ef4c3307ab8d0df43b6baa71f781ab2fca4e6afac62715c5c349cb89f68
+EBUILD samba-3.5.15.ebuild 12458 SHA256 2837e33a487578958d53e1bb39762a7426d3b698392da6e63534502f6e9ec74f SHA512 24f10e3ad829d198ffaa7d00deb9692240688fe787827c1bea243e002ebc92f28b23d8c967d4701154dd19ca00d2bd5d5f7c8613bf667209395a29195ef44ce7 WHIRLPOOL 6638a9ad91fdd88152a3d3826d6efb1f1e4e486c472bc46a79a46c994a80e05ec4535915155b8314eb79d617aa0bfa82f49b7a73d5d5a5eee6a8d8753b81864b
 EBUILD samba-3.5.19.ebuild 12464 SHA256 936b24f5a5fe2d9fc7f0d5a7307395eef3e7fc0007cdd9b68f3ec7bc14c7ccf4 SHA512 03c4cb8cc9e73771753b39cf2fc1c2e350cd7c09bc08d0f3f0748d13769fadb0bb08a6855d8f27201412a6ab16cf32c2ce665a53d4d1714462de552ef66f6ab4 WHIRLPOOL b476ee0c7637cb43eb54541add97410c7ec2e5066d546aee7df40309d57978b63a5304a34fd779b448a530d8b0ada178e38eb4a8c43fe7aa4216ee6269e4ab78
-EBUILD samba-3.6.10.ebuild 11849 SHA256 e0f3fd4fcd3876f522c2886478bed280b19f824c800421021d770940273cc6c1 SHA512 3dd8bf4b670bc5c4ff072e265392b0c1028f95860547bc1219577a17ef831089b86f3626632af3f2841b9f6f18cfdbb39046ce8ebbc40232eaae8c30925c9a54 WHIRLPOOL 0c2f1482484b08687e4c806defcb97ea844cef27dc18ba9684ceb5bf6814edb28e775bf2e9e41c290f85f05745a3f00ec3a82241d208c76da8be3132cf3f6472
-EBUILD samba-3.6.9.ebuild 11833 SHA256 f2a173ddc68d2e6b62cc28925287586d8f1dbaa90d049acfbf40f833e6b7fe84 SHA512 9b21b21ff112bc3c554b605fb649bd8d91ca7dd5d78d7f0bcceafc5f5eb914b0b836df90db9f73706e8d283ef6dd363bcd3d624c886b41a33e5cd9684141fa65 WHIRLPOOL 47a12f01a9b30b35ff6021421f282fed5c8c8792c9234fc425ee27b68742988af93593bd63c4595b7f7aeab9f1d9253e3a530c7b2c6e39088220a8426e036d1c
-EBUILD samba-4.0.0.ebuild 3956 SHA256 b4cdd9ced5313d19b46853ac1b005dff63826af784b1ae130bb42e650cd13007 SHA512 ec74837e247b8d2467c9963947fe435065dcfb358a14c6c334ba17e6a0e6d914699d49a5735994cf014b206dfdea71710d89507860b1420c8a078a817d4886fb WHIRLPOOL 78e63f7b5fed1c6b9c605ebee8dff7dab98cc9d948eee42ade507055ecd20613ef16d1b847c84fbda5e0eb653684a5ea44db4ea41cb858d01c33264af2dcef0d
-EBUILD samba-4.0.0_rc5.ebuild 4235 SHA256 b68ed65c086f5e4829d1f1379d00870feeff45683239feec6245ad325d14f08b SHA512 7c03174e4cd2db111dd24512a12366a3104e437ebeceeae734f80caa2379958551ac949bc9d62523fcab5b9f71050aa4493ebc5921703c4b0607edb7611ea13c WHIRLPOOL aad45799e65ac5de203b6bf4cd28d69691beb7ecc5eef190bd53c0cef97ac1fade99e1c8394b21f7deac595f9293c4b4f6ad4014ddc79d95483c1b61293cffa6
-MISC ChangeLog 91107 SHA256 7ba066fe7d81581819904e63d36cd013aa3ddbeaca82cb808fb6225d1752cc80 SHA512 9f566bab5ea5428c6179730ff6fdc46c19139124360d3e742f067ba2ed32c441553be17f945970684a5fb3da7d2e87b217b6482f077ba8f1706d187a93a27971 WHIRLPOOL acb6d743a89ffdd0e75e0442920ee8ba96cb72e192cbfaa420a4c6ff8cda6c940c0abfa024dcd14847d1c09c8be6ccae45d8fa0d7cdf56ae1345045ad48df553
-MISC metadata.xml 1580 SHA256 bcce2c1233c04b8066d36ca7aae3027c8618eebeea88ebe82e54cbb536c2a0e7 SHA512 38c688ed70818517bb21870872b39e478651b93d380cb36acd8b30c4db691d8157776a3f8eebf93731e6b7c2b5f06d96e202331d585e266a0fd3b12b890697aa WHIRLPOOL b8c85e3168186acd9c157b2e4541c6518a06fba8f319bea38f58078c0bd4a4dd6482a1f1a0eefda4d0cc41c4b4f22e215f15f48244a32e1e7710e71c8b3b8bce
+EBUILD samba-3.5.20.ebuild 12468 SHA256 bda45b3ad5516fd9e2637acba45b530804f8a665143b6abfb6745a819f593079 SHA512 3d513b46df51abfc56ff7edbdbb2af0b46b75046a5fe27cb769d98587cba0b68f4f520cb08f1e7cb9f8a44ffa39628c88540a80e52f0ffd681671740c7563603 WHIRLPOOL 2069d8a1254810c0834b9532df3c64a0828f2114bf67afc016a063708289bbca94f88294f47c506f2b4a97f1380b3cf71f7cacd380cea6a42349769d86bbc8a8
+EBUILD samba-3.6.10.ebuild 11865 SHA256 b240cb91156fa8c976e731b67f0b787c893504688a7cff1ce09c0a36908fea6f SHA512 a291afa5312560dc3ae8556ef73a3e6acacfa35ae37ab6912bb195a7a2a1f78360c8aeb263aa68288828c081bb7758d5201f1928d683af4c92a7da4f8b39019a WHIRLPOOL ad32f0b4009a051334ff384ad580e8b88ac26294896538d6a5ea3c08f437c8e4e790ca0698bd92dede389aa7970a7e3f8faada43566e9862bbab3ff20fe2706f
+EBUILD samba-3.6.9.ebuild 11843 SHA256 c12e87494c00cbcc91ad1c6d427d6bc34ff86d77137882fd1101cad04e81a855 SHA512 84d4116f75f004d0dadbc143519eaa9174c5d0cceb606a7615c3eb192eb615dfaf9edfebb676a9a6d30e975ea48b8f1cfb118f07971a4676cc3ebf905e680ed4 WHIRLPOOL c69d7caa67ed25f4a62c3f28ba94c48cb5d251e7935ae559a6bffa88451cd9e9ce055628644a639bdd2f87c0e7334071ab2e82007c33f75cb832e06c9e378aec
+EBUILD samba-4.0.0.ebuild 3963 SHA256 8df1e1445117c8a3dc825f2c03c89d3bc97509402dd397cc6bc92cbba6dbcc5f SHA512 698b4a27a26da905f072f09cb2affffa652e9e9586ccfe79487937621658477380adfb7f53e40cd709de7e710957f8026a497ce312d8f9a8b9caee06b38c1f7a WHIRLPOOL e44cc2eb084d94276b5434aa234fae5eb6a752cb570f50d02c329366046cddf1762b9c44aaa29fec9a56eeffec9a8f11efa7cb494aff557dacca0592e0a27caa
+MISC ChangeLog 91649 SHA256 e005bd29a1a6cd30efc2f1fd92a83114459071165bfe8b69f0f036e66f2e3832 SHA512 5d5852e32f64e6f64ff069f702c0c21c35c9c8285cd895fd168736129caa9e57c8d4186c523ee6278b8503133b06fb7c8bb8c31202528164b168015477c5430f WHIRLPOOL 4a51aa1b781f634687a5bbabc47e309c05bf85d6489e845b9d2b748bb46f4c583cd7d99fdc4e12e02f58012c47f9c481b070d36ef94998968f2bb657e7872150
+MISC metadata.xml 1514 SHA256 c10deb71703017ec67f4e5bac297d9b4581fec3d8b5549b6aea2a43bda642bc0 SHA512 9e67e8f7e0c972046e32bf4539142559c24183d6c3469e5af2f901728a3c02a9fbfd50e948a9fd414107fd0cb2a8de709ffe3fc5bf3372c77a4a3db6dc622ecc WHIRLPOOL ec92ea6a1b03e70c791670e97e7d9e07e6bdb82c24ed08c186e786afcd009ab63fbee7d481a4cdc394632ad312e58a2048dae3ff333f6f7a1ad19add55e2c8f8
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.19 (GNU/Linux)
+
+iQIcBAEBCAAGBQJQ7VepAAoJEPiazRVxLXTF7WsP/Rstqqlz1iRplNmNaoWhFxp+
+dB+hbsm7czrP+QhSNFPIRUNn6n0FBnFY/AIHizYHDAwHZnJK3kbU7Qk3W8PK8qdK
+75piI4s3/DG1wEcNA4t2UVqJ2F1jTEdlxeVYcZBBK2jYZNkUIpnTumeDQmgc+xSx
+5ePxRsxq+AdFE2zfoHXG8/DG6oObZZMkGsb2JjukFaYp+OXqCTXDgjEIpJLAxZ0H
+MJbrzaB11Qcf3FLTxeQ5afdQeTXINx5QisSfF+Mxr3aK974Qkrpbloj4KRh0uaV+
+Atk2LkHarprxwb+/BYlhUKdl34C2s+1zyf5qxF2AAYT8KWSMWh+DW9g388n9ubA2
+IjjGXxadXumxf+s0i8DwJQnc9Dh1SYjaDeXdOvDuaQmeAh7U2P2zfAZpLL6TtpjL
+adUajTm7RYueTL43UkzayQEVfTx/fErClsWfVomZHFgPl1D+QbDqlqjZWOYtXnlf
++UBj3AK5zy/CMNxmqReCZLNgGaPbfEZevD5h6uNn/gl7TZvrvWKEX4uIq2MU59Br
+dm0TzPxtBOswIkdqMFyWMegneXpYBZIoyFilhlZpPV3nPpHIEqZUHI00KkHlZ9U3
+9o7xF0jvX+kj8+gist6T8E4666M1YY7bwtpdMrWi9UeNpCm5xFka6WfpqUthm4RK
+GwGSFb+SO4hIQK85xrX9
+=8C0b
+-----END PGP SIGNATURE-----
diff --git a/net-fs/samba/metadata.xml b/net-fs/samba/metadata.xml
index 07b196a36e14..d0c82d3de21f 100644
--- a/net-fs/samba/metadata.xml
+++ b/net-fs/samba/metadata.xml
@@ -25,7 +25,6 @@ Samba is an Open Source/Free Software suite that provides seamless file and prin
 	<flag name="smbclient">Enable smbclient tool</flag>
 	<flag name="smbsharemodes">Enable special smb share modes (?) </flag>
 	<flag name="smbtav2">Enable Samba Traffic Analyzer version 2 </flag>
-	<flag name="fulltest">Enabling extra tests in test phase </flag>
 	<flag name="iprint">Enabling iPrint technology by Novell</flag>
 </use>
 </pkgmetadata>
diff --git a/net-fs/samba/samba-3.5.15.ebuild b/net-fs/samba/samba-3.5.15.ebuild
index cc8a0b176032..999281484efb 100644
--- a/net-fs/samba/samba-3.5.15.ebuild
+++ b/net-fs/samba/samba-3.5.15.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-fs/samba/samba-3.5.15.ebuild,v 1.9 2012/10/19 08:10:00 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-fs/samba/samba-3.5.15.ebuild,v 1.10 2013/01/09 11:42:30 polynomial-c Exp $
 
 EAPI=4
 
@@ -11,7 +11,7 @@ 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
+SRC_URI="mirror://samba/stable/${P}.tar.gz
 	http://dev.gentoo.org/~dagger/files/smb_traffic_analyzer_v2.diff.bz2"
 LICENSE="GPL-3"
 SLOT="0"
@@ -20,6 +20,7 @@ IUSE="acl addns ads +aio avahi caps +client cluster cups debug doc examples fam
 	ldap ldb +netapi pam quota +readline selinux +server +smbclient smbsharemodes smbtav2
 	swat syslog winbind"
 
+# upstream doesn't support cups 1.6 for samba 3.5
 DEPEND="dev-libs/popt
 	!net-fs/samba-client
 	!net-fs/samba-libs
@@ -35,7 +36,7 @@ DEPEND="dev-libs/popt
 	client? ( !net-fs/mount-cifs
 		dev-libs/iniparser )
 	cluster? ( >=dev-db/ctdb-1.0.114_p1 )
-	cups? ( net-print/cups )
+	cups? ( <net-print/cups-1.6 )
 	fam? ( virtual/fam )
 	ldap? ( net-nds/openldap )
 	pam? ( virtual/pam
diff --git a/net-fs/samba/samba-3.5.20.ebuild b/net-fs/samba/samba-3.5.20.ebuild
new file mode 100644
index 000000000000..2e32223e3ee9
--- /dev/null
+++ b/net-fs/samba/samba-3.5.20.ebuild
@@ -0,0 +1,456 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-fs/samba/samba-3.5.20.ebuild,v 1.1 2013/01/09 11:42:30 polynomial-c Exp $
+
+EAPI=4
+
+inherit pam versionator multilib eutils
+
+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/stable/${P}.tar.gz
+	http://dev.gentoo.org/~dagger/files/smb_traffic_analyzer_v2.diff.bz2"
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
+IUSE="acl addns ads +aio avahi caps +client cluster cups debug doc examples fam
+	ldap ldb +netapi pam quota +readline selinux +server +smbclient smbsharemodes smbtav2
+	swat syslog winbind"
+
+# upstream doesn't support cups 1.6 for samba 3.5
+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-1.0.114_p1 )
+	cups? ( <net-print/cups-1.6 )
+	fam? ( virtual/fam )
+	ldap? ( net-nds/openldap )
+	pam? ( virtual/pam
+		winbind? ( dev-libs/iniparser )
+	)
+	readline? ( >=sys-libs/readline-5.2 )
+	selinux? ( sec-policy/selinux-samba )
+	syslog? ( virtual/logger )"
+
+RDEPEND="${DEPEND}"
+
+# Disable tests since we don't want to build that much here
+RESTRICT="test"
+
+SBINPROGS=""
+BINPROGS=""
+KRBPLUGIN=""
+PLUGINEXT=".so"
+SHAREDMODS=""
+
+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)"
+
+REQUIRED_USE="
+	ads? ( ldap )
+	swat? ( server )
+"
+
+pkg_setup() {
+	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 smbtav2 && BINPROGS="${BINPROGS} bin/smbta-util"
+		use swat && SBINPROGS="${SBINPROGS} bin/swat"
+		use winbind && SBINPROGS="${SBINPROGS} bin/winbindd"
+		use ads && use winbind && KRBPLUGIN="${KRBPLUGIN} 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"
+		SHAREDMODS="${SHAREDMODS}idmap_rid,idmap_hash"
+		use ads && SHAREDMODS="${SHAREDMODS},idmap_ad"
+		use ldap && SHAREDMODS="${SHAREDMODS},idmap_ldap,idmap_adex"
+	fi
+
+	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
+}
+
+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.5.6-kerberos-dummy.patch
+	use smbtav2 && cd "${WORKDIR}/${P}" && epatch "${WORKDIR}"/smb_traffic_analyzer_v2.diff
+	cd "${WORKDIR}/${MY_P}" && epatch "${CONFDIR}"/${PN}-3.5.8-uclib-build.patch
+	epatch "${CONFDIR}"/smb.conf.default.patch
+}
+
+src_configure() {
+	local myconf
+
+	# Filter out -fPIE
+	[[ ${CHOST} == *-*bsd* ]] && 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+=" --with-cifsupcall"
+	else
+		myconf+=" --without-cifsupcall"
+	fi
+
+	if use client && use kernel_linux ; then
+		myconf+=" --with-cifsmount --with-cifsumount"
+	else
+		myconf+=" --without-cifsmount --without-cifsumount"
+	fi
+
+	#bug #399141 wrap newer iniparser version
+	has_version ">=dev-libs/iniparser-3.0.0" && \
+		export CPPFLAGS+=" -Diniparser_getstr\(d,i\)=iniparser_getstring\(d,i,NULL\)"
+
+	# 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 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 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) \
+		--with-shared-modules=${SHAREDMODS} \
+		--without-included-popt \
+		--without-included-iniparser
+}
+
+src_compile() {
+	# compile libs
+	if use addns ; then
+		einfo "make addns library"
+		emake libaddns
+	fi
+	if use netapi ; then
+		einfo "make netapi library"
+		emake libnetapi
+	fi
+	if use smbclient ; then
+		einfo "make smbclient library"
+		emake libsmbclient
+	fi
+	if use smbsharemodes ; then
+		einfo "make smbsharemodes library"
+		emake libsmbsharemodes
+	fi
+
+	# compile modules
+	emake modules
+
+	# compile pam moudles
+	if use pam ; then
+		einfo "make pam modules"
+		emake pam_modules
+	fi
+
+	# compile winbind nss modules
+	if use winbind ; then
+		einfo "make nss modules"
+		emake nss_modules
+	fi
+
+	# compile utilities
+	if [ -n "${BINPROGS}" ] ; then
+		einfo "make binprogs"
+		emake ${BINPROGS}
+	fi
+	if [ -n "${SBINPROGS}" ] ; then
+		einfo "make sbinprogs"
+		emake ${SBINPROGS}
+	fi
+
+	if [ -n "${KRBPLUGIN}" ] ; then
+		einfo "make krbplugin"
+		emake ${KRBPLUGIN}${PLUGINEXT}
+	fi
+
+	if use client && use kernel_linux; then
+		einfo "make {,u}mount.cifs"
+		emake bin/{,u}mount.cifs
+	fi
+}
+
+src_install() {
+	# install libs
+	if use addns ; then
+		einfo "install addns library"
+		emake installlibaddns DESTDIR="${D}"
+	fi
+	if use netapi ; then
+		einfo "install netapi library"
+		emake installlibnetapi DESTDIR="${D}"
+	fi
+	if use smbclient ; then
+		einfo "install smbclient library"
+		emake installlibsmbclient DESTDIR="${D}"
+	fi
+	if use smbsharemodes ; then
+		einfo "install smbsharemodes library"
+		emake installlibsmbsharemodes DESTDIR="${D}"
+	fi
+
+	# install modules
+	emake installmodules DESTDIR="${D}"
+
+	if use pam ; then
+		einfo "install pam modules"
+		emake installpammodules DESTDIR="${D}"
+
+		if use winbind ; then
+			newpamd "${CONFDIR}/system-auth-winbind.pam" system-auth-winbind
+			doman ../docs/manpages/pam_winbind.8
+			# bug #376853
+			insinto /etc/security
+			doins ../examples/pam_winbind/pam_winbind.conf || die
+		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}"
+		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}
+		doman ../docs/manpages/${prog/bin\/}*
+	done
+
+	for prog in ${BINPROGS} ; do
+		dobin ${prog}
+		doman ../docs/manpages/${prog/bin\/}*
+	done
+
+	# install krbplugin
+	if [ -n "${KRBPLUGIN}" ] ; then
+		if has_version app-crypt/mit-krb5 ; then
+			insinto /usr/$(get_libdir)/krb5/plugins/libkrb5
+			doins ${KRBPLUGIN}${PLUGINEXT}
+		elif has_version app-crypt/heimdal ; then
+			insinto /usr/$(get_libdir)/plugin/krb5
+			doins ${KRBPLUGIN}${PLUGINEXT}
+		fi
+		insinto /usr
+		for prog in ${KRBPLUGIN} ; do
+			doman ../docs/manpages/${prog/bin\/}*
+		done
+	fi
+
+	# 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}"
+		fi
+
+		dodoc ../MAINTAINERS ../README* ../Roadmap ../WHATSNEW.txt ../docs/THANKS
+	fi
+
+	# install client files ({u,}mount.cifs into /)
+	if use client && use kernel_linux ; then
+		into /
+		dosbin bin/{u,}mount.cifs
+		doman ../docs/manpages/{u,}mount.cifs.8
+	fi
+
+	# install the spooler to cups
+	if use cups ; then
+		dosym /usr/bin/smbspool $(cups-config --serverbin)/backend/smb
+	fi
+
+	# install misc files
+	insinto /etc/samba
+	doins ../examples/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
+		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
+			cd ../examples
+			doins -r auth autofs dce-dfs LDAP logon misc pdb \
+			perfcounter printer-accounting 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 value of 'wide links' has been changed to 'no' in samba 3.5"
+	elog "to avoid an insecure default configuration"
+	elog "('wide links = yes' and 'unix extensions = yes'). For more details,"
+	elog "please see http://www.samba.org/samba/news/symlink_attack.html ."
+	elog ""
+	elog "An EXPERIMENTAL implementation of the SMB2 protocol has been added."
+	elog "SMB2 can be enabled by setting 'max protocol = smb2'. SMB2 is a new "
+	elog "implementation of the SMB protocol used by Windows Vista and higher"
+	elog ""
+	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.5.0.html"
+}
diff --git a/net-fs/samba/samba-3.6.10.ebuild b/net-fs/samba/samba-3.6.10.ebuild
index 4e66fd55970a..298b65b51828 100644
--- a/net-fs/samba/samba-3.6.10.ebuild
+++ b/net-fs/samba/samba-3.6.10.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-fs/samba/samba-3.6.10.ebuild,v 1.4 2013/01/01 09:03:08 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-fs/samba/samba-3.6.10.ebuild,v 1.5 2013/01/09 11:42:30 polynomial-c Exp $
 
 EAPI=4
 
@@ -11,7 +11,7 @@ MY_P="${PN}-${MY_PV}"
 
 DESCRIPTION="Library bits of the samba network filesystem"
 HOMEPAGE="http://www.samba.org/"
-SRC_URI="mirror://samba/${MY_P}.tar.gz"
+SRC_URI="mirror://samba/stable/${MY_P}.tar.gz"
 LICENSE="GPL-3"
 SLOT="0"
 KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~x86 ~amd64-fbsd ~x86-fbsd"
diff --git a/net-fs/samba/samba-3.6.9.ebuild b/net-fs/samba/samba-3.6.9.ebuild
index cf6d247c3850..7abb08f92a24 100644
--- a/net-fs/samba/samba-3.6.9.ebuild
+++ b/net-fs/samba/samba-3.6.9.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-fs/samba/samba-3.6.9.ebuild,v 1.7 2012/12/20 13:35:59 nativemad Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-fs/samba/samba-3.6.9.ebuild,v 1.8 2013/01/09 11:42:30 polynomial-c Exp $
 
 EAPI=4
 
@@ -11,7 +11,7 @@ MY_P="${PN}-${MY_PV}"
 
 DESCRIPTION="Library bits of the samba network filesystem"
 HOMEPAGE="http://www.samba.org/"
-SRC_URI="mirror://samba/${MY_P}.tar.gz"
+SRC_URI="mirror://samba/stable/${MY_P}.tar.gz"
 LICENSE="GPL-3"
 SLOT="0"
 KEYWORDS="amd64 ~arm hppa x86 ~amd64-fbsd ~x86-fbsd"
diff --git a/net-fs/samba/samba-4.0.0.ebuild b/net-fs/samba/samba-4.0.0.ebuild
index 2ad7135baf6c..0f2111bb1e08 100644
--- a/net-fs/samba/samba-4.0.0.ebuild
+++ b/net-fs/samba/samba-4.0.0.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-fs/samba/samba-4.0.0.ebuild,v 1.3 2012/12/28 07:22:11 polynomial-c Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-fs/samba/samba-4.0.0.ebuild,v 1.4 2013/01/09 11:42:30 polynomial-c Exp $
 
 EAPI=4
 PYTHON_DEPEND="2"
@@ -15,7 +15,7 @@ if [ "${PV}" = "4.9999" ]; then
 	KEYWORDS=""
 	inherit git-2
 else
-	SRC_URI="mirror://samba/${MY_P}.tar.gz"
+	SRC_URI="mirror://samba/stable/${MY_P}.tar.gz"
 	KEYWORDS="~amd64 ~x86"
 fi
 
diff --git a/net-fs/samba/samba-4.0.0_rc5.ebuild b/net-fs/samba/samba-4.0.0_rc5.ebuild
deleted file mode 100644
index 27edaa5d5a30..000000000000
--- a/net-fs/samba/samba-4.0.0_rc5.ebuild
+++ /dev/null
@@ -1,161 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-fs/samba/samba-4.0.0_rc5.ebuild,v 1.1 2012/11/24 23:59:23 polynomial-c Exp $
-
-EAPI=4
-PYTHON_DEPEND="2"
-
-inherit confutils python waf-utils multilib linux-info
-
-MY_PV="${PV/_rc/rc}"
-MY_P="${PN}-${MY_PV}"
-
-if [ "${PV}" = "4.9999" ]; then
-	EGIT_REPO_URI="git://git.samba.org/samba.git"
-	KEYWORDS=""
-	inherit git-2
-else
-	SRC_URI="mirror://samba/rc/${MY_P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
-fi
-
-DESCRIPTION="Samba Suite Version 4"
-HOMEPAGE="http://www.samba.org/"
-LICENSE="GPL-3"
-
-SLOT="0"
-
-IUSE="acl addns ads aio avahi client cluster cups debug fulltest gnutls iprint
-ldap pam quota selinux swat syslog winbind"
-
-RDEPEND="dev-libs/iniparser
-	dev-libs/popt
-	sys-libs/readline
-	virtual/libiconv
-	>=dev-lang/python-2.4.2
-	dev-python/subunit
-	sys-libs/libcap
-	>=sys-libs/ldb-1.1.13
-	>=sys-libs/tdb-1.2.10[python]
-	>=sys-libs/talloc-2.0.7[python]
-	>=sys-libs/tevent-0.9.17
-	sys-libs/zlib
-	>=app-crypt/heimdal-1.5[-ssl]
-	ads? ( client? ( net-fs/cifs-utils[ads] ) )
-	client? ( net-fs/cifs-utils )
-	cluster? ( >=dev-db/ctdb-1.0.114_p1 )
-	ldap? ( net-nds/openldap )
-	gnutls? ( >=net-libs/gnutls-1.4.0 )
-	selinux? ( sec-policy/selinux-samba )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-RESTRICT="mirror"
-
-S="${WORKDIR}/${MY_P}"
-
-CONFDIR="${FILESDIR}/$(get_version_component_range 1-2)"
-
-WAF_BINARY="${S}/buildtools/bin/waf"
-
-pkg_setup() {
-	confutils_use_depend_all fulltest test
-
-	python_set_active_version 2
-	python_pkg_setup
-
-	if use aio; then
-		if ! linux_config_exists || ! linux_chkconfig_present AIO; then
-				ewarn "You must enable AIO support in your kernel config, "
-				ewarn "to be able to support asynchronous I/O. "
-				ewarn "You can find it at"
-				ewarn
-				ewarn "General Support"
-				ewarn " Enable AIO support "
-				ewarn
-				ewarn "and recompile your kernel..."
-		fi
-	fi
-}
-
-src_configure() {
-	local myconf=''
-	if use "debug"; then
-		myconf="${myconf} --enable-developer"
-	fi
-	if use "cluster"; then
-		myconf="${myconf} --with-ctdb-dir=/usr"
-	fi
-	myconf="${myconf} \
-		--enable-fhs \
-		--sysconfdir=/etc \
-		--localstatedir=/var \
-		--with-modulesdir=/usr/$(get_libdir) \
-		--disable-rpath \
-		--disable-rpath-install \
-		--nopyc \
-		--nopyo \
-		--disable-ntdb \
-		--bundled-libraries=NONE \
-		--builtin-libraries=NONE \
-		$(use_with addns dnsupdate) \
-		$(use_with acl) \
-		$(use_with ads) \
-		$(use_with aio aio-support) \
-		$(use_enable avahi) \
-		$(use_with cluster cluster-support) \
-		$(use_enable cups) \
-		$(use_enable gnutls) \
-		$(use_enable iprint) \
-		$(use_with ldap) \
-		$(use_with pam) \
-		$(use_with pam pam_smbpass) \
-		$(use_with quota) \
-		$(use_with syslog) \
-		$(use_with swat) \
-		$(use_with winbind)"
-	CPPFLAGS="-I/usr/include/et ${CPPFLAGS}" \
-		waf-utils_src_configure ${myconf}
-}
-
-src_install() {
-	waf-utils_src_install
-
-	# Make all .so files executable
-	find "${D}" -type f -name "*.so" -exec chmod +x {} +
-
-	# Move all LDB modules to their correct path
-	mkdir -p "${D}"/usr/$(get_libdir)/ldb/modules/ldb
-	mv "${D}"/usr/$(get_libdir)/ldb/*.so "${D}"/usr/$(get_libdir)/ldb/modules/ldb
-
-	# Install init script and conf.d file
-	newinitd "${CONFDIR}/samba4.initd-r1" samba || die "newinitd failed"
-	newconfd "${CONFDIR}/samba4.confd" samba || die "newconfd failed"
-}
-
-src_test() {
-	local extra_opts=""
-	use fulltest || extra_opts+="--quick"
-	"${WAF_BINARY}" test ${extra_opts} || die "test failed"
-}
-
-pkg_postinst() {
-	# Optimize the python modules so they get properly removed
-	python_mod_optimize "${PN}"
-
-	# Warn that it's a release candidate
-	ewarn "This is not a final Samba release, however the Samba Team is now making"
-	ewarn "good progress towards a Samba 4.0 release, of which this is a preview."
-	ewarn "Be aware the this release contains the best of all of Samba's"
-	ewarn "technology parts, both a file server (that you can reasonably expect"
-	ewarn "to upgrade existing Samba 3.x releases to) and the AD domain"
-	ewarn "controller work previously known as 'samba4'."
-
-	einfo "See http://wiki.samba.org/index.php/Samba4/HOWTO for more"
-	einfo "information about samba 4."
-}
-
-pkg_postrm() {
-	# Clean up the python modules
-	python_mod_cleanup "${PN}"
-}