gentoo resync : 12.10.2017

11 files changed, 503 insertions, 15 deletions

diff --git a/app-admin/gentoo-perl-helpers/Manifest b/app-admin/gentoo-perl-helpers/Manifest
index 6e74c4a86ac7..93487e32de6c 100644
--- a/app-admin/gentoo-perl-helpers/Manifest
+++ b/app-admin/gentoo-perl-helpers/Manifest
@@ -2,8 +2,10 @@ DIST gentoo-perl-helpers-0.1.0.tar.xz 6692 SHA256 e2c0e3eabbdba194460547d4b2beb2
 DIST gentoo-perl-helpers-0.2.0.tar.xz 8876 SHA256 73ed0e54870ca3979067251c35750a21a034501894e07d0626f03dbb19b77250 SHA512 f9c534436dc3ad7bc2c50e47491ef3a76bf949e2065c182391b3526e259ce93e9eb4ef1b9d981d6dbf3924394150b90ee6460f51f67d79505039b826af374d95 WHIRLPOOL f8b3eb49ff34b4b43637069496ed396f1c34d4abebba773889268e4eab7ea0a0cec7d39389c501f8c1285893c4193b34e3b2a6eb7270a0daf53d9c81788f6efd
 DIST gentoo-perl-helpers-0.2.1.tar.xz 8904 SHA256 6e6e5e1a0162771cc7874dbd86910790bed9538e82355875308eafd3691d44c4 SHA512 f2815f0bc893faa815482333c79da0ea81eedb0919d9eec9d2403e0f6d886fa28561221a4f1b4b9d48b6182dea37a02ab79fcea2322a837817948428146a5ba3 WHIRLPOOL fe9742df1235a010a1c52249b510230d65668f3c95da75a0161e9d43431cc41336c77d9748126f77619a19fe0daec1bce0be7c1798b39ca57f52dab25e99f232
 DIST gentoo-perl-helpers-0.2.2.tar.xz 9096 SHA256 1b6479d573f14458e3daa7a4b75b8c30867b480d1f94ca70c03c261bbd867ba3 SHA512 97653cbcff01cb65b5aa8b5e56ecdafedddfed773b8f41120707066d8c3d837634b9d2996eeed069cf434175684ac38a0e829719dd88a3bfd14e2e0ab6f80a14 WHIRLPOOL cd0fa43068dd30b7ee971e14006cf6818fdd22c89a88937a39b64fdf73c29f4066a1f27673485bb406ca41acf6234c4a87e2283b18081041ac22683700892e6b
+DIST gentoo-perl-helpers-0.3.0.tar.xz 9392 SHA256 030aba5f692b77bced185af7ca158ccaa5207874062f965357e4bda57ff82031 SHA512 3feaf287457d0b4fa29cc58878566b38674b0c112ba356727bbce2bcff9b9cca07cec34cfb960260a0a32542c43611b783f74ee4127c9c0aa33843a144544c13 WHIRLPOOL bd2d60dbd5fb337e8d00797b082d9c3fb5ccd39459d15d1949ad1b4d66a97d0ad8337a1dfb4e9e446a4af21d740321f861a79e0ad08894fda6e2691769d628c9
 EBUILD gentoo-perl-helpers-0.1.0.ebuild 1055 SHA256 7831f87f8f9c4f838f3f5b612dec4b3366448ca3066e9ca3563ed8e816495c4d SHA512 78c626c5652693877c5cbeca909ecc2e93a798af83b1b6fef70b7be0a41b2e8ada39b752fe0c982670eb7cfc77525d94fe5c5294725848d339dba8d3b96adcd1 WHIRLPOOL 5fa288ac3ff91c6bbf5e46f093b586825467094081a8b1473e17871b81dc2f6405a568c0d418c55caf2de850f4ae935fb52ae22e56600cbc260f3d40e7614fff
 EBUILD gentoo-perl-helpers-0.2.0.ebuild 1218 SHA256 2f9ed22d919d2b1760a535855463036fbb63849507893d4bfffb5d64ab1e955d SHA512 6a3381deac08ecca97f24f3ff2d8582658998167d18f6267a2ea83eb312b433c37803e3004038e02a2085e853f840cbb8ed1b6135db7d7abb68260ff9f962324 WHIRLPOOL 100214fd7e172d81d33267acc54839cdebcef927a44b028b4f8cd87cead2c1faaa64c69b0b2e35a85e4536b499492245e76a0d1c6d83c666e96331f1d7d11292
 EBUILD gentoo-perl-helpers-0.2.1.ebuild 1225 SHA256 8fba3a3dafac4fe88881af47991966599cc33ace40c5c4de95d86228750903a6 SHA512 60a21a692d621e44e0592576112d66ba14fc01b86874678ff56ee843cc27dbf1ca95d849b6aec6040ee76e0a58add2d07445d2be9be4293e61821464f1c4e426 WHIRLPOOL dc37e3b17a39afde2860bb5d8a51b07b522ae875d436a0f028fd1faac588affec7943314543b275b4c5ae8cf4a7763b8e5b2b41122f86396403ffa302ae1b69e
 EBUILD gentoo-perl-helpers-0.2.2-r1.ebuild 1255 SHA256 f6202930e24fe989b21265edf91af0eaa3453a97cdf497af42c9ea891d81ccc6 SHA512 62e682d07a9d61746378e7f56adcf7bf624b1f41a30065b2fb246ca008d39876cb03152bbbc23d5225895ff735d5479f53125d4b8f428eda6b8a7dfe2049673c WHIRLPOOL a261bd76b8871123b21a619e1cfe6c28c5ab4ca6e35259a226995613f7abf8e801d804fac5390111efa5b6e955083e6de14fccdd4b55a67727910f263d8b0c75
+EBUILD gentoo-perl-helpers-0.3.0.ebuild 1255 SHA256 f6202930e24fe989b21265edf91af0eaa3453a97cdf497af42c9ea891d81ccc6 SHA512 62e682d07a9d61746378e7f56adcf7bf624b1f41a30065b2fb246ca008d39876cb03152bbbc23d5225895ff735d5479f53125d4b8f428eda6b8a7dfe2049673c WHIRLPOOL a261bd76b8871123b21a619e1cfe6c28c5ab4ca6e35259a226995613f7abf8e801d804fac5390111efa5b6e955083e6de14fccdd4b55a67727910f263d8b0c75
 MISC metadata.xml 453 SHA256 5e5afa89bf0f47da3e7ab7e1f8a9833dc0f5a4a5d7a22cea7cfa5b6896cb0870 SHA512 a32d375d6aa0ac38a20cdec805c887be0d6493be5d47572a0e950e1f4a8b28018ab364cd06668ff59c52fe89487853c9c4bffdf05b79913c691d99fdc848b201 WHIRLPOOL b7b4a097b1ef4441eadefb705f70365aeb0443cf600ad60067d45dd61a628f71f1b6663c2018fe24f9584ca3b849c7fb98a9869348bf33ea924a2f7248177424
