gentoo resync : 29.12.2022

4 files changed, 2 insertions, 49 deletions

diff --git a/dev-python/blurb/Manifest b/dev-python/blurb/Manifest
index 6ae61de2005d..71f377137bef 100644
--- a/dev-python/blurb/Manifest
+++ b/dev-python/blurb/Manifest
@@ -1,6 +1,3 @@
-AUX blurb-setuptools.patch 522 BLAKE2B a035fc3282d11845219a442494de83e385210421bcb45edf6780bf93d7cf43c2f3995394f862425f2c0e897357e8f187c07a2ff3b0dbc2aa9c932bfdfd83e69a SHA512 51348af10150ac288df6e4cc2d8c573b43432e18014234b4a68672518f02ef968dd26c4abe8d59dc8d6c64417cc86e770a5295635fa88356c526a580c201c581
-DIST blurb-1.0.8.tar.gz 21519 BLAKE2B 4e76fad58821662b0a97dbde63e0fe7f3e82676ea1f22a3effdc118a014fff2b17995252bca900f495d66df36712122e7a50e95b3ebfcff7d39f8d005ef8456d SHA512 63bba016cfc293923da1cf7cc5f64e8881bf28237faf9908a484d55ff435df71c30544a751e0f167ed82d1f363dca48f53be67a25adc3ebc728c88b31186abac
 DIST blurb-1.1.0.tar.gz 25064 BLAKE2B 4fbdd0d068cc7abb1ffa78dff70bd83feccc1bcfbf8ebb085c9f7e77e0f330d3759f10a94a5ca024b465c01f9d659496ae55162a52b7158a06caf2d114d36806 SHA512 9397173e7bf5babf02c96df27983462e7dd2a729e9eb0cacdf23ca3778336902d5c611ab5e2432bbc877344426d7c62ea8ae77719aa08da98f9b44365583b7ee
-EBUILD blurb-1.0.8.ebuild 677 BLAKE2B c71ba8d012890379828f40cf96d4b227b0f007fc3336d41e51174b762522d6e9797ad1c48bec3d7b88638894ca03b6fcb603c619066340b1baf593d4070158f3 SHA512 4b0861bd0f1d5705b383cf2ef5799b7ec6523af6bad55aa49b97fdd4befb4af30a616fe202eb93dc4e731ef1ba0380eeec3c0a9d760f7ad3bb050806d7448fa4
-EBUILD blurb-1.1.0.ebuild 646 BLAKE2B 443a7fc5e09ed795f738f256a028af17cc3f98c3a669ad34fd5dfecf85edf70f9e6d6522cf46dff5d9aed59e075bf1153eedb0455f64d6c3a2b44f1a597bb4c6 SHA512 c8c1dc61680ab59e96283905dea3dbb04dbcbca4bcc649239f08c7f08b21c123bd55a61533744b82255f92923ec45c39d8b588b4506b8fbc608a8bd16a2a9414
+EBUILD blurb-1.1.0.ebuild 646 BLAKE2B 4ca08b42f6025f1ee46413455a44b8a472b34059b04021c6d76a5128d0da60e2c054e49836d9bef3cc27a196cb9173935c3f5bd5da532b7ce991da2c81c475c8 SHA512 674c56c3ca1bbef7f612e3b84c901329e15125074ac5f23db77fe9a97930b461fda923da2c96a19319df954da83d028e53ff2202c6153c7a05631d43b2a6aa29
 MISC metadata.xml 1039 BLAKE2B e723b7324c373cc1f31235b331f2f7f76e549a8b4e335e7db7a624e1b59c7a664440a28348491f9d176b7138cc4899996d23d2206a82d7660b0c2875e6e74e47 SHA512 7781ff5848693ff7ffa750dfaee88b385ba970803399fd967e98f62544cb196e0fcc1a341ff86c989d6da362921ae364ee8aee1824d0d91412562b00ee23b1d1
diff --git a/dev-python/blurb/blurb-1.0.8.ebuild b/dev-python/blurb/blurb-1.0.8.ebuild
deleted file mode 100644
index 2d91f40572a3..000000000000
--- a/dev-python/blurb/blurb-1.0.8.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 2018-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..10} )
-inherit distutils-r1
-
-DESCRIPTION="Tool to create and manage NEWS blurbs for CPython"
-HOMEPAGE="https://github.com/python/core-workflow/tree/master/blurb"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-PATCHES=(
-	"${FILESDIR}/blurb-setuptools.patch"
-)
-
-src_prepare() {
-	distutils-r1_src_prepare
-
-	# Tests expect to be run from github repo, in which code is inside dir
-	ln -s . blurb || die
-}
-
-python_test() {
-	"${EPYTHON}" -m blurb test || die "Tests failed with ${EPYTHON}"
-}
diff --git a/dev-python/blurb/blurb-1.1.0.ebuild b/dev-python/blurb/blurb-1.1.0.ebuild
index 902953b276f7..87908ccc5df1 100644
--- a/dev-python/blurb/blurb-1.1.0.ebuild
+++ b/dev-python/blurb/blurb-1.1.0.ebuild
@@ -4,7 +4,7 @@
 EAPI=8
 
 DISTUTILS_USE_PEP517=flit
-PYTHON_COMPAT=( python3_{8..10} )
+PYTHON_COMPAT=( python3_{8..11} )
 
 inherit distutils-r1
 
diff --git a/dev-python/blurb/files/blurb-setuptools.patch b/dev-python/blurb/files/blurb-setuptools.patch
deleted file mode 100644
index 4845af98285a..000000000000
--- a/dev-python/blurb/files/blurb-setuptools.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-diff -u blurb-1.0.7.orig/setup.py blurb-1.0.7/setup.py
---- blurb-1.0.7.orig/setup.py	1969-12-31 16:00:00.000000000 -0800
-+++ blurb-1.0.7/setup.py	2018-11-05 14:58:55.148518033 -0800
-@@ -1,7 +1,7 @@
- #!/usr/bin/env python
- # setup.py generated by flit for tools that don't yet use PEP 517
- 
--from distutils.core import setup
-+from setuptools import setup
- 
- entry_points = \
- {'console_scripts': ['blurb = blurb:main']}
-Only in blurb-1.0.7: .setup.py.un~
-Common subdirectories: blurb-1.0.7.orig/tests and blurb-1.0.7/tests