commit: d28d79bec318287faea90f483f659b7d5ba40dfe
Author: Alexis Ballier <aballier <AT> gentoo <DOT> org>
AuthorDate: Thu Jul 23 14:47:28 2020 +0000
Commit: Alexis Ballier <aballier <AT> gentoo <DOT> org>
CommitDate: Thu Jul 23 15:18:58 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d28d79be
dev-libs/urdfdom: bump to 1.0.4
Package-Manager: Portage-3.0.0, Repoman-2.3.23
Signed-off-by: Alexis Ballier <aballier <AT> gentoo.org>
dev-libs/urdfdom/Manifest | 1 +
dev-libs/urdfdom/files/cb.patch | 23 ++++++++++++++++++++++
.../{urdfdom-9999.ebuild => urdfdom-1.0.4.ebuild} | 9 +++++----
dev-libs/urdfdom/urdfdom-9999.ebuild | 8 ++++----
4 files changed, 33 insertions(+), 8 deletions(-)
diff --git a/dev-libs/urdfdom/Manifest b/dev-libs/urdfdom/Manifest
index d038ea541b2..6f51e4c19a5 100644
--- a/dev-libs/urdfdom/Manifest
+++ b/dev-libs/urdfdom/Manifest
@@ -1,2 +1,3 @@
DIST urdfdom-1.0.0.tar.gz 250016 BLAKE2B
525616785b4fa38c8900add42349aa3a2103c75b213c77e3d682084e674b5fae31e9f56331910c19e6e5c49f6f72e1e7240c588df0dc67d862e0eac911667381
SHA512
50a218e596bcc0cecff904db2fa626bebc3902c4fe1f5ff8e08195e462b4d9a8c416a41f4773cabbcc71490060d3feff7e8528a76b824569dc7fdb0bda01ec3f
DIST urdfdom-1.0.3.tar.gz 275339 BLAKE2B
aa14dbd5f55489e0bde97042afb03d47cd023e3003a4ff66808e9be1a03c4de0bdab1c56a6fb5f6aea83324cbb38d286def66553a8ef813fc1f70b0bd9e24268
SHA512
240181d9c61dd7544f16a79a400d9a2c4dc0a682bef165b46529efcb4b31e2a34e27896933b60b9ddbaa5c4a8d575ebda42752599ff3b0a98d1eeef8f9b0b7a7
+DIST urdfdom-1.0.4.tar.gz 276958 BLAKE2B
19353c38d8fa8f1d6d752302bc8b7b84b13cc6c6f83af31dba677184fa09fd42d7de0c00e6927f085c3d013d2bde664dd7ea69d3c69de4c14130c08d256e6f87
SHA512
2a7a0ec61445132b3e8f6ba8b2268b9fd7c035a72b3e4d61b5ed665d07e902a02b87d2c60c53fc9b0c385a871cd8d87f278bd4833f1f904635ec46755a544003
diff --git a/dev-libs/urdfdom/files/cb.patch b/dev-libs/urdfdom/files/cb.patch
new file mode 100644
index 00000000000..3d3e150580e
--- /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 <[email protected]>
+Date: Thu, 28 May 2020 09:22:29 -0700
+Subject: [PATCH] Find console_bridge without explicit version (#141)
+
+Signed-off-by: Steve Peters <[email protected]>
+---
+ 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-9999.ebuild
b/dev-libs/urdfdom/urdfdom-1.0.4.ebuild
similarity index 85%
copy from dev-libs/urdfdom/urdfdom-9999.ebuild
copy to dev-libs/urdfdom/urdfdom-1.0.4.ebuild
index a9258649786..97c80713d08 100644
--- a/dev-libs/urdfdom/urdfdom-9999.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=""
@@ -30,8 +30,9 @@ RDEPEND=">=dev-libs/urdfdom_headers-1.0.0
dev-libs/tinyxml
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 a9258649786..42385570a10 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=""
@@ -33,5 +33,5 @@ DEPEND="${RDEPEND}"
src_prepare() {
sed -i -e 's/set(CMAKE_INSTALL_LIBDIR/#/' CMakeLists.txt || die
- cmake-utils_src_prepare
+ cmake_src_prepare
}
