gentoo auto-resync : 20:09:2022 - 23:24:40

4 files changed, 91 insertions, 4 deletions

diff --git a/dev-util/Manifest.gz b/dev-util/Manifest.gz
index d63b9f91d5bf..ab06719e7840 100644
--- a/dev-util/Manifest.gz
+++ b/dev-util/Manifest.gz
diff --git a/dev-util/pkgdev/Manifest b/dev-util/pkgdev/Manifest
index f8471e9ccc85..8fbf153b4d60 100644
--- a/dev-util/pkgdev/Manifest
+++ b/dev-util/pkgdev/Manifest
@@ -1,8 +1,11 @@
 AUX pkgdev-0.2.1-fix-signoff-example.patch 920 BLAKE2B dbf577e4dbc374b26519d459b2bb17ae5dc659e8373a7cf3aac52699c6ec101159fbdb2fce78b8b22b525637e35b6aea0e2b94ed9d81fc3e320b7290934cde09 SHA512 aa9f067dcbec520392327333317eef17f3153369e0d072d2b0f85f971de2151a649d5ce23183fcbb4b6210b872ce905f99e223ad91950e47dc7bdaa761f522a4
 DIST pkgdev-0.2.1-docs.tar.xz 4156 BLAKE2B d0cae24586dd24d03ae0378205ebf164957a15a85fec06d4a44d24c448aa22732aec7ae4a98b630b4943949f8108b146e1997379f2c23a660fec325f10e5eddb SHA512 0e4d2906ff3ded58884b419a2c3bc771f70051d1c06fd500f0908e50512b49505c19057c4e63a04d81e418193d50c210672ff4dad3c06693e2e6e966c68dac45
 DIST pkgdev-0.2.1.tar.gz 66455 BLAKE2B 6f89b1601813adcb1263a044a096d187d7fa926f116a09dc2b1cec083f8d82da54ae00577c36d64ece5733d8952f8dc5f4dff94aeb695e851f340a30f04b203e SHA512 8277f74f3d9902da295c5436a46302627bdc1cb2a63f29b0603bf9bfa2c8bb812b26f12a54630cbbcba1e2bbac7352146f6ab59fc04cd8b89b46df1fe7c9f8dd
+DIST pkgdev-0.2.2-docs.tar.xz 5496 BLAKE2B 46df2c14370dbe1312e43e08388aa9a3f13e98c5c74b5762f9562cea1d5f6913fc352bc7a4dcce3aae1c3511e3735bc83946bcd0928e56faad32351e811dfbf0 SHA512 e950fa826036ab3cb6fc3ed4b1b5da533d32739ebdc912e77270f4621d378a31b51758801287fd9552c791fbe0f96019b62499ee06950b20f403260e61276237
+DIST pkgdev-0.2.2.tar.gz 66977 BLAKE2B 50b7c06339438ada28ffc9e8e8ba0c472342cbe447790ec7df7506979a1865ebdcd317071833b05091e3749f78857867729e905c1a971bf04e44137337106abe SHA512 f154c7442c40fb1ef5fe9917079db4ddf5bfda4b4d7ca964b9a11fad2a273e79971455142e99905e2293babf73b45d26974480faf0c5c1b25057afc6d658bdc2
 EBUILD pkgdev-0.2.1-r1.ebuild 1655 BLAKE2B edf95d40cb96f7abc2853578c87ff3e8edfeee86844e2ab942d83d55171706806f64f19cb829458f9a312d73d6e385930ab7f439a363f314ae01684e0bee63c5 SHA512 576098e57216e1639827d25aad586465a9c5fde7391e4c0521474c9e1923371903d30de1b835b5d21fd822c5ef3d6a579f2ff0935d6437e998f095d709f7c225
 EBUILD pkgdev-0.2.1-r2.ebuild 2457 BLAKE2B ef4123dd70d265c518f16470bafead9bcf82feb53770a4ac10ee58250b6f1fee890514c6ff6aea84b53e023794d7bd9555d3f72084b361cb3b1005c30a647a1d SHA512 a6620631f757ed0670e76d4ba58eb22a7c4d5831e457b5fdcb92562a9a7fc7754584c9a80610d7bd3de9508ddb81c7756970f7336f0e7d4c86039c51df441ce0
 EBUILD pkgdev-0.2.1-r3.ebuild 2449 BLAKE2B 9d192516dfe71e733ede5dd18e44af663a99e30f7d642e906efca2972393557b9e0bdb8422d10416585026d0ada388ef2adbed98c7112e3edbf96204ee39401f SHA512 5073e5a7a1a8b6982afc448317e71beb5125e4a2393552061b5e2fee0de0c27a255bea635a696b0cbe780efa6c2cf7bdb723d764edd244cf758f0d2d0639e513
