gentoo resync : 20.03.2021

4 files changed, 74 insertions, 8 deletions

diff --git a/dev-util/pkgdev/Manifest b/dev-util/pkgdev/Manifest
index 4e6ba965f0e9..39d1a5cb8109 100644
--- a/dev-util/pkgdev/Manifest
+++ b/dev-util/pkgdev/Manifest
@@ -1,4 +1,6 @@
-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
+DIST pkgdev-0.1.1.tar.gz 31435 BLAKE2B 94f0246bdbc4ee91e6d570969df60ede6f756745e46b41d3a66f1518891c67f15e6daf4ba4eea91d0427346e9d5336b817b7ef918acd717fa7cf704e0151ee7b SHA512 30c70e11fdfb414b2818559eeae250f1a8330187a9b7006475a539aa7fbdeb81b4b0a564fd79105119f697db80845fbd6bd42d278c9339781eb674843cd49717
+DIST pkgdev-0.1.2.tar.gz 32579 BLAKE2B 42ecd7403dcb49b256539e12c22a6bca72884bf55139c5f0972961fbebf4f976dedd3a4fac1186cc1d5af62d339ac7dd3eb20106ff1dcc7b8c264e1c4c53c3de SHA512 c224a054612fd6caa9c66855be9bb5ed439c3ac2abf5b32c4ac516d87fa4e345fc8bc328aa74b4fec44d7fd319322bb42af48f6dfdfff941e3b819a75b9fae9b
+EBUILD pkgdev-0.1.1.ebuild 1533 BLAKE2B 9370cf9d8343d9bb2ebc040561e87d5b5203cb237684f581afd61166a82fbcb92a27f0a68f47e6b09203ad6d101893592ce713147f5ae99ec73326ca711953f2 SHA512 a8a7468cc49526b34cbaf3aa19812681365fa2f14feaa46e8f15980b0a5a31c84e26c1afc191938bf823dfa22d63552a12b30974d53d5015840f0f09d595be31
+EBUILD pkgdev-0.1.2.ebuild 1544 BLAKE2B 8ae62335378a5dc3e826e3db386cca2be16280f41582d4f30c1cbccae31202c608f7cc67ab1f1f4695efc3055338ed3fe3d7a2432502d98d58e698e182017fc9 SHA512 f43bae40fa31725cd7d6ec49ddcbeb1d6cf142940ece6c73f9d7c06d16d6e590c08e56ee87c3aaf407adbab086b2c2be356896f0fc4a23b607e0b4f3ff7e611a
+EBUILD pkgdev-9999.ebuild 1544 BLAKE2B 246fce7c899c709848e29dac7b74cffd8d44dda6be1c7db7b30506413d303ae467bef09be70039406ed29b9847f619447ffd8d19ad1989a362c9ea1864e14b30 SHA512 08602dcf3e3934551c9b774e6e000210eee08a48dbf2c948caf03efe7d7e810bf4af8128e06e264288c3c3f9356bb947f65677f02701489dc4c2c624f015d47e
 MISC metadata.xml 318 BLAKE2B 857b4e6e454663321e0c8f2b9083246459e751c4a1b0c7d900935274efcb63e82379e66984639e41a1adddb32cb995d4ccc99e910f76f3bf19d543d82520b1ef SHA512 40feecfb7907213bad0ee60f17e748aebbc4df381f59bfa47f3a5c9938917b032a37dce6650be4d60e695c17356290a7be984e1d235d219749b11d73d2fa2f6e
diff --git a/dev-util/pkgdev/pkgdev-0.1.1.ebuild b/dev-util/pkgdev/pkgdev-0.1.1.ebuild
new file mode 100644
index 000000000000..310eba8bb7b9
--- /dev/null
+++ b/dev-util/pkgdev/pkgdev-0.1.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.4[${PYTHON_USEDEP}]
+		>=dev-util/pkgcheck-0.9.1[${PYTHON_USEDEP}]
+		>=sys-apps/pkgcore-0.11.5[${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.ebuild b/dev-util/pkgdev/pkgdev-0.1.2.ebuild
index fdf04f9fc038..d3bd40f87aeb 100644
--- a/dev-util/pkgdev/pkgdev-0.1.ebuild
+++ b/dev-util/pkgdev/pkgdev-0.1.2.ebuild
@@ -11,8 +11,8 @@ 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"
+	KEYWORDS="~amd64 ~x64-macos"
 fi
 
 DESCRIPTION="Collection of tools for Gentoo development"
diff --git a/dev-util/pkgdev/pkgdev-9999.ebuild b/dev-util/pkgdev/pkgdev-9999.ebuild
index 041813b0cea7..b94c6c1d71d8 100644
--- a/dev-util/pkgdev/pkgdev-9999.ebuild
+++ b/dev-util/pkgdev/pkgdev-9999.ebuild
@@ -11,8 +11,8 @@ 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"
+	KEYWORDS="~amd64 ~x64-macos"
 fi
 
 DESCRIPTION="Collection of tools for Gentoo development"
@@ -31,9 +31,9 @@ if [[ ${PV} == *9999 ]] ; then
 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}]
+		>=dev-python/snakeoil-0.9.4[${PYTHON_USEDEP}]
+		>=dev-util/pkgcheck-0.9.1[${PYTHON_USEDEP}]
+		>=sys-apps/pkgcore-0.11.5[${PYTHON_USEDEP}]
 	"
 fi