sys-auth/keystone: add 21.0.0.0_rc1, drop 20.0.0.0_rc1

Signed-off-by: Alessandro Barbieri <lssndrbarbieri@gmail.com>

3 files changed, 84 insertions, 37 deletions

diff --git a/sys-auth/keystone/Manifest b/sys-auth/keystone/Manifest
index 3ab51e8c4..aed973eb6 100644
--- a/sys-auth/keystone/Manifest
+++ b/sys-auth/keystone/Manifest
@@ -1,2 +1 @@
-DIST keystone-20.0.0.0rc1.tar.gz 1729520 BLAKE2B 69d870dacf786a8e7ef8474027e83e15950432d232f221715f850ae731dcc6d6620684c6118d95333d674de1a7e2790919ffc1f09e553e25b2eedb999c5c38d3 SHA512 9ff450d80270f9fe037f0e21f8322de10a0f80c51b59226b8c62f3dc8b07e5af49c63aa33c6682203e295c1eb54842332a02c9ad7b4e9dd64653d1ee4536944e
-DIST keystone.conf.sample-20.0.0.0_rc1 107458 BLAKE2B c1d826acdd671638fc4542864811bda8baa237cfbf24438fa0cedc12e6f29047178cfb1b837c0aef035410848ce3e473e58b51f0eadee4c61eb75f214c65c35a SHA512 6488a1c3eac0d1376db0950cda65c62ba04dc03d896a6c0465ea09b870e5d077ed5012a84657defb9f63db25ce320c884f72c4083e4a233f18930120194ba73b
+DIST keystone-21.0.0.0rc1.tar.gz 1698152 BLAKE2B 703fb7b56a12cc3909a8990a2c21df2fca056f5eda43bd562ff8dcaeb06aa61db60b6d2ba6010d5c987f74f8d529eb66f086e648cbef25f96867e6c6b2644b29 SHA512 290e7ce13de1d7a232ef41166d51585460f6be745daf5477b8d83a8537f09eaecb82d6fabf554be777108b4a281ffb2e65457fe815a0405355a9e19c6f31f442
diff --git a/sys-auth/keystone/files/keystone-21.0.0.0_rc1-no-usr-local-bin.patch b/sys-auth/keystone/files/keystone-21.0.0.0_rc1-no-usr-local-bin.patch
new file mode 100644
index 000000000..cef46b2d3
--- /dev/null
+++ b/sys-auth/keystone/files/keystone-21.0.0.0_rc1-no-usr-local-bin.patch
@@ -0,0 +1,47 @@
+--- a/httpd/keystone-uwsgi-admin.ini
++++ b/httpd/keystone-uwsgi-admin.ini
+@@ -1,5 +1,5 @@
+ [uwsgi]
+-wsgi-file = /usr/local/bin/keystone-wsgi-admin
++wsgi-file = /usr/bin/keystone-wsgi-admin
+ 
+ # Versions of mod_proxy_uwsgi>=2.0.6 should use a UNIX socket, see
+ # http://uwsgi-docs.readthedocs.org/en/latest/Apache.html#mod-proxy-uwsgi
+--- a/httpd/keystone-uwsgi-public.ini
++++ b/httpd/keystone-uwsgi-public.ini
+@@ -1,5 +1,5 @@
+ [uwsgi]
+-wsgi-file = /usr/local/bin/keystone-wsgi-public
++wsgi-file = /usr/bin/keystone-wsgi-public
+ 
+ # Versions of mod_proxy_uwsgi>=2.0.6 should use a UNIX socket, see
+ # http://uwsgi-docs.readthedocs.org/en/latest/Apache.html#mod-proxy-uwsgi
+--- a/httpd/wsgi-keystone.conf
++++ b/httpd/wsgi-keystone.conf
+@@ -3,7 +3,7 @@
+ <VirtualHost *:5000>
+     WSGIDaemonProcess keystone-public processes=5 threads=1 user=keystone group=keystone display-name=%{GROUP}
+     WSGIProcessGroup keystone-public
+-    WSGIScriptAlias / /usr/local/bin/keystone-wsgi-public
++    WSGIScriptAlias / /usr/bin/keystone-wsgi-public
+     WSGIApplicationGroup %{GLOBAL}
+     WSGIPassAuthorization On
+     LimitRequestBody 114688
+@@ -13,7 +13,7 @@
+     ErrorLog /var/log/apache2/keystone.log
+     CustomLog /var/log/apache2/keystone_access.log combined
+ 
+-    <Directory /usr/local/bin>
++    <Directory /usr/bin>
+         <IfVersion >= 2.4>
+             Require all granted
+         </IfVersion>
+@@ -24,7 +24,7 @@
+     </Directory>
+ </VirtualHost>
+ 
+-Alias /identity /usr/local/bin/keystone-wsgi-public
++Alias /identity /usr/bin/keystone-wsgi-public
+ <Location /identity>
+     SetHandler wsgi-script
+     Options +ExecCGI
diff --git a/sys-auth/keystone/keystone-20.0.0.0_rc1.ebuild b/sys-auth/keystone/keystone-21.0.0.0_rc1.ebuild
index 878d5f905..715dc5765 100644
--- a/sys-auth/keystone/keystone-20.0.0.0_rc1.ebuild
+++ b/sys-auth/keystone/keystone-21.0.0.0_rc1.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
 
 MYP="${P/_/}"