-EBUILD pkgdev-9999.ebuild 2390 BLAKE2B 7d399dcbaac13e26592fa8c3323f03779f7386513dc3616d5aecfc8d7ed9a0d725914c12d10c2cef424be24dc360cc0f9fa5c3cfd7105d4446b1d07e7254fd82 SHA512 9c48745f935db02383a622814381ef78444ad4585150b5531195144e1408a5ab580d657829e3c814fcfaac9293a9f307985e251ec0590988854f65cdb2354777
+EBUILD pkgdev-0.2.2.ebuild 2392 BLAKE2B c56f5f559c8a4b4b4726c6f92a764069410af473d07aaa44cea78ead6eaa590fd282859eafe7262fc471cd6f42bc5ba9e261e79e96aeefd0ddc70ace9e9d733d SHA512 73f384ed2b5aee56ed5c24ae0b9ed46dfa10b33807d36e36af3208704a02b056df0c9304c3139332f27b2646f9eb30b2290a3ee7c93a4e5e2bc708a0c7d75759
+EBUILD pkgdev-9999.ebuild 2392 BLAKE2B c56f5f559c8a4b4b4726c6f92a764069410af473d07aaa44cea78ead6eaa590fd282859eafe7262fc471cd6f42bc5ba9e261e79e96aeefd0ddc70ace9e9d733d SHA512 73f384ed2b5aee56ed5c24ae0b9ed46dfa10b33807d36e36af3208704a02b056df0c9304c3139332f27b2646f9eb30b2290a3ee7c93a4e5e2bc708a0c7d75759
 MISC metadata.xml 606 BLAKE2B 9c87b0b058df2a15ad455e54499d6a52e31e5c8f51187d36a42a775f1fa03745c69c99179a21f8c44f64562f78ddade051a2a4568b7984600fc529f35e36811a SHA512 5c7151cd72132faf4d47837a58812aefb919edca3fb613a6751de265994bff327515a07d80dfe175069bde7097581f10cb453dde1545383e300735dfcac09bec
