gentoo resync : 02.06.2019

5 files changed, 46 insertions, 126 deletions

diff --git a/dev-util/catkin/Manifest b/dev-util/catkin/Manifest
index 766fe26cefbd..ed7335d7c505 100644
--- a/dev-util/catkin/Manifest
+++ b/dev-util/catkin/Manifest
@@ -1,17 +1,16 @@
 AUX 40catkin 89 BLAKE2B d8a24606f095c6afdbc9141a47fa250bd931b53f9e32ce885a7e1dee33013968e8e401404c187d8afb6660bbb3528888c43b46e473f5dd96b53cf9af04d24d42 SHA512 bc0fc727177f071c48b2177adceaa0f5578a55bb05a65035871d83c7b217d86ef7f6c8585264971d0c8957652a8a60dbdb674600087800433823190e577744db
 AUX catkin_prefix_path.patch 3297 BLAKE2B 60027c9564b6013f885bdd1f695e7279459cbf499536f381806116ef3d9d66a8507faa39008ee95d1d5662ec667dbe8ca3c1b284f0dd0fe561217a4876bfe960 SHA512 22c6e2440e1d7e48c46c0ad7f2006d621942b9c75d1d126ef1e110b36da321b79152aae8bf4d82c18250ce6da3337c697733ba130c1b2f116282ccb954d8d13f
 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 etc.patch 654 BLAKE2B 0ec3289f09983127f60ce4e1a93ad82b9c928fffe3dc820dc3ffc33c4cbedf794d3e49dbe646c83f884072ad949ebdbbe334cced9fdaa3448b5b219669019913 SHA512 8e6026dac6d79fc30056a7c598a99ca4cafcad442eec2eb2f48219b184d610e4d5da5faea5284dd078101b4ef761533d034aba49fd1af95f7f365887bbf22739
 AUX gnuinstalldirs.patch 714 BLAKE2B 32364640271a4868d5a92fcc9ca803df8067ecda2c89c69eb88c168bab4acc099ef2a7efd3c56a77e34acef2ad308780b69c66eb49c272e4d3b1b776d1b4c594 SHA512 38e6e0a220f20a7909a760b558997086bac9dc4919158d58dc41e5dd7d3bf22b8eb9a48cb05503c594dfa0a9e4bdb70e8eec121f45f777fc7821ec6e3678b600
 AUX package_xml.patch 1588 BLAKE2B 15a11031b704f307778e8cb85438851bfa38a2784abee9c544a10fa4e61036ffb45a391f40eacd7f97ec92abf060a1afc790d87cc1cfa40ddc07561db14c027f SHA512 7d6e1cb0076681c6cbb1332b05e6cd33bae4f780939e00412fd4b022f71b0418a4ff4f8e13d06f42fd21225e78d058818d680fef691dad4412d75ea0f0ef9f5e
 AUX sitedir.patch 884 BLAKE2B ba051cbd046971d3b6327755b0de83c03b3a441a3e47e7d791e653bcd0b7ed3373752367a4ecfb8570a6b5d7c6fb3ae006f0c516909646d7ba7142f20b352217 SHA512 c619b6bcfa007f90464146767ea5b1aed4dad79d16bcc7daa573df14dcaa6eeb2ff96eb9d838d3bbfd0480b87d5538ffaf31dc059e25224d425f3786523b475d
 AUX tests.patch 1640 BLAKE2B cc0d89a779ad056806b1c721709c1318278cb836e539042071e83acaa0aaffed9c316ed482a821219c9c074c71ea15bad343a7f63b887b9b266982fe4afe7f71 SHA512 a53ff72bf5302107241d43a0daa8ff18c50b6e69c0e1ecf2a841ace8d37fe7f3e8cb4202b666ad3bdda1bcb7d79f39244308542e1992b9af94d97bcec7086913