-PYTHON_COMPAT=( python3_8 )
+PYTHON_COMPAT=( python3_{8..9} )
 
 inherit distutils-r1
 
@@ -12,12 +12,9 @@ DESCRIPTION="The Openstack authentication, authorization, and service catalog"
 HOMEPAGE="
 	https://opendev.org/openstack/keystone
 	https://launchpad.net/keystone
-	https://pypi.org/project/keystone
-"
-SRC_URI="
-	https://dev.gentoo.org/~prometheanfire/dist/openstack/keystone/victoria/keystone.conf.sample -> keystone.conf.sample-${PV}
-	https://tarballs.openstack.org/${PN}/${MYP}.tar.gz
+	https://pypi.org/project/keystone/
 "
+SRC_URI="https://tarballs.openstack.org/${PN}/${MYP}.tar.gz"
 S="${WORKDIR}/${MYP}"
 
 KEYWORDS="~amd64"
@@ -26,21 +23,11 @@ SLOT="0"
 IUSE="+sqlite ldap memcached mongo mysql postgres"
 
 RDEPEND="
+	>=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
 	>=dev-python/webob-1.7.1[${PYTHON_USEDEP}]
 	>=dev-python/flask-1.0.2[${PYTHON_USEDEP}]
 	>=dev-python/flask-restful-0.3.5[${PYTHON_USEDEP}]
 	>=dev-python/cryptography-2.7[${PYTHON_USEDEP}]
-	sqlite? (
-		>=dev-python/sqlalchemy-1.3.0[sqlite,${PYTHON_USEDEP}]
-	)
-	mysql? (
-		>=dev-python/pymysql-0.7.6[${PYTHON_USEDEP}]
-		>=dev-python/sqlalchemy-1.3.0[${PYTHON_USEDEP}]
-	)
-	postgres? (
-		>=dev-python/psycopg-2.5.0[${PYTHON_USEDEP}]
-		>=dev-python/sqlalchemy-1.3.0[${PYTHON_USEDEP}]
-	)
 	>=dev-python/sqlalchemy-migrate-0.13.0[${PYTHON_USEDEP}]
 	>=dev-python/stevedore-1.20.0[${PYTHON_USEDEP}]
 	>=dev-python/passlib-1.7.0[${PYTHON_USEDEP}]
@@ -69,16 +56,29 @@ RDEPEND="
 	>=dev-python/msgpack-0.5.0[${PYTHON_USEDEP}]
 	>=dev-python/osprofiler-1.4.0[${PYTHON_USEDEP}]
 	>=dev-python/pytz-2013.6[${PYTHON_USEDEP}]
