gentoo resync : 20.03.2022

3 files changed, 59 insertions, 17 deletions

diff --git a/dev-python/rospkg/Manifest b/dev-python/rospkg/Manifest
index 4832da3f8d0b..b06efae3fe01 100644
--- a/dev-python/rospkg/Manifest
+++ b/dev-python/rospkg/Manifest
@@ -1,6 +1,8 @@
 AUX gentoo.patch 662 BLAKE2B 06e1c4af66a5d1ca1e51f8d99a1cf4e62042da3d41f38b34143f7af2ec7ae4bd4516f2b57e863ec6b80d921e2ab6a920ba581dccc6615da480c237e410f4cea2 SHA512 7525f4e8809b6002000b22d6f5def37054a1bceb3d581fe01bcedd7e21dc757dd04d229e9550bfe1d2248c5804856cd9869149bea9a9ec5423e1a596c0f56153
 AUX yaml_load.patch 2300 BLAKE2B 3d24162a4c2501d7ae431b602244d102e0e26894304c868fafee8bf72a7ebea867280f2a5985b5b9139ba6d0b42379fec598212e7db73067a426c28bd9ae3a98 SHA512 60968ec2250ec450b461ef4c196561fdeedfe5fc28d7af6b6a1971b0e5794d3a028c227b8609d3c541902a3fc498194b33ad2f8698115cc1b3eb99c955ca70ff
 DIST rospkg-1.3.0.tar.gz 91442 BLAKE2B 9bf217ff103513471b1a2b0812e4b08519d667c0b883c545b23dd42f10216390f4fb618bf67baed0ba2aba71c18c13b0a702445425ca29568394c0cc5b4dff61 SHA512 bfd67eee80e063db45eb98b1b73cf1865d23a14a55d72639890d7ad3d01f4c85f07aa662d9d66e996340798c002f5ee9d1167cee32b20caff900fe527ed50d5b
+DIST rospkg-1.4.0.tar.gz 91707 BLAKE2B 02ee199a5f59d1256561cda0e9a6f05e40337a604bfba34d076cd09812fb4cd2f253785e894e9590de86226e8e250d77f50f18c4ffb2857c69095f329c7aa58e SHA512 4e4a40961ed1cfba0746069725378414dc61d3f55e479e7af5efa211419e34e44f5964f8ab41a8c4c9e9b74ae275fd29cf6ffda0eab66b6a0ec7fc7066719797
 EBUILD rospkg-1.3.0.ebuild 958 BLAKE2B 622a7a74e86af4252310ac69798913487cc1d03b19e9a10b730ed641069a65295080263b84edd9efe704c989671630d6ccdea607e77a08a82152fcfe06e35b75 SHA512 862bc13ed80cca8f4458f88cc4d2ff0decde07eb2d52f362aac907e47d4e351e9b5227f6fe95f8c7319b43a44d88983d1235af265ebf8cab64517047d10a96f9
-EBUILD rospkg-9999.ebuild 958 BLAKE2B 622a7a74e86af4252310ac69798913487cc1d03b19e9a10b730ed641069a65295080263b84edd9efe704c989671630d6ccdea607e77a08a82152fcfe06e35b75 SHA512 862bc13ed80cca8f4458f88cc4d2ff0decde07eb2d52f362aac907e47d4e351e9b5227f6fe95f8c7319b43a44d88983d1235af265ebf8cab64517047d10a96f9
+EBUILD rospkg-1.4.0.ebuild 871 BLAKE2B 9d61b87613fa6a7ee7eada58e78ff6ef55e365292b5d6f50b4ca6ff10d438758f2a90c3239047e79a26e25925c053587e8e750f3706ea6a9d0b74db32048e726 SHA512 47b138f98c7ee036366c5ab80c5476283a6ef15bafdc70ba2d7dfe35a3c1c1155c5387035a5b9ef531f60467cd67fcfdbd114f6c3c2f72f783d4c366e7c702ae
+EBUILD rospkg-9999.ebuild 871 BLAKE2B 9d61b87613fa6a7ee7eada58e78ff6ef55e365292b5d6f50b4ca6ff10d438758f2a90c3239047e79a26e25925c053587e8e750f3706ea6a9d0b74db32048e726 SHA512 47b138f98c7ee036366c5ab80c5476283a6ef15bafdc70ba2d7dfe35a3c1c1155c5387035a5b9ef531f60467cd67fcfdbd114f6c3c2f72f783d4c366e7c702ae
 MISC metadata.xml 340 BLAKE2B 317bdd9ae3ac0445b83c1beb2e31db348ed88da4498d6526be372e2cd71fd84b0d10f03015f414ae56701e080b12bf8b3630edf9cbc16b0290893213e3ef1c33 SHA512 0fa44f0f4a284d56873ac55d6744c437963a2e2428cbb2ed1060784b48f3487eb05d01f572e1ad5459d3181f5546090c650623405fa71f1c75d1818f20aee5b3
