Temporary fix for #553384

Package-Manager: portage-2.2.20/cvs/Linux x86_64

6 files changed, 20 insertions, 36 deletions

diff --git a/net-fs/samba/ChangeLog b/net-fs/samba/ChangeLog
index 557a22f898ce..764bda7d5975 100644
--- a/net-fs/samba/ChangeLog
+++ b/net-fs/samba/ChangeLog
@@ -1,6 +1,10 @@
 # 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.717 2015/06/26 07:37:20 polynomial-c Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-fs/samba/ChangeLog,v 1.718 2015/06/28 03:34:52 patrick Exp $
+
+  28 Jun 2015; Patrick Lauer <patrick@gentoo.org> samba-4.0.26.ebuild,
+  samba-4.1.18.ebuild, samba-4.1.19.ebuild, samba-4.2.0.ebuild:
+  Temporary fix for #553384
 
 *samba-4.1.19 (26 Jun 2015)
 
diff --git a/net-fs/samba/Manifest b/net-fs/samba/Manifest
index 892fb20fa22f..32f07021081f 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
@@ -53,27 +50,10 @@ DIST smb_traffic_analyzer_v2.diff.bz2 12226 SHA256 1bae7eafbe8ac2382313d5ab9d43d
 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.25.ebuild 13518 SHA256 276106437cfc337e476e402146bb7fd5036711e1d77ad1f9d2fdf794cb7d98db SHA512 a813e2e6aa9ab65bd8b06da36e7124c45315f99a485d6b84b38733468bbb291833afb9d9392c15e3fd6f7e1f1d09043921990bb0e9c3ea991a3eedeb1aee422a WHIRLPOOL 79b51e9420b02096dc0b69af0d0cd6abe82cbc42ad4af702488223808fa6e23dfc1894281f2ade8db9c28f4a44b3a3961cbb8aaf6914c5255c9803c381b0a6ac
-EBUILD samba-4.0.26.ebuild 4877 SHA256 15bfc6ad7b81ed39e18c1bbe23fe0b6e9dd12de901a0343179c9e54153a8db75 SHA512 eb6c6b1aa39a4051c82f2c020ed4b6123f4b04e9c30b6a26a497be0600b6ba43cdad52091830b7cd509cf0810d24b5bf8656fe77c63e884c17ab99dba698e1dc WHIRLPOOL 9ae89f3b07528f066a9480614e56a7f55eb4af4dacde51e1ebd0c5b8f26e099b081e6099933535153cb07a1703fa4388183340c4c00671524ac2af9dfbb81ea3
-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 11205 SHA256 c1493deae3ac4f8db42d2eba22d20989125e93803e586c0d9b13db18c2ab0809 SHA512 44d27b312b25721ccd18b58fb8e620721f625a560a673203af624880d08dd2487b2e21e6d03963cb3a8d4a9a95481a09848bfe628ff8cb6af951756ad9b2d372 WHIRLPOOL d88b94ed78c444205ad3fc2e4019b2d4c4ad54a98ba3d1a2f43252682da407933deb814bf54e37e4de81afed28a57bc8dea3e31bc8ba83ff99da054766d327dd
+EBUILD samba-4.0.26.ebuild 4885 SHA256 741531814b661aa33354897b64529eab8407b36e918ded94fbb925642ad3675e SHA512 1d4c1c81b609ee88cb27a5598f77fa8f52494e2da90d1504eaa77276d3839952abc7d42a7e7b709b66c16141f1c7f131e8eaf13de48bc8ce54f40f6882810ae5 WHIRLPOOL 385af4b813d139666b5e3e92100bad753b9bde7e173440da3e8b0f667307fe380c638b7570ddd65f4db0ec7b901c7f40b8cab386161859e4a9e9cd71fe7a0844
+EBUILD samba-4.1.18.ebuild 4897 SHA256 6f794c369b9d66abea5d63153dc05994795b4ee0a201c48864d9dcbe35b36b12 SHA512 2387e6a4a51130294d814dc296e70fdaee2020c4b882c7334497c8e8a74f6b793206df3c83a320fa2288d964e5171fb5712dc9d210d480c90a74f45055b18ce5 WHIRLPOOL 443db719409d5a31ae34b9385c14742bbaab626bddee2b1845047de419893b2a8eaa56b2a5e7319ea350f09082dc0d8c90bf3aa9ca2621818d506208f270d804
+EBUILD samba-4.1.19.ebuild 4897 SHA256 ca5cd8103eacd7f3863499148ab8867987a6d9b68b82668b7c7e53898326e15e SHA512 a4f88edd264163550d6bf88ff72feb720753ec1cbd85cb0b5bfd8e3ba15590861da8cc41364c105063202d5477c3dbf71998658f2e67679dc0e52feeae8d9c69 WHIRLPOOL a6c9cfa2c3f6dc32ce817b2de3cd15299ef9666019325f6f1b0131a90786716c6f23c341d4a9e45a2fbc3ca7a3c5fe0c80ff4b3573ca42cd2094559c7cdce9c7
+EBUILD samba-4.2.0.ebuild 4845 SHA256 9a2ded86b5647a7030a8618524941dffe23478c23ce688fa67e39fc339e9d229 SHA512 55bd74d24b61349753ce1ec389cd83489cc66c5c60f6b7924770f6b9fcb9a98d65f86f6575db02612cbf96e44ca0c6a9130bbcf2ff1aaeb8e940b29eb3c7c7e3 WHIRLPOOL fe113129e9401e295bcf52bf042d6dab78229ef41eff747c17447d2097515f2699c1b8e373055c2ed4e279892e4883a2436522589e073a2b76403c97a8fa9150
+MISC ChangeLog 11364 SHA256 fa7fed9da17aec8e845a6222d3b163bee0aa67e2901f3dfc7c032f8c6d4c380a SHA512 9ddeb0722c4858bd6dd0250116cd46741d51d00f1bc0a83f66126207ea7e72d73e4475d5d0da16a634b811b42ad2e29a04e50433cbcf1b8399a6b7f763e38a7b WHIRLPOOL 44f3e4be0b5895d7b639d190b87f2883624e02fd8a89c816fc57f0f3e9bcf409b2925798ed5d0e7bd029bec35b1f80e388693cb4b8e9c28f986cba780ed9dd2a
 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
