Move gperf to DEPEND only wrt #352840 by Mr. Bones. USE="static-libs" and punt useless libtool archive.

(Portage version: 2.2.0_alpha19/cvs/Linux x86_64)

2 files changed, 27 insertions, 21 deletions

diff --git a/media-libs/libid3tag/ChangeLog b/media-libs/libid3tag/ChangeLog
index 4d3a6a497187..8075520bad57 100644
--- a/media-libs/libid3tag/ChangeLog
+++ b/media-libs/libid3tag/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-libs/libid3tag
-# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libid3tag/ChangeLog,v 1.42 2008/11/20 16:44:48 vapier Exp $
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libid3tag/ChangeLog,v 1.43 2011/01/26 16:14:05 ssuominen Exp $
+
+  26 Jan 2011; Samuli Suominen <ssuominen@gentoo.org>
+  libid3tag-0.15.1b-r2.ebuild:
+  Move gperf to DEPEND only wrt #352840 by Mr. Bones. USE="static-libs" and
+  punt useless libtool archive.
 
   20 Nov 2008; Mike Frysinger <vapier@gentoo.org>
   files/0.15.1b/libid3tag-0.15.1b-utf16.patchlibid3tag-0.15.1b-utf16.patch:
diff --git a/media-libs/libid3tag/libid3tag-0.15.1b-r2.ebuild b/media-libs/libid3tag/libid3tag-0.15.1b-r2.ebuild
index 7d21bebe1110..698586aed6c1 100644
--- a/media-libs/libid3tag/libid3tag-0.15.1b-r2.ebuild
+++ b/media-libs/libid3tag/libid3tag-0.15.1b-r2.ebuild
@@ -1,7 +1,8 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libid3tag/libid3tag-0.15.1b-r2.ebuild,v 1.7 2008/12/07 11:51:40 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libid3tag/libid3tag-0.15.1b-r2.ebuild,v 1.8 2011/01/26 16:14:05 ssuominen Exp $
 
+EAPI=2
 inherit eutils multilib
 
 DESCRIPTION="The MAD id3tag library"
@@ -11,35 +12,35 @@ SRC_URI="mirror://sourceforge/mad/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sh sparc x86 ~x86-fbsd"
-IUSE="debug"
+IUSE="debug static-libs"
 
-DEPEND="dev-util/gperf"
+RDEPEND=">=sys-libs/zlib-1.1.3"
+DEPEND="${RDEPEND}
+	dev-util/gperf"
 
-RDEPEND="${DEPEND}
-	>=sys-libs/zlib-1.1.3"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
+src_prepare() {
 	epunt_cxx #74489
-
 	epatch "${FILESDIR}/${PV}"/*.patch
 }
 
-src_compile() {
-	econf $(use_enable debug debugging) || die "configure failed"
-	emake || die "make failed"
+src_configure() {
+	econf \
+		--disable-dependency-tracking \
+		$(use_enable static-libs static) \
+		$(use_enable debug debugging)
 }
 
 src_install() {
-	make install DESTDIR="${D}" || die "make install failed"
-
+	emake DESTDIR="${D}" install || die
 	dodoc CHANGES CREDITS README TODO VERSION
 
 	# This file must be updated with every version update
 	insinto /usr/$(get_libdir)/pkgconfig
-	doins "${FILESDIR}/id3tag.pc"
-	sed -i -e "s:libdir=\${exec_prefix}/lib:libdir=/usr/$(get_libdir):" \
+	doins "${FILESDIR}"/id3tag.pc
+	sed -i \
+		-e "s:libdir=\${exec_prefix}/lib:libdir=/usr/$(get_libdir):" \
 		-e "s:0.15.0b:${PV}:" \
-		"${D}/usr/$(get_libdir)/pkgconfig/id3tag.pc"
+		"${D}"/usr/$(get_libdir)/pkgconfig/id3tag.pc || die
+
+	find "${D}" -name '*.la' -exec rm -f '{}' +
 }