diff --git a/dev-python/rospkg/rospkg-1.4.0.ebuild b/dev-python/rospkg/rospkg-1.4.0.ebuild
new file mode 100644
index 000000000000..430b4a135478
--- /dev/null
+++ b/dev-python/rospkg/rospkg-1.4.0.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..10} )
+inherit distutils-r1
+
+DESCRIPTION="Standalone Python library for the ROS package system"
+HOMEPAGE="https://wiki.ros.org/rospkg"
+
+if [[ ${PV} = *9999 ]]; then
+	EGIT_REPO_URI="https://github.com/ros-infrastructure/rospkg"
+	inherit git-r3
+
+	S="${WORKDIR}/${PN}"
+	EGIT_CHECKOUT_DIR="${S}"
+else
+	SRC_URI="https://github.com/ros-infrastructure/rospkg/archive/${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm"
+fi
+
+LICENSE="BSD"
+SLOT="0"
+
+RDEPEND="
+	dev-python/pyyaml[${PYTHON_USEDEP}]
+	dev-python/catkin_pkg[${PYTHON_USEDEP}]
+	dev-python/distro[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/mock[${PYTHON_USEDEP}]
+	)
+"
+PATCHES=(
+	"${FILESDIR}/gentoo.patch"
+)
+
+distutils_enable_tests pytest
diff --git a/dev-python/rospkg/rospkg-9999.ebuild b/dev-python/rospkg/rospkg-9999.ebuild
index fbd4db374f38..430b4a135478 100644
--- a/dev-python/rospkg/rospkg-9999.ebuild
+++ b/dev-python/rospkg/rospkg-9999.ebuild
@@ -1,23 +1,19 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
+DISTUTILS_USE_PEP517=setuptools
 PYTHON_COMPAT=( python3_{8..10} )
-
-SCM=""
-if [ "${PV#9999}" != "${PV}" ] ; then
-	SCM="git-r3"
-	EGIT_REPO_URI="https://github.com/ros-infrastructure/rospkg"
-fi
-
-inherit ${SCM} distutils-r1
+inherit distutils-r1
 
 DESCRIPTION="Standalone Python library for the ROS package system"
 HOMEPAGE="https://wiki.ros.org/rospkg"
-if [ "${PV#9999}" != "${PV}" ] ; then
-	SRC_URI=""
-	# Needed for tests
+
+if [[ ${PV} = *9999 ]]; then
+	EGIT_REPO_URI="https://github.com/ros-infrastructure/rospkg"
+	inherit git-r3
+
 	S="${WORKDIR}/${PN}"
 	EGIT_CHECKOUT_DIR="${S}"
 else
@@ -28,7 +24,8 @@ fi
 LICENSE="BSD"
 SLOT="0"
 
-RDEPEND="dev-python/pyyaml[${PYTHON_USEDEP}]
+RDEPEND="
+	dev-python/pyyaml[${PYTHON_USEDEP}]
 	dev-python/catkin_pkg[${PYTHON_USEDEP}]
 	dev-python/distro[${PYTHON_USEDEP}]
 "
@@ -37,6 +34,8 @@ BDEPEND="
 		dev-python/mock[${PYTHON_USEDEP}]
 	)
 "
-PATCHES=( "${FILESDIR}/gentoo.patch" "${FILESDIR}/yaml_load.patch" )
+PATCHES=(
+	"${FILESDIR}/gentoo.patch"
+)
 
-distutils_enable_tests nose
+distutils_enable_tests pytest