gentoo resync : 15.12.2019

4 files changed, 76 insertions, 5 deletions

diff --git a/media-libs/libheif/Manifest b/media-libs/libheif/Manifest
index e3fb1b74ef3a..842346ad6fb8 100644
--- a/media-libs/libheif/Manifest
+++ b/media-libs/libheif/Manifest
@@ -1,4 +1,6 @@
 DIST libheif-1.5.1.tar.gz 1510087 BLAKE2B 1dd5e913c8913c6b62b770653585f8ccf7cda14c4dd79ff2073bf085da4d730accaef8d0f8008ac941238a7e3e131add1a218e0c78a886847b3bcf253d66c9b6 SHA512 05e32ebff08d5f0e82e9b1107253c27882ae1694150033fe7b3ca07db8c64567f09002081276e92a3b490a63022a1522d577b094a7f489742139758d17f484b8
-EBUILD libheif-1.5.1.ebuild 1430 BLAKE2B 22f4dc1704f359e3f8dbba6365a9c7c228a959ff59957a96f3a3cf99827bbec8355ef6b9e6f12d8e5f819272cd3233158ce4379965ca54ef01c229a547e3d24a SHA512 ec9eb1aa4c8e071bc237668e50400658059939cfb3bf081dc44686c84cf7a8dcd195bb1ff9ae2ee172e48a44f6b400f60921ea63ce054337e9b48d8587fbd178
-EBUILD libheif-9999.ebuild 1433 BLAKE2B d081d416eda7b42dc78e5d14b25cd4587b9c9052a5ea16f9d5a9d865f7b8e1e88cdbc615f4520ffa7a475e5e5db0ffd2f336b1129ad32e5d8374fc867832fcaa SHA512 c58157d6add0a2160e3b05e4f170706b8b3758a904bc798a1256d5b12c264a66dd94ba01cfa2789e0d35b7315add323d0cbc9781e470590838ba7db5a3998857
+DIST libheif-1.6.0.tar.gz 1512262 BLAKE2B db27c65130250d018d8bce9b793d281b9bc3928ef378f8d3180bd0236e7f92810b08da9aaea227733d533cd871712319da1263a9020c5e2dbcfda20ab13f6978 SHA512 25e3f08663224321a5d7646543787f026c0fc344e1b26c90b7b48247a7c036836112d104f3559b1c3c96c0252b2ce5efaaed456ccd0ae648f70e4055d81f2f00
+EBUILD libheif-1.5.1.ebuild 1457 BLAKE2B 083d8e9034d5c4fd5816047ab2e577978b395a13546e3a2d3a747f09c087feb99df885cddf20a0129c3e574bbe981a59c60bfece141505412358214463a4df92 SHA512 79599b18a58d121ffef9b15842c0faa90792d3821fdd9d54a0b2ed2ab81e6c90880230f96137cd21e406d6b254ce1f0b205401d49d0c3a774b6fc923e4b8ce93
+EBUILD libheif-1.6.0.ebuild 1457 BLAKE2B ffe1ba7266fdcad37f89f49dd1948db5ff432e070e15e13e346e48d965ab889ef6251c121262647e7bd0efbb4f9e5434bf5325f69ef9de528b7f107ea8abd66d SHA512 0910ab4d7fb442cc1502c5cae91bd2b19b09870ac4e4785fbf6ad56d6cb3b02f0c425b61e330bfa7e3dbd5d717ca0f78a6770263c8d530e137f2527898989d42
+EBUILD libheif-9999.ebuild 1457 BLAKE2B ffe1ba7266fdcad37f89f49dd1948db5ff432e070e15e13e346e48d965ab889ef6251c121262647e7bd0efbb4f9e5434bf5325f69ef9de528b7f107ea8abd66d SHA512 0910ab4d7fb442cc1502c5cae91bd2b19b09870ac4e4785fbf6ad56d6cb3b02f0c425b61e330bfa7e3dbd5d717ca0f78a6770263c8d530e137f2527898989d42
 MISC metadata.xml 369 BLAKE2B e85296d149b4ebfe852a79ed951dff87e3586617cac09f2e81bc501f2739599e7fda1835f1d677cd923a1324e4f6d85e4f1552eb0589511372dd603d239880c5 SHA512 70bbaa03beb93f3649271be35d4c90e7d79395efefd0cfb9915525a5c736629bcf56bd66e2d1bbf2a746c62a5f21ddb8874cdf28f61180fe9abc3ad22ab51fc8
diff --git a/media-libs/libheif/libheif-1.5.1.ebuild b/media-libs/libheif/libheif-1.5.1.ebuild
index 9ec9a7f716d2..e737b4ce1e4f 100644
--- a/media-libs/libheif/libheif-1.5.1.ebuild
+++ b/media-libs/libheif/libheif-1.5.1.ebuild
@@ -19,6 +19,7 @@ HOMEPAGE="https://github.com/strukturag/libheif"
 LICENSE="GPL-3"
 SLOT="0/1.5"
 IUSE="static-libs test +threads"
+RESTRICT="!test? ( test )"
 
 BDEPEND="test? ( dev-lang/go )"
 DEPEND="
diff --git a/media-libs/libheif/libheif-1.6.0.ebuild b/media-libs/libheif/libheif-1.6.0.ebuild
new file mode 100644
index 000000000000..cbf2d5eaaaad
--- /dev/null
+++ b/media-libs/libheif/libheif-1.6.0.ebuild
@@ -0,0 +1,67 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+inherit autotools xdg-utils 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 ~arm64 ~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.6"
+IUSE="static-libs test +threads"
+
+RESTRICT="!test? ( test )"
+
+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
+}
+
+pkg_postinst() {
+	xdg_mimeinfo_database_update
+}
+
+pkg_postrm() {
+	xdg_mimeinfo_database_update
+}
diff --git a/media-libs/libheif/libheif-9999.ebuild b/media-libs/libheif/libheif-9999.ebuild
index 0d11fc08e5b2..cbf2d5eaaaad 100644
--- a/media-libs/libheif/libheif-9999.ebuild
+++ b/media-libs/libheif/libheif-9999.ebuild
@@ -17,9 +17,11 @@ DESCRIPTION="ISO/IEC 23008-12:2017 HEIF file format decoder and encoder"
 HOMEPAGE="https://github.com/strukturag/libheif"
 
 LICENSE="GPL-3"
-SLOT="0/1.5"
+SLOT="0/1.6"
 IUSE="static-libs test +threads"
 
+RESTRICT="!test? ( test )"
+
 BDEPEND="test? ( dev-lang/go )"
 DEPEND="
 	media-libs/libde265:=[${MULTILIB_USEDEP}]
@@ -33,8 +35,7 @@ RDEPEND="${DEPEND}"
 src_prepare() {
 	default
 
-	sed -i -e 's:-Werror::' \
-		configure.ac || die
+	sed -i -e 's:-Werror::' configure.ac || die
 
 	eautoreconf