gentoo-mirror/gentoo
1
0
Fork 0
mirror of https://github.com/gentoo-mirror/gentoo.git synced 2026-09-16 14:29:05 -07:00
Code Issues Projects Releases Wiki Activity

dev-ros/ament_cmake_include_directories: use python-any-r1

Browse Source 
Package-Manager: Portage-2.3.81, Repoman-2.3.20
Signed-off-by: Alexis Ballier <aballier@gentoo.org>
This commit is contained in:
Alexis Ballier
2019-12-13 13:44:19 +01:00
parent 4e9ba7d7db
commit e0dea5a199
2 changed files with 16 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
dev-ros/ament_cmake_include_directories/ament_cmake_include_directories-0.8.1.ebuild
View File

@@ -5,7 +5,7 @@ EAPI=7
PYTHON_COMPAT=( python{3_6,3_7} )
inherit cmake-utils python-r1
inherit cmake-utils python-any-r1
ROS_PN="ament_cmake"
if [ "${PV#9999}" != "${PV}" ] ; then
@@ -30,19 +30,12 @@ else
fi
IUSE=""
DEPEND="
dev-ros/ament_cmake_core[${PYTHON_USEDEP}]
RDEPEND="
dev-ros/ament_cmake_core
"
DEPEND="${RDEPEND}"
# Deps here are transitive from ament_cmake_core to have matching python support
BDEPEND="
$(python_gen_any_dep 'dev-python/ament_package[${PYTHON_USEDEP}] dev-python/catkin_pkg[${PYTHON_USEDEP}]')
${PYTHON_DEPS}
"
RDEPEND="${DEPEND}"
BDEPEND="${DEPEND}"
REQUIRED_USE="${PYTHON_REQUIRED_USE}"
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
}

23
dev-ros/ament_cmake_include_directories/ament_cmake_include_directories-9999.ebuild
View File

@@ -5,7 +5,7 @@ EAPI=7
PYTHON_COMPAT=( python{3_6,3_7} )
inherit cmake-utils python-r1
inherit cmake-utils python-any-r1
ROS_PN="ament_cmake"
if [ "${PV#9999}" != "${PV}" ] ; then
@@ -30,19 +30,12 @@ else
fi
IUSE=""
DEPEND="
dev-ros/ament_cmake_core[${PYTHON_USEDEP}]
RDEPEND="
dev-ros/ament_cmake_core
"
DEPEND="${RDEPEND}"
# Deps here are transitive from ament_cmake_core to have matching python support
BDEPEND="
$(python_gen_any_dep 'dev-python/ament_package[${PYTHON_USEDEP}] dev-python/catkin_pkg[${PYTHON_USEDEP}]')
${PYTHON_DEPS}
"
RDEPEND="${DEPEND}"
BDEPEND="${DEPEND}"
REQUIRED_USE="${PYTHON_REQUIRED_USE}"
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
}