diff --git a/app-admin/gentoo-perl-helpers/gentoo-perl-helpers-0.3.0.ebuild b/app-admin/gentoo-perl-helpers/gentoo-perl-helpers-0.3.0.ebuild
new file mode 100644
index 000000000000..b725db35e2e2
--- /dev/null
+++ b/app-admin/gentoo-perl-helpers/gentoo-perl-helpers-0.3.0.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="Introspection and Upgrade Assistance tools for Gentoo Perl"
+HOMEPAGE="https://github.com/gentoo-perl/gentoo-perl-helpers"
+SRC_URI="
+	https://github.com/gentoo-perl/${PN}/releases/download/${PV}/${P}.tar.xz
+	mirror://gentoo/${P}.tar.xz
+	https://dev.gentoo.org/~kentnl/distfiles/${P}.tar.xz
+"
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE=""
+
+# Assumed System:
+# sys-apps/coreutils
+# sys-apps/grep
+# sys-apps/findutils
+# sys-apps/sed
+# app-shells/bash
+# sys-apps/gawk
+# app-arch/tar
+
+RDEPEND="
+	$(: --format support)
+	>=app-portage/portage-utils-0.60
+	sys-apps/portage
+"
+DEPEND=""
+
+src_prepare() {
+	sed -i -e "s^@@LIBDIR@@^${EPREFIX}/usr/lib/gentoo-perl-helpers^g" 		\
+		   -e "s^@@LIBEXECDIR@@^${EPREFIX}/usr/libexec/gentoo-perl-helpers^g" \
+		   "${S}/bin/gentoo-perl"			\
+		   "${S}/lib/core-functions.sh"		\
+		   || die "Can't patch bin/gentoo-perl"
+	default
+}
+src_compile() { :; }
+src_install() {
+	exeinto /usr/bin
+	doexe "${S}/bin/"*
+
+	exeinto /usr/libexec/gentoo-perl-helpers
+	doexe "${S}/libexec/"*
+
+	insinto /usr/lib/gentoo-perl-helpers
+	doins -r "${S}/lib/"*
+
+	dodoc "${S}/README.mkdn" "${S}/Changes"
+}
diff --git a/app-admin/keepassxc/Manifest b/app-admin/keepassxc/Manifest
index e5e5d31cfc90..1bdf5b2f409b 100644
--- a/app-admin/keepassxc/Manifest
+++ b/app-admin/keepassxc/Manifest
@@ -1,8 +1,8 @@
 DIST keepassxc-2.1.4.tar.gz 3345520 SHA256 40a990dbcf442eb3cad99452b58ffd36e5855b39e78f213ea20e99fbc7876701 SHA512 48030eb6df595c73644f43d6222654c5f76962ae5aa2f44ca4dc9c8e45726380c6be4300af7a8279b07c06b70912da444f2b17c5b6c37a91cb239d695e7518d8 WHIRLPOOL da2bdac3e334b48903c6b20532ea4a0af0fe057e10e702ba6a4221e828b8f416d666ff67407b434d38b4cbbe5119d3c8a49927e4d5092f4f62ab49e30981017c
 DIST keepassxc-2.2.0.tar.gz 3814252 SHA256 9d9d39b9c056955fe5d7a5212efe1703be02fa4731c36e2b1e06a78174b0a7b8 SHA512 e23968c259afade81c8dcf0786ed68ca77ca8e9726dffb12e1017f2f60afb29b60ec1b71450ce7e284d543bcaa72bbc79bec917dea852d5bb923dff7fc6edcb5 WHIRLPOOL a993068922d8fd0bd1b06d434fff7340160c30992a166f15d9692d83e4a985939b88d20fce2b0425d3bab00de0e2ffce6fd2d34ff0bd92d08d95747ae03c9df9
 DIST keepassxc-2.2.1.tar.gz 3880551 SHA256 184663e8b08e081dedf4c9dbdd68bf86ed0f5e32388b4781b7afcf89ef5c8e4d SHA512 bce2a0d6d3ad32bb507afac22670b34c37f5e36de6a30bb7c9b5a523c12bad59d95a414b90608451660fb9ce224279c7658e1892f2b99c673908449cc86e5595 WHIRLPOOL 32a0ede5c150bc4fc54c1b0a8f3c46110a19349d732913bdc9f3bc6492c1998569b2cd7a178ec9bb11e5b8dc9698138d8a7f26000211377a0c90f505605fe54c
