gentoo resync : 09.06.2018

4 files changed, 2 insertions, 177 deletions

diff --git a/media-libs/vigra/Manifest b/media-libs/vigra/Manifest
index 6f0a7ae5e17f..b05b08b0508e 100644
--- a/media-libs/vigra/Manifest
+++ b/media-libs/vigra/Manifest
@@ -1,9 +1,6 @@
 AUX vigra-1.11.0-gcc-7.patch 550 BLAKE2B c3eda6330490a4fd83ae6c0cd19ca68a71437a2acf905447864dd853fee859bbddbeeb237fda084c89b65257a644033ccd0b3a0762ff03b1c79a4f084bf94702 SHA512 fcab28aea46fd2bcc9b227611d9b8881f1492a70042fab5b7209dd855c4bcb06575ac41489d9f78be1c70937e2f77c951f6c2a60d73d9f6a84c77581810ded1a
-AUX vigra-1.9.0-automagicness.patch 2470 BLAKE2B dbe9116f2864cba0a20d125ec494a08275b4da7798ff9a210a4384ff39c0fb4848638d544d4f68b50a8a9cac14a1157df87e621465ddbfb2db1bd6e59d1e105f SHA512 88374bc6e7c17e4528e4ba78c56c13cc680ace4befe738c910b1007644d068f73b6c60b959bf1f33cc243c38e35fce9aaf77e49a173366c3ec8182ace1443f44
 DIST vigra-1.11.0-src.tar.gz 51854568 BLAKE2B 759390546989d52ffa5447b5434bd2d09b7ceba020ff72b953e9a671514ae2969be7a9f2918b21ab80d2952892219444315ad1df46e635e90a47edde957b6f11 SHA512 3cd8fcfc8ba9a1209a37e49c7b5cb0080bc665987805deec0b92cabf8c571c2f09ba47e2850c12204d04b3c830322fc8e47efa19fc537cf78708c22e1d302d6a
 DIST vigra-1.11.1-src.tar.gz 55119047 BLAKE2B c67dc61515075843faacb4ee054f3e28b4edd033dc6cb89d3c591827309eafa697b839ca85ff7c68d6aff9d7e08b1d3db73d50e6c3b065a5210b64a90e242444 SHA512 9c1638d626d658fa4b13069e5850b628d91db02bb18b8a9f0a4642fee501ede8a6f4f267d79ca5cd5baf3991e704163345cd18ab7919ff2a93db6bd496096de3
-DIST vigra-1.9.0-src.tar.gz 30813416 BLAKE2B ee5a84f1457b96bbda5077136558cf49ceb3f2b2c6727ab0ff07dc6bc7cd4dc99a8db9908b516110517c146a0f21bf87c33bdd038185fcc4ec38fdc5259d5e9f SHA512 8d1c7f3ad8cc8069b34d58fe775eb8604a2c902daeab4a5ad3a602d45c1eda0b4dcfe64e68b9fada669b46ee39b3a6f2c95af9c5f99c2fb2370c55580816e757
 EBUILD vigra-1.11.0.ebuild 3492 BLAKE2B 304c3a1ec38d2239999edb9088144379b0cd08f166e2c6d73e60f1c962217daaa4d3fe5e98c3a3ea5918ab199a030537902823f31cc54d5803130a9e259396ca SHA512 d006b82c2d904308da82a4bdb90860f502a509be2fb5cc0a143c8f8a88ef69fa054b15af63e7a4228d86403bf3d19fe4757f25bb123f4013ba046c70d2b1e160
-EBUILD vigra-1.11.1.ebuild 3535 BLAKE2B 23c0f6fea13190f8b0e729de8d2b28d3a8efbcd5fc77223f553b6c354dacfb61ad13c25f4f991b6b4ca87b73ee53050ba5fa77ab643469a3b5ef675ef0ffe949 SHA512 b1f535c04ca2df0724d6e2b45b714eb1cc0e217c4c1f22e00bdd7dc241730341792c2280a14299031907c7177c45ca69deb27e709d32f411ed0eed23293522be
-EBUILD vigra-1.9.0.ebuild 2637 BLAKE2B dc273de65af90b7b5093f00ab90d1f93a11e989dd267eb014e5e80fb635a85bb42250661761c897dfe499b3fb7796585d87505739a848e2f6f5f57596674cbd1 SHA512 c6d217e3a07bb9332f83a9eb98d98bf76909ec40528cc155c882ff00c2a1fc287935098798793ebc57505185dd7bd36b3c88ba6259b05464d822d3f1a61baf92
+EBUILD vigra-1.11.1.ebuild 3534 BLAKE2B 373b00b7edf79ebe3e9e5ca82cabaf032c87c0e3e8a96714f4f8fe2ac19bd6c6d1b5101303f0f048e1300b8f6e87807f31e6538b1af0eec25efbad0c08e769d8 SHA512 043b293c2648690780fffd19d55029ffdcfe8d8d60f80224c7fab8527e1ad75b15d3def0a2fa3ab7f8d92a905456232662ec000d94e5ea9d56dae22df0c22378
 MISC metadata.xml 413 BLAKE2B 985f005fa338d566dddb20126e0a83cb8e9ec5aa4ac9ed2d5ec6a42743eeb92f521375b74f8caaa94500c42450d68d0a4bf5c036c9a2909e13c922f50896824a SHA512 e5c2a32f7495cfceffc8da8464131b918134b7255fbcde9a10175a24698f5a6aff17630436935c6cda7d8a3cd8b182c299845a24528f3a9c40dff1022dce4f71
