sys-auth/keystone: allow usage of renamed msgpack

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

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 72e231190002d547c4c434c537b755c5e78d9187..487e85aea0ff941254e459055c9f1cbfe72c47a2 100644 (file)
--- 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 8640cea7f1be2b476bdca5e4f4694371a758b6eb..a2157ff67e8cafcf8843b3633d76f3784772478a 100644 (file)
--- 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 e9bfc0ef7fc0bf57fd7ef44b01c41c2187f185de..516762dcc8961bd8d82a19b0c29889c3ca76328f 100644 (file)
--- 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 8640cea7f1be2b476bdca5e4f4694371a758b6eb..a2157ff67e8cafcf8843b3633d76f3784772478a 100644 (file)
--- 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
 }