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

(Portage version: 2.2_rc14/cvs/Linux 2.6.27-gentoo-r2 x86_64)

3 files changed, 59 insertions, 15 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/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
+