gentoo resync : 22.10.2018

5 files changed, 142 insertions, 68 deletions

diff --git a/media-libs/openexr/Manifest b/media-libs/openexr/Manifest
index f39daae45863..87fa5a85786f 100644
--- a/media-libs/openexr/Manifest
+++ b/media-libs/openexr/Manifest
@@ -1,4 +1,3 @@
-AUX openexr-1.7.0-gcc43.patch 235 BLAKE2B 050fea24922fcda2eade967e13121c146306ce53f687e49b6b4a299d4bb08e2a002729ee50bf0a5bfdc93d1a6c8761b33933c4ac803c90b018608f91a13e1f52 SHA512 a19adcf1a8dec253f8577f5905775ea56dc5d2de4edc454a71ec86fda8cadd10a31e473db2341a203ee49b22c5bb06d75b010077ad44766cdbaa9f56b5f6859c
 AUX openexr-2.2.0-CVE-2017-9110-to-9116-security-fixes.patch 2871 BLAKE2B dcc0f9feda88f101e039973d4664df32fa9269794fffdb8686d4197b90615d8b75853ad97813d31a3aabd67589951341a45ebe258e7a9431250b90693939d3dd SHA512 c24365be8c645586efacbd8983a7ccaebb1452afd0fbb45b0e12e77e1442b2d27e19bf155745eeb05b214831f7c081c1f5967d7502bc13c4b53e01ea0e0b9e65
 AUX openexr-2.2.0-Fix-typo-in-C-bindings.patch 649 BLAKE2B ded357550fa531da4288c13d0c0a402bf3c73b53dd028474efe5436b5e22393059d94858ebf9b79760e953b93acd597698baec29406be15cc4ed0f666de5ffb4 SHA512 17ce63c9ad2c39606af83886db34fec3baafe2f9816dd2f6f0189e3caab0015910f89f8eb261a49d8ccb495d36b268b148ce09e2172a7b516b4832fdc8e84fea
 AUX openexr-2.2.0-Install-missing-header-files.patch 1929 BLAKE2B 9695d1c5294d312b5551522044d838db8c19e2a46d970b392ebb2d2889ea1c54f765f3195ce9b1df42b9ac7586a6569e9621b039dde5ab562b0bce5b74a9f33b SHA512 b6d1bb5a37bdf2283da8f45b71f3a8830a96437f2459746c5d354cecaaceee5e35ba3e3cf247e3c5c6f7930490233672542d8f7aaa59b79593d209e66eac8421
@@ -6,14 +5,15 @@ AUX openexr-2.2.0-fix-build-system.patch 17897 BLAKE2B 95f44167ce0590ee591a7b7de
 AUX openexr-2.2.0-fix-config.h-collision.patch 1556 BLAKE2B d7366aeae2a4d5b5496815d844de90c381d3a514dde0e37f86d2b2c5a8fe11eb3631aa44a554a5390cd2a43700cc8a36ff88af4a0e894c4774c45edf0129c4c5 SHA512 15d654f9e1546ea32a6175b1cce24ed9d979afe7dd763ca53a17c1020ca8851c31cc3b8fc0e4ef31722ead91557e24a67958ca9ee5fd0fa4e574304c3153be33
 AUX openexr-2.2.0-fix-cpuid-on-abi_x86_32.patch 2536 BLAKE2B 7eb4db8596cd157f30ba7be564f776598cfa0d893dbaf8f729e8041079e851b0272ba595298e10792a5c74c14b21fbea78a4157d9494501f2c1ca5ef946dc6af SHA512 530088a51d97039e951055361526b8afa2c322351971d26302d21ddd6fdf2d21682df0577872be608b8cd0c3d3fc05792d871e7c724546be42bfa439e74bb726
 AUX openexr-2.2.0-use-ull-for-64-bit-literals.patch 1934 BLAKE2B 616f29857b5cd95c21bfba22ed7df51b1fab88476836eecee08a1befea4f82303ce35bc00eab34762d6cbba660851356198420e6a96092b8eb0a630829d3f132 SHA512 b799c5924bf8dba468236f4d43feab8ca7d8a88444595f2355671337f38d2868957d1372385000c36ed7ae74499925060d402ef9a82a352ea85dc7378cde21e2
