From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-1214567-garchives=archives.gentoo.org@lists.gentoo.org>
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 4E50B138359
for <garchives@archives.gentoo.org>; Tue, 13 Oct 2020 12:24:24 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
by pigeon.gentoo.org (Postfix) with SMTP id AA369E093A;
Tue, 13 Oct 2020 12:24:21 +0000 (UTC)
Received: from smtp.gentoo.org (mail.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4])
(using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits))
(No client certificate requested)
by pigeon.gentoo.org (Postfix) with ESMTPS id 8664BE0937
for <gentoo-commits@lists.gentoo.org>; Tue, 13 Oct 2020 12:24:21 +0000 (UTC)
Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52])
(using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits))
(No client certificate requested)
by smtp.gentoo.org (Postfix) with ESMTPS id 60467335D60
for <gentoo-commits@lists.gentoo.org>; Tue, 13 Oct 2020 12:24:20 +0000 (UTC)
Received: from localhost.localdomain (localhost [IPv6:::1])
by oystercatcher.gentoo.org (Postfix) with ESMTP id C93F836B
for <gentoo-commits@lists.gentoo.org>; Tue, 13 Oct 2020 12:24:18 +0000 (UTC)
From: "Alexis Ballier" <aballier@gentoo.org>
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" <aballier@gentoo.org>
Message-ID: <1602591854.c9fb3d4e4b878dc857fb467c837fd7d3922631bb.aballier@gentoo>
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-util/catkin/, dev-util/catkin/files/
X-VCS-Repository: repo/gentoo
X-VCS-Files: dev-util/catkin/Manifest dev-util/catkin/catkin-0.8.3-r1.ebuild dev-util/catkin/files/egginfo.patch
X-VCS-Directories: dev-util/catkin/ dev-util/catkin/files/
X-VCS-Committer: aballier
X-VCS-Committer-Name: Alexis Ballier
X-VCS-Revision: c9fb3d4e4b878dc857fb467c837fd7d3922631bb
X-VCS-Branch: master
Date: Tue, 13 Oct 2020 12:24:18 +0000 (UTC)
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply
X-Archives-Salt: 97ef38bd-7aeb-4daf-bdd6-a2126e07fee7
X-Archives-Hash: abe4954f0fdb3ef8f3c568544fdaed95
commit: c9fb3d4e4b878dc857fb467c837fd7d3922631bb
Author: Alexis Ballier <aballier <AT> gentoo <DOT> org>
AuthorDate: Tue Oct 13 11:36:53 2020 +0000
Commit: Alexis Ballier <aballier <AT> gentoo <DOT> org>
CommitDate: Tue Oct 13 12:24:14 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c9fb3d4e
dev-util/catkin: Remove old
Package-Manager: Portage-3.0.8, Repoman-3.0.1
Signed-off-by: Alexis Ballier <aballier <AT> gentoo.org>
dev-util/catkin/Manifest | 1 -
dev-util/catkin/catkin-0.8.3-r1.ebuild | 125 ---------------------------------
dev-util/catkin/files/egginfo.patch | 13 ----
3 files changed, 139 deletions(-)
diff --git a/dev-util/catkin/Manifest b/dev-util/catkin/Manifest
index e2012a736da..daf0db1703c 100644
--- a/dev-util/catkin/Manifest
+++ b/dev-util/catkin/Manifest
@@ -1,2 +1 @@
-DIST catkin-0.8.3.tar.gz 215988 BLAKE2B 92d7bced93e2d33dafcfd902724f993aa15756139265b5594c15041c333568591193b86e1a4bee8c278f2739dd063f73b6ce675b8ab4fefd312b5daeea414c7a SHA512 14fd03627f3fb339a850ca73e7a49dfeb7312a85416473dff60995ea1d0f1050982929c297751502589a7320dd7eec5d922c86061166f9d475fc1108540db4ae
DIST catkin-0.8.8.tar.gz 217566 BLAKE2B c17ed55e4f72f6645a778b5669e9b54090ea0425526d7540a6c8cf3af88ba10dfd91b927f53a83d9d2fac56e000c4c52e93216a36694475a91fabe00dd2d0168 SHA512 a90c552bebb46ade23171c85ca1cb23b295d156e731c29cd7602e544aef6231edb179d0fce52d06008d762bafd309456e0ef8976a3f67ed9ea861b905b1bb979
diff --git a/dev-util/catkin/catkin-0.8.3-r1.ebuild b/dev-util/catkin/catkin-0.8.3-r1.ebuild
deleted file mode 100644
index c11d6524150..00000000000
--- a/dev-util/catkin/catkin-0.8.3-r1.ebuild
+++ /dev/null
@@ -1,125 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-SCM=""
-if [ "${PV#9999}" != "${PV}" ] ; then
- SCM="git-r3"
- EGIT_REPO_URI="https://github.com/ros/catkin"
-fi
-
-PYTHON_COMPAT=( python{3_6,3_7,3_8} )
-
-inherit ${SCM} cmake-utils python-r1 python-utils-r1
-
-DESCRIPTION="Cmake macros and associated python code used to build some parts of ROS"
-HOMEPAGE="https://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}] )"
-BDEPEND="
- dev-util/cmake
-"
-
-PATCHES=(
- "${FILESDIR}/tests.patch"
- "${FILESDIR}/distutils-v2.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}/egginfo.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=(
- "-DCATKIN_ENABLE_TESTING=$(usex test)"
- "-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##*/}"
- 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"
-
- python_foreach_impl python_optimize
-}
-
-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/files/egginfo.patch b/dev-util/catkin/files/egginfo.patch
deleted file mode 100644
index a33e066ced6..00000000000
--- a/dev-util/catkin/files/egginfo.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: catkin-0.8.3/cmake/catkin_python_setup.cmake
-===================================================================
---- catkin-0.8.3.orig/cmake/catkin_python_setup.cmake
-+++ catkin-0.8.3/cmake/catkin_python_setup.cmake
-@@ -143,7 +143,7 @@ function(catkin_python_setup)
-
- assert(PYTHON_INSTALL_DIR)
- if(${PROJECT_NAME}_SETUP_PY_SETUP_MODULE STREQUAL "setuptools")
-- set(SETUPTOOLS_EGG_INFO "egg_info --egg-base ${CMAKE_INSTALL_PREFIX}/${PYTHON_INSTALL_DIR}")
-+ set(SETUPTOOLS_EGG_INFO "egg_info --egg-base \${DESTDIR}${CMAKE_INSTALL_PREFIX}/${PYTHON_INSTALL_DIR}")
- else()
- set(SETUPTOOLS_EGG_INFO "")
- endif()