7 files changed, 8 insertions, 163 deletions
diff --git a/dev-util/ignition-cmake/Manifest b/dev-util/ignition-cmake/Manifest
index f44541e455b6..83e1f23897cc 100644
--- a/dev-util/ignition-cmake/Manifest
+++ b/dev-util/ignition-cmake/Manifest
@@ -1,2 +1 @@
-DIST ignition-cmake2-2.2.0.tar.bz2 178241 BLAKE2B 92e84a7493fb731a92889d6988a02edf348859ab7554a2adb2d0b9dc3ee0ba2dd9066cd33eb78e7091c69640e9b0c1821ce68def1653489080926e0ed498c3e9 SHA512 4f1df282d59231eb3a35ce0faf086b78b3dd47dd9182b856f75af70957bc3e84ab2e17913ebb4df36d1f0143d5b094dbb24c8b8c3e2c3161b0fdb831b8000419
-DIST ignition-cmake2-2.5.0.tar.bz2 181864 BLAKE2B 0b82db50cbbc617370be39cafc93ecccc800ab84e3cf0b4c48a720b1bdc74cb88a57c98f5aa4ae2aa9ed31d0f39a79f38141eb4d4962bfde0ef65ad1291f87c0 SHA512 238261be7495adab0abdf21e6774c537944bf8c88719cba42d0b498e85bf56cc0ec9b67255c18dac71666670a88e5d8785f7bc14c7c53ff221c02e474a41c41c
+DIST ignition-cmake2-2.8.0.tar.bz2 191357 BLAKE2B 519ee27abc6cacf8a8ff4d801954ad29bb311a9bd896ab9df180af4a9759c88c4cf58bd73601ef25570c061a3b6108c85922207fa7162e0b1ad91dbc652d2269 SHA512 ad2f922cb1c0a9c26e0ba21c8646fa36cfa032b912cf260af6d7dd729b016bc7e3c29c1a9d75727243ed9bcd3671f49d05bf559ba516662ebbfedc10fa6edc13
diff --git a/dev-util/ignition-cmake/ignition-cmake-2.2.0.ebuild b/dev-util/ignition-cmake/ignition-cmake-2.2.0.ebuild
deleted file mode 100644
index 66ab7624ab79..000000000000
--- a/dev-util/ignition-cmake/ignition-cmake-2.2.0.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake-utils
-
-DESCRIPTION="CMake modules to be used by the Ignition projects."
-HOMEPAGE="https://bitbucket.org/ignitionrobotics/ign-cmake"
-SRC_URI="https://osrf-distributions.s3.amazonaws.com/ign-cmake/releases/${PN}2-${PV}.tar.bz2"
-
-LICENSE="Apache-2.0"
-SLOT="2"
-KEYWORDS="~amd64"
-IUSE=""
-
-DEPEND=""
-RDEPEND="${DEPEND}"
-
-src_configure() {
-	local mycmakeargs=(
-		"-DBUILD_TESTING=OFF"
-	)
-	cmake-utils_src_configure
-}
diff --git a/dev-util/ignition-cmake/ignition-cmake-2.5.0.ebuild b/dev-util/ignition-cmake/ignition-cmake-2.8.0.ebuild
index 1c4eede9e5ac..2770e6466ae3 100644
--- a/dev-util/ignition-cmake/ignition-cmake-2.5.0.ebuild
+++ b/dev-util/ignition-cmake/ignition-cmake-2.8.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-inherit cmake-utils
+inherit cmake
 
 DESCRIPTION="CMake modules to be used by the Ignition projects."
 HOMEPAGE="https://github.com/ignitionrobotics/ign-cmake"
@@ -12,14 +12,15 @@ SRC_URI="https://osrf-distributions.s3.amazonaws.com/ign-cmake/releases/${PN}2-$
 LICENSE="Apache-2.0"
 SLOT="2"
 KEYWORDS="~amd64"
-IUSE=""
+IUSE="test"
+RESTRICT="!test? ( test )"
 
 DEPEND=""
 RDEPEND="${DEPEND}"
 
 src_configure() {
 	local mycmakeargs=(
-		"-DBUILD_TESTING=OFF"
+		"-DBUILD_TESTING=$(usex test)"
 	)
-	cmake-utils_src_configure
+	cmake_src_configure
 }
diff --git a/dev-util/pkgdev/Manifest b/dev-util/pkgdev/Manifest
index 81324b770f23..3575ec4c426a 100644
--- a/dev-util/pkgdev/Manifest
+++ b/dev-util/pkgdev/Manifest
@@ -1,3 +1 @@
-DIST pkgdev-0.1.6.tar.gz 55644 BLAKE2B 70c0c040ca277b108515d6c3fcbdecbf7ee20963bdc2d19218855a8261830f1509073e5a09d0daf6ccb6a276dd19401c9266d74e5c5c0b60ceb234a63779f38e SHA512 5f274d0ddbff0535862827e3e97d3378cc53c3fa2528e35ac4ef8c4bc3215de4eac2b62b2f2fc1c499f360a0594fecdb722613592ac86d01bef3f6abfc522c1f
-DIST pkgdev-0.1.7.tar.gz 55781 BLAKE2B 218842bbba75a0cc3d6005e75859ec679d2c03019c92e813c174554262f7d63bdfe1176faca102e91cfbec073d2197792c85b9c46318e6a86d7fa74d9780303a SHA512 bf68367e13298845c08089cad47a7ccd536bee43d6fb6993f3d0ba283331045032ab1b82d195cffe5368e844ea05ad8cee5b5cd248b69d18f021bb26a26145ff
 DIST pkgdev-0.1.9.tar.gz 57093 BLAKE2B 5f5d9b4956cdc949d5e37c24160c692c32cf7e5d9fe90c167adc364993370dc42291edca048db3b0a2f17b199003aea61bd6b541bc58de1c1a084365ce517660 SHA512 78c117163549cb021e8cb9bd65e9a7752633506f3db825133fc3c4c515549c6e10dc974164489c06f94c1a1e25acb8fe050a57754353b907d6026892ef034cb2
diff --git a/dev-util/pkgdev/pkgdev-0.1.6.ebuild b/dev-util/pkgdev/pkgdev-0.1.6.ebuild
deleted file mode 100644
index 34ececec12d8..000000000000
--- a/dev-util/pkgdev/pkgdev-0.1.6.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# 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
-
-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 ~ppc64 ~riscv ~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.7.ebuild b/dev-util/pkgdev/pkgdev-0.1.7.ebuild
deleted file mode 100644
index a8d3f7b0a6a9..000000000000
--- a/dev-util/pkgdev/pkgdev-0.1.7.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{6,7,8,9,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 ~ppc64 ~riscv ~sparc ~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.1.9.ebuild
index f5621d072900..84e20a9cf211 100644
--- a/dev-util/pkgdev/pkgdev-0.1.9.ebuild
+++ b/dev-util/pkgdev/pkgdev-0.1.9.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 ~ppc ~ppc64 ~riscv ~sparc ~x64-macos"
+	KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x64-macos"
 fi
 
 DESCRIPTION="Collection of tools for Gentoo development"