gentoo resync : 25.08.2020

5 files changed, 38 insertions, 52 deletions

diff --git a/dev-libs/urdfdom/Manifest b/dev-libs/urdfdom/Manifest
index 0f70a8a7791a..2284d2bc6bdc 100644
--- a/dev-libs/urdfdom/Manifest
+++ b/dev-libs/urdfdom/Manifest
@@ -1,6 +1,5 @@
-DIST urdfdom-1.0.0.tar.gz 250016 BLAKE2B 525616785b4fa38c8900add42349aa3a2103c75b213c77e3d682084e674b5fae31e9f56331910c19e6e5c49f6f72e1e7240c588df0dc67d862e0eac911667381 SHA512 50a218e596bcc0cecff904db2fa626bebc3902c4fe1f5ff8e08195e462b4d9a8c416a41f4773cabbcc71490060d3feff7e8528a76b824569dc7fdb0bda01ec3f
-DIST urdfdom-1.0.3.tar.gz 275339 BLAKE2B aa14dbd5f55489e0bde97042afb03d47cd023e3003a4ff66808e9be1a03c4de0bdab1c56a6fb5f6aea83324cbb38d286def66553a8ef813fc1f70b0bd9e24268 SHA512 240181d9c61dd7544f16a79a400d9a2c4dc0a682bef165b46529efcb4b31e2a34e27896933b60b9ddbaa5c4a8d575ebda42752599ff3b0a98d1eeef8f9b0b7a7
-EBUILD urdfdom-1.0.0-r1.ebuild 805 BLAKE2B cdbb0b4f38e03b69a05746bca56b3244ef705ef5a71522cdcb676a8f446c4e8ee2ef30526a2be1dbb7d6719e891ffc9d914939e6c1e35a37e54ce4b0e01e7e77 SHA512 0e1364c218cfbf9d99dad4ac40a707de0997ae088095737f63f977f5bd19ac3d599ecc931a0a1de85ca5d5dddeb89b512d6de020ada69236abdd6cab78c076a5
-EBUILD urdfdom-1.0.3.ebuild 802 BLAKE2B e16dde4316702066aa8172f885a0d3a53d7c88e4964028c53d72687fa00d3be7fb6f9a65236f696b8f2d808fa3f150945631f48d16c96da09f3e015734fa571e SHA512 7db3be38dfd4448edbb5c2db1e814479604059c5d7154737b9128d86b1afdcf32846f579cb2f207e742fcf8078c5132ddfc5b5011b9e55fdf35e6eb3c194352a
-EBUILD urdfdom-9999.ebuild 805 BLAKE2B cdbb0b4f38e03b69a05746bca56b3244ef705ef5a71522cdcb676a8f446c4e8ee2ef30526a2be1dbb7d6719e891ffc9d914939e6c1e35a37e54ce4b0e01e7e77 SHA512 0e1364c218cfbf9d99dad4ac40a707de0997ae088095737f63f977f5bd19ac3d599ecc931a0a1de85ca5d5dddeb89b512d6de020ada69236abdd6cab78c076a5
+AUX cb.patch 768 BLAKE2B d777c9c55e81019c496c4dffbe2b113d4e0586b713fd2f6c630616a5d9e3f5c83bc23f6dcfd9bc034c78a635a92a085afc9a3f51079805c30fd2d31f8f3c59b9 SHA512 fed91e83af1c3f5c3de9e51ce7134e6c9f94a262817cf14034b390c6527cece0b867e4742a0754debfdf358c0816c9443fc0b84d9cffa531094f33861bb1155a
+DIST urdfdom-1.0.4.tar.gz 276958 BLAKE2B 19353c38d8fa8f1d6d752302bc8b7b84b13cc6c6f83af31dba677184fa09fd42d7de0c00e6927f085c3d013d2bde664dd7ea69d3c69de4c14130c08d256e6f87 SHA512 2a7a0ec61445132b3e8f6ba8b2268b9fd7c035a72b3e4d61b5ed665d07e902a02b87d2c60c53fc9b0c385a871cd8d87f278bd4833f1f904635ec46755a544003
+EBUILD urdfdom-1.0.4.ebuild 830 BLAKE2B 32faa951a18610e5fb79205e9136ab6037bb7e6adbafbff892eb49ce71e82998515fe0b36086fc551b83c8ed25ca19e506f96a96950d25f0de0d48529b85a651 SHA512 7d5ac91d6f432b08350ebbc621679e0149aa0c8a0fcdcc06ce98ed4e0fde6046987c5ce3eef0dd6446df02eb2a278daf97aa1da264a9cd5766defe9d57c5f701
+EBUILD urdfdom-9999.ebuild 795 BLAKE2B e53a7cfe21b87fd426dee0d4b12cf5bcf313666da5793b864b31047b7e5930115f825753e838376d84d8c475e850856df3acfd84a02f6ebf0f3c05c0b249bcec SHA512 8728695c1470358941d919765221f6a939f7c095e300ac54c8a387b940012b022fa247635dbfcc484f2b988d3a72ccc50fda7b87487c196d5ef196c056305af6
 MISC metadata.xml 335 BLAKE2B e19eb242410b151b76ffa335373a754a074cc060f57c4441a4da4364d8b7f1cd0c71246e48140c6ba6a80a17bf8d721d09c3b61547f83714d0d9d49ab55182da SHA512 ec4d58e41be7a83c80a5e0a77edcf8c231d783e0b4b5f8bb7c42d54da4dba495575b9ee1c32e334a11a424449cc3eba44f89d147d465ec490e4507443211450f
