Add patch from Matthias Schwarzott (zzam) to build with --as-needed.

Package-Manager: portage-2.1_pre9-r4

4 files changed, 83 insertions, 13 deletions

diff --git a/media-sound/alsa-tools/ChangeLog b/media-sound/alsa-tools/ChangeLog
index b2b2cfa63834..c72e2da1e651 100644
--- a/media-sound/alsa-tools/ChangeLog
+++ b/media-sound/alsa-tools/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-sound/alsa-tools
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/alsa-tools/ChangeLog,v 1.101 2006/04/22 17:02:22 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/alsa-tools/ChangeLog,v 1.102 2006/04/24 13:53:59 flameeyes Exp $
+
+  24 Apr 2006; Diego Pettenò <flameeyes@gentoo.org>
+  +files/alsa-tools-1.0.11-asneeded.patch, alsa-tools-1.0.11.ebuild:
+  Add patch from Matthias Schwarzott (zzam) to build with --as-needed.
 
   22 Apr 2006; Chris Gianelloni <wolf31o2@gentoo.org>
   alsa-tools-1.0.11.ebuild:
diff --git a/media-sound/alsa-tools/Manifest b/media-sound/alsa-tools/Manifest
index 6d7f84e72ce8..d3133e516e36 100644
--- a/media-sound/alsa-tools/Manifest
+++ b/media-sound/alsa-tools/Manifest
@@ -1,18 +1,38 @@
-MD5 8a5e0a3291eaa175ca105bb7e3c54977 ChangeLog 14163
-RMD160 0753a23285464e7cc7dab83d63af2349a3d76fef ChangeLog 14163
-SHA256 71f27a6471e7768e29ef2061fa0e5bf6e9b37f0cbfb70a1bb6af1ab7fcb03060 ChangeLog 14163
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+AUX alsa-tools-1.0.11-asneeded.patch 1845 RMD160 f1b3fa1fca50da0827beff8f87f514814d938833 SHA1 63a368a5d0e435f085e8d84ff7968bb1ac6e78f3 SHA256 95d69d5b9400818243806b643450f8b75e9411efa2acb8ad02e5063fea0de33c size 1845
+MD5 f49f91697e8927971c5b0c65338eac5c files/alsa-tools-1.0.11-asneeded.patch 1845
+RMD160 f1b3fa1fca50da0827beff8f87f514814d938833 files/alsa-tools-1.0.11-asneeded.patch 1845
+SHA256 95d69d5b9400818243806b643450f8b75e9411efa2acb8ad02e5063fea0de33c files/alsa-tools-1.0.11-asneeded.patch 1845
+DIST alsa-tools-1.0.10.tar.bz2 1376274 size 1376274
+DIST alsa-tools-1.0.11.tar.bz2 1445743 RMD160 b011fbbf5ca387a565fa251e7d351b14f05373cd SHA256 0dd23c7412ca6ea9c005a9a95b0abc46f22792e5df1b4dac7bca2b56335b5e54 size 1445743
+EBUILD alsa-tools-1.0.10.ebuild 2404 RMD160 aa90eceadb72dac0a0f54a05f363ccacfba8cbbd SHA1 9b1fb186c4e98e82f12db4f83a6e25a1dcaa5975 SHA256 c093e49f753d6ed4328c720845f32cba073c14d8ee60ee9e35dad2c7ae685aa5 size 2404
 MD5 ffcb7188c78099edf2d2f753c4e5b780 alsa-tools-1.0.10.ebuild 2404
 RMD160 aa90eceadb72dac0a0f54a05f363ccacfba8cbbd alsa-tools-1.0.10.ebuild 2404
 SHA256 c093e49f753d6ed4328c720845f32cba073c14d8ee60ee9e35dad2c7ae685aa5 alsa-tools-1.0.10.ebuild 2404
