Lots of dependency "fixes" (bug #489166, #489748, #489764, #489770). Minor improvements of the init scripts. Removed old (broken) ebuilds

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

8 files changed, 140 insertions, 432 deletions

diff --git a/net-fs/samba/ChangeLog b/net-fs/samba/ChangeLog
index 360bfe459c86..a463395c618d 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.618 2013/10/14 08:00:42 polynomial-c Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-fs/samba/ChangeLog,v 1.619 2013/10/29 13:54:28 polynomial-c Exp $
+
+*samba-4.1.0-r1 (29 Oct 2013)
+*samba-4.0.10-r1 (29 Oct 2013)
+
+  29 Oct 2013; Lars Wendler <polynomial-c@gentoo.org> -samba-4.0.9.ebuild,
+  -samba-4.0.10.ebuild, +samba-4.0.10-r1.ebuild, -samba-4.1.0_rc4.ebuild,
+  -samba-4.1.0.ebuild, +samba-4.1.0-r1.ebuild, files/4.0/samba4.initd-r1,
+  files/4.1/samba4.initd-r1:
+  Lots of dependency "fixes" (bug #489166, #489748, #489764, #489770). Minor
+  improvements of the init scripts. Removed old (broken) ebuilds.
 
 *samba-4.1.0 (14 Oct 2013)
 
diff --git a/net-fs/samba/Manifest b/net-fs/samba/Manifest
index ba9a4914a9ac..81439fb2c6d9 100644
--- a/net-fs/samba/Manifest
+++ b/net-fs/samba/Manifest
@@ -24,10 +24,10 @@ AUX 3.6/swat.xinetd 526 SHA256 59dbb1e4669cfd5c72dacc8d8aed269f169e827338e6d6e92
 AUX 3.6/system-auth-winbind.pam 704 SHA256 42c80d953da2472d789c3de1311045285428a15562f7ad2371ef214d8ea7bf56 SHA512 a93a491736299a67ec39eb06fa6b14e48038f618a4812ef9b2b46bf20ef9600ca4e0f44997d8e7c7e838760c3c53a739ebcdf1bb017a5f49b005b4470afb65f6 WHIRLPOOL 0601c6866bb15779bb7f5d7286902b1a5137435a92963a60734de98ca9ce95d220dfa456dfd4a229176e3a2be7afb9097bcffcfbd8b98be9bf206dded8054ad4
 AUX 4.0/com_err.patch 1276 SHA256 f0dc953202603a5f8c0625921cd89cd59e9ca74a61302bdf07e591836e6bda31 SHA512 62800c962cfb613b11c77ae9360f6c3c610bb1551f9ac3673ab814f6f8e1f589d1192fb3019f1afdc8becf8e692c8d19f4dcaa8b00aeeeb282642327c959c27e WHIRLPOOL 37d06f7f6d7d77acd9e5d794a6b2512aa092f04c553853045fa42e11f850a91912239385b21f8d76694e37d21d63405ea864ea0627a40aa72850b1fe4b8f4b3b
 AUX 4.0/samba4.confd 1783 SHA256 53755809cc27fdbaf98752cd3da45b5c2bda62dd46fcc37570c6e237f7954ffa SHA512 6fc7edf192957f97b171c97482317bf563385917cfdbf950ed28d9387961bd16f82844c6f9b5c430508ec6dc7331ecdf5f81fa3135663316061c1d0b1808f53d WHIRLPOOL 868539ecf658f9da3574847cb1447dafe422c60a9208de5580cf7f53e4346e9c7d1c6b3e7ea5c684b83e613dd912c5245ffce6a43bc8bd9bf8417a9c7a5f2557
-AUX 4.0/samba4.initd-r1 1575 SHA256 4d00243dbd85ee81e2e989f1ac8035c1c1b9379133584291b959bb7bc45fe780 SHA512 941a4f8e6c839d11140c4caa3efd65176e11f07194e43f37e4f97f9c0e7ee4e8696093876c4b21f808cedcd80d3f7810b3fdcd126a8a0fa87e922299ea605e2c WHIRLPOOL 379166290c15c405c7ff50f6bf2654607282bff71546aa79279bdcd2a00cbb21989f42bb2d0be0588c174db2712b39b4e3eece56104b2ebe6ebbedccb69eb354
+AUX 4.0/samba4.initd-r1 1219 SHA256 9e83017fe7034f4be57c16641ae9525001dd86b19d430327ef23f86f659735b9 SHA512 b9314842ea8cb25eecc24c0d2124d1a2cd7dab24385bab44694836d3050d32033b2fd325c94f1ba819b49c08268e907bc06def2471ef0e624aa32b99dd89ae4d WHIRLPOOL b18784242bbc72b2ec63cc152497b8e15704b7dc2565cfe29bb1a387bea0f11a5da75b586717e6a17f0a670677d5f2ea5625a9c225126e4ec25bd30d479ee43a
 AUX 4.1/com_err.patch 1276 SHA256 f0dc953202603a5f8c0625921cd89cd59e9ca74a61302bdf07e591836e6bda31 SHA512 62800c962cfb613b11c77ae9360f6c3c610bb1551f9ac3673ab814f6f8e1f589d1192fb3019f1afdc8becf8e692c8d19f4dcaa8b00aeeeb282642327c959c27e WHIRLPOOL 37d06f7f6d7d77acd9e5d794a6b2512aa092f04c553853045fa42e11f850a91912239385b21f8d76694e37d21d63405ea864ea0627a40aa72850b1fe4b8f4b3b
 AUX 4.1/samba4.confd 1783 SHA256 53755809cc27fdbaf98752cd3da45b5c2bda62dd46fcc37570c6e237f7954ffa SHA512 6fc7edf192957f97b171c97482317bf563385917cfdbf950ed28d9387961bd16f82844c6f9b5c430508ec6dc7331ecdf5f81fa3135663316061c1d0b1808f53d WHIRLPOOL 868539ecf658f9da3574847cb1447dafe422c60a9208de5580cf7f53e4346e9c7d1c6b3e7ea5c684b83e613dd912c5245ffce6a43bc8bd9bf8417a9c7a5f2557
-AUX 4.1/samba4.initd-r1 1570 SHA256 973bac0e8fbc7157af236871a3d00358d50478d57a38942dd279dc24ce9a2b97 SHA512 9a8f60aac96c6e2a911bd2c25deb84c34b0983a48e86b6dff065bfb78735d0d187e36cdaeaaa0b6019f315f5b23a666208ff2dda54c4723e32aef78990bfdcb7 WHIRLPOOL 05afbb06cff02ef9a7aab3d9d221c9b69c9b756ae17901673ed2f0325111cdaab237d73002a711112915401ad9a64c2cffc9286dd71fbe0c46a7244ad1987ebd
+AUX 4.1/samba4.initd-r1 1219 SHA256 4e9a6f4e5fe270843c2f81610e0f763db1218803b6c0e84f17664150670dd700 SHA512 a6cd441674fa8a514b34f58baa6ee71d22a3a66293c7abbb5fecda79031a18aed1ce8d3b78cfcfbb8fdfce1e04d0155a755e931a9cee000c88293f3d7ae5076c WHIRLPOOL 3f58fd8571e360d979f15b649ca91cc8e298a280386ea9c082d28846cbba519b5443407f2a1cb6065fb0156521e5ab215823ce3ec7db36fa98913b52f060c62b
 AUX nmbd.service 224 SHA256 a5e25c11714206c4fb129333dd45152c5753716c6445cbe78c28275df1a1cb77 SHA512 098dfb270c5a5c29f59b4fd8d51b17931771e25e481124832f1a086677825527e2afa7276e8614e5007fbf044d253ce2eaf3a7caf7461ad5d90d0b1c7f157f9d WHIRLPOOL 2f7c342a60c09d5e40e968a026aa17d8c2fe3fd032331c7bb26599bb0f8ec8a77c2a3e329498ed16b1602451fd85a8ef076c436e8a092740cfbd01a82ca52e30
 AUX samba-3.4.2-lib.tevent.python.mk 177 SHA256 3eab52d42a0cbc070d011a131f9a56f4b3da10b2791fec514948fd8d2d013153 SHA512 0bd691d7678737fa815da9e1934db056fa833aa6d6d2d48cf8da559987a899ae4c5ac18e4b3594d634363f515028a3d30711484dbda578aa7506fbe2df55197c WHIRLPOOL 061b3e33b327563f52648931428cce433505353e73bf9851abb33f4f13e7c723c17c3413442dd343477bb0c49fd3284c0155ff59829df448952a6e1d07475251
 AUX samba.conf 28 SHA256 7457c27215898cac4813a59b8018ea68ea46a692ae0eeadbafe9ad2f2c8c6a8d SHA512 51e3b2499eaf2550ca8290f30821c4a79ad6582a4add5120978f2eb06b374e494072db423e5c87ba4b9f3426a37d9d38701b907459e3a6171f205b5b6caee7b4 WHIRLPOOL 67e6dabd922bb95ffd529385b1c8f9310c610bedba26c9d35e20f35bb5c176fff787c78bea8b80f414755104feedb6b22401c3d20d8420381759eaa62dca3406
@@ -41,34 +41,30 @@ DIST samba-3.5.22.tar.gz 35385144 SHA256 b4c98f77f5634478da109063334acd9b6ad7bcb
 DIST samba-3.6.16.tar.gz 34108738 SHA256 347c0abe608ad907d04e37948d0f82a2d9dd8daeba13b0b78d7463b8d7b3fef4 SHA512 e71328bea07c16d5c72c28f5a5b911e33c65f1a4ac6dff791b820783370d61ce4fde99f24575f0a348b3a87d7eac3961621fb59fd0ef126339aa3c7d31d39ee8 WHIRLPOOL 347b5baa85094933f19c3d35d91c938b8a7854643bbbc515b2293fd05c5f73996057566e0468184eacd06cebc661231f8ab7f9fdbe9e8392f504a265b6243d39
 DIST samba-3.6.19.tar.gz 34115773 SHA256 addecc6acb05d3ffd0934f7f91d8e83852705b9e858e13c506e51c297259a92e SHA512 5d1fcb4b178536061e7ae7a61befbb84c5fce0dba805345a25ad3d393f04068f0ade719aaed42844d4541e64d6cbed28a06b0793e1c74431a4ad5a2cba6bdcc5 WHIRLPOOL 2cafb6a250b9d5b8c22a8ca1914f3af1b8786554c61aed6060b151a971a1169e28196df5e02b35fbc7abc60622e3aebac24022cfd0b4656ca4e51401816a4ab3
 DIST samba-4.0.10.tar.gz 22096085 SHA256 e90b627ce310c2c2d52a914ba9f834ac0b37e6e79c3d8183ce194130e422f292 SHA512 b4f609761f51f00d8526564077836f74f5f500cb5c717bf7b491d0783dbf201f7d5bf05ff89f4451fa454f351411a22bde434b858918d5dd560a0a9aa900c9de WHIRLPOOL 5906906e88251c39b29493cd0b5c9060f6994416a60f0a675af15f0a41b2d6eeea50804f6372f4abd68670eb72e5798c4b6fdf69dec2feedb9fe56a6279258ce
-DIST samba-4.0.9.tar.gz 22089529 SHA256 d1d6c0fa077a82550f2e80c8302ca407413da605906b7184ca98fe6846c362a5 SHA512 4c00ad62e972276d60f53058796de28fb3cd03f243006da0f6ee995826011f957e73602c5925551d03980924b27cac7203656bdf2ab69d5d456e41eb765ffda8 WHIRLPOOL 622d9f09f3b88bd8b54abd8f48ef342e142d1efe08934f26450289667867c940b35ea884bc34d77e5bc64da7901be34e11b9f4c92e53b71f891b81ba5f107a63
 DIST samba-4.1.0.tar.gz 23149430 SHA256 ca56ed4fc34cea8198d79ebbfe9ca555eedd884ed24da9348f439910c28c5f12 SHA512 f03f40641a7ec9f20b88bef6c3d4b84184690599a34c9b1522e21ab590bf8924ed501cd5aef24565d9b019ef101fc8a78fe2e87ed74352c3c1c95374728aaaf0 WHIRLPOOL 7a2a98a8977e8c07414562a63c71db91436e4dd9671e9d20fc96fe89b264c83da2e1af64de5f3bfceba72280183c7950751304474a5febef07466bc6b2bf6b20
-DIST samba-4.1.0rc4.tar.gz 23151729 SHA256 4d5dbc990c96632c58910e2d210ab5c9fd9984ae3a708afb1767854963716462 SHA512 4441a9b1293d71a1ceb801defcad21e1c3ff90bd1789a8070f6d4f4e693221bad105e354ed5aabe97c4ad27038645bc10ddfa6f85f6995c2e75ed95f04e43809 WHIRLPOOL fee7a40083339aae61c85b771c107c488a1e96024d885940ce467cbe8d9e5a5a7dc1fc4aed6e26f8da1d1de512a3a138a4d15d8a89e3cdddf695a2309b441193
 DIST smb_traffic_analyzer_v2.diff.bz2 12226 SHA256 1bae7eafbe8ac2382313d5ab9d43d73ba64b63a714f0f588516952d476fb868d SHA512 aa0e457a0dd282e61e6dfcd5705c29b319832dca9711b1b5baf8373e2f079991399c3537c050219ccb861a93f86353ebff677a5c625d2e3f1f3a13ee5c4087d0 WHIRLPOOL 85ee72a360f67ebe71be5cd400ecd635280a0d7c64ebb8b94656a5ef1a94f74a987de86408af00ce1b81cc8363b1b3cf14726860d29b72ee610d4bab73d6b139
 EBUILD samba-3.5.21.ebuild 12311 SHA256 2a849451f886614315680b28b944840d1c670a2b878329773de63a72797a6fa1 SHA512 5006f1afdc2df93f317d15e1e9781bee20eb0e17e4a15892cb5ebe8bb2ab0a7a56bbbf2ed67099620391eda14b53a8fdb78a5ee9634a489915fcf84b031704b7 WHIRLPOOL a295b28990480ed3e13cf76d4f04270739b2669837d5ea93691888c488ee10dad22cd4bcc2037b09e66be41eda4d3d2e064e28701acb1f2dc7acf80935283123
 EBUILD samba-3.5.22.ebuild 12309 SHA256 dc195567858dc0c11b2b86fc42427e1066c5efeef29bfe047bdbac413a62007d SHA512 82125fe1d5ba33f57ca06e513090eb0f2cedcda3242773b8734b4b0a18c68ab12f9149651908ddffbe3b2687b9876491a6cbbee7dc4f1e0584a5eef218ff8a57 WHIRLPOOL 9e87a5fb631fd519c2fc89da8a1a591fc9a4eb58eee63052f09321a6f115dbd82e8dd383843b6e6feffe68edaacb4de5c6ba6e9e66a098fa0cddc480988776c8
 EBUILD samba-3.6.16.ebuild 12630 SHA256 44b15c6a344343e44d0363a099ee616d12d26a9b7de25bb969fc0bfac460d5d6 SHA512 550b7d166ec024c92c6370b01bc95c1ecc6fe7c6c17a520135dea1424d313e4a16826ef5c0a234370507e15f62bf73aadeeaa95b353d6fd549c68cf020a9ca3c WHIRLPOOL 7a06b107ebe1c131a8f73a2c80f4adba5fd828eb2cf1d87d4d3079513c32a49e1d0d36348d138aea2a04c5e10f368135dc44b22fb3ace3bf5507e0c809af5f14
 EBUILD samba-3.6.19.ebuild 12749 SHA256 61cfc1f327ac5630a949020b0f498b100b6a41bcfe00e4e7b4bcf9a59b82cbfc SHA512 f266e557a2d45286053317e0f569072948fc273f932c4e2f02603beb1b2a5a6df176c90730c5fda8b4deabb1f65562f315d134450cafbc6a94ec3eea9a8daa64 WHIRLPOOL a2d7f3514ed829560ee7f6cb0846be64b4e8315b007131f19cedeacbd47b5790b0a5fcf4cfdea3580eeed275ee8700b074c05fe72a6c50859aea843214221cfb
-EBUILD samba-4.0.10.ebuild 4326 SHA256 a66ba4e82ce6fa3e6cca265236a9577fbfe83055b701928a8176f26aa367bcf3 SHA512 0f7120901a3f47d8bf88fbe468ca5fd5420db3414c15b9597dfcb4346630821a5e5d8975e9c633a75d288ec1e1172a0f739e146d06e7f199c26083dd1423f50d WHIRLPOOL cbe393d52a218af89199c1fd2209c9cee16c6f98fd9690d11688ca40a365a3303985f89395e9cf8a065e73012be7dcce6a73d0dfa225c93e05ba5eb3ab6355de
-EBUILD samba-4.0.9.ebuild 4325 SHA256 0dbf97dcd2e1dd7de1c8ebf1c3e5120b5fd1c28ddda9d81f8ee907277601684d SHA512 a87897c7db222bc715012022b3e5b519414fa9a78f9d07b8c261c25ded6bcd998e588f6a50ba9d666a51dcf0da1f7f5dfb2192578aca4fe76eec89e8e250a800 WHIRLPOOL debc771614aae2e453b726a6a11b3d298c8be8d853e5a7118c3b5be0b045ca8b1fff53b72596ea38d865824bd8b65c8da97302351443213aa6fca3b2eb87acc8
-EBUILD samba-4.1.0.ebuild 4163 SHA256 f7528510f21e1b9821adf63bc68caea4dc3cd98341882137b41bff7bfffbbfdd SHA512 10fa85ee53b466e4d1c3e10ab5c9a40de5d64882870ab1b7295ae17b3dc9ee7f84838af83cc85f1fc9ca8c30e09a3be5e2d328f71bf50c27f70d65b6f17c065c WHIRLPOOL 5a470aaa89b0aadfc83920194f071f9f39d88e6bf8d9c1b51e88dc4d7ed1838789990a089503e321c9bafedff3a5b25c37d67178b67ecbf129527f3f0deb7991
-EBUILD samba-4.1.0_rc4.ebuild 4163 SHA256 951672616fa9d0dd41d75ef5d86e522b2dac34405648b201b9fb53b7a6ef944a SHA512 b23a28baf9c2a2b7c36f4b58434ae01abf89f086770426a31ab164dc62dd4fd3403f9f904feeaec84a3b4152244c3464bc0174264b6731850052eab0b1d30744 WHIRLPOOL 4401e6c98f48a92ebf02f6b743abe32e2a76147247fdba159578ed09d287d623b7be19858a0ed89195dae323d1a8f47db447494fe13790b0a846af21fcd66440
-MISC ChangeLog 101690 SHA256 dfaa85f2edc0d743892cebc0724ae5a02d3f3fd000b1b6a7b5dd3adf6f2dae78 SHA512 1e942c4b57af8d0d2cbef9659bb3edd51f1388a9d206214732b18b499d30dd6f0303d3d78872bf0230c8baef9490f97beb64ce754390550ddcd8015a53ad8407 WHIRLPOOL 67b3510d731ac82808fc20d26b0f4c664b09c5c2a1ff6943c7d000783b6dd37f350ddd7373473f14336914a31ca40b0f26485dbccd7fd8fea178e697b28cf805
+EBUILD samba-4.0.10-r1.ebuild 4681 SHA256 d1bc65028d4bf215ee0131147078ebb8c9b75d949b2b6e6592ca236ed6fe9741 SHA512 cc700db7fcbd315bcfa810eec598ca19cc2c676e8dff833b3a48d9d87ae43e52dde8e4bd094feb8c30dd74590d5685c7aba613cf391208c6667fbdcd8cb1c5d0 WHIRLPOOL 46d1428b047c1c82c48b4c6b2457431160446b1fe2f7a71807188da4477a81ce0af50a800b7774b77fd18992e144ea290fca27abac81b3990876d86cf041eb29
+EBUILD samba-4.1.0-r1.ebuild 4518 SHA256 56385850548049a7964ed7da8f8d0bb396f8da2fa7c58e25dc91295f03bc183b SHA512 5684c8cae3de2923ad6fbebe446f4a0375316892ebb48e9cb4e5e79e909052d92cbffe9efb72d1078088895a47a1da6d00a51ad2f23cc780af844e317d64a854 WHIRLPOOL f31787d007f07125e5219f91647f8a371841eccc8be6a230430e09a753ad0c40f4d3fb782a7b267ddbd101e421c2b840d59627fc4e0a38143ade45b6777784d5
+MISC ChangeLog 102148 SHA256 27ab9dcc9a5b99be5672dde2825d2e1a3dffaf128f6f24f84565a7f279b2d9f3 SHA512 d62e3e7a6b9f8b1ed887cfb9adff1ec966549341f48337f77114e586180827977d6eb21925d97f7a7e7d43cb556a92a0d41ce3e19800552adc245fc138a826a0 WHIRLPOOL a46f90e55ef00ddd553786fdf1e7229c4a10a51c777d8346796c2661576f3bebdc1d74247adb0d54c45e87ce0d941d0a904ade60bd0f178e8cae14a1ec432b3d
 MISC metadata.xml 1514 SHA256 c10deb71703017ec67f4e5bac297d9b4581fec3d8b5549b6aea2a43bda642bc0 SHA512 9e67e8f7e0c972046e32bf4539142559c24183d6c3469e5af2f901728a3c02a9fbfd50e948a9fd414107fd0cb2a8de709ffe3fc5bf3372c77a4a3db6dc622ecc WHIRLPOOL ec92ea6a1b03e70c791670e97e7d9e07e6bdb82c24ed08c186e786afcd009ab63fbee7d481a4cdc394632ad312e58a2048dae3ff333f6f7a1ad19add55e2c8f8
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQIcBAEBCAAGBQJSW6SrAAoJEPiazRVxLXTFN4UQAKw8aLTTY9GZks163R8Mn2Wn
-Dpbl7rfDlo0mN0ilMZYYzLuffZLtt66CJrH4gUDUrzbCRRRThxefVbN83cCQIxHY
-tbBD3UqemvS+mIKClIIIM3JrAW2DrrKVq3fKzcZWD6GQbmJuWjAFrwKwWy1EwIIP
-mV+ARaKy1sLvxwFNlU5UaQj/479EyNRmTGaHAlWjgwGd3bDMbbH7rgyL0jRwiWk9
-PHNZZE+VK6FQf1QL1znjPbv+psYQY1wgeek+mpkoFFasJvPUnz9drwRJJhPh4t05
-3LN824tphr+1ML7tgg4+91gCefTY4ANExhTbxR75zIeADXhxV5rU2J2dLXR3RGoI
-M0Ub5yAjA8pwmeUIGCaFDT2x3N9b0VLGpJyN4mpJl2iXlgJC0ZNzrXt9D8NZzO/R
-5gbDhsz1lDDrUlrLn6vszdJvov+HlCNdDoSW6xwNpfpUh+6BxfloO2bY6LB8IeYu
-1sGOb/mUpD2xwm9rkcml+EBgb8GDkUcbajDCw4HxJbU7QxMQddezMTuj4TXZ2H1r
-v9IG3xd7Si0CyJcW8XldiOxKo0KEwoveJBW0pq/rZ86Ov1GfmeLUFCT1+1RTkQmQ
-VDLx5x9V7yhDHPX7NuFo0DXiv+NQYaWTer10SiUpm8+BSV+nFcr0T8PjjqM1xK3x
-K4gWzV6o1PGjqKQhXGoO
-=KMmy
+iQIcBAEBCAAGBQJSb74VAAoJEPiazRVxLXTFPRQP/3XfFjkIEhY5eQV84iEkG4n5
+sW6bSg2vX85Qhb5FmdN0A1jD0m2Kq5i4FAcI242RbR2KbIH6zIjtcSBZM0k6jAnr
+w4uX7tkc3padXIw2ft8gsRNOo2bbREVYqpT6XoDWp4hP8upzHZrZTkfs6lwBB96D
+7sHhBL8mkm3k7LlprcAipSriaOif9s+R+C0e2sB8SZzeLmKdd161jhffL1L1x1ZN
+JeStjrLUIHcdAUwrK9x5mrnI+jGDOQopMFsE3S1ENoFCy+3XxEdC1cZ3DcFL5oHd
+DOQMxf3vNARgguLCu/FnRougf8c3m1lYWk1fXk+gWMnDNuDnl3cly6+GtWfAhrJn
+YwgeDDkxRP79X19//xg7QhjGzgD7o0S64CMsHM9kslIS0MJ10tHAqkZa0p8QK69b
+4C3T8FjcYdrFHWMipo3ehhwBhKVR9ImRG4w7LvZelJi+T/V63LXKSjNId2poq6mt
+jRkFyCHDDLm3ADfdNdLvKZLPM9rKJoNAtFDfkwcpyD5qs5FpVE/dslb8TBHHulpZ
+n0fdnBbeMSk41qjzE8jai4zkpPTrTPfHF6JAxNIQyBJJvmp95UcvapgX6KE3fklN
+oTCNQXfxdMGXDSYsueOqKck1BBTyPb9xe+1y/i/wr+ZsvDSsJv3q75IDLjQtxLOj
+VxYom1D3wAlVmBgVcJH+
+=APw+
 -----END PGP SIGNATURE-----
diff --git a/net-fs/samba/files/4.0/samba4.initd-r1 b/net-fs/samba/files/4.0/samba4.initd-r1
index b1d5cc91782a..434cc5ff8592 100644
--- a/net-fs/samba/files/4.0/samba4.initd-r1
+++ b/net-fs/samba/files/4.0/samba4.initd-r1
@@ -1,59 +1,56 @@
 #!/sbin/runscript
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License, v2 or later
-# $Header: /var/cvsroot/gentoo-x86/net-fs/samba/files/4.0/samba4.initd-r1,v 1.1 2012/11/24 23:59:23 polynomial-c Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-fs/samba/files/4.0/samba4.initd-r1,v 1.2 2013/10/29 13:54:28 polynomial-c Exp $
 
 extra_started_commands="reload"
+piddir="/var/run"
 
 depend() {
-        after slapd
-        need net
-        use cupsd
+	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
+	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}
 }
 
 start() {
-        ${my_service_PRE}
-        mkdir_sambadirs
-        signal_do start && return 0
+	${my_service_PRE}
+	[ -d "${piddir}" ] || mkdir -p "${piddir}"
+	signal_do start && return 0
 
-        eerror "Error: starting services (see system logs)"
-        signal_do stop
-        return 1
+	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
+	${my_service_PRE}
+	if signal_do stop ; then
+		${my_service_POST}
+		return 0
+	fi
 }
 reload() {
-        ${my_service_PRE}
-        signal_do reload
+	${my_service_PRE}
+	signal_do reload
 }
diff --git a/net-fs/samba/files/4.1/samba4.initd-r1 b/net-fs/samba/files/4.1/samba4.initd-r1
index ebdd3f18f750..0c93a1333784 100644
--- a/net-fs/samba/files/4.1/samba4.initd-r1
+++ b/net-fs/samba/files/4.1/samba4.initd-r1
@@ -1,59 +1,56 @@
 #!/sbin/runscript
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License, v2 or later
-# $Header: /var/cvsroot/gentoo-x86/net-fs/samba/files/4.1/samba4.initd-r1,v 1.1 2013/08/05 04:41:21 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-fs/samba/files/4.1/samba4.initd-r1,v 1.2 2013/10/29 13:54:28 polynomial-c Exp $
 
 extra_started_commands="reload"
+piddir="/var/run"
 
 depend() {
-        after slapd
-        need net
-        use cupsd
+	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
+	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}
 }
 
 start() {
-        ${my_service_PRE}
-        mkdir_sambadirs
-        signal_do start && return 0
+	${my_service_PRE}
+	[ -d "${piddir}" ] || mkdir -p "${piddir}"
+	signal_do start && return 0
 
-        eerror "Error: starting services (see system logs)"
-        signal_do stop
-        return 1
+	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
+	${my_service_PRE}
+	if signal_do stop ; then
+		${my_service_POST}
+		return 0
+	fi
 }
 reload() {
-        ${my_service_PRE}
-        signal_do reload
+	${my_service_PRE}
+	signal_do reload
 }
