gentoo resync : 14.05.2020

4 files changed, 151 insertions, 7 deletions

diff --git a/dev-util/catkin/Manifest b/dev-util/catkin/Manifest
index a7f771a327e6..71fe0d2fcbcc 100644
--- a/dev-util/catkin/Manifest
+++ b/dev-util/catkin/Manifest
@@ -3,6 +3,7 @@ AUX catkin_prefix_path.patch 3297 BLAKE2B 60027c9564b6013f885bdd1f695e7279459cbf
 AUX catkin_prefix_path_util_py.patch 2134 BLAKE2B 2c358c1e7e9b2cdb2b889b70ca5644f3823b7d1ef0af597d7f7f0a6de9ef7697d41ce74964f5e0d95deb9d2bc9e1afaf4665fb48cb76258c552483cbdc68374a SHA512 68b375ed46f7d25ece3e723fb6d41ba3f89bd27ef44f11d74427f63d615e043ab02de4ac806d77059db8a0d12671f0602df16a2b318b9d6e36671cd1491ce2b0
 AUX catkin_prefix_path_util_py_v2.patch 2146 BLAKE2B 3d5fa2ec75d71938f3290617f60eb45e46ee6e24da722d05977dd5c58eb078ca1d5fd7b943bd46bbe765e63a7114d5df9fe36ac286f161c99731736a51635279 SHA512 b55d1a67433afec78238795c5d807607c59b97514beffa5e2cf30c9340ec0d62045bdff9af875fc4c2ae7b4d90859010b08b737120e9434d9c7589569f8696d9
 AUX distutils.patch 798 BLAKE2B aeb6d364c8fa565e662686f723fe782bb6d3b2a17c0a1b243090515290258586e0df79699a32ec0eeb5834628dc885566c296055c4062826c03014a809b8cb01 SHA512 de281d0039515c4621d161c778520c4306897426c5692f46b4440326b6246502e64f90f121eaff8741775bafcb4213b2817468354db8c5b3c1250a2fce42d36d
+AUX egginfo.patch 633 BLAKE2B 9308280ddb79b5a303dc6e022d81d4f6b599a669fca18a586a45bb5282f54603a1b201047532c38fdc734e917002709702caccfe3418772b8e4dc5ac928e234b SHA512 768505296427bbafb108aa2ce87cb127b0db8b889d3bc355267123d04cc956beb1eca9cd317d17633eaa50126e96d0aa3dce8d3aa0abc9aad4ee070b607a4224
 AUX etc.patch 654 BLAKE2B 0ec3289f09983127f60ce4e1a93ad82b9c928fffe3dc820dc3ffc33c4cbedf794d3e49dbe646c83f884072ad949ebdbbe334cced9fdaa3448b5b219669019913 SHA512 8e6026dac6d79fc30056a7c598a99ca4cafcad442eec2eb2f48219b184d610e4d5da5faea5284dd078101b4ef761533d034aba49fd1af95f7f365887bbf22739
 AUX gnuinstalldirs.patch 714 BLAKE2B 32364640271a4868d5a92fcc9ca803df8067ecda2c89c69eb88c168bab4acc099ef2a7efd3c56a77e34acef2ad308780b69c66eb49c272e4d3b1b776d1b4c594 SHA512 38e6e0a220f20a7909a760b558997086bac9dc4919158d58dc41e5dd7d3bf22b8eb9a48cb05503c594dfa0a9e4bdb70e8eec121f45f777fc7821ec6e3678b600
 AUX package_xml.patch 1588 BLAKE2B 15a11031b704f307778e8cb85438851bfa38a2784abee9c544a10fa4e61036ffb45a391f40eacd7f97ec92abf060a1afc790d87cc1cfa40ddc07561db14c027f SHA512 7d6e1cb0076681c6cbb1332b05e6cd33bae4f780939e00412fd4b022f71b0418a4ff4f8e13d06f42fd21225e78d058818d680fef691dad4412d75ea0f0ef9f5e
