gentoo resync : 16.06.2019

3 files changed, 68 insertions, 6 deletions

diff --git a/media-libs/libheif/Manifest b/media-libs/libheif/Manifest
index d32bc441c333..f478911066cd 100644
--- a/media-libs/libheif/Manifest
+++ b/media-libs/libheif/Manifest
@@ -1,5 +1,7 @@
 AUX libheif-1.3.2-openjpeg-2.patch 2512 BLAKE2B 165576cb3da35534a9e628f3dfb3c47b52718109ffb3582acfde093a22284053fd1e7986216f670491652f1362011409888084b37a79777e393002b1d9ea7237 SHA512 c8bb96ef7091d2f0e46bbe61e05a30e8a3e93f7b5925d45a30a045cac39e26000c04166d5ea0417ebf530b8bff5992de0b46ca112041e1aa87ecf7eb5928e844
 DIST libheif-1.3.2.tar.gz 1328174 BLAKE2B 4c0f82bb90d48f89a4ce9aed525c5823bb5d008e54e580e761f6fa4f5493f265929a0607e7b81046ba7c249bd2ca21a0c5ab91da83b7e7f3a2a63e8f24df88ed SHA512 bcc8b4b2522ef6fe68f5a9ffd5312c2c8f6bc3718394eef1860e199c30fb735bb214f665ed6480b5f5fe5d578b3ed77a4301af93775ae2349ba5038b3f3ef63a
+DIST libheif-1.4.0.tar.gz 1366030 BLAKE2B a93b3b59a4f89e0aa5a5069fdebc54b9d09adeeff05ebf28b9535baa2fb26e4122b4c5d96b7015fdd181720f10e3dd0887038f0c5567c94509aa76d2ef119dd9 SHA512 fc48caaadb71ffa87227de75c9e13d5006c66f1c966ce454552defb8947999f5242a9bbd1413f58be1ccbf61df7f118defe96d67376e3b4e7b12fe5dfa0fe0c7
 EBUILD libheif-1.3.2-r1.ebuild 1247 BLAKE2B 5c420043fad3797adcdddbe1604f6264a110596495edb2a74bc8ad6eefed7ea985fd5f11d0e3901c442132f6423e0853086bddbde9203d1f79185f222eec91c0 SHA512 cf43868c006597926163c7a095248c375a09f4bf33406a9d6e7b2819f8536a48ac76f413635ac4b380a884d43bc2f3f47a2a0c49162084d776e07b731876c0c1
-EBUILD libheif-9999.ebuild 1325 BLAKE2B b13d52b4593ca62e796208564edb6a6696e86bfe3d0539ca74277027de4d9db7b89867667fb29b9af1f5eed8c583d337b34ed6a4083292ba681963b5ed871fe1 SHA512 ede20f379e5807387acd892472f8190e7ba71a522b027e1297a37bd722832bff6125ad43a94ce5e0ee6d33ec5beb80b1e93793e27e5d2550c8e83f4db24f9504
+EBUILD libheif-1.4.0.ebuild 1318 BLAKE2B 1b48eff2e13cef37b2fb31e9d816f0bd6d1e19bc293ca330c7d93b328699b6537da93aa508ab80d21920918a95227b7ae3d5da36e0989a935603041983c855e5 SHA512 3366e8ec40259561bc5b6a76a6c0093ae56c8b9fb10c0bd48b25eff0f3abcf4585754ab5af2ec37b416dc614f89a733554df29d3f643d9f097476b4ed8f9c565
+EBUILD libheif-9999.ebuild 1318 BLAKE2B 1b48eff2e13cef37b2fb31e9d816f0bd6d1e19bc293ca330c7d93b328699b6537da93aa508ab80d21920918a95227b7ae3d5da36e0989a935603041983c855e5 SHA512 3366e8ec40259561bc5b6a76a6c0093ae56c8b9fb10c0bd48b25eff0f3abcf4585754ab5af2ec37b416dc614f89a733554df29d3f643d9f097476b4ed8f9c565
 MISC metadata.xml 369 BLAKE2B e85296d149b4ebfe852a79ed951dff87e3586617cac09f2e81bc501f2739599e7fda1835f1d677cd923a1324e4f6d85e4f1552eb0589511372dd603d239880c5 SHA512 70bbaa03beb93f3649271be35d4c90e7d79395efefd0cfb9915525a5c736629bcf56bd66e2d1bbf2a746c62a5f21ddb8874cdf28f61180fe9abc3ad22ab51fc8
