commit: a9cbfc9f0ecb5344ed5540edec13a8278d8dd22b
Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Wed Aug 25 16:54:00 2021 +0000
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Wed Aug 25 16:54:00 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a9cbfc9f
sys-apps/pkgcore: Remove old
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>
sys-apps/pkgcore/Manifest | 6 --
.../pkgcore/files/pkgcore-0.10.18-sighdlr-r1.patch | 67 ----------------------
.../pkgcore/files/pkgcore-0.10.18-sighdlr.patch | 47 ---------------
sys-apps/pkgcore/pkgcore-0.11.6-r1.ebuild | 51 ----------------
sys-apps/pkgcore/pkgcore-0.11.8-r3.ebuild | 51 ----------------
sys-apps/pkgcore/pkgcore-0.12.0.ebuild | 51 ----------------
sys-apps/pkgcore/pkgcore-0.12.1-r1.ebuild | 49 ----------------
sys-apps/pkgcore/pkgcore-0.12.2.ebuild | 50 ----------------
sys-apps/pkgcore/pkgcore-0.12.3.ebuild | 50 ----------------
9 files changed, 422 deletions(-)
diff --git a/sys-apps/pkgcore/Manifest b/sys-apps/pkgcore/Manifest
index e8a87910373..29e3002c36a 100644
--- a/sys-apps/pkgcore/Manifest
+++ b/sys-apps/pkgcore/Manifest
@@ -1,7 +1 @@
-DIST pkgcore-0.11.6.tar.gz 634191 BLAKE2B
c06f24006be697771dd3d7569e3a27310dca56c05047ac991c2db359838dddd5eec78c8d424e826b39968cc496be6e7eb366668bfa45082aac438b663015cb8a
SHA512
e556d20100c0234d319ed2e15686a3bb9f388f1cdefd7188958c3c0b32d741dd531cbbe8d377b0736662f66b3241e633491a72a1ce84dd86790e9f543b3d0800
-DIST pkgcore-0.11.8.tar.gz 631665 BLAKE2B
1e33ce394c1df9418d22fc8653fca4da1b4e27d53325167e3b7231fb8382f3c81daa7a93587ab2226116865546d4ca1ae1dd4265ccc2adc9cb9b27106d9c352b
SHA512
42ed7c54db5fa48dffa5e3927afae32d1b4db92da41eff99c8eaa10232fdeae4e0f3f4d39b1e1b4e3881304523822a9a99575648809c554e3bdcf59d9eab485b
-DIST pkgcore-0.12.0.tar.gz 621376 BLAKE2B
d58390ad7251fc48465d744a0b0694210d1f1cf505b072c06dc9731819b327b1edfa60d0f89db113852c87109c6340c8c13c72ae2d89b517d5fca34b53632b6b
SHA512
d066a2f2deb4f654b04f9e78d37bf88a97f67f0396f5867ffe3a18f8c0d6459d73721b66cad52a50581ee10420694a1fd195b28a013b3a97cb1ebf08bc59598b
-DIST pkgcore-0.12.1.tar.gz 621918 BLAKE2B
aa3bedaf4d58d8e604b19ce3e6f97242d29eadbbeab85b7de029d0230a5ea77e2ee96b128381964afe92a327674d64878f833d8c1ddc983c0fe1381b008e2d62
SHA512
a78f3ffd5610f14adb07e2adce07c8446012e742c777d08bbc7ac711bf194508d66a14d21aa56f5d0c9353bd10354fdd34bc6eb4b6017c03bff5d1b565a53575
-DIST pkgcore-0.12.2.tar.gz 621604 BLAKE2B
15964d9a73727028010b7267a61802566aa59f28769f4ac67aa91ccd32708b1a27914ba14957e1da848dc1a2a24ee9fbf92a7b4cee055a7cff22dd1f0d204f58
SHA512
192532dcee696e7ce159efad2f90597aa68801759ceb5ae85484a99a11242c1da98b73290ce1e4c9e29f2c92607989991b3802c4d0fb9bd1f4a866dd80f13cde
-DIST pkgcore-0.12.3.tar.gz 621912 BLAKE2B
629c42b9d0236196d018302b0941d05d36d15d2bdf31f51ef0d212ab0aad2968ff58aa938d22ff8ba65d115e5a1e80e0f444959c2c63aa227f34bd2da3868165
SHA512
6942d13aecfbf0af2969b71b92fcf4e8e938c367fe61e4a748cae14eeeb4ba831b7ac50deb04f4afa8a7f1a6dc31a893ce4106e54b188ff0a1036f7afd6798a4
DIST pkgcore-0.12.4.tar.gz 622553 BLAKE2B
fc9df4f9499ad20cec439275880e469e1ffd8204b894c0a523ed27a3e55748e58634fca2af693fcc453e8aec068733a944331f7cea52e983e50981374239d534
SHA512
bc9eccd8d903e987df97354de008826dd52a7db0d9def064c56bb9425d1aa69e8fdf15dcfd0f86057c98a3c0adefee633a3c1cc9b689a334c126730cbdeafd0c
diff --git a/sys-apps/pkgcore/files/pkgcore-0.10.18-sighdlr-r1.patch
b/sys-apps/pkgcore/files/pkgcore-0.10.18-sighdlr-r1.patch
deleted file mode 100644
index a48bfc5873b..00000000000
--- a/sys-apps/pkgcore/files/pkgcore-0.10.18-sighdlr-r1.patch
+++ /dev/null
@@ -1,67 +0,0 @@
-From 303826ceb22985cfa1dfbf1e7a68ed327ffc741b Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgo...@gentoo.org>
-Date: Sat, 15 May 2021 09:30:58 +0200
-Subject: [PATCH] pytest: Delay loading pkgcore modules until fixtures are used
-
-Delay loading pkgcore modules until the EbuildRepo-based fixtures are
-actually used. This prevents the pkgcore signal handlers from being
-enabled on all packages using pytest while keeping the old behavior
-of setting them upon import in packages using pkgcore directly.
----
- src/pkgcore/pytest/plugin.py | 15 ++++++++++-----
- 1 file changed, 10 insertions(+), 5 deletions(-)
-
-diff --git a/src/pkgcore/pytest/plugin.py b/src/pkgcore/pytest/plugin.py
-index 082538ab..bdc89e4b 100644
---- a/src/pkgcore/pytest/plugin.py
-+++ b/src/pkgcore/pytest/plugin.py
-@@ -1,3 +1,4 @@
-+import importlib
- import os
- import subprocess
- import textwrap
-@@ -5,8 +6,6 @@ from collections.abc import MutableSet
- from datetime import datetime
-
- import pytest
--from pkgcore.ebuild import cpv as cpv_mod
--from pkgcore.ebuild import repo_objs, repository
- from snakeoil import klass
- from snakeoil.fileutils import touch
- from snakeoil.osutils import pjoin
-@@ -169,6 +168,12 @@ class EbuildRepo:
- """Class for creating/manipulating ebuild repos."""
-
- def __init__(self, path, repo_id='fake', eapi='5', masters=(), arches=()):
-+ # load pkgcore modules late to avoid overriding signal handlers
-+ # when the plugin is not actually used
-+ self.cpv_mod = importlib.import_module('pkgcore.ebuild.cpv')
-+ self.repo_objs = importlib.import_module('pkgcore.ebuild.repo_objs')
-+ self.repository = importlib.import_module('pkgcore.ebuild.repository')
-+
- self.path = path
- self.arches = _FileSet(pjoin(self.path, 'profiles', 'arch.list'))
- self._today = datetime.today()
-@@ -194,8 +199,8 @@ class EbuildRepo:
-
- def sync(self):
- """Forcibly create underlying repo object avoiding cache usage."""
-- repo_config = repo_objs.RepoConfig(location=self.path,
disable_inst_caching=True)
-- self._repo = repository.UnconfiguredTree(self.path,
repo_config=repo_config)
-+ repo_config = self.repo_objs.RepoConfig(location=self.path,
disable_inst_caching=True)
-+ self._repo = self.repository.UnconfiguredTree(self.path,
repo_config=repo_config)
-
- def create_profiles(self, profiles):
- for p in profiles:
-@@ -215,7 +220,7 @@ class EbuildRepo:
- f.write(f'{p.eapi}\n')
-
- def create_ebuild(self, cpvstr, data=None, **kwargs):
-- cpv = cpv_mod.VersionedCPV(cpvstr)
-+ cpv = self.cpv_mod.VersionedCPV(cpvstr)
- self._repo.notify_add_package(cpv)
- ebuild_dir = pjoin(self.path, cpv.category, cpv.package)
- os.makedirs(ebuild_dir, exist_ok=True)
---
-2.31.1
-
diff --git a/sys-apps/pkgcore/files/pkgcore-0.10.18-sighdlr.patch
b/sys-apps/pkgcore/files/pkgcore-0.10.18-sighdlr.patch
deleted file mode 100644
index 30cec9114f5..00000000000
--- a/sys-apps/pkgcore/files/pkgcore-0.10.18-sighdlr.patch
+++ /dev/null
@@ -1,47 +0,0 @@
-From 533f1edd70054a5479ee85719d3cbef0d15627fd Mon Sep 17 00:00:00 2001
-From: Tim Harder <radher...@gmail.com>
-Date: Sun, 28 Mar 2021 17:18:16 -0600
-Subject: [PATCH] ebuild.processor: register SIGINT and SIGTERM signal handlers
- on ebd init
-
-Rather than at a global, module level to avoid issues with inadvertent
-issues during 3rd party imports, e.g. the pkgcore pytest plugin getting
-autoloaded by some other project's testsuite.
----
- src/pkgcore/ebuild/processor.py | 9 +++------
- 1 file changed, 3 insertions(+), 6 deletions(-)
-
-diff --git a/src/pkgcore/ebuild/processor.py b/src/pkgcore/ebuild/processor.py
-index e8c3c2cd4..65437efcf 100644
---- a/src/pkgcore/ebuild/processor.py
-+++ b/src/pkgcore/ebuild/processor.py
-@@ -275,9 +275,6 @@ def chuck_KeyboardInterrupt(*args):
- raise KeyboardInterrupt("ctrl+c encountered")
-
-
--signal.signal(signal.SIGINT, chuck_KeyboardInterrupt)
--
--
- def chuck_TermInterrupt(ebp, *args):
- """Event handler for SIGTERM."""
- if ebp is None:
-@@ -292,9 +289,6 @@ def chuck_TermInterrupt(ebp, *args):
- ebp.shutdown_processor()
-
-
--signal.signal(signal.SIGTERM, partial(chuck_TermInterrupt, None))
--
--
- def chuck_UnhandledCommand(ebp, line):
- """Event handler for unhandled commands."""
- raise UnhandledCommand(line)
-@@ -332,6 +326,9 @@ def __init__(self, userpriv, sandbox, fd_pipes=None):
- self._outstanding_expects = []
- self._metadata_paths = None
-
-+ signal.signal(signal.SIGTERM, partial(chuck_TermInterrupt, None))
-+ signal.signal(signal.SIGINT, chuck_KeyboardInterrupt)
-+
- if userpriv:
- self.__userpriv = True
- spawn_opts.update({
diff --git a/sys-apps/pkgcore/pkgcore-0.11.6-r1.ebuild
b/sys-apps/pkgcore/pkgcore-0.11.6-r1.ebuild
deleted file mode 100644
index 2ff367e894b..00000000000
--- a/sys-apps/pkgcore/pkgcore-0.11.6-r1.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{8..9} )
-DISTUTILS_IN_SOURCE_BUILD=1
-inherit distutils-r1
-
-if [[ ${PV} == *9999 ]] ; then
- EGIT_REPO_URI="https://github.com/pkgcore/pkgcore.git";
- inherit git-r3
-else
- KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~s390 sparc x86
~x64-macos"
- SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-fi
-
-DESCRIPTION="a framework for package management"
-HOMEPAGE="https://github.com/pkgcore/pkgcore";
-
-LICENSE="BSD MIT"
-SLOT="0"
-
-RDEPEND="dev-python/lxml[${PYTHON_USEDEP}]"
-if [[ ${PV} == *9999 ]]; then
- RDEPEND+=" ~dev-python/snakeoil-9999[${PYTHON_USEDEP}]"
-else
- RDEPEND+=" >=dev-python/snakeoil-0.9.3[${PYTHON_USEDEP}]"
-fi
-BDEPEND="
- test? (
- dev-python/pytest[${PYTHON_USEDEP}]
- dev-vcs/git
- )
-"
-
-PATCHES=(
- "${FILESDIR}/pkgcore-0.10.18-sighdlr.patch"
-)
-
-distutils_enable_tests setup.py
-
-src_test() {
- local -x PYTHONDONTWRITEBYTECODE=
- distutils-r1_src_test
-}
-
-python_install_all() {
- local DOCS=( NEWS.rst )
- [[ ${PV} == *9999 ]] || doman man/*
- distutils-r1_python_install_all
-}
diff --git a/sys-apps/pkgcore/pkgcore-0.11.8-r3.ebuild
b/sys-apps/pkgcore/pkgcore-0.11.8-r3.ebuild
deleted file mode 100644
index cb4367497c7..00000000000
--- a/sys-apps/pkgcore/pkgcore-0.11.8-r3.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{8..9} )
-DISTUTILS_IN_SOURCE_BUILD=1
-inherit distutils-r1
-
-if [[ ${PV} == *9999 ]] ; then
- EGIT_REPO_URI="https://github.com/pkgcore/pkgcore.git";
- inherit git-r3
-else
- KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64
~riscv ~s390 ~sparc ~x86 ~x64-macos"
- SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-fi
-
-DESCRIPTION="a framework for package management"
-HOMEPAGE="https://github.com/pkgcore/pkgcore";
-
-LICENSE="BSD MIT"
-SLOT="0"
-
-RDEPEND="dev-python/lxml[${PYTHON_USEDEP}]"
-if [[ ${PV} == *9999 ]]; then
- RDEPEND+=" ~dev-python/snakeoil-9999[${PYTHON_USEDEP}]"
-else
- RDEPEND+=" >=dev-python/snakeoil-0.9.6[${PYTHON_USEDEP}]"
-fi
-BDEPEND="
- test? (
- >=dev-python/pytest-6[${PYTHON_USEDEP}]
- dev-vcs/git
- )
-"
-
-PATCHES=(
- "${FILESDIR}/pkgcore-0.10.18-sighdlr-r1.patch"
-)
-
-distutils_enable_tests setup.py
-
-src_test() {
- local -x PYTHONDONTWRITEBYTECODE=
- distutils-r1_src_test
-}
-
-python_install_all() {
- local DOCS=( NEWS.rst )
- [[ ${PV} == *9999 ]] || doman man/*
- distutils-r1_python_install_all
-}
diff --git a/sys-apps/pkgcore/pkgcore-0.12.0.ebuild
b/sys-apps/pkgcore/pkgcore-0.12.0.ebuild
deleted file mode 100644
index cb4367497c7..00000000000
--- a/sys-apps/pkgcore/pkgcore-0.12.0.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{8..9} )
-DISTUTILS_IN_SOURCE_BUILD=1
-inherit distutils-r1
-
-if [[ ${PV} == *9999 ]] ; then
- EGIT_REPO_URI="https://github.com/pkgcore/pkgcore.git";
- inherit git-r3
-else
- KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64
~riscv ~s390 ~sparc ~x86 ~x64-macos"
- SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-fi
-
-DESCRIPTION="a framework for package management"
-HOMEPAGE="https://github.com/pkgcore/pkgcore";
-
-LICENSE="BSD MIT"
-SLOT="0"
-
-RDEPEND="dev-python/lxml[${PYTHON_USEDEP}]"
-if [[ ${PV} == *9999 ]]; then
- RDEPEND+=" ~dev-python/snakeoil-9999[${PYTHON_USEDEP}]"
-else
- RDEPEND+=" >=dev-python/snakeoil-0.9.6[${PYTHON_USEDEP}]"
-fi
-BDEPEND="
- test? (
- >=dev-python/pytest-6[${PYTHON_USEDEP}]
- dev-vcs/git
- )
-"
-
-PATCHES=(
- "${FILESDIR}/pkgcore-0.10.18-sighdlr-r1.patch"
-)
-
-distutils_enable_tests setup.py
-
-src_test() {
- local -x PYTHONDONTWRITEBYTECODE=
- distutils-r1_src_test
-}
-
-python_install_all() {
- local DOCS=( NEWS.rst )
- [[ ${PV} == *9999 ]] || doman man/*
- distutils-r1_python_install_all
-}
diff --git a/sys-apps/pkgcore/pkgcore-0.12.1-r1.ebuild
b/sys-apps/pkgcore/pkgcore-0.12.1-r1.ebuild
deleted file mode 100644
index 05d8679fb96..00000000000
--- a/sys-apps/pkgcore/pkgcore-0.12.1-r1.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{8..10} )
-DISTUTILS_IN_SOURCE_BUILD=1
-inherit distutils-r1
-
-if [[ ${PV} == *9999 ]] ; then
- EGIT_REPO_URI="https://github.com/pkgcore/pkgcore.git";
- inherit git-r3
-else
- KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv
~s390 sparc x86 ~x64-macos"
- SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-fi
-
-DESCRIPTION="a framework for package management"
-HOMEPAGE="https://github.com/pkgcore/pkgcore";
-
-LICENSE="BSD MIT"
-SLOT="0"
-
-RDEPEND="
- >=app-shells/bash-5.0
- dev-python/lxml[${PYTHON_USEDEP}]"
-if [[ ${PV} == *9999 ]]; then
- RDEPEND+=" ~dev-python/snakeoil-9999[${PYTHON_USEDEP}]"
-else
- RDEPEND+=" >=dev-python/snakeoil-0.9.6[${PYTHON_USEDEP}]"
-fi
-BDEPEND="
- test? (
- >=dev-python/pytest-6[${PYTHON_USEDEP}]
- dev-vcs/git
- )
-"
-
-distutils_enable_tests setup.py
-
-src_test() {
- local -x PYTHONDONTWRITEBYTECODE=
- distutils-r1_src_test
-}
-
-python_install_all() {
- local DOCS=( NEWS.rst )
- [[ ${PV} == *9999 ]] || doman man/*
- distutils-r1_python_install_all
-}
diff --git a/sys-apps/pkgcore/pkgcore-0.12.2.ebuild
b/sys-apps/pkgcore/pkgcore-0.12.2.ebuild
deleted file mode 100644
index 5c7eeb03645..00000000000
--- a/sys-apps/pkgcore/pkgcore-0.12.2.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..10} )
-DISTUTILS_IN_SOURCE_BUILD=1
-inherit distutils-r1
-
-if [[ ${PV} == *9999 ]] ; then
- EGIT_REPO_URI="https://github.com/pkgcore/pkgcore.git";
- inherit git-r3
-else
- KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64
~riscv ~s390 ~sparc ~x86 ~x64-macos"
- SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-fi
-
-DESCRIPTION="a framework for package management"
-HOMEPAGE="https://github.com/pkgcore/pkgcore";
-
-LICENSE="BSD MIT"
-SLOT="0"
-
-RDEPEND="
- >=app-shells/bash-5.0
- dev-python/lxml[${PYTHON_USEDEP}]"
-if [[ ${PV} == *9999 ]]; then
- RDEPEND+=" ~dev-python/snakeoil-9999[${PYTHON_USEDEP}]"
-else
- RDEPEND+=" >=dev-python/snakeoil-0.9.6[${PYTHON_USEDEP}]"
-fi
-BDEPEND="
- test? (
- >=dev-python/pytest-6[${PYTHON_USEDEP}]
- dev-vcs/git
- )
-"
-
-distutils_enable_tests setup.py
-
-src_test() {
- local -x PYTHONDONTWRITEBYTECODE=
- distutils-r1_src_test
-}
-
-python_install_all() {
- local DOCS=( NEWS.rst )
- [[ ${PV} == *9999 ]] || doman man/*
- distutils-r1_python_install_all
-}
diff --git a/sys-apps/pkgcore/pkgcore-0.12.3.ebuild
b/sys-apps/pkgcore/pkgcore-0.12.3.ebuild
deleted file mode 100644
index 5c7eeb03645..00000000000
--- a/sys-apps/pkgcore/pkgcore-0.12.3.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..10} )
-DISTUTILS_IN_SOURCE_BUILD=1
-inherit distutils-r1
-
-if [[ ${PV} == *9999 ]] ; then
- EGIT_REPO_URI="https://github.com/pkgcore/pkgcore.git";
- inherit git-r3
-else
- KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64
~riscv ~s390 ~sparc ~x86 ~x64-macos"
- SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-fi
-
-DESCRIPTION="a framework for package management"
-HOMEPAGE="https://github.com/pkgcore/pkgcore";
-
-LICENSE="BSD MIT"
-SLOT="0"
-
-RDEPEND="
- >=app-shells/bash-5.0
- dev-python/lxml[${PYTHON_USEDEP}]"
-if [[ ${PV} == *9999 ]]; then
- RDEPEND+=" ~dev-python/snakeoil-9999[${PYTHON_USEDEP}]"
-else
- RDEPEND+=" >=dev-python/snakeoil-0.9.6[${PYTHON_USEDEP}]"
-fi
-BDEPEND="
- test? (
- >=dev-python/pytest-6[${PYTHON_USEDEP}]
- dev-vcs/git
- )
-"
-
-distutils_enable_tests setup.py
-
-src_test() {
- local -x PYTHONDONTWRITEBYTECODE=
- distutils-r1_src_test
-}
-
-python_install_all() {
- local DOCS=( NEWS.rst )
- [[ ${PV} == *9999 ]] || doman man/*
- distutils-r1_python_install_all
-}
