gentoo resync : 18.11.2019

3 files changed, 99 insertions, 0 deletions

diff --git a/media-sound/lame/Manifest b/media-sound/lame/Manifest
index 7a6857a9e6fc..f7954c9fdce3 100644
--- a/media-sound/lame/Manifest
+++ b/media-sound/lame/Manifest
@@ -1,7 +1,9 @@
+AUX lame-3.100-symbols.patch 400 BLAKE2B ebc8b6fdbb7a3f7f0ff2c2be78bf606d7e2251d1463cca7eb7aaa53fc3a8b682d5aed70bdf7d6521cb0fe715733cafb82aa76d8ce9f829933b5c55dc903a01e3 SHA512 ae7376cdaffbafecaa60dbaa08a7ebd73883935e65c7d7d408fb2cdf89ad04411940d2ab6313c80169a940207e9bed33917f88d1ca5bf6d35514e4c5313f330a
 AUX lame-3.96-ccc.patch 813 BLAKE2B 5a8b500555e9430c88487a75473989a37959ed93a30db5e90988648cfe80db2b30f3d4a87c86831033fae953d8b6fb58a0b2de2ec61d6d476cdb228e3aaf9ba5 SHA512 312cb62a6cfdb96c7bda6526f7a493088ec1053869306c4d292a31be80c5a271889348d41ae8681fcbcc11f61415b8029e8f8928e5949db8a28edb0b9657a7db
 AUX lame-3.98-gtk-path.patch 8523 BLAKE2B 9b5231402293a61f8366383a704056e60edbcbb38373ddab52781e9edafb344fce7d8e773e0eb0e59982362dec507f6f560cc18f7128da2d2772f27e79e54b28 SHA512 26e65b231a69142d6bc56bad268126985ed1bc9d14ff943a5374622184efeb78f2a1fd8bb5a3988c8ab8b4e8f10255ad3d91347276f5621d4adfeadc1230e301
 AUX lame-3.99.5-msse.patch 557 BLAKE2B 76b1201e0909ee408a9556ffeb3d41b4bd749407b17ab0dc98582c01b027d492ac6e2f09c8758a59a6bb2649fa1c7a55e96fccab0525b0dcb70b6ea44a034dc0 SHA512 9bf5a1b0f8955aeedff6effcab7f657961ad60ce00b5f455c05ce39ad5b03c2a809ba7225a3a33b61b84a36665fafac53e35b14e0d357289e66194a4f0ef9807
 AUX lame-3.99.5-tinfo.patch 768 BLAKE2B 3fbbd31b0b5752ee4c2dad573d053edcbfb80d24b68a876c2092cae37d3450ac6044ec14d26b180a46197093151d614be8400f33ff7b1f6968130412daacefa5 SHA512 504428e0a0b43c467848296c219ac855ffc9bd83fadb54107e8f6b99290b91bc36457635a092fc121972a3c89918f2d81b42f98f6d007f9b571c7bc3f9c2895e
 DIST lame-3.100.tar.gz 1524133 BLAKE2B 6954d30cfd3951ea07762ba5dd7ff27038b78455f423099a225ebf748abddf9970e444456ca5a6179bd381e2205b32293392cb757c203901674860710fe2c183 SHA512 0844b9eadb4aacf8000444621451277de365041cc1d97b7f7a589da0b7a23899310afd4e4d81114b9912aa97832621d20588034715573d417b2923948c08634b
 EBUILD lame-3.100-r1.ebuild 2105 BLAKE2B e4531b3ab55b89738a81c2fd62f202134ef55929395de7612df961cda81b8e680fb5be002bacb9dc11722d5168a1b5975cf629bbbcb675aa2e7227c26a944056 SHA512 2c5e77d2fe681c742d5da11dec93ae688d29acfb9280a87513989b8100f2e586c6f4daa8662b2da9959b0c6f612daa99333c4bd36308547cf5400f592d84e070
+EBUILD lame-3.100-r2.ebuild 2228 BLAKE2B 685c53fc9ee0914f25ba8bc69b76afe120bcbb1eb20231b8644b175e6c90f162ae4e64d370539dd35a473b81cfb5c040222cb2ce2a3383a23c06fcc33a25678d SHA512 19707a01db95bbec816a3b7d971881b2435a2c46bcef927b83b38f7b0db454bb1642bc6ab7dc6664394b5a39140993d0d8eb49f2477973cc6e80402a2de900ca
 MISC metadata.xml 542 BLAKE2B 726f3dfefda9c1905739448f1a3124e05ddc90e261d147da12a7839185ef3eeb440678d185510a6bdd4bb71ab987b7a24f52ed108f7c646ca6b651434f9fade1 SHA512 8fc2e2658ae34d146894786f1c66800eecf818e2bd9bb807c6b32a8e132340c1568e9f47220be3daaabce2ab6e1e1d5aa817157f2c0131ed01944abbab6593fb
