Variable quoting, fix broken patch for bug #238397, remove no longer used patch (bug #226759), properly eautoreconf instead of patching configure directly.

(Portage version: 2.2_rc9/cvs/Linux 2.6.26.5 x86_64)

6 files changed, 31 insertions, 148 deletions

diff --git a/media-sound/alsamixergui/ChangeLog b/media-sound/alsamixergui/ChangeLog
index 9eb407140686..a12f8d114bb5 100644
--- a/media-sound/alsamixergui/ChangeLog
+++ b/media-sound/alsamixergui/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for media-sound/alsamixergui
 # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/alsamixergui/ChangeLog,v 1.27 2008/02/29 19:57:54 carlo Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/alsamixergui/ChangeLog,v 1.28 2008/09/22 18:51:08 aballier Exp $
+
+  22 Sep 2008; Alexis Ballier <aballier@gentoo.org>
+  +files/alsamixergui-0.9.0.1.2-fltk-1.1.patch, -files/fltk-1.1+gcc3.diff,
+  -files/gentoo.diff, files/segfault-on-exit.patch,
+  alsamixergui-0.9.0.1.2-r4.ebuild:
+  Variable quoting, fix broken patch for bug #238397, remove no longer used
+  patch (bug #226759), properly eautoreconf instead of patching configure
+  directly.
 
   29 Feb 2008; Carsten Lohrke <carlo@gentoo.org>
   alsamixergui-0.9.0.1.2-r4.ebuild:
diff --git a/media-sound/alsamixergui/alsamixergui-0.9.0.1.2-r4.ebuild b/media-sound/alsamixergui/alsamixergui-0.9.0.1.2-r4.ebuild
index 6a7ceacba957..cdb811caadb5 100644
--- a/media-sound/alsamixergui/alsamixergui-0.9.0.1.2-r4.ebuild
+++ b/media-sound/alsamixergui/alsamixergui-0.9.0.1.2-r4.ebuild
@@ -1,10 +1,9 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/alsamixergui/alsamixergui-0.9.0.1.2-r4.ebuild,v 1.12 2008/02/29 19:57:54 carlo Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/alsamixergui/alsamixergui-0.9.0.1.2-r4.ebuild,v 1.13 2008/09/22 18:51:08 aballier Exp $
 
-IUSE=""
 
-inherit eutils
+inherit eutils autotools
 
 NATIVE_VER=0.9.0rc1-2
 S=${WORKDIR}/${PN}-${NATIVE_VER}
@@ -16,6 +15,7 @@ SRC_URI="ftp://www.iua.upf.es/pub/mdeboer/projects/alsamixergui/${PN}-${NATIVE_V
 SLOT="0"
 LICENSE="GPL-2"
 KEYWORDS="amd64 ppc ppc64 sparc x86"
+IUSE=""
 
 DEPEND=">=media-libs/alsa-lib-0.9.0_rc1
 	>=media-sound/alsa-utils-0.9.0_rc1
@@ -23,10 +23,11 @@ DEPEND=">=media-libs/alsa-lib-0.9.0_rc1
 
 src_unpack() {
 	unpack ${A}
-	cd ${S}
-	epatch ${FILESDIR}/gentoo.diff
-	epatch ${FILESDIR}/${P}-gcc34.patch
-	epatch ${FILESDIR}/segfault-on-exit.patch
+	cd "${S}"
+	epatch "${FILESDIR}/${P}-gcc34.patch"
+	epatch "${FILESDIR}/segfault-on-exit.patch"
+	epatch "${FILESDIR}/${P}-fltk-1.1.patch"
+	eautoreconf
 }
 
 src_compile() {
diff --git a/media-sound/alsamixergui/files/alsamixergui-0.9.0.1.2-fltk-1.1.patch b/media-sound/alsamixergui/files/alsamixergui-0.9.0.1.2-fltk-1.1.patch
new file mode 100644
index 000000000000..d1581d06e90d
--- /dev/null
+++ b/media-sound/alsamixergui/files/alsamixergui-0.9.0.1.2-fltk-1.1.patch
@@ -0,0 +1,13 @@
+Index: alsamixergui-0.9.0rc1-2/configure.in
+===================================================================
+--- alsamixergui-0.9.0rc1-2.orig/configure.in
++++ alsamixergui-0.9.0rc1-2/configure.in
+@@ -11,7 +11,7 @@ AC_PROG_INSTALL
+ AC_PROG_LN_S
+ 
+ dnl Checks for libraries.
+-AC_CHECK_LIB(fltk,numericsort,,AC_MSG_ERROR("missing fltk"))
++AC_CHECK_LIB(fltk,fl_numericsort,,AC_MSG_ERROR("missing fltk"))
+ AM_PATH_ALSA(0.9.0)
+ 
+ dnl Checks for header files.
diff --git a/media-sound/alsamixergui/files/fltk-1.1+gcc3.diff b/media-sound/alsamixergui/files/fltk-1.1+gcc3.diff
deleted file mode 100644
index 6b0463d66fcd..000000000000
--- a/media-sound/alsamixergui/files/fltk-1.1+gcc3.diff
+++ /dev/null
@@ -1,72 +0,0 @@
-diff -urN alsamixergui-0.9.0rc1-2/Makefile.am alsamixergui-0.9.0rc1-2-modified/Makefile.am
---- alsamixergui-0.9.0rc1-2/Makefile.am	Fri Apr 26 05:16:23 2002
-+++ alsamixergui-0.9.0rc1-2-modified/Makefile.am	Fri Sep 20 13:59:06 2002
-@@ -1,2 +1,2 @@
--SUBDIRS=src 
-+SUBDIRS = src 
- DISTCLEANFILES = configure Makefile.in missing install-sh mkinstalldirs COPYING INSTALL
-diff -urN alsamixergui-0.9.0rc1-2/configure alsamixergui-0.9.0rc1-2-modified/configure
---- alsamixergui-0.9.0rc1-2/configure	Fri May  3 04:40:38 2002
-+++ alsamixergui-0.9.0rc1-2-modified/configure	Fri Sep 20 14:08:14 2002
-@@ -1469,8 +1469,8 @@
- fi
- 
- 
--echo $ac_n "checking for numericsort in -lfltk""... $ac_c" 1>&6
--echo "configure:1474: checking for numericsort in -lfltk" >&5
-+echo $ac_n "checking for fl_numericsort in -lfltk""... $ac_c" 1>&6
-+echo "configure:1474: checking for fl_numericsort in -lfltk" >&5
- ac_lib_var=`echo fltk'_'numericsort | sed 'y%./+-%__p_%'`
- if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
-@@ -1483,10 +1483,10 @@
- /* Override any gcc2 internal prototype to avoid an error.  */
- /* We use char because int might match the return type of a gcc2
-     builtin and then its argument prototype would still apply.  */
--char numericsort();
-+char fl_numericsort();
- 
- int main() {
--numericsort()
-+fl_numericsort()
- ; return 0; }
- EOF
- if { (eval echo configure:1493: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-diff -urN alsamixergui-0.9.0rc1-2/configure.in alsamixergui-0.9.0rc1-2-modified/configure.in
---- alsamixergui-0.9.0rc1-2/configure.in	Fri May  3 04:40:21 2002
-+++ alsamixergui-0.9.0rc1-2-modified/configure.in	Fri Sep 20 13:42:05 2002
-@@ -11,7 +11,7 @@
- AC_PROG_LN_S
- 
- dnl Checks for libraries.
--AC_CHECK_LIB(fltk,numericsort,,AC_MSG_ERROR("missing fltk"))
-+AC_CHECK_LIB(fltk,fl_numericsort,,AC_MSG_ERROR("missing fltk"))
- AM_PATH_ALSA(0.9.0)
- 
- dnl Checks for header files.
-diff -urN alsamixergui-0.9.0rc1-2/src/Fl_AM.cxx alsamixergui-0.9.0rc1-2-modified/src/Fl_AM.cxx
---- alsamixergui-0.9.0rc1-2/src/Fl_AM.cxx	Fri May  3 04:37:27 2002
-+++ alsamixergui-0.9.0rc1-2-modified/src/Fl_AM.cxx	Fri Sep 20 13:41:59 2002
-@@ -215,7 +215,7 @@
- 	Fl::add_timeout(0.05,gui_idle_cb,0);
- 	
- #if FL_MAJOR_VERSION == 1 && FL_MINOR_VERSION >= 1
--	Fl::visible_focus(0);
-+//	Fl::visible_focus(0);
- #endif
- 
- 	Fl::run();
-diff -urN alsamixergui-0.9.0rc1-2/src/Fl_Pixmap_Button.H alsamixergui-0.9.0rc1-2-modified/src/Fl_Pixmap_Button.H
---- alsamixergui-0.9.0rc1-2/src/Fl_Pixmap_Button.H	Fri Apr 26 03:23:39 2002
-+++ alsamixergui-0.9.0rc1-2-modified/src/Fl_Pixmap_Button.H	Fri Sep 20 13:42:07 2002
-@@ -48,8 +48,8 @@
- #endif
- 	
- 	if (pw<0) {
--#if FL_MAJOR_VERSION == 1 && FL_MINOR_VERSION == 0
--		fl_measure_pixmap(p->data,pw,ph);
-+#if FL_MAJOR_VERSION == 1 && FL_MINOR_VERSION >= 0
-+		fl_measure_pixmap(p->data(),pw,ph);
- #else
- 		fl_measure_pixmap(p->data(),pw,ph);
- #endif
diff --git a/media-sound/alsamixergui/files/gentoo.diff b/media-sound/alsamixergui/files/gentoo.diff
deleted file mode 100644
index 3dc5239600d9..000000000000
--- a/media-sound/alsamixergui/files/gentoo.diff
+++ /dev/null
@@ -1,67 +0,0 @@
-diff -urN alsamixergui-0.9.0rc1-2/configure alsamixergui-0.9.0rc1-2-modified/configure
---- alsamixergui-0.9.0rc1-2/configure	2002-05-03 04:40:38.000000000 -0500
-+++ alsamixergui-0.9.0rc1-2-modified/configure	2003-01-02 19:35:55.000000000 -0600
-@@ -1468,10 +1468,10 @@
-   echo "$ac_t""no" 1>&6
- fi
- 
--
--echo $ac_n "checking for numericsort in -lfltk""... $ac_c" 1>&6
--echo "configure:1474: checking for numericsort in -lfltk" >&5
--ac_lib_var=`echo fltk'_'numericsort | sed 'y%./+-%__p_%'`
-+ac_link='${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
-+echo $ac_n "checking for main in -lfltk""... $ac_c" 1>&6
-+echo "configure:1474: checking for main in -lfltk" >&5
-+ac_lib_var=`echo fltk'_'main | sed 'y%./+-%__p_%'`
- if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-@@ -1481,12 +1481,12 @@
- #line 1482 "configure"
- #include "confdefs.h"
- /* Override any gcc2 internal prototype to avoid an error.  */
--/* We use char because int might match the return type of a gcc2
--    builtin and then its argument prototype would still apply.  */
--char numericsort();
-+/* We use char because int might match the return type of a gcc2 */
-+/* builtin and then its argument prototype would still apply.  */
-+/* char main(); */
- 
- int main() {
--numericsort()
-+main()
- ; return 0; }
- EOF
- if { (eval echo configure:1493: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-@@ -1656,10 +1656,10 @@
- ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
- cross_compiling=$ac_cv_prog_cc_cross
- 
--
--echo $ac_n "checking for snd_seq_create_event in -lasound""... $ac_c" 1>&6
--echo "configure:1662: checking for snd_seq_create_event in -lasound" >&5
--ac_lib_var=`echo asound'_'snd_seq_create_event | sed 'y%./+-%__p_%'`
-+ac_link='${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
-+echo $ac_n "checking for main in -lasound""... $ac_c" 1>&6
-+echo "configure:1662: checking for main in -lasound" >&5
-+ac_lib_var=`echo asound'_'main | sed 'y%./+-%__p_%'`
- if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-@@ -1669,12 +1669,12 @@
- #line 1670 "configure"
- #include "confdefs.h"
- /* Override any gcc2 internal prototype to avoid an error.  */
--/* We use char because int might match the return type of a gcc2
--    builtin and then its argument prototype would still apply.  */
--char snd_seq_create_event();
-+/* We use char because int might match the return type of a gcc2 */
-+/* builtin and then its argument prototype would still apply.  */
-+/* char main(); */
- 
- int main() {
--snd_seq_create_event()
-+main()
- ; return 0; }
- EOF
- if { (eval echo configure:1681: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
diff --git a/media-sound/alsamixergui/files/segfault-on-exit.patch b/media-sound/alsamixergui/files/segfault-on-exit.patch
index c1e1cc19deab..0435146d7d7a 100644
--- a/media-sound/alsamixergui/files/segfault-on-exit.patch
+++ b/media-sound/alsamixergui/files/segfault-on-exit.patch
@@ -1,5 +1,5 @@
 --- src/alsamixer.cxx	2004-12-07 00:02:52.649159520 +1100
-+++ /home/jjezak/alsamixer.cxx	2004-12-07 00:00:26.385394992 +1100
++++ src/alsamixer.cxx	2004-12-07 00:00:26.385394992 +1100
 @@ -1869,7 +1869,7 @@
  			if (procWindow) delete procWindow;
  			if (mainWindow) delete mainWindow;