-EBUILD keepassxc-2.1.4.ebuild 1296 SHA256 21020aa77454309d2b4ec78c59789b1fc5682cf8b2f496d98fd63379ca7e1c4d SHA512 bff1649354cc4188a248409fca71653831ee5af2f59d8ee8cf2fedbf7b0da08211744379ba3d12db70cddfb397000f827703265f74c5b4842dda2b5952a9b990 WHIRLPOOL 508a2cab8eef69078287ea5ee446546160b764d38319553352ee84000bbeddc72748f71186dbb3efe91df5daeab70a0564a653a75f7c913786edcdac26bcb47b
-EBUILD keepassxc-2.2.0.ebuild 1335 SHA256 0228a57f08e54e04b81f675dd39daaf55576b847651665ecbafeff680f76e337 SHA512 6fbf334e67c6a0f36ff423512fb889257a1458219c1a1ce096de09b0cfb795616f1c4bc943222e0e8ab6cdb8de0e4218b062e20e78e5c4db95c296cdfd6bd832 WHIRLPOOL 7111027f4c17cca3e790a71c60fcd937ba8463d940de988720b3d4d57d13d7e35848cba1a8f35710cd0c41a758623a866e702fb30b1e51d801f9637e7537ae36
-EBUILD keepassxc-2.2.1.ebuild 1335 SHA256 0228a57f08e54e04b81f675dd39daaf55576b847651665ecbafeff680f76e337 SHA512 6fbf334e67c6a0f36ff423512fb889257a1458219c1a1ce096de09b0cfb795616f1c4bc943222e0e8ab6cdb8de0e4218b062e20e78e5c4db95c296cdfd6bd832 WHIRLPOOL 7111027f4c17cca3e790a71c60fcd937ba8463d940de988720b3d4d57d13d7e35848cba1a8f35710cd0c41a758623a866e702fb30b1e51d801f9637e7537ae36
-EBUILD keepassxc-9999.ebuild 1335 SHA256 0228a57f08e54e04b81f675dd39daaf55576b847651665ecbafeff680f76e337 SHA512 6fbf334e67c6a0f36ff423512fb889257a1458219c1a1ce096de09b0cfb795616f1c4bc943222e0e8ab6cdb8de0e4218b062e20e78e5c4db95c296cdfd6bd832 WHIRLPOOL 7111027f4c17cca3e790a71c60fcd937ba8463d940de988720b3d4d57d13d7e35848cba1a8f35710cd0c41a758623a866e702fb30b1e51d801f9637e7537ae36
+EBUILD keepassxc-2.1.4.ebuild 1274 SHA256 c743cc8d10e7074961a183180cef53dc07dc10a31d53459975f2cfc42aac0cc8 SHA512 4779132dfb452a71e48936807e0109d6ee5e9b3cac885f14f2a7d146cd49602297eae2327625c6659fbefa8a55eeeb594710249e6dea31c394d87d8872a66537 WHIRLPOOL cd38f3e72cc674cb47b1ff4843b158626ab5ca00fe0accbc195e4195df024b914339cc197b74bea57679bf05e020b7e8a36cd166dd2ff126cde0ca88fa7ca817
+EBUILD keepassxc-2.2.0.ebuild 1313 SHA256 37e19d25e181318acd264e91f9166e8674802eb86bf84a2b76a4c7ba1b608242 SHA512 9141446b124b5afb5c60e6f02dbd401c8d9bdc752dade96ed8e75e3bad2534e815c6ca7f5695885c1e460bd099c26e145702095c844877cccd8977cf6c6f5723 WHIRLPOOL 2d8f96df0e7bd41ac2a4d4efc923820236d2d6bc69d150ecb77d86597bf223d693b24589f4b6b4274396d31f794e79267019f678c7501638f4c8b5561d56202b
+EBUILD keepassxc-2.2.1.ebuild 1313 SHA256 37e19d25e181318acd264e91f9166e8674802eb86bf84a2b76a4c7ba1b608242 SHA512 9141446b124b5afb5c60e6f02dbd401c8d9bdc752dade96ed8e75e3bad2534e815c6ca7f5695885c1e460bd099c26e145702095c844877cccd8977cf6c6f5723 WHIRLPOOL 2d8f96df0e7bd41ac2a4d4efc923820236d2d6bc69d150ecb77d86597bf223d693b24589f4b6b4274396d31f794e79267019f678c7501638f4c8b5561d56202b
+EBUILD keepassxc-9999.ebuild 1313 SHA256 37e19d25e181318acd264e91f9166e8674802eb86bf84a2b76a4c7ba1b608242 SHA512 9141446b124b5afb5c60e6f02dbd401c8d9bdc752dade96ed8e75e3bad2534e815c6ca7f5695885c1e460bd099c26e145702095c844877cccd8977cf6c6f5723 WHIRLPOOL 2d8f96df0e7bd41ac2a4d4efc923820236d2d6bc69d150ecb77d86597bf223d693b24589f4b6b4274396d31f794e79267019f678c7501638f4c8b5561d56202b
 MISC metadata.xml 819 SHA256 eef8083b85f448c94b9b84f542ac6894cb0d16e91f03a22e27d31cc744667d7d SHA512 b0607500bf25e7d4b504dd7fe0c03cf25f21cc32b79a0fe3a58d847f7ad2647c0452077ad8e16e1b2c63987ef68842b8d673fa0ebe657d918f27e0b163c8957d WHIRLPOOL aa80bba4cfa8cb4e5fadb8e36eced51596072c5a01a20b723742940dd1e7ec12a9ccd908fdf0ec04b8c703b81d6fe520a2f8aea4cae248afa9eafe12076e9914
diff --git a/app-admin/keepassxc/keepassxc-2.1.4.ebuild b/app-admin/keepassxc/keepassxc-2.1.4.ebuild
index e9a3f3c9ed24..a898d01585bf 100644
--- a/app-admin/keepassxc/keepassxc-2.1.4.ebuild
+++ b/app-admin/keepassxc/keepassxc-2.1.4.ebuild
@@ -9,7 +9,7 @@ inherit cmake-utils ${SCM}
 unset SCM
 
 DESCRIPTION="KeePassXC - KeePass Cross-platform Community Edition"
-HOMEPAGE="https://github.com/keepassxreboot/keepassxc"
+HOMEPAGE="https://keepassxc.org"
 
 if [[ "${PV}" != 9999 ]] ; then
 	SRC_URI="https://github.com/keepassxreboot/keepassxc/archive/${PV}.tar.gz -> ${P}.tar.gz"
diff --git a/app-admin/keepassxc/keepassxc-2.2.0.ebuild b/app-admin/keepassxc/keepassxc-2.2.0.ebuild
index 00fb3e294475..44773623ac03 100644
--- a/app-admin/keepassxc/keepassxc-2.2.0.ebuild
+++ b/app-admin/keepassxc/keepassxc-2.2.0.ebuild
@@ -9,7 +9,7 @@ inherit cmake-utils ${SCM}
 unset SCM
 
 DESCRIPTION="KeePassXC - KeePass Cross-platform Community Edition"
-HOMEPAGE="https://github.com/keepassxreboot/keepassxc"
+HOMEPAGE="https://keepassxc.org"
 
 if [[ "${PV}" != 9999 ]] ; then
 	SRC_URI="https://github.com/keepassxreboot/keepassxc/archive/${PV}.tar.gz -> ${P}.tar.gz"
diff --git a/app-admin/keepassxc/keepassxc-2.2.1.ebuild b/app-admin/keepassxc/keepassxc-2.2.1.ebuild
index 00fb3e294475..44773623ac03 100644
--- a/app-admin/keepassxc/keepassxc-2.2.1.ebuild
+++ b/app-admin/keepassxc/keepassxc-2.2.1.ebuild
@@ -9,7 +9,7 @@ inherit cmake-utils ${SCM}
 unset SCM
 
 DESCRIPTION="KeePassXC - KeePass Cross-platform Community Edition"
-HOMEPAGE="https://github.com/keepassxreboot/keepassxc"
+HOMEPAGE="https://keepassxc.org"
 
 if [[ "${PV}" != 9999 ]] ; then
 	SRC_URI="https://github.com/keepassxreboot/keepassxc/archive/${PV}.tar.gz -> ${P}.tar.gz"
diff --git a/app-admin/keepassxc/keepassxc-9999.ebuild b/app-admin/keepassxc/keepassxc-9999.ebuild
index 00fb3e294475..44773623ac03 100644
--- a/app-admin/keepassxc/keepassxc-9999.ebuild
+++ b/app-admin/keepassxc/keepassxc-9999.ebuild
@@ -9,7 +9,7 @@ inherit cmake-utils ${SCM}
 unset SCM
 
 DESCRIPTION="KeePassXC - KeePass Cross-platform Community Edition"
-HOMEPAGE="https://github.com/keepassxreboot/keepassxc"
+HOMEPAGE="https://keepassxc.org"
 
 if [[ "${PV}" != 9999 ]] ; then
 	SRC_URI="https://github.com/keepassxreboot/keepassxc/archive/${PV}.tar.gz -> ${P}.tar.gz"
