From d56d3fb8d2684f055d2ebe3a19c02ba21702f1ef Mon Sep 17 00:00:00 2001
From: Alessandro Barbieri <lssndrbarbieri@gmail.com>
Date: Tue, 28 Sep 2021 17:44:55 +0200
Subject: [PATCH] dev-python/oslo-service: add 2.6.0, drop 2.4.0

Signed-off-by: Alessandro Barbieri <lssndrbarbieri@gmail.com>
---
 dev-python/oslo-service/Manifest              |  2 +-
 ...2.4.0.ebuild => oslo-service-2.6.0.ebuild} | 32 +++++++++++++------
 2 files changed, 23 insertions(+), 11 deletions(-)
 rename dev-python/oslo-service/{oslo-service-2.4.0.ebuild => oslo-service-2.6.0.ebuild} (68%)

diff --git a/dev-python/oslo-service/Manifest b/dev-python/oslo-service/Manifest
index 41177b5d76..b185ce7309 100644
--- a/dev-python/oslo-service/Manifest
+++ b/dev-python/oslo-service/Manifest
@@ -1 +1 @@
-DIST oslo.service-2.4.0.tar.gz 80999 BLAKE2B 813c67eceb303d76ef39fecf057a2304966a367704a1a86a00bb2de515ded862a4eb3684f1e0f7dd4a17aca654fc6571243176d53397f8f93b5ee4cf34849d20 SHA512 7942a913c598471e9a828dba5e624ff6829d061692526021b9ae872ab558f119612e8b7b09c43efa7596e8102fbff323f106f755eef9a0ac68324606bb539703
+DIST oslo.service-2.6.0.tar.gz 84317 BLAKE2B 9f0d4b541a7bf30e8bc4c29acf17ee2e8a0f0f09b80ed65972a5e914cb51ffd181481288f5693da9293f508ad9a299e050c1cd9e22ec203572d99aa5ce8b6a7b SHA512 102690b122822bafaf7614d97c753475665befc2153c6af0348e6766fdbb9e96bcb1dcda0221fa925031691a53a9f3c9bf9102a380c2f561c057241920192e12
diff --git a/dev-python/oslo-service/oslo-service-2.4.0.ebuild b/dev-python/oslo-service/oslo-service-2.6.0.ebuild
similarity index 68%
rename from dev-python/oslo-service/oslo-service-2.4.0.ebuild
rename to dev-python/oslo-service/oslo-service-2.6.0.ebuild
index fb1a3bab92..18f3c8baff 100644
--- a/dev-python/oslo-service/oslo-service-2.4.0.ebuild
+++ b/dev-python/oslo-service/oslo-service-2.6.0.ebuild
@@ -1,14 +1,19 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
-PYTHON_COMPAT=( python3_{7,8} )
+EAPI=8
+
 DISTUTILS_USE_SETUPTOOLS=bdepend
+PYTHON_COMPAT=( python3_8 )
 
 inherit distutils-r1
 
 DESCRIPTION="Library for running OpenStack services"
-HOMEPAGE="https://pypi.org/project/oslo.service/"
+HOMEPAGE="
+	https://pypi.org/project/oslo.service
+	https://opendev.org/openstack/oslo.service
+	https://launchpad.net/oslo.service
+"
 SRC_URI="mirror://pypi/${PN:0:1}/oslo.service/oslo.service-${PV}.tar.gz"
 S="${WORKDIR}/oslo.service-${PV}"
 
@@ -17,13 +22,7 @@ SLOT="0"
 KEYWORDS="~amd64"
 IUSE=""
 
-DEPEND="
-	>=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
-	!~dev-python/pbr-2.1.0[${PYTHON_USEDEP}]
-"
 RDEPEND="
-	>=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
-	!~dev-python/pbr-2.1.0[${PYTHON_USEDEP}]
 	>=dev-python/webob-1.7.1[${PYTHON_USEDEP}]
 	>=dev-python/debtcollector-1.2.0[${PYTHON_USEDEP}]
 	>=dev-python/eventlet-0.25.2[${PYTHON_USEDEP}]
@@ -39,3 +38,16 @@ RDEPEND="
 	>=dev-python/paste-2.0.2[${PYTHON_USEDEP}]
 	>=dev-python/yappi-1.0[${PYTHON_USEDEP}]
 "
+DEPEND="
+	${RDEPEND}
+	>=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
+	test? (
+		>=dev-python/fixtures-3.0.0[${PYTHON_USEDEP}]
+		>=dev-python/hacking-3.0.1[${PYTHON_USEDEP}]
+		>=dev-python/oslotest-3.2.0[${PYTHON_USEDEP}]
+		>=dev-python/requests-2.14.2[${PYTHON_USEDEP}]
+		>=dev-python/stestr-2.0.0[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest