gentoo resync : 15.12.2019

5 files changed, 131 insertions, 6 deletions

diff --git a/dev-util/catkin/Manifest b/dev-util/catkin/Manifest
index ed7335d7c505..be05672509ab 100644
--- a/dev-util/catkin/Manifest
+++ b/dev-util/catkin/Manifest
@@ -10,7 +10,9 @@ AUX sitedir.patch 884 BLAKE2B ba051cbd046971d3b6327755b0de83c03b3a441a3e47e7d791
 AUX tests.patch 1640 BLAKE2B cc0d89a779ad056806b1c721709c1318278cb836e539042071e83acaa0aaffed9c316ed482a821219c9c074c71ea15bad343a7f63b887b9b266982fe4afe7f71 SHA512 a53ff72bf5302107241d43a0daa8ff18c50b6e69c0e1ecf2a841ace8d37fe7f3e8cb4202b666ad3bdda1bcb7d79f39244308542e1992b9af94d97bcec7086913
 DIST catkin-0.7.14.tar.gz 203422 BLAKE2B 22f27066054db9d35aaee216603c778a70a1941ab067ba6bfb42d25c6c90dc3fe3efb19167328dcbb008d21b9f7987cce4d3af44fe8368a1fda369432b383401 SHA512 4d17d2fd9c69d04d90a2aff4d48ac6cbdec052856af18cd4b3fb72cb7b3159651b606cd36ef653b9097ee7c23e036709afc019a95bb0ab34c29f51aad4d17d21
 DIST catkin-0.7.17.tar.gz 212023 BLAKE2B 901bc5a3e226eaab59917b4d548fe3aacfad602a75e46cbd720f252ffd490c4ff2b170cd158a0c09c047b837d6f097555ba55291dfeedb51951d98f2f0273c34 SHA512 0c6adfda27924a5c9c5360e5e84e082e5cc9a7638a1129fe86f604515d3731f4257f725f80e8e8781200a8a367472224aea537871e56e1859e9f66950a746d45
-EBUILD catkin-0.7.14.ebuild 3132 BLAKE2B 7086d2b146eeae7b8ed6f288da896e998a4bdc205c0fd7034364ad498915cb8f467eaca620f4da0e788718fad0f3f50c4af0f989629430dbcf2d767c9297eda1 SHA512 829012be9c52ada3d2b5cfa0e9a4cee5207c594754495c74b9da0b0f9e6964b8375000b7ce4950e8438bc32ee8c1fbf56a9b68aaa06d1726f473658a91242ea4
-EBUILD catkin-0.7.17.ebuild 3135 BLAKE2B 0b1b959e28e610973e36d4942ef9fa04ee9997b5c2f98e5dc217bced73ef336da1a30fc093fccaa57805fcfd132aca4461cd9f9da583a0eb183badeb13eb6b06 SHA512 a871bfa69c8b764b76c82b39f765d10027ebc48d400bc005e86171b39637f57201ad4c6d2597c2e725aca422a7d0c9877b97bcdfa43713ab2c81989ac5168b9f
-EBUILD catkin-9999.ebuild 3135 BLAKE2B 0b1b959e28e610973e36d4942ef9fa04ee9997b5c2f98e5dc217bced73ef336da1a30fc093fccaa57805fcfd132aca4461cd9f9da583a0eb183badeb13eb6b06 SHA512 a871bfa69c8b764b76c82b39f765d10027ebc48d400bc005e86171b39637f57201ad4c6d2597c2e725aca422a7d0c9877b97bcdfa43713ab2c81989ac5168b9f
+DIST catkin-0.7.20.tar.gz 215244 BLAKE2B 06755e87f43d1e97138a6696af05dfd9b9434adcca9d4269c7b93b363b25ac9e8b198a980d7607b6b317f546b7637103dc251213087201ff56c1f12c86892edb SHA512 7258f0d548a92d846c9ad195d5e28a567d3c1b4cd1caabffd58c3fabee66cec8ce3612d3095e6437ac201b4d37fddf8f850775e809ebb7eaaeb99328afaedfc6
+EBUILD catkin-0.7.14.ebuild 3152 BLAKE2B 19e1b075039ce5947cb38f98f832550d5fc9defbe8b2ea95932425118d91276a18f7aafa24930dec713a83623c2e8dcca14948b7aebe453bdebb35fd7b1312ce SHA512 7bb2cb76ddc8ec6abbbf55db504556728f476de99ffe0c3b57bf48ae59bdbf65153fb261958f2a0d55e07ddd6faa16f61464a493f6e81d788110939981973e09
+EBUILD catkin-0.7.17.ebuild 3155 BLAKE2B e799b361e20a268586473032ca470ddf3cd619dca02057c989e1b8346e5122a1cf11770f46ce9144dcf1f3e47df0d9f9c88fb65e5279597e348345b069a50347 SHA512 0adc464937e66fae2c222e4b551c0bffb43321b072f1d764dde49a99198991e6d8ef39918d7c0dd54395b5b464c8fbd1046fe518c77c0972ad9b305d4ea32a6c
+EBUILD catkin-0.7.20.ebuild 3162 BLAKE2B 89003c2b89cf1a9dbf5cc82682d5f0edc1c6f2fffb9679a47fb74e9e398c28517c5badf8c11ca622a1e18d4d22e8fe254dc666aab839dbd2bb93b4a16339678f SHA512 e14f475b54921e1702c4d9b4ca13c2fc6cbc4dd4bf10c070f0b451994f00dfee836ac852dcb80232824f38c89c70a0e5325c71143829299a42925f5db761f424
+EBUILD catkin-9999.ebuild 3155 BLAKE2B e799b361e20a268586473032ca470ddf3cd619dca02057c989e1b8346e5122a1cf11770f46ce9144dcf1f3e47df0d9f9c88fb65e5279597e348345b069a50347 SHA512 0adc464937e66fae2c222e4b551c0bffb43321b072f1d764dde49a99198991e6d8ef39918d7c0dd54395b5b464c8fbd1046fe518c77c0972ad9b305d4ea32a6c
 MISC metadata.xml 324 BLAKE2B 393e10af3d1bef82391a91bbf6382d9d1cafcdfe8a681b3a24844427cee1e3aa36f27ffd0a37a65b8a476ce0b3f2a860f546adc32c480164c69f66673bb0b5f4 SHA512 598dc8dd4427079a7eeca415c192ec39e99e53bc41c06796d2355b8858363b71ee8f038646c61ddd82d27451eb48c6f93b47489cdb04ae7c8663a6b46c4f9b94
