gentoo resync : 25.08.2020

6 files changed, 133 insertions, 70 deletions

diff --git a/dev-libs/console_bridge/Manifest b/dev-libs/console_bridge/Manifest
index b92d826ce38d..caec5a5ad05b 100644
--- a/dev-libs/console_bridge/Manifest
+++ b/dev-libs/console_bridge/Manifest
@@ -1,6 +1,9 @@
-DIST console_bridge-0.4.3.tar.gz 254021 BLAKE2B dc0816c65fb44151c88935058abc1528b1162d5fa8a940956f386031a23eb087e2653954ec60ff08f2f99fc6b3da76b08d8d6db6903955061cc6832d9e2e80ef SHA512 034f69dcfe0c56b93a5bc60095afaaaa275955ff58f0ddee1a0a325eff3981c41703c8b521b43cdca5f6317d6a5775e7caf221cf2d79b5d62045b0f4315cc577
-DIST console_bridge-0.4.4.tar.gz 254030 BLAKE2B ed25742be7eabe4723beb49db33c14eec8653234e86b10aaad49f0138dd610d1901be65306bd5dc1c3e297c2fff591a20dfce7f6e3134144ffc5e3e966c3c206 SHA512 9b8f165e3c2ea4a6c9ee5f551c78229aa57196d19c87a4393e9257bb65aed4dcfa0eb97a0b8c433347c71330659ca80ac6a3952775adb20312c51c31ef905184
-EBUILD console_bridge-0.4.3.ebuild 660 BLAKE2B 0f97c722af6e86c9181b86b22df65ebbe6b6e1886a5bb462bf4538d4bec4d20ca7e1dc84076426dd8a0e01206e9c693b3c011c890c43d5bbb863d65453e68a69 SHA512 8b712f5dce7bc67dbe004d81820e9b213e85246863ddeb1b883631f52d1c3bf186a78049529a147746cb4ec1eefce4cb51e9f5694c491a4fe93346047f8b1256
-EBUILD console_bridge-0.4.4.ebuild 660 BLAKE2B a20604842f209961f17ed06f2328306829722971b642fa7284ae72abc705f0897dc93d44ec1ebacec2613b78b3deee1b953e674e4175d8794679a3ee72e48223 SHA512 6572426be9429d43884b3fc97e89916cade366efc4e64c024093b78cad573bcd4a609221dea0ab994ba546f9d6a6feb762040302d8a1a685aea0cbf708621244
-EBUILD console_bridge-9999.ebuild 660 BLAKE2B a20604842f209961f17ed06f2328306829722971b642fa7284ae72abc705f0897dc93d44ec1ebacec2613b78b3deee1b953e674e4175d8794679a3ee72e48223 SHA512 6572426be9429d43884b3fc97e89916cade366efc4e64c024093b78cad573bcd4a609221dea0ab994ba546f9d6a6feb762040302d8a1a685aea0cbf708621244
+AUX tests.patch 864 BLAKE2B 7561e7fce3da8045b343180303f08a2748eb5aedd99dd297e269434371c63e711be731e4c4c2ccdcb9acee1fb6209f3d0f9323e5eaf6e034ab56bb1b77f43196 SHA512 e8c2fc93efc4af9638e0f8da67686ccddcb9402add5dc65999fe9033b08a95ed62e69b08209633d37885c9bf23d91d446270903d1b973814ea93bb574f64a081
+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
+EBUILD console_bridge-1.0.1.ebuild 1703 BLAKE2B 659359edf3b720a1f1b522d7b7c82490f12d3b13e78baf800b980663b6fb14723e3e7583e594c8b4644cbe6b984eb7507b7096862efa4b27788ea077acafdb9d SHA512 6c5396dc581d061536be6a29d27f864ca2d420ade806dbcf7fa1a13316862aec7b03fac1d0fc0de7fa370e25ad087184c90a51c953997dfddf47af0d782dd20d
+EBUILD console_bridge-9999.ebuild 1703 BLAKE2B 659359edf3b720a1f1b522d7b7c82490f12d3b13e78baf800b980663b6fb14723e3e7583e594c8b4644cbe6b984eb7507b7096862efa4b27788ea077acafdb9d SHA512 6c5396dc581d061536be6a29d27f864ca2d420ade806dbcf7fa1a13316862aec7b03fac1d0fc0de7fa370e25ad087184c90a51c953997dfddf47af0d782dd20d
 MISC metadata.xml 342 BLAKE2B 27f453549abc2dbcca6275e79549c765f3802eccc8161d95baf12311844a9a2b4b42ad7f20e84ca07bde29048436dcfb2b9644b88f30f5a2889b50516afb1e10 SHA512 a438639c10d92d4ae5b4b54b7dff6dcdecfe829544dc7480dd830f38803efe0207f142d5b6177aafb1b170979d11dea590d85d75ac7814dead2edce720367aaf
