Version bump. Removed old

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

5 files changed, 25 insertions, 687 deletions

diff --git a/net-fs/samba/ChangeLog b/net-fs/samba/ChangeLog
index d5a619dc6673..557a22f898ce 100644
--- a/net-fs/samba/ChangeLog
+++ b/net-fs/samba/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-fs/samba
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-fs/samba/ChangeLog,v 1.716 2015/06/03 17:03:40 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-fs/samba/ChangeLog,v 1.717 2015/06/26 07:37:20 polynomial-c Exp $
+
+*samba-4.1.19 (26 Jun 2015)
+
+  26 Jun 2015; Lars Wendler <polynomial-c@gentoo.org> -samba-3.6.24.ebuild,
+  -samba-4.0.25.ebuild, -samba-4.1.17.ebuild, +samba-4.1.19.ebuild:
+  Version bump. Removed old.
 
   03 Jun 2015; Mike Frysinger <vapier@gentoo.org> samba-3.5.21.ebuild,
   samba-3.5.22.ebuild, samba-3.6.24.ebuild, samba-3.6.25.ebuild,
diff --git a/net-fs/samba/Manifest b/net-fs/samba/Manifest
index 622d08fb480d..892fb20fa22f 100644
--- a/net-fs/samba/Manifest
+++ b/net-fs/samba/Manifest
@@ -44,40 +44,36 @@ AUX smbd_at.service 145 SHA256 909dddfd80982035739081d86d2c524f6a25440d9c10b8a80
 AUX winbindd.service 240 SHA256 755036bc419cce90200ac3c04986fbb7cf718c128c2a1288c634658bb779bf3a SHA512 f1ce6d035e8e0fcdc73f14e3b60c9647043777ff6b2a982a81ed07eb4df5ff245a9511e3e4a9d8163f9c8f3fb86d2a39a67621ace68392eb7c2f2e2a55d587f7 WHIRLPOOL eb4d7f30b4ce3341e3d24a6c05965bdce9ded78a7327b44d3d04d00837d6e8109857b1fb1b78c8325680588cf9abe94158755a962fb8f7e8dac04b336308c268
 DIST samba-3.5.21.tar.gz 35377315 SHA256 fd9a66056b1ba9496762394efff41fcaa0e58f2e50e71910e6d202b8a59a1c10 SHA512 e6d52530094b2f8284f8536f97411c3944a83e9f1a808836acdca19fe4aee3cc47e136cc2a2eab96ba89526fe289ec1a3d22fb836bd261bf7c8ddfbccd1cf975 WHIRLPOOL a476ea24841cfdec0f640880e0362173a3f6b957afd2d2448f7b4a8b7c927ef558fd22e7fe20b05bd8aecf1169d8e488b87830a99ddfddcbc8be0c9a414966ad
 DIST samba-3.5.22.tar.gz 35385144 SHA256 b4c98f77f5634478da109063334acd9b6ad7bcb38151a5b1cac6dc5feb6679dc SHA512 0e1b4816d921ca82f0426a254cf103066634cc54e28d707a62da951118413f7f5ca5f87d60688cab802a58b0af87f797fbbe12f4e1284d5d7f545a98aba97616 WHIRLPOOL 6e59655dd7a537f0c7c889c43ddf5afb8060706e1ec79b3835698181c5c7478059f91c93eefbde50b03e0154a686eda35eabf807bb7ae01dd2b9b39648a009ae
-DIST samba-3.6.24.tar.gz 34122116 SHA256 11d0bd04b734731970259efc6692b8e749ff671a9b56d8cc5fa98c192ab234a7 SHA512 40f054ab0e1ef07fa4bb4934229c42eb0e484596c4d4b81edbf43951acd56e7b04b6efb17e6cb269b329f1a84d60cbe10a3ff04e86c1983ec603bdcf7fc7ecbb WHIRLPOOL e98d3ae62e5d57e5d16b320213961ba7221b8b38912b90434296323549e1673f25682ec8da469dd771d68ec222a6be7d30e24224e0cde0d9dc1e9c393590c68a
 DIST samba-3.6.25.tar.gz 34121828 SHA256 8f2c8a7f2bd89b0dfd228ed917815852f7c625b2bc0936304ac3ed63aaf83751 SHA512 25a5c56dae4517e82e196b59fa301b661ec75db57effbb0ede35fb23b018f78cdea6513e8760966caf58abc43335fcebda77fe5bf5bb9d4b27fd3ca6e5a3b626 WHIRLPOOL 68c4a335b3912bf3c6baecae337b1131127515191052366ca9a04ec6d919f2fb69c912aefb087e2578134f3a9bde7b496ea880f2197a8dbf8221058dd1e8444d
