commit:     54a9336fdc365eb41512e0bc17e35867e6713b8a
Author:     Amy Winston <amynka <AT> gentoo <DOT> org>
AuthorDate: Sat Aug 20 18:59:47 2016 +0000
Commit:     Amy Winston <amynka <AT> gentoo <DOT> org>
CommitDate: Sat Aug 20 18:59:47 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=54a9336f

media-libs/opencv: remove old. thanks genstorm

Package-Manager: portage-2.2.28

 media-libs/opencv/Manifest               |   1 -
 media-libs/opencv/opencv-2.4.11.ebuild   | 217 --------------------------
 media-libs/opencv/opencv-3.1.0-r1.ebuild | 253 -------------------------------
 media-libs/opencv/opencv-3.1.0-r3.ebuild | 245 ------------------------------
 4 files changed, 716 deletions(-)

diff --git a/media-libs/opencv/Manifest b/media-libs/opencv/Manifest
index 485d82b..82a9d48 100644
--- a/media-libs/opencv/Manifest
+++ b/media-libs/opencv/Manifest
@@ -1,4 +1,3 @@
-DIST opencv-2.4.11.zip 91671436 SHA256 
af1952fd40fb0dc5e369725e073ac4650847e956fbf77c5f206b6da8ce2b1fea SHA512 
748f6b939200a7ad2c2ae2531bf9bf38b82a576530f10691c13a0ad52568a7eb8b9d312e946ba8e78f592ef05ae389ecb982544f0c00cb83a2d87ae4b4da61b0
 WHIRLPOOL 
1c621b835fb144997ecbabddaa1b9a0cd0653e27c5a4f2abc43f3c6152a0b98eb0941d59263be33f69a6f3bccdffa484455c2ddaa747ed4a2bd2cd3192956d29
 DIST opencv-2.4.12.zip 93261101 SHA256 
2a7e47da87b9119be922f010a1059539e96130c242f4d38e2dbb445ccbeccbc1 SHA512 
3f9142ef23181f93200413b456c11235ecac11c322ccf3f89cc3740bfa9d9228508948cee245583103029e9f6abf1c5d0c5d249eff400e65b3655153bc6dbb05
 WHIRLPOOL 
86488d91cfac4c980e4f794d6d7e40bf93803f4d79defc991647af742198b845db796b1578b5d79a12a71ecbb04d8430a49c1538d6f86f1288c2a31efefc2548
 DIST opencv-3.0.0.zip 100980799 SHA256 
07094ea2f996f2622d572f0f3a162d698c8a547520341ca9109fbaf9363fb001 SHA512 
108d0fdcc60b5688ebf61c930fb965ec81f0d3c36bb1797f6cc571fac35331f540773207fd1cb81b12c05c8f4d1af20c4a2452d9f75cd0cae4acd8131be92375
 WHIRLPOOL 
61cbbf5201b1dea75ffa998d1f55ee35f098bb8f76591cc9705de13b9f05eaefd19dcc74e93d2643d9b721e62483a36547617ec2e3d14fa6a2522e18ccf06747
 DIST opencv-3.1.0.zip 79186131 SHA256 
1f6990249fdb82804fff40e96fa6d99949023ab0e3277eae4bd459b374e622a4 SHA512 
b4915e8838fce8ba9e1af8b11e46678624435e9a41592e645413dfdc830993eaa017d337fe4c212a49f096421a6317a1892546087fbc3cfdab554522336c0f1a
 WHIRLPOOL 
3c38715e2abc431781b724199c2cf06f844c7a889c51a06ecb64889a8ca36d9fd370a0738deec2995e24e453cb64f5db228238681714f62daf6eac50d95a4914

