From b98f5ed0bea9d4ae9596f8d9cb381b5d585134bc Mon Sep 17 00:00:00 2001
From: =?utf8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
Date: Sat, 23 May 2020 11:34:25 +0200
Subject: [PATCH] dev-util/spec-cleaner: Remove last-rited pkg
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

Closes: https://bugs.gentoo.org/718296
Signed-off-by: Michał Górny <mgorny@gentoo.org>
---
 dev-util/spec-cleaner/Manifest                |  1 -
 .../spec-cleaner-1.0.6-pytest-runner.patch    | 11 -----
 dev-util/spec-cleaner/metadata.xml            |  8 ---
 .../spec-cleaner/spec-cleaner-1.0.7.ebuild    | 49 -------------------
 .../spec-cleaner/spec-cleaner-9999.ebuild     | 49 -------------------
 profiles/package.mask                         |  5 --
 6 files changed, 123 deletions(-)
 delete mode 100644 dev-util/spec-cleaner/Manifest
 delete mode 100644 dev-util/spec-cleaner/files/spec-cleaner-1.0.6-pytest-runner.patch
 delete mode 100644 dev-util/spec-cleaner/metadata.xml
 delete mode 100644 dev-util/spec-cleaner/spec-cleaner-1.0.7.ebuild
 delete mode 100644 dev-util/spec-cleaner/spec-cleaner-9999.ebuild

diff --git a/dev-util/spec-cleaner/Manifest b/dev-util/spec-cleaner/Manifest
deleted file mode 100644
index bc30ac4e2f21..000000000000
--- a/dev-util/spec-cleaner/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST spec-cleaner-1.0.7.tar.gz 450429 BLAKE2B 7ec57076f13c526ca10524a3852a26ddee4581137357dd593312cc1b55d908311c9146ac2b9c0a5f0ea491a2e1cec8b8a3e5dba25467881f656d43872bd69f5f SHA512 705fc3b9d5b927a64bd19bbf6c826464e40ec6b3cc97cd032417f8e4debac721c7e5f0c99e02fafbb5ce3454424a8b398a7827779b0a308549955ecac33d39c7
diff --git a/dev-util/spec-cleaner/files/spec-cleaner-1.0.6-pytest-runner.patch b/dev-util/spec-cleaner/files/spec-cleaner-1.0.6-pytest-runner.patch
deleted file mode 100644
index b280cce28bf4..000000000000
--- a/dev-util/spec-cleaner/files/spec-cleaner-1.0.6-pytest-runner.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/setup.py 2018-03-19 15:23:46.128000000 +0000
-+++ b/setup.py 2018-03-19 15:24:26.920000000 +0000
-@@ -43,7 +43,6 @@
-     platforms=['Linux'],
-     keywords=['SUSE', 'RPM', '.spec', 'cleaner'],
- 
--    setup_requires=['pytest-runner'],
--    tests_require=['pytest', 'pytest-cov'],
-+    tests_require=['pytest'],
- 
-     packages=['spec_cleaner'],
diff --git a/dev-util/spec-cleaner/metadata.xml b/dev-util/spec-cleaner/metadata.xml
deleted file mode 100644
index 03f0990dceec..000000000000
--- a/dev-util/spec-cleaner/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<!-- maintainer-needed -->
-	<upstream>
-		<remote-id type="github">openSUSE/spec-cleaner</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-util/spec-cleaner/spec-cleaner-1.0.7.ebuild b/dev-util/spec-cleaner/spec-cleaner-1.0.7.ebuild
deleted file mode 100644
index 1a01126a84cc..000000000000
--- a/dev-util/spec-cleaner/spec-cleaner-1.0.7.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_6 )
-EGIT_REPO_URI="https://github.com/openSUSE/spec-cleaner.git"
-inherit distutils-r1
-[[ ${PV} == 9999 ]] && inherit git-r3
-
-DESCRIPTION="SUSE spec file cleaner and formatter"
-HOMEPAGE="https://github.com/openSUSE/spec-cleaner"
-[[ ${PV} != 9999 ]] && SRC_URI="https://github.com/openSUSE/${PN}/archive/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-[[ ${PV} != 9999 ]] &&
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-DEPEND="
-	test? (
-		dev-python/pytest[${PYTHON_USEDEP}]
-	)
-"
-RDEPEND="
-	${PYTHON_DEPS}
-	>=app-arch/rpm-4.11.0.1
-"
-
-PATCHES=(
-	# pytest-runner is only needed in test scenario
-	"${FILESDIR}/${PN}-1.0.6-pytest-runner.patch"
-)
-
-[[ ${PV} != 9999 ]] && S="${WORKDIR}/${PN}-${P}"
-
-src_prepare() {
-	# we have libexec
-	sed -i \
-		-e 's:lib/obs:libexec/obs:g' \
-		setup.py || die
-	distutils-r1_src_prepare
-}
-
-python_test() {
-	esetup.py test
-}
diff --git a/dev-util/spec-cleaner/spec-cleaner-9999.ebuild b/dev-util/spec-cleaner/spec-cleaner-9999.ebuild
deleted file mode 100644
index 1a01126a84cc..000000000000
--- a/dev-util/spec-cleaner/spec-cleaner-9999.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_6 )
-EGIT_REPO_URI="https://github.com/openSUSE/spec-cleaner.git"
-inherit distutils-r1
-[[ ${PV} == 9999 ]] && inherit git-r3
-
-DESCRIPTION="SUSE spec file cleaner and formatter"
-HOMEPAGE="https://github.com/openSUSE/spec-cleaner"
-[[ ${PV} != 9999 ]] && SRC_URI="https://github.com/openSUSE/${PN}/archive/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-[[ ${PV} != 9999 ]] &&
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-DEPEND="
-	test? (
-		dev-python/pytest[${PYTHON_USEDEP}]
-	)
-"
-RDEPEND="
-	${PYTHON_DEPS}
-	>=app-arch/rpm-4.11.0.1
-"
-
-PATCHES=(
-	# pytest-runner is only needed in test scenario
-	"${FILESDIR}/${PN}-1.0.6-pytest-runner.patch"
-)
-
-[[ ${PV} != 9999 ]] && S="${WORKDIR}/${PN}-${P}"
-
-src_prepare() {
-	# we have libexec
-	sed -i \
-		-e 's:lib/obs:libexec/obs:g' \
-		setup.py || die
-	distutils-r1_src_prepare
-}
-
-python_test() {
-	esetup.py test
-}
diff --git a/profiles/package.mask b/profiles/package.mask
index 6a5a3f52d4dd..3380bc78d029 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -587,11 +587,6 @@ dev-vcs/git-imerge
 # Removal in 30 days.  Bug #718300.
 dev-vcs/ghp-import
 
-# Michał Górny <mgorny@gentoo.org> (2020-04-19)
-# Unmaintained.  Stuck on Python 3.6.  A few releases behind upstream.
-# Removal in 30 days.  Bug #718296.
-dev-util/spec-cleaner
-
 # Georgy Yakovlev <gyakovlev@gentoo.org> (2020-04-18)
 # Unmaintained, vulnerable oracle java ebuilds, even fetching distfiles
 # requires agreement to restrictive license
-- 
2.26.2