gentoo resync : 06.08.2019

7 files changed, 24 insertions, 79 deletions

diff --git a/dev-ros/cv_bridge/Manifest b/dev-ros/cv_bridge/Manifest
index bb2d0891d149..9eb6df69e8b0 100644
--- a/dev-ros/cv_bridge/Manifest
+++ b/dev-ros/cv_bridge/Manifest
@@ -1,10 +1,5 @@
-DIST vision_opencv-1.12.5.tar.gz 81739 BLAKE2B 5c135009f4e766b34c217b6de1dba836bf225b4cc7aca53b34c297f0c0986a79c3c629990464599da98fa32424a87467037caf3b51f3f6dcab2add615d613c08 SHA512 df3ad951262a692124eead5751f64c04fbf831486db8c000e23e2f0b10f645d830c38cf2d99d23b696b96cd0388c4d732ddda4e5d8e8b7cb88a3fd5909c62c71
-DIST vision_opencv-1.12.7.tar.gz 81877 BLAKE2B 216a82ec377e0bc3d85866da3ed3b9e8e90f7615bfbf0e3cacc30cd2bc2aeeb3f822d8daa1f0be42dab45dbdfc69c043a3a4c29b8357561356a2f874b3f61552 SHA512 e02f9450183e8e927d947d2382859ed01aaa5dc7a8f299e5a39815c53ee726b96781e961b1cf0f5cc3ac16699d162d4ed80678de4b6517e5139a5a8bd592e39c
-DIST vision_opencv-1.12.8.tar.gz 82043 BLAKE2B 9eb18ea9a4d3ddf6d2103ab3a2e53557349880ea665f8089d64319e8c99fb4ea922e8de1ab04fb749bed5c2503041d27d8e9b773d6142a5b5366aae937ca2514 SHA512 fadd84bb5e9586a5b04833100d9e1267ce8d153ca95a3257e1c3e6fe825dae524e25b2cc7deebb48d326cce8ef04523c5803eeecd88362cf6ff0384c52557608
+AUX boostpython.patch 551 BLAKE2B f3cecec73fbc584f324da2c1438ca42e283031fdf6df3f8ac458da9f09c3344716e9ca901de9f35edceaf6cc0223f66a1cef2e77ee3106f7b39b8ab96b204ade SHA512 9b306662ccef96aa9eee0b5c244de4919a9f8614502e1d75e63e787b4a0408ca6363c67b4b6eb897ffd8ca90df856444c357acee5f23074e33f7afd985686f7f
 DIST vision_opencv-1.13.0.tar.gz 82177 BLAKE2B 1c863f3c9e6b856d61a0e879f958f0f1fd184f088e208023a504cf5bb982c5496b71e1f2b4761e4456ca76348e51bc2bc760b2c43e1a35b02fa5c23c8e444502 SHA512 a20ec2f41a0c94dde51b19f902ae078cbf5449a2aadbeacbc49bbfc2ab52c39878e63448a3137591f7e1b2f6025baef616579463cf32274e7838157137d214bc
