media-libs/opencv: fix protobuf dnn module bug #631418

Suggested-by: Hanno Meyer-Thurow (geki) <h.mth@web.de>
Suggested-by: Dennis Schridde <devurandom@gmx.net>
Suggested-by: Magnus Kessler <Magnus.Kessler@gmx.net>
Suggested-by: zappel@simple-co.de
Closes: https://bugs.gentoo.org/631418

Package-Manager: Portage-2.3.6, Repoman-2.3.1

diff --git a/media-libs/opencv/opencv-3.3.0-r1.ebuild b/media-libs/opencv/opencv-3.3.0-r2.ebuild
similarity index 97%
rename from media-libs/opencv/opencv-3.3.0-r1.ebuild
rename to media-libs/opencv/opencv-3.3.0-r2.ebuild
index eaa25d8ec26b65619a740dcf30bc12a24230d389..a6a2298e02cced78f16707f463ea2a9d55999afb 100644 (file)
--- a/media-libs/opencv/opencv-3.3.0-r1.ebuild
+++ b/media-libs/opencv/opencv-3.3.0-r2.ebuild
@@ -41,6 +41,7 @@ REQUIRED_USE="
 
 RDEPEND="
        app-arch/bzip2[${MULTILIB_USEDEP}]
+       dev-libs/protobuf:=[${MULTILIB_USEDEP}]
        sys-libs/zlib[${MULTILIB_USEDEP}]
        cuda? ( dev-util/nvidia-cuda-toolkit:0= )
        contrib_hdf? ( sci-libs/hdf5 )
@@ -277,6 +278,11 @@ multilib_src_configure() {
        # ===================================================
                -DBUILD_PACKAGE=OFF
        # ===================================================
+       # Not building protobuf but update files bug #631418
+       # ===================================================
+               -DBUILD_PROTOBUF=OFF
+               -DPROTOBUF_UPDATE_FILES=ON
+       # ===================================================
        # things we want to be hard enabled not worth useflag
        # ===================================================
                -DCMAKE_SKIP_RPATH=ON