-MD5 f265c805759d75c6bc06b67eb0dca254 alsa-tools-1.0.11.ebuild 2409
-RMD160 59ce88a4760076464ff12bfd9dd8aac22ace80ef alsa-tools-1.0.11.ebuild 2409
-SHA256 c5b73b3b7a5aaff87afb4f45af83ccdcd2ee0c1f794a86741de72c7ff732d5c2 alsa-tools-1.0.11.ebuild 2409
+EBUILD alsa-tools-1.0.11.ebuild 2601 RMD160 9493efc488bec4a8ac51ee4c872c1aaa820d0c18 SHA1 a7192d8ffaaee324443287cd38ef278c3e9fac46 SHA256 f3bc8b055f0470c9999b988a09431e1704c6cab07f37e5ba6228474e5fc5d317 size 2601
+MD5 203c83c5f3fc2acd265bf9a57f3e81e7 alsa-tools-1.0.11.ebuild 2601
+RMD160 9493efc488bec4a8ac51ee4c872c1aaa820d0c18 alsa-tools-1.0.11.ebuild 2601
+SHA256 f3bc8b055f0470c9999b988a09431e1704c6cab07f37e5ba6228474e5fc5d317 alsa-tools-1.0.11.ebuild 2601
+MISC ChangeLog 14358 RMD160 6e236c138a5070b4ca90d4923a027f2e48002a60 SHA1 3729ede370f59976bf4f3fc5fb20271d8ccdfa8d SHA256 2d708c7a4533c9526e06293fb502eab5d402779e034de96f57bdef5df785c087 size 14358
+MD5 aaa6a85e0f36ca32a901ef027aecf797 ChangeLog 14358
+RMD160 6e236c138a5070b4ca90d4923a027f2e48002a60 ChangeLog 14358
+SHA256 2d708c7a4533c9526e06293fb502eab5d402779e034de96f57bdef5df785c087 ChangeLog 14358
+MISC metadata.xml 158 RMD160 6842e2189a50bd8a98e84802c38180ac1421c00e SHA1 703cea5a2109d41f7c87993c1f01d418a4c85174 SHA256 dfb5b47e6836db39fb187301dfcff1c2605e91d13d21db160806a563d8c75f9b size 158
+MD5 a1eaeb2ae801daeb712c90c060e922dc metadata.xml 158
+RMD160 6842e2189a50bd8a98e84802c38180ac1421c00e metadata.xml 158
+SHA256 dfb5b47e6836db39fb187301dfcff1c2605e91d13d21db160806a563d8c75f9b metadata.xml 158
 MD5 f679ba128fdc2882d1f7197dbc2a04d8 files/digest-alsa-tools-1.0.10 71
 RMD160 dcbf501cb7a97b61e50444fa5c6935e292245851 files/digest-alsa-tools-1.0.10 71
 SHA256 5168d7bf0b826864d5a76c634119923a4f5d25d87d29e2dd56898de913c5ece6 files/digest-alsa-tools-1.0.10 71
 MD5 34b1ebcbc8fcc1e8eb025b63e55618e6 files/digest-alsa-tools-1.0.11 259
 RMD160 2336ac69e23105cda0913e10d3a10f045ea99b0e files/digest-alsa-tools-1.0.11 259
 SHA256 49c70401b586b38e09532a5a866450d92f6890a13464c8280a472afdce41612f files/digest-alsa-tools-1.0.11 259
-MD5 a1eaeb2ae801daeb712c90c060e922dc metadata.xml 158
-RMD160 6842e2189a50bd8a98e84802c38180ac1421c00e metadata.xml 158
-SHA256 dfb5b47e6836db39fb187301dfcff1c2605e91d13d21db160806a563d8c75f9b metadata.xml 158
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.3 (GNU/Linux)
+
+iD8DBQFETNiPAiZjviIA2XgRAnXOAKDYkqqkN11oBoCK7mhHJXQ/YkXFcACg1F2b
+KECQ9vOho5cN4HOXmx7fy34=
+=EzTI
+-----END PGP SIGNATURE-----
diff --git a/media-sound/alsa-tools/alsa-tools-1.0.11.ebuild b/media-sound/alsa-tools/alsa-tools-1.0.11.ebuild
index 5070ae4856a5..227da548a4cf 100644
--- a/media-sound/alsa-tools/alsa-tools-1.0.11.ebuild
+++ b/media-sound/alsa-tools/alsa-tools-1.0.11.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2006 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.11.ebuild,v 1.3 2006/04/22 17:02:22 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/alsa-tools/alsa-tools-1.0.11.ebuild,v 1.4 2006/04/24 13:53:59 flameeyes Exp $
 
