gentoo resync : 28.04.2019

4 files changed, 14 insertions, 8 deletions

diff --git a/app-emulation/ganeti/Manifest b/app-emulation/ganeti/Manifest
index 805e05703320..df3487edf8fc 100644
--- a/app-emulation/ganeti/Manifest
+++ b/app-emulation/ganeti/Manifest
@@ -39,7 +39,7 @@ DIST ganeti_2.16.0~rc1-1.debian.tar.xz 41892 BLAKE2B 3220b9a071259cee3a86771b6f4
 EBUILD ganeti-2.15.2-r5.ebuild 9757 BLAKE2B caaa94ddb315b7b4ea5f93ce6015521c3e70d835f6aa339ead3a9f1c1da3645e0d603cb6dfa94339822c63bc85c095a88e630c34ba08df2bb6361dba95127c83 SHA512 ae8d599d9338b10e7fdfb22ae8a0c89a76380fee6a03692508294144953e5acc18ba76a9052824e22c09fc00f76a357aca5b0bb4afe5b0bfc25e971fef5f0499
 EBUILD ganeti-2.15.2-r6.ebuild 10209 BLAKE2B 17fe1545ce1866c40f188ec54b86f2cf709cdf6637a4227eaa633ddd00a565cf6b87ee99a152af1e426ce2b1fe4ce2cd765028dc108bb27ddc1e565ab5b14cdf SHA512 446cd91e65c576cb827f2b66f01d7cec1cd9ff57022d664fb2bfbb8b93cb4e02a9d57aacd4ddc2c4d691c3d7b730d751ec3d4c54e26ec2d07869f309f7d931ad
 EBUILD ganeti-2.15.2-r7.ebuild 11657 BLAKE2B c7961e5bf8ea1906e9dff5598f1bbaac496cd8b64d4ebb3f999f75a5d59f60bb6bf597958ddf6579129b1fbba65026cdf9d204fe81c49ef03022ca66f1cf7a1b SHA512 df09969e05a989261487f95af64962f5393714a9ebf33fe3df300e3ca35ee709d2bade6f58c409c8aca1aa158932f1f84881e7131ba5f167b9adccbdfda989aa
-EBUILD ganeti-2.15.2-r8.ebuild 12090 BLAKE2B 89fb227d99927247747a5a2fa95606a7df4a1a81f04c75aa1e94622de076b1e5b8f3f105552bd69b2967dd64c4fecb25353b53445fbf5fb7e6b69709c94add58 SHA512 15e40b4713b3cd55617f668b090eb891d094954c5cc41deb94fb46df94826c738564cdf6c4008a6a6bf2f76d47645aca07224ffd0f71819cf385ec873fe28895
-EBUILD ganeti-2.16.0_rc1.ebuild 10455 BLAKE2B 27e2d97c7e53ec58790b84596ac9915735c049bd196caf75e85a719f2bd7779a5bb4e51c2f5595c724ff11bc46c13072949813cd01d3897d8a4f63be49f2d853 SHA512 1dfd0c29731e02a453e79c72c112e85ad0f95ff51d486dc28bd9685640b6459a0dade98dff3ca2305790134f87973fbecf11e56edba41712974b3f6aa7b3e3a1
-EBUILD ganeti-2.17.0_beta1.ebuild 10482 BLAKE2B c1e4aa4ee3ec0bf191f29d8b63537ec96a8f411517bd274b3872c5a9fc394bc8944cde3fcb0670f678be1c2382860a21adb5f9d76265288b6d7b427317109a39 SHA512 22111278c2ec0491876eaafc45dc3ff401b93298c5caf1f1fe039094cffbbb6e3c74092c04569cdb1c748edbe69111257f2ef965181473394e4fd7148218191b
+EBUILD ganeti-2.15.2-r8.ebuild 12089 BLAKE2B 1d53ade7cb9f0d6a2c978bbb51a748267c2f3b326adc1af13cd8508dc7e034c5addb8c3acdf654e91fc0dba4d066cd157b51e69f9008a579479363fb8400d39f SHA512 f4bebbc46c0a4bd112af927201c59bf16a1796e33037fe9ed71451caa6ad349bcc3004e761f515799a3ca2bee8a832dcebca97da135d25e091289a00f8e21d35
+EBUILD ganeti-2.16.0_rc1.ebuild 10489 BLAKE2B d048e2ad9a3be59a865f763553c40d15d3c389dc501751769e8d4b320b638c0ef1db9e5a25c034d3f4ca391695bd32e9ed7630bc6aa83a16ec96eef416d7db73 SHA512 d5dc99300beaea18735a8d7987e059603eacd19a57707949f64ca0802edeb99602b5cda6a2570ae21077f39b9ef773ad278b2fd4fdd5b6c9f73db8a485084a30
+EBUILD ganeti-2.17.0_beta1.ebuild 10516 BLAKE2B b7439ef3b177ea60e2d3ebcf517480b582aedb484e895091fab1c9d684e80c6e56dd9050382f377a72b3df6477d1bca66388573fdd534f01d906fbd24806932b SHA512 fbca06fe26098d69c144754b1a81ba5c72631456e8d2033a3fd5b5c33b7a5a0c7d347114e995f6f2a86b20c2747257572b5e1e4b97b7c080dd5cf8cd6cc14052
 MISC metadata.xml 1961 BLAKE2B 1c7cc03a3dd655f75b8f9249c3b0b70a738af06a9a0529afb7c73abf6344b112e5daf610f6f6780acf0c3b14e916590c20c6f8837bb333e7da0cad6df7ba8520 SHA512 547dcaaf4392b13c5629e5555d17ba2d4e504b6ce0e043fdf440fce3d857477009aeab0af52cb92cc494ecb3e6e1a7e026fabbe6e24b9323fe47c2fc15175896