diff --git a/media-libs/vigra/files/vigra-1.9.0-automagicness.patch b/media-libs/vigra/files/vigra-1.9.0-automagicness.patch
deleted file mode 100644
index e6deb761d1c5..000000000000
--- a/media-libs/vigra/files/vigra-1.9.0-automagicness.patch
+++ /dev/null
@@ -1,74 +0,0 @@
-diff -urN vigra-1.9.0.old/CMakeLists.txt vigra-1.9.0/CMakeLists.txt
---- vigra-1.9.0.old/CMakeLists.txt	2013-06-04 13:38:43.158564579 +0200
-+++ vigra-1.9.0/CMakeLists.txt	2013-06-04 13:45:19.290550486 +0200
-@@ -57,13 +57,27 @@
- #     search for dependencies
- #
- ##################################################
-+OPTION(WITH_TIFF "Enable tiff support" ON)
-+OPTION(WITH_JPEG "Enable jpeg support" ON)
-+OPTION(WITH_PNG "Enable png support" ON)
-+OPTION(WITH_OPENEXR "Enable openexr support" ON)
-+OPTION(WITH_FFTW3 "Enable fftw support" ON)
-+OPTION(ENABLE_DOC "Build documentation" ON)
- 
- INCLUDE(VigraFindPackage)
--VIGRA_FIND_PACKAGE(TIFF NAMES libtiff)
--VIGRA_FIND_PACKAGE(JPEG NAMES libjpeg)
--VIGRA_FIND_PACKAGE(PNG)
--VIGRA_FIND_PACKAGE(FFTW3 NAMES libfftw3-3 libfftw-3.3)
--VIGRA_FIND_PACKAGE(FFTW3F NAMES libfftw3f-3 libfftwf-3.3)
-+IF(WITH_TIFF)
-+    VIGRA_FIND_PACKAGE(TIFF NAMES libtiff)
-+ENDIF()
-+IF(WITH_JPEG)
-+    VIGRA_FIND_PACKAGE(JPEG NAMES libjpeg)
-+ENDIF()
-+IF(WITH_PNG)
-+    VIGRA_FIND_PACKAGE(PNG)
-+ENDIF()
-+IF(WITH_FFTW3)
-+    VIGRA_FIND_PACKAGE(FFTW3 NAMES libfftw3-3 libfftw-3.3)
-+    VIGRA_FIND_PACKAGE(FFTW3F NAMES libfftw3f-3 libfftwf-3.3)
-+ENDIF()
- IF(WITH_OPENEXR)
-     VIGRA_FIND_PACKAGE(OpenEXR)
- ENDIF()
-@@ -72,8 +86,10 @@
- ENDIF()
- 
- SET(DOXYGEN_SKIP_DOT TRUE)
-+IF(ENABLE_DOC)
- FIND_PACKAGE(Doxygen)
- FIND_PACKAGE(PythonInterp)
-+ENDIF()
- 
- IF(WITH_VIGRANUMPY)
-     FIND_PACKAGE( VIGRANUMPY_DEPENDENCIES )
-diff -urN vigra-1.9.0.old/vigranumpy/docsrc/CMakeLists.txt vigra-1.9.0/vigranumpy/docsrc/CMakeLists.txt
---- vigra-1.9.0.old/vigranumpy/docsrc/CMakeLists.txt	2013-06-04 13:38:43.207564577 +0200
-+++ vigra-1.9.0/vigranumpy/docsrc/CMakeLists.txt	2013-06-04 13:45:51.962549323 +0200
-@@ -1,4 +1,4 @@
--IF(PYTHON_SPHINX)
-+IF(PYTHON_SPHINX AND ENABLE_DOC)
-     # vigranumpy documentation generation using sphinx
-     IF(DEFINED VIGRANUMPY_DOCDIR)
-         MESSAGE(SEND_ERROR "VIGRANUMPY_DOCDIR already defined! Please delete from Cache.")
-@@ -49,7 +49,7 @@
-             ${VIGRANUMPY_DOCDIR}
-         COMMENT "Generating vigranumpy documentation")
- 
--ELSE(PYTHON_SPHINX)
-+ELSE(PYTHON_SPHINX AND ENABLE_DOC)
-     # no vigranumpy documentation if sphinx not available
-     ADD_CUSTOM_TARGET (doc_python 
-         ${CMAKE_COMMAND} -E echo
-@@ -57,7 +57,7 @@
-         "(sphinx-build not found)"
-         VERBATIM)
- 
--ENDIF(PYTHON_SPHINX)
-+ENDIF(PYTHON_SPHINX AND ENABLE_DOC)
- 
- ADD_DEPENDENCIES(doc_python vigranumpy)
- ADD_DEPENDENCIES(doc_python doc_cpp)
diff --git a/media-libs/vigra/vigra-1.11.1.ebuild b/media-libs/vigra/vigra-1.11.1.ebuild
index c7db801f5f0d..44a25f14450a 100644
--- a/media-libs/vigra/vigra-1.11.1.ebuild
+++ b/media-libs/vigra/vigra-1.11.1.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://github.com/ukoethe/vigra/releases/download/Version-${MY_V}/${MY
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~sparc x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ~sparc x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc +fftw +hdf5 +jpeg mpi openexr +png +python test +tiff valgrind"
 
 # runtime dependency on python:2.7 is required by the vigra-config script
