11 files changed, 94 insertions, 32 deletions
diff --git a/dev-util/howdoi/Manifest b/dev-util/howdoi/Manifest
index 4c2206b33842..94cc96173b60 100644
--- a/dev-util/howdoi/Manifest
+++ b/dev-util/howdoi/Manifest
@@ -1,2 +1,3 @@
 DIST howdoi-2.0.15.tar.gz 27545 BLAKE2B 204d7e3ddab07e24ccc08964c3880477743970502423887a2360079606c832b93d1e8fbcec237b77533c2e21d4a35af08b9418d5ce62f8b2ceca70ee844c21ff SHA512 e0b3faf1cde78d35a23e11070b3d73db7468bfe79ec8f71b2370681d3dea1bcf1a313594fd1e4f21aa62035460e5c31509ff683fea3e0e35e9412b173ad874bb
 DIST howdoi-2.0.16.tar.gz 28483 BLAKE2B 466ddc6b6f5a2bfbbf781dddf89d272b609d530b080a06dd33528727010dd6f42b823996bfb3fcbb4afea95fc667f61d30b1cf17a8c5fb1a4c66836be57e1110 SHA512 606346514670d891df91c6d3bd83cae599b2ed2d7d1908b8b805435579ea75c6e25f171bc31af1af7519ac142459b73cae7ffe93d747effb2fb0cee00aa59b1b
+DIST howdoi-2.0.17.tar.gz 26892 BLAKE2B 5b0eee59a3136db35a40a5ffeac6fb95378bf036e005ae0bbfac894969e54435720396bb8f9bc45b3aa575a8955f203b7f352d7cedc0031443e358b9db11808e SHA512 e9b67386909e7015eff45db33857e935a2e995d6b08c1ee9d9d13caeab4c25b9dd9eab2a8bc653684c5b5b0e33b6b1eef382ab559736099811bae4f74bb784aa
diff --git a/dev-util/howdoi/howdoi-2.0.17.ebuild b/dev-util/howdoi/howdoi-2.0.17.ebuild
new file mode 100644
index 000000000000..37004386274c
--- /dev/null
+++ b/dev-util/howdoi/howdoi-2.0.17.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DISTUTILS_USE_SETUPTOOLS="manual"
+PYTHON_COMPAT=( python3_{6,7,8,9,10} )
+inherit distutils-r1
+
+DESCRIPTION="A code search tool"
+HOMEPAGE="https://pypi.org/project/howdoi/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+BDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+RDEPEND="
+	dev-python/appdirs[${PYTHON_USEDEP}]
+	dev-python/cachelib[${PYTHON_USEDEP}]
+	dev-python/keep[${PYTHON_USEDEP}]
+	dev-python/pygments[${PYTHON_USEDEP}]
+	>=dev-python/pyquery-1.4.1[${PYTHON_USEDEP}]
+	>=dev-python/requests-2.24.0[${PYTHON_USEDEP}]
+"
diff --git a/dev-util/pkgcheck/Manifest b/dev-util/pkgcheck/Manifest
index 937d448ceb21..6a73064e204d 100644
--- a/dev-util/pkgcheck/Manifest
+++ b/dev-util/pkgcheck/Manifest
@@ -2,4 +2,5 @@ DIST pkgcheck-0.10.0.tar.gz 453555 BLAKE2B aeb211619f400b729a9f5e7e1ffa787c33c1c
 DIST pkgcheck-0.10.1.tar.gz 454051 BLAKE2B ba0e91fee539d0a41c27da08c91e1c65078eaebea33b8254cbad38d49feb91a4aa490992a5d88bd96ce0570d89f9f8343d0ff0a2d7368f09d55637b2597aad6b SHA512 044067928bc1c1280a95e785def80e6ebb289e0882f9a61b18d1d75ddc22c4f7eea1da4a4621fd5a598c3e7ee75ece2adedb936086f3c3cbc92c23ab93419215
 DIST pkgcheck-0.10.2.tar.gz 454643 BLAKE2B 4585a72ce9675a23a3bcd7228ac811bdf45bacf2a25d91b9665f833de6dffbac5c4e11405b112bd5dd6e643fc51c3f57cf7dda989c2521c11e279324a02740c7 SHA512 0151d6fb81f800d46b65bb02bd5474ae36e8e4dc35376f1abfaa1c8be61e3429e527947b42f76c9f6da5ede648617d58f6b9ac44a93ff58175b748dfd9a43cbe
 DIST pkgcheck-0.10.3.tar.gz 454953 BLAKE2B 5ee2c13cb1ca5b13bfcd8434700c69e6839c5dc2f25dec4060020f8477159ff071b1487a446ba7e03bf1b8d139e8c65a1cd21a777d8bfe3ce677bbfe39b8d85f SHA512 edef25fc1542c3d3fb89c0c1546ebfa736b6ad4b113b0e6bc9ede379b0a5cb9ece5dd8b79ddb2df2cfeaf7f67f290e96a8baee1f2dfcc3bcebe32d9dcf4c264e