diff --git a/net-fs/samba/samba-4.0.10.ebuild b/net-fs/samba/samba-4.0.10-r1.ebuild
index 4f3b7fb07e69..3e5d15f11fcb 100644
--- a/net-fs/samba/samba-4.0.10.ebuild
+++ b/net-fs/samba/samba-4.0.10-r1.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-4.0.10.ebuild,v 1.1 2013/10/08 11:20:47 polynomial-c Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-fs/samba/samba-4.0.10-r1.ebuild,v 1.1 2013/10/29 13:54:28 polynomial-c Exp $
 
 EAPI=5
 PYTHON_COMPAT=( python2_{6,7} )
@@ -25,32 +25,41 @@ LICENSE="GPL-3"
 
 SLOT="0"
 
-IUSE="acl addns ads aio avahi client cluster cups gnutls iprint
-ldap pam quota selinux swat syslog test winbind"
+IUSE="acl addns ads aio avahi client cluster cups fam gnutls iprint
+ldap quota selinux swat syslog test winbind"
 
+# sys-apps/attr is an automagic dependency (see bug #489748)
+# dev-libs/libaio is an automagic dependency (see bug #489764)
+# sys-libs/pam is an automagic dependency (see bug #489770)
 RDEPEND="${PYTHON_DEPS}
