Version bump. Removed old

Package-Manager: portage-2.2.0_alpha134/cvs/Linux x86_64

5 files changed, 19 insertions, 929 deletions

diff --git a/net-fs/samba/ChangeLog b/net-fs/samba/ChangeLog
index 885789b8952c..b1b5a409630c 100644
--- a/net-fs/samba/ChangeLog
+++ b/net-fs/samba/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-fs/samba
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-fs/samba/ChangeLog,v 1.525 2012/09/30 17:59:25 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-fs/samba/ChangeLog,v 1.526 2012/10/02 08:00:47 polynomial-c Exp $
+
+*samba-3.6.8 (02 Oct 2012)
+
+  02 Oct 2012; Lars Wendler <polynomial-c@gentoo.org> -samba-3.5.14.ebuild,
+  -samba-3.5.16.ebuild, -samba-3.6.5.ebuild, +samba-3.6.8.ebuild:
+  non-maintainer commit: Version bump, removed old versions.
 
   30 Sep 2012; Mike Gilbert <floppym@gentoo.org> samba-4.0.0_rc1.ebuild:
   Remove minimum python version.
diff --git a/net-fs/samba/Manifest b/net-fs/samba/Manifest
index 4268a7d77088..5ae3423b7a1a 100644
--- a/net-fs/samba/Manifest
+++ b/net-fs/samba/Manifest
@@ -1,6 +1,3 @@
------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,31 +23,20 @@ AUX 4.0/com_err.patch 1276 SHA256 f0dc953202603a5f8c0625921cd89cd59e9ca74a61302b
 AUX 4.0/samba4.initd 657 SHA256 0b8c9df0d7ec7229f6cfb397f9ee1edb9b85d4379ed088629afe11cf589a32ad SHA512 06e580a1a2b9b30e86b058ef4625ca20b43dbd640b370ebe9a2ee94739675ad5772bc722b1fb262540fda4d2e6936cde758c370ace58d6fdd64cc1467a779d6b WHIRLPOOL 3fa4f0335c8a4a4254d71ce987395c2f2422015d691bbbf0db61c6dac8f985d5d6cbe1fa9ab8790036dfc71afda80bcbff10c241586a20dc4bd4399a4d56bdad
 AUX samba-3.4.2-lib.tevent.python.mk 177 SHA256 3eab52d42a0cbc070d011a131f9a56f4b3da10b2791fec514948fd8d2d013153 SHA512 0bd691d7678737fa815da9e1934db056fa833aa6d6d2d48cf8da559987a899ae4c5ac18e4b3594d634363f515028a3d30711484dbda578aa7506fbe2df55197c WHIRLPOOL 061b3e33b327563f52648931428cce433505353e73bf9851abb33f4f13e7c723c17c3413442dd343477bb0c49fd3284c0155ff59829df448952a6e1d07475251
 AUX samba4.initd 657 SHA256 4c8d1ecf42d58bfa1a2087ba9da55ed410ad238a0050272cb84c2e8d50b034d9 SHA512 3373f2ad30938dd8c2d68d19af4e248470e0b6d749b53257c97d3a0792df54f9ad61a33175ae3e576b728cc11a6ae5fd8803c22188382c7b50ca041b98b84ce7 WHIRLPOOL 25f6a313323b3076ad2a5ff733b1ed4bae1833bf5d4d1aaf9c75449e578ca479998b526a1fdfefbe5d5436c94cbcf6b38934bda1ddff8587f8820a2ccb5ce1e9
-DIST samba-3.5.14.tar.gz 30368829 SHA256 bbdb1f2695bb4227dda0af5babf6eff55336e0d11434cde06de75f0a01d02a52 SHA512 c96ea21951b9d77deb658810a61e7ebc9f6d5d2f6c1f0f6c3653bc41541e6804c6bbecb79a2f94a187cfb5973b26bb5804141747123744fd8abf50193e97187c WHIRLPOOL 9f6a4d2ea6f34a8807b2c4d70a26ee43a46e8d5b3b650d99b30bfe67f46e0d30c85a9a703990fa184895bf019286ae47560a0f74da08ba9143bfd7ad348cfec8
 DIST samba-3.5.15.tar.gz 30368870 SHA256 c23c67c1212b7ff2e68a9e047a22200e1ad447d5ac1bd3cf24363f4b5875d396 SHA512 917864ba014a3180583bf8ce9d89a61c17e5d8b19256a603420481eaf69208600e0e525b9036570dabc1136b2dc0e125627b6f495ad4292f68c1722f6865cada WHIRLPOOL c02d16056baf0dff0783b6f8593e80cbe21144cbf26ef0c15a806ef6520d2d8d263a052e41eba2c66fee1dd47c0385eda119c356665fae2978dcb64accc44981
