commit: c3d939d08bbeb273a183a712c1650f235f5a159d
Author: Alexis Ballier <aballier <AT> gentoo <DOT> org>
AuthorDate: Thu Dec 12 15:43:44 2019 +0000
Commit: Alexis Ballier <aballier <AT> gentoo <DOT> org>
CommitDate: Thu Dec 12 15:43:54 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c3d939d0
ros-meta/ament_cmake: fix deps, add live ebuild
Package-Manager: Portage-2.3.81, Repoman-2.3.20
Signed-off-by: Alexis Ballier <aballier <AT> gentoo.org>
ros-meta/ament_cmake/ament_cmake-0.8.1.ebuild | 23 +++++++++++++++++-----
..._cmake-0.8.1.ebuild => ament_cmake-9999.ebuild} | 23 +++++++++++++++++-----
2 files changed, 36 insertions(+), 10 deletions(-)
diff --git a/ros-meta/ament_cmake/ament_cmake-0.8.1.ebuild
b/ros-meta/ament_cmake/ament_cmake-0.8.1.ebuild
index ff07eb121aa..9424ebe9198 100644
--- a/ros-meta/ament_cmake/ament_cmake-0.8.1.ebuild
+++ b/ros-meta/ament_cmake/ament_cmake-0.8.1.ebuild
@@ -8,13 +8,26 @@ PYTHON_COMPAT=( python{3_6,3_7} )
inherit cmake-utils python-r1
ROS_PN="ament_cmake"
-DESCRIPTION="The entry point package for 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 entry point package for 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="
@@ -30,11 +43,11 @@ DEPEND="
dev-ros/ament_cmake_target_dependencies[${PYTHON_USEDEP}]
dev-ros/ament_cmake_test[${PYTHON_USEDEP}]
dev-ros/ament_cmake_version[${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/ros-meta/ament_cmake/ament_cmake-0.8.1.ebuild
b/ros-meta/ament_cmake/ament_cmake-9999.ebuild
similarity index 73%
copy from ros-meta/ament_cmake/ament_cmake-0.8.1.ebuild
copy to ros-meta/ament_cmake/ament_cmake-9999.ebuild
index ff07eb121aa..9424ebe9198 100644
--- a/ros-meta/ament_cmake/ament_cmake-0.8.1.ebuild
+++ b/ros-meta/ament_cmake/ament_cmake-9999.ebuild
@@ -8,13 +8,26 @@ PYTHON_COMPAT=( python{3_6,3_7} )
inherit cmake-utils python-r1
ROS_PN="ament_cmake"
-DESCRIPTION="The entry point package for 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 entry point package for 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="
@@ -30,11 +43,11 @@ DEPEND="
dev-ros/ament_cmake_target_dependencies[${PYTHON_USEDEP}]
dev-ros/ament_cmake_test[${PYTHON_USEDEP}]
dev-ros/ament_cmake_version[${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