-DIST openexr-1.7.0.tar.gz 13542910 BLAKE2B f187aa1b7c703bc912bfc87eb6f9d44f1ed08dcfd466cff46845afd1e338c5cd518da54628a9cd96c08dc796aaf6f35d5a4188ac7c3db3d2cdb8bc20a70edaf0 SHA512 1fb033f909961a9778b762241e09946d19c7e75bbade7b5a942bb159eec3af9200afd722c3170165ad4b1fa602d9dbe6938112aad1716e7c7e6b8c37ee3980e0
+AUX openexr-2.3.0-fix-build-system.patch 2381 BLAKE2B 37fd9c6ae5357ffb93fd47344137b4c91110a79ab2b685ac048109192f87e41f01aaa0a0fbee222bfa10ffdc58340d7c803b3068bca8bf99c323dfe46252597d SHA512 36889880813acf75a77d3d34ea3f0a6535ca45194ad491bec17df3701d1eabd2bb03d81c525ba96cf695e91ec67abeb1b2395cfa45ff0767d90b4600d63e768a
 DIST openexr-2.0.1.tar.gz 12609335 BLAKE2B 25adcf5a679a0419a7ff0ddd29d4d1c5f1c28cd3fd6c81b0a5c0cc63d907e741eaea378f4ebaa9a66afce0349edf7231ebd2bb3e493aee484860c89f05f45960 SHA512 b35e3e795496f9d4a56352c907bcffef14ae062b189c4e1df35f3ab08c5e9abf829fa9149db3198d60088fa9633816650011e5f7871e07324801b95549d6695b
 DIST openexr-2.1.0.tar.gz 13680816 BLAKE2B 2d3cb4e0419160b07f1efe9a853f1d5deeb0499da4f79da201fc5eb1f57102891da666e161b2d8ec43a6f0b6ff6f5c7b92c2baae51a808892691182290192992 SHA512 d69924331c3392b8063229391414bb90f16ce317c76cfffe5fe0fcbb25e576f6ace8320b51c2a9987fee912cedd8e69116d4b49ba716b4a5f011131a81815403
 DIST openexr-2.2.0.tar.gz 14489661 BLAKE2B fae3c5a255e8bf5121561687e9d704d7de3657eb38295ff96db6ddad240391379a6624483abbe619f80f0979fd9828992d236e55b5014916d4d39d6ff51d0815 SHA512 017abbeeb6b814508180721bc8e8940094965c4c55b135a198c6bcb109a04bf7f72e4aee81ee72cb2185fe818a41d892b383e8d2d59f40c673198948cb79279a
