gentoo resync : 25.04.2020

3 files changed, 8 insertions, 4 deletions

diff --git a/dev-python/pbr/Manifest b/dev-python/pbr/Manifest
index f162c805f7c6..8c2b0e94e8f2 100644
--- a/dev-python/pbr/Manifest
+++ b/dev-python/pbr/Manifest
@@ -2,9 +2,10 @@ DIST pbr-3.1.1.tar.gz 102665 BLAKE2B 301515d50f8550f5553a29faacb1daef589b41b8116
 DIST pbr-4.1.1.tar.gz 108683 BLAKE2B 5c0157ff14590113e7baae0bdca1ff46108a7a10d6eae8bd0a2d06bee62b4aa65eed25c900ae1b67324ac6b416641081c63a274c9694db1877b5d9073c1c04d9 SHA512 ed739901b3a2d1eafa1d4d408a39f1e5d967776571efe0913877145aaccee3114558e107a4e5704403288324c63a08cfbca07a3409bd1baafcbc33105abdf3e4
 DIST pbr-4.2.0.tar.gz 107958 BLAKE2B 716283ceb7b1a8da41e77441c7526bf8cbdb5be7c710013630d3bbddf7de0ce37f3abd063f6103f3ec27fc5c09796f6452d8117df3b533b3c7377bf6dce7d37f SHA512 d46d93333b4d0d3fd5c14e0a474ca7beceddf794a5dbcf66f810993b8d33b48602518072effcd429566f4eede2a38c4aec289df262c2c0e7ab4b82474e14f14d
 DIST pbr-5.1.1.tar.gz 113476 BLAKE2B 9e4857f13eba2e18abffa3d7c56f05eb5a5997b855f02770a807cec110e6eb4596b333b67beba2a507bb8cb55fcd3ed87a012b4a3a245b81d0a74737c010f157 SHA512 cd6f8bdc6db80841e948dbb278423556861aa681b970050a40c920dd00e32704a29cfdd28aabd4d14e0e577fff1bc816f0646a62c9450d0d85233ab5802606f1
+DIST pbr-wheel.patch 2781 BLAKE2B f36ac5bfe22e97dd93735581461f5ac79753543e0e03bcf569d95a3bfac70362c50af8bfc745e5d29ff07092e9669782ddaf3f8edd70501966c4d4682a5bfa33 SHA512 3c89eb9ea617da1d3e2eca3fadff6f5be9f55e4a258e1fbcdd221f3c0ec3cbfd13abe401bdfdb4b464baf74b8111e981f2dab4fb2839a4b52aee65212d1589f5
 EBUILD pbr-3.1.1.ebuild 2927 BLAKE2B eaffd31603285ff741a6d945150eb80676a04cce33fc0961dc02db01ccf6a3108d12c8afa75b03483cd1c81f003b1c3a5894d26bf892688721fe6261fef8f1c2 SHA512 4ec995f7ead626e759ce8064b3083ebed8cd44d0edf5533378f9f2f0dc9a84f6533f994d2243376c53bcc4f6490804462872c750b5aff13bc8a40d89032130cf
 EBUILD pbr-4.1.1.ebuild 2797 BLAKE2B 8d178fb9f0a69b22996ea2e40d5df70086ca35230a78656766ad72e7b83c55048fb9f2727868bf49b65473c6dd9c8adb848764b75a0137bd3b22963f62274bfe SHA512 545c0cf96bcfc74691eb804fb95ed6b266cd98ffbf97a15c8b5dc7f5da88f270cc7d8c4d12ab27a477488669c1abcabc08c2700dfe1fe9b1258213608390a268
 EBUILD pbr-4.2.0-r1.ebuild 2938 BLAKE2B f35461acfa86271528f8b5e69b18396bdd3684dd382271b75543a739453eec3e2f8ea9885810447a3b66051303dd4af8711298010a7c70eb9f82369c5e127f38 SHA512 1dff0573e0e793ac68aefb82cdb5680595ef50800706c2e7a6e76a11e9387d00f00ce20154c9705d6cd30f7e386a95fac93922e805b3d41a99caa4e3730e1fb8
