Put the correct dependencies for autotools. Use automake 1.9 as only eautomake will...

Package-Manager: portage-2.1.2

diff --git a/media-sound/alsa-tools/ChangeLog b/media-sound/alsa-tools/ChangeLog
index 016e0944f70b77ed2b17b2c54e26812b48e6fabc..6482d4e5769459dacbe684e7c9e477573e9e81b5 100644 (file)
--- a/media-sound/alsa-tools/ChangeLog
+++ b/media-sound/alsa-tools/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-sound/alsa-tools
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/alsa-tools/ChangeLog,v 1.132 2007/01/14 09:16:25 josejx Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/alsa-tools/ChangeLog,v 1.133 2007/01/16 21:32:50 flameeyes Exp $
+
+  16 Jan 2007; Diego Pettenò <flameeyes@gentoo.org>
+  alsa-tools-1.0.13.ebuild, alsa-tools-1.0.14_rc1.ebuild:
+  Put the correct dependencies for autotools. Use automake 1.9 as only
+  eautomake will be run this way. Closes bug #161143 too.
 
   14 Jan 2007; Joseph Jezak <josejx@gentoo.org>
   alsa-tools-1.0.14_rc1.ebuild:

diff --git a/media-sound/alsa-tools/Manifest b/media-sound/alsa-tools/Manifest
index c8837f11daf70d7eca64ec0134bd649b47a3f1d6..4bb533b76b602c13ff436564f47050a1f71cc71c 100644 (file)
--- a/media-sound/alsa-tools/Manifest
+++ b/media-sound/alsa-tools/Manifest
@@ -7,18 +7,18 @@ RMD160 f1b3fa1fca50da0827beff8f87f514814d938833 files/alsa-tools-1.0.11-asneeded
 SHA256 95d69d5b9400818243806b643450f8b75e9411efa2acb8ad02e5063fea0de33c files/alsa-tools-1.0.11-asneeded.patch 1845
 DIST alsa-tools-1.0.13.tar.bz2 1464807 RMD160 1e55ab98dcc78dabbfec8f057bb164482d334c9a SHA1 43c32b3304140f31cce7f5f9fe4dcd57f01b0965 SHA256 1d82c6f64d035e20fb151b8791972cad47ef229bc365fd046ff64f74bec31eb3
 DIST alsa-tools-1.0.14rc1.tar.bz2 1466476 RMD160 7c0e0131bfa91b9b07705204ebacca2b5b87a19b SHA1 c170029c5a783abb122f0a93b4343e75a6d3fc84 SHA256 d29ebd324359263d98428213f4fc2f58a12b108f9fce9c3b8bde18e315f4ac36
-EBUILD alsa-tools-1.0.13.ebuild 2597 RMD160 c6e11fdeee4c060dd64c45fdba2329186794f289 SHA1 39f19bfe8c6d2ed7e99ae4fdccaef51c0bb578db SHA256 14bffa624da5009dd0650530536cba67b559e9beea7453cab6f0c1bbb96c8f6b
-MD5 91e23340b49967ade00f7c3ab1ada1be alsa-tools-1.0.13.ebuild 2597
-RMD160 c6e11fdeee4c060dd64c45fdba2329186794f289 alsa-tools-1.0.13.ebuild 2597
-SHA256 14bffa624da5009dd0650530536cba67b559e9beea7453cab6f0c1bbb96c8f6b alsa-tools-1.0.13.ebuild 2597
-EBUILD alsa-tools-1.0.14_rc1.ebuild 2603 RMD160 fd7c629ce5e4dd34cc262ff42b51155dbcf02bea SHA1 53ed1da8a309840b839230adf2a6ca3ff3a881f5 SHA256 5f4702898d4b46ed784096e1f57c8cc49d3e84cd8c24ba52a6010e0a2c53d575
-MD5 6fc41187c89e57dcc64a2b12e3a96f2d alsa-tools-1.0.14_rc1.ebuild 2603
-RMD160 fd7c629ce5e4dd34cc262ff42b51155dbcf02bea alsa-tools-1.0.14_rc1.ebuild 2603
-SHA256 5f4702898d4b46ed784096e1f57c8cc49d3e84cd8c24ba52a6010e0a2c53d575 alsa-tools-1.0.14_rc1.ebuild 2603
-MISC ChangeLog 18188 RMD160 293d8b956b5a127d1b631162b4c505ea6f2799c8 SHA1 cc5d2d99afd438186ccfc3507523e7506a68511e SHA256 7c380ac0181ab9c0e8cac182510f281b816d74b8fc6353633d11bd78c8b64a1e
-MD5 92c5aead73ae3f58c851ac7baf654469 ChangeLog 18188
-RMD160 293d8b956b5a127d1b631162b4c505ea6f2799c8 ChangeLog 18188
-SHA256 7c380ac0181ab9c0e8cac182510f281b816d74b8fc6353633d11bd78c8b64a1e ChangeLog 18188
+EBUILD alsa-tools-1.0.13.ebuild 2641 RMD160 a0051986c31f445ff7e957fd0a50a73233d8c902 SHA1 5f546d08ec821302f17d6c13e80d90e876b0dd3d SHA256 c7ca718af9a5e4352a40537d8f98b674d703a02c79f33971bf8219a5a743a021
+MD5 591a5ebd624a83047fc54ad5434ed952 alsa-tools-1.0.13.ebuild 2641
+RMD160 a0051986c31f445ff7e957fd0a50a73233d8c902 alsa-tools-1.0.13.ebuild 2641
+SHA256 c7ca718af9a5e4352a40537d8f98b674d703a02c79f33971bf8219a5a743a021 alsa-tools-1.0.13.ebuild 2641
+EBUILD alsa-tools-1.0.14_rc1.ebuild 2701 RMD160 92a83b1c30f2ec2e61dacbd05e3972d47eb507db SHA1 f2d171ba3c9bd9c789c0dabdfe41099e410bb3b2 SHA256 64919e7bce73eb90f401d7d9c79bbc91f9d33a9092f4a0e38c2d182fe92015cc
+MD5 2040229d78cd1eef680e06469b904a06 alsa-tools-1.0.14_rc1.ebuild 2701
+RMD160 92a83b1c30f2ec2e61dacbd05e3972d47eb507db alsa-tools-1.0.14_rc1.ebuild 2701
+SHA256 64919e7bce73eb90f401d7d9c79bbc91f9d33a9092f4a0e38c2d182fe92015cc alsa-tools-1.0.14_rc1.ebuild 2701
+MISC ChangeLog 18432 RMD160 432d7d75397e82839e0589fe82493c65aafb7b4c SHA1 ad849917a55671971f8c549cd53995194dcedc1b SHA256 a111c283ba2b3c0952081cfc5165facc9169db600bef3b364b53afedf63f3d79
+MD5 5a7869c973ec007fc0525ad17206237d ChangeLog 18432
+RMD160 432d7d75397e82839e0589fe82493c65aafb7b4c ChangeLog 18432
+SHA256 a111c283ba2b3c0952081cfc5165facc9169db600bef3b364b53afedf63f3d79 ChangeLog 18432
 MISC metadata.xml 220 RMD160 e49f8bb330d1798cd2c8ee5335cef1784f0d7ccb SHA1 1b895fe6cae4b8eab08ba1a6a1212baf4b4b4105 SHA256 8570ef11cd59b0d8edb71e78eecaec423616836b10eacb86bee0de941f0ae054
 MD5 7c52acc7d4fe40bac97d3198a43dcbd6 metadata.xml 220
 RMD160 e49f8bb330d1798cd2c8ee5335cef1784f0d7ccb metadata.xml 220
