USE="static-libs" and punt .la files. Fix LICENSE. Remove USE="doc" as it doesn't bring in any external dependencies. Revert useless base.eclass usage.

(Portage version: 2.2_rc83/cvs/Linux x86_64)

2 files changed, 38 insertions, 32 deletions

diff --git a/media-libs/flac/ChangeLog b/media-libs/flac/ChangeLog
index 2b9603a8e666..84895bb5c990 100644
--- a/media-libs/flac/ChangeLog
+++ b/media-libs/flac/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-libs/flac
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/flac/ChangeLog,v 1.148 2009/07/23 08:24:03 ssuominen Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-libs/flac/ChangeLog,v 1.149 2010/09/16 11:24:19 ssuominen Exp $
+
+  16 Sep 2010; Samuli Suominen <ssuominen@gentoo.org> flac-1.2.1-r3.ebuild:
+  USE="static-libs" and punt .la files. Fix LICENSE. Remove USE="doc" as it
+  doesn't bring in any external dependencies. Revert useless base.eclass
+  usage.
 
   23 Jul 2009; Samuli Suominen <ssuominen@gentoo.org> flac-1.2.1-r3.ebuild:
   Fix eautoreconf (missing AM_ICONV) for embedded wrt #173464, thanks to
diff --git a/media-libs/flac/flac-1.2.1-r3.ebuild b/media-libs/flac/flac-1.2.1-r3.ebuild
index 1b490d89a56e..38e4de7606f1 100644
--- a/media-libs/flac/flac-1.2.1-r3.ebuild
+++ b/media-libs/flac/flac-1.2.1-r3.ebuild
@@ -1,20 +1,19 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/flac/flac-1.2.1-r3.ebuild,v 1.11 2009/07/24 11:01:07 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/flac/flac-1.2.1-r3.ebuild,v 1.12 2010/09/16 11:24:19 ssuominen Exp $
 
-EAPI=1
-
-inherit autotools eutils base
+EAPI=2
+inherit autotools eutils
 
 DESCRIPTION="free lossless audio encoder and decoder"
 HOMEPAGE="http://flac.sourceforge.net"
 SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz
 	mirror://gentoo/${P}-embedded-m4.tar.bz2"
 
-LICENSE="GPL-2 LGPL-2"
+LICENSE="BSD FDL-1.2 GPL-2 LGPL-2.1"
 SLOT="0"
 KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sh sparc x86 ~x86-fbsd"
-IUSE="3dnow altivec +cxx debug doc ogg sse"
+IUSE="3dnow altivec +cxx debug ogg sse static-libs"
 
 RDEPEND="ogg? ( >=media-libs/libogg-1.1.3 )"
 DEPEND="${RDEPEND}
@@ -22,47 +21,49 @@ DEPEND="${RDEPEND}
 	!elibc_uclibc? ( sys-devel/gettext )
 	dev-util/pkgconfig"
 
-PATCHES=( "${FILESDIR}/${P}-asneeded.patch"
-	"${FILESDIR}/${P}-cflags.patch"
-	"${FILESDIR}/${P}-asm.patch"
-	"${FILESDIR}/${P}-dontbuild-tests.patch"
-	"${FILESDIR}/${P}-dontbuild-examples.patch"
-	"${FILESDIR}/${P}-gcc-4.3-includes.patch" )
+src_prepare() {
+	epatch \
+		"${FILESDIR}"/${P}-asneeded.patch \
+		"${FILESDIR}"/${P}-cflags.patch \
+		"${FILESDIR}"/${P}-asm.patch \
+		"${FILESDIR}"/${P}-dontbuild-tests.patch \
+		"${FILESDIR}"/${P}-dontbuild-examples.patch \
+		"${FILESDIR}"/${P}-gcc-4.3-includes.patch
+
+	cp "${WORKDIR}"/*.m4 m4 || die
 
-src_unpack() {
-	base_src_unpack
-	cd "${S}"
-	cp "${WORKDIR}"/*.m4 m4 || die "cp failed"
 	AT_M4DIR="m4" eautoreconf
 }
 
-src_compile() {
-	econf $(use_enable ogg) \
+src_configure() {
+	econf \
+		$(use_enable static-libs static) \
+		--disable-dependency-tracking \
+		$(use_enable debug) \
 		$(use_enable sse) \
 		$(use_enable 3dnow) \
 		$(use_enable altivec) \
-		$(use_enable debug) \
-		$(use_enable cxx cpplibs) \
-		--disable-examples \
 		--disable-doxygen-docs \
-		--disable-dependency-tracking \
-		--disable-xmms-plugin
-
-	emake || die "emake failed."
+		--disable-xmms-plugin \
+		$(use_enable cxx cpplibs) \
+		$(use_enable ogg) \
+		--disable-examples
 }
 
 src_test() {
-	if [ $UID != 0 ] ; then
-		emake check || die "tests failed"
+	if [ $UID != 0 ]; then
+		emake check || die
 	else
 		ewarn "Tests will fail if ran as root, skipping."
 	fi
 }
 
 src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed."
+	emake DESTDIR="${D}" install || die
 
 	rm -rf "${D}"/usr/share/doc/${P}
 	dodoc AUTHORS README
-	use doc && dohtml -r doc/html/*
+	dohtml -r doc/html/*
+
+	find "${D}" -name '*.la' -exec rm -f '{}' +
 }