diff --git a/media-libs/opencv/opencv-2.4.11.ebuild 
b/media-libs/opencv/opencv-2.4.11.ebuild
deleted file mode 100644
index 262d90f..0000000
--- a/media-libs/opencv/opencv-2.4.11.ebuild
+++ /dev/null
@@ -1,217 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-PYTHON_COMPAT=( python2_7 )
-
-inherit toolchain-funcs cmake-utils python-single-r1 java-pkg-opt-2 java-ant-2
-
-DESCRIPTION="A collection of algorithms and sample code for various computer 
vision problems"
-HOMEPAGE="http://opencv.willowgarage.com";
-
-SRC_URI="mirror://sourceforge/opencvlibrary/opencv-unix/${PV}/${P}.zip"
-
-LICENSE="BSD"
-SLOT="0/2.4"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux"
-IUSE="cuda doc +eigen examples ffmpeg gstreamer gtk ieee1394 ipp jpeg jpeg2k 
libav opencl openexr opengl openmp pch png +python qt4 testprograms threads 
tiff v4l vtk xine"
-REQUIRED_USE="
-       python? ( ${PYTHON_REQUIRED_USE} )
-"
-
-# The following logic is intrinsic in the build system, but we do not enforce
-# it on the useflags since this just blocks emerging pointlessly:
-#      gtk? ( !qt4 )
-#      opengl? ( || ( gtk qt4 ) )
-#      openmp? ( !threads )
-
-RDEPEND="
-       app-arch/bzip2
-       sys-libs/zlib
-       cuda? ( >=dev-util/nvidia-cuda-toolkit-5.5 )
-       ffmpeg? (
-               libav? ( media-video/libav:0= )
-               !libav? ( media-video/ffmpeg:0= )
-       )
-       gstreamer? (
-               media-libs/gstreamer:1.0
-               media-libs/gst-plugins-base:1.0
-       )
-       gtk? (
-               dev-libs/glib:2
-               x11-libs/gtk+:2
-               opengl? ( x11-libs/gtkglext )
-       )
-       java? ( >=virtual/jre-1.6:* )
-       jpeg? ( virtual/jpeg:0 )
-       jpeg2k? ( media-libs/jasper )
-       ieee1394? (
-               media-libs/libdc1394
-               sys-libs/libraw1394
-       )
-       ipp? ( sci-libs/ipp )
-       opencl? ( virtual/opencl )
-       openexr? ( media-libs/openexr )
-       opengl? ( virtual/opengl virtual/glu )
-       png? ( media-libs/libpng:0= )
-       python? ( ${PYTHON_DEPS} dev-python/numpy[${PYTHON_USEDEP}] )
-       qt4? (
-               dev-qt/qtgui:4
-               dev-qt/qttest:4
-               opengl? ( dev-qt/qtopengl:4 )
-       )
-       threads? ( dev-cpp/tbb )
-       tiff? ( media-libs/tiff:0 )
-       v4l? ( >=media-libs/libv4l-0.8.3 )
-       vtk? ( sci-libs/vtk[rendering] )
-       xine? ( media-libs/xine-lib )
-"
-DEPEND="${RDEPEND}
-       virtual/pkgconfig
-       eigen? ( dev-cpp/eigen:3 )
-       java? ( >=virtual/jdk-1.6 )
-"
-
-pkg_setup() {
-       use python && python-single-r1_pkg_setup
-       java-pkg-opt-2_pkg_setup
-}
-
-src_prepare() {
-       epatch "${FILESDIR}/${PN}-2.3.1a-libav-0.7.patch" \
-               "${FILESDIR}/${PN}-2.4.3-gcc47.patch" \
-               "${FILESDIR}/${PN}-2.4.2-cflags.patch" \
-               "${FILESDIR}/${PN}-2.4.8-javamagic.patch" \
-               "${FILESDIR}/${PN}-2.4.9-cuda-pkg-config.patch" \
-               "${FILESDIR}/${P}-git-autodetect.patch"
-
-       # remove bundled stuff
-       rm -rf 3rdparty
-       sed -i \
-               -e '/add_subdirectory(3rdparty)/ d' \
-               CMakeLists.txt || die
-
-       java-pkg-opt-2_src_prepare
-}
-
-src_configure() {
-       if use openmp; then
-               tc-has-openmp || die "Please switch to an openmp compatible 
compiler"
-       fi
-
-       JAVA_ANT_ENCODING="iso-8859-1"
-       # set encoding so even this cmake build will pick it up.
-       export ANT_OPTS+=" -Dfile.encoding=iso-8859-1"
-       java-ant-2_src_configure
-
-       # please dont sort here, order is the same as in CMakeLists.txt
-       local mycmakeargs=(
-       # the optinal dependency libraries
-               $(cmake-utils_use_with ieee1394 1394)
-               -DWITH_AVFOUNDATION=OFF
-               -DWITH_CARBON=OFF
-               $(cmake-utils_use_with eigen)
-               $(cmake-utils_use_with ffmpeg)
-               $(cmake-utils_use_with gstreamer)
-               $(cmake-utils_use_with gtk)
-               $(cmake-utils_use_with ipp)
-               $(cmake-utils_use_with java)
-               $(cmake-utils_use_with jpeg2k JASPER)
-               $(cmake-utils_use_with jpeg)
-               $(cmake-utils_use_with opencl)
-       #       $(cmake-utils_use_with opencl OPENCLAMDFFT)
-       #       $(cmake-utils_use_with opencl OPENCLAMDBLAS)
-               $(cmake-utils_use_with openexr)
-               $(cmake-utils_use_with opengl)
-               $(cmake-utils_use_with openmp)
-               -DWITH_OPENNI=OFF                                       # not 
packaged
-               $(cmake-utils_use_with png)
-               $(cmake-utils_use_build python opencv_python)
-               -DWITH_PVAPI=OFF                                        # not 
packaged
-               -DWITH_QUICKTIME=OFF
-               $(cmake-utils_use_with threads TBB)
-               $(cmake-utils_use_with tiff)
-               -DWITH_UNICAP=OFF                                       # not 
packaged
-               $(cmake-utils_use_with v4l V4L)
-               $(cmake-utils_use_with vtk VTK)
-               -DWITH_LIBV4L=ON
-               -DWITH_VIDEOINPUT=OFF                                   # 
windows only
-               -DWITH_XIMEA=OFF                                        # 
windows only
-               $(cmake-utils_use_with xine)
-       # the build components
-               -DBUILD_SHARED_LIBS=ON
-               -DBUILD_ANDROID_EXAMPLES=OFF
-               $(cmake-utils_use_build doc DOCS)
-               $(cmake-utils_use_build examples)
-               -DBUILD_PERF_TESTS=OFF
-               $(cmake-utils_use_build testprograms TESTS)
-       # install examples, tests etc
-               $(cmake-utils_use examples INSTALL_C_EXAMPLES)
-               $(cmake-utils_use testprograms INSTALL_TESTS)
-       # build options
-               $(cmake-utils_use_enable pch PRECOMPILED_HEADERS)
-               -DENABLE_OMIT_FRAME_POINTER=OFF                         #
-               -DENABLE_FAST_MATH=OFF                                  #
-               -DENABLE_SSE=OFF                                        # these 
options do nothing but
-               -DENABLE_SSE2=OFF                                       # add 
params to CFLAGS
-               -DENABLE_SSE3=OFF
-               -DENABLE_SSSE3=OFF
-               -DENABLE_SSE41=OFF
-               -DENABLE_SSE42=OFF
-               -DOPENCV_EXTRA_FLAGS_RELEASE=""                         # black 
magic
-       )
-
-       if use qt4; then
-               mycmakeargs+=( "-DWITH_QT=4" )
-       else
-               mycmakeargs+=( "-DWITH_QT=OFF" )
-       fi
-
-       if use cuda; then
-               if [[ "$(gcc-version)" > "4.7" ]]; then
-                       ewarn "CUDA and >=sys-devel/gcc-4.8 do not play well 
together. Disabling CUDA support."
-                       mycmakeargs+=( "-DWITH_CUDA=OFF" )
-                       mycmakeargs+=( "-DWITH_CUBLAS=OFF" )
-                       mycmakeargs+=( "-DWITH_CUFFT=OFF" )
-               else
-                       mycmakeargs+=( "-DWITH_CUDA=ON" )
-                       mycmakeargs+=( "-DWITH_CUBLAS=ON" )
-                       mycmakeargs+=( "-DWITH_CUFFT=ON" )
-               fi
-       else
-               mycmakeargs+=( "-DWITH_CUDA=OFF" )
-               mycmakeargs+=( "-DWITH_CUBLAS=OFF" )
-               mycmakeargs+=( "-DWITH_CUFFT=OFF" )
-       fi
-
-       if use examples && use python; then
-               mycmakeargs+=( "-DINSTALL_PYTHON_EXAMPLES=ON" )
-       else
-               mycmakeargs+=( "-DINSTALL_PYTHON_EXAMPLES=OFF" )
-       fi
-
-       # things we want to be hard off or not yet figured out
-       mycmakeargs+=(
-               "-DOPENCV_BUILD_3RDPARTY_LIBS=OFF"
-               "-DBUILD_LATEX_DOCS=OFF"
-               "-DBUILD_PACKAGE=OFF"
-               "-DENABLE_PROFILING=OFF"
-       )
-
-       # things we want to be hard enabled not worth useflag
-       mycmakeargs+=(
-               "-DCMAKE_SKIP_RPATH=ON"
-               "-DOPENCV_DOC_INSTALL_PATH=${EPREFIX}/usr/share/doc/${PF}"
-       )
-
-       # hardcode cuda paths
-       mycmakeargs+=(
-               "-DCUDA_NPP_LIBRARY_ROOT_DIR=/opt/cuda"
-       )
-
-       # workaround for bug 413429
-       tc-export CC CXX
-
-       cmake-utils_src_configure
-}

