gentoo resync : 29.12.2022

3 files changed, 7 insertions, 26 deletions

diff --git a/dev-python/uri_template/Manifest b/dev-python/uri_template/Manifest
index d8827c895c7f..8e008a0b41f5 100644
--- a/dev-python/uri_template/Manifest
+++ b/dev-python/uri_template/Manifest
@@ -1,5 +1,3 @@
-DIST uri_template-v1.1.0.tar.gz 18014 BLAKE2B 01ac4439b6661d0d1e7adb5b5ebcc594497cdaeef24b33cbfc8a26f607e779a72ae20838dbbcce28278886c87df475adfd53c73287a4768d848f65b95ba2ce58 SHA512 b6d34931e750acc6c160e7157fc000984acc099023e9794163777679cbe706b8a646bab89e82171c0318827b7a7b9cfcfb997768120cabcf36e7982214321665
 DIST uri_template-v1.2.0.tar.gz 18284 BLAKE2B cf857ccd8496111f61fb95af020514f1c484e5c3ff19829f28bc2dc112887fe276dac68aa21e0d092d42a22319e8d6ac8aff95c734aadd8417c56f57b0076256 SHA512 81b046bbc2dc4d5c0b40a76f13713c10e69d803e3d9da13ab69cc6d40569ef0a39c786a6637a66651a5c3d3e68807f923ad48a7feaf898ae3ca6fd03c0e68c37
-EBUILD uri_template-1.1.0.ebuild 658 BLAKE2B 7f4c44c92a22390f610a16ee6f067973040706c2d468ac2fcd5c65a64771e5e97584ce761dd5b12423ddb64d18b85343556424ebab74083c47590d63e4280d14 SHA512 67841fd510d2703a616d47a80544d43a917524ad997872fcf81729a0aba268a7ea30ca5fda04c43df802146ab14487b5f57960fa48a71f78ce86eb87c001c7c5
-EBUILD uri_template-1.2.0.ebuild 709 BLAKE2B 4e0ac649ce6e2620c296b9128f31a512935b227374e48c8684b2f06ac79e303cb2b21adc719435826eccc0c7963e6bbaba3ea3a7477c2359e025827a409c0f52 SHA512 c86bfc1d30a2230e7aa878d943e3f5656d22085b68d55cbc78d8aa003ff2b9cd7d4badd7f856a111cb2f965f6b1592983c6b1dc8e37e5888478144b003baf7b7
+EBUILD uri_template-1.2.0-r1.ebuild 835 BLAKE2B e22f184da083b2801c45044709ae6596dd76d33f85bcfbfe32428fdf5701ccef7833b6bb6ea7cfd16bae3baead49d432661aa4b1bbdc4ad2495cca74dcf452f3 SHA512 fdd587c0344fd62d6f1b643f50ec238563677493fa77585159d96134d16f8207f1c8314c714a758ddf1338f660332437911c37f5daffe0785f607ba17164eebb
 MISC metadata.xml 596 BLAKE2B 3dd78f11c031a0810c2386cd362bba5563405d3bc9347efdbea8a54a29b76f72dfc0343f59c82f46802fa80437fc24e96477ae64626a12a46ca21a85e292682c SHA512 39d59df7ae7d6c9b3ad84406abd93a051418ee0b82b008e28c3e872697bcbf0ff89ce27684bb05225b65e79655256e0c44b38096cc5e7b2eca224370721e744a
diff --git a/dev-python/uri_template/uri_template-1.1.0.ebuild b/dev-python/uri_template/uri_template-1.1.0.ebuild
deleted file mode 100644
index 2aa659f49c57..000000000000
--- a/dev-python/uri_template/uri_template-1.1.0.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( pypy3 python3_{8..10} )
-
-inherit distutils-r1
-
-MY_P="${PN}-v${PV}"
-DESCRIPTION="URI Template expansion in strict adherence to RFC 6570"
-HOMEPAGE="https://gitlab.linss.com/open-source/uri_template/"
-SRC_URI="https://gitlab.linss.com/open-source/${PN}/-/archive/v${PV}/${MY_P}.tar.gz"
-S="${WORKDIR}/${MY_P}"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-
-python_test() {
-	"${EPYTHON}" "test.py" || die "Tests fail with ${EPYTHON}."
-}
diff --git a/dev-python/uri_template/uri_template-1.2.0.ebuild b/dev-python/uri_template/uri_template-1.2.0-r1.ebuild
index 90ea54cc924f..6338f0309acd 100644
--- a/dev-python/uri_template/uri_template-1.2.0.ebuild
+++ b/dev-python/uri_template/uri_template-1.2.0-r1.ebuild
@@ -23,6 +23,12 @@ LICENSE="MIT"
 SLOT="0"
 KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 
+src_prepare() {
+	distutils-r1_src_prepare
+	# fix the version number
+	sed -i -e "/version/s:0\.0\.0:${PV}:" setup.py || die
+}
+
 python_test() {
 	"${EPYTHON}" "test.py" || die "Tests fail with ${EPYTHON}."
 }