gentoo resync : 25.11.2020

3 files changed, 112 insertions, 2 deletions

diff --git a/media-sound/mpg123/Manifest b/media-sound/mpg123/Manifest
index aec476515232..273ddef90a0c 100644
--- a/media-sound/mpg123/Manifest
+++ b/media-sound/mpg123/Manifest
@@ -1,7 +1,9 @@
 DIST mpg123-1.25.10.tar.bz2 921219 BLAKE2B 04bfbe8915e3943ed42cc2d3597b0bd9c4686f77ee699f5845e7d1e905022206724cf23d6b0420a36e64b232f840dd9367f46f3c00dc2fe6256f44e8b83fa5b2 SHA512 a33666ae4aca7e7c1a93a6414d8c525ec19044c54f712d578180147d88e63033f7af2370b9ad22960cc3a0b454f15967b7a831cccc97e034c8855f70cdf1ab09
 DIST mpg123-1.25.13.tar.bz2 910176 BLAKE2B c7881fdfda1d2b5acf27c2bd8b2a25329708b481a500a29b4a6ca89d2fc849c05fa25d35b85782b0d430437853013dba23c3b1519f9e299106317c31786302ba SHA512 2308a899f47eb0d17a603cb8a19ea07b1f338d85d9c2f798fb55732d77c603802e18b6ca0215cc59ccdd70fe89816c09fd16a6a91b1d1cd3834bd7877239cb39
 DIST mpg123-1.26.2.tar.bz2 1047437 BLAKE2B 31b3434968fe48c81f599a9aa23557937ac71ed485c6c933f40f1ef2fdfaabcf8c34059de7f62e163286036db987932b6fcbf4f63f752c64659c9b9a805cf63c SHA512 aa63fcb08b243a1e09f7701b3d84a19d7412a87253d54d49f014fdb9e75bbc81d152a41ed750fccde901453929b2a001585a7645351b41845ad205c17a73dcc9
+DIST mpg123-1.26.3.tar.bz2 1046915 BLAKE2B 791fbeb1638b5df8c7c8c6aaa5bf534ff05fac684d10f0f70e5fb1d4bcd59e906c7023926e3a1c1ac5c5622aab7cc50349b24fb6781c79a9d013f38dce77938e SHA512 7574331afaecf3f867455df4b7012e90686ad6ac8c5b5e820244204ea7088bf2b02c3e75f53fe71c205f9eca81fef93f1d969c8d0d1ee9775dc05482290f7b2d
 EBUILD mpg123-1.25.10-r1.ebuild 2840 BLAKE2B b5fc0883aef5242b4cddfc142cb6eaea54b11a3cac3ae4ee891e32bbeda4abfda304bb76c2c55dc2d88aadbd3555e2b2639a09294d40114e432403af75c956e8 SHA512 321fbcaf8be4780387f8af4451bb8c18863c64cd8686596d9657738be8cf5a76ecc4fedc89ecd1380bd7f671ac669800ab56f889305ca3d504808dd5081481f9
-EBUILD mpg123-1.25.13.ebuild 2883 BLAKE2B a4ad4f83a516e57cf4181987fa4d59ca0680fe609b9477085e514a4227f82a819476489178db12e4caee26144416e6f73b3841f8741476a74135f61ff4e22e29 SHA512 1f9ded3f159a9bd6fbc85e1871d410d6919fde7c6cae3f069ec77c9dad3043f866cd74ab5ebd60868bbe2043f3e95f095154461821b7fb159a22125018f1bfde
+EBUILD mpg123-1.25.13.ebuild 2882 BLAKE2B 6df742a1cda39743d832103757aa2792896122bf9aeb32b9ed057f7aa633069fe561cf07b1758ddbc82cb5894bcb5aa1252ac149a9d92560b653423ef7173ab2 SHA512 d5ee996bc7d276f9fc9440b85a9c8dc3a46b8b36b9b4ad3244ed89e10dc3b38dee78caa692c05d3ee81ba9c7762fbf7d8abbcc5ada6f318d3a335278d2159347
 EBUILD mpg123-1.26.2.ebuild 2890 BLAKE2B 7a3c28e701250569588b10a9bab6ad3f07d6cb49a63f9daed89d690d80f49bf8a38978a8a7afe30e3575edef046d32695043debdc9bdcf96d66332a4064bf24a SHA512 43d3327264a67f9be02c5b33aca99fa6a00084fd9fe167594465643a6ebd6c380da688ae3d75f14e07eb1d57b61fc00c20ba6b0e9d88eacd74a3aa18155131c2
+EBUILD mpg123-1.26.3.ebuild 2890 BLAKE2B 7a3c28e701250569588b10a9bab6ad3f07d6cb49a63f9daed89d690d80f49bf8a38978a8a7afe30e3575edef046d32695043debdc9bdcf96d66332a4064bf24a SHA512 43d3327264a67f9be02c5b33aca99fa6a00084fd9fe167594465643a6ebd6c380da688ae3d75f14e07eb1d57b61fc00c20ba6b0e9d88eacd74a3aa18155131c2
 MISC metadata.xml 525 BLAKE2B 8604e161c32fb1f812a3f90d0489983289dc1db8ffc3dd259ea2cc2d8bbbf14a99448619f881c88f25188434efc903d399498126aceba9aa14e21094aa23dfa7 SHA512 06621f91056d0eb4131385dd430c15839c943d6560c59b711508064a8141020b795d0f7193f884365092332c4b3464dd0cd493e921519c9eab8b7ea4d9ce03b7
diff --git a/media-sound/mpg123/mpg123-1.25.13.ebuild b/media-sound/mpg123/mpg123-1.25.13.ebuild
index 6476f6e637a5..a3bb45a165b6 100644
--- a/media-sound/mpg123/mpg123-1.25.13.ebuild
+++ b/media-sound/mpg123/mpg123-1.25.13.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 ~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 ~x86-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.26.3.ebuild b/media-sound/mpg123/mpg123-1.26.3.ebuild
new file mode 100644
index 000000000000..0b76cb7da365
--- /dev/null
+++ b/media-sound/mpg123/mpg123-1.26.3.ebuild
@@ -0,0 +1,108 @@
+# Copyright 1999-2020 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 ~x86-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 )
+
+pkg_setup() {
+	# Build fails without -D_GNU_SOURCE like this:
+	# error: ‘struct hostent’ has no member named ‘h_addr’
+	append-cflags -D_GNU_SOURCE
+}
+
+src_prepare() {
+	default
+	elibtoolize # for Darwin bundles
+}
+
+multilib_src_configure() {
+	local _audio=dummy
+	local _output=dummy
+	local _cpu=generic_fpu
+
+	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
+	elif use x86-macos ; then
+		# ASM doesn't work quite as expected with the Darwin linker
+		_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
+}