@@ -32,7 +32,7 @@ SHA256 ed4e83c5e9dfb0acb7f9bed2ffcbe387ce74d04845da9b4b0d5636ce7d72560d files/di
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.1 (GNU/Linux)
 
-iD8DBQFFqfR1csIHjyDViGQRAo4mAJ9bMj+DWWan+0X3d14tT12jhaY+jgCeN3g6
-RQwxXp/Zj8QQF/4hqvR3Lsk=
-=yQMV
+iD8DBQFFrUSNAiZjviIA2XgRApHXAJ45W2TMv1ELdgR/BB/XmUaP5v+TdgCgtct6
+Ga8xVL06po7eJYrTT7xttLM=
+=m+Po
 -----END PGP SIGNATURE-----

diff --git a/media-sound/alsa-tools/alsa-tools-1.0.13.ebuild b/media-sound/alsa-tools/alsa-tools-1.0.13.ebuild
index d8cb8484d9ce64aef51037b05ffb6800ef26ed05..42ca2d2b3044146257a16e9f432b42b2ac1cd974 100644 (file)
--- a/media-sound/alsa-tools/alsa-tools-1.0.13.ebuild
+++ b/media-sound/alsa-tools/alsa-tools-1.0.13.ebuild
@@ -1,6 +1,9 @@
-# Copyright 1999-2006 Gentoo Foundation
+# Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/alsa-tools/alsa-tools-1.0.13.ebuild,v 1.8 2006/12/21 12:42:08 kloeri Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/alsa-tools/alsa-tools-1.0.13.ebuild,v 1.9 2007/01/16 21:32:50 flameeyes Exp $
+
+WANT_AUTOMAKE="1.9"
+WANT_AUTOCONF="2.5"
 
 inherit eutils flag-o-matic autotools
 

diff --git a/media-sound/alsa-tools/alsa-tools-1.0.14_rc1.ebuild b/media-sound/alsa-tools/alsa-tools-1.0.14_rc1.ebuild
index 77967e848d4284a77ce6efe93523de01f66364b0..6e98771ea96c7eeb3fd593638527f3c5e41bba4b 100644 (file)
--- a/media-sound/alsa-tools/alsa-tools-1.0.14_rc1.ebuild
+++ b/media-sound/alsa-tools/alsa-tools-1.0.14_rc1.ebuild
@@ -1,6 +1,9 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/alsa-tools/alsa-tools-1.0.14_rc1.ebuild,v 1.5 2007/01/14 09:16:25 josejx Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/alsa-tools/alsa-tools-1.0.14_rc1.ebuild,v 1.6 2007/01/16 21:32:50 flameeyes Exp $
+
+WANT_AUTOMAKE="1.9"
+WANT_AUTOCONF="2.5"
 
 inherit eutils flag-o-matic autotools
 
@@ -63,6 +66,7 @@ src_unpack() {
 
        for dir in echomixer envy24control rmedigicontrol; do
                pushd ${dir} &> /dev/null
+               sed -i -e '/AM_PATH_GTK/d' configure.in
                eautomake
                popd &> /dev/null
        done
@@ -84,7 +88,7 @@ src_compile() {
        for f in ${ALSA_TOOLS}
        do
                cd "${S}/${f}"
-               econf || die "econf failed"
+               econf --with-gtk2 || die "econf failed"
                make || die "make failed"
        done
 }