@@ -11,8 +12,10 @@ AUX tests.patch 1640 BLAKE2B cc0d89a779ad056806b1c721709c1318278cb836e539042071e
 DIST catkin-0.7.14.tar.gz 203422 BLAKE2B 22f27066054db9d35aaee216603c778a70a1941ab067ba6bfb42d25c6c90dc3fe3efb19167328dcbb008d21b9f7987cce4d3af44fe8368a1fda369432b383401 SHA512 4d17d2fd9c69d04d90a2aff4d48ac6cbdec052856af18cd4b3fb72cb7b3159651b606cd36ef653b9097ee7c23e036709afc019a95bb0ab34c29f51aad4d17d21
 DIST catkin-0.7.17.tar.gz 212023 BLAKE2B 901bc5a3e226eaab59917b4d548fe3aacfad602a75e46cbd720f252ffd490c4ff2b170cd158a0c09c047b837d6f097555ba55291dfeedb51951d98f2f0273c34 SHA512 0c6adfda27924a5c9c5360e5e84e082e5cc9a7638a1129fe86f604515d3731f4257f725f80e8e8781200a8a367472224aea537871e56e1859e9f66950a746d45
 DIST catkin-0.7.20.tar.gz 215244 BLAKE2B 06755e87f43d1e97138a6696af05dfd9b9434adcca9d4269c7b93b363b25ac9e8b198a980d7607b6b317f546b7637103dc251213087201ff56c1f12c86892edb SHA512 7258f0d548a92d846c9ad195d5e28a567d3c1b4cd1caabffd58c3fabee66cec8ce3612d3095e6437ac201b4d37fddf8f850775e809ebb7eaaeb99328afaedfc6
+DIST catkin-0.8.3.tar.gz 215988 BLAKE2B 92d7bced93e2d33dafcfd902724f993aa15756139265b5594c15041c333568591193b86e1a4bee8c278f2739dd063f73b6ce675b8ab4fefd312b5daeea414c7a SHA512 14fd03627f3fb339a850ca73e7a49dfeb7312a85416473dff60995ea1d0f1050982929c297751502589a7320dd7eec5d922c86061166f9d475fc1108540db4ae
 EBUILD catkin-0.7.14.ebuild 3123 BLAKE2B 55670c978713ca720322e1fc8b2f83b4177f9ec4b92ff3d8ce160211c1dd8bccdb393ac720aa0d18ddb51bb31bc2a7bacdd51b2b447bbfe15c5f593e11147235 SHA512 bd0d8dc4b32f5e563efdae702305b4bced7c6581d2bce59861e90e6326247b95a60e2a1840f68a5126ba79e6e7e26b3cc2848b88ed587c0d843597716b5000e0
 EBUILD catkin-0.7.17.ebuild 3126 BLAKE2B 572239dad696efab0d44e214c85d6a223e095f2f9fbd61a7fbf467cdda3a8f3b64ee9d971a5f36165f604efd1a1f6801649a7399ff2009aa2d04fa59e8b9b467 SHA512 47cb440805dfb949f2ea55edb77a12e8986ddd4c7898d9abfd2fe306d0f522f59d2a3a5be658eb58c1e406feea1e83bae427e60ceee73e9c445fa7be1237fe5f
 EBUILD catkin-0.7.20.ebuild 3133 BLAKE2B 6f37db38a28e5b9256e52b0f5ea7b7a5ac60286a800c5cddf624519c1ee4a0524a47ff8f245604d1f51aea2d3b9384240fde336af8c06e2baf5577e7d8362143 SHA512 0a6099a1ca8517167c3e4a05a4140e14f85788de885fcf8c7cccaf501e5b5cd9fd0042341dc8831384c1f2abdfd0b9f64c197b26aabb41ab1fbd598bd3273974
-EBUILD catkin-9999.ebuild 3126 BLAKE2B 572239dad696efab0d44e214c85d6a223e095f2f9fbd61a7fbf467cdda3a8f3b64ee9d971a5f36165f604efd1a1f6801649a7399ff2009aa2d04fa59e8b9b467 SHA512 47cb440805dfb949f2ea55edb77a12e8986ddd4c7898d9abfd2fe306d0f522f59d2a3a5be658eb58c1e406feea1e83bae427e60ceee73e9c445fa7be1237fe5f
+EBUILD catkin-0.8.3.ebuild 3172 BLAKE2B dee044ad152f760bb3d16c7aee9dadbd972582ee1b6236eea33cd6962ef176a3a5cb3866b9a62b1af697055616ad95113ce7173eb40e6e684d133397aa2ac2a6 SHA512 02872e01ec15bc4e5f424938ed4bc7e7b765afe99598133a01dc3cb59c2aa14b230b5a2b7b8c8252f4d55636123aa3ecc70c8885ae79a4efb1545a65038ba2e3
+EBUILD catkin-9999.ebuild 3172 BLAKE2B dee044ad152f760bb3d16c7aee9dadbd972582ee1b6236eea33cd6962ef176a3a5cb3866b9a62b1af697055616ad95113ce7173eb40e6e684d133397aa2ac2a6 SHA512 02872e01ec15bc4e5f424938ed4bc7e7b765afe99598133a01dc3cb59c2aa14b230b5a2b7b8c8252f4d55636123aa3ecc70c8885ae79a4efb1545a65038ba2e3
 MISC metadata.xml 324 BLAKE2B 393e10af3d1bef82391a91bbf6382d9d1cafcdfe8a681b3a24844427cee1e3aa36f27ffd0a37a65b8a476ce0b3f2a860f546adc32c480164c69f66673bb0b5f4 SHA512 598dc8dd4427079a7eeca415c192ec39e99e53bc41c06796d2355b8858363b71ee8f038646c61ddd82d27451eb48c6f93b47489cdb04ae7c8663a6b46c4f9b94
