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 C8FC8138334 for ; Thu, 12 Dec 2019 14:47:25 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id BBD7FE0885; Thu, 12 Dec 2019 14:47:16 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (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 85BECE0885 for ; Thu, 12 Dec 2019 14:47:16 +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 5E28E34D981 for ; Thu, 12 Dec 2019 14:47:15 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 6BADB991 for ; Thu, 12 Dec 2019 14:47:10 +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: <1576162021.8aa742ae666a49d329ff70872ec78f0184c59e2c.aballier@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-ros/ament_cmake_export_definitions/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-ros/ament_cmake_export_definitions/ament_cmake_export_definitions-0.8.1.ebuild dev-ros/ament_cmake_export_definitions/ament_cmake_export_definitions-9999.ebuild X-VCS-Directories: dev-ros/ament_cmake_export_definitions/ X-VCS-Committer: aballier X-VCS-Committer-Name: Alexis Ballier X-VCS-Revision: 8aa742ae666a49d329ff70872ec78f0184c59e2c X-VCS-Branch: master Date: Thu, 12 Dec 2019 14:47:10 +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: 1ad3acdd-7623-4848-8116-8a51b2b8b290 X-Archives-Hash: d747e48dcb28c87a92f7bd9d5595d417 commit: 8aa742ae666a49d329ff70872ec78f0184c59e2c Author: Alexis Ballier gentoo org> AuthorDate: Thu Dec 12 14:44:18 2019 +0000 Commit: Alexis Ballier gentoo org> CommitDate: Thu Dec 12 14:47:01 2019 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8aa742ae dev-ros/ament_cmake_export_definitions: fix deps and add live ebuild Package-Manager: Portage-2.3.81, Repoman-2.3.20 Signed-off-by: Alexis Ballier gentoo.org> .../ament_cmake_export_definitions-0.8.1.ebuild | 21 +++++++++++++++++---- ...d => ament_cmake_export_definitions-9999.ebuild} | 21 +++++++++++++++++---- 2 files changed, 34 insertions(+), 8 deletions(-) diff --git a/dev-ros/ament_cmake_export_definitions/ament_cmake_export_definitions-0.8.1.ebuild b/dev-ros/ament_cmake_export_definitions/ament_cmake_export_definitions-0.8.1.ebuild index 927b7ae0692..a3fd2aea101 100644 --- a/dev-ros/ament_cmake_export_definitions/ament_cmake_export_definitions-0.8.1.ebuild +++ b/dev-ros/ament_cmake_export_definitions/ament_cmake_export_definitions-0.8.1.ebuild @@ -8,22 +8,35 @@ 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 core of the ament buildsystem in CMake" 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}] + ${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 diff --git a/dev-ros/ament_cmake_export_definitions/ament_cmake_export_definitions-0.8.1.ebuild b/dev-ros/ament_cmake_export_definitions/ament_cmake_export_definitions-9999.ebuild similarity index 64% copy from dev-ros/ament_cmake_export_definitions/ament_cmake_export_definitions-0.8.1.ebuild copy to dev-ros/ament_cmake_export_definitions/ament_cmake_export_definitions-9999.ebuild index 927b7ae0692..a3fd2aea101 100644 --- a/dev-ros/ament_cmake_export_definitions/ament_cmake_export_definitions-0.8.1.ebuild +++ b/dev-ros/ament_cmake_export_definitions/ament_cmake_export_definitions-9999.ebuild @@ -8,22 +8,35 @@ 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 core of the ament buildsystem in CMake" 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}] + ${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