gentoo resync : 17.07.2021

4 files changed, 6 insertions, 112 deletions

diff --git a/media-sound/mpg123/Manifest b/media-sound/mpg123/Manifest
index dcdd3b1fea31..cfd1687e49b8 100644
--- a/media-sound/mpg123/Manifest
+++ b/media-sound/mpg123/Manifest
@@ -1,8 +1,7 @@
-DIST mpg123-1.27.2.tar.bz2 1067102 BLAKE2B 14da616ffd9e798f07f8eaa00080a1a5ff8cf3c3c7436cc83c8f2264317a30a88ee98ddd0ac077c43672887daff447bf10d287be72a5c7d1a4d5580c90e68298 SHA512 b1c7de0c1b1d14cce3b3ba72e7454b7ce392443a3eaace0431381f1871e2fda1470b8efd07176057f8bf76d88f14c2b7ffae470ba34a3271c7e779277b86d6c0
 DIST mpg123-1.28.0.tar.bz2 1063321 BLAKE2B a4fa37ac9c3aca867ac4f18eea9c2d39ed80c7e86908b2f5399da8ae82c2e4b57c1a041f17427702da14af9902051ce4de5a85497f7236963ae390ef8715327a SHA512 4e333ee4f3bbebcfff280cf286265e969a8da93b9043d03c0189e22cd40918b07bf12181bd06141d4479c78bc0d0ed472e0d3bb61b2fdb96fe9f7cd48f9a6b77
 DIST mpg123-1.28.1.tar.bz2 1066558 BLAKE2B 4516ed6cafda21aaaf132266b91ae235ca0b911a79c4514c0588c030f4f5f2f3923153729f1fc3354cb5fa982ca8dc27ba6cb58fa884da379a8913c8119e8bd2 SHA512 af1fb96878a7b57f62f06445e9b888cbecc569a91fe118459c71415f62287f9d9de9b0d0663522cb181e1a21692d64d0a810d8aebfa6e085eb76926d7a2186f9
-EBUILD mpg123-1.27.2.ebuild 2753 BLAKE2B 129900b38d6e5464f19aec88b4b2894feff3d8c6023230f93c63e1fa5954658de8c9aafc10f1fa1b1dc2c70347667557576d9ecc0ef9e612aed17190ce31317e SHA512 67a19b872805005f14f719468c97ade3b94a2220e95dcced877e79b807dbf4826acf3c5f3673e9ffd644261d4cb28e4decb35be50de3d94bab71a77f444f698f
-EBUILD mpg123-1.28.0-r1.ebuild 2764 BLAKE2B bcc28d43dc1a60fa5e3cded8c387e35cb0e960ef52acb602956ce714bb3a2690815ec80948e9966b301bb07acda4309318fce8b74c46b738c247ddffd00f527d SHA512 ba5345fd2f5c3147cde4dc39250ae15c09f399a06489cddcdfcc3213e13ed20255be2605b71060ee558e455f62563101e93bc735c2a6b94e796304d0bdff5d06
-EBUILD mpg123-1.28.0.ebuild 2760 BLAKE2B 71996cbe978df08d7a2eaa45ed95a71649eef62dd1ee89b878e44fadbfef173718f3ddbdba8e98109cb5cee4d46ad8dbeb144a1b90197af68c131f543f086745 SHA512 3031dc355f017f04dbe2bdc9337e7d1db250ea0fc09dd92e1816ef08615e679edee70e8f8b2dc54ebb42a953ea97200e72e6841525616831f97431c7411419b6
+DIST mpg123-1.28.2.tar.bz2 1065867 BLAKE2B 2fc585598e49334b608c2a8487b40b599dc1a57afc53249975a339dbc381b968cc099d4274fb74872d3c4c54d1a6ee1858c4b00c78feb93809c823cc56398661 SHA512 45ac11c5997d13f80917e135a40d2fb4448703dad56271dfe8ce7c8dea339cbac7727ec121779040bd7a07fc4ea79086860ea4a8ec879eda3bdcbf7d57348cda
+EBUILD mpg123-1.28.0-r1.ebuild 2762 BLAKE2B d04be49750a688f21f4696b5649f5330b0832a09375475537072675473bb59d8a3a424b5c3e68141d8f21815e3ed019b3d1048b6a8d2aa005ca6511fe2a9bde3 SHA512 b9b74309aed772b7bb4984786c7c0635b6d5dec56033a1fc176549be55b7b36d24abbc21d3e69dca8417a99da56b23d36000489fa2e6951f266af21103342114
 EBUILD mpg123-1.28.1.ebuild 2769 BLAKE2B fa730d6ba2f282f774b3de5e0fcb61ae4ec04c7431c61a02fc38da1496032c49fd7bbab296801a6778954ee91bf88625c803022c62ca4aabb199ad91410fc82d SHA512 76bbbe89ffd5f8d0cbcd7ce8f07acff4ec19e9ead7ca3130372e75719595c68de2c1adf8b529018200c6f9a6f8b052b102b996bf7560676d293e469a98aa7eb3