+DIST pkgcheck-0.10.4.tar.gz 455252 BLAKE2B 3fb8183120b8a45569a007e4c9e521e5b070554523c5c2fbf44c383996896924800d42f79f9809e0fcc3b04363b2c50a8894b547376a8c030f4d0451c7f943bf SHA512 f5f01340ff4ac882da8e56cbb44440425dcb42c5ed6a9ab102c435a61cfca6861a421ee294039f055fec5b93cae338ea4ba23237f1ba509e6e24bdba351427eb
 DIST pkgcheck-0.9.7.tar.gz 453478 BLAKE2B 486bae68af1757fbdb4b109b34cea836cb6dee258d4e53b4c3818c1aa6194da86e7ee339335ac6f2a1c2fb89a547f46658fadd88706fa807a9fdce2bb82a5c65 SHA512 e8fc02997d558af1e8e89a13130076b4db59e9c2a8ea383d0dca9a57375dae1fb315619593178d67c89d30e7b16810905694c838ea4ec608eaee195fa4797569
diff --git a/dev-util/pkgcheck/pkgcheck-0.10.4.ebuild b/dev-util/pkgcheck/pkgcheck-0.10.4.ebuild
new file mode 100644
index 000000000000..c29cb23df425
--- /dev/null
+++ b/dev-util/pkgcheck/pkgcheck-0.10.4.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{6,7,8,9,10} )
+DISTUTILS_IN_SOURCE_BUILD=1
+inherit distutils-r1 optfeature
+
+if [[ ${PV} == *9999 ]] ; then
+	EGIT_REPO_URI="https://github.com/pkgcore/pkgcheck.git"
+	inherit git-r3
+else
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
+	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+fi
+
+DESCRIPTION="pkgcore-based QA utility for ebuild repos"
+HOMEPAGE="https://github.com/pkgcore/pkgcheck"
+
+LICENSE="BSD MIT"
+SLOT="0"
+
+if [[ ${PV} == *9999 ]]; then
+	RDEPEND="
+		~dev-python/snakeoil-9999[${PYTHON_USEDEP}]
+		~sys-apps/pkgcore-9999[${PYTHON_USEDEP}]"
+else
+	RDEPEND="
+		>=dev-python/snakeoil-0.9.6[${PYTHON_USEDEP}]
+		>=sys-apps/pkgcore-0.12.1[${PYTHON_USEDEP}]"
+fi
+RDEPEND+="
+	dev-python/chardet[${PYTHON_USEDEP}]
+	dev-python/lazy-object-proxy[${PYTHON_USEDEP}]
+	dev-python/lxml[${PYTHON_USEDEP}]
+	dev-python/pathspec[${PYTHON_USEDEP}]
+	>=dev-python/tree-sitter-0.19.0[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? ( dev-python/pytest[${PYTHON_USEDEP}] )
+"
+
+distutils_enable_tests setup.py
+
+src_test() {
+	local -x PYTHONDONTWRITEBYTECODE=
+	distutils-r1_src_test
+}
+
+python_install_all() {
+	local DOCS=( NEWS.rst )
+	[[ ${PV} == *9999 ]] || doman man/*
+	distutils-r1_python_install_all
+}
+
+pkg_postinst() {
+	optfeature "Network check support" dev-python/requests
+	optfeature "Perl module version check support" dev-perl/Gentoo-PerlMod-Version
+}
diff --git a/dev-util/pkgconf/files/pkgconf-1.7.3-darwin9.patch b/dev-util/pkgconf/files/pkgconf-1.7.3-darwin9.patch
deleted file mode 100644
index f41de43b97c5..000000000000
--- a/dev-util/pkgconf/files/pkgconf-1.7.3-darwin9.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-darwin9 does not malloc on NULL resolved_path
-
-https://github.com/pkgconf/pkgconf/pull/208
-
---- a/libpkgconf/path.c
-+++ b/libpkgconf/path.c
-@@ -92,15 +92,11 @@
- 			return;
- 		if (S_ISLNK(st.st_mode))
- 		{
--			char *linkdest = realpath(path, NULL);
-+			char pathbuf[PATH_MAX];
-+			char *linkdest = realpath(path, pathbuf);
- 
- 			if (linkdest != NULL && stat(linkdest, &st) == -1)
--			{
--				free(linkdest);
- 				return;
--			}
--
--			free(linkdest);
- 		}
- 		if (path_list_contains_entry(path, dirlist, &st))
- 			return;
diff --git a/dev-util/pkgconf/metadata.xml b/dev-util/pkgconf/metadata.xml
index 6d8b61a41930..b0aec79f2de1 100644
--- a/dev-util/pkgconf/metadata.xml
+++ b/dev-util/pkgconf/metadata.xml
@@ -9,6 +9,9 @@
   <email>polynomial-c@gentoo.org</email>
   <name>Lars Wendler</name>
  </maintainer>
+ <maintainer type="project">
+  <email>base-system@gentoo.org</email>
+ </maintainer>
  <upstream>
   <remote-id type="cpe">cpe:/a:pkgconf:pkgconf</remote-id>
  </upstream>
diff --git a/dev-util/pkgconf/pkgconf-1.7.4.ebuild b/dev-util/pkgconf/pkgconf-1.7.4.ebuild
index 28f583d94f5f..edfc4c30bd49 100644
--- a/dev-util/pkgconf/pkgconf-1.7.4.ebuild
+++ b/dev-util/pkgconf/pkgconf-1.7.4.ebuild
@@ -40,8 +40,6 @@ MULTILIB_CHOST_TOOLS=(
 src_prepare() {
 	default
 
-	[[ ${CHOST} == *-darwin9 ]] && eapply "${FILESDIR}"/${PN}-1.7.3-darwin9.patch
-
 	[[ ${PV} == "9999" ]] && eautoreconf
 	if use pkg-config; then
 		MULTILIB_CHOST_TOOLS+=(
diff --git a/dev-util/pkgconf/pkgconf-1.8.0.ebuild b/dev-util/pkgconf/pkgconf-1.8.0.ebuild
index 5be8ccdbf798..257e865e259d 100644
--- a/dev-util/pkgconf/pkgconf-1.8.0.ebuild
+++ b/dev-util/pkgconf/pkgconf-1.8.0.ebuild
@@ -40,8 +40,6 @@ MULTILIB_CHOST_TOOLS=(
 src_prepare() {
 	default
 
-	[[ ${CHOST} == *-darwin9 ]] && eapply "${FILESDIR}"/${PN}-1.7.3-darwin9.patch
-
 	[[ ${PV} == "9999" ]] && eautoreconf
 	if use pkg-config; then
 		MULTILIB_CHOST_TOOLS+=(
diff --git a/dev-util/pkgconf/pkgconf-9999.ebuild b/dev-util/pkgconf/pkgconf-9999.ebuild
index a29e166995b7..257e865e259d 100644
--- a/dev-util/pkgconf/pkgconf-9999.ebuild
+++ b/dev-util/pkgconf/pkgconf-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2012-2020 Gentoo Authors
+# Copyright 2012-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -10,7 +10,7 @@ if [[ ${PV} == "9999" ]] ; then
 	EGIT_REPO_URI="https://git.sr.ht/~kaniini/pkgconf"
 else
 	SRC_URI="http://distfiles.dereferenced.org/${PN}/${P}.tar.xz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~ppc-macos ~x64-macos"
 fi
 
 DESCRIPTION="pkg-config compatible replacement with no dependencies other than ANSI C89"
diff --git a/dev-util/umockdev/umockdev-0.16.1-r1.ebuild b/dev-util/umockdev/umockdev-0.16.1-r1.ebuild
index 2032c8176d24..ecb763035a26 100644
--- a/dev-util/umockdev/umockdev-0.16.1-r1.ebuild
+++ b/dev-util/umockdev/umockdev-0.16.1-r1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/martinpitt/umockdev/releases/download/${PV}/${P}.tar
 
 LICENSE="LGPL-2.1+"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~sparc ~x86"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~sparc ~x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-util/visualvm/visualvm-2.0.7.ebuild b/dev-util/visualvm/visualvm-2.0.7.ebuild
index e132e704c5ce..001ed43cc6e0 100644
--- a/dev-util/visualvm/visualvm-2.0.7.ebuild
+++ b/dev-util/visualvm/visualvm-2.0.7.ebuild
@@ -19,7 +19,7 @@ SRC_URI="https://github.com/oracle/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2-with-linking-exception"
 SLOT="7"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
 
 RDEPEND="
 	>=virtual/jre-1.8"