gentoo auto-resync : 29:11:2023 - 16:55:57

4 files changed, 3 insertions, 58 deletions

diff --git a/media-libs/faad2/Manifest b/media-libs/faad2/Manifest
index dbfa8d167575..9da8a50ddcc3 100644
--- a/media-libs/faad2/Manifest
+++ b/media-libs/faad2/Manifest
@@ -1,6 +1,4 @@
 AUX faad2-2.11.0-check-if-lrintf-is-defined.patch 1583 BLAKE2B 687ada25cdc2bb5bc8e708f19649e19886cba3e956db53856c33e069f3e1dd6948173c88fbd8e9009a7046847285ca1d9a1a8d96c1d337fa865c890f5294658b SHA512 7dce44ade5e32f6d4a5aa8ccf075709a55552b90dfcd7515518a8512b2eca4c917876f5b3098fe66524f32965571e1621e8f99f59ae6e69a1430f42e038027dc
-DIST faad2-2.10.1.tar.gz 803488 BLAKE2B f25bf9242675250b910bd5540487cf708d6e195e1ddca0b27588678e5fbf2bedf9d41e6bc607aa34bb2dbff95a8a4071e74e2f9bd9493ccb7ef040ce9bf81b4c SHA512 8df69278350c68dd770c4bc482e42bc95eb04cd784eeea3f3fc58d615833c8b07dc3c72029bb7e5bfed612b7c1b8daefc9cb57be9789befb587120ef115e55b3
 DIST faad2-2.11.1.tar.gz 657255 BLAKE2B f1e58a5618bdd93ee919f2d77dd461972cf4bc930c4a1738a8b4ec949fd2572ce0662a08ea01a4caca0da5fe007ec119d00184cd76e6f9f98c3141d24a589504 SHA512 b8f17680610b2f47344ea52b54412a02810a85eaf9d4c91b97ca09b2c6415c62d4af1b0771bfcacb9dfee400ed34504c0bd3c28369921c0392b3809e7de46ec5
-EBUILD faad2-2.10.1.ebuild 1120 BLAKE2B 55660b80ffc65d021e1fed17797d87786d6cb915348f43eb529ee445d2dea89c4683a86ab592431fda61ae87fa6ebc49db1ae90d71e3b063016673ce907a4ee4 SHA512 f56c2e485a53239171ad34a2d24578c05595770bbc3d8aeb87954405a0efa4cbb2c5c12e7f4ef43e057814eb87d086e8ee4f8201a3c3eb29a4f9863392a7f09c
-EBUILD faad2-2.11.1.ebuild 697 BLAKE2B 5d05e32e0ca9b24563cbee456fda36487ae065f4c6248c59b305bcee0e8a7b3face05fab9d3bfdd39779e2f9c69a3df6e3588293fbfb1c8b7b6068a44fdb0c07 SHA512 c15b7584102f90340c666cb6c0af20a248f6dd0abf1f4a02b70df5ddb5fbbb988046d8d2639058b5c67bb6a89b1eb90cdb04503f1d80e6f10b4d0f394aa8d5ea
-MISC metadata.xml 673 BLAKE2B 28208bc0cbb71f989bfb9fb82f90115cdb1446ab0414f1ac4a642a83bdf39e6cf7ade76e4d82e583ffb2a9e47e86a2fe8b1416d218a95eacd8886124bb6f3f96 SHA512 294c2ea06d75d6d8f0a803b0c8e28b2b70e1fe05ed7ef1d1ddd515b8e7f829b7a99cb5195a5f4076bf5a4887dce87c424e46517a69efe5e17734594884d7be3c
+EBUILD faad2-2.11.1.ebuild 694 BLAKE2B d80072301e0a096ae17934cce9c6edfcf7e17f385e925da6f7df6c6d1029c83e76deec6f3e3cee7a81e6d5898f7d4cb7219aa6324e162e7b73941d4fe8b045ad SHA512 e1fcc31dd5e0cdc69ec2e5636587db1c9359a9c29b43016b6efa5e991f840c7d4173bec39873c5410bda9f35c14b8a8206f71ff1cfa3815e60c697fc83d86185
+MISC metadata.xml 561 BLAKE2B 49847285881fd84af8e801e538fc7f91a84c196818a50a50b67a77f17ce37a2f5a5b0da675a9f377ab426fca80a1812cb655caf0f96a49edea3565c095b3b762 SHA512 c4006c2800666dd5467ad97a34d048eb135bb47fe25f821044b9531d01d0eb512138287a90507974fc871ff89b30668660097b11328d87859f8247ddd31d812f
diff --git a/media-libs/faad2/faad2-2.10.1.ebuild b/media-libs/faad2/faad2-2.10.1.ebuild
deleted file mode 100644
index 9005b046c9c9..000000000000
--- a/media-libs/faad2/faad2-2.10.1.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools multilib-minimal
-
-DESCRIPTION="AAC audio decoding library"
-HOMEPAGE="https://www.audiocoding.com/faad2.html https://github.com/knik0/faad2/"
-SRC_URI="https://github.com/knik0/faad2/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
-IUSE="digitalradio static-libs"
-
-RDEPEND=""
-DEPEND=""
-
-DOCS=( AUTHORS ChangeLog NEWS README TODO )
-
-src_prepare() {
-	default
-
-	sed -i -e 's:iquote :I:' libfaad/Makefile.am || die
-
-	eautoreconf
-
-	multilib_copy_sources
-}
-
-multilib_src_configure() {
-	local myconf=(
-		--without-xmms
-		$(use_with digitalradio drm)
-		$(use_enable static-libs static)
-	)
-
-	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
-}
diff --git a/media-libs/faad2/faad2-2.11.1.ebuild b/media-libs/faad2/faad2-2.11.1.ebuild
index a74319e02e5b..f9c782bf26dc 100644
--- a/media-libs/faad2/faad2-2.11.1.ebuild
+++ b/media-libs/faad2/faad2-2.11.1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/knik0/faad2/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 
 # no tests
 RESTRICT="test"
diff --git a/media-libs/faad2/metadata.xml b/media-libs/faad2/metadata.xml
index 50bfe6a960b6..77cf9f86a72b 100644
--- a/media-libs/faad2/metadata.xml
+++ b/media-libs/faad2/metadata.xml
@@ -6,9 +6,6 @@
     <name>Gentoo Sound project</name>
   </maintainer>
   <longdescription>The fastest ISO AAC audio decoder available, correctly decodes all MPEG-4 and MPEG-2 MAIN, LOW, LTP, LD and ER object type AAC files</longdescription>
-  <use>
-    <flag name="digitalradio">Digital Radio Mondiale (warning: disables other decoders)</flag>
-  </use>
   <upstream>
     <remote-id type="github">knik0/faad2</remote-id>
     <remote-id type="sourceforge">faac</remote-id>