-DIST samba-3.5.16.tar.gz 35367569 SHA256 447bb56a12ed1917ae71d5b385c68f6804a25470e62a3a65477158c02a67ab7c SHA512 c836e0d69b62151513c832f6aa15b95483a6f1573296480a8c38bcc28e39284de78a98f78de5a378e9439d684c5e60d7555b6941deaafef04b3b1ab2adeeaf41 WHIRLPOOL c0bb1e6d408a4b8d7715e20f7cfab27402e46d01ef67d5a7f86fd20fd761401528d7a2246be46e564d7d84ed99d0a5e81ddc47d5afc28c13c3772c2f6319048c
 DIST samba-3.5.17.tar.gz 35368811 SHA256 793f38ab2df6b2431c469c6b7018fc21638475a4cb241614af2b7537d54fbce8 SHA512 9712cd1e04885ce302086d3801d934ca9cdd1a363ac5a804734a2e6c2e6e21dad135e3aaf63a1bb1e4eb96e000517a8d608c9e5c5df80414f7705894a2a0e9b3 WHIRLPOOL a3ac96492f7823398090beaa81ce60f545899fea8ea767133acde03abb1210f9c50f27b04b9f6a42c33b3205e5228138e07ef38ecc46e162aae4278146c0c9dc
-DIST samba-3.6.5.tar.gz 29009444 SHA256 8af65ff3b8c1155e7897c89a895e3155534ec3c5b97877ee2f05fc9d8bab80c4 SHA512 5ee25308e5cf89265618cb94ac6aa69e206a166fb06142c88fff1ae46f6217fda1bf93740b84e327daa9636f87849302a7298abb8bcccfe10607e537761b89d2 WHIRLPOOL d2a06b325516587c8fad2206a2e27b339958f501f9de97b9e894de89085e898577aeed443fed4221fd14e02bc0da99df8806bbd5ececbafe9a014bd3c544e526
 DIST samba-3.6.6.tar.gz 34061741 SHA256 67685f2badf7451cb06ad60534784072947c3a845e4d0afec5ab7817f2ee9310 SHA512 f9045c57bbce04bbaf5540ee92ce78437d5f53bbf424384c1c6e5a1cd0822a4e0c913a8e4bfbe836950b4195a7c90ff29c1ffd9304d28d3dd7138ca69de05b4b WHIRLPOOL 5df2dea100d3050d1f33ab3144b6c91441c7821367596e2eb64ac4936c309bcbedfc39a652c3f14103bdc4e91c075b88a7acd2b41ddc839ef0cb5f861fe363cc
 DIST samba-3.6.7.tar.gz 34067900 SHA256 b858a0f011ba7fe554881b9c7e6cb1c9cb7face22ed86860f560fcaecc4ed4ca SHA512 3b7282b010aaafa2672403e6cda7dfbb4a4d53feabe864099a96513c89a1dcb1d254a3dfa1c4a303bab1ff961ecf1a6fb58b13bffa07255d901ef2d5529b4ce3 WHIRLPOOL 23c0444a4501116a126ecaf49e48a83d47a15010dbfe7ecc96f0e705d4d8c3b03da8ba5f036b983d5a2d57282ef2217a33eff8c3d104e254c38319a4bb35a93b
