Fixed installation of pam modules (bug #481262). Removed old (unfixed) versions

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

7 files changed, 38 insertions, 479 deletions

diff --git a/net-fs/samba/ChangeLog b/net-fs/samba/ChangeLog
index f53002c61aec..321def0dbe6d 100644
--- a/net-fs/samba/ChangeLog
+++ b/net-fs/samba/ChangeLog
@@ -1,6 +1,14 @@
 # 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.590 2013/08/16 04:39:27 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-fs/samba/ChangeLog,v 1.591 2013/08/16 07:13:48 polynomial-c Exp $
+
+*samba-4.0.8-r2 (16 Aug 2013)
+
+  16 Aug 2013; Lars Wendler <polynomial-c@gentoo.org> -samba-4.0.7.ebuild,
+  -samba-4.0.8.ebuild, -samba-4.0.8-r1.ebuild, +samba-4.0.8-r2.ebuild,
+  -samba-4.1.0_rc1.ebuild, samba-4.1.0_rc2.ebuild:
+  Fixed installation of pam modules (bug #481262). Removed old (unfixed)
+  versions.
 
 *samba-4.0.8-r1 (16 Aug 2013)
 
diff --git a/net-fs/samba/Manifest b/net-fs/samba/Manifest
index ab9c64303e53..cb9291dff32f 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
@@ -38,9 +41,7 @@ DIST samba-3.5.22.tar.gz 35385144 SHA256 b4c98f77f5634478da109063334acd9b6ad7bcb
 DIST samba-3.6.12.tar.gz 34073788 SHA256 6ff797c1772613bd5172d2c8b900fd56bf096d7252faee8b47c4925a4fdc9f8b SHA512 06a7b8883a18b802de5aeced2e7dcf97147351b621736ab2383c6e4f22d5fb14e2b1ce88c8137a2fa9571b25357c766b0fb2b31352009b8a7137b20e2e9c3416 WHIRLPOOL 6f41dd455a52c9397fc4e7429aa5312573a9a1888ecde94a25be9d000a6567374e5eb60c3c0a76151f8628e8ee8c68cdce234fb51f4163c9a3996acf74b1f4a7
 DIST samba-3.6.16.tar.gz 34108738 SHA256 347c0abe608ad907d04e37948d0f82a2d9dd8daeba13b0b78d7463b8d7b3fef4 SHA512 e71328bea07c16d5c72c28f5a5b911e33c65f1a4ac6dff791b820783370d61ce4fde99f24575f0a348b3a87d7eac3961621fb59fd0ef126339aa3c7d31d39ee8 WHIRLPOOL 347b5baa85094933f19c3d35d91c938b8a7854643bbbc515b2293fd05c5f73996057566e0468184eacd06cebc661231f8ab7f9fdbe9e8392f504a265b6243d39
 DIST samba-3.6.18.tar.gz 34112906 SHA256 6d71a9ba77567eae863b9599e451479b99f6acb6042a1d98e7a22422ce599992 SHA512 fdd10db9ab3a1619291d6a65b84782205081333b97ab8e6b0eed5b58084ffce35bc168010ff2442622220ed65dd8b94834d419ae6a35a7dbcfb77756d23b0548 WHIRLPOOL bd1dc4da01b09cecf7e7917c288442c3aa6e97f948ffb7922df23a632a48b611c81aca4ffa77bc19fc68ff622766aaeb882eabcfb5c33b903af8d9a845680eb0
-DIST samba-4.0.7.tar.gz 22078244 SHA256 e9ad36ff65a1d6b6a57f272aa08f844139ac2b5b1cb2257f1236aa2a8c864245 SHA512 84573c9fad7ad2f605661158faf70e3e57c6c15e814dd504314355055e73c58bd48bbdf2941203bb8c6dd36fb1635d3ba54a8a4534bf7a104d0c48e1bc063163 WHIRLPOOL f6001faf8cce7920d5b87ea6ed64a6f0d42f03a73162ae8bcf5b5fc6d0141cef3c038a3993e330008cc3dc445a8b4a388e9a62cb8d8f0bf4e4b4639ab0f5e146
 DIST samba-4.0.8.tar.gz 22076951 SHA256 5c6d4ff8249ad4377dc2e854de6744ce0058d1ff28ece6008f5152e922993a88 SHA512 0c6a84430a425d1a7299ed4587748ed0b527cb5fd48b227613649bf72737128a071fa19d77cf9c1203ad5b950e922a0a1517536c3672ee2c21f5aae58f6c310b WHIRLPOOL 6e9d290e2a747053989c905fe8d64ff2b4a4615c45ae5a3f3388a3cc55889749aa27ea2d2e5971d6db9df8624461e7d9f71fd341e9bc4189f5da90d92abd4868
-DIST samba-4.1.0rc1.tar.gz 19426225 SHA256 de7d94002628415ca02fe2cf2d500942abe2444bb33544bd2018c99c53d70824 SHA512 90d8763a3b95ec430434e0a59c8f2ec490d95362e51df4d616237fef26aa2fd365149ff7388574dfae97b5c1786de92ed817055106a947eeecce60019c89d3f1 WHIRLPOOL ffb744926944cb2a0cc724e4ddd043672e53aefeba4e9cf0d939e85b7802e9782a3bb502c15497305168671d7fce6cb7bdc31174dff6003fca458e57001554cd
 DIST samba-4.1.0rc2.tar.gz 19428575 SHA256 d1268e978ad318725649c28ab90fc8e4b0651e0fd84f85915cd79de3fba2ce85 SHA512 6457d2e7721b0a96957c89d141fc1b042ad2f48c65768d943d0468daede4cb4781650cf9df1a7dfc207df4316ed0a4f77a7ffe57a23f3d5f28a30b3e326f3c3a WHIRLPOOL 723387e4afb6c505f2fdd5df6a1f987842f22c8b01a161d4d0b3d1faa81a5ed407831abd8cc8bd45ddfe3977a98403b453b6efce8609fe5d272de624430fb327
 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
@@ -48,10 +49,24 @@ EBUILD samba-3.5.22.ebuild 12326 SHA256 d28d2ebad6d1d3593a4846b390b1f01903e7e1ea
 EBUILD samba-3.6.12.ebuild 12017 SHA256 b1a4ae0e490e6e3ecbdef24b9a50336e676cb39f6077044ef9e99f745e433147 SHA512 f377aa4ad20d5a05d31a492935251040e2a3c4522fb774fc2918d09d629480551a6eb359d1079fd4ed9eed9339985977d5f792358b0b74d426261e01dd662c6e WHIRLPOOL dd77e2be95a4766cce5dab5f06ae5f4064f0824a26018e191ba881cd2aec6a865762441f8f983114f21d58edcbc5dad8c75fe9409db2e4270a6aab64944b7153
 EBUILD samba-3.6.16.ebuild 12626 SHA256 256c7381cf163375c3bd326818ea387c94251dcf5a4c9c1316f4c4cd74f90638 SHA512 441bb8f987ebc769f42fb249e217525167ee96d4ffce992b8c19ccfbbfe775737081d1adc1b5f55122d0675731b5a0b7f1550fdb005ff60440b7d323825068ef WHIRLPOOL 19166ec8fa5ba8014245b757c325bbca35bd70f6dbb896816ffe219e8e8ca6a55ba8df49cbc8a3ad598eccc6307bf9de9702c0718127f2708dab42cfa7dc48d7
 EBUILD samba-3.6.18.ebuild 12633 SHA256 974755671f9db90365dffcd8218e84259b7756979f56106e9d72a60c19879838 SHA512 cd3ceeeef46ce341d5d6252e8e5801c1f4d360f9917dc04da32d6b187dbb81bce8a7eb1c44921186191b06fef2150d02bb67019bfc31de5f076a06fa51a00865 WHIRLPOOL cf62798e0ec9de3c8bef268efeb41edaebbbf3592d0acc6f2a0feadbfd428726a403dcd2cfad52723366060a9b7bcc640a84ecee1dddaa92a3508500132334a0
-EBUILD samba-4.0.7.ebuild 4216 SHA256 b86711044ab90162c1fa97827be696e080f81db31647e569a47e15d31ca2ba43 SHA512 a626231277e62a5454bf6af2dad43cba7a1c90fe83f2c506f26ab6d95a37ae5ce8b450b19b328dfba5f45e4bf745155a0cd31fc4d293854f142fd76bfd2136a8 WHIRLPOOL c7b17ffa79cab9957bb486317ba99819869c634c7864357a525faf80f436723b247c7bfe7630757597a9e977d8c200e0a948c9767dedc2c6d6aadcad7f9c3268
-EBUILD samba-4.0.8-r1.ebuild 4280 SHA256 71b38cb956a6af03802ce3449cb80967ace0871e55957d764095a2e18e618d33 SHA512 687eb1b8c1ff9f34685bd576f72092c6becc6514f697fbcc4b10481a186e8f3c13a2cc7d7bcb9fdaf7acc92d090710ef5ad5419957e96981358d81bcfb9005d8 WHIRLPOOL 360fadc53d306b672a63d9bee6d9cb17d2373e56e051a1c20d128383925418e1dce681f02090e16cf61a5d4baae8b769eba44e75baf63d0fcf121de0799e2abd
-EBUILD samba-4.0.8.ebuild 4225 SHA256 12a20efff6e953f308bd3e3d109a83ad073a626a9c2f0d532b5ccfaa21b397d6 SHA512 3c563441c51f6e549cb00d85e8b24691e3ebc80e69a3ad6f029b50902e0be82dd8f6498e1e1c7de5cd87890c9c5bf3ed725cf42114cebed18286428589399a8a WHIRLPOOL e32587158a71b9d4d89fb4c12374ceb2f476f5b69adfcde7f2ffd9793d9bd7f7324e23709950cf716568816263dfbff3977a89eb42e96446171748554283174b
-EBUILD samba-4.1.0_rc1.ebuild 4058 SHA256 9619d4dffef53d358c4572359684d48f59d133076cacaab00d079cad2838e17d SHA512 4762b257127464a23d4a8df3f6940ae4b229892b09f6e18322f45e68b6737c3d60a20a68ad758973d33b8045eb85f55b4a110fcaa2835bd532eeed7717a36101 WHIRLPOOL 754d468d2f22d68763dfae0f494eefd1cfd62f3d2ce5f1865a8885bf7d3395c5f7d76f02f3ff859bd706102b391cb84cde7677cb46896ad4eef1e505b6fc43d0
-EBUILD samba-4.1.0_rc2.ebuild 4115 SHA256 11ab2cc42a7682f4cccd273f62639d640f4bbc8716b85aeab8b4fdf233baeb34 SHA512 4411eba3a5c21dbd2df1f1d3d2f849ac6e203df56acd2d80f0db437ae9eb4e5bd74d2103c62a11dd5dd10f79708535fda75d2394474882955f00c32edc8cf4e8 WHIRLPOOL 9f28edeb617b5f430ef2827c08085250dea409f161837d4b507e5141a3bfd936ae66fa4df9be6d4b35dd1017c9774ac755aa33e788aa360eebd53fe78679ef84
-MISC ChangeLog 97971 SHA256 52157d3da1f1c36a27bd4eb492d7f842d99d597cb6b5d411230d0c8d962e5d61 SHA512 426edc072fb37e78e4c5ef9c7a6e840f8a53898d4ee36b87cb587599386721398d2992161865263b23ff52b66d576f7913a37773d6dfc319c72dcfc20e691e22 WHIRLPOOL b6fa299d7313d82c364b3bc7dce53f2148ee3635110871fdd012ce8940a502f2cf06fa5c6e2b3a5c146da42dc61787ba24ef8842632acb19c8beb4c6127722d7
+EBUILD samba-4.0.8-r2.ebuild 4330 SHA256 6279bcf00d691535a66ac6e9ac396bd255acc5a6484dae45c69b35c2e70ff8d7 SHA512 3d3ca8fae07cf9c373f39447b9bb711a07ba285cec1831681ad04fa4935977721c1e144262806f261ea7e1215cd0db50341881766601854bd0e9d136594c4f15 WHIRLPOOL 031f089335b5362e4c2189c697b8663c6aacb2a405d9e8e8180f89338ac23df2ba7f10556715d504ddc6ac7164b5cb696dc8654afbcc502323a820bcc3ae5f6a
+EBUILD samba-4.1.0_rc2.ebuild 4165 SHA256 74ab1cbc1fd59a6f1dcf79bd73f7a6114684bbee5a3b42e37b86665e9d9f1f8d SHA512 07f09f8e3842212cc7f2c4cabddebe5dafae0a32e8cc1220d3fe9918b83061afe0ff17d79f552bd7a6894d5ac9facf1c99a6a268aaacdbf5be54b1e186ea2f4c WHIRLPOOL 5b206d531d58708d82c934d11eecffd55dc55613ffaae0712f1f5a09b4bac1cfc3e9723eae5e1ffc64e12ab43f10fbbb25047d3539679df75f1b205918ed9677
+MISC ChangeLog 98290 SHA256 30f6e80c92034d3b08055a06e979433b9ed2340d02e256fe3e4cf0be71193732 SHA512 60db3de125aad12373ffe2aca84c9411d6c538dc3d018d0f7a9fb71f9c226a5c6ca6f7aa132c2727302c3afeb20a653842bd9e365bc764dc2873b00ee26d8700 WHIRLPOOL 496654b245ab35c598e3bff0c120411c00082a9d472e1ea772d4148ff3c8267c9fb4de73336e21660dc942d1ea1b0588fa62aab20a682b95ea961e1cac9ea465
 MISC metadata.xml 1514 SHA256 c10deb71703017ec67f4e5bac297d9b4581fec3d8b5549b6aea2a43bda642bc0 SHA512 9e67e8f7e0c972046e32bf4539142559c24183d6c3469e5af2f901728a3c02a9fbfd50e948a9fd414107fd0cb2a8de709ffe3fc5bf3372c77a4a3db6dc622ecc WHIRLPOOL ec92ea6a1b03e70c791670e97e7d9e07e6bdb82c24ed08c186e786afcd009ab63fbee7d481a4cdc394632ad312e58a2048dae3ff333f6f7a1ad19add55e2c8f8
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.20 (GNU/Linux)
+
+iQIcBAEBCAAGBQJSDdEtAAoJEPiazRVxLXTFAMwP/jZLDLWMpvWPOaOlBK/OaC36
+zFCj8f3D/9+Q3x9AiN5qMjiV5gwhMaftgpXkiHiRf2XfTzCZGeyHnTiY9LwHfd2R
+q5rU69usO8CuyaUy2E6cIBbTrfyf4mm4E7z/EGC8VuKmrfTWpTJkgv8712q8/Lzf
+U1AspRJDWoBshgQTxoNO7XF9GeqNTvBR9iFIE/wJzeYVtI/p4Jxj9qdchSLOeHjz
+P7ckJYFdE0vPamzoPjAnxRdFIqG52V61p+losaa7WrXk0qfRNtAHnIazCfKSqmW6
+LI8uM9qrrhi2v02BLxCL116j/tlqkVVuKhPw4h9y5oqGVFR4xjX7k/dNlciXEHUr
+Gv/K0Cfo1a44x/IJ99yW0LfeDjvJjthk9xSjp0FoqG4bh1bvJMSJXAtIYfR6zIRB
+rk+eRQgbaGRstK/Yg7iQtpTCEfLxGbQZmi/2zbMteceLljHBGjsoIsuILzSrzysr
+9NRo11sHZ+cUbX44JmmTRmc+BIrTnlStwx1a5R5x2TCdNiLhTe4AOywdkteF+y2q
+A0vRQbZYvc4IeCy+M2FPGAuEuV9fskIna3EV0nvqJALasZJMd+2ERTH30iWo69wS
+3CgoF7BSFZoMsSbDIaKNuI+jdaR0J8SvgoeEO3NaV+XtpTEG+xUSac5VrDSEdMCp
+1RElRmJOfxDTvzUWak+a
+=V1j+
+-----END PGP SIGNATURE-----
diff --git a/net-fs/samba/samba-4.0.7.ebuild b/net-fs/samba/samba-4.0.7.ebuild
deleted file mode 100644
index 1f471d29899f..000000000000
--- a/net-fs/samba/samba-4.0.7.ebuild
+++ /dev/null
@@ -1,158 +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.7.ebuild,v 1.3 2013/07/20 17:44:20 jer Exp $
-
-EAPI=5
-PYTHON_COMPAT=( python{2_5,2_6,2_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 \
-		--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
-
-	# 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.0.8-r1.ebuild b/net-fs/samba/samba-4.0.8-r2.ebuild
index 87a03f62689f..4a349cdc5622 100644
--- a/net-fs/samba/samba-4.0.8-r1.ebuild
+++ b/net-fs/samba/samba-4.0.8-r2.ebuild
@@ -1,9 +1,9 @@
 # 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.8-r1.ebuild,v 1.1 2013/08/16 04:39:27 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-fs/samba/samba-4.0.8-r2.ebuild,v 1.1 2013/08/16 07:13:48 polynomial-c Exp $
 
 EAPI=5
-PYTHON_COMPAT=( python{2_5,2_6,2_7} )
+PYTHON_COMPAT=( python2_{5,6,7} )
 
 inherit python-r1 waf-utils multilib linux-info systemd
 
@@ -85,6 +85,7 @@ src_configure() {
 		--sysconfdir=/etc \
 		--localstatedir=/var \
 		--with-modulesdir=/usr/$(get_libdir)/samba \
+		--with-pammodulesdir=/$(get_libdir)/security \
 		--disable-rpath \
 		--disable-rpath-install \
 		--nopyc \
diff --git a/net-fs/samba/samba-4.0.8.ebuild b/net-fs/samba/samba-4.0.8.ebuild
deleted file mode 100644
index 6526f0d92099..000000000000
--- a/net-fs/samba/samba-4.0.8.ebuild
+++ /dev/null
@@ -1,158 +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.8.ebuild,v 1.1 2013/08/06 11:31:36 polynomial-c Exp $
-
-EAPI=5
-PYTHON_COMPAT=( python{2_5,2_6,2_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 \
-		--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
-
-	# 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_rc1.ebuild b/net-fs/samba/samba-4.1.0_rc1.ebuild
deleted file mode 100644
index 5c9a6b24c85d..000000000000
--- a/net-fs/samba/samba-4.1.0_rc1.ebuild
+++ /dev/null
@@ -1,150 +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_rc1.ebuild,v 1.1 2013/08/05 04:41:22 patrick Exp $
-
-EAPI=5
-PYTHON_COMPAT=( python{2_5,2_6,2_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 \
-		--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)
-		"
-	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_rc2.ebuild b/net-fs/samba/samba-4.1.0_rc2.ebuild
index 76e72f4a68ff..0fcfc481e72a 100644
--- a/net-fs/samba/samba-4.1.0_rc2.ebuild
+++ b/net-fs/samba/samba-4.1.0_rc2.ebuild
@@ -1,9 +1,9 @@
 # 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_rc2.ebuild,v 1.2 2013/08/16 04:39:27 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-fs/samba/samba-4.1.0_rc2.ebuild,v 1.3 2013/08/16 07:13:48 polynomial-c Exp $
 
 EAPI=5
-PYTHON_COMPAT=( python{2_5,2_6,2_7} )
+PYTHON_COMPAT=( python2_{5,6,7} )
 
 inherit python-r1 waf-utils multilib linux-info systemd
 
@@ -79,6 +79,7 @@ src_configure() {
 		--sysconfdir=/etc \
 		--localstatedir=/var \
 		--with-modulesdir=/usr/$(get_libdir)/samba \
+		--with-pammodulesdir=/$(get_libdir)/security \
 		--disable-rpath \
 		--disable-rpath-install \
 		--nopyc \