+
+	ldap? (
+		>=dev-python/python-ldap-3.1.0[${PYTHON_USEDEP}]
+		>=dev-python/ldappool-2.3.1[${PYTHON_USEDEP}]
+	)
+	mysql? (
+		>=dev-python/pymysql-0.7.6[${PYTHON_USEDEP}]
+		>=dev-python/sqlalchemy-1.3.0[${PYTHON_USEDEP}]
+	)
 	memcached? (
 		>=dev-python/python-memcached-1.56[${PYTHON_USEDEP}]
 	)
 	mongo? (
 		>=dev-python/pymongo-3.0.2[${PYTHON_USEDEP}]
 	)
-	ldap? (
-		>=dev-python/python-ldap-3.1.0[${PYTHON_USEDEP}]
-		>=dev-python/ldappool-2.3.1[${PYTHON_USEDEP}]
+	postgres? (
+		>=dev-python/psycopg-2.5.0[${PYTHON_USEDEP}]
+		>=dev-python/sqlalchemy-1.3.0[${PYTHON_USEDEP}]
 	)
+	sqlite? (
+		>=dev-python/sqlalchemy-1.3.0[sqlite,${PYTHON_USEDEP}]
+	)
+
 	|| (
 		www-servers/uwsgi[python,${PYTHON_USEDEP}]
 		www-apache/mod_wsgi[${PYTHON_USEDEP}]
@@ -87,9 +87,8 @@ RDEPEND="
 	acct-user/keystone
 	acct-group/keystone
 "
-DEPEND="
-	${RDEPEND}
-	>=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
+DEPEND="${RDEPEND}"
+BDEPEND="
 	test? (
 		>=dev-python/bashate-0.5.1[${PYTHON_USEDEP}]
 		>=dev-python/freezegun-0.3.6[${PYTHON_USEDEP}]
@@ -105,6 +104,7 @@ DEPEND="
 	)
 "
 
+PATCHES=( "${FILESDIR}/${P}-no-usr-local-bin.patch" )
 REQUIRED_USE="
 	|| ( mysql postgres sqlite )
 	test? ( ldap )
@@ -113,32 +113,33 @@ REQUIRED_USE="
 distutils_enable_tests pytest
 
 python_prepare_all() {
-	# it's in git, but not in the tarball.....
 	sed -i '/^hacking/d' test-requirements.txt || die
-	mkdir -p ${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
+	# allow usage of renamed msgpack
 	sed -i '/^msgpack/d' requirements.txt || die
 	distutils-r1_python_prepare_all
 }
 
+python_compile_all() {
+	oslo-config-generator --config-file=config-generator/keystone.conf || die
+	oslopolicy-sample-generator --config-file config-generator/keystone-policy-generator.conf || die
+}
+
 python_install_all() {
 	distutils-r1_python_install_all
 
 	diropts -m 0750
 	keepdir /etc/keystone /var/log/keystone
 	insinto /etc/keystone
-	insopts -m0640 -okeystone -gkeystone
-	newins "${DISTDIR}/keystone.conf.sample-${PV}" keystone.conf.sample
+	insopts -m 0640 -o keystone -g keystone
+	doins etc/nova/keystone.conf.sample
+	doins etc/nova/policy.yaml.sample
 	doins etc/logging.conf.sample
 	doins etc/default_catalog.templates
-#	doins etc/policy.v3cloudsample.json
 	insinto /etc/keystone/httpd
 	doins httpd/*
 
 	fowners keystone:keystone /etc/keystone /etc/keystone/httpd /var/log/keystone
-	# stupid python doing stupid things
+
 	rm -r "${ED}/usr/etc" || die
 }
 
@@ -153,10 +154,10 @@ pkg_postinst() {
 }
 
 pkg_config() {
-	if [ ! -d "${ROOT}"/etc/keystone/ssl ] ; then
+	if [ ! -d "${ROOT}/etc/keystone/ssl" ] ; then
 		einfo "Press ENTER to configure the keystone PKI, or Control-C to abort now..."
 		read
-		"${ROOT}"/usr/bin/keystone-manage pki_setup --keystone-user keystone --keystone-group keystone
+		"${ROOT}/usr/bin/keystone-manage" pki_setup --keystone-user keystone --keystone-group keystone
 	else
 		einfo "keystone PKI certificates directory already present, skipping configuration"
 	fi