gentoo resync : 12.03.2021

3 files changed, 79 insertions, 5 deletions

diff --git a/dev-util/pkgdev/Manifest b/dev-util/pkgdev/Manifest
index fb899bbdcc3f..4e6ba965f0e9 100644
--- a/dev-util/pkgdev/Manifest
+++ b/dev-util/pkgdev/Manifest
@@ -1,2 +1,4 @@
-EBUILD pkgdev-9999.ebuild 1250 BLAKE2B 57ff9a8e6d25ad8c7e8ebb63a213fe31656ffd19fe21d255c7384b801cb649bbf247ed9e06a6f6f6866dfda398837e4d293aafe1ddf94534e52654b60d70caf6 SHA512 d6c56880df065e97fd30331ad0881ca533695b4dc55fc3d876faa000c8d31968ecb387e6fed6b4dfc88f26ba0da85bc6887b7980e1adab44730c3c7743ee3abd
+DIST pkgdev-0.1.tar.gz 26075 BLAKE2B e7f7a83d91ef923bdd38465e7c70d6a2d0693d945273583937b4f444e26493887c5aeff9cf6a353dc02c42786d635eda7cc0fbfbc888be2b0e4eee883b5bd9c6 SHA512 1714857c3d66655226a4217ec8955662c5e37022c92183bdd8e61f91ff46f335935af8d6badf79f7c9f894a56b970ab0109f9b18ac7f3e59722d096ce2f24664
+EBUILD pkgdev-0.1.ebuild 1533 BLAKE2B b52d4e7310632fab48a5879e1990eb9d5789b9e7c19c743926756b8d4dcdaee43dd055ef6e8a400999ac933fa1450859a24d56af5980eccd8253e06c6d459776 SHA512 f8f85c891036270e560853e6a27dc13272164ddb410b4372dd6b185d20aecd5b593fe5f335dc590a04fbed48fecea999906ed665f872d153d73664d752e9cc75
+EBUILD pkgdev-9999.ebuild 1532 BLAKE2B 35f3dfc9677eb887f97cfc736e61d10d950e8cbb3e49092ad201ebd547223a68230af7bd053ab695f72a71e1eb7f356b554c8bccdad25065b0a6788c58645245 SHA512 ad2abc4203f8a06a633f1ac1b41067091d3b1467d56bd855ae52d6cc4f42cf3d22562c27ea4f7a5850833e99739d9fdcc3657d993843081ab2e879de3c0fcab7
 MISC metadata.xml 318 BLAKE2B 857b4e6e454663321e0c8f2b9083246459e751c4a1b0c7d900935274efcb63e82379e66984639e41a1adddb32cb995d4ccc99e910f76f3bf19d543d82520b1ef SHA512 40feecfb7907213bad0ee60f17e748aebbc4df381f59bfa47f3a5c9938917b032a37dce6650be4d60e695c17356290a7be984e1d235d219749b11d73d2fa2f6e
diff --git a/dev-util/pkgdev/pkgdev-0.1.ebuild b/dev-util/pkgdev/pkgdev-0.1.ebuild
new file mode 100644
index 000000000000..fdf04f9fc038
--- /dev/null
+++ b/dev-util/pkgdev/pkgdev-0.1.ebuild
@@ -0,0 +1,64 @@
+# 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/pkgdev.git"
+	inherit git-r3
+else
+	KEYWORDS="~amd64"
+	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+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.3[${PYTHON_USEDEP}]
+		>=dev-util/pkgcheck-0.9.1[${PYTHON_USEDEP}]
+		>=sys-apps/pkgcore-0.11.4[${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-9999.ebuild b/dev-util/pkgdev/pkgdev-9999.ebuild
index 6a425ed841c9..041813b0cea7 100644
--- a/dev-util/pkgdev/pkgdev-9999.ebuild
+++ b/dev-util/pkgdev/pkgdev-9999.ebuild
@@ -15,7 +15,7 @@ else
 	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 fi
 
-DESCRIPTION="pkgcore-based git QA tool"
+DESCRIPTION="Collection of tools for Gentoo development"
 HOMEPAGE="https://github.com/pkgcore/pkgdev"
 
 LICENSE="BSD MIT"
@@ -26,15 +26,23 @@ if [[ ${PV} == *9999 ]] ; then
 	RDEPEND="
 		~dev-python/snakeoil-9999[${PYTHON_USEDEP}]
 		~dev-util/pkgcheck-9999[${PYTHON_USEDEP}]
-		dev-vcs/git
 		~sys-apps/pkgcore-9999[${PYTHON_USEDEP}]
 	"
+else
+	# https://github.com/pkgcore/pkgdev/blob/main/requirements/install.txt
+	RDEPEND="
+		>=dev-python/snakeoil-0.9.3[${PYTHON_USEDEP}]
+		>=dev-util/pkgcore-0.11.4[${PYTHON_USEDEP}]
+		>=sys-apps/pkgcore-0.9.1[${PYTHON_USEDEP}]
+	"
 fi
 
-# Releases (in future): https://github.com/pkgcore/pkgdev/blob/main/requirements/install.txt
+# 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 pytest
+distutils_enable_tests setup.py
 
 python_install_all() {
 	# We'll generate man pages ourselves