From 88ebe56470c37b02a044e1091cad6b2df0f3be8f Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Fri, 11 May 2018 16:02:49 +0100 Subject: gentoo resync : 11.05.2018 --- dev-util/catkin/Manifest | 4 +- dev-util/catkin/catkin-0.7.12.ebuild | 119 +++++++++++++++++++++++++++++++++++ dev-util/catkin/catkin-0.7.8.ebuild | 119 ----------------------------------- 3 files changed, 121 insertions(+), 121 deletions(-) create mode 100644 dev-util/catkin/catkin-0.7.12.ebuild delete mode 100644 dev-util/catkin/catkin-0.7.8.ebuild (limited to 'dev-util/catkin') diff --git a/dev-util/catkin/Manifest b/dev-util/catkin/Manifest index a90d1399da75..a205d9b79ad6 100644 --- a/dev-util/catkin/Manifest +++ b/dev-util/catkin/Manifest @@ -8,8 +8,8 @@ AUX package_xml.patch 1588 BLAKE2B 15a11031b704f307778e8cb85438851bfa38a2784abee 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.8.tar.gz 203828 BLAKE2B 169a8381297f5ea213c6e4179f63020330b19fb52821bb851f0716857607fda2af3e867ff3f23113bd66d9b96a9b47d60c6bf3643b9552c8f7686a8126b4dd18 SHA512 c3628c551c8a5a1e544f7816a5bdedf413217c6e1fc7bb612801d29fbb247660b35d634c26f8847ace8984482978a8b8bf72c3373fd1e2e0972917f206ee0605 +DIST catkin-0.7.12.tar.gz 211602 BLAKE2B ee5b9e57601847f79a2e7c49bb9b38974b0385a1c524c70cc549511d31b9fe8d03bf95e254b9c40a420fad990da40bf9c5d29f198ae42bd772c54a89cdc532b9 SHA512 ada496fae0959330b369c8a29daf9c575fcc94c3ee7e27e0180614fc49912450b23163622759975e588ffcdd49180e5f2fc8351e02bf1aef9b1f2db92811dbd6 EBUILD catkin-0.7.11.ebuild 3139 BLAKE2B bc6d94dc8ecc6939cf87c49afefcb74f664c9283b38735303265ca392472d8457f7a7c58f30ccbbfd2adc8f3682effb716acf4772f920245da3bf9d545ec3b32 SHA512 8b7e0b4e54866abf40d87daa43a16ed396afec17674b6d09898bf794a326f44fcbf8cb5836184f35e245ae34e488bd99a8ae01137bec2e60fae56d65577f0f3c -EBUILD catkin-0.7.8.ebuild 3139 BLAKE2B 6a79b59b3737995740a010bd564765f4e8ee5ef527c6a65d7100335047e774c81a46e54cd2e142903c50ca6a8dc82c52fbe4522aad7e41c58ad419da0b256e26 SHA512 6376d7edca6f7fea19baf69d9e42f0a75692f9104e9881415e96cfcb8cb2f2a6652901ac01c485f6e7ca1951a454e05439c67b8b36bf92ba8147566e7e006b01 +EBUILD catkin-0.7.12.ebuild 3139 BLAKE2B bc6d94dc8ecc6939cf87c49afefcb74f664c9283b38735303265ca392472d8457f7a7c58f30ccbbfd2adc8f3682effb716acf4772f920245da3bf9d545ec3b32 SHA512 8b7e0b4e54866abf40d87daa43a16ed396afec17674b6d09898bf794a326f44fcbf8cb5836184f35e245ae34e488bd99a8ae01137bec2e60fae56d65577f0f3c EBUILD catkin-9999.ebuild 3139 BLAKE2B 6a79b59b3737995740a010bd564765f4e8ee5ef527c6a65d7100335047e774c81a46e54cd2e142903c50ca6a8dc82c52fbe4522aad7e41c58ad419da0b256e26 SHA512 6376d7edca6f7fea19baf69d9e42f0a75692f9104e9881415e96cfcb8cb2f2a6652901ac01c485f6e7ca1951a454e05439c67b8b36bf92ba8147566e7e006b01 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 new file mode 100644 index 000000000000..6f125a7d7fb0 --- /dev/null +++ b/dev-util/catkin/catkin-0.7.12.ebuild @@ -0,0 +1,119 @@ +# Copyright 1999-2018 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." +} diff --git a/dev-util/catkin/catkin-0.7.8.ebuild b/dev-util/catkin/catkin-0.7.8.ebuild deleted file mode 100644 index eb49a4b8c816..000000000000 --- a/dev-util/catkin/catkin-0.7.8.ebuild +++ /dev/null @@ -1,119 +0,0 @@ -# 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." -} -- cgit v1.2.3