gentoo resync : 30.12.2017

5 files changed, 4 insertions, 56 deletions

diff --git a/dev-ros/opencv_apps/Manifest b/dev-ros/opencv_apps/Manifest
index 03774fe828d0..e06c88af8385 100644
--- a/dev-ros/opencv_apps/Manifest
+++ b/dev-ros/opencv_apps/Manifest
@@ -1,7 +1,4 @@
-AUX ocv33.patch 1387 BLAKE2B 5f708e8f2307bbbfe70c936431ce4a729fa9c70ce2c8e39ca785399a1e35da7c6e1e797cd184a5a3d94a4c8cb8cecf166565995f7caca4217505b0fdfc536fb4 SHA512 cf15d436f1704e48068a92ff558fc5dc5f46b5f967b7a6a594c949344ff4c5d300ce57ea99838a505819d01450cdfba02ec2d7dcab7e23a37ac06fdd537a32e4
-DIST opencv_apps-1.12.0.tar.gz 77353 BLAKE2B 757cff5a549db835236d58079c5ccfacee3d5bb7640f0567e157bd9e2ea827903faa35f268cb898e4348d30fd477cd80b0e7cf18fe4b73dd770a7b2e18295685 SHA512 8a0dffad44520ea78abead88dc2917314e8688b820c37512eff909164c626ab9d2511357e8d2683ebcc37610d061b4d6356a3bd39263bbccb5afc5560a4d78b7
 DIST opencv_apps-2.0.0.tar.gz 81204 BLAKE2B cd8fbcbde0213b6f5aca61dc1e9aa9740cc9d726c9d139e2888cc42d777e13f5923b4e19d2efd732797cadeb352ea26edbddab58e5d09cd7ba4571fe60649d73 SHA512 5b89ced226bfcd186de94a4bf3a9cf94d80b117a726609f58bf7331b0b3ba62ad9d4b72c4d6f0d1332000665e9aacc0e7f6dd26defda6914fa8696b586996798
-EBUILD opencv_apps-1.12.0.ebuild 696 BLAKE2B 994ea0bb83dd2da6f817e4ab16d5d7ba7e0e3976438f6a08ec891cc74acc020f90d389e92ec05aca9fcce9a1a6039ba4a3d2f4a154333d420395e4f45a652bcf SHA512 c8afb47b6f95a6c0174581ddf09f55bcbe509b317bd5f6b14345585b9e5b20e4a0cae062eb403c6d6e292d5ce6eb23b8cf5965dd0591f78a30a03ccbfd336ac0
-EBUILD opencv_apps-2.0.0.ebuild 657 BLAKE2B b15a1bf9e2b075a914225c86d96a6d6c6ff0648645863e04292b755a1b1e8bfc51677950e5ca072580e8de14d66585d40e7bfb6ef63d495761918c8bc48677f9 SHA512 60ecedbff1753a4349d2c595f6fc3e946f34465a38c3fb46836e5d3cf3bf6d545a4dabe16c31aef2a7d3887e79cc947e26ff1602a10360cf50060b5b1a9b652f
-EBUILD opencv_apps-9999.ebuild 657 BLAKE2B b15a1bf9e2b075a914225c86d96a6d6c6ff0648645863e04292b755a1b1e8bfc51677950e5ca072580e8de14d66585d40e7bfb6ef63d495761918c8bc48677f9 SHA512 60ecedbff1753a4349d2c595f6fc3e946f34465a38c3fb46836e5d3cf3bf6d545a4dabe16c31aef2a7d3887e79cc947e26ff1602a10360cf50060b5b1a9b652f
+EBUILD opencv_apps-2.0.0-r1.ebuild 684 BLAKE2B 137307ff871a7f5aa7003692e977c6957beb772f0c8f8dfdc43f6c44849b951f4ef434e8063d6130b881b313a2f4f9f07b51112fd77d732b9a2c71438d0988af SHA512 1314179ad9e8f67931fe1f38585a52cb3799436b2f245bbb48b746b154cf8a4ae9eeceb3e174e25f7617ebb5e47ceea6593b48f38b3789c26386e23a273c10d0
+EBUILD opencv_apps-9999.ebuild 684 BLAKE2B 137307ff871a7f5aa7003692e977c6957beb772f0c8f8dfdc43f6c44849b951f4ef434e8063d6130b881b313a2f4f9f07b51112fd77d732b9a2c71438d0988af SHA512 1314179ad9e8f67931fe1f38585a52cb3799436b2f245bbb48b746b154cf8a4ae9eeceb3e174e25f7617ebb5e47ceea6593b48f38b3789c26386e23a273c10d0
 MISC metadata.xml 342 BLAKE2B 41ebd1d903bb2c2be8df58a29062ae314becf1e29b309369eb8295f49760e35800d2164de2d9088b90716432d04b5290123f1a1110175250348301e12afe3f26 SHA512 ebd8a1fd0c584bd4dbbcbdd6e396c288a50d68916d357f030dfaf13ec8204c0bf8a4c98f740952400e43ce5d6f112a0865086484de1a8abdd088d39e79f74693
