gentoo resync : 25.08.2020

6 files changed, 12 insertions, 185 deletions

diff --git a/dev-ros/stage_ros/Manifest b/dev-ros/stage_ros/Manifest
index 885cef7d23ea..f15ee89da23a 100644
--- a/dev-ros/stage_ros/Manifest
+++ b/dev-ros/stage_ros/Manifest
@@ -1,8 +1,4 @@
-AUX fltk.patch 1980 BLAKE2B e20ddc6695a2148a6bbb8e548a6f7676e7d9c34dd6a6f3667b5d523a4a23ca4bfc9529a9636b27752910da9b8605173a5f6e247d6510c66ee8fe8075a82fed2b SHA512 3d75b1181387e14f307704707f324792aa1ae932fc683926b1c88f2123ac18562f8e96aed634980707396bd367a8a6bd19af3ddd1ccaa7cafd0a7c1aa86558b9
-AUX stageconfig.patch 1780 BLAKE2B 9b9900a7f0bb83c90244b1720038cb2388b807af182fcf9a78aeefaf56801270b43779402762c31cb66a50bb13789409cd819a1430b1389779d328803fdbb101 SHA512 049e646983d8cb7bbb586b9f2bd7c89db7b94ed6d105b4f1208a4847317d338323b9fbd9e868733c90e2179788216aa872e90ec8d9990fda3b0560132329021a
-DIST stage_ros-1.7.5.tar.gz 58903 BLAKE2B 7bc31dc806560c3286cbc6b112d7e1af41429931ef88f2b85b460669ed5fc1e219c62ab1d733bf9a6ce311783ecfc865117e02890e53d80352b981daca481c8d SHA512 ce4e46f04d4440932f548ccb97745d421dbb5be41ead46df0f45a02e002c2ab672281277ad9835f8c40c001b823873299952b25d6758639a682b19ae470b9511
 DIST stage_ros-1.8.0.tar.gz 59891 BLAKE2B a70708ce0e30418116a1b7b4a2f6b9bfa1e8f03b6562013f51a49e3a349ab0d7d8c090f61d620e4ef7c8d2e19f77165c04b05fb5ceeab061e9d88895cbb6eef7 SHA512 d953e819d1955e7b1f0ca5a3d91e5b052b485045c057ecfe210e8b31dd3b4aa3418ac642dbad87ce8925e74295661a9fee9b10d826c2b1a2a17f8ec478a87927
-EBUILD stage_ros-1.7.5.ebuild 699 BLAKE2B 12108b64c61004fbb2cfb999d86b997f2312251e891e0cbac1d8b18ad00a974e80a9c87860cc496d049409e48fae710da359c926a7313f5c75fe9b6f7fa82284 SHA512 89e47f1cf9e01af029dba9eb968bef560ccc6f4f9ae67e9ba6478b88b0f0b51f20f2bc925425e47bec3619ab59d34c2d7eead4d7b8216c9caf915065dad9d8ea
-EBUILD stage_ros-1.8.0.ebuild 638 BLAKE2B 70f66aae7197118049ff409c0b43483c02057cc7132eda9671c8f3570878ad3939a351216ab62b2402f98c093d9361ebbab55b5e8a1c44a83bbdd0fcfa0b7029 SHA512 d6320a5011b9ffb70f7102c2dc51671e39726e17e39cef242f97401ee7d6524f99877eacb69253e74f190d8dae78403e83fbebfc7e0aebcf0ce763ca86b47295
-EBUILD stage_ros-9999.ebuild 638 BLAKE2B 70f66aae7197118049ff409c0b43483c02057cc7132eda9671c8f3570878ad3939a351216ab62b2402f98c093d9361ebbab55b5e8a1c44a83bbdd0fcfa0b7029 SHA512 d6320a5011b9ffb70f7102c2dc51671e39726e17e39cef242f97401ee7d6524f99877eacb69253e74f190d8dae78403e83fbebfc7e0aebcf0ce763ca86b47295
+EBUILD stage_ros-1.8.0.ebuild 647 BLAKE2B a9c73810ed26c7d34560acf52e4beaf684a0f699f3447f837d1046f055899261eecefe340c687e581f6aa80720957b6bb896bbede67f1e9d3d1930634bb32309 SHA512 9d2006852d99fb12fb7dc2486d365e0edb066a998caef04253d46fc719ca5df4723ce78fedee868e948d109196a3abe6588d7ea85121431013bd4d5a0bb9fa62
+EBUILD stage_ros-9999.ebuild 647 BLAKE2B a9c73810ed26c7d34560acf52e4beaf684a0f699f3447f837d1046f055899261eecefe340c687e581f6aa80720957b6bb896bbede67f1e9d3d1930634bb32309 SHA512 9d2006852d99fb12fb7dc2486d365e0edb066a998caef04253d46fc719ca5df4723ce78fedee868e948d109196a3abe6588d7ea85121431013bd4d5a0bb9fa62
 MISC metadata.xml 338 BLAKE2B be113ba641978d842732dba943269bfbecda305f280a1e594e66e80432987e754f04e83f1da5a94ba941e21900bd626f7dbfd0371dfd68077cd6f74b5531aab6 SHA512 60d3c473f35f325bd591eb4b81993b474b9477904362c8459266eed6c4da08c0bfdcf46deb8c9ab77dd28f11a07870374da80c49469b6a824d3d467d23455b7c