diff --git a/dev-util/pkgdev/pkgdev-0.2.2.ebuild b/dev-util/pkgdev/pkgdev-0.2.2.ebuild
new file mode 100644
index 000000000000..2dd46fdefcc4
--- /dev/null
+++ b/dev-util/pkgdev/pkgdev-0.2.2.ebuild
@@ -0,0 +1,84 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# Generate using https://github.com/thesamesam/sam-gentoo-scripts/blob/main/niche/generate-pkgdev-docs
+# Set to 1 if prebuilt, 0 if not
+# (the construct below is to allow overriding from env for script)
+: ${PKGDEV_DOCS_PREBUILT:=1}
+
+PKGDEV_DOCS_PREBUILT_DEV=sam
+PKGDEV_DOCS_VERSION=$(ver_cut 1-3)
+# Default to generating docs (inc. man pages) if no prebuilt; overridden later
+PKGDEV_DOCS_USEFLAG="+doc"
+
+PYTHON_COMPAT=( python3_{8..11} )
+DISTUTILS_IN_SOURCE_BUILD=1
+inherit distutils-r1
+
+if [[ ${PV} == *9999 ]] ; then
+	PKGDEV_DOCS_PREBUILT=0
+
+	EGIT_REPO_URI="https://github.com/pkgcore/pkgdev.git"
+	inherit git-r3
+else
+	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+	if [[ ${PKGDEV_DOCS_PREBUILT} -eq 1 ]] ; then
+		SRC_URI+=" !doc? ( https://dev.gentoo.org/~${PKGDEV_DOCS_PREBUILT_DEV}/distfiles/${CATEGORY}/${PN}/${PN}-${PKGDEV_DOCS_VERSION}-docs.tar.xz )"
+	fi
+
+	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86 ~x64-macos"
+fi
+
+DESCRIPTION="Collection of tools for Gentoo development"
+HOMEPAGE="https://github.com/pkgcore/pkgdev"
+
+LICENSE="BSD MIT"
+SLOT="0"
+
+[[ ${PKGDEV_DOCS_PREBUILT} == 1 ]] && PKGDEV_DOCS_USEFLAG="doc"
+
+IUSE="${PKGDEV_DOCS_USEFLAG}"
+
+if [[ ${PV} == *9999 ]] ; then
+	# https://github.com/pkgcore/pkgdev/blob/main/requirements/dev.txt
+	RDEPEND="
+		~dev-python/snakeoil-9999[${PYTHON_USEDEP}]
+		~dev-util/pkgcheck-9999[${PYTHON_USEDEP}]
+		~sys-apps/pkgcore-9999[${PYTHON_USEDEP}]
+	"
+else
+	# https://github.com/pkgcore/pkgdev/blob/main/requirements/install.txt
+	RDEPEND="
+		>=dev-python/snakeoil-0.9.12[${PYTHON_USEDEP}]
+		>=dev-util/pkgcheck-0.10.15[${PYTHON_USEDEP}]
+		>=sys-apps/pkgcore-0.12.14[${PYTHON_USEDEP}]
+	"
+fi
+
+# Uses pytest but we want to use the setup.py runner to get generated modules
+BDEPEND+="test? ( dev-python/pytest )"
+RDEPEND+="dev-vcs/git"
+
+distutils_enable_sphinx doc
+distutils_enable_tests setup.py
+
+python_compile_all() {
+	use doc && emake -C doc man
+
+	# HTML pages only
+	sphinx_compile_all
+}
+
+python_install_all() {
+	# If USE=doc, there'll be newly generated docs which we install instead.
+	if use doc ; then
+		doman doc/_build/man/*
+	elif ! use doc && [[ ${PKGDEV_DOCS_PREBUILT} == 1 ]] ; then
+		doman "${WORKDIR}"/${PN}-${PKGDEV_DOCS_VERSION}-docs/man/*.[0-8]
+	fi
+
+	distutils-r1_python_install_all
+}
diff --git a/dev-util/pkgdev/pkgdev-9999.ebuild b/dev-util/pkgdev/pkgdev-9999.ebuild
index 5172a308d581..2dd46fdefcc4 100644
--- a/dev-util/pkgdev/pkgdev-9999.ebuild
+++ b/dev-util/pkgdev/pkgdev-9999.ebuild
@@ -25,7 +25,7 @@ if [[ ${PV} == *9999 ]] ; then
 else
 	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
-	if [[ ${PKGDEV_DOCS_PREBUILT} == 1 ]] ; then
+	if [[ ${PKGDEV_DOCS_PREBUILT} -eq 1 ]] ; then
 		SRC_URI+=" !doc? ( https://dev.gentoo.org/~${PKGDEV_DOCS_PREBUILT_DEV}/distfiles/${CATEGORY}/${PN}/${PN}-${PKGDEV_DOCS_VERSION}-docs.tar.xz )"
 	fi
 
@@ -53,8 +53,8 @@ else
 	# https://github.com/pkgcore/pkgdev/blob/main/requirements/install.txt
 	RDEPEND="
 		>=dev-python/snakeoil-0.9.12[${PYTHON_USEDEP}]
-		>=dev-util/pkgcheck-0.10.0[${PYTHON_USEDEP}]
-		>=sys-apps/pkgcore-0.12.13[${PYTHON_USEDEP}]
+		>=dev-util/pkgcheck-0.10.15[${PYTHON_USEDEP}]
+		>=sys-apps/pkgcore-0.12.14[${PYTHON_USEDEP}]
 	"
 fi