Slightly polish the ebuild as it is supposed to be eapi4 so it does not need to contain most of the stuff.

Package-Manager: portage-2.2.0_alpha90/cvs/Linux x86_64

3 files changed, 39 insertions, 24 deletions

diff --git a/media-libs/libmad/ChangeLog b/media-libs/libmad/ChangeLog
index a70681864b2e..c056d5d12e91 100644
--- a/media-libs/libmad/ChangeLog
+++ b/media-libs/libmad/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-libs/libmad
-# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libmad/ChangeLog,v 1.63 2011/08/21 03:05:59 mattst88 Exp $
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libmad/ChangeLog,v 1.64 2012/03/15 17:33:12 scarabeus Exp $
+
+  15 Mar 2012; Tomáš Chvátal <scarabeus@gentoo.org> libmad-0.15.1b-r7.ebuild:
+  Slightly polish the ebuild as it is supposed to be eapi4 so it does not need
+  to contain most of the stuff.
 
   21 Aug 2011; Matt Turner <mattst88@gentoo.org> libmad-0.15.1b-r7.ebuild:
   Added USE=static-libs (bug 378325), also bump to EAPI4.
diff --git a/media-libs/libmad/Manifest b/media-libs/libmad/Manifest
index f7b36f29230e..535a4346e8f3 100644
--- a/media-libs/libmad/Manifest
+++ b/media-libs/libmad/Manifest
@@ -7,13 +7,23 @@ AUX libmad-0.15.1b-gcc44-mips-h-constraint-removal.patch 2377 RMD160 602120e21d3
 AUX mad.pc 211 RMD160 fd821f10ff5e1f43a4f166229bebebd9f78a2a4c SHA1 c119a0ac710c4a3255fc643ca60c9107a31e3e7c SHA256 821918a6be761d7b8a697af951e4a9a5d2e48920cd80c9b6b9fa19d78afcf3b3
 DIST libmad-0.15.1b.tar.gz 502379 RMD160 0f3415ee10b188681e282ca69dec74c46ca73b0f SHA1 cac19cd00e1a907f3150cc040ccc077783496d76 SHA256 bbfac3ed6bfbc2823d3775ebb931087371e142bb0e9bb1bee51a76a6e0078690
 EBUILD libmad-0.15.1b-r6.ebuild 2021 RMD160 5fc556b4f71a12790aa622cbbdef210f89b78b18 SHA1 0cc438620959c1dcaff3c3517cd5e9b1a72f6c78 SHA256 8f5e94c949c674d121ca35b751eef0ef4f87917d8bf966ca3434c5c471db668c
-EBUILD libmad-0.15.1b-r7.ebuild 2067 RMD160 1e701d3e5635b4bf1da13e12dc076e9a87bb3afb SHA1 6e12643ccfba4886920d78447317cf8c5a7ee086 SHA256 6621b093e11e0b5cd484f78576724148fedd836e6a6f3751c4574c4580e956d9
-MISC ChangeLog 8398 RMD160 9f214739b820e0d7d1a32f7143a19d4ebdc8201c SHA1 de9c8856602a0f0ed8a647d5e92a42056ec68a2b SHA256 93470216d37a2ad5304136215b737d9625a299288619a2c1c1c7f39b6f985933
+EBUILD libmad-0.15.1b-r7.ebuild 1948 RMD160 fe3e6d7b553b5a0f6560ed1476a18b421e47a5e8 SHA1 527d10a12ae93d1147f6d42dcbcaa59c39dc1683 SHA256 fa698bb887276d14a2fe94cc6f995e7b80e40439098c1466e7724c4a423eaeb8
+MISC ChangeLog 8592 RMD160 f4615d5c0026ae36924e97a4b390c0e56cc69efd SHA1 3fa2b350e3b251e7b977fd870e4b88ace3406891 SHA256 90b40db0368ca77f243928577191abd251d45d206a57fc8447a101c7ae33b7bd
 MISC metadata.xml 252 RMD160 68406e733c1a9f26b7ab37e79ab53b3f59305b3a SHA1 6e5cc1551616801a2f257d688e6fc286044c3499 SHA256 5ab00710d822d203a1a38e1b6a9754137de4fe2cf5c4e79470419ed3f3927450
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEARECAAYFAk5QdhoACgkQTVUdg23rv50ywQCggACbg5hptORHe+ql3k5VsBDE
-dJoAnRRaCXruLm8PV3sWk0D9eyPag46U
-=xTav
+iQIcBAEBAgAGBQJPYifoAAoJEOSiRoyO7jvoOwQP/05LJzML8v3iJK5b3nENC4AX
+27tn0N+2vM2EOsihEEtfsgPsSxOnr91BUsXj1QBcYVDrwmuXrbtlklEMpz5TqHrU
+yayJmovbf8MmXmxmtoao5ndgJrnEXF1mIaP5nk9nrVK4nbtmI2fE8qPOsTH88w5N
+8ukvQE9Sq726UH3DonyEwhRBd0AwlRlbD9TIj44ET38VOhiD7yJi3iaUkqOcLmpp
+LsGcej/hu7COq9IJIWjCDi1xlX8DPSf0Asj3Jxgrd2xhit1PRnJQBlrtGvvAs0I+
+kQ04RJ2VFTXhqA7p87Vcq0UENSRyeSMsF4qTuCEfQ94wA0hBVjLHjt/eWDe2qx4i
+iQlKjszyQgQCrYfULLEIqkB+zmZaQBhPcU01Ig3RoUjI2nK6jQDyh8tVgErLRW12
+q4sLGYUpt/rJbTeKzEcGxMooVq44NfL8vp0IiHs27gXTaF5+GVFmOqn6Y9dVZm7b
+6dzTVTByHfNHnuR4dyeXtXRAuc3w9s55ly3rV/myIPMoIsRHxL0OZ6ICRZGsrDSb
+nW4WZqH5DQo6syKEoGARGwaIYrkM0tTtTx1pn8Uw820Atwj0W3Xxjhbp+yJ5vrpC
+qQiPR133AhoInPoQpBECqpPzxBtFK4X24oRPzXColLYMcSvLCkzsMLJOBMxXeK0i
+77KuJAxRGf00RwE7SYSC
+=E/SK
 -----END PGP SIGNATURE-----
