gentoo resync : 10.11.2017

2 files changed, 121 insertions, 0 deletions

diff --git a/dev-util/catkin/Manifest b/dev-util/catkin/Manifest
index d48f2b7f4348..56524ea90150 100644
--- a/dev-util/catkin/Manifest
+++ b/dev-util/catkin/Manifest
@@ -9,8 +9,10 @@ AUX sitedir.patch 884 SHA256 0e0537eaab38dd872153e4179f45074a01e2186b83d59f2f0be
 AUX tests.patch 1640 SHA256 ea0258bc61eec6c03dbd2bcea2640abe9b95677882b169f39879551090867ee1 SHA512 a53ff72bf5302107241d43a0daa8ff18c50b6e69c0e1ecf2a841ace8d37fe7f3e8cb4202b666ad3bdda1bcb7d79f39244308542e1992b9af94d97bcec7086913 WHIRLPOOL bf990fb921745c627d77a3d46d55bf9ce3420c80eba76052fcc631bb1963f7e56b1268ed1605cce9968773c969d49246cd73a8ed778d1701b2b76595c0dc083a
 DIST catkin-0.7.6.tar.gz 202970 SHA256 468725aadfd6b615cd7d7a75fca37777db987b6ad63f73062c3273bd96d380d6 SHA512 9f4ddef3cdef0f81aeb2abe27db797318f813e184d457f6f81439d3b539efe2e2726da7eda8359a803848c5e5f8a2f8fd291b6f2a00a16a06112d084c1ec14ce WHIRLPOOL 863f477d54dd2ed297ea94776102fd31ad68cba3550e2a17a3218acda889c0b1071c9df73f16224fc75445742294df46ba6a7eae20019bb01974bde17db9fab8
 DIST catkin-0.7.7.tar.gz 203773 SHA256 0ab4efd1d42fc586ace5a37aba3c4266cff31593b39b7abe3ab6ced6b160e92f SHA512 616ff6a34ab52d50e383acdcebe66aa8f4ac1515ed3c654d75f32cdfe86ee3b87b17872ea2068ea5ddc5f35b73b5cf53c84c6e386d89ad2c8270228f1c446d01 WHIRLPOOL 40c901f74e39e6239d0967ce997d6ebc011063ed0208123d20e057a3bbd53e4dd7b70c6e8c4bfb31d7f0ae9e57292e17343565b68b9c441a5c10f7ff1dee6117
+DIST catkin-0.7.8.tar.gz 203828 SHA256 f0e2f0548ca40fb401d5badfd34798b39fb1aa6c08d4d369fd9cbf44c638f129 SHA512 c3628c551c8a5a1e544f7816a5bdedf413217c6e1fc7bb612801d29fbb247660b35d634c26f8847ace8984482978a8b8bf72c3373fd1e2e0972917f206ee0605 WHIRLPOOL 6a81046365f821241656c811461859d35945cd558b45172c92c0b911878230443ad95b0445f351633b0ea0835e6dc5aee1b0b3ba506f03bee63754fed2b36ca0
 EBUILD catkin-0.7.6-r1.ebuild 3139 SHA256 404f7d51614d4917c3ffe225d4edcae03183a4af37e0d511d7d97aefc54a8618 SHA512 6376d7edca6f7fea19baf69d9e42f0a75692f9104e9881415e96cfcb8cb2f2a6652901ac01c485f6e7ca1951a454e05439c67b8b36bf92ba8147566e7e006b01 WHIRLPOOL 7fb37095e7523ddc4c35d346f8173c6091f6437e752de87bb0014a35c672369c22358a1f95cdb23f93bf0d4f4e01f462bfe52b9df990e094b62708cd820cf61d
 EBUILD catkin-0.7.7.ebuild 3139 SHA256 404f7d51614d4917c3ffe225d4edcae03183a4af37e0d511d7d97aefc54a8618 SHA512 6376d7edca6f7fea19baf69d9e42f0a75692f9104e9881415e96cfcb8cb2f2a6652901ac01c485f6e7ca1951a454e05439c67b8b36bf92ba8147566e7e006b01 WHIRLPOOL 7fb37095e7523ddc4c35d346f8173c6091f6437e752de87bb0014a35c672369c22358a1f95cdb23f93bf0d4f4e01f462bfe52b9df990e094b62708cd820cf61d
+EBUILD catkin-0.7.8.ebuild 3139 SHA256 404f7d51614d4917c3ffe225d4edcae03183a4af37e0d511d7d97aefc54a8618 SHA512 6376d7edca6f7fea19baf69d9e42f0a75692f9104e9881415e96cfcb8cb2f2a6652901ac01c485f6e7ca1951a454e05439c67b8b36bf92ba8147566e7e006b01 WHIRLPOOL 7fb37095e7523ddc4c35d346f8173c6091f6437e752de87bb0014a35c672369c22358a1f95cdb23f93bf0d4f4e01f462bfe52b9df990e094b62708cd820cf61d
 EBUILD catkin-9999.ebuild 3139 SHA256 404f7d51614d4917c3ffe225d4edcae03183a4af37e0d511d7d97aefc54a8618 SHA512 6376d7edca6f7fea19baf69d9e42f0a75692f9104e9881415e96cfcb8cb2f2a6652901ac01c485f6e7ca1951a454e05439c67b8b36bf92ba8147566e7e006b01 WHIRLPOOL 7fb37095e7523ddc4c35d346f8173c6091f6437e752de87bb0014a35c672369c22358a1f95cdb23f93bf0d4f4e01f462bfe52b9df990e094b62708cd820cf61d
 MISC ChangeLog 5990 SHA256 a018d7be6b058ebfb6830438fedb99c62f5308fef6e3c0578bd69d09c312cbab SHA512 16d316ec40a72e54831a46f067d6c96e2af30e9ec3462f41a31ba0f6381161bbd67b32e052850acc989debf5ab7ac52a4f4087916133a109342a561b237d9960 WHIRLPOOL 284b9f907c2d313b17a76b4e4bc7e87e512854a52b520b59eb95b86ac603a5725c807a01f95b86515a705e7715578627f55ec2426c1ab47fd0461cd40d098c39
 MISC metadata.xml 324 SHA256 76d2cb422285dc8034108df724a94ec65a1d54886954d9ed835abae02d78df48 SHA512 598dc8dd4427079a7eeca415c192ec39e99e53bc41c06796d2355b8858363b71ee8f038646c61ddd82d27451eb48c6f93b47489cdb04ae7c8663a6b46c4f9b94 WHIRLPOOL fceca90068856e6ddaa7e39a1a14129f6bcb3e711bb91980b5bc7f79ef0bc950df3d3540309affff519115a91d060351b36e14af034aeffc2adbe2a1fa6e9bc0
diff --git a/dev-util/catkin/catkin-0.7.8.ebuild b/dev-util/catkin/catkin-0.7.8.ebuild
new file mode 100644
index 000000000000..eb49a4b8c816
--- /dev/null
+++ b/dev-util/catkin/catkin-0.7.8.ebuild
@@ -0,0 +1,119 @@
+# Copyright 1999-2017 Gentoo Foundation
+# 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_4,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."
+}