diff --git a/app-emulation/ganeti/ganeti-2.15.2-r8.ebuild b/app-emulation/ganeti/ganeti-2.15.2-r8.ebuild
index 0d2eaac25e1b..579f39cb3711 100644
--- a/app-emulation/ganeti/ganeti-2.15.2-r8.ebuild
+++ b/app-emulation/ganeti/ganeti-2.15.2-r8.ebuild
@@ -17,7 +17,7 @@ SRC_URI="
 	http://downloads.ganeti.org/releases/${SERIES}/${MY_P}.tar.gz
 	mirror://debian/pool/main/g/ganeti-${SERIES}/ganeti-${SERIES}_${PV}-${DEBIAN_PATCH}.debian.tar.xz
 "
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 PATCHES=(
 	"${FILESDIR}"/ganeti-2.15-use-balloon-device.patch
 	"${WORKDIR}"/debian/patches/do-not-backup-export-dir.patch
diff --git a/app-emulation/ganeti/ganeti-2.16.0_rc1.ebuild b/app-emulation/ganeti/ganeti-2.16.0_rc1.ebuild
index e1a45367e939..7902fba92c36 100644
--- a/app-emulation/ganeti/ganeti-2.16.0_rc1.ebuild
+++ b/app-emulation/ganeti/ganeti-2.16.0_rc1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -62,7 +62,10 @@ DEPEND="
 	dev-python/bitarray[${PYTHON_USEDEP}]
 	dev-python/docutils[${PYTHON_USEDEP}]
 	dev-python/fdsend[${PYTHON_USEDEP}]
-	net-analyzer/arping
+	|| (
+		net-misc/iputils[arping]
+		net-analyzer/arping
+	)
 	net-analyzer/fping
 	net-misc/bridge-utils
 	net-misc/curl[ssl]
diff --git a/app-emulation/ganeti/ganeti-2.17.0_beta1.ebuild b/app-emulation/ganeti/ganeti-2.17.0_beta1.ebuild
index 8e3045974703..053c5aff28a1 100644
--- a/app-emulation/ganeti/ganeti-2.17.0_beta1.ebuild
+++ b/app-emulation/ganeti/ganeti-2.17.0_beta1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -62,7 +62,10 @@ DEPEND="
 	dev-python/bitarray[${PYTHON_USEDEP}]
 	dev-python/docutils[${PYTHON_USEDEP}]
 	dev-python/fdsend[${PYTHON_USEDEP}]
-	net-analyzer/arping
+	|| (
+		net-misc/iputils[arping]
+		net-analyzer/arping
+	)
 	net-analyzer/fping
 	net-misc/bridge-utils
 	net-misc/curl[ssl]