diff --git a/app-admin/salt/Manifest b/app-admin/salt/Manifest
index 6d8f0b4c5ae8..32d96cedba80 100644
--- a/app-admin/salt/Manifest
+++ b/app-admin/salt/Manifest
@@ -31,16 +31,15 @@ AUX syndic-confd-1 188 SHA256 286148f5391d42c04a62a13cc125fa2130b5821e50da913c5a
 AUX syndic-initd-4 311 SHA256 86c1af171c7b13018f089fab6d045feabd72455f9453720ef36ae2011b9cb976 SHA512 69cc10fa7d9f0f4a68d223272c08ee33af242a50eb9bbea919d61f6cb5baf1ce986b07d69fc0e47e2f6dffc0a11100c3bc0d836d2938c46aa364beecb47f07ef WHIRLPOOL 0bc115ba99507a673c387ecacce4906d42ab93bd3c29016a1fac9621f61473c1b75f6236f69d449f3e393d2c05436b3a9185840ff20ad2d006e4397280c6843c
 DIST salt-2015.5.10.tar.gz 5693422 SHA256 863a96e70f8521af35fe11b10d25b3205a0bfbba9a8aee02e2842aa7106496fd SHA512 78a4cbe5c771208e957360689a25ae4e44566987e07e7fda54e6db9028485eacc6ad016c65c981090f9b5d95331e46048a094aecc27703b3956c06ab6ebad95d WHIRLPOOL 805b48df07707d85d8338251f26c72164a5421731fc11f5c933b72af97348a2f11ee35889f72ec032acbea275e98575d35786b56fd84a7917f8fdbc30567ae86
 DIST salt-2015.8.13.tar.gz 7036243 SHA256 cca82c9a4f267692660b098c1f76e54ab6a24131391893719bde0eb3a1ed2959 SHA512 ec8626f7360542bfeea90fc3d6fd9d9d015da4c2a6adf9957c22501ed9531b0a44d2cbc4853c41856b4cd46c142d2441884ec99700f3c0a5310cc428f9f1ec2a WHIRLPOOL c21f3bdc5fd674ea664c7e8fd58ef6685328a6ee3679850f3e9a085b1e604e1224a3323b906b47075fb8dd39f373583fb549e7b0f3f725d44928bcf716955a10
-DIST salt-2016.11.7.tar.gz 9409315 SHA256 279fa5bd73b5616620f628234575140f91df28b0d40d931569f179efabf27a2d SHA512 5bb52d75fafd57cd8efebe9b94dc3b53e39b476f6289e3509f1324fc86bb57a85d0ac832270c80629c04f301a749e018789c842e90cc3f2167445854e0f0ed99 WHIRLPOOL 984f297a23d59a129feaac40debc4aecaf64b2540cf62cae503c01cbe7413fdbeb58d18ed86b33b4da6f84a167bb7fed0fd502fca737720242dad91f7afad581
-DIST salt-2016.3.7.tar.gz 8516192 SHA256 3dd65ec44ca372c91b8254b625414cd7e795fdba274a07de902c3f33e199007b SHA512 78f3e23f7f05c8940bdb0359bc323cdb94c027d8abe554cffff8504d7e978f64f25d7b1f48450aed506e58ed8cbf9c272d95741dd330617809c663451f70b8d1 WHIRLPOOL 69e72d8a15310b5c1578de8c43d4a2f71cf1bdf3ae827a6283720f17a74972fd3d3fe84a95f045df77fdde82614ac6a30f549176fc44062569f40e8969e7f6fe
-DIST salt-2017.7.1.tar.gz 11408839 SHA256 fe868415d0e1162157186f4c5263e9af902b0571870ad2da210e7edf5ff5331d SHA512 c12db2361e04ce7bf4d663fafdeebdb318f210e0669d1ae26db6daf3dd19a7549b4151cb4e53acacda24d11eec7bbd06190b01cf4962d9027783ffd4617a2e52 WHIRLPOOL 6073ec85a4797ac6cc58f475f7f3bd5fa0d61b4d1228c514326d32644e2f6d1656e46196d1ad32d5c87d2bfa18eff5e786b9a1325d5e73387c33a591d8dd61d2
+DIST salt-2016.11.8.tar.gz 10142142 SHA256 e75f4178465d9198fcd5822643460c94d63de6221316367d5b85356ef8b1994a SHA512 0adc544ca460d13d2adb11b04575bd079a3dad1be3468bea7d32d0b74416b78546e4c86c75551bba09786be8e9810a6e30232414c4f5851cbc9a0fb4b894e0de WHIRLPOOL aa2ba8a4afbdd412e133364b4b034b7a34cb5af43fcbed929451624444440a07b143977ecf1db5cfcbbd53c98aedc15dae5ab8c246e48ab3b7c1053d30054b66
+DIST salt-2016.3.8.tar.gz 8519835 SHA256 9558379a11882348c1299ca094b638feb6bdf8f0d443d2055a71d0c9a52427e3 SHA512 bba41d4c70e278aa7196d292fb27b926dce32f4cc67c5b23b6c219ad59178b1a8b26e8adeb3a7bd587c25cc1c8ff36a207ea2a2f68d13d64f37a34f96f35ecd1 WHIRLPOOL 14e18eabd1287f05b0387455890f31c030ce6c84c831a12d0c691f76a3181dba0d3c12a15935c0f786c02fe6887d17a0fad492356814166c23865e3f98831f44
+DIST salt-2017.7.2.tar.gz 11471191 SHA256 ff3bc7de5abf01b8acbd144db5811b00867179b2353f5c6f7f19241e2eff2840 SHA512 959cec404f0fa7c00f78427cba902b8b9c2c0d95016fc70925d8da6d0b97a0284fc034ac92a5c5c313763db4fdcbd1b0391318596b77fe8e0cd1c7e4b3fa928b WHIRLPOOL 85e6ae3ba1a5b7c1e3e8546daec6ceb4ec60fb915409dd8000298b394b933f24a4b1d5740ebe230930bf8de76e7934d1ae3c919a058fdf6bf60638c260e6a585
 EBUILD salt-2015.5.10.ebuild 4120 SHA256 e43d362181f9daf161832757539fcfe556fdbfa62c6cb08e72ea04fe1d434409 SHA512 083d1fefcb43b825d0e52e9cde37802c146261b98dc45d5ad780753b35f80444931529ca2334671515f69d5f8de6af6eb38512ea6806d9d06af24464b13c1270 WHIRLPOOL ee70ede1d04d74884b33b5b6d7df91a46ec239060e1e449db7960df9daf5b787a4a6a0039434667cccbc6eb211a36477402ad8fa29743aded268bf05f9237e10
 EBUILD salt-2015.8.13-r1.ebuild 4539 SHA256 6b0a3e37090adc0987d9b2dd4017d3d6ca65f3f0542566902b6adc1f7f99781e SHA512 9f581b8892282b96044511bbf444c9e95b1d548d9f39fe972e97aa9e801d961071301eeb1df41734a0c33a100d70d43a6c0bc3b04e7cf7c469dcc19aef577330 WHIRLPOOL 050e08bfb759f4d11fd3a8323d7f150435f56e82e92e6bbff6a1aa17f5ecdd5130ae945f616569984071a27fcd8ccb4a21ae13174cc266c659ed12827f680b3c
 EBUILD salt-2015.8.13.ebuild 4481 SHA256 e2c5c61ccf9978ef29c9f77e71155ae90a50b87303a55c18ac1b49153b05d0e5 SHA512 e3a39c1c44ce16b6bb63a05d135cf46f1a0676a419d70441f0d051b5f6f8f8f3a6b961961d03d7cfcab71b50866fcb1234f76f800c29050dd900743eb29e4586 WHIRLPOOL 1025b6ced7cbfbf4564915970a0f0d4c074b120e78b609eab2567659f647cdae5d12026ad14982d9824a1e886543b71857b45a0653943cfc6d0a6f0b2d780e1a