-
-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-4.0.26.ebuild b/net-fs/samba/samba-4.0.26.ebuild
index f1b8ee63bfb3..f076e5ff13dc 100644
--- a/net-fs/samba/samba-4.0.26.ebuild
+++ b/net-fs/samba/samba-4.0.26.ebuild
@@ -1,12 +1,12 @@
 # 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.26.ebuild,v 1.2 2015/06/03 17:03:40 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-fs/samba/samba-4.0.26.ebuild,v 1.3 2015/06/28 03:34:52 patrick Exp $
 
 EAPI=5
 PYTHON_COMPAT=( python2_7 )
 PYTHON_REQ_USE='threads(+)'
 
-inherit python-single-r1 waf-utils multilib linux-info systemd
+inherit python-single-r1 waf-utils multilib linux-info systemd eutils
 
 MY_PV="${PV/_rc/rc}"
 MY_P="${PN}-${MY_PV}"
diff --git a/net-fs/samba/samba-4.1.18.ebuild b/net-fs/samba/samba-4.1.18.ebuild
index 6bd6d0914bd1..b7f6465dc15b 100644
--- a/net-fs/samba/samba-4.1.18.ebuild
+++ b/net-fs/samba/samba-4.1.18.ebuild
@@ -1,12 +1,12 @@
 # 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.18.ebuild,v 1.3 2015/06/03 17:03:40 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-fs/samba/samba-4.1.18.ebuild,v 1.4 2015/06/28 03:34:52 patrick Exp $
 
 EAPI=5
 PYTHON_COMPAT=( python2_7 )
 PYTHON_REQ_USE='threads(+)'
 
-inherit python-single-r1 waf-utils multilib linux-info systemd
+inherit python-single-r1 waf-utils multilib linux-info systemd base
 
 MY_PV="${PV/_rc/rc}"
 MY_P="${PN}-${MY_PV}"
@@ -26,7 +26,7 @@ ldap quota selinux syslog systemd 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]
+	>=app-crypt/heimdal-1.5[-ssl,-threads]
 	dev-libs/iniparser
 	dev-libs/popt
 	sys-libs/readline:=
diff --git a/net-fs/samba/samba-4.1.19.ebuild b/net-fs/samba/samba-4.1.19.ebuild
index a4efdbb24f21..7533aa85bffb 100644
--- a/net-fs/samba/samba-4.1.19.ebuild
+++ b/net-fs/samba/samba-4.1.19.ebuild
@@ -1,12 +1,12 @@
 # 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.19.ebuild,v 1.1 2015/06/26 07:37:20 polynomial-c Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-fs/samba/samba-4.1.19.ebuild,v 1.2 2015/06/28 03:34:52 patrick Exp $
 
 EAPI=5
 PYTHON_COMPAT=( python2_7 )
 PYTHON_REQ_USE='threads(+)'
 
-inherit python-single-r1 waf-utils multilib linux-info systemd
+inherit python-single-r1 waf-utils multilib linux-info systemd base
 
 MY_PV="${PV/_rc/rc}"
 MY_P="${PN}-${MY_PV}"
@@ -26,7 +26,7 @@ ldap quota selinux syslog systemd 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]
+	>=app-crypt/heimdal-1.5[-ssl,-threads]
 	dev-libs/iniparser
 	dev-libs/popt
 	sys-libs/readline:=
diff --git a/net-fs/samba/samba-4.2.0.ebuild b/net-fs/samba/samba-4.2.0.ebuild
index be6d23e2dfe7..9343253cef52 100644
--- a/net-fs/samba/samba-4.2.0.ebuild
+++ b/net-fs/samba/samba-4.2.0.ebuild
@@ -1,12 +1,12 @@
 # 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.2.0.ebuild,v 1.2 2015/06/03 17:03:40 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-fs/samba/samba-4.2.0.ebuild,v 1.3 2015/06/28 03:34:52 patrick Exp $
 
 EAPI=5
 PYTHON_COMPAT=( python2_7 )
 PYTHON_REQ_USE='threads(+)'
 
-inherit python-single-r1 waf-utils multilib linux-info systemd
+inherit python-single-r1 waf-utils multilib linux-info systemd eutils
 
 MY_PV="${PV/_rc/rc}"
 MY_P="${PN}-${MY_PV}"