commit:     07d392554c7c60474bba42bd03cf978572e62976
Author:     Amy Liffey <amynka <AT> gentoo <DOT> org>
AuthorDate: Sun Apr 16 14:11:02 2017 +0000
Commit:     Amy Liffey <amynka <AT> gentoo <DOT> org>
CommitDate: Sun Apr 16 14:15:05 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=07d39255

media-libs/opencv: version bump 3.2.0 bug #604982

Package-Manager: portage-2.3.3

 media-libs/opencv/Manifest                         |   3 +
 ...cv-3.2.0-contrib_xfeatures2d-autodownload.patch |  10 +
 media-libs/opencv/files/opencv-3.2.0-vtk.patch     |  11 +
 media-libs/opencv/metadata.xml                     |   5 +-
 media-libs/opencv/opencv-3.2.0.ebuild              | 329 +++++++++++++++++++++
 5 files changed, 356 insertions(+), 2 deletions(-)

diff --git a/media-libs/opencv/Manifest b/media-libs/opencv/Manifest
index 4b12e50eae0..040a0468305 100644
--- a/media-libs/opencv/Manifest
+++ b/media-libs/opencv/Manifest
@@ -1,3 +1,6 @@
 DIST opencv-2.4.13.zip 94319943 SHA256 
fa6a45f635f4e1dbc982b8ccc93206650e7fc584b2f3dd945759ce28b047b94f SHA512 
b5ccaa22deabfedd29b697296d265a32c7db959f2e94ca3643c1cde65fb84463809535f2e6bd49c4baa06958fa223a32bbfdd7234b8e160ec333fd9cd7800d3b
 WHIRLPOOL 
86f7690b460dbcf70dec30c29784d96b2bb99e43ba70fe967d18b375fcee4f8934591f0d9fe2ff6717346eb9be8628766658d589eae9943d528352d1ce1df455
 DIST opencv-3.1.0.tar.gz 76135587 SHA256 
f00b3c4f42acda07d89031a2ebb5ebe390764a133502c03a511f67b78bbd4fbf SHA512 
57e0fe41e3d5d1dc036e7fc5673523e53d54f5f62e4d3bcb95238a9cd53e79da7c1704dc136ce632f7cfce369ebf5eb27f629a9b6ac4f7fa34120b80b5c7438f
 WHIRLPOOL 
b2825d5cafa87e0fe9cacd093ddb969913d916c0370819073b2bde3c598798efcf23c406aae2116f2628c564ca99e5f871a448a3ece97d8d29ec73841ac283b4
 DIST opencv-3.1.0_contrib-75b3ea9.tar.gz 54277105 SHA256 
478f742457d3f4e96f857b726e35b28a8d20a1de8e5f51b8671251bc896d443b SHA512 
d1d11520b8729fbaf0257c927654251ff9ac1ba5cf937af9dd973ec39f483d1ee08aff7ad3f1a9941fef921a35dc466ac5574918197ddecd3f6c66b682bf671a
 WHIRLPOOL 
18b70014428c4fa532658ca5ac332bffaae049b468f46cb027a6972f21f5b2bd17d02b33d68c43b84f821a77fa09efb9c372499cfa4f645a0516b93acb858353
+DIST opencv-3.2.0.tar.gz 78861546 SHA256 
b9d62dfffb8130d59d587627703d5f3e6252dce4a94c1955784998da7a39dd35 SHA512 
a338f4b4cdebfc2dcd763427b9c9632b3a3b0d072117b8e6367c73ea1ac21f7148553a23c7afbb44b01a48be3be95520789c2de1d6ae230b7b414ee713d3606d
 WHIRLPOOL 
092c0c1195d80f89e0e2fd030a93eb80e7b83ce155fdcd9fa071248be20127a684922c83de73be9bf321d934e14b0b4e60cc78ab272ab9d39d6707da37db30d3
+DIST opencv-3.2.0_contrib.tar.gz 54765210 SHA256 
1e2bb6c9a41c602904cc7df3f8fb8f98363a88ea564f2a087240483426bf8cbe SHA512 
eadb6a8a3625235b0c71e29c36d15d9342278aaf9148ef6a7e1aa80f4db0491aaf30b6df16bfd0cd358402b2a3059b6acbce23fb5fe2c0c57150a733ffbbff5a
 WHIRLPOOL 
