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 38B22139695 for ; Fri, 7 Jul 2017 07:11:49 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 82AB12340C6; Fri, 7 Jul 2017 07:11:47 +0000 (UTC) Received: from smtp.gentoo.org (dev.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (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 553572340C6 for ; Fri, 7 Jul 2017 07:11:47 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (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 4869334176D for ; Fri, 7 Jul 2017 07:11:46 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id AA86374A9 for ; Fri, 7 Jul 2017 07:11:44 +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: <1499411429.2acf3a14236e928d6a3c3a3323bd825cd4d593ea.aballier@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-ros/rospack/, dev-ros/rospack/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-ros/rospack/files/multipy.patch dev-ros/rospack/rospack-2.4.1.ebuild dev-ros/rospack/rospack-9999.ebuild X-VCS-Directories: dev-ros/rospack/ dev-ros/rospack/files/ X-VCS-Committer: aballier X-VCS-Committer-Name: Alexis Ballier X-VCS-Revision: 2acf3a14236e928d6a3c3a3323bd825cd4d593ea X-VCS-Branch: master Date: Fri, 7 Jul 2017 07:11:44 +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: 545052c7-c0dc-4665-b490-734ee7dac638 X-Archives-Hash: c4cb2a70da65b43cc20dddb600cd380f commit: 2acf3a14236e928d6a3c3a3323bd825cd4d593ea Author: Alexis Ballier gentoo org> AuthorDate: Fri Jul 7 07:05:46 2017 +0000 Commit: Alexis Ballier gentoo org> CommitDate: Fri Jul 7 07:10:29 2017 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2acf3a14 dev-ros/rospack: simplify on top of recent ros-catkin.eclass changes. Package-Manager: Portage-2.3.6, Repoman-2.3.2 dev-ros/rospack/files/multipy.patch | 40 ------------------------------------ dev-ros/rospack/rospack-2.4.1.ebuild | 10 --------- dev-ros/rospack/rospack-9999.ebuild | 10 --------- 3 files changed, 60 deletions(-) diff --git a/dev-ros/rospack/files/multipy.patch b/dev-ros/rospack/files/multipy.patch deleted file mode 100644 index 8350cc0a8da..00000000000 --- a/dev-ros/rospack/files/multipy.patch +++ /dev/null @@ -1,40 +0,0 @@ -Install separate libraries linking to different python implementations. - -Index: rospack-2.4.1/CMakeLists.txt -=================================================================== ---- rospack-2.4.1.orig/CMakeLists.txt -+++ rospack-2.4.1/CMakeLists.txt -@@ -23,28 +23,28 @@ endif() - - include_directories(include ${TinyXML2_INCLUDE_DIRS} ${Boost_INCLUDE_DIRS} ${PYTHON_INCLUDE_DIRS}) - --add_library(rospack -+add_library(rospack-py${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR} - src/rospack.cpp - ${backcompat_source} - src/rospack_cmdline.cpp - src/utils.cpp - ) --target_link_libraries(rospack ${TinyXML2_LIBRARIES} ${Boost_LIBRARIES} ${PYTHON_LIBRARIES}) -+target_link_libraries(rospack-py${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR} ${TinyXML2_LIBRARIES} ${Boost_LIBRARIES} ${PYTHON_LIBRARIES}) - - add_executable(rospackexe src/rospack_main.cpp) - # Set the name, and make it a "global" executable - set_target_properties(rospackexe PROPERTIES - OUTPUT_NAME rospack - RUNTIME_OUTPUT_DIRECTORY ${CATKIN_DEVEL_PREFIX}/bin) --target_link_libraries(rospackexe rospack ${Boost_LIBRARIES}) -+target_link_libraries(rospackexe rospack-py${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR} ${Boost_LIBRARIES}) - add_executable(rosstackexe src/rosstack_main.cpp) --target_link_libraries(rosstackexe rospack ${Boost_LIBRARIES}) -+target_link_libraries(rosstackexe rospack-py${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR} ${Boost_LIBRARIES}) - # Set the name, and make it a "global" executable - set_target_properties(rosstackexe PROPERTIES - OUTPUT_NAME rosstack - RUNTIME_OUTPUT_DIRECTORY ${CATKIN_DEVEL_PREFIX}/bin) - --install(TARGETS rospack rospackexe rosstackexe -+install(TARGETS rospack-py${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR} rospackexe rosstackexe - ARCHIVE DESTINATION ${CATKIN_PACKAGE_LIB_DESTINATION} - LIBRARY DESTINATION ${CATKIN_PACKAGE_LIB_DESTINATION} - RUNTIME DESTINATION ${CATKIN_GLOBAL_BIN_DESTINATION}) diff --git a/dev-ros/rospack/rospack-2.4.1.ebuild b/dev-ros/rospack/rospack-2.4.1.ebuild index 7d49abfd959..18b9f633ad3 100644 --- a/dev-ros/rospack/rospack-2.4.1.ebuild +++ b/dev-ros/rospack/rospack-2.4.1.ebuild @@ -5,7 +5,6 @@ EAPI=5 ROS_REPO_URI="https://github.com/ros/rospack" KEYWORDS="~amd64 ~arm" -PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} ) inherit ros-catkin @@ -29,13 +28,4 @@ DEPEND="${RDEPEND} PATCHES=( "${FILESDIR}/gentoo.patch" - "${FILESDIR}/multipy.patch" ) - -src_install() { - ros-catkin_src_install - # Assume greatest alphabetically is what we want as default implementation - for i in "${ED}"/usr/$(get_libdir)/librospack*.so ; do - dosym $(basename "${i}") /usr/$(get_libdir)/librospack.so - done -} diff --git a/dev-ros/rospack/rospack-9999.ebuild b/dev-ros/rospack/rospack-9999.ebuild index 7d49abfd959..18b9f633ad3 100644 --- a/dev-ros/rospack/rospack-9999.ebuild +++ b/dev-ros/rospack/rospack-9999.ebuild @@ -5,7 +5,6 @@ EAPI=5 ROS_REPO_URI="https://github.com/ros/rospack" KEYWORDS="~amd64 ~arm" -PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} ) inherit ros-catkin @@ -29,13 +28,4 @@ DEPEND="${RDEPEND} PATCHES=( "${FILESDIR}/gentoo.patch" - "${FILESDIR}/multipy.patch" ) - -src_install() { - ros-catkin_src_install - # Assume greatest alphabetically is what we want as default implementation - for i in "${ED}"/usr/$(get_libdir)/librospack*.so ; do - dosym $(basename "${i}") /usr/$(get_libdir)/librospack.so - done -}