-DIST samba-4.0.25.tar.gz 22150978 SHA256 e6a07940a658b81d368fc7ed8e5068bd27188996d73dee1cea9755682cb9a485 SHA512 ff8ae7a87c41b8b31ec5069b733b9aec4dffb082ffaa71f33cd031ac8b3e8b5ddef7e579048beb1fc7154f050347d80949cd662c08513a8e0bb6ee9baa84c32c WHIRLPOOL e215b604571feeffa8e52520753769a9a71a339f3c88fd30046bbf8a2b2cdd52b2fd8eac3f911a25fe607667e105aba2b72447d2c4195a5d465101a230bd62d0
 DIST samba-4.0.26.tar.gz 22155521 SHA256 ce2441992c6d18950d752edb2d1274b3f7e056b2e2e8516fc42e408e4a25894a SHA512 0df6f5961b2b6af1a4356540299acae52473f9d4342762d1556c859a36a63a7b8706c94f835581e96ecbf47a2d7fb09b67f93aa3869812215e9661dda7ee1906 WHIRLPOOL fda98da46719e6f4cefa58aef56f4d75120c4386b5e398e9b2ac3aa693255a6bce9606b1bf5646708d96e4f3c8982586501ccdae7c11f223b629ab128d33ae59
-DIST samba-4.1.17.tar.gz 19536407 SHA256 7aeb5d09e9c84bbeeb4b98d33404e9dbc4d99c54e64a447cc9c4d57e9255cb1d SHA512 19fa34521d3d520784d1eb85b4844fa59bf12468bf96b174b952eb63b6645a9eefb9044416829ffbe7a6a57abd28a227d1d57e1567cd46a1495c05a865ae75d5 WHIRLPOOL 1784c0db382e0940acc9fc1c1a0a2274b852bfdf2bf47604af4a253302ff95e2e43ad27e3b73afd8e4efb9fbefd4519b4e9b91bde79ac615881d6ae3f0f354a2
 DIST samba-4.1.18.tar.gz 19550894 SHA256 5bd302355c82195271de41d4f1e0c6353bde652a23886940b310b7734256f156 SHA512 1798fc23bfa282f4e0cc047e8da6fc553f4e56a19ec1f82877a7381b7ba2d97b4687de0d499a094e725e420303e2e07038a63b9cc463f97131b91c29c0919dec WHIRLPOOL fce4c07255c882c742429a91b6faeeb079a4c85a227b803c6e2e6b7531402746f57d02099bf5104c8c7db0190ff9ca9cc69797bf30000412aecbe90906a66100
+DIST samba-4.1.19.tar.gz 19558250 SHA256 62f23dffacd4faf8ac557f9cf01a1595e39db0bbdd959c4c1890f46155c9f936 SHA512 116f022cfd55506028a14363e084080eeb93257d216958c70991b11f4f8f01195e7174371edcdd2c72cadcb7544c0b0b979d638a7a37600d7bbd0610020f028e WHIRLPOOL dd672fc7cb659f8a80177b6d19187e2557847e802db9b3cd5fd2b708dc78b9a31c675cac80afd3a36789d562a8582155c7ffcbad26b810b621cda08b0395e6c9
 DIST samba-4.2.0.tar.gz 20682204 SHA256 66a6057815a971fee64fbe936ff6cbad542421a4bd52cba8d8d41afc9abc490f SHA512 ec6f1a6276087196450cf5774690cde564beb414ab55fb7db6991f8ae470d338fb9c2b12d38232b804436efc686450d1fa19a26bc234e9f63d8c569e321357e0 WHIRLPOOL a3c44ac80f22fc34b9bcdf8d4ad20a79b275d4f7ac0006e879df80c7d1e8f7f859e47d3020c29e709aca27102165efb169c325c6c4cb691f99dace893da5ad76
 DIST smb_traffic_analyzer_v2.diff.bz2 12226 SHA256 1bae7eafbe8ac2382313d5ab9d43d73ba64b63a714f0f588516952d476fb868d SHA512 aa0e457a0dd282e61e6dfcd5705c29b319832dca9711b1b5baf8373e2f079991399c3537c050219ccb861a93f86353ebff677a5c625d2e3f1f3a13ee5c4087d0 WHIRLPOOL 85ee72a360f67ebe71be5cd400ecd635280a0d7c64ebb8b94656a5ef1a94f74a987de86408af00ce1b81cc8363b1b3cf14726860d29b72ee610d4bab73d6b139
 EBUILD samba-3.5.21.ebuild 12310 SHA256 a65273c2fb22091cf0a643ea13b0f362c4b7366745d9ec36c75064781f79ce2d SHA512 f75298fcef9fe174b0e80d79b3bcc98c38a84ee51b9f748fdf9adec6012ed7be654156685828312b2ed99a8a64869a0bb0ffc5fe2aabcb4e30af717b266daabd WHIRLPOOL 0bea3d534cfd9305f15bf290b57e751ae4c92a1ee6f8c5620bb3d23cbe461238e6be333c11e579a653540d1ac71c04b18c85f7a78dc841d2c5f0844d8ca836ce
 EBUILD samba-3.5.22.ebuild 12313 SHA256 f480a20964b77f38138a91f30b1fadd7e71872360970c8fc481a5993dad31c66 SHA512 32e8f37c9d762e2a9c7559a9e93a2d58ffe53a27b9e6ce89e6b9004cbcafadb60b049bd40b18987e33ed6d8c3f1d029e226aa3dad3aed056a88efebd2aebe590 WHIRLPOOL 593c2f63518f92ce6197824b72b04851e90a5cc12f8afd826a01fc1c3d1ca45b6df2e3cae541f585f156410056268395cbbf44aeb189cbadf54069b0fbe540cf
