gentoo resync : 08.01.2021

4 files changed, 3 insertions, 114 deletions

diff --git a/media-libs/faad2/Manifest b/media-libs/faad2/Manifest
index 51c9f38b1148..28bf68c972a6 100644
--- a/media-libs/faad2/Manifest
+++ b/media-libs/faad2/Manifest
@@ -1,7 +1,3 @@
 DIST faad2-2.10.0.tar.gz 803225 BLAKE2B 73ecbcbb3fce93e8ceb88f6f7669bb681d2329935018cc2a23929cf6672959a0678b47c830cfdcf8e716709ce5252a02178737a7af09de373f7c8b54f38f3d9d SHA512 92c8b5e79f85b7a7caac9e7954959c26d74ef148a658dcb37e2c1b303fc2fcc5a0d12f21e7bd476870498109bdd03916a56c13f578186a69d6eceb103222e771
-DIST faad2-2.9.0.tar.gz 802390 BLAKE2B 8cd68f96a48fefcc4d75901ae67607ec4cc4c4a76efae490dcfb3330b384ff91049894af9fccae0b41ca9fd4ef22cdff35c36f11cea1baab4cc96fe1e54749ae SHA512 1756b2672f9e438a56b11160ddc77fc721d85860eaa325a3ff01b51a2524baf4c1c61068a97cbc4e99d47e7643f10e1d6afb997eede3295b44551fe4661fb5dc
-DIST faad2-2.9.2.tar.gz 803100 BLAKE2B 093c629b81d976db760f02dc7945ae8caee66e2dc6d859499696e4978d4832c9592c2868bed575a39c778fd62f0b74fe5ee3a17b6ab22ec5c148b0dbcd7946c8 SHA512 996c279a56c6abde13da964b91d4ff87ac4c611e889f1dd59882fa3898093dec68ab0714cf106db10a5e24952e2d6dddc049ec9bf4f07ff68378a705d5debee2
-EBUILD faad2-2.10.0.ebuild 1170 BLAKE2B fd78872aa59bd3b07936eab61b431f6be6c3d9eaf4feb6241259a944aa3b5e99bb3b77438bd4c334fc14851433990a6c68d29ccea878cdc3204e5f4dafa86954 SHA512 20f7d74002dd50380367d76bf05679a5f40fb61dffc7fe375dcd407264129ff93c1795a672e6093a99025c4628b5d421a0c5423debd45ff97508a56298462657
-EBUILD faad2-2.9.0.ebuild 1239 BLAKE2B 51468976d855993a95d0b91ecff2478404a5d1f52b11fb5f4a10cd860108355be0971306a093fb2d92162c04e8776c81ebb312ac2b248d392f07f11f405a3a4b SHA512 c43636b72b1c7871b3b195a337cc62407e5367e450ecc59acbc836fdcad7119538afd9e9c0352371e2d2d6b4d9e51cb0366f7f188b1c9217594929892acfe9bf
-EBUILD faad2-2.9.2.ebuild 1174 BLAKE2B cd3eb9cd8c8e1fce5c72fde2bb0791dcd1e779a682f573e6df8c66cd0fc08e6efe91fed76f781c2fb0da173ea87cdb548fe6d2d8d2b5fd439d6198ab7ca119cb SHA512 1d76863099b6103571aa1cf2f112ec3a678cea54594348bb0da78dca76d3118fe0c78c0e0f00af3a18f041b98ec6de1f58be7d17b0c9d6028a1894f062701a6f
+EBUILD faad2-2.10.0.ebuild 1156 BLAKE2B 1448cf2bf914fb6376f91d17db9093eff04b50e1133f17176c41fb3d358e8df219aed365fa3771352a299a6b4761aa3b7b42c09cd1b5a030821caf31b02b3011 SHA512 a081c21fd37e082782042393ebcfede136f496bfddfb26931060ec8be13355576c282ef7097b3ef3486a74ed5303ee8ea3e5a7fe8f10630044af413859bfe71c
 MISC metadata.xml 672 BLAKE2B 7a596dc10b925376781d43d1a3175b213d3ff02443a01d8e5ccc6c30bb12f9bf35961f9270b8316e321eff32e4680d505ffd652dcce32d770477c3137a3e67ce SHA512 d7f0fb4df63e5e0cf15d17044d723f2b94a476fa9efee3907354f7a7de45fe7f623839cfc739e90ab5581101addd86bb950e96e8d34a3fc379e7eecc22c175cf