-EBUILD openexr-1.7.0.ebuild 1181 BLAKE2B 13e1628151f4bdb52e961338990b2fba921fd09570c0763327685a16c80337eb81f029d00d0d064a74337f22e31f99ea56f9e280988965df8bfb44a7faaa6d27 SHA512 69d3ec9b799f7b5c09d5d9df76a234929334a2ca9ea95dc2903b62475b53e5ebe8ed06615c59f0a79885eb18311c4b042d3ff8c384a618a9fae3029e6e91ca34
+DIST openexr-2.3.0.tar.gz 18412067 BLAKE2B c73c4db4e414010ed8cc9f9631f3e8b17f47edf89b4ecb459aa00ff54a316b3bb1489e332bc029e0917ac4ffe7e152082244102029fd375f183da6741788dab7 SHA512 003f5bb3bd010be1ad9ff1798643ef711c683c8191625fe9b59070c9cb0c649c277cd506d890c6b239d9cbab80e83e16f1c1d1d74117c916ee3a80e061953123
 EBUILD openexr-2.0.1-r1.ebuild 1255 BLAKE2B 23d26effb4996d82e843a5811fbbf2e609ba93a5383eb3844e4c53253c9748a915a08df1cfcedfa4393d695e000ec201eb92cd022b9fe9d607f3b78ea993dfdf SHA512 e46119eb545d174f1565746600df038e0028340f59f7670e1c0975a9b7a4c4a266a80970dccba054041b0bad31a98763b8aa5d4b9db32f83e65679e3fb0bab83
 EBUILD openexr-2.1.0.ebuild 1256 BLAKE2B 0c8154e2bf910e9d3994c28f9a29f725efc1c677d1a587162e6766d24e6f6ac7d0ab7fd98b46d5ea3103321d12de217678d4de97ab555733af8e99cb1aed97fb SHA512 c5a8158b4ebb432479f7edfb39b41d3742d0bcd3cca4782dac1bfa1b4aaa6191355dc0a4b2a5c643874c19829c2118052ef1841975b6f7c97ee23542dd3063fd
 EBUILD openexr-2.2.0-r1.ebuild 1578 BLAKE2B fd0dc90294f80362a6575e445a6510efa7f218566b97869dbc9f12c6187e3b0be0cfb24aebb2460925b40bced9bdb42b058974a9789d4c775494a6257f16cc2f SHA512 830f0c476b53b59bec9e65e0859c1623425a0b3a5bdd5081c1cf62be9f274b452c373e8ed2e7b4d6b92d8a20c9f477bdac9a80f604d3d8866ccdfac3a924849c
 EBUILD openexr-2.2.0-r2.ebuild 1862 BLAKE2B 2ddcfb899e3213db76211cbacf9fe7afa597ac0fece9ec4655e390fd6501a5cb15f3553d374408d748c2a4364b519f15f71e82af7d93402736b9c1c245b50266 SHA512 028067478c69a1eade6bda177b734f6530de91e6350e9057aadef4028c0a5c3cc5ca8989186fe59c9b9075d9d17e119e7b53d3713acc29228af52100250a9fda
 EBUILD openexr-2.2.0.ebuild 1248 BLAKE2B e4926afffcbf1f64891ed5ebdae8d4ab5895ffde3d79e3a29eeef121d8214c4c1528ccaaef62e35830b09bd1f54d1ceafd0b62d3652cff76160d7ce155e26955 SHA512 1af7a2a6c95ddd32b1688495b65954982974fa5cb3c0374ee16d6f89f049191a14a7e79fd6fdbefc8cf25ba67e0450e684015798325f2258982528909ee2ed9d
+EBUILD openexr-2.3.0.ebuild 1933 BLAKE2B ec44faffda4f70c5a9964dc09d6ec2e3c068fcb6463524d64a3cd0613e48d9f3b8250d3a9b8f7a05414b9df506de67c90df08c24dcc1b71a83306eb4d738180a SHA512 502493e8c7793954b4255b7f6e73835c068a70287ada74f2a21bc42377830258e0420400276808d8c21a0ecb00ac5cdcae1aa4d9cc5747b492e64eb390773add
 MISC metadata.xml 303 BLAKE2B 53fb5019bd6fe939d485f1eccb4a140ca9b7ce121b06744d8155842ccb6c5e1378ea39a9ae74c8d519be7b3926bd76040df4b8107137fcc2e25be97431e7a1be SHA512 0ab8d735dd7a8e0dc96b14cfde1ae06969d15cfbad956f4fda60b093660aee38fe98709376eedc9362a26858678d2f28eec795c1accb2560858fd804a11bb7ca
