Fix multiple inherit calls, thanks to dirtyepic for reporting

Package-Manager: portage-2.1.2-r7

diff --git a/media-sound/gnusound/ChangeLog b/media-sound/gnusound/ChangeLog
index e9d5ded530717bf64e0543b398893bbe81cd5a18..3598242dec14aed71f86544ac094889683f26bf5 100644 (file)
--- a/media-sound/gnusound/ChangeLog
+++ b/media-sound/gnusound/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for media-sound/gnusound
 # Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/gnusound/ChangeLog,v 1.14 2007/01/30 20:23:02 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/gnusound/ChangeLog,v 1.15 2007/02/03 23:06:26 aballier Exp $
+
+  03 Feb 2007; Alexis Ballier <aballier@gentoo.org> gnusound-0.7.4.ebuild:
+  Fix multiple inherit calls, thanks to dirtyepic for reporting
 
   30 Jan 2007; Alexis Ballier <aballier@gentoo.org>
   +files/gnusound-0.7.4-ffmpeg.patch, gnusound-0.7.4.ebuild:

diff --git a/media-sound/gnusound/Manifest b/media-sound/gnusound/Manifest
index a16ffbd90544618a5bb21e4eb3e36af09cd2c8b1..f0b4bd050c06e894169004615e658bc913084ca0 100644 (file)
--- a/media-sound/gnusound/Manifest
+++ b/media-sound/gnusound/Manifest
@@ -26,14 +26,14 @@ MD5 9f6d1af17f682bfabec6552509f8ce3a files/gnusound-0.7.4-flac-1.1.3.patch 11622
 RMD160 e157d53337f7840f6d0bd2294535bf0f9648ebd6 files/gnusound-0.7.4-flac-1.1.3.patch 11622
 SHA256 24472652fc113373e3fb4de780cd81d05026671f5dbdc48d90a6f11cd422a335 files/gnusound-0.7.4-flac-1.1.3.patch 11622
 DIST gnusound-0.7.4.tar.bz2 513044 RMD160 775c7d3ae5dc94f56221526c7e1f0e9afb6a0b7f SHA1 c5fc8bc979d5031ab8850cbd39a072abe7372194 SHA256 9309d8212cf1d98ab1e8de776e52e2fcd6e68618b0bf4ac60766f6351746edfb
-EBUILD gnusound-0.7.4.ebuild 2509 RMD160 e4591f8f955e5e1bb15596b3bb7c5b1ce81e674d SHA1 aebe4c6cea9d11fd479ade4cc1159c1c2a13daef SHA256 0184ef940f8246c9daab3fc50e2324586a78238cee106348acc761db10e61365
-MD5 265111090842b5a2276a03510cb8ea40 gnusound-0.7.4.ebuild 2509
-RMD160 e4591f8f955e5e1bb15596b3bb7c5b1ce81e674d gnusound-0.7.4.ebuild 2509
-SHA256 0184ef940f8246c9daab3fc50e2324586a78238cee106348acc761db10e61365 gnusound-0.7.4.ebuild 2509
-MISC ChangeLog 2613 RMD160 a3782a230db9cd9e55b897f37bd2ca50ef38c55e SHA1 2f89b99016494769838f857694740cb16c0d433c SHA256 fc2327e4af1a524a35bb5a2bb878952e90f01b471941f1e9f8cacc893e0a46a3
-MD5 5a4d932c038cebaf017b2f8ea2d042de ChangeLog 2613
-RMD160 a3782a230db9cd9e55b897f37bd2ca50ef38c55e ChangeLog 2613
-SHA256 fc2327e4af1a524a35bb5a2bb878952e90f01b471941f1e9f8cacc893e0a46a3 ChangeLog 2613
+EBUILD gnusound-0.7.4.ebuild 2493 RMD160 df528ed9edda4831079a1c2f98c0330798f6e232 SHA1 51a504b7f0576f479d63eaaec85df56a930684f4 SHA256 3e3d56da22fc815bd47bb6c5735a135db7444bd1e887f8de74eebd7dc0e3ee10
+MD5 724ec9949084da8cafd5f48745d3c14d gnusound-0.7.4.ebuild 2493
+RMD160 df528ed9edda4831079a1c2f98c0330798f6e232 gnusound-0.7.4.ebuild 2493
+SHA256 3e3d56da22fc815bd47bb6c5735a135db7444bd1e887f8de74eebd7dc0e3ee10 gnusound-0.7.4.ebuild 2493
+MISC ChangeLog 2753 RMD160 af3fef6b986908c01006389aae456de3ea5d17e1 SHA1 1688a3cd3fe3c11a06dad0142ab6723acfb59b63 SHA256 150ce1c78a0949f0c21cff1f3a2f480022caf00d6ee0c340bbf7659dcdf458ed
+MD5 332b6787243fd70801a45a1d8f6f66ed ChangeLog 2753
+RMD160 af3fef6b986908c01006389aae456de3ea5d17e1 ChangeLog 2753
+SHA256 150ce1c78a0949f0c21cff1f3a2f480022caf00d6ee0c340bbf7659dcdf458ed ChangeLog 2753
 MISC metadata.xml 158 RMD160 6842e2189a50bd8a98e84802c38180ac1421c00e SHA1 703cea5a2109d41f7c87993c1f01d418a4c85174 SHA256 dfb5b47e6836db39fb187301dfcff1c2605e91d13d21db160806a563d8c75f9b
 MD5 a1eaeb2ae801daeb712c90c060e922dc metadata.xml 158
 RMD160 6842e2189a50bd8a98e84802c38180ac1421c00e metadata.xml 158
