gentoo resync : 10.03.2018

5 files changed, 14 insertions, 6 deletions

diff --git a/sys-auth/keystone/Manifest b/sys-auth/keystone/Manifest
index 311858b72d53..29229cbff5a4 100644
--- a/sys-auth/keystone/Manifest
+++ b/sys-auth/keystone/Manifest
@@ -1,7 +1,7 @@
 DIST keystone-12.0.0.tar.gz 1491044 BLAKE2B ebe5fd423509e94d636e303825ac499cf9017a616971654ee52dead111b0fdc76379cf24554c7dd115b1d1a65b081e6931bd890613736f6bffe75e8628f94f7a SHA512 7b7e6cb56b9d22e92834ccfb31dcd6d28d7318e2d8160da93cbc48cdb72aa626021db5b38068ca76caae88e68204c3650f7ce728bc8e1791df8fc8d36072483c
 DIST keystone-13.0.0.tar.gz 1462543 BLAKE2B f34da8cd1af58e8de589c0eb5f3f1f6519f4fcadc6152289c9d1196e6fc9fc3ac607af9686884d3a8072514ed8e6c275a2147c5a4d38c3a93660c1b499544539 SHA512 97e6eba83e47480e3f756f8a726012835c5fcb33534d8cc7eb31343a29e4c23ddf20be10adafb257850c8d846fbf2f674dc5f44a09fd901f95ef5b342c066097
-EBUILD keystone-12.0.0.ebuild 6199 BLAKE2B 59f0e4674e3239cd3f5b83f883504f3c16044807cf049452fbdf8eb95ba0f89ee26c574c8dc924b58b9cc2a8490f215a55693f8b54735d1302cb49e7e5bef114 SHA512 9cd8d4a2255a94d4c3278077eecd3efdc747d3477d3f77b6a645746810aeede13600358dace03692a33704df766fa550daea654950b59865669b44e67c489ed3
-EBUILD keystone-13.0.0.ebuild 6104 BLAKE2B 728f53cde68c7ccf0160fdbb7f87e556f94c4174f3e0b2d00a5f84e004b0fe641ec659253b7a72ebc11cb632adcd96755dfaa2dc6ff020acb73da28579b54c9d SHA512 a9697fb20ba0d2f7fe7e255df865f0caee649aac4eba70bb9e1cb63b2f22140271aacef02024d662bf67b4138a583a93b345dd3ae81a3143c3ac15e15a7b7059
-EBUILD keystone-2017.2.9999.ebuild 6215 BLAKE2B 2d83dc144c4efcda8a7e0fa8f97e92e46749f04c54fa43acca2ae7eb36bee1a5d90729625f593c977be7d428a65723dbcbe6432d88e3df7359df863c47393dd2 SHA512 9d7b9a175f1f4ba214ecea842f8e0694584023f151596de5b771f59a673cbde3835dee5dd71e947a2a64deeb44cc90e0c348ad7a8927c920767891f7271b1357
-EBUILD keystone-2018.1.9999.ebuild 6104 BLAKE2B 728f53cde68c7ccf0160fdbb7f87e556f94c4174f3e0b2d00a5f84e004b0fe641ec659253b7a72ebc11cb632adcd96755dfaa2dc6ff020acb73da28579b54c9d SHA512 a9697fb20ba0d2f7fe7e255df865f0caee649aac4eba70bb9e1cb63b2f22140271aacef02024d662bf67b4138a583a93b345dd3ae81a3143c3ac15e15a7b7059
+EBUILD keystone-12.0.0-r1.ebuild 6280 BLAKE2B ffb752f981b0e72674cd6dac474a9f475123994cc2eba0ea24eed4d01acccdba9f9ec009c38a42e8e4084e0e6a95e03d794ef4b6be0328e3c87e8e0a17f4f5fa SHA512 32b5582c8e4bb24c3799b3716ac9cc62a254ed694e10e2c72ff275b69535639c442f66baa5eecd81fdca0d8007e1c4e2154eeaa00f07c3f169a7b698aec49230
+EBUILD keystone-13.0.0-r1.ebuild 6185 BLAKE2B 129b3c7c066f6d5232b487191f56bdcfac9133723bfbac50a1e9ee29c235876901216610759ba72e8a978bc8b1464dacd31c126b2f52c5da2a4eea3fc7e62b59 SHA512 dd98d065f981ad6359c8933d5c57e7730742ebce52114e5f9ae5ab7a8477a069cc5e45b52df2930a090fa5ae9d59fb913c96730a054217e8053b3fda49fcbb6b
+EBUILD keystone-2017.2.9999.ebuild 6296 BLAKE2B 6f5da1373e1880a9b36f6b0c57130e7643ebff3b8478bc719be3e70070e0c837475f9957486a482f5c3cf49fc9e6490e999937c65a4cb42a533b531d37ac9aa2 SHA512 d5ad51ab2244e2a83f1ef32bad8491e74705f3f73f7371b781e410cd5c463013e3563e45c00aa50a926dd1d4b6f37b161bf6c81baed02c14bab86761d6a50de2
+EBUILD keystone-2018.1.9999.ebuild 6185 BLAKE2B 129b3c7c066f6d5232b487191f56bdcfac9133723bfbac50a1e9ee29c235876901216610759ba72e8a978bc8b1464dacd31c126b2f52c5da2a4eea3fc7e62b59 SHA512 dd98d065f981ad6359c8933d5c57e7730742ebce52114e5f9ae5ab7a8477a069cc5e45b52df2930a090fa5ae9d59fb913c96730a054217e8053b3fda49fcbb6b
 MISC metadata.xml 807 BLAKE2B 2e674e33b20a046cbe09e98474f3fc36dadac01f7438acbdc4bb8729b16cf8ca9bc8717b000b798d8d5501cdc14dd4365a5fa2f3e0326e160b74d7a0f8bcdbf7 SHA512 3738ac4fde08eb90daea5aeb9731cf6e303b3ad6838f07732e707d5597ee2d96ac6530f691b6ac8c0f347946b75695be98a19e224496d137bf1968bccfe156ad
