Switch to EAPI=4. Fix bug #376895.

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

diff --git a/media-sound/aqualung/ChangeLog b/media-sound/aqualung/ChangeLog
index a8db41d020a16dfeffc209b389cfc18ac76f57ee..1e2d2098e0c9cf3c71170ab9f3a1551f73230687 100644 (file)
--- a/media-sound/aqualung/ChangeLog
+++ b/media-sound/aqualung/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-sound/aqualung
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/aqualung/ChangeLog,v 1.18 2011/07/29 07:58:04 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/aqualung/ChangeLog,v 1.19 2011/08/01 18:21:59 billie Exp $
+
+  01 Aug 2011; Daniel Pielmeier <billie@gentoo.org>
+  aqualung-0.9_beta11-r1.ebuild:
+  Switch to EAPI=4. Fix bug #376895.
 
   29 Jul 2011; Samuli Suominen <ssuominen@gentoo.org>
   aqualung-0.9_beta11-r1.ebuild,

diff --git a/media-sound/aqualung/Manifest b/media-sound/aqualung/Manifest
index d263f1656ac601a2ebeb55685e2f2468db28bc12..1077b345cb312fd2988da0b56e5e54ba34c19d57 100644 (file)
--- a/media-sound/aqualung/Manifest
+++ b/media-sound/aqualung/Manifest
@@ -3,14 +3,14 @@ Hash: SHA256
 
 AUX aqualung-0.9_beta11-use_lrdf_cflags.patch 1190 RMD160 d98a06cabaf6db7ed9a8450a0bde59e8117bd4bc SHA1 f2ed98c644fbe89d033d99c989cb48faaf1473c9 SHA256 1bd61fae33bbd2bc36e551dac73757258765de28b17cefa33f70474947197e66
 DIST aqualung-0.9beta11.tar.gz 1584700 RMD160 3ff28f7611db89290baa1b0b8528c0ba5e79a762 SHA1 7a52a82ced0554acad56bd18f5ec707bf9fa85a0 SHA256 315eae4539c1039978d38bd7bc8ef965f3e9dc518c7eb6f4e9da52a9bf332ddd
-EBUILD aqualung-0.9_beta11-r1.ebuild 2566 RMD160 f46fcc8f2af65cefa5304f93832a266d28a121f4 SHA1 c8cfb9b509bcda063d710ea3e22a80c2d9d214a8 SHA256 2d9f9cda4e3b2b227defcae8790ae5d98808fd62492bc9e8273455f9460091e7
+EBUILD aqualung-0.9_beta11-r1.ebuild 2576 RMD160 b73877d88c00b9d69631b52dea83dec28c766f0e SHA1 803a15f15dfc3493f92a6df8002c82ede9616278 SHA256 98aa0580237d9aa63a90efb48a7b1f53b927231782a54617be1824314e8e5cea
 EBUILD aqualung-0.9_beta11.ebuild 2362 RMD160 5efa3c441c4277f3fe708a9ea1e6f27fa7597a77 SHA1 fca5d93b7df0cf6c23ce84f62e8dc1c52cd224f9 SHA256 00b8c92993c4d18f9e1146f1a1d6147a07a44a262c4c951b55a7f25008a8eb20
-MISC ChangeLog 3738 RMD160 a1a34be375f6c829659330a59c6d3deaa57725e4 SHA1 d74e7cb5f42426b282c3d75bc71b81b3d18ad9ea SHA256 73a87ff0cb55b1248cb46776ae947a7aecf478f03f2169eedd238c60706b1e1d
+MISC ChangeLog 3858 RMD160 5c62240cd66e196e641d563bbce4473d3111e8d4 SHA1 682a236d4cafe95d3b95f207d104dff094c7868b SHA256 3d9a9c57fc8764e5758b7039da50de48b08576e3e592946664af68fb46b5c425
 MISC metadata.xml 663 RMD160 f62e66e7b9c130ea967c3f82bc59c24b43194cf9 SHA1 1841f9a0738b59214aa523f8240af8ed98737f34 SHA256 c0a4fbd91732bb8bf47fcf8862325f1ab833dd2c1e91a4e27d3482eb7998c575
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iF4EAREIAAYFAk4yZ44ACgkQXkR9YqOcLPHAWQEAn8+YUw5bKkAjbj3by/59tTjm
-/7VDMeCmQ8Qt965l7uAA+QEVNUeg13GdkQ7240E9Mw1vcOddxxkkApS6vzr2jXzh
-=3Svr
+iEYEAREIAAYFAk427ugACgkQlcuUeyFa0U30PACdHIJ2CjXSnhcxndi/JB2rd6Fk
+C3wAoJjPT28h+Ou7S80ttI6Q8KFOxj8/
+=eqBM
 -----END PGP SIGNATURE-----

diff --git a/media-sound/aqualung/aqualung-0.9_beta11-r1.ebuild b/media-sound/aqualung/aqualung-0.9_beta11-r1.ebuild
index 3323d8f774f4f6c8f0ccb79106f651ae6511fc66..ad7eac2c6ff1231782e77621fdc4d5f343059e44 100644 (file)
--- a/media-sound/aqualung/aqualung-0.9_beta11-r1.ebuild
+++ b/media-sound/aqualung/aqualung-0.9_beta11-r1.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/aqualung/aqualung-0.9_beta11-r1.ebuild,v 1.5 2011/07/29 07:58:04 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/aqualung/aqualung-0.9_beta11-r1.ebuild,v 1.6 2011/08/01 18:21:59 billie Exp $
 
-EAPI=2
+EAPI=4
 
 inherit autotools eutils versionator
 
@@ -48,7 +48,10 @@ S=${WORKDIR}/${PN}-${MY_PV}
 
 src_prepare() {
        epatch "${FILESDIR}"/${P}-use_lrdf_cflags.patch
-       sed -i -e 's:$(pkgdatadir)/doc:/usr/share/doc/${PF}:' doc/Makefile.am
+       sed -i -e 's:$(pkgdatadir)/doc:/usr/share/doc/${PF}:' \
+               doc/Makefile.am || die
+       sed -i -e 's:BUILD_CFLAGS="-O2":BUILD_CFLAGS="":' \
+               configure.ac || die
        eautoreconf
 }
 
@@ -84,8 +87,8 @@ src_configure() {
 }
 
 src_install() {
-       emake install DESTDIR="${D}" || die
-       dodoc AUTHORS README ChangeLog || die
-       newicon src/img/icon_64.png aqualung.png || die
+       default
+
+       newicon src/img/icon_64.png aqualung.png
        make_desktop_entry aqualung Aqualung
 }