gentoo resync : 19.04.2018

3 files changed, 144 insertions, 3 deletions

diff --git a/media-libs/vigra/Manifest b/media-libs/vigra/Manifest
index 14fd55d1e852..72750cb7d094 100644
--- a/media-libs/vigra/Manifest
+++ b/media-libs/vigra/Manifest
@@ -1,7 +1,9 @@
 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 3505 BLAKE2B c1c7ecc6e7844b6cd29b25e1668ab69775242415487490b5fddc5a0139738ddf637498bef9810269b77f8de8903083dcf949230e7438742ea2cffebd18681fec SHA512 80fc790c2284f9576905bb58b387483c2954183af071132efd37facd3d53666c4de7ba9d832434866cbffb8700f286cf1c17aec9663cca0b067fe1a57ba1d286
+EBUILD vigra-1.11.0.ebuild 3504 BLAKE2B b234c2c35e728818322358eb3bc1b22339a9e3ed2cb6853c724a2b80ec214627b953138e9a5ca7bc2e2e7b8d37835443ed80b86f7c892992f5774326ec83c7d0 SHA512 702c801b8b5eccc845db31a61637210e148d8ffbd27182252820b5fecabf9b068c5828f2e7519c3caf2089d909d03909e30786a30260a2a8919dd16ad01127c5
+EBUILD vigra-1.11.1.ebuild 3548 BLAKE2B 737ab017f04ad0630782ff60f0846457e611e66ccd8d1c71ebaf0e39d447919a6a1e57d64d58bb2a12990c97512e55616d6d0afa9cc2fd29db33650645972c8a SHA512 53270bb5f330a387d03fab354f8fdd52e61e565dcfdec2da08d7e08eda0308341dfc2ea18182e2eb221344b7ed77477fca973744bf98cd76ec5c87fbd53156fd
 EBUILD vigra-1.9.0.ebuild 2647 BLAKE2B 44d9d93f5f0d735b08e0bba27e455d3e3eaf6266d8e65a1ee10843db9667b0c39789f40f0e3226101ab075dbe683004e87b00df9496c3ea0ff8e2622d8e77861 SHA512 a1f995bca67859d072e666d16d7ddad87609dd857afde8fc2de4c56636cfbdc751b63acadd3ab06d230374da57edb49e9cc9f4bb896f6264005e54570fc96c0c
 MISC metadata.xml 413 BLAKE2B 985f005fa338d566dddb20126e0a83cb8e9ec5aa4ac9ed2d5ec6a42743eeb92f521375b74f8caaa94500c42450d68d0a4bf5c036c9a2909e13c922f50896824a SHA512 e5c2a32f7495cfceffc8da8464131b918134b7255fbcde9a10175a24698f5a6aff17630436935c6cda7d8a3cd8b182c299845a24528f3a9c40dff1022dce4f71
diff --git a/media-libs/vigra/vigra-1.11.0.ebuild b/media-libs/vigra/vigra-1.11.0.ebuild
index 2a8cb7118127..7c3e44a5e1b5 100644
--- a/media-libs/vigra/vigra-1.11.0.ebuild
+++ b/media-libs/vigra/vigra-1.11.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/ukoethe/vigra/releases/download/Version-${MY_V}/${MY
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ~ppc ~ppc64 ~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.11.1.ebuild b/media-libs/vigra/vigra-1.11.1.ebuild
new file mode 100644
index 000000000000..6fa95e1699aa
--- /dev/null
+++ b/media-libs/vigra/vigra-1.11.1.ebuild
@@ -0,0 +1,139 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+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"
+HOMEPAGE="https://ukoethe.github.io/vigra/"
+SRC_URI="https://github.com/ukoethe/vigra/releases/download/Version-${MY_V}/${MY_P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~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
+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-1.8.0:=[mpi?] )
+	jpeg? ( virtual/jpeg:0 )
+	openexr? ( media-libs/openexr:= )
+	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 )"
+
+# 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
+	rm .git* .travis.yml || die
+
+	cmake-utils_src_prepare
+
+	# 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() {
+	vigra_configure() {
+		local libdir="$(get_libdir)"
+
+		local mycmakeargs=(
+			-DAUTOEXEC_TESTS=OFF
+			-DDOCDIR="${BUILD_DIR}/doc"
+			-DDOCINSTALL="share/doc/${P}"
+			-DLIBDIR_SUFFIX="${libdir/lib}"
+			-DUSE_DOC=$(usex doc ON OFF) # unused
+			-DUSE_FFTW3=$(usex fftw ON OFF) # unused
+			-DUSE_JPEG=$(usex jpeg ON OFF) # unused
+			-DUSE_MPI=$(usex mpi ON OFF) # unused
+			-DUSE_PNG=$(usex png ON OFF) # unused
+			-DUSE_TIFF=$(usex tiff ON OFF) # unused
+			-DWITH_HDF5=$(usex hdf5 ON OFF)
+			-DWITH_OPENEXR=$(usex openexr ON OFF)
+			-DWITH_VALGRIND=$(usex valgrind ON OFF)
+			-DWITH_VIGRANUMPY=$(usex python ON OFF)
+			-DBUILD_TESTING=$(usex test ON OFF) # unused
+			-DUSE_AUTOBUILD_TESTS=$(usex test ON OFF) # unused
+			-DUSE_CREATE_CTEST_TARGETS=$(usex test ON OFF) # unused
+		)
+		cmake-utils_src_configure
+	}
+
+	if use python; then
+		python_foreach_impl vigra_configure
+	else
+		# required for docdir
+		_cmake_check_build_dir init
+		vigra_configure
+	fi
+}
+
+src_compile() {
+	local VIGRA_BUILD_DIR
+	vigra_compile() {
+		cmake-utils_src_compile
+		VIGRA_BUILD_DIR="${BUILD_DIR}"
+	}
+	if use python; then
+		python_foreach_impl vigra_compile
+	else
+		vigra_compile
+	fi
+
+	if use doc; then
+		einfo "Generating Documentation"
+		# use build dir from last compile command
+		VARTEXFONTS="${T}/fonts" BUILD_DIR="${VIGRA_BUILD_DIR}" cmake-utils_src_make doc
+	fi
+}
+
+src_install() {
+	if use python; then
+		python_foreach_impl cmake-utils_src_install
+		python_optimize
+	else
+		cmake-utils_src_install
+	fi
+}
+
+src_test() {
+	# perhaps disable tests (see #390447)
+	vigra_test() {
+		PYTHONPATH="${BUILD_DIR}/vigranumpy/vigra" cmake-utils_src_test
+	}
+	if use python; then
+		python_foreach_impl vigra_test
+	else
+		vigra_test
+	fi
+}