5 files changed, 18 insertions, 9 deletions
diff --git a/dev-util/anjuta/metadata.xml b/dev-util/anjuta/metadata.xml
index 98cdff4e1d4d..bde50910897c 100644
--- a/dev-util/anjuta/metadata.xml
+++ b/dev-util/anjuta/metadata.xml
@@ -11,6 +11,8 @@
 		reduced to the base library, allowing applications built on Anjuta to
 		still be run.
 	</longdescription>
- 
+ <upstream>
+  <remote-id type="cpe">cpe:/a:gnome:anjuta</remote-id>
+ </upstream>
  <origin>gentoo-staging</origin>
 </pkgmetadata>
 \ No newline at end of file
diff --git a/dev-util/opencl-headers/opencl-headers-2022.05.18.ebuild b/dev-util/opencl-headers/opencl-headers-2022.05.18-r1.ebuild
index 1a6a9ed81af1..245fefd3e4c0 100644
--- a/dev-util/opencl-headers/opencl-headers-2022.05.18.ebuild
+++ b/dev-util/opencl-headers/opencl-headers-2022.05.18-r1.ebuild
@@ -3,6 +3,8 @@
 
 EAPI=8
 
+inherit cmake
+
 MY_PN="OpenCL-Headers"
 MY_P="${MY_PN}-${PV}"
 
@@ -13,12 +15,15 @@ SRC_URI="https://github.com/KhronosGroup/${MY_PN}/archive/refs/tags/v${PV}.tar.g
 LICENSE="Apache-2.0"
 SLOT="0"
 KEYWORDS="~amd64 ~ppc64 ~x86"
+IUSE="test"
 
-S="${WORKDIR}"/${MY_P}
+RESTRICT="!test? ( test )"
 
-src_install() {
-	insinto /usr/include
-	doins -r "${S}"/CL
+S="${WORKDIR}"/${MY_P}
 
-	einstalldocs
+src_configure() {
+	local mycmakeargs=(
+		-DBUILD_TESTING=$(usex test)
+	)
+	cmake_src_configure
 }
diff --git a/dev-util/pkgcheck/pkgcheck-0.10.12.ebuild b/dev-util/pkgcheck/pkgcheck-0.10.12.ebuild
index 16f04b26de11..46a15a0d4d9e 100644
--- a/dev-util/pkgcheck/pkgcheck-0.10.12.ebuild
+++ b/dev-util/pkgcheck/pkgcheck-0.10.12.ebuild
@@ -11,7 +11,7 @@ if [[ ${PV} == *9999 ]] ; then
 	EGIT_REPO_URI="https://github.com/pkgcore/pkgcheck.git"
 	inherit git-r3
 else
-	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos"
+	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
 	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 fi
 
diff --git a/dev-util/schroot/metadata.xml b/dev-util/schroot/metadata.xml
index 54337daa4ff6..15dc5a27003f 100644
--- a/dev-util/schroot/metadata.xml
+++ b/dev-util/schroot/metadata.xml
@@ -5,7 +5,9 @@
   <email>gyakovlev@gentoo.org</email>
   <name>Georgy Yakovlev</name>
  </maintainer>
- 
+ <upstream>
+  <remote-id type="cpe">cpe:/a:debian:schroot</remote-id>
+ </upstream>
  <use>
   <flag name="btrfs">Enable support for chroots using btrfs snapshots</flag>
   <flag name="dchroot">Enables the building of a wrapper named "dchroot", replacing <pkg>sys-apps/dchroot</pkg></flag>
diff --git a/dev-util/scons/scons-4.4.0.ebuild b/dev-util/scons/scons-4.4.0.ebuild
index df971373af9d..40102d7d79d4 100644
--- a/dev-util/scons/scons-4.4.0.ebuild
+++ b/dev-util/scons/scons-4.4.0.ebuild
@@ -23,7 +23,7 @@ S="${WORKDIR}/${P}/src"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc test"
 RESTRICT="!test? ( test )"