-DIST catkin-0.7.11.tar.gz 206933 BLAKE2B cda31e3d097516ce830060a2323956ec27c4113d161e95ab55564c00209e23d894e2acf3bf11b78e19538d4d8ff4c85814362a89bca58700da5fb609fb708fb8 SHA512 71810a80c1ac4334fdaed176285bee6bcb0443529debecf421723881e3d6316f41d4ed07c5eafa55515ba9d8143d5dc5fb683eda5ad54e52fda5c24085c44c96
-DIST catkin-0.7.12.tar.gz 211602 BLAKE2B ee5b9e57601847f79a2e7c49bb9b38974b0385a1c524c70cc549511d31b9fe8d03bf95e254b9c40a420fad990da40bf9c5d29f198ae42bd772c54a89cdc532b9 SHA512 ada496fae0959330b369c8a29daf9c575fcc94c3ee7e27e0180614fc49912450b23163622759975e588ffcdd49180e5f2fc8351e02bf1aef9b1f2db92811dbd6
 DIST catkin-0.7.14.tar.gz 203422 BLAKE2B 22f27066054db9d35aaee216603c778a70a1941ab067ba6bfb42d25c6c90dc3fe3efb19167328dcbb008d21b9f7987cce4d3af44fe8368a1fda369432b383401 SHA512 4d17d2fd9c69d04d90a2aff4d48ac6cbdec052856af18cd4b3fb72cb7b3159651b606cd36ef653b9097ee7c23e036709afc019a95bb0ab34c29f51aad4d17d21
-EBUILD catkin-0.7.11.ebuild 3132 BLAKE2B 7086d2b146eeae7b8ed6f288da896e998a4bdc205c0fd7034364ad498915cb8f467eaca620f4da0e788718fad0f3f50c4af0f989629430dbcf2d767c9297eda1 SHA512 829012be9c52ada3d2b5cfa0e9a4cee5207c594754495c74b9da0b0f9e6964b8375000b7ce4950e8438bc32ee8c1fbf56a9b68aaa06d1726f473658a91242ea4
-EBUILD catkin-0.7.12.ebuild 3132 BLAKE2B 7086d2b146eeae7b8ed6f288da896e998a4bdc205c0fd7034364ad498915cb8f467eaca620f4da0e788718fad0f3f50c4af0f989629430dbcf2d767c9297eda1 SHA512 829012be9c52ada3d2b5cfa0e9a4cee5207c594754495c74b9da0b0f9e6964b8375000b7ce4950e8438bc32ee8c1fbf56a9b68aaa06d1726f473658a91242ea4
+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-9999.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
 MISC metadata.xml 324 BLAKE2B 393e10af3d1bef82391a91bbf6382d9d1cafcdfe8a681b3a24844427cee1e3aa36f27ffd0a37a65b8a476ce0b3f2a860f546adc32c480164c69f66673bb0b5f4 SHA512 598dc8dd4427079a7eeca415c192ec39e99e53bc41c06796d2355b8858363b71ee8f038646c61ddd82d27451eb48c6f93b47489cdb04ae7c8663a6b46c4f9b94
