[gentoo-commits] repo/gentoo:master commit in: media-libs/vigra/

[Andreas Sturmlechner]

commit:     fbec2d140834b04eee6c2a306993d1ec65f820da
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Mon Apr  8 18:39:00 2019 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Mon Apr  8 21:10:46 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fbec2d14

media-libs/vigra: EAPI-7 bump

Package-Manager: Portage-2.3.62, Repoman-2.3.12
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 media-libs/vigra/vigra-9999.ebuild | 45 +++++++++++++++++++-------------------
 1 file changed, 23 insertions(+), 22 deletions(-)

diff --git a/media-libs/vigra/vigra-9999.ebuild 
b/media-libs/vigra/vigra-9999.ebuild
index 4073587b713..120f0cc2429 100644
--- a/media-libs/vigra/vigra-9999.ebuild
+++ b/media-libs/vigra/vigra-9999.ebuild
@@ -1,12 +1,12 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
+
 MY_P="${P}-src"
 MY_V="${PV//\./-}"
 PYTHON_COMPAT=( python2_7 )
 PYTHON_REQ_USE="threads,xml"
-
 inherit cmake-utils python-r1
 
 DESCRIPTION="C++ computer vision library emphasizing customizable algorithms 
and structures"
@@ -24,8 +24,20 @@ LICENSE="MIT"
 SLOT="0"
 IUSE="doc +fftw +hdf5 +jpeg mpi openexr +png +python test +tiff valgrind"
 
+REQUIRED_USE="
+       doc? ( hdf5 fftw )
+       python? ( hdf5 ${PYTHON_REQUIRED_USE} )
+       test? ( hdf5 python fftw )"
+
+BDEPEND="
+       doc? (
+               app-doc/doxygen
+               python? ( >=dev-python/sphinx-1.1.3-r5[${PYTHON_USEDEP}] )
+       )
+       test? ( >=dev-python/nose-1.1.2-r1[${PYTHON_USEDEP}] )
+"
 # runtime dependency on python:2.7 is required by the vigra-config script
-RDEPEND="
+DEPEND="
        dev-lang/python:2.7
        >=dev-libs/boost-1.52.0-r6:=[python?,${PYTHON_USEDEP}]
        fftw? ( sci-libs/fftw:3.0 )
@@ -35,35 +47,24 @@ RDEPEND="
        png? ( media-libs/libpng:0= )
        python? ( ${PYTHON_DEPS} dev-python/numpy[${PYTHON_USEDEP}] )
        tiff? ( media-libs/tiff:0= )
-       valgrind? ( dev-util/valgrind )"
-
-DEPEND="${RDEPEND}
-       doc? (
-               app-doc/doxygen
-               python? ( >=dev-python/sphinx-1.1.3-r5[${PYTHON_USEDEP}] )
-       )
-       test? ( >=dev-python/nose-1.1.2-r1[${PYTHON_USEDEP}] )"
-
-REQUIRED_USE="
-       doc? ( hdf5 fftw )
-       python? ( hdf5 ${PYTHON_REQUIRED_USE} )
-       test? ( hdf5 python fftw )"
+       valgrind? ( dev-util/valgrind )
+"
+RDEPEND="${DEPEND}"
 
 # Severely broken, also disabled in Fedora, bugs #390447, #653442
 RESTRICT="test"
 
-DOCS=( README.md )
-
 pkg_setup() {
        use python && python_setup
 }
 
 src_prepare() {
-       einfo "Removing shipped docs and VCS files"
-       rm -rf doc || die
-
        cmake-utils_src_prepare
 
+       if [[ ${PV} != *9999 ]]; then
+               rm -r doc || die "failed to remove shipped docs"
+       fi
+
        # Don't use python_fix_shebang because we can't put this behind 
USE="python"
        sed -i -e '/env/s:python:python2:' config/vigra-config.in || die
 }