diff --git a/media-sound/lame/files/lame-3.100-symbols.patch b/media-sound/lame/files/lame-3.100-symbols.patch
new file mode 100644
index 000000000000..eb3a3b54dc93
--- /dev/null
+++ b/media-sound/lame/files/lame-3.100-symbols.patch
@@ -0,0 +1,16 @@
+--- lame-3.100/include/libmp3lame.sym	2017-09-06 14:33:35.000000000 -0500
++++ lame-3.100/include/libmp3lame.sym	2017-10-22 16:18:44.708436200 -0500
+@@ -1,5 +1,4 @@
+ lame_init
+-lame_init_old
+ lame_set_num_samples
+ lame_get_num_samples
+ lame_set_in_samplerate
+@@ -188,6 +187,7 @@ hip_decode_exit
+ hip_set_errorf
+ hip_set_debugf
+ hip_set_msgf
++hip_set_pinfo
+ hip_decode
+ hip_decode_headers
+ hip_decode1
diff --git a/media-sound/lame/lame-3.100-r2.ebuild b/media-sound/lame/lame-3.100-r2.ebuild
new file mode 100644
index 000000000000..b0ad4bce4411
--- /dev/null
+++ b/media-sound/lame/lame-3.100-r2.ebuild
@@ -0,0 +1,81 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit autotools multilib-minimal
+
+DESCRIPTION="LAME Ain't an MP3 Encoder"
+HOMEPAGE="http://lame.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+IUSE="debug cpu_flags_x86_mmx +frontend mp3rtp sndfile static-libs"
+
+# These deps are without MULTILIB_USEDEP and are correct since we only build
+# libmp3lame for multilib and these deps apply to the lame frontend executable.
+RDEPEND="
+	frontend? (
+		>=sys-libs/ncurses-5.7-r7:0=
+		sndfile? ( >=media-libs/libsndfile-1.0.2 )
+	)
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	sys-devel/gettext
+	virtual/pkgconfig
+	cpu_flags_x86_mmx? ( dev-lang/nasm )
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-3.96-ccc.patch
+	"${FILESDIR}"/${PN}-3.98-gtk-path.patch
+	"${FILESDIR}"/${PN}-3.99.5-tinfo.patch
+	"${FILESDIR}"/${PN}-3.99.5-msse.patch
+	"${FILESDIR}"/${PN}-3.100-symbols.patch #662752
+)
+
+src_prepare() {
+	default
+
+	mkdir libmp3lame/i386/.libs || die #workaround parallel build with nasm
+
+	sed -i -e '/define sp/s/+/ + /g' libmp3lame/i386/nasm.h || die
+
+	use cpu_flags_x86_mmx || sed -i -e '/AC_PATH_PROG/s:nasm:dIsAbLe&:' configure.in #361879
+
+	mv configure.{in,ac} || die
+	AT_M4DIR=. eautoreconf
+}
+
+multilib_src_configure() {
+	# Only build the frontend for the default ABI.
+	local myconf=(
+		--disable-mp3x
+		--enable-dynamic-frontends
+		$(multilib_native_use_enable frontend)
+		$(multilib_native_use_enable mp3rtp)
+		$(multilib_native_usex sndfile '--with-fileio=sndfile' '')
+		$(use_enable debug debug norm)
+		$(use_enable static-libs static)
+		$(usex cpu_flags_x86_mmx '--enable-nasm' '') #361879
+	)
+
+	ECONF_SOURCE="${S}" econf "${myconf[@]}"
+}
+
+multilib_src_install() {
+	emake \
+		DESTDIR="${D}" \
+		pkghtmldir="${EPREFIX}/usr/share/doc/${PF}/html" \
+		install
+}
+
+multilib_src_install_all() {
+	dodoc API ChangeLog HACKING README STYLEGUIDE TODO USAGE
+	docinto html
+	dodoc misc/lameGUI.html Dll/LameDLLInterface.htm
+
+	find "${D}" -name '*.la' -type f -delete || die
+}