diff --git a/media-libs/opencv/opencv-3.1.0-r1.ebuild 
b/media-libs/opencv/opencv-3.1.0-r1.ebuild
deleted file mode 100644
index 4ed36c8..0000000
--- a/media-libs/opencv/opencv-3.1.0-r1.ebuild
+++ /dev/null
@@ -1,253 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-PYTHON_COMPAT=( python{2_7,3_3,3_4,3_5} )
-
-inherit toolchain-funcs cmake-utils python-single-r1 java-pkg-opt-2 java-ant-2
-
-DESCRIPTION="A collection of algorithms and sample code for various computer 
vision problems"
-HOMEPAGE="http://opencv.org";
-
-SRC_URI="
-       mirror://sourceforge/opencvlibrary/opencv-unix/${PV}/${P}.zip
-       https://github.com/Itseez/${PN}/archive/${PV}.zip -> ${P}.zip
-       contrib? ( 
https://github.com/Itseez/opencv_contrib/archive/2d1fc7a6cdccd04435795f68126151a51071a539.zip
 -> ${PN}_contrib.zip )" # commit from 26.10.2015
-
-LICENSE="BSD"
-SLOT="0/3.1" # subslot = libopencv* soname version
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux"
-IUSE="contrib cuda doc +eigen examples ffmpeg gdal gphoto2 gstreamer gtk 
ieee1394 ipp jpeg jpeg2k libav opencl openexr opengl openmp pch png +python qt4 
qt5 testprograms threads tiff vaapi v4l vtk webp xine"
-REQUIRED_USE="
-       python? ( ${PYTHON_REQUIRED_USE} )
-       ?? ( qt4 qt5 )
-"
-
-# The following logic is intrinsic in the build system, but we do not enforce
-# it on the useflags since this just blocks emerging pointlessly:
-#      gtk? ( !qt4 )
-#      opengl? ( || ( gtk qt4 ) )
-#      openmp? ( !threads )
-
-RDEPEND="
-       app-arch/bzip2
-       sys-libs/zlib
-       cuda? ( >=dev-util/nvidia-cuda-toolkit-5.5 )
-       ffmpeg? (
-               libav? ( media-video/libav:0= )
-               !libav? ( media-video/ffmpeg:0= )
-       )
-       gdal? ( sci-libs/gdal )
-       gphoto2? ( media-libs/libgphoto2 )
-       gstreamer? (
-               media-libs/gstreamer:1.0
-               media-libs/gst-plugins-base:1.0
-       )
-       gtk? (
-               dev-libs/glib:2
-               x11-libs/gtk+:2
-               opengl? ( x11-libs/gtkglext )
-       )
-       java? ( >=virtual/jre-1.6:* )
-       jpeg? ( virtual/jpeg:0 )
-       jpeg2k? ( media-libs/jasper )
-       ieee1394? (
-               media-libs/libdc1394
-               sys-libs/libraw1394
-       )
-       ipp? ( sci-libs/ipp )
-       opencl? ( virtual/opencl )
-       openexr? ( media-libs/openexr )
-       opengl? ( virtual/opengl virtual/glu )
-       png? ( media-libs/libpng:0= )
-       python? ( ${PYTHON_DEPS} dev-python/numpy[${PYTHON_USEDEP}] )
-       qt4? (
-               dev-qt/qtgui:4
-               dev-qt/qttest:4
-               opengl? ( dev-qt/qtopengl:4 )
-       )
-       qt5? (
-               dev-qt/qtgui:5
-               dev-qt/qttest:5
-               dev-qt/qtconcurrent:5
-               opengl? ( dev-qt/qtopengl:5 )
-       )
-       threads? ( dev-cpp/tbb )
-       tiff? ( media-libs/tiff:0 )
-       v4l? ( >=media-libs/libv4l-0.8.3 )
-       vtk? ( sci-libs/vtk[rendering] )
-       webp? ( media-libs/libwebp )
-       xine? ( media-libs/xine-lib )
-"
-DEPEND="${RDEPEND}
-       virtual/pkgconfig
-       eigen? ( dev-cpp/eigen:3 )
-       java? ( >=virtual/jdk-1.6 )
-"
-
-pkg_setup() {
-       use python && python-single-r1_pkg_setup
-       java-pkg-opt-2_pkg_setup
-}
-
-src_prepare() {
-
-       epatch "${FILESDIR}/${PN}-3.0.0-gles.patch" \
-               "${FILESDIR}/${PN}-3.1.0-cmake-no-opengl.patch" \
-               "${FILESDIR}/${P}-git-autodetect.patch"
-
-       # remove bundled stuff
-       rm -rf 3rdparty
-       sed -i \
-               -e '/add_subdirectory(.*3rdparty.*)/ d' \
-               CMakeLists.txt cmake/*cmake || die
-
-       if use contrib; then
-
-               cd "${WORKDIR}"
-               epatch "${FILESDIR}/${PN}-3.1.0-fix-hal-headers.patch" \
-                       "${FILESDIR}/${PN}-3.1.0-fix-ocl-declaration.patch" \
-                       "${FILESDIR}/${PN}-3.1.0-invalid-string-usage.patch"
-       fi
-
-       java-pkg-opt-2_src_prepare
-}
-
-src_configure() {
-       if use openmp; then
-               tc-has-openmp || die "Please switch to an openmp compatible 
compiler"
-       fi
-
-       JAVA_ANT_ENCODING="iso-8859-1"
-       # set encoding so even this cmake build will pick it up.
-       export ANT_OPTS+=" -Dfile.encoding=iso-8859-1"
-       java-ant-2_src_configure
-
-       # please dont sort here, order is the same as in CMakeLists.txt
-       local mycmakeargs=(
-       # the optinal dependency libraries
-               $(cmake-utils_use_with ieee1394 1394)
-               -DWITH_AVFOUNDATION=OFF # IOS
-               -DWITH_CARBON=OFF # APPLE
-               $(cmake-utils_use_with eigen)
-               $(cmake-utils_use_with ffmpeg)
-               -DWITH_VFW=OFF     # video windows support
-               $(cmake-utils_use_with gstreamer)
-               -DWITH_GSTREAMER_0_10=OFF
-               $(cmake-utils_use_with gtk)
-               -DWITH_GTK_2_X=OFF
-               $(cmake-utils_use_with ipp)
-               $(cmake-utils_use_with java)
-               $(cmake-utils_use_with jpeg2k JASPER)
-               $(cmake-utils_use_with jpeg)
-               $(cmake-utils_use_with webp)
-               $(cmake-utils_use_with opencl)
-               $(cmake-utils_use_with gphoto2)
-               $(cmake-utils_use_with openexr)
-               $(cmake-utils_use_with opengl)
-               $(cmake-utils_use_with openmp)
-               -DWITH_OPENNI=OFF       #not packaged
-               -DWITH_OPENNI2=OFF      #not packaged
-               $(cmake-utils_use_with png)
-               $(cmake-utils_use_build python opencv_python)
-               -DWITH_PVAPI=OFF                                        # not 
packaged
-               -DWITH_GIGEAPI=OFF
-               -DWITH_QUICKTIME=OFF
-               -DWITH_WIN32UI=OFF
-               $(cmake-utils_use_with threads TBB)
-               -DWITH_CSTRIPES=OFF
-               -DWITH_PTHREADS_PF=ON
-               $(cmake-utils_use_with tiff)
-               -DWITH_UNICAP=OFF                                       # not 
packaged
-               $(cmake-utils_use_with v4l V4L)
-               $(cmake-utils_use_with vtk VTK)
-               -DWITH_LIBV4L=ON
-               -DWITH_DSHOW=ON               # direct show supp
-               -DWITH_MSMF=OFF
-               -DWITH_VIDEOINPUT=OFF                                   # 
windows only
-               -DWITH_XIMEA=OFF # windows only
-               $(cmake-utils_use_with xine)
-               -DWITH_CLP=OFF
-               $(cmake-utils_use_with opencl)
-               -DWITH_OPENCL_SVM=OFF
-               $(cmake-utils_use_with opencl OPENCLAMDFFT)
-               $(cmake-utils_use_with opencl OPENCLAMDBLAS)
-               -DWITH_DIRECTX=OFF
-               -DWITH_INTELPERC=OFF
-               -DWITH_IPP_A=OFF
-               -DWITH_MATLAB=ON #default
-               $(cmake-utils_use_with vaapi VA)
-               $(cmake-utils_use_with vaapi VA_INTEL)
-               $(cmake-utils_use_with gdal gdal)
-               #
-               # OpenCV build components
-               -DBUILD_SHARED_LIBS=ON
-               -DBUILD_ANDROID_EXAMPLES=OFF
-               $(cmake-utils_use_build doc DOCS)
-               $(cmake-utils_use_build examples)
-               $(cmake-utils_use_build java opencv_java)               #for 
-java bug #555650
-               -DBUILD_PERF_TESTS=OFF
-               $(cmake-utils_use_build testprograms TESTS)
-       # install examples, tests etc
-               $(cmake-utils_use examples INSTALL_C_EXAMPLES)
-               $(cmake-utils_use testprograms INSTALL_TESTS)
-       # build options
-               $(cmake-utils_use_enable pch PRECOMPILED_HEADERS)
-               -DOPENCV_EXTRA_FLAGS_RELEASE=""                         # black 
magic
-       )
-
-       if use qt4; then
-               mycmakeargs+=( "-DWITH_QT=4" )
-       elif use qt5; then
-               mycmakeargs+=( "-DWITH_QT=5" )
-       else
-               mycmakeargs+=( "-DWITH_QT=OFF" )
-       fi
-
-       if use contrib; then
-               mycmakeargs+=( 
"-DOPENCV_EXTRA_MODULES_PATH=../opencv_contrib-master/modules" )
-       fi
-
-       if use cuda; then
-               mycmakeargs+=( "-DWITH_CUDA=ON" )
-               mycmakeargs+=( "-DWITH_CUBLAS=ON" )
-               mycmakeargs+=( "-DWITH_CUFFT=ON" )
-               mycmakeargs+=( "-DWITH_NVCUVID=ON" ) #Nvidia video decoding 
library supp
-       else
-               mycmakeargs+=( "-DWITH_CUDA=OFF" )
-               mycmakeargs+=( "-DWITH_CUBLAS=OFF" )
-               mycmakeargs+=( "-DWITH_CUFFT=OFF" )
-               mycmakeargs+=( "-DWITH_NVCUVID=OFF" )
-       fi
-
-       if use examples && use python; then
-               mycmakeargs+=( "-DINSTALL_PYTHON_EXAMPLES=ON" )
-       else
-               mycmakeargs+=( "-DINSTALL_PYTHON_EXAMPLES=OFF" )
-       fi
-
-       # things we want to be hard off or not yet figured out
-       mycmakeargs+=(
-               "-DOPENCV_BUILD_3RDPARTY_LIBS=OFF"
-               "-DBUILD_LATEX_DOCS=OFF"
-               "-DBUILD_PACKAGE=OFF"
-               "-DENABLE_PROFILING=OFF"
-       )
-
-       # things we want to be hard enabled not worth useflag
-       mycmakeargs+=(
-               "-DCMAKE_SKIP_RPATH=ON"
-               "-DOPENCV_DOC_INSTALL_PATH=${EPREFIX}/usr/share/doc/${PF}"
-       )
-
-       # hardcode cuda paths
-       mycmakeargs+=(
-               "-DCUDA_NPP_LIBRARY_ROOT_DIR=/opt/cuda"
-       )
-
-       # workaround for bug 413429
-       tc-export CC CXX
-
-       cmake-utils_src_configure
-}

diff --git a/media-libs/opencv/opencv-3.1.0-r3.ebuild 
b/media-libs/opencv/opencv-3.1.0-r3.ebuild
deleted file mode 100644
index 2cdd13b..0000000
--- a/media-libs/opencv/opencv-3.1.0-r3.ebuild
+++ /dev/null
@@ -1,245 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-PYTHON_COMPAT=( python{2_7,3_3,3_4,3_5} )
-
-inherit toolchain-funcs cmake-utils python-single-r1 java-pkg-opt-2 java-ant-2
-
-DESCRIPTION="A collection of algorithms and sample code for various computer 
vision problems"
-HOMEPAGE="http://opencv.org";
-
-SRC_URI="
-       mirror://sourceforge/opencvlibrary/opencv-unix/${PV}/${P}.zip
-       https://github.com/Itseez/${PN}/archive/${PV}.zip -> ${P}.zip
-       contrib? ( 
https://github.com/Itseez/${PN}_contrib/archive/cd5993c6576267875adac300b9ddd1f881bb1766.zip
 -> ${P}_contrib.zip )" #commit from Sun, 27 Mar 2016 17:31:51
-
-LICENSE="BSD"
-SLOT="0/3.1" # subslot = libopencv* soname version
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux"
-IUSE="contrib cuda doc +eigen examples ffmpeg gdal gphoto2 gstreamer gtk 
ieee1394 ipp jpeg jpeg2k libav opencl openexr opengl openmp pch png +python qt4 
qt5 testprograms threads tiff vaapi v4l vtk webp xine"
-REQUIRED_USE="
-       python? ( ${PYTHON_REQUIRED_USE} )
-       ?? ( qt4 qt5 )
-"
-
-# The following logic is intrinsic in the build system, but we do not enforce
-# it on the useflags since this just blocks emerging pointlessly:
-#      gtk? ( !qt4 )
-#      opengl? ( || ( gtk qt4 ) )
-#      openmp? ( !threads )
-
-RDEPEND="
-       app-arch/bzip2
-       sys-libs/zlib
-       cuda? ( >=dev-util/nvidia-cuda-toolkit-5.5 )
-       ffmpeg? (
-               libav? ( media-video/libav:0= )
-               !libav? ( media-video/ffmpeg:0= )
-       )
-       gdal? ( sci-libs/gdal )
-       gphoto2? ( media-libs/libgphoto2 )
-       gstreamer? (
-               media-libs/gstreamer:1.0
-               media-libs/gst-plugins-base:1.0
-       )
-       gtk? (
-               dev-libs/glib:2
-               x11-libs/gtk+:2
-               opengl? ( x11-libs/gtkglext )
-       )
-       java? ( >=virtual/jre-1.6:* )
-       jpeg? ( virtual/jpeg:0 )
-       jpeg2k? ( media-libs/jasper )
-       ieee1394? (
-               media-libs/libdc1394
-               sys-libs/libraw1394
-       )
-       ipp? ( sci-libs/ipp )
-       opencl? ( virtual/opencl )
-       openexr? ( media-libs/openexr )
-       opengl? ( virtual/opengl virtual/glu )
-       png? ( media-libs/libpng:0= )
-       python? ( ${PYTHON_DEPS} dev-python/numpy[${PYTHON_USEDEP}] )
-       qt4? (
-               dev-qt/qtgui:4
-               dev-qt/qttest:4
-               opengl? ( dev-qt/qtopengl:4 )
-       )
-       qt5? (
-               dev-qt/qtgui:5
-               dev-qt/qttest:5
-               dev-qt/qtconcurrent:5
-               opengl? ( dev-qt/qtopengl:5 )
-       )
-       threads? ( dev-cpp/tbb )
-       tiff? ( media-libs/tiff:0 )
-       v4l? ( >=media-libs/libv4l-0.8.3 )
-       vtk? ( sci-libs/vtk[rendering] )
-       webp? ( media-libs/libwebp )
-       xine? ( media-libs/xine-lib )
-"
-DEPEND="${RDEPEND}
-       virtual/pkgconfig
-       eigen? ( dev-cpp/eigen:3 )
-       java? ( >=virtual/jdk-1.6 )
-"
-
-pkg_setup() {
-       use python && python-single-r1_pkg_setup
-       java-pkg-opt-2_pkg_setup
-}
-
-src_prepare() {
-
-       epatch "${FILESDIR}/${PN}-3.0.0-gles.patch" \
-               "${FILESDIR}/${PN}-3.1.0-cmake-no-opengl.patch" \
-               "${FILESDIR}/${P}-git-autodetect.patch"
-
-       # remove bundled stuff
-       rm -rf 3rdparty
-       sed -i \
-               -e '/add_subdirectory(.*3rdparty.*)/ d' \
-               CMakeLists.txt cmake/*cmake || die
-
-       java-pkg-opt-2_src_prepare
-}
-
-src_configure() {
-       if use openmp; then
-               tc-has-openmp || die "Please switch to an openmp compatible 
compiler"
-       fi
-
-       JAVA_ANT_ENCODING="iso-8859-1"
-       # set encoding so even this cmake build will pick it up.
-       export ANT_OPTS+=" -Dfile.encoding=iso-8859-1"
-       java-ant-2_src_configure
-
-       # please dont sort here, order is the same as in CMakeLists.txt
-       local mycmakeargs=(
-       # the optinal dependency libraries
-               $(cmake-utils_use_with ieee1394 1394)
-               -DWITH_AVFOUNDATION=OFF # IOS
-               -DWITH_CARBON=OFF # APPLE
-               $(cmake-utils_use_with eigen)
-               $(cmake-utils_use_with ffmpeg)
-               -DWITH_VFW=OFF     # video windows support
-               $(cmake-utils_use_with gstreamer)
-               -DWITH_GSTREAMER_0_10=OFF
-               $(cmake-utils_use_with gtk)
-               -DWITH_GTK_2_X=OFF
-               $(cmake-utils_use_with ipp)
-               $(cmake-utils_use_with java)
-               $(cmake-utils_use_with jpeg2k JASPER)
-               $(cmake-utils_use_with jpeg)
-               $(cmake-utils_use_with webp)
-               $(cmake-utils_use_with opencl)
-               $(cmake-utils_use_with gphoto2)
-               $(cmake-utils_use_with openexr)
-               $(cmake-utils_use_with opengl)
-               $(cmake-utils_use_with openmp)
-               -DWITH_OPENNI=OFF       #not packaged
-               -DWITH_OPENNI2=OFF      #not packaged
-               $(cmake-utils_use_with png)
-               $(cmake-utils_use_build python opencv_python)
-               -DWITH_PVAPI=OFF                                        # not 
packaged
-               -DWITH_GIGEAPI=OFF
-               -DWITH_QUICKTIME=OFF
-               -DWITH_WIN32UI=OFF
-               $(cmake-utils_use_with threads TBB)
-               -DWITH_CSTRIPES=OFF
-               -DWITH_PTHREADS_PF=ON
-               $(cmake-utils_use_with tiff)
-               -DWITH_UNICAP=OFF                                       # not 
packaged
-               $(cmake-utils_use_with v4l V4L)
-               $(cmake-utils_use_with vtk VTK)
-               -DWITH_LIBV4L=ON
-               -DWITH_DSHOW=ON               # direct show supp
-               -DWITH_MSMF=OFF
-               -DWITH_VIDEOINPUT=OFF                                   # 
windows only
-               -DWITH_XIMEA=OFF # windows only
-               $(cmake-utils_use_with xine)
-               -DWITH_CLP=OFF
-               $(cmake-utils_use_with opencl)
-               -DWITH_OPENCL_SVM=OFF
-               $(cmake-utils_use_with opencl OPENCLAMDFFT)
-               $(cmake-utils_use_with opencl OPENCLAMDBLAS)
-               -DWITH_DIRECTX=OFF
-               -DWITH_INTELPERC=OFF
-               -DWITH_IPP_A=OFF
-               -DWITH_MATLAB=ON #default
-               $(cmake-utils_use_with vaapi VA)
-               $(cmake-utils_use_with vaapi VA_INTEL)
-               $(cmake-utils_use_with gdal gdal)
-               #
-               # OpenCV build components
-               -DBUILD_SHARED_LIBS=ON
-               -DBUILD_ANDROID_EXAMPLES=OFF
-               $(cmake-utils_use_build doc DOCS)
-               $(cmake-utils_use_build examples)
-               $(cmake-utils_use_build java opencv_java)               #for 
-java bug #555650
-               -DBUILD_PERF_TESTS=OFF
-               $(cmake-utils_use_build testprograms TESTS)
-       # install examples, tests etc
-               $(cmake-utils_use examples INSTALL_C_EXAMPLES)
-               $(cmake-utils_use testprograms INSTALL_TESTS)
-       # build options
-               $(cmake-utils_use_enable pch PRECOMPILED_HEADERS)
-               -DOPENCV_EXTRA_FLAGS_RELEASE=""                         # black 
magic
-       )
-
-       if use qt4; then
-               mycmakeargs+=( "-DWITH_QT=4" )
-       elif use qt5; then
-               mycmakeargs+=( "-DWITH_QT=5" )
-       else
-               mycmakeargs+=( "-DWITH_QT=OFF" )
-       fi
-
-       if use contrib; then
-               mycmakeargs+=( 
"-DOPENCV_EXTRA_MODULES_PATH=../opencv_contrib-${PV}/modules" )
-       fi
-
-       if use cuda; then
-               mycmakeargs+=( "-DWITH_CUDA=ON" )
-               mycmakeargs+=( "-DWITH_CUBLAS=ON" )
-               mycmakeargs+=( "-DWITH_CUFFT=ON" )
-               mycmakeargs+=( "-DWITH_NVCUVID=ON" ) #Nvidia video decoding 
library supp
-       else
-               mycmakeargs+=( "-DWITH_CUDA=OFF" )
-               mycmakeargs+=( "-DWITH_CUBLAS=OFF" )
-               mycmakeargs+=( "-DWITH_CUFFT=OFF" )
-               mycmakeargs+=( "-DWITH_NVCUVID=OFF" )
-       fi
-
-       if use examples && use python; then
-               mycmakeargs+=( "-DINSTALL_PYTHON_EXAMPLES=ON" )
-       else
-               mycmakeargs+=( "-DINSTALL_PYTHON_EXAMPLES=OFF" )
-       fi
-
-       # things we want to be hard off or not yet figured out
-       mycmakeargs+=(
-               "-DOPENCV_BUILD_3RDPARTY_LIBS=OFF"
-               "-DBUILD_LATEX_DOCS=OFF"
-               "-DBUILD_PACKAGE=OFF"
-               "-DENABLE_PROFILING=OFF"
-       )
-
-       # things we want to be hard enabled not worth useflag
-       mycmakeargs+=(
-               "-DCMAKE_SKIP_RPATH=ON"
-               "-DOPENCV_DOC_INSTALL_PATH=${EPREFIX}/usr/share/doc/${PF}"
-       )
-
-       # hardcode cuda paths
-       mycmakeargs+=(
-               "-DCUDA_NPP_LIBRARY_ROOT_DIR=/opt/cuda"
-       )
-
-       # workaround for bug 413429
-       tc-export CC CXX
-
-       cmake-utils_src_configure
-}

Reply via email to