eb8f916c19474a58f4c2785e50dc261a31f684a917011473b94a19d26e4e9845c042f77196c000dd97543699b745360114cdd31cad549379b6394e9d727c72a8
+DIST vgg_boostdesc-3.2.0.tar.gz 1867770 SHA256 
6da9c2465e2b36330fa5d5c45320a0667da5cb4eafd66a5b1f45feb2af047a27 SHA512 
4a046aedd639c8eb4b295b0f499e756deb66210ca083f0124c75531e540663367cb58f6d175f66c4713324177036cd89a8869bdab2de8d1736dafc7f00ef9f44
 WHIRLPOOL 
5c78e43c95d40d103ac741248deb130bcb49a5b7e2cd012135572630b525b6f15a7f89948170c76545d97eb3815a000a2a1236ad24de2205eeb8938ee8eb0c12

diff --git 
a/media-libs/opencv/files/opencv-3.2.0-contrib_xfeatures2d-autodownload.patch 
b/media-libs/opencv/files/opencv-3.2.0-contrib_xfeatures2d-autodownload.patch
new file mode 100644
index 00000000000..f03c57d425c
--- /dev/null
+++ 
b/media-libs/opencv/files/opencv-3.2.0-contrib_xfeatures2d-autodownload.patch
@@ -0,0 +1,10 @@
+--- a/modules/xfeatures2d/CMakeLists.txt       2017-02-28 13:10:56.470000000 
+0100
++++ b/modules/xfeatures2d/CMakeLists.txt       2017-02-28 13:11:03.970000000 
+0100
+@@ -1,5 +1,5 @@
+ set(the_description "Contributed/Experimental Algorithms for Salient 2D 
Features Detection")
+ ocv_define_module(xfeatures2d opencv_core opencv_imgproc opencv_features2d 
opencv_calib3d opencv_shape opencv_highgui opencv_videoio opencv_ml
+                   OPTIONAL opencv_cudaarithm WRAP python java)
+-include(cmake/download_vgg.cmake)
+-include(cmake/download_boostdesc.cmake)
++#include(cmake/download_vgg.cmake)
++#include(cmake/download_boostdesc.cmake)

diff --git a/media-libs/opencv/files/opencv-3.2.0-vtk.patch 
b/media-libs/opencv/files/opencv-3.2.0-vtk.patch
new file mode 100644
index 00000000000..1e3daec8aa3
--- /dev/null
+++ b/media-libs/opencv/files/opencv-3.2.0-vtk.patch
@@ -0,0 +1,11 @@
+--- a/cmake/OpenCVDetectVTK.cmake      2017-03-20 10:43:28.401962910 +0100
++++ b/cmake/OpenCVDetectVTK.cmake      2017-03-20 10:43:09.127963906 +0100
+@@ -8,7 +8,7 @@
+   IF(VTK_RENDERING_BACKEND) #in vtk 7, the rendering backend is exported as a 
var.
+       find_package(VTK QUIET COMPONENTS vtkRendering${VTK_RENDERING_BACKEND} 
vtkInteractionStyle vtkRenderingLOD vtkIOPLY vtkFiltersTexture 
vtkRenderingFreeType vtkIOExport vtkIOGeometry NO_MODULE)
+   ELSE(VTK_RENDERING_BACKEND)
+-      find_package(VTK QUIET COMPONENTS vtkRenderingOpenGL 
vtkInteractionStyle vtkRenderingLOD vtkIOPLY vtkFiltersTexture 
vtkRenderingFreeType vtkIOExport NO_MODULE)
++      find_package(VTK QUIET COMPONENTS vtkRenderingOpenGL2 
vtkInteractionStyle vtkRenderingLOD vtkIOPLY vtkFiltersTexture 
vtkRenderingFreeType vtkIOExport NO_MODULE)
+   ENDIF(VTK_RENDERING_BACKEND)
+ ENDIF(VTK_FOUND)
+ 

diff --git a/media-libs/opencv/metadata.xml b/media-libs/opencv/metadata.xml
index d136656a74c..271e8804134 100644
--- a/media-libs/opencv/metadata.xml
+++ b/media-libs/opencv/metadata.xml
@@ -3,7 +3,7 @@
 <pkgmetadata>
        <maintainer type="person">
                <email>[email protected]</email>
-               <name>Amy Winston</name>
+               <name>Amy Liffey</name>
                <description>Assign bugs on me.</description>
        </maintainer>
        <maintainer type="person">
@@ -17,12 +17,13 @@ Face Recognition; Gesture Recognition; Motion Tracking, Ego 
Motion, Motion Under
 </longdescription>
        <use>
                <flag name="contrib">Install user contributed scripts from 
opencv_contrib (Experimental!)</flag>
-               <flag name="cuda">Enable NVIDIA Cuda computations support</flag>
+               <flag name="cuda">Enable NVIDIA Cuda computations support 
(Experimental!)</flag>
                <flag name="eigen">Enable usage of <pkg>dev-cpp/eigen</pkg> for 
computations</flag>
                <flag name="gdal">Enable support for sci-libs/gdal 
library</flag>
                <flag restrict="&gt;=media-libs/opencv-3.1.0" name="gflags">Use 
Google's C++ argument parsing library</flag>
                <flag restrict="&gt;=media-libs/opencv-3.1.0" name="glog">Use 
Google's C++ loggin library</flag>
                <flag name="ipp">Enable Intel Integrated Primitive 
support</flag>
+               <flag restrict="&gt;=media-libs/opencv-3.1.0" 
name="contrib_xfeatures2d">Enables xfeatures2d and autodownload of samples in 
contrib</flag>
                <flag restrict="&gt;=media-libs/opencv-3.1.0" 
name="contrib_cvv">CVV module requires Qt5</flag>
                <flag restrict="&gt;=media-libs/opencv-3.1.0" 
name="contrib_hdf">HDF module requires <pkg>sci-libs/hdf5</pkg></flag>
                <flag restrict="&gt;=media-libs/opencv-3.1.0" 
name="contrib_sfm">SFM module requires eigen, gflags, and glog</flag>

diff --git a/media-libs/opencv/opencv-3.2.0.ebuild 
b/media-libs/opencv/opencv-3.2.0.ebuild
new file mode 100644
index 00000000000..4f91336a398
--- /dev/null
+++ b/media-libs/opencv/opencv-3.2.0.ebuild
@@ -0,0 +1,329 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python{2_7,3_4,3_5} )
+
+inherit toolchain-funcs cmake-utils python-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="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz
+       contrib? ( https://github.com/${PN}/${PN}_contrib/archive/${PV}.tar.gz 
-> ${P}_contrib.tar.gz
+               contrib_xfeatures2d? ( 
http://dev.gentoo.org/~amynka/snap/vgg_boostdesc-${PV}.tar.gz ) )"
+LICENSE="BSD"
+SLOT="0/3.2" # subslot = libopencv* soname version
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux"
+IUSE="contrib cuda debug +eigen examples ffmpeg gdal gflags glog gphoto2 
gstreamer gtk ieee1394 ipp jpeg jpeg2k lapack libav opencl openexr opengl 
openmp pch png +python qt5 tesseract testprograms threads tiff vaapi v4l vtk 
webp xine contrib_cvv contrib_hdf contrib_sfm contrib_xfeatures2d"
+
+# OpenGL needs gtk or Qt installed to activate, otherwise build system
+# will silently disable it without the user knowing, which defeats the
+# purpose of the opengl use flag.
+REQUIRED_USE="
+       cuda? ( tesseract? ( opencl ) )
+       gflags? ( contrib )
+       glog? ( contrib )
+       contrib_cvv? ( contrib qt5 )
+       contrib_hdf? ( contrib )
+       contrib_sfm? ( contrib eigen gflags glog )
+       opengl? ( || ( gtk qt5 ) )
+       python? ( ${PYTHON_REQUIRED_USE} )
+       tesseract? ( contrib )"
+
+# 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? ( !qt5 )
+#      openmp? ( !threads )
+
+RDEPEND="
+       app-arch/bzip2
+       sys-libs/zlib
+       cuda? ( dev-util/nvidia-cuda-toolkit:0= )
+       contrib_hdf? ( sci-libs/hdf5 )
+       ffmpeg? (
+               libav? ( media-video/libav:0= )
+               !libav? ( media-video/ffmpeg:0= )
+       )
+       gdal? ( sci-libs/gdal:= )
+       gflags? ( dev-cpp/gflags )
+       glog? ( dev-cpp/glog )
+       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 )
+       )
+       ieee1394? (
+               media-libs/libdc1394
+               sys-libs/libraw1394
+               )
+       ipp? ( sci-libs/ipp )
+       java? ( >=virtual/jre-1.6:* )
+       jpeg? ( virtual/jpeg:0 )
+       jpeg2k? ( media-libs/jasper:= )
+       lapack? ( virtual/lapack )
+       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}] )
+       qt5? (
+               dev-qt/qtgui:5
+               dev-qt/qtwidgets:5
+               dev-qt/qttest:5
+               dev-qt/qtconcurrent:5
+               opengl? ( dev-qt/qtopengl:5 )
+       )
+       tesseract? ( app-text/tesseract[opencl=] )
+       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 )"
+
+PATCHES=(
+       "${FILESDIR}/${PN}-3.0.0-gles.patch"
+       "${FILESDIR}/${PN}-3.1.0-java-magic.patch"
+       "${FILESDIR}/${PN}-3.1.0-find-libraries-fix.patch"
+       "${FILESDIR}/${P}-vtk.patch"
+)
+
+pkg_pretend() {
+       [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
+}
+
+pkg_setup() {
+       [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
+       java-pkg-opt-2_pkg_setup
+}
+
+src_prepare() {
+       cmake-utils_src_prepare
+
+       # remove bundled stuff
+       rm -rf 3rdparty || die "Removing 3rd party components failed"
+       sed -e '/add_subdirectory(.*3rdparty.*)/ d' \
+               -i CMakeLists.txt cmake/*cmake || die
+
+       if use contrib && use contrib_xfeatures2d; then
+               cd  "${WORKDIR}/${PN}_contrib-${PV}" || die
+               eapply "${FILESDIR}/${P}-contrib_xfeatures2d-autodownload.patch"
+               mv "${WORKDIR}"/*.i 
"${WORKDIR}/${PN}_contrib-${PV}"/modules/xfeatures2d/src/ || die
+       fi
+
+       java-pkg-opt-2_src_prepare
+}
+
+src_configure() {
+       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
+       GLOBALCMAKEARGS=(
+       # Optional 3rd party components
+       # ===================================================
+               -DWITH_1394=$(usex ieee1394)
+       #       -DWITH_AVFOUNDATION=OFF         # IOS
+               -DWITH_VTK=$(usex vtk)
+               -DWITH_EIGEN=$(usex eigen)
+               -DWITH_VFW=OFF                  # Video windows support
+               -DWITH_FFMPEG=$(usex ffmpeg)
+               -DWITH_GSTREAMER=$(usex gstreamer)
+               -DWITH_GSTREAMER_0_10=OFF       # Don't want this
+               -DWITH_GTK=$(usex gtk)
+               -DWITH_GTK_2_X=$(usex gtk)
+               -DWITH_IPP=$(usex ipp)
+               -DWITH_JASPER=$(usex jpeg2k)
+               -DWITH_JPEG=$(usex jpeg)
+               -DWITH_WEBP=$(usex webp)
+               -DWITH_OPENEXR=$(usex openexr)
+               -DWITH_OPENGL=$(usex opengl)
+               -DWITH_OPENVX=OFF
+               -DWITH_OPENNI=OFF               # Not packaged
+               -DWITH_OPENNI2=OFF              # Not packaged
+               -DWITH_PNG=$(usex png)
+               -DWITH_GDCM=OFF
+               -DWITH_PVAPI=OFF
+               -DWITH_GIGEAPI=OFF
+               -DWITH_ARAVIS=OFF
+               -DWITH_QT=$(usex qt5 5 OFF)
+               -DWITH_WIN32UI=OFF              # Windows only
+       #       -DWITH_QUICKTIME=OFF
+       #       -DWITH_QTKIT=OFF
+               -DWITH_TBB=$(usex threads)
+               -DWITH_OPENMP=$(usex openmp)
+               -DWITH_CSTRIPES=OFF
+               -DWITH_PTHREADS_PF=ON
+               -DWITH_TIFF=$(usex tiff)
+               -DWITH_UNICAP=OFF               # Not packaged
+               -DWITH_V4L=$(usex v4l)
+               -DWITH_LIBV4L=$(usex v4l)
+               -DWITH_DSHOW=ON                 # direct show supp
+               -DWITH_MSMF=OFF
+               -DWITH_XIMEA=OFF                # Windows only
+               -DWITH_XINE=$(usex xine)
+               -DWITH_CLP=OFF
+               -DWITH_OPENCL=$(usex opencl)
+               -DWITH_OPENCL_SVM=OFF
+               -DWITH_OPENCLAMDFFT=$(usex opencl)
+               -DWITH_OPENCLAMDBLAS=$(usex opencl)
+               -DWITH_DIRECTX=OFF
+               -DWITH_INTELPERC=OFF
+               -DWITH_JAVA=$(usex java) # Ant needed, no compile flag
+               -DWITH_IPP_A=OFF
+               -DWITH_MATLAB=OFF
+               -DWITH_VA=$(usex vaapi)
+               -DWITH_VA_INTEL=$(usex vaapi)
+               -DWITH_GDAL=$(usex gdal)
+               -DWITH_GPHOTO2=$(usex gphoto2)
+               -DWITH_LAPACK=$(usex lapack)
+       # ===================================================
+       # CUDA build components: nvidia-cuda-toolkit takes care of GCC version
+       # ===================================================
+               -DWITH_CUDA=$(usex cuda)
+               -DWITH_CUBLAS=$(usex cuda)
+               -DWITH_CUFFT=$(usex cuda)
+               -DWITH_NVCUVID=OFF
+#              -DWITH_NVCUVID=$(usex cuda)
+               -DCUDA_NPP_LIBRARY_ROOT_DIR=$(usex cuda "${EPREFIX}/opt/cuda" 
"")
+       # ===================================================
+       # OpenCV build components
+       # ===================================================
+               -DBUILD_SHARED_LIBS=ON
+               -DBUILD_ANDROID_EXAMPLES=OFF
+               -BUILD_opencv_apps=
+               -DBUILD_DOCS=OFF # Doesn't install anyways.
+               -DBUILD_EXAMPLES=$(usex examples)
+               -DBUILD_PERF_TESTS=OFF
+               -DBUILD_TESTS=$(usex testprograms)
+               -DBUILD_WITH_DEBUG_INFO=$(usex debug)
+       #       -DBUILD_WITH_STATIC_CRT=OFF
+               -DBUILD_WITH_DYNAMIC_IPP=OFF
+               -DBUILD_FAT_JAVA_LIB=$(usex java)
+       #       -DBUILD_ANDROID_SERVICE=OFF
+               -DBUILD_CUDA_STUBS=$(usex cuda)
+               -DOPENCV_EXTRA_MODULES_PATH=$(usex contrib 
"${WORKDIR}/opencv_contrib-${PV}/modules" "")
+       # ===================================================
+       # OpenCV installation options
+       # ===================================================
+               -DINSTALL_CREATE_DISTRIB=OFF
+               -DINSTALL_C_EXAMPLES=$(usex examples)
+               -DINSTALL_TESTS=$(usex testprograms)
+               -DINSTALL_PYTHON_EXAMPLES=$(usex examples)
+       #       -DINSTALL_ANDROID_EXAMPLES=OFF
+               -DINSTALL_TO_MANGLED_PATHS=OFF
+       # ===================================================
+       # OpenCV build options
+       # ===================================================
+               -DENABLE_CCACHE=OFF
+               -DENABLE_PRECOMPILED_HEADERS=$(usex pch)
+               -DENABLE_SOLUTION_FOLDERS=OFF
+               -DENABLE_PROFILING=OFF
+               -DENABLE_COVERAGE=OFF
+               -DENABLE_OMIT_FRAME_POINTER=OFF
+               -DENABLE_FAST_MATH=OFF
+               -DENABLE_SSE=OFF
+               -DENABLE_SSE2=OFF
+               -DENABLE_SSE3=OFF
+               -DENABLE_SSSE3=OFF
+               -DENABLE_SSE41=OFF
+               -DENABLE_SSE42=OFF
+               -DENABLE_POPCNT=OFF
+               -DENABLE_AVX=OFF
+               -DENABLE_AVX=OFF
+               -DENABLE_AVX2=OFF
+               -DENABLE_FMA3=OFF
+               -DENABLE_NEON=OFF
+
+               -DHAVE_opencv_java=$(usex java YES NO)
+               -DENABLE_NOISY_WARNINGS=OFF
+               -DOPENCV_WARNINGS_ARE_ERRORS=OFF
+               -DENABLE_IMPL_COLLECTION=OFF
+               -DENABLE_INSTRUMENTATION=OFF
+               -DGENERATE_ABI_DESCRIPTOR=OFF
+               -DDOWNLOAD_EXTERNAL_TEST_DATA=OFF
+       # ===================================================
+       # things we want to be hard off or not yet figured out
+       # ===================================================
+               -DBUILD_PACKAGE=OFF
+               -DENABLE_PROFILING=OFF
+       # ===================================================
+       # things we want to be hard enabled not worth useflag
+       # ===================================================
+               -DCMAKE_SKIP_RPATH=ON
+               -DOPENCV_DOC_INSTALL_PATH=
+       )
+
+       # ===================================================
+       # OpenCV Contrib Modules
+       # ===================================================
+       if use contrib; then
+               GLOBALCMAKEARGS+=(
+                       -DBUILD_opencv_dnn=OFF
+                       -DBUILD_opencv_dnns_easily_fooled=OFF
+                       -DBUILD_opencv_xfeatures2d=$(usex contrib_xfeatures2d 
ON OFF)
+                       -DBUILD_opencv_cvv=$(usex contrib_cvv ON OFF)
+                       -DBUILD_opencv_hdf=$(usex contrib_hdf ON OFF)
+                       -DBUILD_opencv_sfm=$(usex contrib_sfm ON OFF)
+               )
+       fi
+
+       # workaround for bug 413429
+       tc-export CC CXX
+
+       local mycmakeargs=( ${GLOBALCMAKEARGS[@]}
+               -DPYTHON_EXECUTABLE=OFF
+               -DINSTALL_PYTHON_EXAMPLES=OFF
+       )
+
+       cmake-utils_src_configure
+}
+
+python_module_compile() {
+       local mycmakeargs=( ${GLOBALCMAKEARGS[@]} )
+
+       # Set all python variables to load the correct Gentoo paths
+       mycmakeargs+=(
+               # cheap trick: python_setup sets one of them as a symlink
+               # to the correct interpreter, and the other to fail-wrapper
+               -DPYTHON2_EXECUTABLE=$(type -P python2)
+               -DPYTHON3_EXECUTABLE=$(type -P python3)
+               -DINSTALL_PYTHON_EXAMPLES=$(usex examples)
+       )
+
+       # Compile and install all at once because configuration will be wiped
+       # for each impl of Python
+       BUILD_DIR="${WORKDIR}"/${P}_build
+       cd "${BUILD_DIR}" || die "cd failed"
+
+       # Regenerate cache file. Can't use rebuild_cache as it won't
+       # have the Gentoo specific options.
+       rm -rf CMakeCache.txt || die "rm failed"
+       cmake-utils_src_configure
+       cmake-utils_src_compile
+       cmake-utils_src_install
+
+       # Remove compiled binary so new version compiles
+       # Avoid conflicts with new module builds as build system doesn't
+       # really support it.
+       rm -rf modules/python2 || die "rm failed"
+}
+
+src_install() {
+       cmake-utils_src_install
+
+       # Build and install the python modules for all targets
+       use python && python_foreach_impl python_module_compile
+}

Reply via email to