+DIST samba-3.6.8.tar.gz 34070798 SHA256 4f5a171a8d902c6b4f822ed875c51eb8339196d9ccf0ecd7f6521c966b3514de SHA512 11d7161c6b1c50b740338b80a5d55f0f7f07f6c6f5218b1c8e8e2d3ea14e2e22069a2342700777bbdce734cdf723d00d518f4f9837fbadeac2baf326eb98ee6d WHIRLPOOL 5422473a01f5650ee4ddb31779b85591790fd9e54c01c4be82413b88b209e515e23d1a48d96e7bbbee3830cab5f52014a4268ed50625eb5f81b34edaa8e32b7e
 DIST samba-4.0.0alpha17.tar.gz 20749528 SHA256 6c3a238d2ae1a98177f87465b263e34d9fb7198bf86c21a69b5276c3fea6cf09 SHA512 2eaa221c33e13453ec6189c0eb7155514841f52fa0e255e2f03b7daa78b4ffdd0efcfb60ff973467079ad037a107e0ea58482cd361dbe5911f6184342de796a9 WHIRLPOOL 79a487260f14de6c4c001f41d6e8cc6c2ecdc7747103ef08b398d24fd6453c6775996b5af49e0fbd3806b2f0bccf38908573f1f54ef615355b129580905040da
 DIST samba-4.0.0rc1.tar.gz 22028510 SHA256 0a4ec6a77dc0113ca7574f367c18509fd555c08c9f7c17938312545dd3e8b6c6 SHA512 a0252567701b9b8ecc304b3b7c1b0ab0864854cbd69857b50853edfd8bf4c6f30619c4a22f8178aa390d5ed37de51d72c58b1d10072d0d81c7a4892fd514edac WHIRLPOOL b9d48f8d9c646b27a1e04add133f65503f9a436da50ef5382a2a43f364760f368c4430b3bcf372e1efa496bc4221a421ffcf99083de12a3660205121113992bb
 DIST smb_traffic_analyzer_v2.diff.bz2 12226 SHA256 1bae7eafbe8ac2382313d5ab9d43d73ba64b63a714f0f588516952d476fb868d SHA512 aa0e457a0dd282e61e6dfcd5705c29b319832dca9711b1b5baf8373e2f079991399c3537c050219ccb861a93f86353ebff677a5c625d2e3f1f3a13ee5c4087d0 WHIRLPOOL 85ee72a360f67ebe71be5cd400ecd635280a0d7c64ebb8b94656a5ef1a94f74a987de86408af00ce1b81cc8363b1b3cf14726860d29b72ee610d4bab73d6b139
-EBUILD samba-3.5.14.ebuild 12342 SHA256 1545767c4b2f24e90478c1615372b6b8cb080103cf38fcff88756431fef544ea SHA512 96b3c3c88f5f29cbad60e4b2df125c9e6bad4f82d88035e0e312ad659b482332879409649f1cd2b85ece4096264436543d636c450c7b74cb5a2b4dae2f62545b WHIRLPOOL 3c172319be905c7e6e26f9334885ab3d56aec52cbc0834ff68e9c55d38e504a4a3a7f95e91666ecaafe19f0b3731b8980fea6a23379b2e46709bea29a5ebc561
 EBUILD samba-3.5.15.ebuild 12342 SHA256 aad766339433b9e2e265a0a3dec05d8652a4dd81c637388c86c7f84764b6d2cf SHA512 c43b443853242ca0a49b0f638fa865da261eaa1eab8b89b26986fb25e98a79a5fd741533749ea12696b5ebc794eefdae7344159ca19d6ad221d74172d8840d0d WHIRLPOOL 65c82be0756745c0322fbb63a1508dd901a0ac335798d3f15738749ad9f79bb6db4f86df6633a0acc5a0506a572e113ac8a302d3854ef9b316d42be82cf0b9e9
-EBUILD samba-3.5.16.ebuild 12354 SHA256 b08fd2ec99ab7585bae8525d9cb90a1dc6c622619cdf78f07a1c21a830655ede SHA512 4bb7520da8f173ec8a150718d6f02f01b4a689fb573a821cc23ee6b532577f4593f333c5adbd5e498e02b32d54657c39ef635dbbd1e163c555dc45d51ca35975 WHIRLPOOL ee8f767a4989c9bea1cba14aff760101bd8857ad10d117e05b45d051b29eb77b792ae5d838c158c1d29ef79ae2e820fc4ead6e3bdf59006f9919444d4f8ddd18
 EBUILD samba-3.5.17.ebuild 12409 SHA256 59e26b5d505a45d5a8e210a85332420e4670c6cc4e680ca48e9a2ee3eb53a618 SHA512 58fbd7fed095deb0542f6e503d70f50ef7390dc6233e8fbec0aed9db23010a14579e13fcb6c1ddde1bca6ddf0c7c92ef77c6276994fa99c893b5ef10d1c148be WHIRLPOOL 4fe35da89937459c9fda46de98666ad83785e37b1309eb910af20139c66093b8b8cc57b8582b721a944d78f49cd1eae142dc4f1a9af17438b1c565ac4d7f296c