diff --git a/media-libs/openexr/files/openexr-1.7.0-gcc43.patch b/media-libs/openexr/files/openexr-1.7.0-gcc43.patch
deleted file mode 100644
index ab99eb9a19fb..000000000000
--- a/media-libs/openexr/files/openexr-1.7.0-gcc43.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- exrenvmap/blurImage.cpp
-+++ exrenvmap/blurImage.cpp
-@@ -39,6 +39,8 @@
- //
- //-----------------------------------------------------------------------------
- 
-+#include <cstring>
-+
- #include <blurImage.h>
- 
- #include <resizeImage.h>
diff --git a/media-libs/openexr/files/openexr-2.3.0-fix-build-system.patch b/media-libs/openexr/files/openexr-2.3.0-fix-build-system.patch
new file mode 100644
index 000000000000..811a7af38758
--- /dev/null
+++ b/media-libs/openexr/files/openexr-2.3.0-fix-build-system.patch
@@ -0,0 +1,68 @@
+diff --git a/configure.ac b/configure.ac
+index 067f9d0..fdbe2f8 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -13,8 +13,7 @@ AC_SUBST(OPENEXR_VERSION_API, ${OPENEXR_VERSION_MAJOR}_${OPENEXR_VERSION_MINOR})
+ AC_CANONICAL_HOST
+ AC_CONFIG_SRCDIR(IlmImfTest/main.cpp)
+ AC_CONFIG_HEADERS([config/OpenEXRConfig.h])
+-AM_INIT_AUTOMAKE(1.6.3)  dnl Require automake 1.6.3 or better
+-AM_MAINTAINER_MODE
++AM_INIT_AUTOMAKE
+ 
+ 
+ LIBTOOL_CURRENT=24
+@@ -28,7 +27,7 @@ AC_PROG_CXX
+ AC_PROG_INSTALL
+ AC_PROG_CC
+ AC_PROG_LN_S
+-AC_PROG_LIBTOOL
++LT_INIT
+ AC_PROG_MAKE_SET
+ 
+ dnl
+@@ -58,8 +57,8 @@ AM_PATH_PKGCONFIG(
+     [ILMBASE])
+ 
+ dnl Define the version string
+-AC_DEFINE_UNQUOTED([OPENEXR_VERSION_STRING], "${VERSION}", [OpenEXR version string])
+-AC_DEFINE_UNQUOTED([OPENEXR_PACKAGE_STRING], "${PACKAGE_STRING}", [OpenEXR version string])
++AC_DEFINE_UNQUOTED([OPENEXR_VERSION_STRING], ["${VERSION}"], [OpenEXR version string])
++AC_DEFINE_UNQUOTED([OPENEXR_PACKAGE_STRING], ["${PACKAGE_STRING}"], [OpenEXR version string])
+ AC_DEFINE_UNQUOTED([OPENEXR_VERSION_MAJOR], [${OPENEXR_VERSION_MAJOR}], [OpenEXR version string])
+ AC_DEFINE_UNQUOTED([OPENEXR_VERSION_MINOR], [${OPENEXR_VERSION_MINOR}], [OpenEXR version string])
+ AC_DEFINE_UNQUOTED([OPENEXR_VERSION_PATCH], [${OPENEXR_VERSION_PATCH}], [OpenEXR version string])
+@@ -110,16 +109,7 @@ AC_ARG_ENABLE(threading,
+               [multithread="${enableval}"], [multithread=yes])
+ 
+ AS_IF([test "x${multithread}" != xno], [
+-	ACX_PTHREAD(
+-    [
+-      AC_DEFINE(OPENEXR_IMF_HAVE_PTHREAD)
+-      ILMBASE_LIBS="$PTHREAD_LIBS $ILMBASE_LIBS"
+-      ILMBASE_CXXFLAGS="$ILMBASE_CXXFLAGS $PTHREAD_CFLAGS"
+-      CC="$PTHREAD_CC"
+-
+-      AM_POSIX_SEM()
+-    ],
+-    [AC_MSG_ERROR([POSIX thread support required])])
++	AX_PTHREAD
+ 
+ 	AC_DEFINE([OPENEXR_IMF_HAVE_PTHREAD], [1], [Define if pthreads are available])
+ 
+@@ -195,15 +185,6 @@ dnl AC_MSG_RESULT($complete_iomanip)
+ dnl AC_LANG_RESTORE
+ AC_DEFINE([OPENEXR_IMF_HAVE_COMPLETE_IOMANIP], [1], [Define when std::right is available])
+ 
+-AC_MSG_CHECKING(for gcc optimization flags)
+-old_cflags=$CFLAGS
+-CFLAGS="$CFLAGS -pipe"
+-AC_TRY_COMPILE([#include <stdio.h>],
+-[ printf ("hello, world"); ],
+-[ EXTRA_OPT_CFLAGS="-pipe"],[ EXTRA_OPT_CFLAGS=""])
+-CFLAGS=$old_cflags
+-AC_MSG_RESULT([$EXTRA_OPT_CFLAGS])
+-
+ 
+ dnl Check to see if the toolset supports AVX instructions in inline asm
+ AC_ARG_ENABLE([avx],
diff --git a/media-libs/openexr/openexr-1.7.0.ebuild b/media-libs/openexr/openexr-1.7.0.ebuild
deleted file mode 100644
index ac9a2a1e958b..000000000000
--- a/media-libs/openexr/openexr-1.7.0.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=2
-inherit eutils libtool
-
-DESCRIPTION="ILM's OpenEXR high dynamic-range image file format libraries"
-HOMEPAGE="http://openexr.com/"
-SRC_URI="http://download.savannah.gnu.org/releases/openexr/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 -arm hppa ia64 ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd"
-IUSE="examples static-libs"
-
-RDEPEND="sys-libs/zlib
-	>=media-libs/ilmbase-1.0.2"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-src_prepare() {
-	sed -i \
-		-e "s:/var/tmp/:${T}:" \
-		IlmImfTest/tmpDir.h || die # Fix path for testsuite
-
-	epatch "${FILESDIR}"/${P}-gcc43.patch
-
-	elibtoolize
-}
-
-src_configure() {
-	econf \
-		--disable-dependency-tracking \
-		$(use_enable static-libs static) \
-		$(use_enable examples imfexamples)
-}
-
-src_install() {
-	emake \
-		DESTDIR="${D}" \
-		docdir="/usr/share/doc/${PF}/pdf" \
-		examplesdir="/usr/share/doc/${PF}/examples" \
-		install || die
-
-	dodoc AUTHORS ChangeLog NEWS README
-
-	if use examples; then
-		dobin IlmImfExamples/imfexamples || die
-	else
-		rm -rf "${D}"/usr/share/doc/${PF}/examples
-	fi
-
-	find "${D}" -name '*.la' -delete
-}
diff --git a/media-libs/openexr/openexr-2.3.0.ebuild b/media-libs/openexr/openexr-2.3.0.ebuild
new file mode 100644
index 000000000000..99f63d05e1f9
--- /dev/null
+++ b/media-libs/openexr/openexr-2.3.0.ebuild
@@ -0,0 +1,71 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit autotools flag-o-matic toolchain-funcs multilib-minimal
+
+DESCRIPTION="ILM's OpenEXR high dynamic-range image file format libraries"
+HOMEPAGE="http://openexr.com/"
+SRC_URI="https://github.com/openexr/openexr/releases/download/v${PV}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/24" # based on SONAME
+KEYWORDS="~amd64 -arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x86-solaris"
+IUSE="cpu_flags_x86_avx examples static-libs"
+
+RDEPEND="
+	>=media-libs/ilmbase-${PV}:=[${MULTILIB_USEDEP}]
+	sys-libs/zlib[${MULTILIB_USEDEP}]
+"
+DEPEND="${RDEPEND}
+	>=sys-devel/autoconf-archive-2016.09.16
+	virtual/pkgconfig[${MULTILIB_USEDEP}]
+"
+
+DOCS=( AUTHORS ChangeLog NEWS README.md )
+MULTILIB_WRAPPED_HEADERS=( /usr/include/OpenEXR/OpenEXRConfig.h )
+
+PATCHES=(
+	"${FILESDIR}/${PN}-2.2.0-fix-cpuid-on-abi_x86_32.patch"
+	"${FILESDIR}/${PN}-2.2.0-fix-config.h-collision.patch"
+	"${FILESDIR}/${PN}-2.2.0-Install-missing-header-files.patch"
+	"${FILESDIR}/${P}-fix-build-system.patch"
+)
+
+src_prepare() {
+	default
+	# Fix path for testsuite
+	sed -i -e "s:/var/tmp/:${T}:" IlmImfTest/tmpDir.h || die
+	eautoreconf
+}
+
+multilib_src_configure() {
+	local myeconfargs=(
+		--disable-imffuzztest
+		--disable-imfhugetest
+		--enable-threading
+		$(use_enable cpu_flags_x86_avx avx)
+		$(use_enable examples imfexamples)
+		$(use_enable static-libs static)
+	)
+
+	# TODO: check if this still applies on updates!
+	# internal tool dwaLookup fails to run when linked with gold linker
+	tc-ld-disable-gold
+
+	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
+}
+
+multilib_src_install_all() {
+	einstalldocs
+
+	if use examples; then
+		docompress -x /usr/share/doc/${PF}/examples
+	else
+		rm -rf "${ED%/}"/usr/share/doc/${PF}/examples || die
+	fi
+
+	# package provides .pc files
+	find "${D}" -name '*.la' -delete || die
+}