diff --git a/media-libs/vigra/vigra-1.9.0.ebuild b/media-libs/vigra/vigra-1.9.0.ebuild
deleted file mode 100644
index 0252dcd97b64..000000000000
--- a/media-libs/vigra/vigra-1.9.0.ebuild
+++ /dev/null
@@ -1,98 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 )
-PYTHON_REQ_USE="threads,xml"
-
-# This ebuild could use python-r1 in the future when upstream gets Python 3.x
-# support working
-inherit cmake-utils eutils multilib python-single-r1
-
-MY_P=${P}-src
-
-DESCRIPTION="a C++ computer vision library with emphasis on customizability of algorithms and data structures"
-HOMEPAGE="https://ukoethe.github.io/vigra/"
-SRC_URI="http://hci.iwr.uni-heidelberg.de/${PN}/${MY_P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ~sparc x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris"
-IUSE="doc +fftw +hdf5 +jpeg openexr +png +python test +tiff"
-
-# Pull in dev-lang/python:2.7 for vigra-config which is always installed
-RDEPEND="dev-lang/python:2.7
-	>=dev-libs/boost-1.52.0-r6:=[python?,${PYTHON_USEDEP}]
-	fftw? ( sci-libs/fftw:3.0 )
-	hdf5? ( sci-libs/hdf5:= )
-	jpeg? ( virtual/jpeg )
-	openexr? ( media-libs/openexr:= )
-	png? ( media-libs/libpng:0= )
-	python? ( ${PYTHON_DEPS} )
-	tiff? ( media-libs/tiff:0= )"
-DEPEND="${RDEPEND}
-	doc? (
-		app-doc/doxygen
-		python? ( >=dev-python/sphinx-1.1.3-r5[${PYTHON_USEDEP}] )
-	)
-	test? (
-		python? ( >=dev-python/nose-1.1.2-r1[${PYTHON_USEDEP}] )
-	)"
-REQUIRED_USE="doc? ( hdf5 fftw )
-	python? ( hdf5 ${PYTHON_REQUIRED_USE} )
-	test? ( hdf5 python fftw )"
-
-DOCS=( README.txt )
-
-pkg_setup() {
-	use python && python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-automagicness.patch
-
-	# Don't build nor install API docs when not requested
-	use doc || { sed -i -e '/ADD_SUBDIRECTORY(docsrc)/d' CMakeLists.txt || die; }
-
-	# 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
-}
-
-src_configure() {
-	local libdir=$(get_libdir)
-
-	# required for ddocdir
-	_cmake_check_build_dir init
-	local mycmakeargs=(
-		-DDOCDIR="${CMAKE_BUILD_DIR}"/doc
-		-DLIBDIR_SUFFIX=${libdir/lib}
-		-DDOCINSTALL=share/doc/${PF}
-		-DWITH_VALGRIND=OFF
-		$(cmake-utils_use_with python VIGRANUMPY)
-		$(cmake-utils_use_with png)
-		$(cmake-utils_use_with jpeg)
-		$(cmake-utils_use_with openexr)
-		$(cmake-utils_use_with tiff)
-		$(cmake-utils_use_with fftw FFTW3)
-		$(cmake-utils_use_with hdf5)
-		$(cmake-utils_use_build test TESTING)
-		$(cmake-utils_use test CREATE_CTEST_TARGETS)
-		$(cmake-utils_use test AUTOBUILD_TESTS)
-	)
-
-	cmake-utils_src_configure
-}
-
-src_compile() {
-	cmake-utils_src_compile
-	use doc && cmake-utils_src_make doc
-}
-
-src_test() { :; } #390447
-
-src_install() {
-	cmake-utils_src_install
-
-	use python && python_optimize
-}