commit:     8aa742ae666a49d329ff70872ec78f0184c59e2c
Author:     Alexis Ballier <aballier <AT> gentoo <DOT> org>
AuthorDate: Thu Dec 12 14:44:18 2019 +0000
Commit:     Alexis Ballier <aballier <AT> gentoo <DOT> 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 <aballier <AT> 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

Reply via email to