-EBUILD salt-2016.11.7.ebuild 4623 SHA256 b99a61c53dfa6fd905d4570e41a81cdc3c9d724418d851c263b152c452508e4a SHA512 946eccb7bbe7175d81fa3746e6c87d7880ede9ed9c1f27106c2d6d782cbc001b05976fa113e2c5dc8b03c8b5d9a6ebfb0dd739250f82bf623ae4ab0f799f6738 WHIRLPOOL fd87ca9221dcf3772569bcbbd1e9b3de3f2ec5c4610582ca3ec8595400f0fdb5c98c0026d2b285380f22e3aeaf5ada48ba35aef9fd9bb2f25f9352f8b48c4ee7
-EBUILD salt-2016.3.7.ebuild 4480 SHA256 01c260d891ac85b05fe8ea46c504d60c4470d5fcb911f5bada765ed5f30b5bf5 SHA512 4633d977af7d07a4483af40f0722d42766c4ee2c801dfd506f9b9fbcfaaabe507af63ae7298374838a27486127b47464593e6b678c40ebf575fa2a4d40fe50bf WHIRLPOOL 235a160faeb64cd95f4cab92b8665c0692ed832db3df123490a6bce50abe311d17df53b071dc9c4a87b33fbd9eeacc2bdba626518a2a68f93e6b89292d25d3f7
-EBUILD salt-2017.7.1.ebuild 4331 SHA256 315b6d84b5a9f7cb124129332cd57e5a4f12eb8a8475cf099ba655b0034f0458 SHA512 91f78244df90369ca0f1251618c463ef0c5ae34c2a7569c8cc23dd2cd5d4fc9000c0da521846a82d938fd1a49506d567307898c1368ffeb98babc93eabe6821b WHIRLPOOL 653bdb2440f423ec3545c7c30146ab79749c60ca78939044de76b7d031b1b73dd7c33a0c6633d5ec8d92e5d5a80cf29ce996aaedecbccfdd9e5416ed9982bfca
-EBUILD salt-9999.ebuild 4247 SHA256 f07619d0622068fca3c858d382532d0febcc37e397cf86af8ef44f5797995d61 SHA512 c9a3230f8a99b13cb5604dcc76be3ccbb7a5d1698e8cf3bb70b14a25dc73317eee0b30055e6c53e7fff51fe9a8a4fda6317060582e64b156d6fdbfeca0bb4943 WHIRLPOOL cbc2894ccf5d5f4bade826cbf0b17066247620e43e6cf17fabb857ea12edb58daab15dd60f050fdd7dbe2da56783aae712dfbd63dac92c9ebc0f734af6ef81e9
+EBUILD salt-2016.11.8.ebuild 4623 SHA256 b99a61c53dfa6fd905d4570e41a81cdc3c9d724418d851c263b152c452508e4a SHA512 946eccb7bbe7175d81fa3746e6c87d7880ede9ed9c1f27106c2d6d782cbc001b05976fa113e2c5dc8b03c8b5d9a6ebfb0dd739250f82bf623ae4ab0f799f6738 WHIRLPOOL fd87ca9221dcf3772569bcbbd1e9b3de3f2ec5c4610582ca3ec8595400f0fdb5c98c0026d2b285380f22e3aeaf5ada48ba35aef9fd9bb2f25f9352f8b48c4ee7
+EBUILD salt-2016.3.8.ebuild 4670 SHA256 384ca2dd8486c136828ffc3e29f668173fdc45fcfaa6192528410b705784b21b SHA512 3c9133d50c9abee9fc4dad7fcf9c643c84b0f3f8399fb71dc7e92e105f5dc4666b66c1bb308fd6950fe81d79fadc2a0eeaba14c75d9c6a2fe8e8c1ebb3d5cf02 WHIRLPOOL 2c3faa3033ab715e829307bf0e123d5909dc60b78306889014889e33ca0f600dc2d841c887c99bdb827170fae49236c4cb4196c5a3779f9041676a9530290b0c
+EBUILD salt-2017.7.2.ebuild 4331 SHA256 315b6d84b5a9f7cb124129332cd57e5a4f12eb8a8475cf099ba655b0034f0458 SHA512 91f78244df90369ca0f1251618c463ef0c5ae34c2a7569c8cc23dd2cd5d4fc9000c0da521846a82d938fd1a49506d567307898c1368ffeb98babc93eabe6821b WHIRLPOOL 653bdb2440f423ec3545c7c30146ab79749c60ca78939044de76b7d031b1b73dd7c33a0c6633d5ec8d92e5d5a80cf29ce996aaedecbccfdd9e5416ed9982bfca
 MISC ChangeLog 12403 SHA256 298bea725d2152b7f69553d11f297509ed77ca25766db0bd2ef701cabf4af9cb SHA512 4d09eec2c3b202dce66d1930ac797047b5a8a62e23d9544f4b9e87b9c04f8154c2e22bb15a81d8c12d2c655b69e6caf14a3fb894091d5fcc0a0dc19ae4605a27 WHIRLPOOL 32f7fb99620f148d306f4ab71de645013ffacba2634da765c4857fbc27470a4266774bb4568d43d4c454d428c2bbf212d23d560003545463148715240343a322
 MISC ChangeLog-2015 12557 SHA256 b377310761177c31ab41e955e1a83e638d4c48ca3ab3f785a09fc7dfbcde4e6c SHA512 d364f9c749647bc9a3daa67e08ea79d09a598b35620b1971f797739fdc066a5700e5b5c8d0b412aab6766db67cc90a5ef871e1aeba61caae0496413b24d7177a WHIRLPOOL ac4da49c7b67666ba3b9b184b688a25d68ea7234d2556f9f25f34e3014b118ba743574519e93fca6447ba5450c52dd6079c91d873ccf1344cc9309c23bddacf2
 MISC metadata.xml 2288 SHA256 84db13520194dd4ed73cbf3eb01226be10f0800be4be988bac56960507bdb543 SHA512 fdcea2f80fc87ab2a0db1643d71dd6d54e91d898594570af6a7505343c5d9a5a0ce4803d11460d7d3f6f533509b072819f958cbe31ca9183fabf811982526969 WHIRLPOOL 50fbf4e2c309ddf255c5b867554f8c56600a81b71cf4b7ccbe43b7d2fb15430767b11573b834f9eaed9dfd45bcd802e50865f1e42662bfeb12dd1b16387645c4