diff --git a/dev-libs/console_bridge/console_bridge-0.4.3.ebuild b/dev-libs/console_bridge/console_bridge-0.4.3.ebuild
deleted file mode 100644
index 24c3a5e41f0a..000000000000
--- a/dev-libs/console_bridge/console_bridge-0.4.3.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-SCM=""
-if [ "${PV#9999}" != "${PV}" ] ; then
-	SCM="git-r3"
-	EGIT_REPO_URI="https://github.com/ros/console_bridge"
-fi
-
-inherit ${SCM} cmake-utils multilib
-
-if [ "${PV#9999}" != "${PV}" ] ; then
-	KEYWORDS=""
-	SRC_URI=""
-else
-	KEYWORDS="~amd64 ~arm"
-	SRC_URI="https://github.com/ros/console_bridge/archive/${PV}.tar.gz -> ${P}.tar.gz"
-fi
-
-DESCRIPTION="A ROS-independent package for logging into rosconsole/rosout"
-HOMEPAGE="http://wiki.ros.org/console_bridge"
-LICENSE="BSD"
-SLOT="0/4"
-IUSE=""
-
-RDEPEND="dev-libs/boost:=[threads]"
-DEPEND="${RDEPEND}"
diff --git a/dev-libs/console_bridge/console_bridge-0.4.4.ebuild b/dev-libs/console_bridge/console_bridge-0.4.4.ebuild
deleted file mode 100644
index 1fac726c6456..000000000000
--- a/dev-libs/console_bridge/console_bridge-0.4.4.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-SCM=""
-if [ "${PV#9999}" != "${PV}" ] ; then
-	SCM="git-r3"
-	EGIT_REPO_URI="https://github.com/ros/console_bridge"
-fi
-
-inherit ${SCM} cmake-utils multilib
-
-if [ "${PV#9999}" != "${PV}" ] ; then
-	KEYWORDS=""
-	SRC_URI=""
-else
-	KEYWORDS="~amd64 ~arm"
-	SRC_URI="https://github.com/ros/console_bridge/archive/${PV}.tar.gz -> ${P}.tar.gz"
-fi
-
-DESCRIPTION="A ROS-independent package for logging into rosconsole/rosout"
-HOMEPAGE="http://wiki.ros.org/console_bridge"
-LICENSE="BSD"
-SLOT="0/4"
-IUSE=""
-
-RDEPEND="dev-libs/boost:=[threads]"
-DEPEND="${RDEPEND}"
diff --git a/dev-libs/console_bridge/console_bridge-1.0.1.ebuild b/dev-libs/console_bridge/console_bridge-1.0.1.ebuild
new file mode 100644
index 000000000000..a93aeb6410c5
--- /dev/null
+++ b/dev-libs/console_bridge/console_bridge-1.0.1.ebuild
@@ -0,0 +1,66 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+SCM=""
+if [ "${PV#9999}" != "${PV}" ] ; then
+	SCM="git-r3"
+	EGIT_REPO_URI="https://github.com/ros/console_bridge"
+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="${EXTERNAL_PROGS}"
+else
+	KEYWORDS="~amd64 ~arm"
+	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"
+HOMEPAGE="https://wiki.ros.org/console_bridge"
+LICENSE="BSD"
+SLOT="0/1"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="dev-libs/boost:=[threads]"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	test? (
+		dev-util/cppcheck
+	)
+"
+PATCHES=( "${FILESDIR}/tests.patch" )
+
+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
+	if use test ; then
+		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
+	fi
+}
+
+src_test() {
+	export AMENT_CPPCHECK_ALLOW_1_88=yes
+	cmake_src_test
+}
diff --git a/dev-libs/console_bridge/console_bridge-9999.ebuild b/dev-libs/console_bridge/console_bridge-9999.ebuild
index 1fac726c6456..a93aeb6410c5 100644
--- a/dev-libs/console_bridge/console_bridge-9999.ebuild
+++ b/dev-libs/console_bridge/console_bridge-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -9,21 +9,58 @@ if [ "${PV#9999}" != "${PV}" ] ; then
 	EGIT_REPO_URI="https://github.com/ros/console_bridge"
 fi
 
-inherit ${SCM} cmake-utils multilib
+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"
-HOMEPAGE="http://wiki.ros.org/console_bridge"
+HOMEPAGE="https://wiki.ros.org/console_bridge"
 LICENSE="BSD"
-SLOT="0/4"
-IUSE=""
+SLOT="0/1"
+IUSE="test"
+RESTRICT="!test? ( test )"
 
 RDEPEND="dev-libs/boost:=[threads]"
 DEPEND="${RDEPEND}"
+BDEPEND="
+	test? (
+		dev-util/cppcheck
+	)
+"
+PATCHES=( "${FILESDIR}/tests.patch" )
+
+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
+	if use test ; then
+		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
+	fi
+}
+
+src_test() {
+	export AMENT_CPPCHECK_ALLOW_1_88=yes
+	cmake_src_test
+}
diff --git a/dev-libs/console_bridge/files/tests.patch b/dev-libs/console_bridge/files/tests.patch
new file mode 100644
index 000000000000..0f41a8dd3aa7
--- /dev/null
+++ b/dev-libs/console_bridge/files/tests.patch
@@ -0,0 +1,15 @@
+This test does not make sense since the file is not yet installed.
+
+Index: console_bridge-1.0.1/test/CMakeLists.txt
+===================================================================
+--- console_bridge-1.0.1.orig/test/CMakeLists.txt
++++ console_bridge-1.0.1/test/CMakeLists.txt
+@@ -77,7 +77,7 @@ if(WGET_EXE)
+                    "--counting=detailed"
+                    "--extensions=cpp,h"
+                    "--linelength=100"
+-                   "--filter=-build/c++11,-runtime/references,-whitespace/braces,-whitespace/indent,-whitespace/parens,-whitespace/semicolon"
++                   "--filter=-build/c++11,-runtime/references,-whitespace/braces,-whitespace/indent,-whitespace/parens,-whitespace/semicolon,-build/header_guard"
+            "${PROJECT_SOURCE_DIR}/include/console_bridge/console.h"
+            "${PROJECT_SOURCE_DIR}/src/console.cpp"
+   )