-inherit gnuconfig eutils flag-o-matic
+inherit gnuconfig eutils flag-o-matic autotools
 
 MY_P="${P/_rc/rc}"
 
@@ -56,8 +56,18 @@ pkg_setup() {
 
 src_unpack() {
 	unpack ${A}
-	cd ${S}
+	cd "${S}"
+
+	epatch "${FILESDIR}/${P}-asneeded.patch"
+
+	for dir in echomixer envy24control rmedigicontrol; do
+		pushd ${dir} &> /dev/null
+		eautomake
+		popd &> /dev/null
+	done
+
 	gnuconfig_update
+	elibtoolize
 }
 
 src_compile() {
diff --git a/media-sound/alsa-tools/files/alsa-tools-1.0.11-asneeded.patch b/media-sound/alsa-tools/files/alsa-tools-1.0.11-asneeded.patch
new file mode 100644
index 000000000000..60f34c5432a0
--- /dev/null
+++ b/media-sound/alsa-tools/files/alsa-tools-1.0.11-asneeded.patch
@@ -0,0 +1,36 @@
+diff -ru alsa-tools-1.0.11-orig/echomixer/Makefile.am alsa-tools-1.0.11/echomixer/Makefile.am
+--- alsa-tools-1.0.11-orig/echomixer/Makefile.am	2006-04-24 14:39:38.000000000 +0200
++++ alsa-tools-1.0.11/echomixer/Makefile.am	2006-04-24 14:38:00.000000000 +0200
+@@ -2,7 +2,7 @@
+ bin_PROGRAMS = echomixer
+ man_MANS = 
+ echomixer_SOURCES = echomixer.c 
+-echomixer_LDFLAGS = @ECHOMIXER_LIBS@
++echomixer_LDADD = @ECHOMIXER_LIBS@
+ EXTRA_DIST = configure.in-gtk1 configure.in-gtk2
+ AUTOMAKE_OPTIONS = foreign
+ 
+diff -ru alsa-tools-1.0.11-orig/envy24control/Makefile.am alsa-tools-1.0.11/envy24control/Makefile.am
+--- alsa-tools-1.0.11-orig/envy24control/Makefile.am	2006-04-24 14:39:14.000000000 +0200
++++ alsa-tools-1.0.11/envy24control/Makefile.am	2006-04-24 14:43:16.000000000 +0200
+@@ -4,7 +4,7 @@
+ envy24control_SOURCES = envy24control.c envy24control.h levelmeters.c midi.c \
+                         mixer.c patchbay.c hardware.c driverevents.c volume.c \
+ 			profiles.c profiles.h midi.h config.c config.h
+-envy24control_LDFLAGS = @ENVY24CONTROL_LIBS@
++envy24control_LDADD = @ENVY24CONTROL_LIBS@
+ EXTRA_DIST = envy24control.1 depcomp configure.in-gtk1 configure.in-gtk2 \
+ 	     strstr_icase_blank.c new_process.c README.profiles
+ AUTOMAKE_OPTIONS = foreign
+diff -ru alsa-tools-1.0.11-orig/rmedigicontrol/Makefile.am alsa-tools-1.0.11/rmedigicontrol/Makefile.am
+--- alsa-tools-1.0.11-orig/rmedigicontrol/Makefile.am	2006-04-24 14:39:14.000000000 +0200
++++ alsa-tools-1.0.11/rmedigicontrol/Makefile.am	2006-04-24 14:45:40.000000000 +0200
+@@ -2,7 +2,7 @@
+ bin_PROGRAMS = rmedigicontrol
+ rmedigicontrol_SOURCES = rmedigicontrol.c rmedigicontrol.h level.c loopback.c
+ 
+-rmedigicontrol_LDFLAGS = @RMEDIGICONTROL_LIBS@
++rmedigicontrol_LDADD = @RMEDIGICONTROL_LIBS@
+ 
+ EXTRA_DIST = depcomp configure.in-gtk1 configure.in-gtk2
+ AUTOMAKE_OPTIONS = foreign
\ No newline at end of file