Replace the asneeded patches for 1.0.18 with the one that has been applied upstream, so that we don't diverge from upstream.

Package-Manager: portage-2.2_rc14/cvs/Linux 2.6.27-gentoo-r2 x86_64

4 files changed, 65 insertions, 21 deletions

diff --git a/media-sound/alsa-tools/ChangeLog b/media-sound/alsa-tools/ChangeLog
index 70d2df1814d7..bf7e2e5be2c2 100644
--- a/media-sound/alsa-tools/ChangeLog
+++ b/media-sound/alsa-tools/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-sound/alsa-tools
 # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/alsa-tools/ChangeLog,v 1.164 2008/11/13 00:00:15 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/alsa-tools/ChangeLog,v 1.165 2008/11/14 03:33:31 flameeyes Exp $
+
+  14 Nov 2008; Diego Pettenò <flameeyes@gentoo.org>
+  files/alsa-tools-1.0.18-asneeded.patch, alsa-tools-1.0.18.ebuild:
+  Replace the asneeded patches for 1.0.18 with the one that has been applied
+  upstream, so that we don't diverge from upstream.
 
   12 Nov 2008; Diego Pettenò <flameeyes@gentoo.org>
   +files/alsa-tools-1.0.18-asneeded.patch, alsa-tools-1.0.18.ebuild:
diff --git a/media-sound/alsa-tools/Manifest b/media-sound/alsa-tools/Manifest
index 883796bbb1fa..d50c4cdad42d 100644
--- a/media-sound/alsa-tools/Manifest
+++ b/media-sound/alsa-tools/Manifest
@@ -3,7 +3,7 @@ Hash: SHA1
 
 AUX alsa-tools-1.0.11-asneeded.patch 1845 RMD160 f1b3fa1fca50da0827beff8f87f514814d938833 SHA1 63a368a5d0e435f085e8d84ff7968bb1ac6e78f3 SHA256 95d69d5b9400818243806b643450f8b75e9411efa2acb8ad02e5063fea0de33c
 AUX alsa-tools-1.0.14-asneeded.patch 256 RMD160 db252d8994605036e5ab200af2d7a9dc633650b5 SHA1 94cd80b03fd5d58ef564e26711c60b95ece3b4d6 SHA256 d309bee615d0d22da845f7448e4be48d9838a006a4b53b745149410123a34ca8
-AUX alsa-tools-1.0.18-asneeded.patch 1792 RMD160 b26c7227cceb63b36de6b2a021528f1275cc7bc3 SHA1 94f14d4c83fdeadea1446132eff63004198b362f SHA256 39debe7729d07f8ae626d62dbfc633b42e0ca9ecc5df0e0f2a66027dbf81ad66
+AUX alsa-tools-1.0.18-asneeded.patch 2898 RMD160 44f2ac59f5868b1bd8ecf6aef3c81a7c49075dc1 SHA1 1233b39b8df8a89581fc69ab24a6b387946f7af7 SHA256 b35d80c761f0994174147dd1ccf36b6d9d707f437246d5784db3fc73c4f850ae
 DIST alsa-tools-1.0.15.tar.bz2 1546790 RMD160 cb6949dc34e3151459e3c81d613f85df30090fed SHA1 202de1344881dd2f1616a697992741ef469adb21 SHA256 5e37ebaf28c75dbd80a10acf5c8ab36646c841646b0787085885e1e124c32b45
 DIST alsa-tools-1.0.16.tar.bz2 1545984 RMD160 f855e72f76efc6c07edd23ffd868f40900d63126 SHA1 8fbd576986e3bc44e6bcdc4f028febe12839140d SHA256 2e62b6a0c04547148539e9c3fb074aa5beb389e0ae2cb6cabb59f67b11cb6565
 DIST alsa-tools-1.0.17.tar.bz2 1546105 RMD160 0ec3f6a27ba085beb183e416bbcfc4658f0710e7 SHA1 a127fcc1ee5d4757b259a50b289db252f2951d7a SHA256 464bfa1a25de822367f95e9050413753601da36cd79302e20eb566cbef834c40
@@ -11,13 +11,13 @@ DIST alsa-tools-1.0.18.tar.bz2 1556113 RMD160 d24648724e3795bf47ec10ac38a2443f6e
 EBUILD alsa-tools-1.0.15.ebuild 3652 RMD160 8b07f5a486f2f19366cb52a724c23c780a999482 SHA1 08f5872163396d26ea125903a60b368fbdad5b2b SHA256 c5cb15e43d438f0336a2ebcadfe19a1f7897b2216e0f7f508d76878ab3faf707
 EBUILD alsa-tools-1.0.16.ebuild 3714 RMD160 add2eb6f7d7a1054c69553c9a6093915bf05f9bf SHA1 a7112584bc83aecb20c88de06fad22afa9ea3bbe SHA256 4cf880ce0f9279e15e77d4b36e2f624d28e3adedc091c04e6ffa5ae41748c370
 EBUILD alsa-tools-1.0.17.ebuild 3741 RMD160 de4013449c9e88b262e6c30258110cf455e8cc75 SHA1 50b1f753588694dc98c7bf3a31fc3def2b3fe515 SHA256 bac568de8e698fcdc99a6acdf8bcf4a5b1d34feb91507269743bb37db071c606
