gentoo auto-resync : 28:12:2022 - 02:11:45

4 files changed, 51 insertions, 67 deletions

diff --git a/sys-apps/pkgcore/Manifest b/sys-apps/pkgcore/Manifest
index f81ce94c8bef..12ab81276717 100644
--- a/sys-apps/pkgcore/Manifest
+++ b/sys-apps/pkgcore/Manifest
@@ -1,8 +1,8 @@
 AUX pkgcore-0.12.17-fix-extra-files.patch 1006 BLAKE2B 72de925e135d33f3cdf52382c4a9cf172f195301de467e01d4218f88b4037d6e7fc824f06401e1838c4a22d25e3132f0b0aace9047bc6b557e413ed65e6e6053 SHA512 1f09f215b544cdbc07935af405f94a5c69f4840a1c1570e9cea23a2a48cf8a4e71a9ac74f8b65cf7f3d391060fc2f8012761f4187e9a4446e4e9de42d6c316c9
 AUX pkgcore-0.12.17-fix-prefix.patch 731 BLAKE2B 4487c145393747415717f5bf4845a49741641eb509175d4bcf766ae56625513243f7f0a951ad749a1e5efcf5327e16b8b9d684a5e235a23b18a0af5256e4506c SHA512 edcaa570a6c7606437b3b35f684f9fcd9c1fc2bf493c5199ad209007dec0ae546b31fff3b6adcc9477cda3a7ad35764357107519d8429a254af52d56b3f0c3ee
-DIST pkgcore-0.12.16.tar.gz 623795 BLAKE2B b591aeaa5d780f0b273d446d1bdbdf33a44d085aa4975d3c5f394820a6f479c15da7850a699c92a56cb280ee028d922551c7226801dea6f4c34620bde3859c31 SHA512 acd7c478b342349e66dfda5ed1284663037b221e39b557215d1441e8a908c845fe26e274bcfd97b1879f5792fc017437cd0fbde1cdffc5ebc595a34fa56d2589
 DIST pkgcore-0.12.17.tar.gz 615375 BLAKE2B 9aabdeead2997e53ee3c966c908a231ff5e3b85422844538f47ff7bed03611459224ad7e931a9e94f0e376f221bd5c54f0f77f7883543cbd5b03c4dba6ba591b SHA512 9bad9b6e6177873b9187cff66b6b51c644a59a2d9f01b8ca110bc49006d6f0221c2c3b145d7cf5cec6f3c7526b6751100d56df13350b674a68ab5bbf19f10131
-EBUILD pkgcore-0.12.16-r1.ebuild 1449 BLAKE2B a4620deadd0c3e5c59a72b0eea28d15dab8d73449051d59f347a4d37b4a83c69ff8c84cae743b7d8f3344dbac5055c08e6a85282d3680900b9e873131ba9f842 SHA512 cd9676de9f17249a2c0aeb1b266b357c6a700f829a6fe8ba0b9cab5423312ef8874e2f407c29156f894a2c9b64e3a7e98d733f6abff082ec2a199870e629c1e2
+DIST pkgcore-0.12.18.tar.gz 630331 BLAKE2B a3be66c1af3b455733cadfeb0117f37593187dda3d8653532a5f32b6292e9350363514b3d6bf0fcd10b32187b5f257f90985cd752739998bfe4d2f6aa2cab2c7 SHA512 c8ca97cd27f5ba37f6baa160e1a387789e1477ca689e477e9f3f68cb8acd1a27b9fb9f77f3eb11e0babad7461f0c27ce08ec619abfd4c259fdcfd203ec325dc0
 EBUILD pkgcore-0.12.17-r2.ebuild 1241 BLAKE2B 67795444045840078c64cad5fb90b58d74ad60e3c991764c5abeae1fc0c9de81366ac8d805d8f83524ea3f11987d07c53746e89568125cd92619233c7259bee5 SHA512 593a11d72ea6db8b6a883533d1e5dedc8e49cec6b90cec7afefa36abe8138ac397860af62af9d94901ed707c08d5493d6ab5017d7c40843a7d182334901f74ab