-EBUILD cv_bridge-1.12.5.ebuild 592 BLAKE2B e83e4897190d99593d5921ba55ba342511f8e5d3b7b4173892b3b763b01f6a68d4421d39c928519505982a6df17185973ec91685e3421a0f67ee8099b8c95999 SHA512 ae4b1d791d4ace3b583124c14a5499e0e0f45ad834e694c9c06f259ce28a4af95c43f567bd440139f043be7d80f9bcb4d19caaf56794228ec1e6e49b0b8cff62
-EBUILD cv_bridge-1.12.7.ebuild 592 BLAKE2B e83e4897190d99593d5921ba55ba342511f8e5d3b7b4173892b3b763b01f6a68d4421d39c928519505982a6df17185973ec91685e3421a0f67ee8099b8c95999 SHA512 ae4b1d791d4ace3b583124c14a5499e0e0f45ad834e694c9c06f259ce28a4af95c43f567bd440139f043be7d80f9bcb4d19caaf56794228ec1e6e49b0b8cff62
-EBUILD cv_bridge-1.12.8.ebuild 592 BLAKE2B 31b4abecd775ec2383eae038f2a27780a9b5dd1628f15223deb347426ec132ecc19b12077f44c782e7f93bd16977613bab442595c9cc7c6b3006120c863e0ffb SHA512 fcfa0f414ff530e0f0981a538b64e5a8a403aec5962f7b7d5127ff0e6aed93324e612650b46fb6632aaa9a59ce42641085221f04b5153c6a06b754310ec2618e
-EBUILD cv_bridge-1.13.0.ebuild 592 BLAKE2B 31b4abecd775ec2383eae038f2a27780a9b5dd1628f15223deb347426ec132ecc19b12077f44c782e7f93bd16977613bab442595c9cc7c6b3006120c863e0ffb SHA512 fcfa0f414ff530e0f0981a538b64e5a8a403aec5962f7b7d5127ff0e6aed93324e612650b46fb6632aaa9a59ce42641085221f04b5153c6a06b754310ec2618e
-EBUILD cv_bridge-9999.ebuild 592 BLAKE2B e83e4897190d99593d5921ba55ba342511f8e5d3b7b4173892b3b763b01f6a68d4421d39c928519505982a6df17185973ec91685e3421a0f67ee8099b8c95999 SHA512 ae4b1d791d4ace3b583124c14a5499e0e0f45ad834e694c9c06f259ce28a4af95c43f567bd440139f043be7d80f9bcb4d19caaf56794228ec1e6e49b0b8cff62
+EBUILD cv_bridge-1.13.0.ebuild 633 BLAKE2B 43e33f439c1fa4af188c7cadbfc36c16ebb4bf1594cd1b797fdb09dc1cc660b4773d1488ff189666dcd8d6a3cba4024f20b0a7b4ad82c4fa47c33c987b15196a SHA512 757803d5fa063ad1856bb9d758522b2a8908999187742f6a8fb3398204ab4c824d0da8e70b085c0e687e23ed49740ec2073e962c60f49e650ceacee2e44e1a25
+EBUILD cv_bridge-9999.ebuild 633 BLAKE2B 43e33f439c1fa4af188c7cadbfc36c16ebb4bf1594cd1b797fdb09dc1cc660b4773d1488ff189666dcd8d6a3cba4024f20b0a7b4ad82c4fa47c33c987b15196a SHA512 757803d5fa063ad1856bb9d758522b2a8908999187742f6a8fb3398204ab4c824d0da8e70b085c0e687e23ed49740ec2073e962c60f49e650ceacee2e44e1a25
 MISC metadata.xml 342 BLAKE2B 41ebd1d903bb2c2be8df58a29062ae314becf1e29b309369eb8295f49760e35800d2164de2d9088b90716432d04b5290123f1a1110175250348301e12afe3f26 SHA512 ebd8a1fd0c584bd4dbbcbdd6e396c288a50d68916d357f030dfaf13ec8204c0bf8a4c98f740952400e43ce5d6f112a0865086484de1a8abdd088d39e79f74693
