gentoo resync : 28.04.2021

4 files changed, 2 insertions, 146 deletions

diff --git a/media-libs/libheif/Manifest b/media-libs/libheif/Manifest
index 033277b7f2d9..57846edc45a6 100644
--- a/media-libs/libheif/Manifest
+++ b/media-libs/libheif/Manifest
@@ -1,8 +1,4 @@
-DIST libheif-1.10.0.tar.gz 1681115 BLAKE2B d9dc8c630f76d0f8df33e644fbbd589a92aab62927b72f7cc49b0ac9b65141979250c7fecbc4f119d62e5cc4386803580bff10accb3a0a4a04aa9c74ada9a146 SHA512 85550afe4d2c4a0af16213f51b7c9e9478f87199941d125aa7622ee42e5473a2344f3460d9c684b1805d45f903a98b77b4081f539d5b8c445fbf9443c8341629
 DIST libheif-1.11.0.tar.gz 1680855 BLAKE2B a85ed643bd05cd59a34e9e42c0b8690fc779c06d01aa4925b177c1a36e7a4d11c9dfa798295c9b8215f45802e80119f2a8f5c3876103818c5436358416d97dd8 SHA512 1a5d54a09a5dc581a054052bac4299f7c96ca121650e9238312c426d5261247ce6af1840088b8717c5a53d212b7ec17bfaa109b9245abfaebf1603eaeb77b0ed
-DIST libheif-1.9.1.tar.gz 1556450 BLAKE2B 5829afbde9c8ad8d7a2ed46e736d17e84dc6f5f2c4deccd1647c3048588fb8bdec96764a31e7801aac81d5f0a3f1c3e1474b8bd5e2d4d84236ef07478e62933e SHA512 a41ff9666877904da095c72af743b56196c75ce90deaeb1998be7eba9729a62282827e7e916e2a067489cc78e558c55fbb6d70da6a5b5281f6d2efcccbe6dbbe
-EBUILD libheif-1.10.0.ebuild 1832 BLAKE2B 9ca2ae7db0359ce08c1438d21853c274fae7c9b4264a8579c4faa352db5193d17d4db51c838b18497b8152a772da4df34439e401896a995bb7cee416a009d6d2 SHA512 bca081a5dd7c953b914e58ea9fc48091a1c8eb3110b468d132b63633b2a9481890e8d3004b6d1176e11b21dccdc8d22c33f1d30296ed2417e733bca38dc10592
-EBUILD libheif-1.11.0.ebuild 1833 BLAKE2B 0d7fc59c209a62e3437d30a21ad587cf74a6b32f12a71349132a380ab4ba62e31a20564c3ffad60c9ed307b20d75e222c1e93a7b76624f4a07147e8d387fbb87 SHA512 b525e20e676dc64b9e798671bf52035188e16e893cca79722b350ac31057e223b32cded88ceafaf52a94290b6341ed65109de9324806008575ab28a07ee6478b
-EBUILD libheif-1.9.1.ebuild 1594 BLAKE2B 32fcf5315081f5aa4437c88de45393c2965a391f0d37fde470f3527d8ce5a5c346088ce0e119672cafc4788eced325c7eb415f4252a16d455995249636f38912 SHA512 45026b98d6cab726bea57cc32b16ac5ee535c1b56355f75108cb5c3e566a7df07d74caa566deb8baf3046803c69c35ed71626d07dbe7676ef0a9a4c5b8cfbdbf
+EBUILD libheif-1.11.0.ebuild 1829 BLAKE2B 79717765460165bad32b30e4e6ad000cc5436b516c62415e1b4d8d885fa03f894394f5b2e9e60114f2b0d3edfed335ee5c5de1ceb01f09bd2fbeb2cc3e29bc5e SHA512 cec879361ba3869c151da18a27059055d17466fb49bcb3d88121c8aa940b36bcd08e4ad2c9c684cfcb87db1800af23b61dbaca3d02ecdbf39a1843056c96a496
 EBUILD libheif-9999.ebuild 1833 BLAKE2B 0d7fc59c209a62e3437d30a21ad587cf74a6b32f12a71349132a380ab4ba62e31a20564c3ffad60c9ed307b20d75e222c1e93a7b76624f4a07147e8d387fbb87 SHA512 b525e20e676dc64b9e798671bf52035188e16e893cca79722b350ac31057e223b32cded88ceafaf52a94290b6341ed65109de9324806008575ab28a07ee6478b
 MISC metadata.xml 1038 BLAKE2B c04c4e8ef4df16a22ab34e87ab9142f00243aec2e471a17645ae74b9159ab7092c396cb65131c762ab5b102bf510b3859f4a9e36870cb10d254614ba8fcdce95 SHA512 fad35ef040ebf936350bf75195aae4a8ceb42472f5243b5e3e6afa170a5a9d4c4f2e6fb93d6674c13e27051261f210f24b155f6f666f3a9af896726906280d31
