Bump to 3.98.2, bug 238443. Drop a bunch of patches that were merged upstream.

Package-Manager: portage-2.2_rc8/cvs/Linux 2.6.25.8 i686

3 files changed, 92 insertions, 12 deletions

diff --git a/media-sound/lame/ChangeLog b/media-sound/lame/ChangeLog
index 41bd246e185e..dcd8ad030906 100644
--- a/media-sound/lame/ChangeLog
+++ b/media-sound/lame/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-sound/lame
 # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/lame/ChangeLog,v 1.101 2008/08/08 08:29:25 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/lame/ChangeLog,v 1.102 2008/09/23 22:46:29 loki_val Exp $
+
+*lame-3.98.2 (23 Sep 2008)
+
+  23 Sep 2008; Peter Alfredsen <loki_val@gentoo.org> +lame-3.98.2.ebuild:
+  Bump to 3.98.2, bug 238443. Drop a bunch of patches that were merged
+  upstream.
 
   08 Aug 2008; Alexis Ballier <aballier@gentoo.org>
   +files/lame-3.98-echo.patch, lame-3.98.ebuild:
diff --git a/media-sound/lame/Manifest b/media-sound/lame/Manifest
index fcda7e7be720..b6877996b731 100644
--- a/media-sound/lame/Manifest
+++ b/media-sound/lame/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX lame-3.96-ccc.patch 658 RMD160 c598ad66543cc63897e0212e220a436da563ee71 SHA1 1e291ea8dbde132a22760a5279abe624e2835fae SHA256 60f0a60a72711827222cbb2d934a285199a62f9899e84097f851a53c61c4e6dd
 AUX lame-3.96.1-asneeded.patch 9027 RMD160 5456182576a331feb00d1d8931ba598e37f08804 SHA1 16ca5409f6710e3bf061f1fc3e339a0b265ac8a8 SHA256 6f9874c2f79c129a6d0d8d59d5887e8dbceff4a4bad2ad0b35987dc7d3f09809
 AUX lame-3.96.1-shared-frontend.patch 483 RMD160 bbcd78d61c25a92cdbcc04f10cf11f1a455846a2 SHA1 f2c7442d84e3d437e3c5d76064cf3e960ea6fad7 SHA256 b4b62098d61bc4e252b03abaea2f92d812ba0a8b16bb5fdf45d4b926e6c8c417
@@ -11,15 +8,10 @@ AUX lame-3.98-pic-fix.patch 14804 RMD160 443e4b1fc6a54be4d2c356ea7b4cc857f26b2a1
 AUX lame-3.98-shared-frontend.patch 1008 RMD160 8e12e752a325926e1376e45ffd3b72cac61ebf4a SHA1 af371fe673e42c4ba2e6e07255d6196d76d8ef79 SHA256 fb40bfb00e47964acbe0de428cc7a3e4b3a0e0ade120bf547891bf78031f6916
 AUX lame-3.98-stdint.patch 651 RMD160 84a732f356ac05941d90c2a261f9d624fc38bc5b SHA1 b4ebe2a3e8c343180b7d82e2bd2edb81a7c0d1bd SHA256 2fc25342cf5b5d5fd465c76f7899b0276e6e9f21b948f6005de0724a35dcc567
 DIST lame-3.97.tar.gz 1328058 RMD160 5c4cf02c0f4e10c4cd2ab610d62478b554cd0873 SHA1 acf56065f4e31ce023b0f99002d537adb1ec09df SHA256 0a2334a6d11085298a9a3c46d5d310cca012f2e61d6efae90840a76a364dbe17
+DIST lame-398-2.tar.gz 1327643 RMD160 767dd94271eef221170469535db2bf388149715a SHA1 b2db41dbc9c0824caa102e8c932b820c79ccd5ec SHA256 a17a28569d8ed1e514915c1f12bdf4eedac506e5fbdf9a429ba97d5d42c9af32
 DIST lame-398.tar.gz 1415983 RMD160 754343791ac80d2403291c63f99eb409bca6b62f SHA1 287979d076834882c99d0cc01ddbd9b3697ceaae SHA256 8396bcb425ddcbfb8027d5712fa8878a2257006ccbe3ac7a772e1652e43d19b1
 EBUILD lame-3.97-r1.ebuild 2344 RMD160 0a9a1f527ff190af4be8537e005f228c7bca6de2 SHA1 7b8e6829846de017788b86605bedcc46590261f5 SHA256 0562fbf1fe90d783f9f04eff7b5adfabd5b0bf1865f28826852b48086f114604
+EBUILD lame-3.98.2.ebuild 2498 RMD160 6d2b30cca9a817338e7f171a3e1c48667be7d3dd SHA1 f22171aedddcf1585e871ba99f63fa3fce4033b9 SHA256 d551713905185b5c15e6d035a4967f9469f6c1bd9b29fee123986966d4950b51
 EBUILD lame-3.98.ebuild 2902 RMD160 96fcb761eee2c8eb7fa949322b07ec00df8a94c6 SHA1 3c381588959be200767347551612f7fdd03565fa SHA256 0d216b33806d272c7da57298978e75772b41633467a0a8cfda745382d83128b2