-EBUILD alsa-tools-1.0.18.ebuild 3740 RMD160 b9e9764f0bfd7649041a108d3ace89cb93459f63 SHA1 667365ac834fec4e01416e51ad9540111c055509 SHA256 1512e06791c60537cee8f26c22e4020cf0f4f2939b179710d9185fb1f794002a
-MISC ChangeLog 23569 RMD160 b825a55f53ab4a8599a03fa780c3a618c2827371 SHA1 f06b9bdc43d2fafaccbc27053c5df4ddd1bd0166 SHA256 cb42be6b094c954b56ecb257ba4b460213df6c17dc6434e9a458fe91a224f438
+EBUILD alsa-tools-1.0.18.ebuild 3794 RMD160 0bccad07a7060c82062b759e1a6af4a992e6d9c7 SHA1 d9ef07516dc0a2be9de4aa2e5163396a355decf9 SHA256 c4da546a900cd808058990cb99bf9de65c91bd80537c982c830a9fddf7580e39
+MISC ChangeLog 23820 RMD160 403c3ab412736354db062015cc02c5010eab85da SHA1 a6e4de47d22f60f7c14ae66f2c3ae42e14bb8217 SHA256 50b03e1b0068bbda56cca03647f3cbab47f7c9c1ce292b597d918ab2fc4335fe
 MISC metadata.xml 313 RMD160 268cddbeb91eb55d326ff5736fe51e704b22db82 SHA1 2a144ccf9aa1c3789e7b25cd0e9083c5ce345b67 SHA256 4777a7e011441b62b0e6db0b35035fa99d36a0657aac31f406c7cbeaef906801
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.9 (GNU/Linux)
 
-iEYEARECAAYFAkkbbhUACgkQAiZjviIA2XhBVwCgrFySYrsCrwljApRsk2C0m12x
-dNYAmgMag1dlPxZ+4G5P9eM1NTJBGvt4
-=H4GY
+iEYEARECAAYFAkkc8Y8ACgkQAiZjviIA2Xgt9QCgjtO2ZSffSYmalXqeCEQWQlHM
+xGwAnjm/Q0QxsfcPZqjxKf75c4pcL+Cf
+=5+/R
 -----END PGP SIGNATURE-----
diff --git a/media-sound/alsa-tools/alsa-tools-1.0.18.ebuild b/media-sound/alsa-tools/alsa-tools-1.0.18.ebuild
index a78e8fa89d52..2cca13ac101e 100644
--- a/media-sound/alsa-tools/alsa-tools-1.0.18.ebuild
+++ b/media-sound/alsa-tools/alsa-tools-1.0.18.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 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.18.ebuild,v 1.2 2008/11/13 00:00:15 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/alsa-tools/alsa-tools-1.0.18.ebuild,v 1.3 2008/11/14 03:33:31 flameeyes Exp $
 
 WANT_AUTOMAKE="1.9"
 WANT_AUTOCONF="2.5"