+	>=app-crypt/heimdal-1.5[-ssl]
 	dev-libs/iniparser
+	dev-libs/libaio
 	dev-libs/popt
 	sys-libs/readline
 	virtual/libiconv
 	dev-python/subunit
+	sys-apps/attr
 	sys-libs/libcap
 	>=sys-libs/ldb-1.1.16
 	>=sys-libs/tdb-1.2.11[python]
 	>=sys-libs/talloc-2.0.8[python]
 	>=sys-libs/tevent-0.9.18
 	sys-libs/zlib
-	>=app-crypt/heimdal-1.5[-ssl]
+	virtual/pam
+	acl? ( virtual/acl )
 	addns? ( net-dns/bind-tools[gssapi] )
 	client? ( net-fs/cifs-utils[ads?] )
 	cluster? ( >=dev-db/ctdb-1.0.114_p1 )
+	fam? ( virtual/fam )
+	gnutls? ( dev-libs/libgcrypt
+		>=net-libs/gnutls-1.4.0 )
 	ldap? ( net-nds/openldap )
-	gnutls? ( >=net-libs/gnutls-1.4.0 )
 	selinux? ( sec-policy/selinux-samba )"
 DEPEND="${RDEPEND}
 	virtual/pkgconfig"
 
-REQUIRED_USE="ads? ( ldap )"
+REQUIRED_USE="ads? ( acl ldap )"
 
 RESTRICT="mirror"
 