+EBUILD mpg123-1.28.2.ebuild 2769 BLAKE2B fa730d6ba2f282f774b3de5e0fcb61ae4ec04c7431c61a02fc38da1496032c49fd7bbab296801a6778954ee91bf88625c803022c62ca4aabb199ad91410fc82d SHA512 76bbbe89ffd5f8d0cbcd7ce8f07acff4ec19e9ead7ca3130372e75719595c68de2c1adf8b529018200c6f9a6f8b052b102b996bf7560676d293e469a98aa7eb3
 MISC metadata.xml 525 BLAKE2B 8604e161c32fb1f812a3f90d0489983289dc1db8ffc3dd259ea2cc2d8bbbf14a99448619f881c88f25188434efc903d399498126aceba9aa14e21094aa23dfa7 SHA512 06621f91056d0eb4131385dd430c15839c943d6560c59b711508064a8141020b795d0f7193f884365092332c4b3464dd0cd493e921519c9eab8b7ea4d9ce03b7
diff --git a/media-sound/mpg123/mpg123-1.27.2.ebuild b/media-sound/mpg123/mpg123-1.27.2.ebuild
deleted file mode 100644
index 4d8fe02781d3..000000000000
--- a/media-sound/mpg123/mpg123-1.27.2.ebuild
+++ /dev/null
@@ -1,105 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-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.
-RDEPEND="
-	app-eselect/eselect-mpg123
-	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/libsdl )"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	sys-devel/libtool
-	virtual/pkgconfig
-"
-
-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.0-r1.ebuild b/media-sound/mpg123/mpg123-1.28.0-r1.ebuild
index 5ea1d218bc53..b43f88f17c22 100644
--- a/media-sound/mpg123/mpg123-1.28.0-r1.ebuild
+++ b/media-sound/mpg123/mpg123-1.28.0-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 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-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="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.28.0.ebuild b/media-sound/mpg123/mpg123-1.28.2.ebuild
index b8286510b25f..9d14cfb3dbb9 100644
--- a/media-sound/mpg123/mpg123-1.28.0.ebuild
+++ b/media-sound/mpg123/mpg123-1.28.2.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 inherit flag-o-matic toolchain-funcs libtool multilib-minimal
 
@@ -16,7 +16,6 @@ IUSE="cpu_flags_x86_3dnow cpu_flags_x86_3dnowext cpu_flags_ppc_altivec alsa core
 
 # No MULTILIB_USEDEP here since we only build libmpg123 for non native ABIs.
 RDEPEND="
-	app-eselect/eselect-mpg123
 	dev-libs/libltdl:0
 	alsa? ( media-libs/alsa-lib )
 	jack? ( virtual/jack )
@@ -29,6 +28,7 @@ BDEPEND="
 	sys-devel/libtool
 	virtual/pkgconfig
 "
+IDEPEND="app-eselect/eselect-mpg123"
 
 DOCS=( AUTHORS ChangeLog NEWS NEWS.libmpg123 README )