diff --git a/dev-libs/urdfdom/files/cb.patch b/dev-libs/urdfdom/files/cb.patch
new file mode 100644
index 000000000000..3d3e150580ee
--- /dev/null
+++ b/dev-libs/urdfdom/files/cb.patch
@@ -0,0 +1,23 @@
+From 6faba176d41cf39114785a3e029013f941ed5a0e Mon Sep 17 00:00:00 2001
+From: Steven Peters <scpeters@openrobotics.org>
+Date: Thu, 28 May 2020 09:22:29 -0700
+Subject: [PATCH] Find console_bridge without explicit version (#141)
+
+Signed-off-by: Steve Peters <scpeters@openrobotics.org>
+---
+ CMakeLists.txt | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 92762f1..f0d115d 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -41,7 +41,7 @@ if (NOT MSVC)
+   set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11")
+ endif()
+ 
+-find_package(console_bridge 0.3 REQUIRED)
++find_package(console_bridge REQUIRED)
+ include_directories(SYSTEM ${console_bridge_INCLUDE_DIRS})
+ link_directories(${console_bridge_LIBRARY_DIRS})
+ 
diff --git a/dev-libs/urdfdom/urdfdom-1.0.3.ebuild b/dev-libs/urdfdom/urdfdom-1.0.3.ebuild
deleted file mode 100644
index b48a465442cd..000000000000
--- a/dev-libs/urdfdom/urdfdom-1.0.3.ebuild
+++ /dev/null
@@ -1,37 +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/urdfdom"
-fi
-
-inherit ${SCM} cmake-utils
-
-if [ "${PV#9999}" != "${PV}" ] ; then
-	KEYWORDS=""
-	SRC_URI=""
-else
-	KEYWORDS="~amd64 ~arm"
-	SRC_URI="https://github.com/ros/urdfdom/archive/${PV}.tar.gz -> ${P}.tar.gz"
-fi
-
-DESCRIPTION="URDF (U-Robot Description Format) library"
-HOMEPAGE="http://ros.org/wiki/urdf"
-LICENSE="BSD"
-SLOT="0/1"
-IUSE=""
-
-RDEPEND=">=dev-libs/urdfdom_headers-1.0.0
-	>=dev-libs/console_bridge-0.3:=
-	dev-libs/tinyxml
-	dev-libs/boost:=[threads]"
-DEPEND="${RDEPEND}"
-
-src_prepare() {
-	sed -i -e 's/set(CMAKE_INSTALL_LIBDIR/#/' CMakeLists.txt || die
-	cmake-utils_src_prepare
-}
diff --git a/dev-libs/urdfdom/urdfdom-1.0.0-r1.ebuild b/dev-libs/urdfdom/urdfdom-1.0.4.ebuild
index a92586497867..ff59cc0e6461 100644
--- a/dev-libs/urdfdom/urdfdom-1.0.0-r1.ebuild
+++ b/dev-libs/urdfdom/urdfdom-1.0.4.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
 SCM=""
 if [ "${PV#9999}" != "${PV}" ] ; then
@@ -9,7 +9,7 @@ if [ "${PV#9999}" != "${PV}" ] ; then
 	EGIT_REPO_URI="https://github.com/ros/urdfdom"
 fi
 
-inherit ${SCM} cmake-utils
+inherit ${SCM} cmake
 
 if [ "${PV#9999}" != "${PV}" ] ; then
 	KEYWORDS=""
@@ -27,11 +27,12 @@ IUSE=""
 
 RDEPEND=">=dev-libs/urdfdom_headers-1.0.0
 	>=dev-libs/console_bridge-0.3:=
-	dev-libs/tinyxml
+	dev-libs/tinyxml[stl]
 	dev-libs/boost:=[threads]"
 DEPEND="${RDEPEND}"
+PATCHES=( "${FILESDIR}/cb.patch" )
 
 src_prepare() {
 	sed -i -e 's/set(CMAKE_INSTALL_LIBDIR/#/' CMakeLists.txt || die
-	cmake-utils_src_prepare
+	cmake_src_prepare
 }
diff --git a/dev-libs/urdfdom/urdfdom-9999.ebuild b/dev-libs/urdfdom/urdfdom-9999.ebuild
index a92586497867..6c0a7505b197 100644
--- a/dev-libs/urdfdom/urdfdom-9999.ebuild
+++ b/dev-libs/urdfdom/urdfdom-9999.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
 SCM=""
 if [ "${PV#9999}" != "${PV}" ] ; then
@@ -9,7 +9,7 @@ if [ "${PV#9999}" != "${PV}" ] ; then
 	EGIT_REPO_URI="https://github.com/ros/urdfdom"
 fi
 
-inherit ${SCM} cmake-utils
+inherit ${SCM} cmake
 
 if [ "${PV#9999}" != "${PV}" ] ; then
 	KEYWORDS=""
@@ -27,11 +27,11 @@ IUSE=""
 
 RDEPEND=">=dev-libs/urdfdom_headers-1.0.0
 	>=dev-libs/console_bridge-0.3:=
-	dev-libs/tinyxml
+	dev-libs/tinyxml[stl]
 	dev-libs/boost:=[threads]"
 DEPEND="${RDEPEND}"
 
 src_prepare() {
 	sed -i -e 's/set(CMAKE_INSTALL_LIBDIR/#/' CMakeLists.txt || die
-	cmake-utils_src_prepare
+	cmake_src_prepare
 }