@@ -86,6 +95,7 @@ src_configure() {
 		--localstatedir=/var \
 		--with-modulesdir=/usr/$(get_libdir)/samba \
 		--with-pammodulesdir=/$(get_libdir)/security \
+		--with-piddir=/run/${PN} \
 		--disable-rpath \
 		--disable-rpath-install \
 		--nopyc \
@@ -94,18 +104,19 @@ src_configure() {
 		--bundled-libraries=NONE \
 		--builtin-libraries=NONE \
 		$(use_with addns dnsupdate) \
-		$(use_with acl) \
+		$(use_with acl acl-support) \
 		$(use_with ads) \
 		$(use_with aio aio-support) \
 		$(use_enable avahi) \
 		$(use_with cluster cluster-support) \
 		$(use_enable cups) \
+		$(use_with fam) \
 		$(use_enable gnutls) \
 		$(use_enable iprint) \
 		$(use_with ldap) \
-		$(use_with pam) \
-		$(use_with pam pam_smbpass) \
-		$(use_with quota) \
+		--with-pam \
+		--with-pam_smbpass \
+		$(use_with quota quotas) \
 		$(use_with syslog) \
 		$(use_with swat) \
 		$(use_with winbind)
diff --git a/net-fs/samba/samba-4.0.9.ebuild b/net-fs/samba/samba-4.0.9.ebuild
deleted file mode 100644
index e9da7e50f769..000000000000
--- a/net-fs/samba/samba-4.0.9.ebuild
+++ /dev/null
@@ -1,161 +0,0 @@
-# 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.9.ebuild,v 1.1 2013/09/06 11:58:35 polynomial-c Exp $
-
-EAPI=5
-PYTHON_COMPAT=( python2_{6,7} )
-
-inherit python-r1 waf-utils multilib linux-info systemd
-
-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/stable/${MY_P}.tar.gz"
-	KEYWORDS="~amd64 ~hppa ~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 gnutls iprint
-ldap pam quota selinux swat syslog test winbind"
-
-RDEPEND="${PYTHON_DEPS}
-	dev-libs/iniparser
-	dev-libs/popt
-	sys-libs/readline
-	virtual/libiconv
-	dev-python/subunit
-	sys-libs/libcap
-	>=sys-libs/ldb-1.1.16
-	>=sys-libs/tdb-1.2.11[python]
-	>=sys-libs/talloc-2.0.8[python]
-	>=sys-libs/tevent-0.9.18
-	sys-libs/zlib
-	>=app-crypt/heimdal-1.5[-ssl]
-	addns? ( net-dns/bind-tools[gssapi] )
-	client? ( net-fs/cifs-utils[ads?] )
-	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"
-
-REQUIRED_USE="ads? ( ldap )"
-
-RESTRICT="mirror"
-
-S="${WORKDIR}/${MY_P}"
-
-CONFDIR="${FILESDIR}/$(get_version_component_range 1-2)"
-
-WAF_BINARY="${S}/buildtools/bin/waf"
-
-pkg_setup() {
-	python_export_best
-	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=''
-	use "cluster" && myconf+=" --with-ctdb-dir=/usr"
-	use "test" && myconf+=" --enable-selftest"
-	myconf="${myconf} \
-		--enable-fhs \
-		--sysconfdir=/etc \
-		--localstatedir=/var \
-		--with-modulesdir=/usr/$(get_libdir)/samba \
-		--with-pammodulesdir=/$(get_libdir)/security \
-		--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)
-		"
-	use "ads" && myconf+=" --with-shared-modules=idmap_ad"
-
-	CPPFLAGS="-I/usr/include/et ${CPPFLAGS}" \
-		waf-utils_src_configure ${myconf}
-}
-
-src_install() {
-	waf-utils_src_install
-
-	# Seems like the build script gets the shebangs correct by itself
-	# (4.0.6)
-	#python_replicate_script \
-	#	"${D}/usr/sbin/samba_dnsupdate" \
-	#	"${D}/usr/sbin/samba_spnupdate" \
-	#	"${D}/usr/sbin/samba_upgradedns" \
-	#	"${D}/usr/sbin/samba_kcc" \
-	#	"${D}/usr/bin/samba-tool"
-
-	# Make all .so files executable
-	find "${D}" -type f -name "*.so" -exec chmod +x {} +
-
-	# Install init script and conf.d file
-	newinitd "${CONFDIR}/samba4.initd-r1" samba
-	newconfd "${CONFDIR}/samba4.confd" samba
-
-	systemd_dotmpfilesd "${FILESDIR}"/samba.conf
-	systemd_dounit "${FILESDIR}"/nmbd.service
-	systemd_dounit "${FILESDIR}"/smbd.{service,socket}
-	systemd_newunit "${FILESDIR}"/smbd_at.service 'smbd@.service'
-	systemd_dounit "${FILESDIR}"/winbindd.service
-}
-
-src_test() {
-	"${WAF_BINARY}" test || die "test failed"
-}
-
-pkg_postinst() {
-	elog "This is is the first stable release of Samba 4.0"
-
-	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'."
-
-	elog "For further information and migration steps make sure to read "
-	elog "http://samba.org/samba/history/${P}.html "
-	elog "http://samba.org/samba/history/${PN}-4.0.0.html and"
-	elog "http://wiki.samba.org/index.php/Samba4/HOWTO "
-}
diff --git a/net-fs/samba/samba-4.1.0.ebuild b/net-fs/samba/samba-4.1.0-r1.ebuild
index 2ad8a7173cd3..77efc3b33891 100644
--- a/net-fs/samba/samba-4.1.0.ebuild
+++ b/net-fs/samba/samba-4.1.0-r1.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-4.1.0.ebuild,v 1.1 2013/10/14 08:00:42 polynomial-c Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-fs/samba/samba-4.1.0-r1.ebuild,v 1.1 2013/10/29 13:54:28 polynomial-c Exp $
 
 EAPI=5
 PYTHON_COMPAT=( python2_{6,7} )
@@ -19,32 +19,41 @@ LICENSE="GPL-3"
 
 SLOT="0"
 
-IUSE="acl addns ads aio avahi client cluster cups gnutls iprint
-ldap pam quota selinux syslog test winbind"
+IUSE="acl addns ads aio avahi client cluster cups fam gnutls iprint
+ldap quota selinux syslog test winbind"
 
+# sys-apps/attr is an automagic dependency (see bug #489748)
+# dev-libs/libaio is an automagic dependency (see bug #489764)
+# sys-libs/pam is an automagic dependency (see bug #489770)
 RDEPEND="${PYTHON_DEPS}
+	>=app-crypt/heimdal-1.5[-ssl]
 	dev-libs/iniparser
+	dev-libs/libaio
 	dev-libs/popt
 	sys-libs/readline
 	virtual/libiconv
 	dev-python/subunit
+	sys-apps/attr
 	sys-libs/libcap
 	>=sys-libs/ldb-1.1.16
 	>=sys-libs/tdb-1.2.11[python]
 	>=sys-libs/talloc-2.0.8[python]
 	>=sys-libs/tevent-0.9.18
 	sys-libs/zlib
-	>=app-crypt/heimdal-1.5[-ssl]
+	virtual/pam
+	acl? ( virtual/acl )
 	addns? ( net-dns/bind-tools[gssapi] )
 	client? ( net-fs/cifs-utils[ads?] )
 	cluster? ( >=dev-db/ctdb-1.0.114_p1 )
+	fam? ( virtual/fam )
+	gnutls? ( dev-libs/libgcrypt
+		>=net-libs/gnutls-1.4.0 )
 	ldap? ( net-nds/openldap )
-	gnutls? ( >=net-libs/gnutls-1.4.0 )
 	selinux? ( sec-policy/selinux-samba )"
 DEPEND="${RDEPEND}
 	virtual/pkgconfig"
 
-REQUIRED_USE="ads? ( ldap )"
+REQUIRED_USE="ads? ( acl ldap )"
 
 RESTRICT="mirror"
 
@@ -80,6 +89,7 @@ src_configure() {
 		--localstatedir=/var \
 		--with-modulesdir=/usr/$(get_libdir)/samba \
 		--with-pammodulesdir=/$(get_libdir)/security \
+		--with-piddir=/run/${PN} \
 		--disable-rpath \
 		--disable-rpath-install \
 		--nopyc \
@@ -87,18 +97,19 @@ src_configure() {
 		--bundled-libraries=ntdb \
 		--builtin-libraries=ntdb \
 		$(use_with addns dnsupdate) \
-		$(use_with acl) \
+		$(use_with acl acl-support) \
 		$(use_with ads) \
 		$(use_with aio aio-support) \
 		$(use_enable avahi) \
 		$(use_with cluster cluster-support) \
 		$(use_enable cups) \
+		$(use_with fam) \
 		$(use_enable gnutls) \
 		$(use_enable iprint) \
 		$(use_with ldap) \
-		$(use_with pam) \
-		$(use_with pam pam_smbpass) \
-		$(use_with quota) \
+		--with-pam \
+		--with-pam_smbpass \
+		$(use_with quota quotas) \
 		$(use_with syslog) \
 		$(use_with winbind)
 		"
diff --git a/net-fs/samba/samba-4.1.0_rc4.ebuild b/net-fs/samba/samba-4.1.0_rc4.ebuild
deleted file mode 100644
index 02d1962bc995..000000000000
--- a/net-fs/samba/samba-4.1.0_rc4.ebuild
+++ /dev/null
@@ -1,153 +0,0 @@
-# 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.1.0_rc4.ebuild,v 1.1 2013/10/01 08:20:51 polynomial-c Exp $
-
-EAPI=5
-PYTHON_COMPAT=( python2_{6,7} )
-
-inherit python-r1 waf-utils multilib linux-info systemd
-
-MY_PV="${PV/_rc/rc}"
-MY_P="${PN}-${MY_PV}"
-
-SRC_URI="mirror://samba/rc/${MY_P}.tar.gz"
-KEYWORDS="~amd64 ~hppa ~x86"
-
-DESCRIPTION="Samba Suite Version 4"
-HOMEPAGE="http://www.samba.org/"
-LICENSE="GPL-3"
-
-SLOT="0"
-
-IUSE="acl addns ads aio avahi client cluster cups gnutls iprint
-ldap pam quota selinux syslog test winbind"
-
-RDEPEND="${PYTHON_DEPS}
-	dev-libs/iniparser
-	dev-libs/popt
-	sys-libs/readline
-	virtual/libiconv
-	dev-python/subunit
-	sys-libs/libcap
-	>=sys-libs/ldb-1.1.16
-	>=sys-libs/tdb-1.2.11[python]
-	>=sys-libs/talloc-2.0.8[python]
-	>=sys-libs/tevent-0.9.18
-	sys-libs/zlib
-	>=app-crypt/heimdal-1.5[-ssl]
-	addns? ( net-dns/bind-tools[gssapi] )
-	client? ( net-fs/cifs-utils[ads?] )
-	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"
-
-REQUIRED_USE="ads? ( ldap )"
-
-RESTRICT="mirror"
-
-S="${WORKDIR}/${MY_P}"
-
-CONFDIR="${FILESDIR}/$(get_version_component_range 1-2)"
-
-WAF_BINARY="${S}/buildtools/bin/waf"
-
-pkg_setup() {
-	python_export_best
-	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=''
-	use "cluster" && myconf+=" --with-ctdb-dir=/usr"
-	use "test" && myconf+=" --enable-selftest"
-	myconf="${myconf} \
-		--enable-fhs \
-		--sysconfdir=/etc \
-		--localstatedir=/var \
-		--with-modulesdir=/usr/$(get_libdir)/samba \
-		--with-pammodulesdir=/$(get_libdir)/security \
-		--disable-rpath \
-		--disable-rpath-install \
-		--nopyc \
-		--nopyo \
-		--bundled-libraries=ntdb \
-		--builtin-libraries=ntdb \
-		$(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 winbind)
-		"
-	use "ads" && myconf+=" --with-shared-modules=idmap_ad"
-
-	CPPFLAGS="-I/usr/include/et ${CPPFLAGS}" \
-		waf-utils_src_configure ${myconf}
-}
-
-src_install() {
-	waf-utils_src_install
-
-	# Seems like the build script gets the shebangs correct by itself
-	# (4.0.6)
-	#python_replicate_script \
-	#	"${D}/usr/sbin/samba_dnsupdate" \
-	#	"${D}/usr/sbin/samba_spnupdate" \
-	#	"${D}/usr/sbin/samba_upgradedns" \
-	#	"${D}/usr/sbin/samba_kcc" \
-	#	"${D}/usr/bin/samba-tool"
-
-	# Make all .so files executable
-	find "${D}" -type f -name "*.so" -exec chmod +x {} +
-
-	# Install init script and conf.d file
-	newinitd "${CONFDIR}/samba4.initd-r1" samba
-	newconfd "${CONFDIR}/samba4.confd" samba
-
-	systemd_dotmpfilesd "${FILESDIR}"/samba.conf
-	systemd_dounit "${FILESDIR}"/nmbd.service
-	systemd_dounit "${FILESDIR}"/smbd.{service,socket}
-	systemd_newunit "${FILESDIR}"/smbd_at.service 'smbd@.service'
-	systemd_dounit "${FILESDIR}"/winbindd.service
-}
-
-src_test() {
-	"${WAF_BINARY}" test || die "test failed"
-}
-
-pkg_postinst() {
-	elog "This is is the first stable release of Samba 4.0"
-
-	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'."
-
-	elog "For further information and migration steps make sure to read "
-	elog "http://samba.org/samba/history/${P}.html "
-	elog "http://samba.org/samba/history/${PN}-4.0.0.html and"
-	elog "http://wiki.samba.org/index.php/Samba4/HOWTO "
-}