diff --git a/media-libs/faad2/faad2-2.10.0.ebuild b/media-libs/faad2/faad2-2.10.0.ebuild
index a4d3d4b887f3..e04ebea4a3cd 100644
--- a/media-libs/faad2/faad2-2.10.0.ebuild
+++ b/media-libs/faad2/faad2-2.10.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/knik0/faad2/archive/${MY_PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x86-solaris"
 IUSE="digitalradio static-libs"
 
 RDEPEND=""
diff --git a/media-libs/faad2/faad2-2.9.0.ebuild b/media-libs/faad2/faad2-2.9.0.ebuild
deleted file mode 100644
index 34d597dcbe6d..000000000000
--- a/media-libs/faad2/faad2-2.9.0.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools multilib-minimal
-
-MY_PV=$(ver_rs 1- _)
-
-DESCRIPTION="AAC audio decoding library"
-HOMEPAGE="https://www.audiocoding.com/faad2.html"
-SRC_URI="https://github.com/knik0/faad2/archive/${MY_PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
-IUSE="digitalradio static-libs"
-
-RDEPEND=""
-DEPEND=""
-
-DOCS=( AUTHORS ChangeLog NEWS README TODO )
-
-S="${WORKDIR}/${PN}-${MY_PV}"
-
-src_prepare() {
-	default
-
-	sed -i -e 's:iquote :I:' libfaad/Makefile.am || die
-
-	# bug 466986
-	sed -i 's:AM_CONFIG_HEADER:AC_CONFIG_HEADERS:' configure.ac || die
-
-	eautoreconf
-}
-
-multilib_src_configure() {
-	local myconf=(
-		--without-xmms
-		$(use_with digitalradio drm)
-		$(use_enable static-libs static)
-	)
-
-	ECONF_SOURCE="${S}" econf "${myconf[@]}"
-
-	# do not build the frontend for non default abis
-	if [ "${ABI}" != "${DEFAULT_ABI}" ] ; then
-		sed -i -e 's/frontend//' Makefile || die
-	fi
-}
-
-multilib_src_install_all() {
-	find "${D}" -name '*.la' -delete || die
-	einstalldocs
-}
diff --git a/media-libs/faad2/faad2-2.9.2.ebuild b/media-libs/faad2/faad2-2.9.2.ebuild
deleted file mode 100644
index 4c6a8bef3075..000000000000
--- a/media-libs/faad2/faad2-2.9.2.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools multilib-minimal
-
-MY_PV="$(ver_rs 1- _)"
-
-DESCRIPTION="AAC audio decoding library"
-HOMEPAGE="https://www.audiocoding.com/faad2.html"
-SRC_URI="https://github.com/knik0/faad2/archive/${MY_PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
-IUSE="digitalradio static-libs"
-
-RDEPEND=""
-DEPEND=""
-
-DOCS=( AUTHORS ChangeLog NEWS README TODO )
-
-S="${WORKDIR}/${PN}-${MY_PV}"
-
-src_prepare() {
-	default
-
-	sed -i -e 's:iquote :I:' libfaad/Makefile.am || die
-
-	eautoreconf
-}
-
-multilib_src_configure() {
-	local myconf=(
-		--without-xmms
-		$(use_with digitalradio drm)
-		$(use_enable static-libs static)
-	)
-
-	ECONF_SOURCE="${S}" econf "${myconf[@]}"
-
-	# do not build the frontend for non default abis
-	if [ "${ABI}" != "${DEFAULT_ABI}" ] ; then
-		sed -i -e 's/frontend//' Makefile || die
-	fi
-}
-
-multilib_src_install_all() {
-	find "${ED}" -type f -name '*.la' -delete || die
-	einstalldocs
-}