commit: 1e0de28b078ead4e51fb20e6cf7caffea188fd18 Author: Alexis Ballier <aballier <AT> gentoo <DOT> org> AuthorDate: Mon Jul 27 13:19:34 2020 +0000 Commit: Alexis Ballier <aballier <AT> gentoo <DOT> org> CommitDate: Mon Jul 27 13:19:43 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1e0de28b
dev-libs/console_bridge: fix for network sandbox Closes: https://bugs.gentoo.org/733704 Package-Manager: Portage-3.0.0, Repoman-2.3.23 Signed-off-by: Alexis Ballier <aballier <AT> gentoo.org> dev-libs/console_bridge/Manifest | 4 ++++ dev-libs/console_bridge/console_bridge-1.0.1.ebuild | 21 ++++++++++++++++++--- dev-libs/console_bridge/console_bridge-9999.ebuild | 21 ++++++++++++++++++--- 3 files changed, 40 insertions(+), 6 deletions(-) diff --git a/dev-libs/console_bridge/Manifest b/dev-libs/console_bridge/Manifest index d36388ee03e..1ef811a7f04 100644 --- a/dev-libs/console_bridge/Manifest +++ b/dev-libs/console_bridge/Manifest @@ -1 +1,5 @@ +DIST console_bridge-1.0.1-ament-0.9.5-cppcheck.py 11626 BLAKE2B d4125b72bfd467f14302ef42c68ac0d7d5dcf53b0d8a678b9ec4a7e01cb71d27ef178d125ba659141dcb912a6a6b08a059e4b5babf03981d6da7190c4f626807 SHA512 19e5a854a228d4e98bdad1037089c2b74d88e31ee633bc1c7d580b011b4306f700aff3eb38fb1dcc0624a00a35942f38f71758eb3f0fc07b2b2f2a97e03def4c +DIST console_bridge-1.0.1-ament-0.9.5-cpplint.py 239005 BLAKE2B 9dc409974ada177f4698106fba4ec4f1dae9e49719daba999c19670057b11fa74463d459b3575dc80b589e36d96dfac182ac66a6ef31ef3fd0639aeab256990a SHA512 c01c549e67744f0646a8c29c7d35fff0ba80dfd374f77619c66b6f8e4365b9e4dfaa9419bd87aa00066d99a6af8d89f28438e3f116312303a521a8277fc427ab DIST console_bridge-1.0.1.tar.gz 259480 BLAKE2B 78df3aeaba2e7589166709e7c43a77ac021d22d0db8d379f320455a9d532b247083ff86c3e03d7f9842943c3c98f78cfb33d7920a2987433f822a05ccaf23866 SHA512 913b7ee1d5401c6324eaaab1f8a54d5ff6df4eedb119a1cd00712f223750d69313047344aec5887920497c7b456cf6cb88e5f756bfbbb5ed8223ec758cdfd021 +DIST console_bridge-9999-ament-0.9.5-cppcheck.py 11626 BLAKE2B d4125b72bfd467f14302ef42c68ac0d7d5dcf53b0d8a678b9ec4a7e01cb71d27ef178d125ba659141dcb912a6a6b08a059e4b5babf03981d6da7190c4f626807 SHA512 19e5a854a228d4e98bdad1037089c2b74d88e31ee633bc1c7d580b011b4306f700aff3eb38fb1dcc0624a00a35942f38f71758eb3f0fc07b2b2f2a97e03def4c +DIST console_bridge-9999-ament-0.9.5-cpplint.py 239005 BLAKE2B 9dc409974ada177f4698106fba4ec4f1dae9e49719daba999c19670057b11fa74463d459b3575dc80b589e36d96dfac182ac66a6ef31ef3fd0639aeab256990a SHA512 c01c549e67744f0646a8c29c7d35fff0ba80dfd374f77619c66b6f8e4365b9e4dfaa9419bd87aa00066d99a6af8d89f28438e3f116312303a521a8277fc427ab diff --git a/dev-libs/console_bridge/console_bridge-1.0.1.ebuild b/dev-libs/console_bridge/console_bridge-1.0.1.ebuild index cc6b84d4565..725184d675f 100644 --- a/dev-libs/console_bridge/console_bridge-1.0.1.ebuild +++ b/dev-libs/console_bridge/console_bridge-1.0.1.ebuild @@ -11,12 +11,18 @@ fi inherit ${SCM} cmake +AMENT_LINT_VER=0.9.5 +EXTERNAL_PROGS=" + https://raw.githubusercontent.com/ament/ament_lint/${AMENT_LINT_VER}/ament_cppcheck/ament_cppcheck/main.py -> ${P}-ament-${AMENT_LINT_VER}-cppcheck.py + https://raw.githubusercontent.com/ament/ament_lint/${AMENT_LINT_VER}/ament_cpplint/ament_cpplint/cpplint.py -> ${P}-ament-${AMENT_LINT_VER}-cpplint.py +" if [ "${PV#9999}" != "${PV}" ] ; then KEYWORDS="" - SRC_URI="" + SRC_URI="${EXTERNAL_PROGS}" else KEYWORDS="~amd64 ~arm" - SRC_URI="https://github.com/ros/console_bridge/archive/${PV}.tar.gz -> ${P}.tar.gz" + SRC_URI="${EXTERNAL_PROGS} + https://github.com/ros/console_bridge/archive/${PV}.tar.gz -> ${P}.tar.gz" fi DESCRIPTION="A ROS-independent package for logging into rosconsole/rosout" @@ -29,16 +35,25 @@ RDEPEND="dev-libs/boost:=[threads]" DEPEND="${RDEPEND}" BDEPEND=" test? ( - net-misc/wget dev-util/cppcheck ) " +src_prepare() { + # Avoid wgeting it. #733704 + sed -e 's/add_dependencies(console_bridge wget_cppchec/#/' -i test/CMakeLists.txt || die + cmake_src_prepare +} + src_configure() { local mycmakeargs=( -DBUILD_TESTING=$(usex test ON OFF) ) cmake_src_configure + + # For tests + cp "${DISTDIR}/${P}-ament-${AMENT_LINT_VER}-cppcheck.py" "${BUILD_DIR}/test/cppcheck.py" || die + cp "${DISTDIR}/${P}-ament-${AMENT_LINT_VER}-cpplint.py" "${BUILD_DIR}/test/cpplint.py" || die } src_test() { diff --git a/dev-libs/console_bridge/console_bridge-9999.ebuild b/dev-libs/console_bridge/console_bridge-9999.ebuild index cc6b84d4565..725184d675f 100644 --- a/dev-libs/console_bridge/console_bridge-9999.ebuild +++ b/dev-libs/console_bridge/console_bridge-9999.ebuild @@ -11,12 +11,18 @@ fi inherit ${SCM} cmake +AMENT_LINT_VER=0.9.5 +EXTERNAL_PROGS=" + https://raw.githubusercontent.com/ament/ament_lint/${AMENT_LINT_VER}/ament_cppcheck/ament_cppcheck/main.py -> ${P}-ament-${AMENT_LINT_VER}-cppcheck.py + https://raw.githubusercontent.com/ament/ament_lint/${AMENT_LINT_VER}/ament_cpplint/ament_cpplint/cpplint.py -> ${P}-ament-${AMENT_LINT_VER}-cpplint.py +" if [ "${PV#9999}" != "${PV}" ] ; then KEYWORDS="" - SRC_URI="" + SRC_URI="${EXTERNAL_PROGS}" else KEYWORDS="~amd64 ~arm" - SRC_URI="https://github.com/ros/console_bridge/archive/${PV}.tar.gz -> ${P}.tar.gz" + SRC_URI="${EXTERNAL_PROGS} + https://github.com/ros/console_bridge/archive/${PV}.tar.gz -> ${P}.tar.gz" fi DESCRIPTION="A ROS-independent package for logging into rosconsole/rosout" @@ -29,16 +35,25 @@ RDEPEND="dev-libs/boost:=[threads]" DEPEND="${RDEPEND}" BDEPEND=" test? ( - net-misc/wget dev-util/cppcheck ) " +src_prepare() { + # Avoid wgeting it. #733704 + sed -e 's/add_dependencies(console_bridge wget_cppchec/#/' -i test/CMakeLists.txt || die + cmake_src_prepare +} + src_configure() { local mycmakeargs=( -DBUILD_TESTING=$(usex test ON OFF) ) cmake_src_configure + + # For tests + cp "${DISTDIR}/${P}-ament-${AMENT_LINT_VER}-cppcheck.py" "${BUILD_DIR}/test/cppcheck.py" || die + cp "${DISTDIR}/${P}-ament-${AMENT_LINT_VER}-cpplint.py" "${BUILD_DIR}/test/cpplint.py" || die } src_test() {