diff --git a/dev-util/catkin/catkin-0.7.12.ebuild b/dev-util/catkin/catkin-0.7.12.ebuild
deleted file mode 100644
index cef4fa0eb0e8..000000000000
--- a/dev-util/catkin/catkin-0.7.12.ebuild
+++ /dev/null
@@ -1,119 +0,0 @@
-# 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"
-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.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-0.7.11.ebuild b/dev-util/catkin/catkin-0.7.17.ebuild
index cef4fa0eb0e8..84cbac41ee4e 100644
--- a/dev-util/catkin/catkin-0.7.11.ebuild
+++ b/dev-util/catkin/catkin-0.7.17.ebuild
@@ -42,7 +42,7 @@ PATCHES=(
 	"${FILESDIR}/distutils.patch"
 	"${FILESDIR}/catkin_prefix_path.patch"
 	"${FILESDIR}/gnuinstalldirs.patch"
-	"${FILESDIR}/catkin_prefix_path_util_py.patch"
+	"${FILESDIR}/catkin_prefix_path_util_py_v2.patch"
 	"${FILESDIR}/package_xml.patch"
 	"${FILESDIR}/etc.patch"
 	"${FILESDIR}/sitedir.patch"
diff --git a/dev-util/catkin/catkin-9999.ebuild b/dev-util/catkin/catkin-9999.ebuild
index cef4fa0eb0e8..84cbac41ee4e 100644
--- a/dev-util/catkin/catkin-9999.ebuild
+++ b/dev-util/catkin/catkin-9999.ebuild
@@ -42,7 +42,7 @@ PATCHES=(
 	"${FILESDIR}/distutils.patch"
 	"${FILESDIR}/catkin_prefix_path.patch"
 	"${FILESDIR}/gnuinstalldirs.patch"
-	"${FILESDIR}/catkin_prefix_path_util_py.patch"
+	"${FILESDIR}/catkin_prefix_path_util_py_v2.patch"
 	"${FILESDIR}/package_xml.patch"
 	"${FILESDIR}/etc.patch"
 	"${FILESDIR}/sitedir.patch"
diff --git a/dev-util/catkin/files/catkin_prefix_path_util_py_v2.patch b/dev-util/catkin/files/catkin_prefix_path_util_py_v2.patch
new file mode 100644
index 000000000000..ae468b21c01c
--- /dev/null
+++ b/dev-util/catkin/files/catkin_prefix_path_util_py_v2.patch
@@ -0,0 +1,40 @@
+Author:  Eric Timmons 
+https://bugs.gentoo.org/show_bug.cgi?id=586104
+
+Index: catkin-0.7.17/cmake/templates/_setup_util.py.in
+===================================================================
+--- catkin-0.7.17.orig/cmake/templates/_setup_util.py.in
++++ catkin-0.7.17/cmake/templates/_setup_util.py.in
+@@ -264,7 +264,7 @@ if __name__ == '__main__':
+ 
+         if not args.local:
+             # environment at generation time
+-            CMAKE_PREFIX_PATH = '@CMAKE_PREFIX_PATH_AS_IS@'.split(';')
++            CMAKE_PREFIX_PATH = '@CATKIN_PREFIX_PATH@;@CMAKE_PREFIX_PATH_AS_IS@'.split(';')
+         else:
+             # don't consider any other prefix path than this one
+             CMAKE_PREFIX_PATH = []
+Index: catkin-0.7.17/python/catkin/builder.py
+===================================================================
+--- catkin-0.7.17.orig/python/catkin/builder.py
++++ catkin-0.7.17/python/catkin/builder.py
+@@ -1143,6 +1143,7 @@ _CATKIN_SETUP_DIR= . "{0}/setup.sh"
+                     'CATKIN_LIB_ENVIRONMENT_PATHS': "'lib'",
+                     'CATKIN_PKGCONFIG_ENVIRONMENT_PATHS': "os.path.join('lib', 'pkgconfig')",
+                     'CMAKE_PREFIX_PATH_AS_IS': ';'.join(os.environ['CMAKE_PREFIX_PATH'].split(os.pathsep)),
++                    'CATKIN_PREFIX_PATH': ';'.join(os.environ['CATKIN_PREFIX_PATH'].split(os.pathsep)),
+                     'PYTHON_EXECUTABLE': sys.executable,
+                     'PYTHON_INSTALL_DIR': get_python_install_dir(),
+                 }
+Index: catkin-0.7.17/test/unit_tests/test_setup_util.py
+===================================================================
+--- catkin-0.7.17.orig/test/unit_tests/test_setup_util.py
++++ catkin-0.7.17/test/unit_tests/test_setup_util.py
+@@ -14,6 +14,7 @@ data = configure_file(os.path.join(os.pa
+                           'PYTHON_EXECUTABLE': sys.executable,
+                           'PYTHON_INSTALL_DIR': 'pythonX.Y/packages',
+                           'CMAKE_PREFIX_PATH_AS_IS': '',
++                          'CATKIN_PREFIX_PATH':'',
+                       })
+ with tempfile.NamedTemporaryFile('w+') as setup_util_file:
+     setup_util_file.write(data)