-EBUILD samba-3.6.24.ebuild 13520 SHA256 9654c576254311fd453351e0607108682d01bf7265eaa2564ce0f34c6fa0e88d SHA512 7447687e6c2305ad1cf8c3d7862220418cbee602f598f0cce2e834ed32cfb41a5dcbb0a503f648481cf9d8bebe3d6e796d05bb3d3b6ecf61dd0c1cbe4732dc91 WHIRLPOOL 8985d5be88441b46090ac93d4ec0b54101d6499516f9dbbb8e6fcd79f458eee347de6ab6aba5e7451b72f9a436e6a8b3be9b0e960e68f31393881428c22b272a
 EBUILD samba-3.6.25.ebuild 13518 SHA256 276106437cfc337e476e402146bb7fd5036711e1d77ad1f9d2fdf794cb7d98db SHA512 a813e2e6aa9ab65bd8b06da36e7124c45315f99a485d6b84b38733468bbb291833afb9d9392c15e3fd6f7e1f1d09043921990bb0e9c3ea991a3eedeb1aee422a WHIRLPOOL 79b51e9420b02096dc0b69af0d0cd6abe82cbc42ad4af702488223808fa6e23dfc1894281f2ade8db9c28f4a44b3a3961cbb8aaf6914c5255c9803c381b0a6ac
-EBUILD samba-4.0.25.ebuild 4877 SHA256 6d98e9b5a660b95bd4788759fc2bcadd4f8cc09eaba9791b57bd60f696cc8b45 SHA512 a6790ba7ad3f85b499739da40b07fdb9afe413238ae29db5ae58342536c005d1f9fec11c1e7be45a8b918d4f338595eb6f8660df14fa37877d217a157fa8e631 WHIRLPOOL 704f0165985883b646a389692497ec43591cc37863475a2786728ce924bd2c1ffe967229cb5e0094a1ba4a27987fa1e115ee424047c93ebd0d724692a2781872
 EBUILD samba-4.0.26.ebuild 4877 SHA256 15bfc6ad7b81ed39e18c1bbe23fe0b6e9dd12de901a0343179c9e54153a8db75 SHA512 eb6c6b1aa39a4051c82f2c020ed4b6123f4b04e9c30b6a26a497be0600b6ba43cdad52091830b7cd509cf0810d24b5bf8656fe77c63e884c17ab99dba698e1dc WHIRLPOOL 9ae89f3b07528f066a9480614e56a7f55eb4af4dacde51e1ebd0c5b8f26e099b081e6099933535153cb07a1703fa4388183340c4c00671524ac2af9dfbb81ea3
-EBUILD samba-4.1.17.ebuild 4882 SHA256 7b6afe68257144aa05c7e3930fe9139e8473dcb6ccffd364c0a79b81a75f82d0 SHA512 3fbee21f111aff99f24809fdfb808494be1a604e7bc5f05809b4936a9bb3d2d26cd431c54fde57a1e96011df8d49a47859820a498596d2e557167e947151410d WHIRLPOOL 77ed2a5ef0b1afb9ca7218a71ee11775d345eb9e87410e2e986a21d7df61ce1da32cc018d2abaab158158e40a8bedb00c3a687de0adc0635d49cacb6981e6676
 EBUILD samba-4.1.18.ebuild 4882 SHA256 281ef060737bba72649202185bd5dad2e52e1e14ad4e7b4c34ce3a5a3295c38c SHA512 ff9c54c151cff09f9c9b5e6b69c9fdcc1c07b3a5cc558f47f98664e6af919727469ec77ff4d65074ab565bc221eaac2a44ad2adab4744fbb50bf98155c3fd109 WHIRLPOOL e0893f762c0ff67fb39dec7ed299da21c17baaab3ae72a04623dfd459025d02a14b9dad44684da609fcc707e06ce522fb08e5b4375b09231926c2b560ec72bd2
