[gentoo-commits] repo/gentoo:master commit in: sys-auth/keystone/

["Matt Thode" <prometheanfire@gentoo.org>]

commit:     8b6b57146f606171b55b3540c6de22bbeb27ba8f
Author:     Matthew Thode <prometheanfire <AT> gentoo <DOT> org>
AuthorDate: Fri Mar  9 17:56:54 2018 +0000
Commit:     Matt Thode <prometheanfire <AT> gentoo <DOT> org>
CommitDate: Fri Mar  9 17:58:55 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8b6b5714

sys-auth/keystone: allow usage of renamed msgpack

Package-Manager: Portage-2.3.19, Repoman-2.3.6
RepoMan-Options: --force

 .../keystone/{keystone-12.0.0.ebuild => keystone-12.0.0-r1.ebuild}    | 4 +++-
 .../keystone/{keystone-13.0.0.ebuild => keystone-13.0.0-r1.ebuild}    | 2 ++
 sys-auth/keystone/keystone-2017.2.9999.ebuild                         | 4 +++-
 sys-auth/keystone/keystone-2018.1.9999.ebuild                         | 2 ++
 4 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/sys-auth/keystone/keystone-12.0.0.ebuild b/sys-auth/keystone/keystone-12.0.0-r1.ebuild
similarity index 98%
rename from sys-auth/keystone/keystone-12.0.0.ebuild
rename to sys-auth/keystone/keystone-12.0.0-r1.ebuild
index 72e23119000..487e85aea0f 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
similarity index 98%
rename from sys-auth/keystone/keystone-13.0.0.ebuild
rename to sys-auth/keystone/keystone-13.0.0-r1.ebuild
index 8640cea7f1b..a2157ff67e8 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 e9bfc0ef7fc..516762dcc89 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 8640cea7f1b..a2157ff67e8 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
 }