diff --git a/media-libs/libmad/libmad-0.15.1b-r7.ebuild b/media-libs/libmad/libmad-0.15.1b-r7.ebuild
index 812e721bdbf3..c8d3b8af0f9e 100644
--- a/media-libs/libmad/libmad-0.15.1b-r7.ebuild
+++ b/media-libs/libmad/libmad-0.15.1b-r7.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libmad/libmad-0.15.1b-r7.ebuild,v 1.2 2011/08/21 03:05:59 mattst88 Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libmad/libmad-0.15.1b-r7.ebuild,v 1.3 2012/03/15 17:33:12 scarabeus Exp $
 
 EAPI=4
 
@@ -12,16 +12,19 @@ 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"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ppc ~ppc64 ~sh ~sparc x86 ~x86-fbsd"
 IUSE="debug static-libs"
 
 DEPEND=""
 RDEPEND=""
 
+DOCS="CHANGES CREDITS README TODO VERSION"
+
 src_prepare() {
-	epatch "${FILESDIR}"/libmad-0.15.1b-cflags.patch
-	epatch "${FILESDIR}"/libmad-0.15.1b-cflags-O2.patch
-	epatch "${FILESDIR}"/libmad-0.15.1b-gcc44-mips-h-constraint-removal.patch
+	epatch \
+		"${FILESDIR}"/libmad-0.15.1b-cflags.patch \
+		"${FILESDIR}"/libmad-0.15.1b-cflags-O2.patch \
+		"${FILESDIR}"/libmad-0.15.1b-gcc44-mips-h-constraint-removal.patch
 
 	eautoreconf
 
@@ -38,23 +41,21 @@ src_configure() {
 
 	# Fix for b0rked sound on sparc64 (maybe also sparc32?)
 	# default/approx is also possible, uses less cpu but sounds worse
-	use sparc && myconf="${myconf} --enable-fpm=64bit"
+	use sparc && myconf+=" --enable-fpm=64bit"
 
-	[[ $(tc-arch) == "amd64" ]] && myconf="${myconf} --enable-fpm=64bit"
-	[[ $(tc-arch) == "x86" ]] && myconf="${myconf} --enable-fpm=intel"
-	[[ $(tc-arch) == "ppc" ]] && myconf="${myconf} --enable-fpm=default"
-	[[ $(tc-arch) == "ppc64" ]] && myconf="${myconf} --enable-fpm=64bit"
+	[[ $(tc-arch) == "amd64" ]] && myconf+=" --enable-fpm=64bit"
+	[[ $(tc-arch) == "x86" ]] && myconf+=" --enable-fpm=intel"
+	[[ $(tc-arch) == "ppc" ]] && myconf+=" --enable-fpm=default"
+	[[ $(tc-arch) == "ppc64" ]] && myconf+=" --enable-fpm=64bit"
 
 	econf \
 		$(use_enable debug debugging) \
 		$(use_enable static-libs static) \
-		${myconf} || die "configure failed"
+		${myconf}
 }
 
 src_install() {
-	emake install DESTDIR="${D}" || die "make install failed"
-
-	dodoc CHANGES CREDITS README TODO VERSION
+	default
 
 	# This file must be updated with each version update
 	insinto /usr/$(get_libdir)/pkgconfig
@@ -62,7 +63,7 @@ src_install() {
 
 	# Use correct libdir in pkgconfig file
 	sed -i -e "s:^libdir.*:libdir=/usr/$(get_libdir):" \
-		"${D}"/usr/$(get_libdir)/pkgconfig/mad.pc
+		"${ED}"/usr/$(get_libdir)/pkgconfig/mad.pc
 
-	find "${D}" -name '*.la' -delete
+	find "${ED}" -name '*.la' -delete
 }