+EBUILD samba-4.1.19.ebuild 4888 SHA256 4bf98c6a4d9c5c64756f294ec3287fcb6822fdad9cbdbc68b13c05f0ad3d6504 SHA512 d9f32acde67bd7002474697cce677cd76be04e594a99d0d2d9ed814cc766aeed996c60b3a872626b62a72fdf8344d6645f5f2d35a7ade8e31ca68999ec5564e9 WHIRLPOOL ac747f4f1161fa51669f04d4f6f61278e3a677b97f0891d1652f35a3f5dd0239ac9c64d8e65230af631ac5e65975c3767784beb04b502dbe9c8e3e57a3f21a0e
 EBUILD samba-4.2.0.ebuild 4837 SHA256 df7419b6a52b404deaae18b8399ec220de7cf366e44d2d333e99d11c5d1828a1 SHA512 66888726fee3d19f1f9b50d90272db40ff93d08a05f14286f84fd90faf01e81fbc2a5af0153f481a0447e2faefd6e8e5086a518d88ec57c8ace7b86fc3be8920 WHIRLPOOL 53307aaa028431a85152359bb4abcc0651447bfcafeec1347078055878382752e32c7f4923ae6abc3114a8e1c23356ee563cdf8ae1065bc37f82110ecbcdc9f4
