From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 5C5B6139694 for ; Thu, 9 Feb 2017 17:46:39 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id B100AE0D55; Thu, 9 Feb 2017 17:46:27 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 7BD3BE0D55 for ; Thu, 9 Feb 2017 17:46:22 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 93B23341117 for ; Thu, 9 Feb 2017 17:46:16 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 56AC33EB1 for ; Thu, 9 Feb 2017 17:46:13 +0000 (UTC) From: "Alexis Ballier" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Alexis Ballier" Message-ID: <1486662361.851539d05ba74c25e5f79826eb2f0a65a3a6a45f.aballier@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-util/catkin/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-util/catkin/Manifest dev-util/catkin/catkin-0.7.1-r2.ebuild dev-util/catkin/catkin-0.7.2.ebuild X-VCS-Directories: dev-util/catkin/ X-VCS-Committer: aballier X-VCS-Committer-Name: Alexis Ballier X-VCS-Revision: 851539d05ba74c25e5f79826eb2f0a65a3a6a45f X-VCS-Branch: master Date: Thu, 9 Feb 2017 17:46:13 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: d07d36cb-8782-4702-9200-85b67f2782d0 X-Archives-Hash: 4ad1d77a9c80231d84bca79e0afe2dd8 commit: 851539d05ba74c25e5f79826eb2f0a65a3a6a45f Author: Alexis Ballier gentoo org> AuthorDate: Thu Feb 9 16:38:49 2017 +0000 Commit: Alexis Ballier gentoo org> CommitDate: Thu Feb 9 17:46:01 2017 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=851539d0 dev-util/catkin: remove old Package-Manager: Portage-2.3.3, Repoman-2.3.1 dev-util/catkin/Manifest | 2 - dev-util/catkin/catkin-0.7.1-r2.ebuild | 110 --------------------------------- dev-util/catkin/catkin-0.7.2.ebuild | 110 --------------------------------- 3 files changed, 222 deletions(-) diff --git a/dev-util/catkin/Manifest b/dev-util/catkin/Manifest index dff4f787ea..0491695b6d 100644 --- a/dev-util/catkin/Manifest +++ b/dev-util/catkin/Manifest @@ -1,3 +1 @@ -DIST catkin-0.7.1.tar.gz 200307 SHA256 232cc85807daee31329ba4509fb1e5697ddb0a17f9442ac886a5883da687d9ab SHA512 e1ab220dc04e9522059c073c328c7da9d957266d2030e07a4ae03829c5666abf8ff5008e8208b5ca4b9a0153cb201337879e3c8f987d84fe5a4b66000d60ae03 WHIRLPOOL f47fb5a51869f49fc238eeb05ae76284081d8ac522283232b182197d7fc8e0255f34e99fd7f08abc79427f63e554e0cefdf5bee81a96a64d9ef489c45151af52 -DIST catkin-0.7.2.tar.gz 201049 SHA256 e8c23823b8cc6ea19b5e15af93c2790395cae72b82797c8f1ce2569e0c036e2f SHA512 23587533d531f6ef2fdc4c109a7954a771af60b95261057061aca50bf6d041e31307f4429d6dc9021ecc9e21d723806278b186a037b7ac26b751d83cb842ea37 WHIRLPOOL f91c4164ace4a354fcb9541ddd54f310b3bd5e3f481b0bf9c02cf594531485b079ec026ce6ce388cabf54a7bbc91230ddc71aa07a567a23d1b3384b7e0a313f0 DIST catkin-0.7.4.tar.gz 201140 SHA256 e113577697cd58432111c187b3faaa0df365f7694fe81ff71f9d29b65d467e48 SHA512 89bd38e8fbe4eba481404295f83a77974a2af14a038d326b294029d84789356290480588d7824e4e9849a9974a8ca08be13115c459aa6e00a8e36ce861f46a83 WHIRLPOOL 66b738d02609d9cfe891f7e159ec8ff980acb18208b635d25e9c66895e85ebd6024082ff117d3c1e0a26ebe529d7079aea2f8ecdfa541dc449b0ea768e033dd0 diff --git a/dev-util/catkin/catkin-0.7.1-r2.ebuild b/dev-util/catkin/catkin-0.7.1-r2.ebuild deleted file mode 100644 index ada4a5e925..0000000000 --- a/dev-util/catkin/catkin-0.7.1-r2.ebuild +++ /dev/null @@ -1,110 +0,0 @@ -# Copyright 1999-2016 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -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} ) - -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" - -RDEPEND=" - dev-python/catkin_pkg[${PYTHON_USEDEP}] - dev-python/empy[${PYTHON_USEDEP}] -" -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" -) - -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() { - mycmakeargs+=( -DPYTHON_EXECUTABLE="${PYTHON}" ) - python_export PYTHON_SCRIPTDIR - cmake-utils_src_configure -} - -src_configure() { - 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.2.ebuild b/dev-util/catkin/catkin-0.7.2.ebuild deleted file mode 100644 index ada4a5e925..0000000000 --- a/dev-util/catkin/catkin-0.7.2.ebuild +++ /dev/null @@ -1,110 +0,0 @@ -# Copyright 1999-2016 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -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} ) - -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" - -RDEPEND=" - dev-python/catkin_pkg[${PYTHON_USEDEP}] - dev-python/empy[${PYTHON_USEDEP}] -" -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" -) - -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() { - mycmakeargs+=( -DPYTHON_EXECUTABLE="${PYTHON}" ) - python_export PYTHON_SCRIPTDIR - cmake-utils_src_configure -} - -src_configure() { - 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." -}