From 3cf7c3ef441822c889356fd1812ebf2944a59851 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Tue, 25 Aug 2020 10:45:55 +0100 Subject: gentoo resync : 25.08.2020 --- dev-ros/opencv_apps/Manifest | 4 ++-- dev-ros/opencv_apps/opencv_apps-2.0.1.ebuild | 22 ++++++++++++++++------ dev-ros/opencv_apps/opencv_apps-9999.ebuild | 22 ++++++++++++++++------ 3 files changed, 34 insertions(+), 14 deletions(-) (limited to 'dev-ros/opencv_apps') diff --git a/dev-ros/opencv_apps/Manifest b/dev-ros/opencv_apps/Manifest index 63c2973bd22a..6f0ed28d6198 100644 --- a/dev-ros/opencv_apps/Manifest +++ b/dev-ros/opencv_apps/Manifest @@ -1,5 +1,5 @@ AUX ocv4.patch 5101 BLAKE2B 1f298695f9c0dd46dad07c6495975043e9031ee5e19fdb886a512861a04bfa3029427213db00af9f6e68ef678c1a172e6ffdaf671bfa9a108f17d58204dd5bf9 SHA512 a24a4a510a501caafaa78a9a856724e3bdf8b9ea70cbf41da7b6b96e18a013b08f01660289e4cb0e77567c9ae6fbabf751cbbefef6ba391a37ecb6b09cb1c373 DIST opencv_apps-2.0.1.tar.gz 83497 BLAKE2B 31d0447696716ba623e64e69dc269491c4a943125c90c33ac2e495ce2a64f417758e0a142f36c5dde9032475abee516fecf9e227bbe977706f1a89ea02a3daad SHA512 db263bb49f1b083cfd84f325911da804c3a2c8b3db7f3a2ce697a4fe2dde2b692a2b1921bd32aecb19d67c93f7bf6809340c418b6bf4619ebd7beed1469838da -EBUILD opencv_apps-2.0.1.ebuild 718 BLAKE2B ed7aac7cf21fac146d6128c05699646ed4290e425146fbb85e398368155d799581a0e46ef55d6b462a8e626cad8486f773224dd7c1b763495df77dc9fe821061 SHA512 0a17c17195a8bbe8dd61b52f4135413374536f1cf1c271a47623bc2da940a273842e836d0cacba183efa50d1891ee3ad2767393a0090440422a2eb80a8dad679 -EBUILD opencv_apps-9999.ebuild 684 BLAKE2B 137307ff871a7f5aa7003692e977c6957beb772f0c8f8dfdc43f6c44849b951f4ef434e8063d6130b881b313a2f4f9f07b51112fd77d732b9a2c71438d0988af SHA512 1314179ad9e8f67931fe1f38585a52cb3799436b2f245bbb48b746b154cf8a4ae9eeceb3e174e25f7617ebb5e47ceea6593b48f38b3789c26386e23a273c10d0 +EBUILD opencv_apps-2.0.1.ebuild 885 BLAKE2B a407bfde56c9c1f14df21623f73e75a3225bdd9e44afbcb5dbcc461645932fcaaff9e24922f3a15ab4e85f11a0998458fc37d89321d3f6c4df2f8bc550a759ce SHA512 6f9a098724e48f781856621cc83fc656ad61c05176699fbd4c85fbd9a32c2930368bb955761a5147c35f4972bda574d1118137426661f221c206bd6be87c0165 +EBUILD opencv_apps-9999.ebuild 848 BLAKE2B a1a94c4a4af7f7a8ce07913ecc7bf98fb75d1e5fc7ad68159050d318e4f2edcd61f3764dc02210c1cdb8858bbe34b25e6c155ea44feb8acc8a6d4a83c5d4ba57 SHA512 c973ba5d50e0f7c175b96e1fdd959960add08504eaecf6e3b84087e09ec195ba09b4a01344844c86cf675cfad7c1073ca2be9784f58d38225bd5aaf37dc36ec0 MISC metadata.xml 342 BLAKE2B 41ebd1d903bb2c2be8df58a29062ae314becf1e29b309369eb8295f49760e35800d2164de2d9088b90716432d04b5290123f1a1110175250348301e12afe3f26 SHA512 ebd8a1fd0c584bd4dbbcbdd6e396c288a50d68916d357f030dfaf13ec8204c0bf8a4c98f740952400e43ce5d6f112a0865086484de1a8abdd088d39e79f74693 diff --git a/dev-ros/opencv_apps/opencv_apps-2.0.1.ebuild b/dev-ros/opencv_apps/opencv_apps-2.0.1.ebuild index 74105169c2d5..e6864994ac92 100644 --- a/dev-ros/opencv_apps/opencv_apps-2.0.1.ebuild +++ b/dev-ros/opencv_apps/opencv_apps-2.0.1.ebuild @@ -1,10 +1,9 @@ -# Copyright 1999-2019 Gentoo Authors +# 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-perception/opencv_apps" KEYWORDS="~amd64 ~arm" -PYTHON_COMPAT=( python2_7 ) CATKIN_HAS_MESSAGES=yes CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/std_msgs" @@ -17,14 +16,25 @@ IUSE="" RDEPEND=" dev-ros/cv_bridge - dev-ros/dynamic_reconfigure[${PYTHON_USEDEP}] + dev-ros/dynamic_reconfigure[${PYTHON_SINGLE_USEDEP}] dev-ros/image_transport - dev-ros/std_srvs[${CATKIN_MESSAGES_CXX_USEDEP}] dev-ros/nodelet dev-libs/console_bridge:= dev-ros/roscpp >=media-libs/opencv-3.3:0=[contrib] dev-libs/boost:= " -DEPEND="${RDEPEND}" +DEPEND="${RDEPEND} + dev-ros/std_srvs[${CATKIN_MESSAGES_CXX_USEDEP}] + test? ( + dev-ros/roslaunch + dev-ros/rostest + dev-ros/rosbag + dev-ros/rosservice + dev-ros/rostopic + dev-ros/image_proc + dev-ros/topic_tools + dev-ros/compressed_image_transport + ) +" PATCHES=( "${FILESDIR}/ocv4.patch" ) diff --git a/dev-ros/opencv_apps/opencv_apps-9999.ebuild b/dev-ros/opencv_apps/opencv_apps-9999.ebuild index ddf09bbd814e..bb49ddbddb1e 100644 --- a/dev-ros/opencv_apps/opencv_apps-9999.ebuild +++ b/dev-ros/opencv_apps/opencv_apps-9999.ebuild @@ -1,10 +1,9 @@ -# 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-perception/opencv_apps" KEYWORDS="~amd64 ~arm" -PYTHON_COMPAT=( python2_7 ) CATKIN_HAS_MESSAGES=yes CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/std_msgs" @@ -17,13 +16,24 @@ IUSE="" RDEPEND=" dev-ros/cv_bridge - dev-ros/dynamic_reconfigure[${PYTHON_USEDEP}] + dev-ros/dynamic_reconfigure[${PYTHON_SINGLE_USEDEP}] dev-ros/image_transport - dev-ros/std_srvs[${CATKIN_MESSAGES_CXX_USEDEP}] dev-ros/nodelet dev-libs/console_bridge:= dev-ros/roscpp >=media-libs/opencv-3.3:0=[contrib] dev-libs/boost:= " -DEPEND="${RDEPEND}" +DEPEND="${RDEPEND} + dev-ros/std_srvs[${CATKIN_MESSAGES_CXX_USEDEP}] + test? ( + dev-ros/roslaunch + dev-ros/rostest + dev-ros/rosbag + dev-ros/rosservice + dev-ros/rostopic + dev-ros/image_proc + dev-ros/topic_tools + dev-ros/compressed_image_transport + ) +" -- cgit v1.2.3