-MISC ChangeLog 10996 SHA256 6fbde64011b95322f7e7e8982d0ce4658178d47a898a1db19e6e31669cbf3077 SHA512 7342746590165bd8c0d471f767ce7089fc25ff6f4a8f42a248208ae90264e4820cf43ee34bdae898eeb55e5bfd5a6ded6290d02cbdfb4e0512fcc381d3e9c8cc WHIRLPOOL f646fcae244a2edde8083e91bc733e785df3b73de1ede05eb2de93aa49056162c860fb2e8c85ba4336204f19c1b3d651750c9c3fda8226fdcc1f46a2f2bfcfdc
+MISC ChangeLog 11205 SHA256 c1493deae3ac4f8db42d2eba22d20989125e93803e586c0d9b13db18c2ab0809 SHA512 44d27b312b25721ccd18b58fb8e620721f625a560a673203af624880d08dd2487b2e21e6d03963cb3a8d4a9a95481a09848bfe628ff8cb6af951756ad9b2d372 WHIRLPOOL d88b94ed78c444205ad3fc2e4019b2d4c4ad54a98ba3d1a2f43252682da407933deb814bf54e37e4de81afed28a57bc8dea3e31bc8ba83ff99da054766d327dd
 MISC ChangeLog-2013 106689 SHA256 00ac832a137c7ce1d21be794b45339e1f4e9c51eb1b796cbcac90a03e1cf5453 SHA512 9dc4e4e22042db7f5ff3a474eb7a454044ea6958ffc3ba5c5de6f09608cfbbcaed8db00763a38995276de03a5f1c728fc783d4addaca7da16f4be76a4e49fd6f WHIRLPOOL 85a746ae34c0386ecb151f5f323b92615cce971b1e46f249cccfdc682bdddd7dad080dd4ffbe5748f093ee11db3f5182cae6d85191a37014639a56040eff9644
 MISC metadata.xml 1514 SHA256 c10deb71703017ec67f4e5bac297d9b4581fec3d8b5549b6aea2a43bda642bc0 SHA512 9e67e8f7e0c972046e32bf4539142559c24183d6c3469e5af2f901728a3c02a9fbfd50e948a9fd414107fd0cb2a8de709ffe3fc5bf3372c77a4a3db6dc622ecc WHIRLPOOL ec92ea6a1b03e70c791670e97e7d9e07e6bdb82c24ed08c186e786afcd009ab63fbee7d481a4cdc394632ad312e58a2048dae3ff333f6f7a1ad19add55e2c8f8
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQIcBAEBCAAGBQJVbzNvAAoJEPGu1DbS6WIAj+0P/10toZQROR3M/I4AtbgXn6TC
-irP/0G/+XzERMDBvYyyej6dADaXY96TFZET70bUsULoiesxUxHCLIB11HlMUHqQh
-NWHPLmRzwCz5ldBLVLpCl/2GdQadJhEDqE8xF40bq2+KhfLyxc6e77qlo2JiwgGm
-KuXnTpu7qk3jt2ch7FHww0PM9U1u2Yv2W5hNIs50bESGXav77mhpTtIV3Iu7kZmd
-3ALGv/9GxOhRjdTRqMFNK89W+diHFXknlQhVXSXaLaxhX7hO2yaWbjRlWVgkkC+S
-1UJRwBTIqp86C3lra/kCpNaoTRvIt53csdZ1IkwyIN0HQDrwcrk8wil0Hd675t3J
-Gy2d1XB90EUhJk/63LGlRP6TH1Dh2UEEYeDwyhSQMKAJoIA7zWbNVkC0SVp27X/Z
-TOm+MM7LVafWA8JJM3qVUaEY/rBYDQLJadLQT0u/9CoqSvnUHL6yftGIAqwBM1Jv
-doKYqRKbxOqoQRGJpNw943FNQA49F0Psa0HnJ64m+F5F7/l/Q6laeG0FEphi3Han
-1GJUalBgYfzf/7jm/GxNGiIF+A/15VREEYWkY+86u0fyrZXPTT9achdm74xVIXab
-vHzNbr/z/yn5O8qPgxoKb0n2X74vPYcMmWe51FG4H+MxFCdf70DR9I8md+rExNMk
-gFwcJWHUh+GcOe7oN/3g
-=8Dzr
+iQIcBAEBCAAGBQJVjQExAAoJEPiazRVxLXTFuowP/3/2SLH0X1RVEfodtUtAFeJx
+PH7c5wLOcJU5cOLVvfW9XRJDldsN1cXCQm7clW5YqdCAh1DErvpIe13AMRklyT5s
+6ZyrZU+rlMRSwngc7QV4eQ0iWLz8XfAc7PJaNrd/a8zvnmZLnel4y8w8d0AHyDC6
+m0+NGlnRPKUDVVtdUsqzSZYvwEkWA6qg3G2/00ym3bDJsHA6YW/0UVGaORjc6oph
+mwb1b9Kmxtg1byIDcf3LLNdrXzWAt0cRQbH5db4Du4vMkFS1z5euQdfV2sFzGRT5
+1rHETX6l3fvHR45SDKftCTCy52VOs428CW1lWrsprvFrw9tkvX7QxX7bo7wtVRXi
+9bP5QnqKAPiSE0eFsdErgMVrI+5BP+wUXEGN9O5iY7jde69KRHUbH9M3rikEBR9u
+Z78oTl3lz9H7yyODQ6DV/2QWUodUZ9beryVPZaKQXMZbcyh4eCAsy7wodBZI7Q2g
+ez0E8NTX+pzZr8RAxLyMJxX+c8qvvwjQaIpI3u+T7QckDUCN9ayoQ2ZKZMZQQkdf
+pYf5Et832OXvY7ndkOJoyBtABAvEntw1UC01SW0MItOOQafSsLL+LbEKRzzLeddV
+O0XcOEGGM3jUPBXxP7Wi3cJpx2wVWLH8VAlzH1YdUEnabadrguLz/NiPh8WBhSi9
+EwQFtCftPxl4OnRJ603n
+=EZL3
 -----END PGP SIGNATURE-----