@@ -42,9 +42,9 @@ MD5 c85d487477798897e43b6acdddf7041c files/digest-gnusound-0.7.4 247
 RMD160 ff3404278ceac1b154292da474fc2aebaf859375 files/digest-gnusound-0.7.4 247
 SHA256 3961ff2a880a87ee5b2dad63c7e96a4d2fcaf07cdea6bc7487b88159e8aa10ea files/digest-gnusound-0.7.4 247
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.1 (GNU/Linux)
+Version: GnuPG v2.0.2 (GNU/Linux)
 
-iD8DBQFFv6ktvFcC4BYPU0oRAuvgAJ9y8xxvi/OZBm/bbZFaGQmyKnX7XgCfUCRF
-l1FdlAPLb0nVBxeb1t1n+AE=
-=6/yF
+iD8DBQFFxRV4vFcC4BYPU0oRAnNWAJ4iVpqnHynDY4VyW0eypImyL19liQCdG4CG
+EwzxFRRgH83KmyALZOIL4hA=
+=GFn7
 -----END PGP SIGNATURE-----

diff --git a/media-sound/gnusound/gnusound-0.7.4.ebuild b/media-sound/gnusound/gnusound-0.7.4.ebuild
index 82b386e7aadeb98f3f8d25a1598171cd3502662d..d47958481a3a9342b9157b70f9489a7b4d50873a 100644 (file)
--- a/media-sound/gnusound/gnusound-0.7.4.ebuild
+++ b/media-sound/gnusound/gnusound-0.7.4.ebuild
@@ -1,16 +1,14 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/gnusound/gnusound-0.7.4.ebuild,v 1.3 2007/01/30 20:23:02 aballier Exp $
-
-inherit toolchain-funcs
-
-IUSE="3dnow alsa audiofile cpudetection flac ffmpeg jack lame libsamplerate mmx
-ogg oss sse vorbis"
+# $Header: /var/cvsroot/gentoo-x86/media-sound/gnusound/gnusound-0.7.4.ebuild,v 1.4 2007/02/03 23:06:26 aballier Exp $
 
 WANT_ATUOMAKE=1.8
 WANT_AUTOCONF=2.5
 
-inherit eutils autotools
+inherit toolchain-funcs eutils autotools
+
+IUSE="3dnow alsa audiofile cpudetection flac ffmpeg jack lame libsamplerate mmx
+ogg oss sse vorbis"
 
 DESCRIPTION="GNUsound is a sound editor for Linux/x86"
 HOMEPAGE="http://gnusound.sourceforge.net/"
@@ -55,8 +53,7 @@ src_unpack() {
        epatch "${FILESDIR}/${P}-flac-1.1.3.patch"
        epatch "${FILESDIR}/${P}-ffmpeg.patch"
 
-       AT_M4DIR="config" eaclocal
-       eautoconf
+       AT_M4DIR="config" eautoreconf
 }
 
 src_compile() {
@@ -85,6 +82,6 @@ src_compile() {
 }
 
 src_install() {
-       make DESTDIR="${D}" install || die "make install failed"
+       emake DESTDIR="${D}" install || die "make install failed"
        dodoc README NOTES TODO CHANGES
 }