-EBUILD samba-3.6.5.ebuild 11585 SHA256 8c29a56af0f427e65812b7acb81b4d9f8aeba38a368af52dda450026bd2f300a SHA512 1e2f3c1e92852f3fa2a3360024a16de00123948d89475d87bf9487decbd39ef1a8c84d783939176dc8f7334161a2b480855bb6c72d0e6dcda052a449d9d8f73e WHIRLPOOL c06ea3337c02ea05e17095a01c17b12164eb17b6781378a1e22b1147997c815aa14a76699ab8fee0f67d59b20db656e0c2ddd1017382ee8902b91f83fbd33d4d
 EBUILD samba-3.6.6.ebuild 11584 SHA256 13554505e9e660d03b8e25b5a243d8ba3e912bd37a93654f3723db57645c2afe SHA512 e3cb1ca7620450e74f942aa7182d4af88e9a47aae7bac1725badd2b7d8e35e9c50adf2edb05328fd889dc1ee05ed48035a0876460d60efe4d95b0192bbdee9f1 WHIRLPOOL 0405d3d068f8caed4db6e68ec0fff7ff6daa7eda56e12dcc5008b675858e825d8096c5a54fa6d9a60db559fc48a9cf30852222210d2ab1821e1caab89980bb00
 EBUILD samba-3.6.7.ebuild 11761 SHA256 952ce5215044989d03daf5ba664a0d065b84b80886547b269966664bd66cbccb SHA512 ae06acee02811d09043e18bfb890c631efbf809caa124a7fb89400940fb9e6d0a01c8a14fc84887e6aac23dbad7a11cdd6fc6448b366b5be20293752e90a6519 WHIRLPOOL d51d0a76a0c44eacc5b85f84914ba590b3b176b530041f323e8d59aa7dc2fc6be2abbaecb3922c391e17eb389061778c2cfd96d40a9d7b23dbef181ff01e7964
+EBUILD samba-3.6.8.ebuild 11765 SHA256 a71492db7bc9be34981095bb14bb7bacc7b94bc25f48d35f33d893557c33e681 SHA512 33352d6454c0e36287938a31b7c6fe325451b2c173abe7e58ecfbe36bda967b66f135dce051bc3f42f571c20a25d4fac4d69f59aafd08430458b81a2ee737110 WHIRLPOOL 935fa29439729868b996b7ad555dc9a8fc283dadab5346ffe3244668cbb240ebf4fe109c5c1e87f567a11c18781fa215288af62624e1712d035800939c446b2d
 EBUILD samba-4.0.0_alpha17.ebuild 3221 SHA256 988fef8633eb5c192e664ef80de034060408a21a4e62d43ad9c2d47dc695ee8e SHA512 c089b45bab4450e4e8954810b8325b3c9df08ec0af1c4965a01bb5a0fd7ffa52aa89548d09789797e23c30acc478e1bebd7a529f3463319937697aecd99a50c9 WHIRLPOOL 01d7a5b6bfbc37e51f24493e8706c532d568dd5a3ea945554633fee7cc4696aa3ee727299038f801c38979f5464a42de1dedc4e39d88db9ea59c83ab8abbdeaf
 EBUILD samba-4.0.0_rc1.ebuild 4097 SHA256 93054c114ba5e0b0e5df71854d187976c5c7ba69f9c43f2704a83f9e3a279974 SHA512 79eb2997b9ca2dcbc5a34f9cd65be82b5fc6bf6670d37ebf5f7f380c6ee8405900e99a2edc743528b284c86a11b3738375c6e0ba8290ca140b71ddc0af9a4370 WHIRLPOOL c7fb9bbcb551bde808bf41aba224cb407dfb2991dd2c98628f9b566f5e1dce1980911164eead15349afa93d341e1acfe397088cafe77336656643d809d503e99