diff --git a/dev-util/catkin/catkin-0.7.14.ebuild b/dev-util/catkin/catkin-0.7.14.ebuild
index cef4fa0eb0e8..74a1aa7e9e01 100644
--- a/dev-util/catkin/catkin-0.7.14.ebuild
+++ b/dev-util/catkin/catkin-0.7.14.ebuild
@@ -26,6 +26,7 @@ fi
 LICENSE="BSD"
 SLOT="0"
 IUSE="test"
+RESTRICT="!test? ( test )"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
 RDEPEND="
@@ -94,7 +95,7 @@ catkin_src_install_internal() {
 	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##*/}" || die
+			dosym ../lib/python-exec/python-exec2 "/usr/bin/${i##*/}"
 		done
 		touch "${T}/.catkin_python_symlinks_generated"
 	fi
diff --git a/dev-util/catkin/catkin-0.7.17.ebuild b/dev-util/catkin/catkin-0.7.17.ebuild
index 84cbac41ee4e..061b05be08af 100644
--- a/dev-util/catkin/catkin-0.7.17.ebuild
+++ b/dev-util/catkin/catkin-0.7.17.ebuild
@@ -26,6 +26,7 @@ fi
 LICENSE="BSD"
 SLOT="0"
 IUSE="test"
+RESTRICT="!test? ( test )"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
 RDEPEND="
@@ -94,7 +95,7 @@ catkin_src_install_internal() {
 	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##*/}" || die
+			dosym ../lib/python-exec/python-exec2 "/usr/bin/${i##*/}"
 		done
 		touch "${T}/.catkin_python_symlinks_generated"
 	fi
diff --git a/dev-util/catkin/catkin-0.7.20.ebuild b/dev-util/catkin/catkin-0.7.20.ebuild
new file mode 100644
index 000000000000..92350f4085ab
--- /dev/null
+++ b/dev-util/catkin/catkin-0.7.20.ebuild
@@ -0,0 +1,120 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+SCM=""
+if [ "${PV#9999}" != "${PV}" ] ; then
+	SCM="git-r3"
+	EGIT_REPO_URI="https://github.com/ros/catkin"
+fi
+
+PYTHON_COMPAT=( python{2_7,3_5,3_6} pypy{,3} )
+
+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}] )"
+
+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"
+)
+
+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=(
+		"$(cmake-utils_use test CATKIN_ENABLE_TESTING)"
+		"-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##*/}" || die
+		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"
+}
+
+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 84cbac41ee4e..061b05be08af 100644
--- a/dev-util/catkin/catkin-9999.ebuild
+++ b/dev-util/catkin/catkin-9999.ebuild
@@ -26,6 +26,7 @@ fi
 LICENSE="BSD"
 SLOT="0"
 IUSE="test"
+RESTRICT="!test? ( test )"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
 RDEPEND="
@@ -94,7 +95,7 @@ catkin_src_install_internal() {
 	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##*/}" || die
+			dosym ../lib/python-exec/python-exec2 "/usr/bin/${i##*/}"
 		done
 		touch "${T}/.catkin_python_symlinks_generated"
 	fi