-EBUILD pbr-4.2.0-r2.ebuild 2982 BLAKE2B 68c5ea6e9a21f8fbddabeaa3839b036d7c90a604fd1d83e5526c40bcf3059056b9aa9f5df22dadedb39e017fb86ebb926016318b50f7c79f0cb6676109617310 SHA512 b2218c7da2a74a675c0fc940b0f0709def8133fa80336aa30f229faff87de7ba0572d08c4c10578f369a9e2ce20106fb3476207065c419dc41b65d4b5ea9c9c4
-EBUILD pbr-5.1.1.ebuild 3137 BLAKE2B 893efd70bddabf34dbe21afbc0ef2dc9abd81bbc6ce63d74a56850e92be05a0bcaad6036c173149c13632d7dadb1a3f18cf28c44c8b81c1b79405a44b57dfd40 SHA512 c9aa6d6b3ca631c76ffc0657942aeb3b3f75ea52dfd189dab8828264883b0ff2bca648f6413e1be5cbf2f0bec63dc5f7dd58dbfcfcd79619507bdf926c27abce
+EBUILD pbr-4.2.0-r3.ebuild 3133 BLAKE2B 4c2757cacce58ed2466b58613934370998b4e9479d9a3a06e1326cb43e9b02d5171ea393b353c7a442b791d6c2259f7592dc129f3ddf3198f7896dad7dc5f5e3 SHA512 5e12308c218345aebfb66b6dbd8fde60617112a0194a743feeb8e437844de88893c1add6a6ab34ae86b291e679b14a931e9da59db274ab69d4ef02cbe2c6550a
+EBUILD pbr-5.1.1.ebuild 3136 BLAKE2B 76e39c40b2027f499c03f07058f3c6088c73c1cccaea5aa3b78bf5c7d53f3ef4961b5f279ae501635c9036978093217294de4c44070ed52f38cf8b237ee4f464 SHA512 a8bfab5dac222adbb433c282c8b2eb58abe6a153926611fd6d917f6b2d4107d511289ad37ed0ba4788ea44faff9e126d2b7549780dbd93a9f724bdcbc9f5ac71
 MISC metadata.xml 711 BLAKE2B c5572087c31ce124b9ffcfcfc1042f0e484dd68f9b4ada35e25a7eaf0b98bcd1380a5bf14c364c28919a06ca5126af9ad83ae0eee3dc97af3d690faecab6e335 SHA512 196cef8eed603fa985d71e456afa5ff39ddd0967485ce9d7d1b6721ba706dec099890a30618de88aa5b1e31a31dfbdc84cf357ff52595a08f4a7f395fffe2738
diff --git a/dev-python/pbr/pbr-4.2.0-r2.ebuild b/dev-python/pbr/pbr-4.2.0-r3.ebuild
index 50b10709d005..3b838aa43596 100644
--- a/dev-python/pbr/pbr-4.2.0-r2.ebuild
+++ b/dev-python/pbr/pbr-4.2.0-r3.ebuild
@@ -10,7 +10,8 @@ inherit distutils-r1
 
 DESCRIPTION="Inject some useful and sensible default behaviors into setuptools"
 HOMEPAGE="https://github.com/openstack-dev/pbr"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz
+	https://github.com/openstack/pbr/commit/f14a3b2b73c6c95edbea8de799cf1df07decdf0e.patch -> ${PN}-wheel.patch"
 
 LICENSE="Apache-2.0"
 SLOT="0"
@@ -46,6 +47,8 @@ DEPEND="
 	)"
 PDEPEND=""
 
+PATCHES=("${DISTDIR}/${PN}-wheel.patch")
+
 # This normally actually belongs here.
 python_prepare_all() {
 	# This test passes when run within the source and doesn't represent a failure, but rather
diff --git a/dev-python/pbr/pbr-5.1.1.ebuild b/dev-python/pbr/pbr-5.1.1.ebuild
index 4ca2cfcd1915..96ea19beccd8 100644
--- a/dev-python/pbr/pbr-5.1.1.ebuild
+++ b/dev-python/pbr/pbr-5.1.1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~hppa ~mips ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm64 ~hppa ~mips ~s390 sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux"
 #KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~x86 ~amd64-linux ~x86-linux"
 #KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux"
 IUSE="test"