gentoo resync : 08.10.2021

4 files changed, 4 insertions, 114 deletions

diff --git a/media-sound/mpg123/Manifest b/media-sound/mpg123/Manifest
index dea201a88632..13176df33ec0 100644
--- a/media-sound/mpg123/Manifest
+++ b/media-sound/mpg123/Manifest
@@ -1,7 +1,5 @@
-DIST mpg123-1.28.1.tar.bz2 1066558 BLAKE2B 4516ed6cafda21aaaf132266b91ae235ca0b911a79c4514c0588c030f4f5f2f3923153729f1fc3354cb5fa982ca8dc27ba6cb58fa884da379a8913c8119e8bd2 SHA512 af1fb96878a7b57f62f06445e9b888cbecc569a91fe118459c71415f62287f9d9de9b0d0663522cb181e1a21692d64d0a810d8aebfa6e085eb76926d7a2186f9
 DIST mpg123-1.28.2.tar.bz2 1065867 BLAKE2B 2fc585598e49334b608c2a8487b40b599dc1a57afc53249975a339dbc381b968cc099d4274fb74872d3c4c54d1a6ee1858c4b00c78feb93809c823cc56398661 SHA512 45ac11c5997d13f80917e135a40d2fb4448703dad56271dfe8ce7c8dea339cbac7727ec121779040bd7a07fc4ea79086860ea4a8ec879eda3bdcbf7d57348cda
 DIST mpg123-1.29.0.tar.bz2 1068523 BLAKE2B f044dcdef62156cc34a4709d6ead71042e936d77a86386563862d54d7b18635dd378d4dcac1358228c8275d7bcef894f17432cac0519373d11d4c5f18e346728 SHA512 4261a086395f118f6723d8a3757ebcf5244359be07af634d8bf802e48524978a0974f8b17b423bbf38d262c82ac9e31e0fd5d07a735f63f5e33f58d82dc5fdaf
-EBUILD mpg123-1.28.1-r1.ebuild 2985 BLAKE2B f8336768a984ea5833a8367c5117634c8cb2df08a26dd15347198ccbc8a6ddb7af7823d2159aad3840a2c0a0f0c38a917ace673985c98bdcede043defde6066a SHA512 349beec6a8e9d9c7a2f4762760da91fc4683d956098cf7bb9b230aab601eeb1754f428fbcb141e2cb66f0c834651ad2b6ca64ceecee9b2200f8f449b6912306f
-EBUILD mpg123-1.28.2-r1.ebuild 2994 BLAKE2B bd492a7b8daae68de10d10c23aadceb89c135bbb8c4d7f1d039b4aacc4ca5174cae5f9034ee2a1036c44fb0f46dec2540151eb056b1124971470527988b1e15f SHA512 2280c59a37c5ff30fac9a0c15fae050032cc5a2bcc423c9a2944d44f0b41024e3bd12559110dd33984d8a1954df3e13ad9aa3d4cca4b9b9e0d7e3a0ad5c91e46
-EBUILD mpg123-1.29.0.ebuild 2999 BLAKE2B 49a074e953c393d80541c36a02e2ca1340937b4d844650177316b76662a2b4a47c775ff119f32ad0c65605f1daf554c6e46c985bbf83070961064479c9fea15e SHA512 359623d74681fd7401f131d63094219cb2a1e42fa2fa1a27692c48c432e1929809c5b10f9b9a6d3a97983de05ae4410f176368d39e9c269a10eac264d81447ee
+EBUILD mpg123-1.28.2-r1.ebuild 2992 BLAKE2B 4bb2cafa1ed3c1f69097a953697fe924c675b78d5117dc52d1abcd3b8a9e6fd6b694e791320c9ada6fd6852c478f3a93eb5e810323f59fdd719ec2ad829fba66 SHA512 804e99324bf8c5fbbf870307d8b243733eb09708b0c6a9a6068803f8886219169d7153789f43690e368a0c2fc2ed2ac47ebcf84a67fca035937c202abc5869a4
+EBUILD mpg123-1.29.0.ebuild 2997 BLAKE2B 9075445f0712ee679a65f97cf85cfa0a7d044898c8e2e776e251cb9970f387b8b98343b1308e57231057ec0a4d3e54b4fbfe75ce6f04ddedfb25d83af78649dd SHA512 953077d11d5ee4ed7693e2f99db8e777e48277f43beb6519d03a0f1c247a4e5e5b2046e56c586d5695d39969c873de0fae26be7529a6cf7aa52a542366e2ab40
 MISC metadata.xml 526 BLAKE2B 42eed8f068420cefea4cf3e75a880889be7abe182feec2aa95e0e7f550cf68eb2582460e43500d24b7ad189adb3e0e135da1079efb405957fe3dfc6b93a91ece SHA512 11e572b6ec77d6c971766e666db84ee4b605479c3f89ba639177de7fb109a8d9e38d1f5034a52554736e6bd0915aae84830169ba3580f6d64794adc4c8cb9d0e