diff --git a/media-libs/libheif/libheif-1.10.0.ebuild b/media-libs/libheif/libheif-1.10.0.ebuild
deleted file mode 100644
index 1dbb452f4a4d..000000000000
--- a/media-libs/libheif/libheif-1.10.0.ebuild
+++ /dev/null
@@ -1,73 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools xdg multilib-minimal
-
-if [[ ${PV} == *9999 ]] ; then
-	EGIT_REPO_URI="https://github.com/strukturag/libheif.git"
-	inherit git-r3
-else
-	SRC_URI="https://github.com/strukturag/libheif/releases/download/v${PV}/${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 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.10"
-IUSE="+aom gdk-pixbuf go libde265 rav1e test +threads x265"
-REQUIRED_USE="test? ( go libde265 )"
-RESTRICT="!test? ( test )"
-
-BDEPEND="test? ( dev-lang/go )"
-DEPEND="
-	media-libs/dav1d:=[${MULTILIB_USEDEP}]
-	media-libs/libpng:0=[${MULTILIB_USEDEP}]
-	sys-libs/zlib:=[${MULTILIB_USEDEP}]
-	virtual/jpeg:0=[${MULTILIB_USEDEP}]
-	aom? ( >=media-libs/libaom-2.0.0:=[${MULTILIB_USEDEP}] )
-	gdk-pixbuf? ( x11-libs/gdk-pixbuf[${MULTILIB_USEDEP}] )
-	go? ( dev-lang/go )
-	libde265? ( media-libs/libde265:=[${MULTILIB_USEDEP}] )
-	rav1e? ( media-video/rav1e:= )
-	x265? ( media-libs/x265:=[${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() {
-	export GO111MODULE=auto
-	local econf_args=(
-		--disable-static
-		$(multilib_is_native_abi && use go || echo --disable-go)
-		$(use_enable aom)
-		$(use_enable libde265)
-		$(use_enable gdk-pixbuf)
-		$(use_enable rav1e)
-		$(use_enable threads multithreading)
-		$(use_enable x265)
-	)
-	ECONF_SOURCE="${S}" econf "${econf_args[@]}"
-}
-
-multilib_src_test() {
-	default
-	emake -C go test
-}
-
-multilib_src_install_all() {
-	einstalldocs
-	find "${ED}" -name '*.la' -delete || die
-}
diff --git a/media-libs/libheif/libheif-1.11.0.ebuild b/media-libs/libheif/libheif-1.11.0.ebuild
index f85c234173f7..8b2e59db0e89 100644
--- a/media-libs/libheif/libheif-1.11.0.ebuild
+++ b/media-libs/libheif/libheif-1.11.0.ebuild
@@ -10,7 +10,7 @@ if [[ ${PV} == *9999 ]] ; then
 	inherit git-r3
 else
 	SRC_URI="https://github.com/strukturag/libheif/releases/download/v${PV}/${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+	KEYWORDS="amd64 arm arm64 ~ppc64 x86"
 fi
 
 DESCRIPTION="ISO/IEC 23008-12:2017 HEIF file format decoder and encoder"
diff --git a/media-libs/libheif/libheif-1.9.1.ebuild b/media-libs/libheif/libheif-1.9.1.ebuild
deleted file mode 100644
index 49f02ffbc2bb..000000000000
--- a/media-libs/libheif/libheif-1.9.1.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools xdg multilib-minimal
-
-if [[ ${PV} == "9999" ]] ; then
-	EGIT_REPO_URI="https://github.com/strukturag/libheif.git"
-	inherit git-r3
-else
-	SRC_URI="https://github.com/strukturag/libheif/releases/download/v${PV}/${P}.tar.gz"
-	KEYWORDS="amd64 ~arm arm64 ~ppc64 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.9"
-IUSE="gdk-pixbuf go static-libs test +threads"
-REQUIRED_USE="test? ( go )"
-
-RESTRICT="!test? ( test )"
-
-BDEPEND="test? ( dev-lang/go )"
-DEPEND="
-	>=media-libs/libaom-2.0.0:=[${MULTILIB_USEDEP}]
-	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}]
-	gdk-pixbuf? ( x11-libs/gdk-pixbuf[${MULTILIB_USEDEP}] )
-	go? ( dev-lang/go )
-"
-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 econf_args=(
-		$(multilib_is_native_abi && use go || echo --disable-go)
-		$(use_enable gdk-pixbuf)
-		$(use_enable static-libs static)
-		$(use_enable threads multithreading)
-	)
-	ECONF_SOURCE="${S}" econf "${econf_args[@]}"
-}
-
-multilib_src_test() {
-	default
-	emake -C go test
-}
-
-multilib_src_install_all() {
-	find "${ED}" -name '*.la' -delete || die
-}