-MISC ChangeLog 87208 SHA256 3e1b28cfb0e8ff8af755a142c25b424a344c703ffd16c82f9ee281af97b3d20f SHA512 8e9c0ec6e2b6d6ee3cec8fef67ac973cf3fc42a61e5abd235a7c97502a9de264dd66153dc02696071ea6078dee4ff8f5c5c0cd0f5d95eb3382822ab7600c51f0 WHIRLPOOL 25ab218d8ba56289238e71e069bf8b6fe77aeef3a81b4df742a458efa204038acd77a33625a94faf8ddd6774e5ce6d08590ee8c645e12fad85f6fba4f83a50ee
+MISC ChangeLog 87445 SHA256 ce6a28c617b229d076cc69f5644ad3b8e96c3004ac1ec38172cfffe3c8a276dc SHA512 79f661d10976f1d11031095d014859177dbe3559b370512bbda81f137c023d5bceafa2edc891284125c455cfdc0ab14c94fcdda5ad5f6261ee7cdb4a063c5185 WHIRLPOOL 2faf7a8969b07a17bdc8ca00d7b7f87b457097edc8893df345a07a803b635b7fd3700ac58974b79f3aff2df2c7040cff5fde76003bd3dbf0bf99f4cf62553866
 MISC metadata.xml 1630 SHA256 ed398aadab7a4bb58e2dfe8af77dd1d9441a218046b06a9bb43007e427cd2a16 SHA512 53d436acb0a32757c2159e430f9c80cab8ef781fc164a98bfdcd3d443b091104a18b7f6f6dc70c8eddda9c89984f62b347b337abe200315bf6139acddd757fd2 WHIRLPOOL f297887b3f607d6ca953019557e2c34ff5253423e18e884309bbe8e73c33a0f307c80ea9a327dda8a892ebe72b4d992dbefd2eae21e9e5ac876c95a553b57f0e
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
-
-iF4EAREIAAYFAlBoiIMACgkQC77qH+pIQ6RrTwD9EpyOgmwD7T0oArp4eBPB/cnR
-MJkZUG1aU4pVy5mY6GgA/iKej01kbxGSP+uFRiG7+K/S4JA4AnBwXbrXxCYg/oXr
-=amzC
------END PGP SIGNATURE-----
diff --git a/net-fs/samba/samba-3.5.14.ebuild b/net-fs/samba/samba-3.5.14.ebuild
deleted file mode 100644
index 603b2fb4bea5..000000000000
--- a/net-fs/samba/samba-3.5.14.ebuild
+++ /dev/null
@@ -1,454 +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-3.5.14.ebuild,v 1.8 2012/04/17 21:35:40 ranger 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/${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 +server +smbclient smbsharemodes smbtav2
-	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-1.0.114_p1 )
-	cups? ( net-print/cups )
-	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=""
-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.5.16.ebuild b/net-fs/samba/samba-3.5.16.ebuild
deleted file mode 100644
index 9854e106ad39..000000000000
--- a/net-fs/samba/samba-3.5.16.ebuild
+++ /dev/null
@@ -1,454 +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-3.5.16.ebuild,v 1.1 2012/07/03 05:29:05 patrick 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/${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 +server +smbclient smbsharemodes smbtav2
-	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-1.0.114_p1 )
-	cups? ( net-print/cups )
-	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=""
-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.5.ebuild b/net-fs/samba/samba-3.6.8.ebuild
index bdf1dbb400fd..4ed1a72353dd 100644
--- a/net-fs/samba/samba-3.6.5.ebuild
+++ b/net-fs/samba/samba-3.6.8.ebuild
@@ -1,6 +1,6 @@
 # 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-3.6.5.ebuild,v 1.2 2012/05/16 12:41:50 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-fs/samba/samba-3.6.8.ebuild,v 1.1 2012/10/02 08:00:47 polynomial-c Exp $
 
 EAPI=4
 
@@ -14,8 +14,8 @@ HOMEPAGE="http://www.samba.org/"
 SRC_URI="mirror://samba/${MY_P}.tar.gz"
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~hppa ~x86 ~amd64-fbsd ~x86-fbsd"
-IUSE="acl addns ads +aio avahi caps +client cluster cups debug doc examples fam
+KEYWORDS="~amd64 ~hppa ~x86"
+IUSE="acl addns ads +aio avahi caps +client cluster cups debug dmapi doc examples fam
 	ldap ldb +netapi pam quota +readline +server +smbclient smbsharemodes
 	swat syslog winbind"
 
@@ -34,6 +34,7 @@ DEPEND="dev-libs/popt
 	cluster? ( >=dev-db/ctdb-1.13 )
 	cups? ( net-print/cups )
 	debug? ( dev-libs/dmalloc )
+	dmapi? ( sys-apps/dmapi )
 	fam? ( virtual/fam )
 	ldap? ( net-nds/openldap )
 	ldb? ( sys-libs/ldb )
@@ -107,6 +108,7 @@ pkg_setup() {
 		BINPROGS="${BINPROGS} bin/wbinfo"
 		SHAREDMODS="${SHAREDMODS}idmap_rid,idmap_hash"
 		use ads && SHAREDMODS="${SHAREDMODS},idmap_ad"
+		use cluster && SHAREDMODS="${SHAREDMODS},idmap_tdb2"
 		use ldap && SHAREDMODS="${SHAREDMODS},idmap_ldap,idmap_adex"
 	fi
 }
@@ -127,6 +129,9 @@ src_configure() {
 	# Filter out -fPIE
 	[[ ${CHOST} == *-*bsd* ]] && myconf+=" --disable-pie"
 
+	# http://wiki.samba.org/index.php/CTDB_Setup
+	use cluster && 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
 
@@ -162,6 +167,7 @@ src_configure() {
 		--with-configdir=/etc/samba \
 		--with-logfilebase=/var/log/samba \
 		--with-pammodulesdir=$(getpam_mod_dir) \
+		$(use_with dmapi) \
 		--without-afs \
 		--without-fake-kaserver \
 		--without-vfs-afsacl \