diff --git a/media-sound/mpg123/mpg123-1.28.1-r1.ebuild b/media-sound/mpg123/mpg123-1.28.1-r1.ebuild
deleted file mode 100644
index 4afe46cf0ce9..000000000000
--- a/media-sound/mpg123/mpg123-1.28.1-r1.ebuild
+++ /dev/null
@@ -1,108 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit flag-o-matic toolchain-funcs libtool multilib-minimal
-
-DESCRIPTION="a realtime MPEG 1.0/2.0/2.5 audio player for layers 1, 2 and 3"
-HOMEPAGE="https://www.mpg123.org/"
-SRC_URI="https://www.mpg123.org/download/${P}.tar.bz2"
-
-LICENSE="GPL-2 LGPL-2.1"
-SLOT="0"
-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="cpu_flags_x86_3dnow cpu_flags_x86_3dnowext cpu_flags_ppc_altivec alsa coreaudio int-quality ipv6 jack cpu_flags_x86_mmx nas oss portaudio pulseaudio sdl cpu_flags_x86_sse"
-
-# No MULTILIB_USEDEP here since we only build libmpg123 for non native ABIs.
-# Note: build system prefers libsdl2 > libsdl. We could in theory add both
-# but it's tricky when it comes to handling switching between them properly.
-# We'd need a USE flag for both sdl1 and sdl2 and to make them clash.
-RDEPEND="
-	dev-libs/libltdl:0
-	alsa? ( media-libs/alsa-lib )
-	jack? ( virtual/jack )
-	nas? ( media-libs/nas )
-	portaudio? ( media-libs/portaudio )
-	pulseaudio? ( media-sound/pulseaudio )
-	sdl? ( media-libs/libsdl2 )"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	sys-devel/libtool
-	virtual/pkgconfig
-"
-IDEPEND="app-eselect/eselect-mpg123"
-
-DOCS=( AUTHORS ChangeLog NEWS NEWS.libmpg123 README )
-
-src_prepare() {
-	default
-	elibtoolize # for Darwin bundles
-}
-
-multilib_src_configure() {
-	local _audio=dummy
-	local _output=dummy
-	local _cpu=generic_fpu
-
-	# Build fails without -D_GNU_SOURCE like this:
-	# error: ‘struct hostent’ has no member named ‘h_addr’
-	append-cflags -D_GNU_SOURCE
-
-	if $(multilib_is_native_abi) ; then
-		local flag
-		for flag in nas portaudio sdl oss jack alsa pulseaudio coreaudio; do
-			if use ${flag}; then
-				_audio+=" ${flag/pulseaudio/pulse}"
-				_output=${flag/pulseaudio/pulse}
-			fi
-		done
-	fi
-
-	use cpu_flags_ppc_altivec && _cpu=altivec
-
-	if [[ $(tc-arch) == amd64 || ${ARCH} == x64-* ]]; then
-		use cpu_flags_x86_sse && _cpu=x86-64
-	elif use x86 && gcc-specs-pie ; then
-		# Don't use any mmx, 3dnow, sse and 3dnowext
-		# bug #164504
-		_cpu=generic_fpu
-	else
-		use cpu_flags_x86_mmx && _cpu=mmx
-		use cpu_flags_x86_3dnow && _cpu=3dnow
-		use cpu_flags_x86_sse && _cpu=x86
-		use cpu_flags_x86_3dnowext && _cpu=x86
-	fi
-
-	local myconf=(
-		--with-optimization=0
-		--with-audio="${_audio}"
-		--with-default-audio=${_output}
-		--with-cpu=${_cpu}
-		--enable-network
-		$(use_enable ipv6)
-		--enable-int-quality=$(usex int-quality)
-	)
-
-	multilib_is_native_abi || myconf+=( --disable-modules )
-
-	ECONF_SOURCE="${S}" econf "${myconf[@]}"
-
-	if ! $(multilib_is_native_abi) ; then
-		sed -i -e 's:src doc:src/libmpg123:' Makefile || die
-	fi
-}
-
-multilib_src_install_all() {
-	einstalldocs
-	mv "${ED}"/usr/bin/mpg123{,-mpg123}
-	find "${ED}" -type f -name '*.la' -delete || die
-}
-
-pkg_postinst() {
-	eselect mpg123 update ifunset
-}
-
-pkg_postrm() {
-	eselect mpg123 update ifunset
-}
diff --git a/media-sound/mpg123/mpg123-1.28.2-r1.ebuild b/media-sound/mpg123/mpg123-1.28.2-r1.ebuild
index b4af182dace6..b49ebad52d41 100644
--- a/media-sound/mpg123/mpg123-1.28.2-r1.ebuild
+++ b/media-sound/mpg123/mpg123-1.28.2-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://www.mpg123.org/download/${P}.tar.bz2"
 
 LICENSE="GPL-2 LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x86-solaris"
 IUSE="cpu_flags_x86_3dnow cpu_flags_x86_3dnowext cpu_flags_ppc_altivec alsa coreaudio int-quality ipv6 jack cpu_flags_x86_mmx nas oss portaudio pulseaudio sdl cpu_flags_x86_sse"
 
 # No MULTILIB_USEDEP here since we only build libmpg123 for non native ABIs.
diff --git a/media-sound/mpg123/mpg123-1.29.0.ebuild b/media-sound/mpg123/mpg123-1.29.0.ebuild
index 29a2b1f3de75..3b1cbeb24236 100644
--- a/media-sound/mpg123/mpg123-1.29.0.ebuild
+++ b/media-sound/mpg123/mpg123-1.29.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://www.mpg123.org/download/${P}.tar.bz2"
 
 LICENSE="GPL-2 LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 arm ~arm64 ~hppa ~ia64 ~mips ~ppc ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x86-solaris"
 IUSE="cpu_flags_x86_3dnow cpu_flags_x86_3dnowext cpu_flags_ppc_altivec alsa coreaudio int-quality ipv6 jack cpu_flags_x86_mmx nas oss portaudio pulseaudio sdl cpu_flags_x86_sse"
 
 # No MULTILIB_USEDEP here since we only build libmpg123 for non native ABIs.