diff --git a/dev-util/catkin/catkin-0.8.3.ebuild b/dev-util/catkin/catkin-0.8.3.ebuild
new file mode 100644
index 000000000000..c37940ea8dfe
--- /dev/null
+++ b/dev-util/catkin/catkin-0.8.3.ebuild
@@ -0,0 +1,124 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+SCM=""
+if [ "${PV#9999}" != "${PV}" ] ; then
+	SCM="git-r3"
+	EGIT_REPO_URI="https://github.com/ros/catkin"
+fi
+
+PYTHON_COMPAT=( python{3_6,3_7,3_8} )
+
+inherit ${SCM} cmake-utils python-r1 python-utils-r1
+
+DESCRIPTION="Cmake macros and associated python code used to build some parts of ROS"
+HOMEPAGE="http://wiki.ros.org/catkin"
+if [ "${PV#9999}" != "${PV}" ] ; then
+	SRC_URI=""
+	KEYWORDS=""
+else
+	SRC_URI="https://github.com/ros/catkin/archive/${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm"
+fi
+
+LICENSE="BSD"
+SLOT="0"
+IUSE="test"
+RESTRICT="!test? ( test )"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND="
+	${PYTHON_DEPS}
+	dev-python/catkin_pkg[${PYTHON_USEDEP}]
+	dev-python/empy[${PYTHON_USEDEP}]
+	dev-util/cmake
+"
+DEPEND="${RDEPEND}
+	test? ( dev-python/nose[${PYTHON_USEDEP}] dev-python/mock[${PYTHON_USEDEP}] )"
+BDEPEND="
+	dev-util/cmake
+"
+
+PATCHES=(
+	"${FILESDIR}/tests.patch"
+	"${FILESDIR}/catkin_prefix_path.patch"
+	"${FILESDIR}/gnuinstalldirs.patch"
+	"${FILESDIR}/catkin_prefix_path_util_py_v2.patch"
+	"${FILESDIR}/package_xml.patch"
+	"${FILESDIR}/etc.patch"
+	"${FILESDIR}/egginfo.patch"
+)
+
+src_prepare() {
+	# fix libdir
+	sed -i \
+		-e 's:LIBEXEC_DESTINATION lib:LIBEXEC_DESTINATION libexec:' \
+		-e 's:}/lib:}/${CMAKE_INSTALL_LIBDIR}:' \
+		-e 's:DESTINATION lib):DESTINATION ${CMAKE_INSTALL_LIBDIR}):' \
+		-e 's:DESTINATION lib/:DESTINATION ${CMAKE_INSTALL_LIBDIR}/:' \
+		-e 's:PYTHON_INSTALL_DIR lib:PYTHON_INSTALL_DIR ${CMAKE_INSTALL_LIBDIR}:' \
+		cmake/*.cmake || die
+	cmake-utils_src_prepare
+}
+
+catkin_src_configure_internal() {
+	local sitedir="$(python_get_sitedir)"
+	mycmakeargs+=(
+		-DPYTHON_EXECUTABLE="${PYTHON}"
+		-DPYTHON_INSTALL_DIR="${sitedir#${EPREFIX}/usr/}"
+	)
+	python_export PYTHON_SCRIPTDIR
+	cmake-utils_src_configure
+}
+
+src_configure() {
+	export PYTHONPATH="${S}/python"
+	local mycmakeargs=(
+		"-DCATKIN_ENABLE_TESTING=$(usex test)"
+		"-DCATKIN_BUILD_BINARY_PACKAGE=ON"
+		)
+	python_foreach_impl catkin_src_configure_internal
+}
+
+src_compile() {
+	python_foreach_impl cmake-utils_src_compile
+}
+
+src_test() {
+	unset PYTHON_SCRIPTDIR
+	python_foreach_impl cmake-utils_src_test
+}
+
+catkin_src_install_internal() {
+	python_export PYTHON_SCRIPTDIR
+	cmake-utils_src_install
+	if [ ! -f "${T}/.catkin_python_symlinks_generated" ]; then
+		dodir /usr/bin
+		for i in "${D}/${PYTHON_SCRIPTDIR}"/* ; do
+			dosym ../lib/python-exec/python-exec2 "/usr/bin/${i##*/}"
+		done
+		touch "${T}/.catkin_python_symlinks_generated"
+	fi
+}
+
+src_install() {
+	python_foreach_impl catkin_src_install_internal
+
+	doenvd "${FILESDIR}/40catkin"
+
+	# needed to be considered as a workspace
+	touch "${ED}/usr/.catkin"
+
+	python_foreach_impl python_optimize
+}
+
+pkg_postinst() {
+	ewarn "Starting from version 0.7.1-r2, dev-util/catkin changed the"
+	ewarn "installation path for package.xml files on Gentoo."
+	ewarn "In order for ROS to work properly, you will need to reinstall ROS"
+	ewarn "packages that have it installed in the old location:"
+	ewarn "		emerge -1O /usr/share/*/package.xml"
+	ewarn "See https://bugs.gentoo.org/show_bug.cgi?id=595004 for more details."
+}
diff --git a/dev-util/catkin/catkin-9999.ebuild b/dev-util/catkin/catkin-9999.ebuild
index bd0fec4e9fa1..c37940ea8dfe 100644
--- a/dev-util/catkin/catkin-9999.ebuild
+++ b/dev-util/catkin/catkin-9999.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
 SCM=""
 if [ "${PV#9999}" != "${PV}" ] ; then
