gentoo resync : 29.12.2022

6 files changed, 48 insertions, 88 deletions

diff --git a/dev-util/pkgdev/Manifest b/dev-util/pkgdev/Manifest
index 33668ec415c2..4470db6fb4b8 100644
--- a/dev-util/pkgdev/Manifest
+++ b/dev-util/pkgdev/Manifest
@@ -1,6 +1,5 @@
-DIST pkgdev-0.1.9.tar.gz 57093 BLAKE2B 5f5d9b4956cdc949d5e37c24160c692c32cf7e5d9fe90c167adc364993370dc42291edca048db3b0a2f17b199003aea61bd6b541bc58de1c1a084365ce517660 SHA512 78c117163549cb021e8cb9bd65e9a7752633506f3db825133fc3c4c515549c6e10dc974164489c06f94c1a1e25acb8fe050a57754353b907d6026892ef034cb2
-DIST pkgdev-0.2.0.tar.gz 59836 BLAKE2B 89de7179b1365f7f4bf1359720200bc8dba53e3b3133fead12b224db8d9a6cf7accbed3c5ed89760030efd3a992d46cf525756a522ac4d9128376e4c03b2a5e9 SHA512 6bf17e8188c809e8862c1a39ce4c0c2e60ed0a261f00bf93707257df0395b03120838247bdc7f5a3375111797564a5a6b16bb8f7e571ce957efe92e173a6ed11
-EBUILD pkgdev-0.1.9.ebuild 1588 BLAKE2B 85333c27c4d55c4e226dcfee8402614336e15964b0e9c72a0707fba1ec147dddd1bea9097d729f1e445da6aca6161778a1ecf193149d8fdd341823f9b710cbc4 SHA512 89b7752b01592d67c7ee4d49fd14de38a436fe4ef05dedd6aacfa7aec830b9a48a841aacd0d9148516f0b47c4b4d776f17fba7d61da6f245a8b2f66af1467f0b
-EBUILD pkgdev-0.2.0.ebuild 1602 BLAKE2B 4921ad31f4a0a936ed1a390f7575030c8a04d77542ca4903e0b2c93dbea27687da417b9ab1a7a3ebe4589ae0ba68f6dd2f4f7625d9e432b453c7b973a215ea02 SHA512 9da646cc648eb745a2a24d7fa0390d2add59005accfe7c6d591954671e4ca087ae8025413f6d250d0d3b3ab0090e09ae38ad315a15a0c274cd1989ca482b1b50
-EBUILD pkgdev-9999.ebuild 1581 BLAKE2B 45c96a8cd5704424126646cf5b86ad44edb03e5d38a17d000b28644cf0ab1c44e982c62f5f768d89282c4e48962ffaac64790e99d6f50458bdf72993889004be SHA512 a17a1aebd6169d8b8b49a76f39b158cb7f25511dbb984b70f07e64c60b235c071c81947a51d45f38a8bbd58f6314cdf733638a36ff500062dba0942c9abf94c7
-MISC metadata.xml 538 BLAKE2B 856860c07254a3a7d051773121d85d1e227e69dc70373a1adcef4ebe08b48e48ab5f225f528fad5cb5d82c96b9a93a9bc88c5d00248598d39954f7dabfa2972b SHA512 3ec400568986c34edd550d3f55c76fa046e43b83a95c4c302c04b9707319db42424fb4bf6a06cf6c431decada9434feb80e0c6375a2e217a56e9da4f40e97ac3
+AUX pkgdev-0.2.1-fix-signoff-example.patch 920 BLAKE2B dbf577e4dbc374b26519d459b2bb17ae5dc659e8373a7cf3aac52699c6ec101159fbdb2fce78b8b22b525637e35b6aea0e2b94ed9d81fc3e320b7290934cde09 SHA512 aa9f067dcbec520392327333317eef17f3153369e0d072d2b0f85f971de2151a649d5ce23183fcbb4b6210b872ce905f99e223ad91950e47dc7bdaa761f522a4
+DIST pkgdev-0.2.1.tar.gz 66455 BLAKE2B 6f89b1601813adcb1263a044a096d187d7fa926f116a09dc2b1cec083f8d82da54ae00577c36d64ece5733d8952f8dc5f4dff94aeb695e851f340a30f04b203e SHA512 8277f74f3d9902da295c5436a46302627bdc1cb2a63f29b0603bf9bfa2c8bb812b26f12a54630cbbcba1e2bbac7352146f6ab59fc04cd8b89b46df1fe7c9f8dd
+EBUILD pkgdev-0.2.1-r1.ebuild 1655 BLAKE2B edf95d40cb96f7abc2853578c87ff3e8edfeee86844e2ab942d83d55171706806f64f19cb829458f9a312d73d6e385930ab7f439a363f314ae01684e0bee63c5 SHA512 576098e57216e1639827d25aad586465a9c5fde7391e4c0521474c9e1923371903d30de1b835b5d21fd822c5ef3d6a579f2ff0935d6437e998f095d709f7c225
+EBUILD pkgdev-9999.ebuild 1604 BLAKE2B a39780d43843a44a4bac8cc14a22ea279be859e8c27b0c02bdf2f60529be3d377c42b0622d5124612f3595d7079bae8b4e94147846eb2441e98c5dfaa204ca64 SHA512 02c76fe419682bff30cdb0146e6ac8898aa6b05957a957831154847764be1fd00de0bfc95dea334b9005861d96d1ce0189594d779c4f789d6ccdb61c092d4ad2
+MISC metadata.xml 606 BLAKE2B 9c87b0b058df2a15ad455e54499d6a52e31e5c8f51187d36a42a775f1fa03745c69c99179a21f8c44f64562f78ddade051a2a4568b7984600fc529f35e36811a SHA512 5c7151cd72132faf4d47837a58812aefb919edca3fb613a6751de265994bff327515a07d80dfe175069bde7097581f10cb453dde1545383e300735dfcac09bec
diff --git a/dev-util/pkgdev/files/pkgdev-0.2.1-fix-signoff-example.patch b/dev-util/pkgdev/files/pkgdev-0.2.1-fix-signoff-example.patch
new file mode 100644
index 000000000000..9fddf8a768fb
--- /dev/null
+++ b/dev-util/pkgdev/files/pkgdev-0.2.1-fix-signoff-example.patch
@@ -0,0 +1,25 @@
+https://github.com/pkgcore/pkgdev/commit/b780cf967804cb532421ef7cced5f1964224d8dd
+
+From: Arthur Zamarin <arthurzam@gentoo.org>
+Date: Mon, 23 May 2022 22:07:43 +0300
+Subject: [PATCH] docs: fix signoff example
+
+Fixes: https://github.com/pkgcore/pkgdev/issues/72
+Signed-off-by: Arthur Zamarin <arthurzam@gentoo.org>
+--- a/doc/man/config.rst
++++ b/doc/man/config.rst
+@@ -34,10 +34,10 @@ related values. To find all possible configuration options, run:
+     push.ask = true
+ 
+ - Add `Signed-off-by` consenting to the `Certificate of Origin <https://www.gentoo.org/glep/glep-0076.html#certificate-of-origin>`_
+-  to all commits for the 'gentoo' repository::
++  to all commits::
+ 
+-    [gentoo]
+-    push.signoff = true
++    [DEFAULT]
++    commit.signoff = true
+ 
+ - When committing, stage all files in current working directory (note that this
+   option doesn't expect value, therefore no value is defined post equal sign)::
+
diff --git a/dev-util/pkgdev/metadata.xml b/dev-util/pkgdev/metadata.xml
index fea86a0ce71e..84522b26edf2 100644
--- a/dev-util/pkgdev/metadata.xml
+++ b/dev-util/pkgdev/metadata.xml
@@ -13,7 +13,9 @@
 		<email>mgorny@gentoo.org</email>
 		<name>Michał Górny</name>
 	</maintainer>
+	<stabilize-allarches/>
 	<upstream>
 		<remote-id type="github">pkgcore/pkgdev</remote-id>
+		<remote-id type="pypi">pkgdev</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-util/pkgdev/pkgdev-0.2.0.ebuild b/dev-util/pkgdev/pkgdev-0.2.0.ebuild
deleted file mode 100644
index 6e52159b76e3..000000000000
--- a/dev-util/pkgdev/pkgdev-0.2.0.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2022 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/pkgdev.git"
-	inherit git-r3
-else
-	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-	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"
-
-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.6[${PYTHON_USEDEP}]
-		>=dev-util/pkgcheck-0.10.0[${PYTHON_USEDEP}]
-		>=sys-apps/pkgcore-0.12.0[${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_install_all() {
-	# We'll generate man pages ourselves
-	# Revisit when a release is made
-	# to pregenerate them, making USE=doc
-	# for generating the real HTML docs only.
-	if use doc ; then
-		cd doc || die
-		emake man
-		doman _build/man/*
-	fi
-
-	cd .. || die
-
-	# HTML pages only
-	sphinx_compile_all
-
-	distutils-r1_python_install_all
-}
diff --git a/dev-util/pkgdev/pkgdev-0.1.9.ebuild b/dev-util/pkgdev/pkgdev-0.2.1-r1.ebuild
index 69bbf2819e93..d325a89554c8 100644
--- a/dev-util/pkgdev/pkgdev-0.1.9.ebuild
+++ b/dev-util/pkgdev/pkgdev-0.2.1-r1.ebuild
@@ -12,7 +12,7 @@ if [[ ${PV} == *9999 ]] ; then
 	inherit git-r3
 else
 	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-	KEYWORDS="amd64 arm arm64 ~hppa ppc ppc64 ~riscv sparc x86 ~x64-macos"
+	KEYWORDS="amd64 arm arm64 hppa ~loong ppc ppc64 ~riscv sparc x86 ~x64-macos"
 fi
 
 DESCRIPTION="Collection of tools for Gentoo development"
@@ -41,24 +41,25 @@ fi
 BDEPEND+="test? ( dev-python/pytest )"
 RDEPEND+="dev-vcs/git"
 
+PATCHES=(
+	"${FILESDIR}"/${P}-fix-signoff-example.patch
+)
+
 distutils_enable_sphinx doc
 distutils_enable_tests setup.py
 
-python_install_all() {
+python_compile_all() {
 	# We'll generate man pages ourselves
 	# Revisit when a release is made
 	# to pregenerate them, making USE=doc
 	# for generating the real HTML docs only.
-	if use doc ; then
-		cd doc || die
-		emake man
-		doman _build/man/*
-	fi
-
-	cd .. || die
+	use doc && emake -C doc man
 
 	# HTML pages only
 	sphinx_compile_all
+}
 
+python_install_all() {
+	use doc && doman doc/_build/man/*
 	distutils-r1_python_install_all
 }
diff --git a/dev-util/pkgdev/pkgdev-9999.ebuild b/dev-util/pkgdev/pkgdev-9999.ebuild
index 94052c39603d..7453376035da 100644
--- a/dev-util/pkgdev/pkgdev-9999.ebuild
+++ b/dev-util/pkgdev/pkgdev-9999.ebuild
@@ -12,7 +12,7 @@ if [[ ${PV} == *9999 ]] ; then
 	inherit git-r3
 else
 	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm64 ~loong ~ppc64 ~riscv ~sparc ~x64-macos"
+	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86 ~x64-macos"
 fi
 
 DESCRIPTION="Collection of tools for Gentoo development"
@@ -44,21 +44,18 @@ RDEPEND+="dev-vcs/git"
 distutils_enable_sphinx doc
 distutils_enable_tests setup.py
 
-python_install_all() {
+python_compile_all() {
 	# We'll generate man pages ourselves
 	# Revisit when a release is made
 	# to pregenerate them, making USE=doc
 	# for generating the real HTML docs only.
-	if use doc ; then
-		cd doc || die
-		emake man
-		doman _build/man/*
-	fi
-
-	cd .. || die
+	use doc && emake -C doc man
 
 	# HTML pages only
 	sphinx_compile_all
+}
 
+python_install_all() {
+	use doc && doman doc/_build/man/*
 	distutils-r1_python_install_all
 }