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

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

commit:     beb983344cb81051e10b7ddea8bc3c1311975c3d
Author:     Matthew Thode <prometheanfire <AT> gentoo <DOT> org>
AuthorDate: Thu Oct 15 16:38:32 2015 +0000
Commit:     Matt Thode <prometheanfire <AT> gentoo <DOT> org>
CommitDate: Thu Oct 15 16:41:22 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=beb98334

sys-auth/keystone: liberty tag

Package-Manager: portage-2.2.20.1

 sys-auth/keystone/Manifest                                         | 1 +
 sys-auth/keystone/keystone-2015.2.9999.ebuild                      | 2 +-
 .../{keystone-2015.2.9999.ebuild => keystone-8.0.0.ebuild}         | 7 +++----
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/sys-auth/keystone/Manifest b/sys-auth/keystone/Manifest
index c675198..b80c651 100644
--- a/sys-auth/keystone/Manifest
+++ b/sys-auth/keystone/Manifest
@@ -1,2 +1,3 @@
 DIST keystone-2015.1.1.tar.gz 884979 SHA256 6c703f2d26c6a5f4fd4963dc11474b55cf87c5890d97361a4738df35eea258c5 SHA512 0c540f2a33729a539e68cb5d3e0b0b4ef0014829c274b0b92d982cd7d75110b14a3edc9db9c15794dd4c73f45a4982f47f99f75be6cbd8c91b0550ef24040848 WHIRLPOOL c20cc32d6043e9a2e9e5441a17e55431efabc3619156256c8fe8217bd876b07abb5860a48fc4bd761f505f022579d815a29b56d5c7a0536bafe89a2ad4b3b93a
 DIST keystone-2015.1.2.tar.gz 889207 SHA256 af63a89ca1cebfff593e35c24105c1442ab50f760871d756a48cfc120a7a8ddb SHA512 1592fb4e4d0b3ada08f2f12a25e9da08979e6c624239660b38b858115e1dc04a810857f07753ad855f51abf3b4cc43bae4a6f53cca33d10ab9e16ec4229bff42 WHIRLPOOL 285d9e91dcd8b3961596c0d1a7d093d32538e4fefb0e082fc496c79882c5f5d80a296ad415c443d0549a8412488d38820799db7ba03be98013d1340e0641a19e
+DIST keystone-8.0.0.tar.gz 1061052 SHA256 b2172b3c5eec6d4438138856562833dfb5cabd69e0aab35be015f2505cb2431d SHA512 2675cd056bac6a1e0eb59e3f93583942a9a5db20e40d317ea300ca687c1112b001210f2c0d454f967f4d61c1c5117bf96731dbd17a5f6ec81b07e5c1d0666b6c WHIRLPOOL 9c4e76438ca2eb35685754e3580aa6ba3d1a86a30f0f8a484bac6b741adc6e5f328db988146c752a2d1a0b25b02a5089d9f859f5373cbf5c43b9c859a198eb51

diff --git a/sys-auth/keystone/keystone-2015.2.9999.ebuild b/sys-auth/keystone/keystone-2015.2.9999.ebuild
index d9b5b06..9d9c7ab 100644
--- a/sys-auth/keystone/keystone-2015.2.9999.ebuild
+++ b/sys-auth/keystone/keystone-2015.2.9999.ebuild
@@ -117,7 +117,7 @@ pkg_setup() {
 
 python_prepare_all() {
 	# it's in git, but not in the tarball.....
-	sed -i '/^hacking/d' test-requirements.txt test-requirements-py3.txt || die
+	sed -i '/^hacking/d' test-requirements.txt || die
 	mkdir -p ${PN}/tests/tmp/ || die
 	cp etc/keystone-paste.ini ${PN}/tests/tmp/ || die
 	distutils-r1_python_prepare_all

diff --git a/sys-auth/keystone/keystone-2015.2.9999.ebuild b/sys-auth/keystone/keystone-8.0.0.ebuild
similarity index 96%
copy from sys-auth/keystone/keystone-2015.2.9999.ebuild
copy to sys-auth/keystone/keystone-8.0.0.ebuild
index d9b5b06..a3f38b1 100644
--- a/sys-auth/keystone/keystone-2015.2.9999.ebuild
+++ b/sys-auth/keystone/keystone-8.0.0.ebuild
@@ -6,12 +6,11 @@ EAPI=5
 
 PYTHON_COMPAT=( python2_7 python3_4 )
 
-inherit distutils-r1 git-2 user
+inherit distutils-r1 user
 
 DESCRIPTION="The Openstack authentication, authorization, and service catalog"
 HOMEPAGE="https://launchpad.net/keystone"
-EGIT_REPO_URI="https://github.com/openstack/keystone.git"
-EGIT_BRANCH="stable/liberty"
+SRC_URI="https://launchpad.net/${PN}/liberty/${PV}/+download/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
@@ -117,7 +116,7 @@ pkg_setup() {
 
 python_prepare_all() {
 	# it's in git, but not in the tarball.....
-	sed -i '/^hacking/d' test-requirements.txt test-requirements-py3.txt || die
+	sed -i '/^hacking/d' test-requirements.txt || die
 	mkdir -p ${PN}/tests/tmp/ || die
 	cp etc/keystone-paste.ini ${PN}/tests/tmp/ || die
 	distutils-r1_python_prepare_all