diff --git a/dev-ros/opencv_apps/files/ocv33.patch b/dev-ros/opencv_apps/files/ocv33.patch
deleted file mode 100644
index aa034ce3456c..000000000000
--- a/dev-ros/opencv_apps/files/ocv33.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-Index: opencv_apps-1.12.0/src/nodelet/face_recognition_nodelet.cpp
-===================================================================
---- opencv_apps-1.12.0.orig/src/nodelet/face_recognition_nodelet.cpp
-+++ opencv_apps-1.12.0/src/nodelet/face_recognition_nodelet.cpp
-@@ -463,13 +463,13 @@ namespace face_recognition {
-       if (need_recreate_model) {
-         try {
-           if (config.model_method == "eigen") {
--            model_ = face::createEigenFaceRecognizer(config.model_num_components,
-+            model_ = face::EigenFaceRecognizer::create(config.model_num_components,
-                                                    config.model_threshold);
-           } else if (config.model_method == "fisher") {
--            model_ = face::createFisherFaceRecognizer(config.model_num_components,
-+            model_ = face::FisherFaceRecognizer::create(config.model_num_components,
-                                                     config.model_threshold);
-           } else if (config.model_method == "LBPH") {
--            model_ = face::createLBPHFaceRecognizer(config.lbph_radius,
-+            model_ = face::LBPHFaceRecognizer::create(config.lbph_radius,
-                                                   config.lbph_neighbors,
-                                                   config.lbph_grid_x,
-                                                   config.lbph_grid_y);
diff --git a/dev-ros/opencv_apps/opencv_apps-1.12.0.ebuild b/dev-ros/opencv_apps/opencv_apps-1.12.0.ebuild
deleted file mode 100644
index 1bb75ae5f0f2..000000000000
--- a/dev-ros/opencv_apps/opencv_apps-1.12.0.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-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"
-
-inherit ros-catkin
-
-DESCRIPTION="OpenCV applications for ROS"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/cv_bridge
-	dev-ros/dynamic_reconfigure[${PYTHON_USEDEP}]
-	dev-ros/image_transport
-	dev-ros/std_srvs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-ros/nodelet
-	dev-ros/roscpp
-	>=media-libs/opencv-3.3:0=[contrib]
-	dev-libs/boost:=
-"
-DEPEND="${RDEPEND}"
-
-PATCHES=( "${FILESDIR}/ocv33.patch" )
diff --git a/dev-ros/opencv_apps/opencv_apps-2.0.0.ebuild b/dev-ros/opencv_apps/opencv_apps-2.0.0-r1.ebuild
index 328054b9fc64..ddf09bbd814e 100644
--- a/dev-ros/opencv_apps/opencv_apps-2.0.0.ebuild
+++ b/dev-ros/opencv_apps/opencv_apps-2.0.0-r1.ebuild
@@ -21,6 +21,7 @@ RDEPEND="
 	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:=
diff --git a/dev-ros/opencv_apps/opencv_apps-9999.ebuild b/dev-ros/opencv_apps/opencv_apps-9999.ebuild
index 328054b9fc64..ddf09bbd814e 100644
--- a/dev-ros/opencv_apps/opencv_apps-9999.ebuild
+++ b/dev-ros/opencv_apps/opencv_apps-9999.ebuild
@@ -21,6 +21,7 @@ RDEPEND="
 	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:=