@@ -85,7 +85,6 @@ src_unpack() {
 	unpack ${A}
 	cd "${S}"
 
-	epatch "${FILESDIR}/${PN}-1.0.14-asneeded.patch"
 	epatch "${FILESDIR}/${PN}-1.0.18-asneeded.patch"
 
 	for dir in echomixer envy24control rmedigicontrol; do
@@ -95,6 +94,11 @@ src_unpack() {
 		popd &> /dev/null
 	done
 
+	pushd hdspmixer &> /dev/null
+	sed -i -e '/AM_PATH_GTK/d' configure.in
+	eautoreconf
+	popd &> /dev/null
+
 	elibtoolize
 }
 
diff --git a/media-sound/alsa-tools/files/alsa-tools-1.0.18-asneeded.patch b/media-sound/alsa-tools/files/alsa-tools-1.0.18-asneeded.patch
index 7d5024403d7a..841c3a392c2f 100644
--- a/media-sound/alsa-tools/files/alsa-tools-1.0.18-asneeded.patch
+++ b/media-sound/alsa-tools/files/alsa-tools-1.0.18-asneeded.patch
@@ -1,7 +1,27 @@
-Index: alsa-tools-1.0.18/echomixer/Makefile.am
-===================================================================
---- alsa-tools-1.0.18.orig/echomixer/Makefile.am
-+++ alsa-tools-1.0.18/echomixer/Makefile.am
+From 56970e8143b4d171a118d114b1ddfa7621401127 Mon Sep 17 00:00:00 2001
+From: =?utf-8?q?Diego=20'Flameeyes'=20Petten=C3=B2?= <flameeyes@gmail.com>
+Date: Thu, 13 Nov 2008 13:13:53 +0100
+Subject: [PATCH] Fix building of alsa-tools when using the --as-needed linker option.
+MIME-Version: 1.0
+Content-Type: text/plain; charset=utf-8
+Content-Transfer-Encoding: 8bit
+
+Please note that LDFLAGS is the _wrong_ variable to pass libraries
+with, automake tells you to use _LDADD for binaries and _LIBADD for
+libraries, while autoconf wants them in the LIBS variable.
+
+Signed-off-by: Diego 'Flameeyes' Pettenò <flameeyes@gmail.com>
+---
+ echomixer/Makefile.am      |    2 +-
+ envy24control/Makefile.am  |    2 +-
+ hdspmixer/configure.in     |    2 +-
+ rmedigicontrol/Makefile.am |    2 +-
+ 4 files changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/echomixer/Makefile.am b/echomixer/Makefile.am
+index a9dfaf0..1af72c0 100644
+--- a/echomixer/Makefile.am
++++ b/echomixer/Makefile.am
 @@ -2,7 +2,7 @@ AM_CFLAGS = @ECHOMIXER_CFLAGS@
  bin_PROGRAMS = echomixer
  man_MANS = 
@@ -11,10 +31,10 @@ Index: alsa-tools-1.0.18/echomixer/Makefile.am
  EXTRA_DIST = gitcompile configure.in-gtk1 configure.in-gtk2
  AUTOMAKE_OPTIONS = foreign
  
-Index: alsa-tools-1.0.18/envy24control/Makefile.am
-===================================================================
---- alsa-tools-1.0.18.orig/envy24control/Makefile.am
-+++ alsa-tools-1.0.18/envy24control/Makefile.am
+diff --git a/envy24control/Makefile.am b/envy24control/Makefile.am
+index 72fe707..e29c408 100644
+--- a/envy24control/Makefile.am
++++ b/envy24control/Makefile.am
 @@ -4,7 +4,7 @@ man_MANS = envy24control.1
  envy24control_SOURCES = envy24control.c envy24control.h levelmeters.c midi.c \
                          mixer.c patchbay.c hardware.c driverevents.c volume.c \
@@ -24,10 +44,22 @@ Index: alsa-tools-1.0.18/envy24control/Makefile.am
  EXTRA_DIST = gitcompile envy24control.1 depcomp configure.in-gtk1 \
  	     configure.in-gtk2 strstr_icase_blank.c new_process.c \
  	     README.profiles
-Index: alsa-tools-1.0.18/rmedigicontrol/Makefile.am
-===================================================================
---- alsa-tools-1.0.18.orig/rmedigicontrol/Makefile.am
-+++ alsa-tools-1.0.18/rmedigicontrol/Makefile.am
+diff --git a/hdspmixer/configure.in b/hdspmixer/configure.in
+index 6fb5abe..8f2c498 100644
+--- a/hdspmixer/configure.in
++++ b/hdspmixer/configure.in
+@@ -36,6 +36,6 @@ FLTK_CXXFLAGS="`$FLTK_CONFIG --cxxflags` -fno-exceptions"
+ FLTK_LIBS="`$FLTK_CONFIG --ldflags`"
+ 
+ CXXFLAGS="$CXXFLAGS $ALSA_CFLAGS $FLTK_CXXFLAGS"
+-LDFLAGS="$LDFLAGS $ALSA_LIBS $FLTK_LIBS"
++LIBS="$LIBS $ALSA_LIBS $FLTK_LIBS"
+ 
+ AC_OUTPUT(Makefile src/Makefile pixmaps/Makefile)
+diff --git a/rmedigicontrol/Makefile.am b/rmedigicontrol/Makefile.am
+index 88e9a3f..bf24c5c 100644
+--- a/rmedigicontrol/Makefile.am
++++ b/rmedigicontrol/Makefile.am
 @@ -2,7 +2,7 @@ AM_CFLAGS = @RMEDIGICONTROL_CFLAGS@
  bin_PROGRAMS = rmedigicontrol
  rmedigicontrol_SOURCES = rmedigicontrol.c rmedigicontrol.h level.c loopback.c
@@ -37,3 +69,6 @@ Index: alsa-tools-1.0.18/rmedigicontrol/Makefile.am
  
  EXTRA_DIST = gitcompile depcomp configure.in-gtk1 configure.in-gtk2
  AUTOMAKE_OPTIONS = foreign
+-- 
+1.6.0.3
+