-MISC ChangeLog 14147 RMD160 4a18f9a688198d95b92996b706ea3a00463eba29 SHA1 2b2f1b070cacd07532067f7251320a2321238290 SHA256 c89c10afb2bf4c7c7a61c416270b5f3b0ea70dbb1e03ffcee209d542d4af1831
+MISC ChangeLog 14333 RMD160 4a2af50f713542c21fe86def8019e1b17bad3a13 SHA1 8f64508e68c951b4c2656b2dce517459edb5f5bb SHA256 ce11092bd1eb302d684db9eab11e50682010024976251d0346c3b83cb1d5d7d2
 MISC metadata.xml 264 RMD160 a6be36fe4dffbf9280e34fafcf40571d0f960580 SHA1 7e6bff4996ab638c7e04e31197d3b45f9752c00f SHA256 69ff3c8176be87b9e058cf261280c392e026742616602914b8ee3e3b6eaa2280
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.9 (GNU/Linux)
-
-iEYEARECAAYFAkicA+sACgkQvFcC4BYPU0p7tgCfScYZ2PinZPD3T/Rfbcc6WEL/
-EEQAn1veeDm16TTdpemY1SkiPIeN3n7n
-=uqHa
------END PGP SIGNATURE-----
diff --git a/media-sound/lame/lame-3.98.2.ebuild b/media-sound/lame/lame-3.98.2.ebuild
new file mode 100644
index 000000000000..c70e14a1619b
--- /dev/null
+++ b/media-sound/lame/lame-3.98.2.ebuild
@@ -0,0 +1,82 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/lame/lame-3.98.2.ebuild,v 1.1 2008/09/23 22:46:29 loki_val Exp $
+
+inherit flag-o-matic toolchain-funcs eutils autotools versionator
+
+DESCRIPTION="LAME Ain't an MP3 Encoder"
+HOMEPAGE="http://lame.sourceforge.net"
+
+MY_PV=$(replace_version_separator 1 '')
+[ ${MY_PV/.} = ${MY_PV} ] || MY_PV=$(replace_version_separator 1 '-' ${MY_PV})
+S=${WORKDIR}/${PN}-${MY_PV}
+SRC_URI="mirror://sourceforge/${PN}/${PN}-${MY_PV}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd"
+IUSE="debug mmx mp3rtp sndfile"
+
+RDEPEND=">=sys-libs/ncurses-5.2
+	sndfile? ( >=media-libs/libsndfile-1.0.2 )"
+DEPEND="${RDEPEND}
+	dev-util/pkgconfig
+	mmx? ( dev-lang/nasm )"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	# The frontened tries to link staticly, but we prefer shared libs
+	epatch "${FILESDIR}"/${PN}-3.98-shared-frontend.patch
+
+	# If ccc (alpha compiler) is installed on the system, the default
+	# configure is broken, fix it to respect CC.  This is only
+	# directly broken for ARCH=alpha but would affect anybody with a
+	# ccc binary in their PATH.  Bug #41908  (26 Jul 2004 agriffis)
+	epatch "${FILESDIR}"/${PN}-3.96-ccc.patch
+
+	# Patch gtk stuff, otherwise eautoreconf dies
+	epatch "${FILESDIR}"/${PN}-3.98-gtk-path.patch
+
+	# It fails parallel make otherwise when enabling nasm...
+	mkdir "${S}/libmp3lame/i386/.libs" || die
+
+	AT_M4DIR="${S}" eautoreconf
+	epunt_cxx # embedded bug #74498
+}
+
+src_compile() {
+	use sndfile && myconf="--with-fileio=sndfile"
+	# The user sets compiler optimizations... But if you'd like
+	# lame to choose it's own... uncomment one of these (experiMENTAL)
+	# myconf="${myconf} --enable-expopt=full \
+	# myconf="${myconf} --enable-expopt=norm \
+
+	econf \
+		--enable-shared \
+		$(use_enable debug debug norm) \
+		--disable-mp3x \
+		$(use_enable mmx nasm) \
+		$(use_enable mp3rtp) \
+		${myconf} || die "econf failed"
+
+	emake || die "emake failed"
+}
+
+src_install() {
+	emake DESTDIR="${D}" pkghtmldir="/usr/share/doc/${PF}/html" install || die
+
+	dodoc API ChangeLog HACKING README* STYLEGUIDE TODO USAGE || die
+	dohtml misc/lameGUI.html Dll/LameDLLInterface.htm || die
+
+	dobin "${S}"/misc/mlame || die
+}
+
+pkg_postinst(){
+	if use mp3rtp ; then
+	    ewarn "Warning, support for the encode-to-RTP program, 'mp3rtp'"
+	    ewarn "is broken as of August 2001."
+	    ewarn " "
+	fi
+}