diff --git a/media-libs/libheif/libheif-1.4.0.ebuild b/media-libs/libheif/libheif-1.4.0.ebuild
new file mode 100644
index 000000000000..a03be0af6d3d
--- /dev/null
+++ b/media-libs/libheif/libheif-1.4.0.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+inherit autotools multilib-minimal
+
+if [[ ${PV} == "9999" ]] ; then
+	EGIT_REPO_URI="https://github.com/strukturag/${PN}.git"
+	inherit git-r3
+else
+	SRC_URI="https://github.com/strukturag/${PN}/releases/download/v${PV}/${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+DESCRIPTION="ISO/IEC 23008-12:2017 HEIF file format decoder and encoder"
+HOMEPAGE="https://github.com/strukturag/libheif"
+
+LICENSE="GPL-3"
+SLOT="0/1.4"
+IUSE="static-libs test +threads"
+
+BDEPEND="test? ( dev-lang/go )"
+DEPEND="
+	media-libs/libde265:=[${MULTILIB_USEDEP}]
+	media-libs/libpng:0=[${MULTILIB_USEDEP}]
+	media-libs/x265:=[${MULTILIB_USEDEP}]
+	sys-libs/zlib:=[${MULTILIB_USEDEP}]
+	virtual/jpeg:0=[${MULTILIB_USEDEP}]
+"
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+	default
+
+	sed -i -e 's:-Werror::' \
+		configure.ac || die
+
+	eautoreconf
+
+	# prevent "stat heif-test.go: no such file or directory"
+	multilib_copy_sources
+}
+
+multilib_src_configure() {
+	local myeconfargs=(
+		$(use_enable threads multithreading)
+		$(use_enable static-libs static)
+	)
+	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
+}
+
+multilib_src_install_all() {
+	find "${ED}" -name '*.la' -delete || die
+	if ! use static-libs ; then
+		find "${ED}" -name "*.a" -delete || die
+	fi
+}
diff --git a/media-libs/libheif/libheif-9999.ebuild b/media-libs/libheif/libheif-9999.ebuild
index d9ed4b630621..a03be0af6d3d 100644
--- a/media-libs/libheif/libheif-9999.ebuild
+++ b/media-libs/libheif/libheif-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
@@ -17,17 +17,16 @@ DESCRIPTION="ISO/IEC 23008-12:2017 HEIF file format decoder and encoder"
 HOMEPAGE="https://github.com/strukturag/libheif"
 
 LICENSE="GPL-3"
-SLOT="0/1.3.9999"
-IUSE="static-libs +threads"
+SLOT="0/1.4"
+IUSE="static-libs test +threads"
 
-# Doesn't yet support libjpeg-turbo-2, https://github.com/strukturag/libheif/issues/70
+BDEPEND="test? ( dev-lang/go )"
 DEPEND="
 	media-libs/libde265:=[${MULTILIB_USEDEP}]
 	media-libs/libpng:0=[${MULTILIB_USEDEP}]
 	media-libs/x265:=[${MULTILIB_USEDEP}]
 	sys-libs/zlib:=[${MULTILIB_USEDEP}]
 	virtual/jpeg:0=[${MULTILIB_USEDEP}]
-	!>=media-libs/libjpeg-turbo-2
 "
 RDEPEND="${DEPEND}"
 
@@ -38,6 +37,9 @@ src_prepare() {
 		configure.ac || die
 
 	eautoreconf
+
+	# prevent "stat heif-test.go: no such file or directory"
+	multilib_copy_sources
 }
 
 multilib_src_configure() {