diff --git a/net-fs/samba/samba-3.6.24.ebuild b/net-fs/samba/samba-3.6.24.ebuild
deleted file mode 100644
index 823bd62649e4..000000000000
--- a/net-fs/samba/samba-3.6.24.ebuild
+++ /dev/null
@@ -1,483 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-fs/samba/samba-3.6.24.ebuild,v 1.12 2015/06/03 17:03:40 vapier Exp $
-
-EAPI=5
-
-inherit pam versionator multilib multilib-minimal eutils flag-o-matic systemd
-
-MY_PV=${PV/_/}
-MY_P="${PN}-${MY_PV}"
-
-DESCRIPTION="Library bits of the samba network filesystem"
-HOMEPAGE="http://www.samba.org/"
-SRC_URI="mirror://samba/stable/${MY_P}.tar.gz"
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~arm-linux ~x86-linux"
-IUSE="acl addns ads +aio avahi caps +client cluster cups debug dmapi doc examples fam
-	ldap ldb +netapi pam quota +readline selinux +server +smbclient smbsharemodes
-	swat syslog +winbind"
-
-DEPEND="dev-libs/popt
-	>=sys-libs/talloc-2.0.8-r1[${MULTILIB_USEDEP}]
-	>=sys-libs/tdb-1.2.13[${MULTILIB_USEDEP}]
-	>=sys-libs/tevent-0.9.19[${MULTILIB_USEDEP}]
-	>=virtual/libiconv-0-r1[${MULTILIB_USEDEP}]
-	ads? ( >=virtual/krb5-0-r1[${MULTILIB_USEDEP}] sys-fs/e2fsprogs
-		client? ( sys-apps/keyutils ) )
-	avahi? ( net-dns/avahi[dbus] )
-	caps? ( >=sys-libs/libcap-2.22-r2[${MULTILIB_USEDEP}] )
-	client? ( !net-fs/mount-cifs
-		>=dev-libs/iniparser-3.1-r1[${MULTILIB_USEDEP}] )
-	cluster? ( >=dev-db/ctdb-1.13 )
-	cups? ( net-print/cups )
-	debug? ( dev-libs/dmalloc )
-	dmapi? ( sys-apps/dmapi )
-	fam? ( >=virtual/fam-0-r1[${MULTILIB_USEDEP}] )
-	ldap? ( >=net-nds/openldap-2.4.38-r1[${MULTILIB_USEDEP}] )
-	ldb? ( sys-libs/ldb )
-	pam? ( >=virtual/pam-0-r1[${MULTILIB_USEDEP}]
-		winbind? ( >=dev-libs/iniparser-3.1-r1[${MULTILIB_USEDEP}] )
-	)
-	readline? ( >=sys-libs/readline-5.2 )
-	syslog? ( virtual/logger )"
-
-RDEPEND="${DEPEND}
-	kernel_linux? ( ads? ( net-fs/cifs-utils[ads] )
-			client? ( net-fs/cifs-utils ) )
-	selinux? ( sec-policy/selinux-samba )
-"
-
-# Disable tests since we don't want to build that much here
-RESTRICT="test"
-
-SBINPROGS=""
-BINPROGS=""
-KRBPLUGIN=""
-PLUGINEXT=".so"
-SHAREDMODS=""
-
-S=${WORKDIR}/${MY_P}
-
-# 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_pretend() {
-	if [[ ${MERGE_TYPE} != binary ]]; then
-		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
-	fi
-}
-
-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 bin/smbta-util
-			$(usex client "" "bin/smbclient")"
-
-		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"
-
-	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 cluster && SHAREDMODS="${SHAREDMODS},idmap_tdb2"
-		use ldap && SHAREDMODS="${SHAREDMODS},idmap_ldap,idmap_adex"
-	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' \
-		source3/configure || die "sed failed"
-	epatch "${CONFDIR}"/smb.conf.default.patch
-
-	#bug #399141 wrap newer iniparser version
-	has_version ">=dev-libs/iniparser-3.0.0" && \
-		append-cppflags "-Diniparser_getstr\(d,i\)=iniparser_getstring\(d,i,NULL\)"
-
-	multilib_copy_sources
-}
-
-multilib_src_configure() {
-	local myconf=()
-
-	# we can't alter S since build system writes to '../' and therefore
-	# we need to duplicate the whole structure
-	cd source3 || die
-
-	# Filter out -fPIE
-	[[ ${CHOST} == *-*bsd* ]] && myconf+=( --disable-pie )
-
-	#Allowing alpha/s390/sh to build
-	if use alpha || [[ ${ABI} == s390 ]] || use sh ; then
-		local CFLAGS=${CFLAGS} CXXFLAGS=${CXXFLAGS}
-		replace-flags -O? -O1
-	fi
-
-	# http://wiki.samba.org/index.php/CTDB_Setup
-	use cluster && myconf+=( --disable-pie )
-
-	# Upstream refuses to make this configurable
-	myconf+=( ac_cv_header_sys_capability_h=$(usex caps) )
-
-	# 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="${EPREFIX}"/var/run/samba \
-		--sysconfdir="${EPREFIX}"/etc/samba \
-		--localstatedir="${EPREFIX}"/var \
-		$(multilib_native_use_enable debug developer) \
-		--enable-largefile \
-		--enable-socket-wrapper \
-		--enable-nss-wrapper \
-		$(multilib_native_use_enable swat) \
-		$(multilib_native_use_enable debug dmalloc) \
-		$(multilib_native_use_enable cups) \
-		--disable-iprint \
-		$(use_enable fam) \
-		--enable-shared-libs \
-		--disable-dnssd \
-		$(multilib_native_use_enable avahi) \
-		--with-fhs \
-		--with-privatedir="${EPREFIX}"/var/lib/samba/private \
-		--with-rootsbindir="${EPREFIX}"/var/cache/samba \
-		--with-lockdir="${EPREFIX}"/var/cache/samba \
-		--with-swatdir="${EPREFIX}"/usr/share/doc/${PF}/swat \
-		--with-configdir="${EPREFIX}"/etc/samba \
-		--with-logfilebase="${EPREFIX}"/var/log/samba \
-		--with-pammodulesdir=$(getpam_mod_dir) \
-		$(multilib_native_use_with dmapi) \
-		--without-afs \
-		--without-fake-kaserver \
-		--without-vfs-afsacl \
-		$(use_with ldap) \
-		$(use_with ads) \
-		$(use_with ads krb5 "${EPREFIX}"/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 "${EPREFIX}"/usr) \
-		$(use_with cluster cluster-support) \
-		$(multilib_native_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
-}
-
-multilib_src_compile() {
-	cd source3 || die
-
-	# 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 multilib_is_native_abi; then
-		if [ -n "${BINPROGS}" ] ; then
-			einfo "make binprogs"
-			emake ${BINPROGS}
-		fi
-		if [ -n "${SBINPROGS}" ] ; then
-			einfo "make sbinprogs"
-			emake ${SBINPROGS}
-		fi
-	fi
-
-	if [ -n "${KRBPLUGIN}" ] ; then
-		einfo "make krbplugin"
-		emake ${KRBPLUGIN}${PLUGINEXT}
-	fi
-}
-
-multilib_src_install() {
-	cd source3 || die
-
-	# pkgconfig files installation needed, bug #464818
-	local pkgconfigdir=/usr/$(get_libdir)/pkgconfig
-
-	# 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}"
-		insinto $pkgconfigdir
-		doins pkgconfig/netapi.pc
-	fi
-	if use smbclient ; then
-		einfo "install smbclient library"
-		emake installlibsmbclient DESTDIR="${D}"
-		insinto $pkgconfigdir
-		doins pkgconfig/smbclient.pc
-	fi
-	if use smbsharemodes ; then
-		einfo "install smbsharemodes library"
-		emake installlibsmbsharemodes DESTDIR="${D}"
-		insinto $pkgconfigdir
-		doins pkgconfig/smbsharemodes.pc
-	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
-		insinto $pkgconfigdir
-		doins pkgconfig/wbclient.pc
-		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
-	if multilib_is_native_abi; then
-		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 scripts
-		if use client ; then
-			dobin script/findsmb
-			doman ../docs/manpages/findsmb.1
-		fi
-	fi
-
-	# 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
-}
-
-multilib_src_install_all() {
-	# 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 "${ED}" "${EROOT}/usr/share/doc/${PF}/swat" "${S}"
-		fi
-
-		dodoc MAINTAINERS.txt README* Roadmap WHATSNEW.txt docs/THANKS
-	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 || die
-			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 \
-		"${ED}/usr/$(get_libdir)/samba" \
-		"${ED}/usr"/{sbin,bin} \
-		"${ED}/usr/share"/{man,locale,} \
-		"${ED}/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"
-
-	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
-}
-
-pkg_postinst() {
-	elog "Samba 3.6 has adopted a number of improved security defaults that"
-	elog "will impact on existing users of Samba."
-	elog "			client ntlmv2 auth = yes"
-	elog "			client use spnego principal = no"
-	elog "			send spnego principal = no"
-	elog ""
-	elog "SMB2 protocol support in 3.6.0 is fully functional and can be "
-	elog "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.6.0.html"
-}
diff --git a/net-fs/samba/samba-4.0.25.ebuild b/net-fs/samba/samba-4.0.25.ebuild
deleted file mode 100644
index bbdaeca06f97..000000000000
--- a/net-fs/samba/samba-4.0.25.ebuild
+++ /dev/null
@@ -1,181 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-fs/samba/samba-4.0.25.ebuild,v 1.2 2015/06/03 17:03:40 vapier Exp $
-
-EAPI=5
-PYTHON_COMPAT=( python2_7 )
-PYTHON_REQ_USE='threads(+)'
-
-inherit python-single-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 dmapi fam gnutls iprint
-ldap quota selinux swat syslog test winbind"
-
-# sys-apps/attr is an automagic dependency (see bug #489748)
-# sys-libs/pam is an automagic dependency (see bug #489770)
-CDEPEND="${PYTHON_DEPS}
-	>=app-crypt/heimdal-1.5[-ssl]
-	dev-libs/iniparser
-	dev-libs/popt
-	sys-libs/readline:=
-	virtual/libiconv
-	dev-python/subunit[${PYTHON_USEDEP}]
-	sys-apps/attr
-	sys-libs/libcap
-	>=sys-libs/ldb-1.1.16
-	>=sys-libs/tdb-1.2.11[python,${PYTHON_USEDEP}]
-	>=sys-libs/talloc-2.0.8[python,${PYTHON_USEDEP}]
-	>=sys-libs/tevent-0.9.18
-	sys-libs/zlib
-	virtual/pam
-	acl? ( virtual/acl )
-	addns? ( net-dns/bind-tools[gssapi] )
-	aio? ( dev-libs/libaio )
-	cluster? ( >=dev-db/ctdb-1.0.114_p1 )
-	cups? ( net-print/cups )
-	dmapi? ( sys-apps/dmapi )
-	fam? ( virtual/fam )
-	gnutls? ( dev-libs/libgcrypt:0
-		>=net-libs/gnutls-1.4.0 )
-	ldap? ( net-nds/openldap )"
-DEPEND="${CDEPEND}
-	virtual/pkgconfig"
-RDEPEND="${CDEPEND}
-	client? ( net-fs/cifs-utils[ads?] )
-	selinux? ( sec-policy/selinux-samba )
-"
-
-REQUIRED_USE="ads? ( acl ldap )
-	${PYTHON_REQUIRED_USE}"
-
-RESTRICT="mirror"
-
-S="${WORKDIR}/${MY_P}"
-
-CONFDIR="${FILESDIR}/$(get_version_component_range 1-2)"
-
-# sys-apps/dmapi is an automagic dependency (see bug #474492)
-PATCHES=(
-	"${FILESDIR}/named.conf.dlz.patch"
-	"${FILESDIR}/${PN}-4.0.19-automagic_aio_fix.patch"
-)
-
-WAF_BINARY="${S}/buildtools/bin/waf"
-
-pkg_setup() {
-	python-single-r1_pkg_setup
-	if use aio; then
-		if ! linux_config_exists || ! linux_chkconfig_present AIO; then
-				ewarn "You must enable AIO support in your kernel config, "
-				ewarn "to be able to support asynchronous I/O. "
-				ewarn "You can find it at"
-				ewarn
-				ewarn "General Support"
-				ewarn " Enable AIO support "
-				ewarn
-				ewarn "and recompile your kernel..."
-		fi
-	fi
-}
-
-src_configure() {
-	local myconf=''
-	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 \
-		--with-piddir=/var/run/${PN} \
-		--disable-rpath \
-		--disable-rpath-install \
-		--nopyc \
-		--nopyo \
-		--disable-ntdb \
-		--bundled-libraries=NONE \
-		--builtin-libraries=NONE \
-		$(use_with addns dnsupdate) \
-		$(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 dmapi) \
-		$(use_with fam) \
-		$(use_enable gnutls) \
-		$(use_enable iprint) \
-		$(use_with ldap) \
-		--with-pam \
-		--with-pam_smbpass \
-		$(use_with quota quotas) \
-		$(use_with syslog) \
-		$(use_with swat) \
-		$(use_with winbind)
-		"
-	use "ads" && myconf+=" --with-shared-modules=idmap_ad"
-
-	CPPFLAGS="-I${SYSROOT}/usr/include/et ${CPPFLAGS}" \
-		waf-utils_src_configure ${myconf}
-}
-
-src_install() {
-	waf-utils_src_install
-
-	# install ldap schema for server (bug #491002)
-	if use ldap ; then
-		insinto /etc/openldap/schema
-		doins examples/LDAP/samba.schema
-	fi
-
-	# 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.17.ebuild b/net-fs/samba/samba-4.1.19.ebuild
index 9da451445b5a..a4efdbb24f21 100644
--- a/net-fs/samba/samba-4.1.17.ebuild
+++ b/net-fs/samba/samba-4.1.19.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-fs/samba/samba-4.1.17.ebuild,v 1.3 2015/06/03 17:03:40 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-fs/samba/samba-4.1.19.ebuild,v 1.1 2015/06/26 07:37:20 polynomial-c Exp $
 
 EAPI=5
 PYTHON_COMPAT=( python2_7 )
@@ -37,7 +37,7 @@ CDEPEND="${PYTHON_DEPS}
 	>=sys-libs/ntdb-1.0[python,${PYTHON_USEDEP}]
 	>=sys-libs/ldb-1.1.17
 	>=sys-libs/tdb-1.2.12[python,${PYTHON_USEDEP}]
-	>=sys-libs/talloc-2.0.8[python,${PYTHON_USEDEP}]
+	>=sys-libs/talloc-2.1.2[python,${PYTHON_USEDEP}]
 	>=sys-libs/tevent-0.9.18
 	sys-libs/zlib
 	virtual/pam