diff --git a/app-admin/salt/salt-2016.11.8.ebuild b/app-admin/salt/salt-2016.11.8.ebuild
new file mode 100644
index 000000000000..e68adad560f9
--- /dev/null
+++ b/app-admin/salt/salt-2016.11.8.ebuild
@@ -0,0 +1,146 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 )
+
+inherit eutils systemd distutils-r1
+
+DESCRIPTION="Salt is a remote execution and configuration manager"
+HOMEPAGE="https://saltstack.com/community/"
+
+if [[ ${PV} == 9999* ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/${PN}stack/${PN}.git"
+	EGIT_BRANCH="develop"
+	SRC_URI=""
+	KEYWORDS=""
+else
+	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+	KEYWORDS="~x86 ~amd64"
+fi
+
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE="cherrypy ldap libcloud libvirt gnupg keyring mako mongodb mysql neutron nova"
+IUSE+=" openssl portage profile redis selinux test timelib raet +zeromq vim-syntax"
+
+RDEPEND="sys-apps/pciutils
+	dev-python/jinja[${PYTHON_USEDEP}]
+	>=dev-python/msgpack-0.3[${PYTHON_USEDEP}]
+	dev-python/pyyaml[${PYTHON_USEDEP}]
+	dev-python/markupsafe[${PYTHON_USEDEP}]
+	>=dev-python/requests-1.0.0[${PYTHON_USEDEP}]
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	>=www-servers/tornado-4.2.1[${PYTHON_USEDEP}]
+	virtual/python-futures[${PYTHON_USEDEP}]
+	libcloud? ( >=dev-python/libcloud-0.14.0[${PYTHON_USEDEP}] )
+	mako? ( dev-python/mako[${PYTHON_USEDEP}] )
+	ldap? ( dev-python/python-ldap[${PYTHON_USEDEP}] )
+	libvirt? ( dev-python/libvirt-python[${PYTHON_USEDEP}] )
+	openssl? (
+		dev-libs/openssl:*[-bindist]
+		dev-python/pyopenssl[${PYTHON_USEDEP}]
+	)
+	raet? (
+		>=dev-python/libnacl-1.0.0[${PYTHON_USEDEP}]
+		>=dev-python/ioflo-1.1.7[${PYTHON_USEDEP}]
+		>=dev-python/raet-0.6.0[${PYTHON_USEDEP}]
+	)
+	zeromq? (
+		>=dev-python/pyzmq-2.2.0[${PYTHON_USEDEP}]
+		>=dev-python/pycrypto-2.6.1[${PYTHON_USEDEP}]
+	)
+	cherrypy? ( >=dev-python/cherrypy-3.2.2[${PYTHON_USEDEP}] )
+	mongodb? ( dev-python/pymongo[${PYTHON_USEDEP}] )
+	portage? ( sys-apps/portage[${PYTHON_USEDEP}] )
+	keyring? ( dev-python/keyring[${PYTHON_USEDEP}] )
+	mysql? ( dev-python/mysql-python[${PYTHON_USEDEP}] )
+	redis? ( dev-python/redis-py[${PYTHON_USEDEP}] )
+	selinux? ( sec-policy/selinux-salt )
+	timelib? ( dev-python/timelib[${PYTHON_USEDEP}] )
+	nova? ( >=dev-python/python-novaclient-2.17.0[${PYTHON_USEDEP}] )
+	neutron? ( >=dev-python/python-neutronclient-2.3.6[${PYTHON_USEDEP}] )
+	gnupg? ( dev-python/python-gnupg[${PYTHON_USEDEP}] )
+	profile? ( dev-python/yappi[${PYTHON_USEDEP}] )
+	vim-syntax? ( app-vim/salt-vim )"
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+	test? (
+		dev-python/psutil[${PYTHON_USEDEP}]
+		dev-python/pip[${PYTHON_USEDEP}]
+		dev-python/virtualenv[${PYTHON_USEDEP}]
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/timelib[${PYTHON_USEDEP}]
+		>=dev-python/boto-2.32.1[${PYTHON_USEDEP}]
+		!x86? ( dev-python/boto3[${PYTHON_USEDEP}] )
+		>=dev-python/moto-0.3.6[${PYTHON_USEDEP}]
+		>=dev-python/SaltTesting-2016.5.11[${PYTHON_USEDEP}]
+		>=dev-python/libcloud-0.14.0[${PYTHON_USEDEP}]
+		${RDEPEND}
+	)"
+
+DOCS=( README.rst AUTHORS )
+
+REQUIRED_USE="|| ( raet zeromq )"
+RESTRICT="x86? ( test )"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-2016.11.0-tmpdir.patch"
+	"${FILESDIR}/${PN}-2016.3.1-dont-realpath-tmpdir.patch"
+	"${FILESDIR}/${PN}-2016.3.4-test-nonexist-dirs.patch"
+	"${FILESDIR}/${PN}-2016.11.0-remove-file-tree-test.patch"
+	"${FILESDIR}/${PN}-2016.11.0-broken-tests.patch"
+)
+
+python_prepare() {
+	# this test fails because it trys to "pip install distribute"
+	rm tests/unit/{modules,states}/zcbuildout_test.py \
+		tests/unit/modules/{rh_ip,win_network,random_org}_test.py || die
+
+	# https://github.com/saltstack/salt/issues/39095
+	rm tests/unit/utils/parsers_test.py
+
+	# apparently libcloud does not know about this?
+	rm tests/unit/cloud/clouds/dimensiondata_test.py || die
+
+	# seriously? "ValueError: Missing (or not readable) key file: '/home/dany/PRIVKEY.pem'"
+	rm tests/unit/cloud/clouds/gce_test.py || die
+}
+
+python_install_all() {
+	local svc
+	USE_SETUPTOOLS=1 distutils-r1_python_install_all
+
+	for svc in minion master syndic api; do
+		newinitd "${FILESDIR}"/${svc}-initd-4 salt-${svc}
+		newconfd "${FILESDIR}"/${svc}-confd-1 salt-${svc}
+		systemd_dounit "${FILESDIR}"/salt-${svc}.service
+	done
+
+	insinto /etc/${PN}
+	doins -r conf/*
+}
+
+python_test() {
+	local tempdir
+	# testsuite likes lots of files
+	ulimit -n 3072 || die
+
+	# ${T} is too long a path for the tests to work
+	tempdir="$(mktemp -dup /tmp salt-XXX)"
+	mkdir "${T}/$(basename "${tempdir}")"
+
+	(
+		cleanup() { rm -f "${tempdir}"; }
+		trap cleanup EXIT
+
+		addwrite "${tempdir}"
+		ln -s "$(realpath --relative-to=/tmp "${T}/$(basename "${tempdir}")")" "${tempdir}"
+
+		USE_SETUPTOOLS=1 SHELL="/bin/bash" \
+			TMPDIR="${tempdir}" \
+			${EPYTHON} tests/runtests.py \
+			--unit-tests --no-report --verbose
+
+	) || die "testing failed"
+}
diff --git a/app-admin/salt/salt-2016.3.8.ebuild b/app-admin/salt/salt-2016.3.8.ebuild
new file mode 100644
index 000000000000..655ea35eb46a
--- /dev/null
+++ b/app-admin/salt/salt-2016.3.8.ebuild
@@ -0,0 +1,147 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 )
+
+inherit eutils systemd distutils-r1
+
+DESCRIPTION="Salt is a remote execution and configuration manager"
+HOMEPAGE="https://saltstack.com/community/"
+
+if [[ ${PV} == 9999* ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/${PN}stack/${PN}.git"
+	EGIT_BRANCH="develop"
+	SRC_URI=""
+	KEYWORDS=""
+else
+	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+	KEYWORDS="~x86 ~amd64"
+fi
+
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE="cherrypy ldap libcloud libvirt gnupg keyring mako mongodb mysql neutron nova"
+IUSE+=" openssl portage profile redis selinux test timelib raet +zeromq vim-syntax"
+
+RDEPEND="sys-apps/pciutils
+	dev-python/jinja[${PYTHON_USEDEP}]
+	>=dev-python/msgpack-0.3[${PYTHON_USEDEP}]
+	dev-python/pyyaml[${PYTHON_USEDEP}]
+	dev-python/markupsafe[${PYTHON_USEDEP}]
+	>=dev-python/requests-1.0.0[${PYTHON_USEDEP}]
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	>=www-servers/tornado-4.2.1[${PYTHON_USEDEP}]
+	virtual/python-futures[${PYTHON_USEDEP}]
+	libcloud? ( >=dev-python/libcloud-0.14.0[${PYTHON_USEDEP}] )
+	mako? ( dev-python/mako[${PYTHON_USEDEP}] )
+	ldap? ( dev-python/python-ldap[${PYTHON_USEDEP}] )
+	libvirt? ( dev-python/libvirt-python[${PYTHON_USEDEP}] )
+	openssl? (
+		dev-libs/openssl:*[-bindist]
+		dev-python/pyopenssl[${PYTHON_USEDEP}]
+	)
+	raet? (
+		>=dev-python/libnacl-1.0.0[${PYTHON_USEDEP}]
+		>=dev-python/ioflo-1.1.7[${PYTHON_USEDEP}]
+		>=dev-python/raet-0.6.0[${PYTHON_USEDEP}]
+	)
+	zeromq? (
+		>=dev-python/pyzmq-2.2.0[${PYTHON_USEDEP}]
+		>=dev-python/pycrypto-2.6.1[${PYTHON_USEDEP}]
+	)
+	cherrypy? ( >=dev-python/cherrypy-3.2.2[${PYTHON_USEDEP}] )
+	mongodb? ( dev-python/pymongo[${PYTHON_USEDEP}] )
+	portage? ( sys-apps/portage[${PYTHON_USEDEP}] )
+	keyring? ( dev-python/keyring[${PYTHON_USEDEP}] )
+	mysql? ( dev-python/mysql-python[${PYTHON_USEDEP}] )
+	redis? ( dev-python/redis-py[${PYTHON_USEDEP}] )
+	selinux? ( sec-policy/selinux-salt )
+	timelib? ( dev-python/timelib[${PYTHON_USEDEP}] )
+	nova? ( >=dev-python/python-novaclient-2.17.0[${PYTHON_USEDEP}] )
+	neutron? ( >=dev-python/python-neutronclient-2.3.6[${PYTHON_USEDEP}] )
+	gnupg? ( dev-python/python-gnupg[${PYTHON_USEDEP}] )
+	profile? ( dev-python/yappi[${PYTHON_USEDEP}] )
+	vim-syntax? ( app-vim/salt-vim )"
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+	test? (
+		dev-python/psutil[${PYTHON_USEDEP}]
+		dev-python/pip[${PYTHON_USEDEP}]
+		dev-python/virtualenv[${PYTHON_USEDEP}]
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/timelib[${PYTHON_USEDEP}]
+		>=dev-python/boto-2.32.1[${PYTHON_USEDEP}]
+		!x86? ( dev-python/boto3[${PYTHON_USEDEP}] )
+		>=dev-python/moto-0.3.6[${PYTHON_USEDEP}]
+		>=dev-python/SaltTesting-2016.5.11[${PYTHON_USEDEP}]
+		>=dev-python/libcloud-0.14.0[${PYTHON_USEDEP}]
+		${RDEPEND}
+	)"
+
+DOCS=( README.rst AUTHORS )
+
+REQUIRED_USE="|| ( raet zeromq )"
+RESTRICT="x86? ( test )"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-2016.3.5-tmpdir.patch"
+	"${FILESDIR}/${PN}-2016.3.1-dont-realpath-tmpdir.patch"
+	"${FILESDIR}/${PN}-2016.3.4-test-nonexist-dirs.patch"
+	"${FILESDIR}/${PN}-2016.3.4-dont-test-ordering.patch"
+)
+
+python_prepare() {
+	# this test fails because it trys to "pip install distribute"
+	rm tests/unit/{modules,states}/zcbuildout_test.py \
+		tests/unit/modules/{rh_ip,win_network,random_org}_test.py || die
+
+	# apparently libcloud does not know about this?
+	rm tests/unit/cloud/clouds/dimensiondata_test.py || die
+
+	# seriously? "ValueError: Missing (or not readable) key file: '/home/dany/PRIVKEY.pem'"
+	rm tests/unit/cloud/clouds/gce_test.py || die
+
+	# needs network access
+	rm tests/unit/modules/boto_{vpc,elb,secgroup}_test.py || die
+	rm tests/unit/states/boto_vpc_test.py || die
+	rm tests/unit/transport/{zeromq,tcp,req}_test.py || die
+}
+
+python_install_all() {
+	local svc
+	USE_SETUPTOOLS=1 distutils-r1_python_install_all
+
+	for svc in minion master syndic api; do
+		newinitd "${FILESDIR}"/${svc}-initd-4 salt-${svc}
+		newconfd "${FILESDIR}"/${svc}-confd-1 salt-${svc}
+		systemd_dounit "${FILESDIR}"/salt-${svc}.service
+	done
+
+	insinto /etc/${PN}
+	doins -r conf/*
+}
+
+python_test() {
+	local tempdir
+	# testsuite likes lots of files
+	ulimit -n 3072 || die
+
+	# ${T} is too long a path for the tests to work
+	tempdir="$(mktemp -dup /tmp salt-XXX)"
+	mkdir "${T}/$(basename "${tempdir}")"
+
+	(
+		cleanup() { rm -f "${tempdir}"; }
+		trap cleanup EXIT
+
+		addwrite "${tempdir}"
+		ln -s "$(realpath --relative-to=/tmp "${T}/$(basename "${tempdir}")")" "${tempdir}"
+
+		USE_SETUPTOOLS=1 SHELL="/bin/bash" \
+			TMPDIR="${tempdir}" \
+			${EPYTHON} tests/runtests.py \
+			--unit-tests --no-report --verbose
+
+	) || die "testing failed"
+}
diff --git a/app-admin/salt/salt-2017.7.2.ebuild b/app-admin/salt/salt-2017.7.2.ebuild
new file mode 100644
index 000000000000..48c9f23243af
--- /dev/null
+++ b/app-admin/salt/salt-2017.7.2.ebuild
@@ -0,0 +1,140 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 )
+
+inherit eutils systemd distutils-r1
+
+DESCRIPTION="Salt is a remote execution and configuration manager"
+HOMEPAGE="http://saltstack.org/"
+
+if [[ ${PV} == 9999* ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="git://github.com/${PN}stack/${PN}.git"
+	EGIT_BRANCH="develop"
+	SRC_URI=""
+	KEYWORDS=""
+else
+	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+	KEYWORDS="~x86 ~amd64"
+fi
+
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE="cherrypy ldap libcloud libvirt gnupg keyring mako mongodb mysql neutron nova"
+IUSE+=" openssl portage profile redis selinux test timelib raet +zeromq vim-syntax"
+
+RDEPEND="sys-apps/pciutils
+	dev-python/jinja[${PYTHON_USEDEP}]
+	>=dev-python/msgpack-0.3[${PYTHON_USEDEP}]
+	dev-python/pyyaml[${PYTHON_USEDEP}]
+	dev-python/markupsafe[${PYTHON_USEDEP}]
+	>=dev-python/requests-1.0.0[${PYTHON_USEDEP}]
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	>=www-servers/tornado-4.2.1[${PYTHON_USEDEP}]
+	virtual/python-futures[${PYTHON_USEDEP}]
+	libcloud? ( >=dev-python/libcloud-0.14.0[${PYTHON_USEDEP}] )
+	mako? ( dev-python/mako[${PYTHON_USEDEP}] )
+	ldap? ( dev-python/python-ldap[${PYTHON_USEDEP}] )
+	libvirt? ( dev-python/libvirt-python[${PYTHON_USEDEP}] )
+	openssl? (
+		dev-libs/openssl:*[-bindist]
+		dev-python/pyopenssl[${PYTHON_USEDEP}]
+	)
+	raet? (
+		>=dev-python/libnacl-1.0.0[${PYTHON_USEDEP}]
+		>=dev-python/ioflo-1.1.7[${PYTHON_USEDEP}]
+		>=dev-python/raet-0.6.0[${PYTHON_USEDEP}]
+	)
+	zeromq? (
+		>=dev-python/pyzmq-2.2.0[${PYTHON_USEDEP}]
+		>=dev-python/pycrypto-2.6.1[${PYTHON_USEDEP}]
+	)
+	cherrypy? ( >=dev-python/cherrypy-3.2.2[${PYTHON_USEDEP}] )
+	mongodb? ( dev-python/pymongo[${PYTHON_USEDEP}] )
+	portage? ( sys-apps/portage[${PYTHON_USEDEP}] )
+	keyring? ( dev-python/keyring[${PYTHON_USEDEP}] )
+	mysql? ( dev-python/mysql-python[${PYTHON_USEDEP}] )
+	redis? ( dev-python/redis-py[${PYTHON_USEDEP}] )
+	selinux? ( sec-policy/selinux-salt )
+	timelib? ( dev-python/timelib[${PYTHON_USEDEP}] )
+	nova? ( >=dev-python/python-novaclient-2.17.0[${PYTHON_USEDEP}] )
+	neutron? ( >=dev-python/python-neutronclient-2.3.6[${PYTHON_USEDEP}] )
+	gnupg? ( dev-python/python-gnupg[${PYTHON_USEDEP}] )
+	profile? ( dev-python/yappi[${PYTHON_USEDEP}] )
+	vim-syntax? ( app-vim/salt-vim )"
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+	test? (
+		dev-python/pytest-salt[${PYTHON_USEDEP}]
+		dev-python/psutil[${PYTHON_USEDEP}]
+		dev-python/pytest[${PYTHON_USEDEP}]
+		dev-python/pip[${PYTHON_USEDEP}]
+		dev-python/virtualenv[${PYTHON_USEDEP}]
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/timelib[${PYTHON_USEDEP}]
+		>=dev-python/boto-2.32.1[${PYTHON_USEDEP}]
+		!x86? ( >=dev-python/boto3-1.2.1[${PYTHON_USEDEP}] )
+		>=dev-python/moto-0.3.6[${PYTHON_USEDEP}]
+		>=dev-python/SaltTesting-2016.5.11[${PYTHON_USEDEP}]
+		>=dev-python/libcloud-0.14.0[${PYTHON_USEDEP}]
+		${RDEPEND}
+	)"
+
+DOCS=( README.rst AUTHORS )
+
+REQUIRED_USE="|| ( raet zeromq )"
+RESTRICT="x86? ( test )"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-2017.7.0-dont-realpath-tmpdir.patch"
+)
+
+python_prepare() {
+	rm tests/unit/{test_zypp_plugins.py,utils/test_extend.py} || die
+	rm tests/unit/modules/test_boto_{vpc,secgroup,elb}.py || die
+	rm tests/unit/states/test_boto_vpc.py || die
+}
+
+python_install_all() {
+	local svc
+	USE_SETUPTOOLS=1 distutils-r1_python_install_all
+
+	for svc in minion master syndic api; do
+		newinitd "${FILESDIR}"/${svc}-initd-4 salt-${svc}
+		newconfd "${FILESDIR}"/${svc}-confd-1 salt-${svc}
+		systemd_dounit "${FILESDIR}"/salt-${svc}.service
+	done
+
+	insinto /etc/${PN}
+	doins -r conf/*
+}
+
+python_test() {
+	local tempdir
+	# testsuite likes lots of files
+	ulimit -n 3072 || die
+
+	# ${T} is too long a path for the tests to work
+	tempdir="$(mktemp -du --tmpdir=/tmp salt-XXX)"
+	mkdir "${T}/$(basename "${tempdir}")"
+	mkdir "${BUILD_DIR}"/../{templates,conf/cloud.{providers,profiles,maps}.d} || die
+
+	(
+		cleanup() {
+			rm -f "${tempdir}"
+			rmdir "${BUILD_DIR}"/../{templates,conf/cloud.{providers,profiles,maps}.d} || die
+		}
+
+		trap cleanup EXIT
+
+		addwrite "${tempdir}"
+		ln -s "$(realpath --relative-to=/tmp "${T}/$(basename "${tempdir}")")" "${tempdir}"
+
+		USE_SETUPTOOLS=1 SHELL="/bin/bash" \
+			TMPDIR="${tempdir}" \
+			${EPYTHON} tests/runtests.py \
+			--unit-tests --no-report --verbose
+
+	) || die "testing failed"
+}