diff --git a/dev-ros/cv_bridge/cv_bridge-1.12.5.ebuild b/dev-ros/cv_bridge/cv_bridge-1.12.5.ebuild
deleted file mode 100644
index 091646aa633e..000000000000
--- a/dev-ros/cv_bridge/cv_bridge-1.12.5.ebuild
+++ /dev/null
@@ -1,23 +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/vision_opencv"
-KEYWORDS="~amd64 ~arm"
-PYTHON_COMPAT=( python2_7 )
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Converts between ROS Image messages and OpenCV images"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/rosconsole
-	>=media-libs/opencv-3:=[contrib(+)]
-	dev-libs/boost:=[threads,python,${PYTHON_USEDEP}]
-	dev-ros/sensor_msgs[${CATKIN_MESSAGES_CXX_USEDEP},${CATKIN_MESSAGES_PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/cv_bridge/cv_bridge-1.12.7.ebuild b/dev-ros/cv_bridge/cv_bridge-1.12.7.ebuild
deleted file mode 100644
index 091646aa633e..000000000000
--- a/dev-ros/cv_bridge/cv_bridge-1.12.7.ebuild
+++ /dev/null
@@ -1,23 +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/vision_opencv"
-KEYWORDS="~amd64 ~arm"
-PYTHON_COMPAT=( python2_7 )
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Converts between ROS Image messages and OpenCV images"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/rosconsole
-	>=media-libs/opencv-3:=[contrib(+)]
-	dev-libs/boost:=[threads,python,${PYTHON_USEDEP}]
-	dev-ros/sensor_msgs[${CATKIN_MESSAGES_CXX_USEDEP},${CATKIN_MESSAGES_PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/cv_bridge/cv_bridge-1.12.8.ebuild b/dev-ros/cv_bridge/cv_bridge-1.12.8.ebuild
deleted file mode 100644
index 781df6ff0219..000000000000
--- a/dev-ros/cv_bridge/cv_bridge-1.12.8.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-ROS_REPO_URI="https://github.com/ros-perception/vision_opencv"
-KEYWORDS="~amd64 ~arm"
-PYTHON_COMPAT=( python2_7 )
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Converts between ROS Image messages and OpenCV images"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/rosconsole
-	>=media-libs/opencv-3:=[contrib(+)]
-	dev-libs/boost:=[threads,python,${PYTHON_USEDEP}]
-	dev-ros/sensor_msgs[${CATKIN_MESSAGES_CXX_USEDEP},${CATKIN_MESSAGES_PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/cv_bridge/cv_bridge-1.13.0.ebuild b/dev-ros/cv_bridge/cv_bridge-1.13.0.ebuild
index 781df6ff0219..422225d82b4f 100644
--- a/dev-ros/cv_bridge/cv_bridge-1.13.0.ebuild
+++ b/dev-ros/cv_bridge/cv_bridge-1.13.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -21,3 +21,4 @@ RDEPEND="
 	dev-ros/sensor_msgs[${CATKIN_MESSAGES_CXX_USEDEP},${CATKIN_MESSAGES_PYTHON_USEDEP}]
 "
 DEPEND="${RDEPEND}"
+PATCHES=( "${FILESDIR}/boostpython.patch" )
diff --git a/dev-ros/cv_bridge/cv_bridge-9999.ebuild b/dev-ros/cv_bridge/cv_bridge-9999.ebuild
index 091646aa633e..422225d82b4f 100644
--- a/dev-ros/cv_bridge/cv_bridge-9999.ebuild
+++ b/dev-ros/cv_bridge/cv_bridge-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -21,3 +21,4 @@ RDEPEND="
 	dev-ros/sensor_msgs[${CATKIN_MESSAGES_CXX_USEDEP},${CATKIN_MESSAGES_PYTHON_USEDEP}]
 "
 DEPEND="${RDEPEND}"
+PATCHES=( "${FILESDIR}/boostpython.patch" )
diff --git a/dev-ros/cv_bridge/files/boostpython.patch b/dev-ros/cv_bridge/files/boostpython.patch
new file mode 100644
index 000000000000..72fac8087363
--- /dev/null
+++ b/dev-ros/cv_bridge/files/boostpython.patch
@@ -0,0 +1,17 @@
+Index: cv_bridge/CMakeLists.txt
+===================================================================
+--- cv_bridge.orig/CMakeLists.txt
++++ cv_bridge/CMakeLists.txt
+@@ -5,11 +5,7 @@ find_package(catkin REQUIRED COMPONENTS
+ 
+ if(NOT ANDROID)
+   find_package(PythonLibs)
+-  if(PYTHONLIBS_VERSION_STRING VERSION_LESS 3)
+-    find_package(Boost REQUIRED python)
+-  else()
+-    find_package(Boost REQUIRED python3)
+-  endif()
++  find_package(Boost REQUIRED python${PYTHON_VERSION_MAJOR}${PYTHON_VERSION_MINOR})
+ else()
+ find_package(Boost REQUIRED)
+ endif()