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 615F7138334 for ; Thu, 12 Dec 2019 15:44:08 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 7F999E0863; Thu, 12 Dec 2019 15:44:05 +0000 (UTC) Received: from smtp.gentoo.org (smtp.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 571E6E0863 for ; Thu, 12 Dec 2019 15:44:05 +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 5686534D979 for ; Thu, 12 Dec 2019 15:44:04 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 77478905 for ; Thu, 12 Dec 2019 15:44:00 +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: <1576165433.bea53e4aff4198b0d8d42f320bd9d1023238fc5c.aballier@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-ros/ament_cmake_test/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-ros/ament_cmake_test/ament_cmake_test-0.8.1.ebuild dev-ros/ament_cmake_test/ament_cmake_test-9999.ebuild X-VCS-Directories: dev-ros/ament_cmake_test/ X-VCS-Committer: aballier X-VCS-Committer-Name: Alexis Ballier X-VCS-Revision: bea53e4aff4198b0d8d42f320bd9d1023238fc5c X-VCS-Branch: master Date: Thu, 12 Dec 2019 15:44:00 +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-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 6d57635d-6766-41b7-9338-fbc8cdd5ec40 X-Archives-Hash: 36e444a84237cfe794e729e4e7f37ce4 commit: bea53e4aff4198b0d8d42f320bd9d1023238fc5c Author: Alexis Ballier gentoo org> AuthorDate: Thu Dec 12 15:39:19 2019 +0000 Commit: Alexis Ballier gentoo org> CommitDate: Thu Dec 12 15:43:53 2019 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bea53e4a dev-ros/ament_cmake_test: fix deps and python install Add live ebuild too Package-Manager: Portage-2.3.81, Repoman-2.3.20 Signed-off-by: Alexis Ballier gentoo.org> .../ament_cmake_test/ament_cmake_test-0.8.1.ebuild | 45 ++++++++++++----- .../ament_cmake_test/ament_cmake_test-9999.ebuild | 56 ++++++++++++++++++++++ 2 files changed, 89 insertions(+), 12 deletions(-) diff --git a/dev-ros/ament_cmake_test/ament_cmake_test-0.8.1.ebuild b/dev-ros/ament_cmake_test/ament_cmake_test-0.8.1.ebuild index db5c3969d56..71917fb38ac 100644 --- a/dev-ros/ament_cmake_test/ament_cmake_test-0.8.1.ebuild +++ b/dev-ros/ament_cmake_test/ament_cmake_test-0.8.1.ebuild @@ -5,32 +5,53 @@ EAPI=7 PYTHON_COMPAT=( python{3_6,3_7} ) -inherit cmake-utils python-r1 +inherit cmake-utils python-r1 python-utils-r1 ROS_PN="ament_cmake" -DESCRIPTION="The core of the ament buildsystem in CMake" +if [ "${PV#9999}" != "${PV}" ] ; then + inherit git-r3 + EGIT_REPO_URI="https://github.com/ament/ament_cmake" + SRC_URI="" + S=${WORKDIR}/${P}/${PN} +else + SRC_URI="https://github.com/ament/ament_cmake/archive/${PV}.tar.gz -> ${ROS_PN}-${PV}.tar.gz" + S="${WORKDIR}/${ROS_PN}-${PV}/${PN}" +fi + +DESCRIPTION="The ability to add tests in the ament buildsystem" HOMEPAGE="https://github.com/ament/ament_cmake" -SRC_URI="https://github.com/ament/ament_cmake/archive/${PV}.tar.gz -> ${ROS_PN}-${PV}.tar.gz" LICENSE="Apache-2.0" SLOT="0" -KEYWORDS="~amd64" +if [ "${PV#9999}" != "${PV}" ] ; then + KEYWORDS="" +else + KEYWORDS="~amd64" +fi IUSE="" DEPEND=" dev-ros/ament_cmake_core[${PYTHON_USEDEP}] dev-ros/ament_cmake_python[${PYTHON_USEDEP}] + ${PYTHON_DEPS} " RDEPEND="${DEPEND}" -BDEPEND="${PYTHON_DEPS}" +BDEPEND="${DEPEND}" REQUIRED_USE="${PYTHON_REQUIRED_USE}" -S="${WORKDIR}/${ROS_PN}-${PV}/${PN}" src_configure() { - # This is a build tool that does not install python-related files - # ... but we need to propagate the deps and use python3 to build it. - local pyimpl="${PYTHON_COMPAT[0]}" - python_export "${pyimpl}" EPYTHON PYTHON - python_wrapper_setup - cmake-utils_src_configure + python_foreach_impl cmake-utils_src_configure +} + +src_compile() { + python_foreach_impl cmake-utils_src_compile +} + +src_test() { + python_foreach_impl cmake-utils_src_test +} + +src_install() { + python_foreach_impl cmake-utils_src_install + python_foreach_impl python_optimize } diff --git a/dev-ros/ament_cmake_test/ament_cmake_test-9999.ebuild b/dev-ros/ament_cmake_test/ament_cmake_test-9999.ebuild new file mode 100644 index 00000000000..d459a75c693 --- /dev/null +++ b/dev-ros/ament_cmake_test/ament_cmake_test-9999.ebuild @@ -0,0 +1,56 @@ +# Copyright 2019 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +PYTHON_COMPAT=( python{3_6,3_7} ) + +inherit cmake-utils python-r1 + +ROS_PN="ament_cmake" +if [ "${PV#9999}" != "${PV}" ] ; then + inherit git-r3 + EGIT_REPO_URI="https://github.com/ament/ament_cmake" + SRC_URI="" + S=${WORKDIR}/${P}/${PN} +else + SRC_URI="https://github.com/ament/ament_cmake/archive/${PV}.tar.gz -> ${ROS_PN}-${PV}.tar.gz" + S="${WORKDIR}/${ROS_PN}-${PV}/${PN}" +fi + +DESCRIPTION="The ability to add tests in the ament buildsystem" +HOMEPAGE="https://github.com/ament/ament_cmake" + +LICENSE="Apache-2.0" +SLOT="0" +if [ "${PV#9999}" != "${PV}" ] ; then + KEYWORDS="" +else + KEYWORDS="~amd64" +fi +IUSE="" + +DEPEND=" + dev-ros/ament_cmake_core[${PYTHON_USEDEP}] + dev-ros/ament_cmake_python[${PYTHON_USEDEP}] + ${PYTHON_DEPS} +" +RDEPEND="${DEPEND}" +BDEPEND="${DEPEND}" +REQUIRED_USE="${PYTHON_REQUIRED_USE}" + +src_configure() { + python_foreach_impl cmake-utils_src_configure +} + +src_compile() { + python_foreach_impl cmake-utils_src_compile +} + +src_test() { + python_foreach_impl cmake-utils_src_test +} + +src_install() { + python_foreach_impl cmake-utils_src_install +}