diff --git a/sys-auth/keystone/keystone-12.0.0.ebuild b/sys-auth/keystone/keystone-12.0.0-r1.ebuild
index 72e231190002..487e85aea0ff 100644
--- a/sys-auth/keystone/keystone-12.0.0.ebuild
+++ b/sys-auth/keystone/keystone-12.0.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -125,6 +125,8 @@ python_prepare_all() {
 	cp etc/keystone-paste.ini ${PN}/tests/tmp/ || die
 	sed -i 's|/usr/local|/usr|g' httpd/keystone-uwsgi-* || die
 	sed -i 's|python|python27|g' httpd/keystone-uwsgi-* || die
+	# allow useage of renamed msgpack
+	sed -i '/^msgpack/d' requirements.txt || die
 	distutils-r1_python_prepare_all
 }
 
diff --git a/sys-auth/keystone/keystone-13.0.0.ebuild b/sys-auth/keystone/keystone-13.0.0-r1.ebuild
index 8640cea7f1be..a2157ff67e8c 100644
--- a/sys-auth/keystone/keystone-13.0.0.ebuild
+++ b/sys-auth/keystone/keystone-13.0.0-r1.ebuild
@@ -126,6 +126,8 @@ python_prepare_all() {
 	cp etc/keystone-paste.ini ${PN}/tests/tmp/ || die
 	sed -i 's|/usr/local|/usr|g' httpd/keystone-uwsgi-* || die
 	sed -i 's|python|python27|g' httpd/keystone-uwsgi-* || die
+	# allow useage of renamed msgpack
+	sed -i '/^msgpack/d' requirements.txt || die
 	distutils-r1_python_prepare_all
 }
 
diff --git a/sys-auth/keystone/keystone-2017.2.9999.ebuild b/sys-auth/keystone/keystone-2017.2.9999.ebuild
index e9bfc0ef7fc0..516762dcc896 100644
--- a/sys-auth/keystone/keystone-2017.2.9999.ebuild
+++ b/sys-auth/keystone/keystone-2017.2.9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -126,6 +126,8 @@ python_prepare_all() {
 	cp etc/keystone-paste.ini ${PN}/tests/tmp/ || die
 	sed -i 's|/usr/local|/usr|g' httpd/keystone-uwsgi-* || die
 	sed -i 's|python|python27|g' httpd/keystone-uwsgi-* || die
+	# allow useage of renamed msgpack
+	sed -i '/^msgpack/d' requirements.txt || die
 	distutils-r1_python_prepare_all
 }
 
diff --git a/sys-auth/keystone/keystone-2018.1.9999.ebuild b/sys-auth/keystone/keystone-2018.1.9999.ebuild
index 8640cea7f1be..a2157ff67e8c 100644
--- a/sys-auth/keystone/keystone-2018.1.9999.ebuild
+++ b/sys-auth/keystone/keystone-2018.1.9999.ebuild
@@ -126,6 +126,8 @@ python_prepare_all() {
 	cp etc/keystone-paste.ini ${PN}/tests/tmp/ || die
 	sed -i 's|/usr/local|/usr|g' httpd/keystone-uwsgi-* || die
 	sed -i 's|python|python27|g' httpd/keystone-uwsgi-* || die
+	# allow useage of renamed msgpack
+	sed -i '/^msgpack/d' requirements.txt || die
 	distutils-r1_python_prepare_all
 }