@@ -9,9 +9,9 @@ if [ "${PV#9999}" != "${PV}" ] ; then
 	EGIT_REPO_URI="https://github.com/ros/catkin"
 fi
 
-PYTHON_COMPAT=( python3_6 pypy3 )
+PYTHON_COMPAT=( python{3_6,3_7,3_8} )
 
-inherit ${SCM} cmake-utils python-r1
+inherit ${SCM} cmake-utils python-r1 python-utils-r1
 
 DESCRIPTION="Cmake macros and associated python code used to build some parts of ROS"
 HOMEPAGE="http://wiki.ros.org/catkin"
@@ -37,16 +37,18 @@ RDEPEND="
 "
 DEPEND="${RDEPEND}
 	test? ( dev-python/nose[${PYTHON_USEDEP}] dev-python/mock[${PYTHON_USEDEP}] )"
+BDEPEND="
+	dev-util/cmake
+"
 
 PATCHES=(
 	"${FILESDIR}/tests.patch"
-	"${FILESDIR}/distutils.patch"
 	"${FILESDIR}/catkin_prefix_path.patch"
 	"${FILESDIR}/gnuinstalldirs.patch"
 	"${FILESDIR}/catkin_prefix_path_util_py_v2.patch"
 	"${FILESDIR}/package_xml.patch"
 	"${FILESDIR}/etc.patch"
-	"${FILESDIR}/sitedir.patch"
+	"${FILESDIR}/egginfo.patch"
 )
 
 src_prepare() {
@@ -74,7 +76,7 @@ catkin_src_configure_internal() {
 src_configure() {
 	export PYTHONPATH="${S}/python"
 	local mycmakeargs=(
-		"$(cmake-utils_use test CATKIN_ENABLE_TESTING)"
+		"-DCATKIN_ENABLE_TESTING=$(usex test)"
 		"-DCATKIN_BUILD_BINARY_PACKAGE=ON"
 		)
 	python_foreach_impl catkin_src_configure_internal
@@ -108,6 +110,8 @@ src_install() {
 
 	# needed to be considered as a workspace
 	touch "${ED}/usr/.catkin"
+
+	python_foreach_impl python_optimize
 }
 
 pkg_postinst() {
diff --git a/dev-util/catkin/files/egginfo.patch b/dev-util/catkin/files/egginfo.patch
new file mode 100644
index 000000000000..a33e066ced66
--- /dev/null
+++ b/dev-util/catkin/files/egginfo.patch
@@ -0,0 +1,13 @@
+Index: catkin-0.8.3/cmake/catkin_python_setup.cmake
+===================================================================
+--- catkin-0.8.3.orig/cmake/catkin_python_setup.cmake
++++ catkin-0.8.3/cmake/catkin_python_setup.cmake
+@@ -143,7 +143,7 @@ function(catkin_python_setup)
+ 
+   assert(PYTHON_INSTALL_DIR)
+   if(${PROJECT_NAME}_SETUP_PY_SETUP_MODULE STREQUAL "setuptools")
+-    set(SETUPTOOLS_EGG_INFO "egg_info --egg-base ${CMAKE_INSTALL_PREFIX}/${PYTHON_INSTALL_DIR}")
++    set(SETUPTOOLS_EGG_INFO "egg_info --egg-base \${DESTDIR}${CMAKE_INSTALL_PREFIX}/${PYTHON_INSTALL_DIR}")
+   else()
+     set(SETUPTOOLS_EGG_INFO "")
+   endif()