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 D0B64138335 for ; Thu, 12 Dec 2019 14:47:24 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 87B57E0893; 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 554A3E0885 for ; Thu, 12 Dec 2019 14:47:16 +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 4A74C34D97F 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 9132E993 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.c2e47b8de07d6151149b0549d65168b21f745074.aballier@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-ros/ament_cmake_export_dependencies/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-ros/ament_cmake_export_dependencies/ament_cmake_export_dependencies-0.8.1.ebuild dev-ros/ament_cmake_export_dependencies/ament_cmake_export_dependencies-9999.ebuild X-VCS-Directories: dev-ros/ament_cmake_export_dependencies/ X-VCS-Committer: aballier X-VCS-Committer-Name: Alexis Ballier X-VCS-Revision: c2e47b8de07d6151149b0549d65168b21f745074 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: fb467876-c57e-4d5d-b3ef-54be54519a69 X-Archives-Hash: f2612bbe3ac6d7a5544b2ecec17a37f5 commit: c2e47b8de07d6151149b0549d65168b21f745074 Author: Alexis Ballier gentoo org> AuthorDate: Thu Dec 12 14:46:41 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=c2e47b8d dev-ros/ament_cmake_export_dependencies: fix deps, add live ebuild Package-Manager: Portage-2.3.81, Repoman-2.3.20 Signed-off-by: Alexis Ballier gentoo.org> .../ament_cmake_export_dependencies-0.8.1.ebuild | 23 +++++++++++++++++----- ...=> ament_cmake_export_dependencies-9999.ebuild} | 23 +++++++++++++++++----- 2 files changed, 36 insertions(+), 10 deletions(-) diff --git a/dev-ros/ament_cmake_export_dependencies/ament_cmake_export_dependencies-0.8.1.ebuild b/dev-ros/ament_cmake_export_dependencies/ament_cmake_export_dependencies-0.8.1.ebuild index a7cae097311..cfd9dde3b96 100644 --- a/dev-ros/ament_cmake_export_dependencies/ament_cmake_export_dependencies-0.8.1.ebuild +++ b/dev-ros/ament_cmake_export_dependencies/ament_cmake_export_dependencies-0.8.1.ebuild @@ -8,23 +8,36 @@ PYTHON_COMPAT=( python{3_6,3_7} ) inherit cmake-utils python-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="Export dependencies to downstream packages in 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}] dev-ros/ament_cmake_libraries[${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_dependencies/ament_cmake_export_dependencies-0.8.1.ebuild b/dev-ros/ament_cmake_export_dependencies/ament_cmake_export_dependencies-9999.ebuild similarity index 59% copy from dev-ros/ament_cmake_export_dependencies/ament_cmake_export_dependencies-0.8.1.ebuild copy to dev-ros/ament_cmake_export_dependencies/ament_cmake_export_dependencies-9999.ebuild index a7cae097311..cfd9dde3b96 100644 --- a/dev-ros/ament_cmake_export_dependencies/ament_cmake_export_dependencies-0.8.1.ebuild +++ b/dev-ros/ament_cmake_export_dependencies/ament_cmake_export_dependencies-9999.ebuild @@ -8,23 +8,36 @@ PYTHON_COMPAT=( python{3_6,3_7} ) inherit cmake-utils python-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="Export dependencies to downstream packages in 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}] dev-ros/ament_cmake_libraries[${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