diff --git a/dev-ros/stage_ros/files/fltk.patch b/dev-ros/stage_ros/files/fltk.patch
deleted file mode 100644
index 3e7dc2582944..000000000000
--- a/dev-ros/stage_ros/files/fltk.patch
+++ /dev/null
@@ -1,68 +0,0 @@
-commit c62d2b2e64e3d36cac91fbd656db8f69b7c42dc5
-Author: Alexis Ballier <aballier@gentoo.org>
-Date:   Wed Sep 23 14:58:50 2015 +0200
-
-    Revert "Remove all references to FLTK/Fluid"
-    
-    This reverts commit 933f2bf0b776ee028aaa4b58a382101d81fb042e.
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 7ddd2c7..f709ea5 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -14,12 +14,27 @@ find_package(catkin REQUIRED
- 
- find_package(Boost REQUIRED COMPONENTS system thread)
- 
-+find_package(FLTK REQUIRED)
-+if(FLTK_FOUND)
-+  # FindFLTK.cmake doesn't populate FLTK_INCLUDE_DIRS on some systems,
-+  # so we try to use FLTK_INCLUDE_DIR if we need to.
-+  if("${FLTK_INCLUDE_DIRS}" STREQUAL "")
-+    set(FLTK_INCLUDE_DIRS "${FLTK_INCLUDE_DIR}")
-+  endif()
-+  message(status "FLTK_LIBRARIES=" ${FLTK_LIBRARIES})
-+  message(status "FLTK_INCLUDE_DIR=" ${FLTK_INCLUDE_DIR})
-+  message(status "FLTK_INCLUDE_DIRS=" ${FLTK_INCLUDE_DIRS})
-+else()
-+  message(fatal_error "FLTK not found...aborting!")
-+endif()
-+
- set(Stage_DIR cmake)
- find_package(Stage REQUIRED)
- 
- include_directories(
-   ${catkin_INCLUDE_DIRS}
-   ${Boost_INCLUDE_DIRS}
-+  ${FLTK_INCLUDE_DIRS}
-   ${Stage_INCLUDE_DIRS}
- )
- 
-@@ -34,6 +49,7 @@ endif()
- target_link_libraries(stageros
-   ${catkin_LIBRARIES}
-   ${Boost_LIBRARIES}
-+  ${FLTK_LIBRARIES}
-   ${Stage_LIBRARIES}
-   ${${PROJECT_NAME}_extra_libs}
- )
-diff --git a/package.xml b/package.xml
-index 8803254..fde1a64 100644
---- a/package.xml
-+++ b/package.xml
-@@ -17,6 +17,7 @@
-   <buildtool_depend>catkin</buildtool_depend>
- 
-   <build_depend>boost</build_depend>
-+  <build_depend>libfltk-dev</build_depend>
-   <build_depend>geometry_msgs</build_depend>
-   <build_depend>nav_msgs</build_depend>
-   <build_depend>roscpp</build_depend>
-@@ -28,6 +29,7 @@
-   <build_depend>tf</build_depend>
- 
-   <run_depend>boost</run_depend>
-+  <run_depend>fluid</run_depend>
-   <run_depend>geometry_msgs</run_depend>
-   <run_depend>nav_msgs</run_depend>
-   <run_depend>roscpp</run_depend>
diff --git a/dev-ros/stage_ros/files/stageconfig.patch b/dev-ros/stage_ros/files/stageconfig.patch
deleted file mode 100644
index baadba4ec10c..000000000000
--- a/dev-ros/stage_ros/files/stageconfig.patch
+++ /dev/null
@@ -1,73 +0,0 @@
-commit 7e9a04fef3b02510017d0ea3bbea047c32a408b1
-Author: Alexis Ballier <aballier@gentoo.org>
-Date:   Wed Sep 23 14:55:50 2015 +0200
-
-    Revert "Use upstream stage-config.cmake"
-    
-    This reverts commit 55700196507b44ea577233747de25dbf271cdef8.
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 89c433d..7ddd2c7 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -14,12 +14,13 @@ find_package(catkin REQUIRED
- 
- find_package(Boost REQUIRED COMPONENTS system thread)
- 
--find_package(stage REQUIRED)
-+set(Stage_DIR cmake)
-+find_package(Stage REQUIRED)
- 
- include_directories(
-   ${catkin_INCLUDE_DIRS}
-   ${Boost_INCLUDE_DIRS}
--  ${STAGE_INCLUDE_DIRS}
-+  ${Stage_INCLUDE_DIRS}
- )
- 
- catkin_package()
-@@ -33,7 +34,7 @@ endif()
- target_link_libraries(stageros
-   ${catkin_LIBRARIES}
-   ${Boost_LIBRARIES}
--  ${STAGE_LIBRARIES}
-+  ${Stage_LIBRARIES}
-   ${${PROJECT_NAME}_extra_libs}
- )
- if(catkin_EXPORTED_TARGETS)
-diff --git a/cmake/StageConfig.cmake b/cmake/StageConfig.cmake
-new file mode 100644
-index 0000000..118e41c
---- /dev/null
-+++ b/cmake/StageConfig.cmake
-@@ -0,0 +1,30 @@
-+# - Try to find Stage
-+#
-+# Once done this will define
-+#
-+#  Stage_FOUND - system has Stage
-+#  Stage_INCLUDE_DIRS - the Stage include directory
-+#  Stage_LIBRARIES - the Stage libraries
-+#
-+# Written by William Woodall <william@osrfoundation.org>
-+#
-+
-+find_package(PkgConfig)
-+pkg_check_modules(PC_Stage stage)
-+
-+find_library(Stage_LIBRARIES
-+  NAMES ${PC_Stage_LIBRARIES}
-+  PATHS ${PC_Stage_LIBRARY_DIRS}
-+)
-+
-+set(Stage_INCLUDE_DIRS ${PC_Stage_INCLUDE_DIRS})
-+
-+include(FindPackageHandleStandardArgs)
-+find_package_handle_standard_args(Stage
-+	DEFAULT_MSG
-+	Stage_LIBRARIES Stage_INCLUDE_DIRS
-+)
-+
-+mark_as_advanced(Stage_LIBRARIES Stage_INCLUDE_DIRS)
-+
-+set(Stage_FOUND ${STAGE_FOUND})
diff --git a/dev-ros/stage_ros/stage_ros-1.7.5.ebuild b/dev-ros/stage_ros/stage_ros-1.7.5.ebuild
deleted file mode 100644
index 748bdbbb4c6d..000000000000
--- a/dev-ros/stage_ros/stage_ros-1.7.5.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-ROS_REPO_URI="https://github.com/ros-simulation/stage_ros"
-KEYWORDS="~amd64"
-
-inherit ros-catkin
-
-DESCRIPTION="ROS specific hooks and tools for the Stage simulator"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-libs/boost:=[threads]
-	dev-ros/geometry_msgs
-	dev-ros/nav_msgs
-	dev-ros/roscpp
-	dev-ros/rostest
-	dev-ros/sensor_msgs
-	dev-ros/std_msgs
-	dev-ros/tf
-	x11-libs/fltk
-	sci-electronics/Stage
-	dev-ros/std_srvs[${CATKIN_MESSAGES_CXX_USEDEP}]
-"
-DEPEND="${RDEPEND}
-	test? ( dev-ros/rostest )
-	virtual/pkgconfig"
-PATCHES=( "${FILESDIR}/stageconfig.patch" "${FILESDIR}/fltk.patch" )
diff --git a/dev-ros/stage_ros/stage_ros-1.8.0.ebuild b/dev-ros/stage_ros/stage_ros-1.8.0.ebuild
index 3cdc7cdc4d1c..42b77b4d1dfd 100644
--- a/dev-ros/stage_ros/stage_ros-1.8.0.ebuild
+++ b/dev-ros/stage_ros/stage_ros-1.8.0.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
 
 ROS_REPO_URI="https://github.com/ros-simulation/stage_ros"
 KEYWORDS="~amd64"
@@ -24,8 +24,10 @@ RDEPEND="
 	dev-ros/tf
 	x11-libs/fltk
 	>=sci-electronics/Stage-4.3:=
-	dev-ros/std_srvs[${CATKIN_MESSAGES_CXX_USEDEP}]
 "
 DEPEND="${RDEPEND}
+	dev-ros/std_srvs[${CATKIN_MESSAGES_CXX_USEDEP}]
 	test? ( dev-ros/rostest )
+"
+BDEPEND="
 	virtual/pkgconfig"
diff --git a/dev-ros/stage_ros/stage_ros-9999.ebuild b/dev-ros/stage_ros/stage_ros-9999.ebuild
index 3cdc7cdc4d1c..42b77b4d1dfd 100644
--- a/dev-ros/stage_ros/stage_ros-9999.ebuild
+++ b/dev-ros/stage_ros/stage_ros-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
 
 ROS_REPO_URI="https://github.com/ros-simulation/stage_ros"
 KEYWORDS="~amd64"
@@ -24,8 +24,10 @@ RDEPEND="
 	dev-ros/tf
 	x11-libs/fltk
 	>=sci-electronics/Stage-4.3:=
-	dev-ros/std_srvs[${CATKIN_MESSAGES_CXX_USEDEP}]
 "
 DEPEND="${RDEPEND}
+	dev-ros/std_srvs[${CATKIN_MESSAGES_CXX_USEDEP}]
 	test? ( dev-ros/rostest )
+"
+BDEPEND="
 	virtual/pkgconfig"