From: Lars Wendler <polynomial-c@gentoo.org>
Date: Thu, 15 Mar 2018 08:27:40 +0000 (+0100)
Subject: media-sound/lame: Don't install mlame script
X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=de2c52788dc9a6881830eca97da7e3499ea34219;p=gentoo.git

media-sound/lame: Don't install mlame script

It uses mlame_corr binary that gets never built, only works on little endian
machines and fails to recognize all wav files.
Also overhauled the ebuild a bit. Committed straight to stable.

Closes: https://bugs.gentoo.org/650542
Package-Manager: Portage-2.3.24, Repoman-2.3.6
---

diff --git a/media-sound/lame/lame-3.100.ebuild b/media-sound/lame/lame-3.100-r1.ebuild
similarity index 82%
rename from media-sound/lame/lame-3.100.ebuild
rename to media-sound/lame/lame-3.100-r1.ebuild
index 50c2f1cf6963..3639535b0578 100644
--- a/media-sound/lame/lame-3.100.ebuild
+++ b/media-sound/lame/lame-3.100-r1.ebuild
@@ -46,33 +46,29 @@ src_prepare() {
 }
 
 multilib_src_configure() {
+	# Only build the frontend for the default ABI.
 	local myconf=(
-		$(use_enable static-libs static)
-		$(use_enable debug debug norm)
 		--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
 	)
-	use cpu_flags_x86_mmx && myconf+=( --enable-nasm ) #361879
-
-	# Only build the frontend for the default ABI.
-	if [ "${ABI}" = "${DEFAULT_ABI}" ] ; then
-		myconf+=( $(use_enable mp3rtp) $(use_enable frontend) )
-		use sndfile && myconf+=( --with-fileio=sndfile )
-	else
-		myconf+=( --disable-frontend --disable-mp3rtp )
-	fi
 
 	ECONF_SOURCE="${S}" econf "${myconf[@]}"
 }
 
 multilib_src_install() {
-	emake DESTDIR="${D}" pkghtmldir="${EPREFIX}/usr/share/doc/${PF}/html" install
+	emake \
+		DESTDIR="${D}" \
+		pkghtmldir="${EPREFIX}/usr/share/doc/${PF}/html" \
+		install
 }
 
 multilib_src_install_all() {
-	cd "${S}"
-	dobin misc/mlame
-
 	dodoc API ChangeLog HACKING README STYLEGUIDE TODO USAGE
 	docinto html
 	dodoc misc/lameGUI.html Dll/LameDLLInterface.htm