Added USE=static-libs (bug 378325), also bump to EAPI4.

Package-Manager: portage-2.1.10.3/cvs/Linux x86_64

diff --git a/media-libs/libmad/ChangeLog b/media-libs/libmad/ChangeLog
index a2416d640a196b4c0107b46cf82f3b65a6f10199..a70681864b2ef703cc4d7c0ca78a28f210e51123 100644 (file)
--- a/media-libs/libmad/ChangeLog
+++ b/media-libs/libmad/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for media-libs/libmad
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libmad/ChangeLog,v 1.62 2010/11/09 17:01:52 jer Exp $
+# 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 $
+
+  21 Aug 2011; Matt Turner <mattst88@gentoo.org> libmad-0.15.1b-r7.ebuild:
+  Added USE=static-libs (bug 378325), also bump to EAPI4.
 
 *libmad-0.15.1b-r7 (09 Nov 2010)
 

diff --git a/media-libs/libmad/Manifest b/media-libs/libmad/Manifest
index c42b897327078301850f4b0627dd53131dae13a7..f7b36f29230e9069709472c17d617a115a0fbe9f 100644 (file)
--- a/media-libs/libmad/Manifest
+++ b/media-libs/libmad/Manifest
@@ -1,9 +1,19 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX libmad-0.15.1b-cflags-O2.patch 347 RMD160 a2a0059dc8fb2c8f526a09fc250b5c16907e687a SHA1 334c2e88e180d8d4757934973f32f3ac270744bf SHA256 197bd69c064ba2957b23d83509c9fdc63c5315076fdf8c98dbc9eccd3ff236ca
 AUX libmad-0.15.1b-cflags.patch 4867 RMD160 9103cec98f6dc746fd05e385159484098c6347b3 SHA1 e6e8c0de26ed6ef6ccfb6d1ea6e8b682695e1144 SHA256 0d92977b30b599be8d423e9bec39c0f76b9dbc0f38dbc98a397394c30e28243e
 AUX libmad-0.15.1b-gcc44-mips-h-constraint-removal.patch 2377 RMD160 602120e21d3010ba9c9f0bbbcb507920cf676ecf SHA1 2dde95528ef0d66166001f25e9896777e488c032 SHA256 328e42102e637273502831d5c45b29e765073d08328de1e8ed6280958877eae5
 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 2034 RMD160 309243acb4858fc45fa80a59f446ad7219826d70 SHA1 432baf1861e2b3f39c6ff3325d45e4ab96d80c3c SHA256 0caab96c09d34a96c5c0e7b4a30bf63796b6f572082854f99273a3f4a9c8817f
-MISC ChangeLog 8259 RMD160 99c89c869ab9837a1056ef0d24b27e33ff2199ac SHA1 3b48ec00322b47bfec3e5bcb95f7155641f6ae8f SHA256 45deea72f5163f56a3f65da2fed5fca3466d8ee91663f40f7012223329458719
+EBUILD libmad-0.15.1b-r7.ebuild 2067 RMD160 1e701d3e5635b4bf1da13e12dc076e9a87bb3afb SHA1 6e12643ccfba4886920d78447317cf8c5a7ee086 SHA256 6621b093e11e0b5cd484f78576724148fedd836e6a6f3751c4574c4580e956d9
+MISC ChangeLog 8398 RMD160 9f214739b820e0d7d1a32f7143a19d4ebdc8201c SHA1 de9c8856602a0f0ed8a647d5e92a42056ec68a2b SHA256 93470216d37a2ad5304136215b737d9625a299288619a2c1c1c7f39b6f985933
 MISC metadata.xml 252 RMD160 68406e733c1a9f26b7ab37e79ab53b3f59305b3a SHA1 6e5cc1551616801a2f257d688e6fc286044c3499 SHA256 5ab00710d822d203a1a38e1b6a9754137de4fe2cf5c4e79470419ed3f3927450
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.17 (GNU/Linux)
+
+iEYEARECAAYFAk5QdhoACgkQTVUdg23rv50ywQCggACbg5hptORHe+ql3k5VsBDE
+dJoAnRRaCXruLm8PV3sWk0D9eyPag46U
+=xTav
+-----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 1d14de64d507078e4237246b1e1dd4a82c10952b..812e721bdbf38cd88d2bcfb6ec1977bafe1491b9 100644 (file)
--- a/media-libs/libmad/libmad-0.15.1b-r7.ebuild
+++ b/media-libs/libmad/libmad-0.15.1b-r7.ebuild
@@ -1,6 +1,8 @@
-# Copyright 1999-2010 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/libmad/libmad-0.15.1b-r7.ebuild,v 1.1 2010/11/09 17:01:52 jer Exp $
+# $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 $
+
+EAPI=4
 
 inherit eutils autotools libtool flag-o-matic
 
@@ -11,14 +13,12 @@ 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=""
+RDEPEND=""
 
-src_unpack() {
-       unpack ${A}
-       cd "${S}"
-
+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
@@ -29,7 +29,7 @@ src_unpack() {
        epunt_cxx #74490
 }
 
-src_compile() {
+src_configure() {
        local myconf="--enable-accuracy"
        # --enable-speed                 optimize for speed over accuracy
        # --enable-accuracy              optimize for accuracy over speed
@@ -47,8 +47,8 @@ src_compile() {
 
        econf \
                $(use_enable debug debugging) \
+               $(use_enable static-libs static) \
                ${myconf} || die "configure failed"
-       emake || die "make failed"
 }
 
 src_install() {
@@ -61,8 +61,8 @@ src_install() {
        doins "${FILESDIR}"/mad.pc
 
        # Use correct libdir in pkgconfig file
-       dosed "s:^libdir.*:libdir=/usr/$(get_libdir):" \
-               /usr/$(get_libdir)/pkgconfig/mad.pc
+       sed -i -e "s:^libdir.*:libdir=/usr/$(get_libdir):" \
+               "${D}"/usr/$(get_libdir)/pkgconfig/mad.pc
 
        find "${D}" -name '*.la' -delete
 }