-EBUILD pkgcore-9999.ebuild 1139 BLAKE2B 1030392abec3f120c6e588b7750cdf03b01cce418ed79c85d4b2de5d62e5474d2e0c690294c80f4f0e66d8b38208de409a41e7f0e4bc805424399935670c828c SHA512 cac9cdada2dc91a8e720d40af32dd61d0f4884766d581cf793c39757a43457c0e680abac4b44fe71975cc017e047b8bc79b1bd5586d45f203679814eb427af32
+EBUILD pkgcore-0.12.18.ebuild 1139 BLAKE2B 0838d6b83edf528dd68a4a15c580cc290a027604995dd8d3f50c7c7fa768f1901f7a7f6c7f3a99e59a7b2b3c217e12b12c1b24ecb3c4f2b57cd70cf3551d593a SHA512 ab3bc9d211059f63c9893c2439e87ce75807c1af7e2621ef9341610bbee93ed284d6a7c18421f06318c4d9e72a264ae4e60e48ab0a4dfe4dfc8d04e5bab92f97
+EBUILD pkgcore-9999.ebuild 1139 BLAKE2B 0838d6b83edf528dd68a4a15c580cc290a027604995dd8d3f50c7c7fa768f1901f7a7f6c7f3a99e59a7b2b3c217e12b12c1b24ecb3c4f2b57cd70cf3551d593a SHA512 ab3bc9d211059f63c9893c2439e87ce75807c1af7e2621ef9341610bbee93ed284d6a7c18421f06318c4d9e72a264ae4e60e48ab0a4dfe4dfc8d04e5bab92f97
 MISC metadata.xml 392 BLAKE2B 98797b18321d3133dceaf79389bd35b26344a342c55c477b178359d731c46fa209adbdcf1d14eb009d57c8c20db8b898651dd45d5bcfc6bb3009ceffa1436650 SHA512 097710cc6c1df7455328a1d3feb223e324162ff20ef03964de4682eec7acf4e2d08fa64d3ac4946783f4c2587455d90ee5aa628f637f3a48386d9c9e6b7362e1
diff --git a/sys-apps/pkgcore/pkgcore-0.12.16-r1.ebuild b/sys-apps/pkgcore/pkgcore-0.12.16-r1.ebuild
deleted file mode 100644
index b060b26f7101..000000000000
--- a/sys-apps/pkgcore/pkgcore-0.12.16-r1.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..11} )
-inherit distutils-r1
-
-if [[ ${PV} == *9999 ]] ; then
-	EGIT_REPO_URI="https://github.com/pkgcore/pkgcore"
-	inherit git-r3
-else
-	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~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.10.0[${PYTHON_USEDEP}]"
-fi
-BDEPEND="
-	test? (
-		>=dev-python/pytest-6[${PYTHON_USEDEP}]
-		dev-vcs/git
-	)
-"
-
-distutils_enable_tests setup.py
-
-src_prepare() {
-	# force Gentoo's prefix
-	sed -e "/INSTALL_PREFIX =/s@= .*\$@= '${EPREFIX}/usr'@" -i setup.py || die
-
-	distutils-r1_src_prepare
-}
-
-src_test() {
-	# With PYTHONDONTWRITEBYTECODE=, python will try rebuild all sorts of modules.
-	# https://bugs.gentoo.org/840266
-	local -x SANDBOX_PREDICT=${SANDBOX_PREDICT}
-	addpredict /
-
-	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.18.ebuild b/sys-apps/pkgcore/pkgcore-0.12.18.ebuild
new file mode 100644
index 000000000000..005d9ddb6987
--- /dev/null
+++ b/sys-apps/pkgcore/pkgcore-0.12.18.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=standalone
+PYTHON_COMPAT=( python3_{9..11} )
+inherit distutils-r1
+
+if [[ ${PV} == *9999 ]] ; then
+	EGIT_REPO_URI="https://anongit.gentoo.org/git/proj/pkgcore/pkgcore.git
+		https://github.com/pkgcore/pkgcore.git"
+	inherit git-r3
+else
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~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.10.4[${PYTHON_USEDEP}]"
+fi
+BDEPEND="
+	>=dev-python/flit_core-3.8[${PYTHON_USEDEP}]
+	test? (
+		dev-vcs/git
+	)
+"
+
+distutils_enable_tests pytest
+
+python_install_all() {
+	local DOCS=( NEWS.rst )
+	[[ ${PV} == *9999 ]] || doman build/sphinx/man/*
+	distutils-r1_python_install_all
+}
diff --git a/sys-apps/pkgcore/pkgcore-9999.ebuild b/sys-apps/pkgcore/pkgcore-9999.ebuild
index a25e0809c909..005d9ddb6987 100644
--- a/sys-apps/pkgcore/pkgcore-9999.ebuild
+++ b/sys-apps/pkgcore/pkgcore-9999.ebuild
@@ -29,7 +29,7 @@ RDEPEND="
 if [[ ${PV} == *9999 ]]; then
 	RDEPEND+=" ~dev-python/snakeoil-9999[${PYTHON_USEDEP}]"
 else
-	RDEPEND+=" >=dev-python/snakeoil-0.10.1[${PYTHON_USEDEP}]"
+	RDEPEND+=" >=dev-python/snakeoil-0.10.4[${PYTHON_USEDEP}]"
 fi
 BDEPEND="
 	>=dev-python/flit_core-3.8[${PYTHON_USEDEP}]