Fix arts depends (unneeded, see #150814). Fix compiler warnings

(Portage version: 2.1.2_rc1-r1)

5 files changed, 257 insertions, 4 deletions

diff --git a/x11-misc/switcher/ChangeLog b/x11-misc/switcher/ChangeLog
index edfa3bf8fb7a..6569ee122d12 100644
--- a/x11-misc/switcher/ChangeLog
+++ b/x11-misc/switcher/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for x11-misc/switcher
-# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/switcher/ChangeLog,v 1.6 2005/07/26 14:59:58 dholm Exp $
+# Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/switcher/ChangeLog,v 1.7 2006/10/30 20:41:36 troll Exp $
+
+  30 Oct 2006; Przemysław Maciąg <troll@gentoo.org>
+  +files/switcher-0.3.7a-clear_from_warnings.patch,
+  +files/switcher-0.3.7a-noarts.patch, switcher-0.3.7a.ebuild:
+  Fixing unneeded arts dependency from configure script (see #150814). Other
+  patch for gcc warnings
 
   26 Jul 2005; David Holm <dholm@gentoo.org> switcher-0.3.7a.ebuild:
   Added to ~ppc.
diff --git a/x11-misc/switcher/files/digest-switcher-0.3.7a b/x11-misc/switcher/files/digest-switcher-0.3.7a
index 807e95b332a8..1e14b0fa2840 100644
--- a/x11-misc/switcher/files/digest-switcher-0.3.7a
+++ b/x11-misc/switcher/files/digest-switcher-0.3.7a
@@ -1 +1,3 @@
 MD5 c6901f46c172712dc7372671423581bf switcher-0.3.7a.tar.bz2 375260
+RMD160 d8972ef2687aa31ee975d1d996bfa006415d5228 switcher-0.3.7a.tar.bz2 375260
+SHA256 5b96752caab7da521a6350096fe0c33f11488dd8960c7ff8fd58c077e20ae7fe switcher-0.3.7a.tar.bz2 375260
diff --git a/x11-misc/switcher/files/switcher-0.3.7a-clear_from_warnings.patch b/x11-misc/switcher/files/switcher-0.3.7a-clear_from_warnings.patch
new file mode 100644
index 000000000000..f443a582a6f8
--- /dev/null
+++ b/x11-misc/switcher/files/switcher-0.3.7a-clear_from_warnings.patch
@@ -0,0 +1,74 @@
+diff -Naur switcher-0.3.7a-orig/acinclude.m4 switcher-0.3.7a/acinclude.m4
+--- switcher-0.3.7a-orig/acinclude.m4	2006-10-29 14:17:59.000000000 +0000
++++ switcher-0.3.7a/acinclude.m4	2006-10-29 14:19:04.000000000 +0000
+@@ -2559,7 +2559,7 @@
+   if test "$GXX" = "yes" || test "$CXX" = "KCC"; then
+     if test "$kde_use_debug_code" != "no"; then
+       if test "$CXX" = "KCC"; then
+-        CXXFLAGS="+K0 -Wall -pedantic -W -Wpointer-arith -Wmissing-prototypes -Wwrite-strings $CXXFLAGS"
++        CXXFLAGS="+K0 -Wall -pedantic -W -Wpointer-arith -Wwrite-strings $CXXFLAGS"
+       else
+         if test "$kde_use_debug_code" = "full"; then
+           CXXFLAGS="-g3 $CXXFLAGS"
+@@ -2597,13 +2597,12 @@
+       if test "$GCC" = "yes"; then
+         case $host in
+           *-*-linux-gnu)	
+-            CFLAGS="-ansi -W -Wall -pedantic -Wshadow -Wpointer-arith -Wmissing-prototypes -Wwrite-strings -D_XOPEN_SOURCE=500 -D_BSD_SOURCE $CFLAGS"
++            CFLAGS="-ansi -W -Wall -pedantic -Wshadow -Wpointer-arith -Wwrite-strings -D_XOPEN_SOURCE=500 -D_BSD_SOURCE $CFLAGS"
+             CXXFLAGS="-ansi -D_XOPEN_SOURCE=500 -D_BSD_SOURCE -Wcast-align -Wconversion $CXXFLAGS"
+           ;;
+         esac
+-        CXXFLAGS="-Wall -pedantic -W -Wpointer-arith -Wmissing-prototypes -Wwrite-strings $CXXFLAGS"
++        CXXFLAGS="-Wall -pedantic -W -Wpointer-arith -Wwrite-strings $CXXFLAGS"
+         KDE_CHECK_COMPILER_FLAG(Wundef,[CXXFLAGS="-Wundef $CXXFLAGS"])
+-        KDE_CHECK_COMPILER_FLAG(Wbad-function-cast,[CXXFLAGS="-Wbad-function-cast $CXXFLAGS"])
+         KDE_CHECK_COMPILER_FLAG(Wno-long-long,[CXXFLAGS="-Wno-long-long $CXXFLAGS"])
+         KDE_CHECK_COMPILER_FLAG(Wnon-virtual-dtor,[CXXFLAGS="-Wnon-virtual-dtor $CXXFLAGS"])
+      fi
+@@ -2982,7 +2981,7 @@
+    AC_CACHE_VAL(kde_cv_func_stpcpy,
+    [
+    kde_safe_cxxflags=$CXXFLAGS
+-   CXXFLAGS="-Wmissing-prototypes -Werror"
++   CXXFLAGS="-Werror"
+    AC_LANG_SAVE
+    AC_LANG_CPLUSPLUS
+    AC_TRY_COMPILE([
+diff -Naur switcher-0.3.7a-orig/aclocal.m4 switcher-0.3.7a/aclocal.m4
+--- switcher-0.3.7a-orig/aclocal.m4	2006-10-29 14:17:59.000000000 +0000
++++ switcher-0.3.7a/aclocal.m4	2006-10-29 14:19:32.000000000 +0000
+@@ -2571,7 +2571,7 @@
+   if test "$GXX" = "yes" || test "$CXX" = "KCC"; then
+     if test "$kde_use_debug_code" != "no"; then
+       if test "$CXX" = "KCC"; then
+-        CXXFLAGS="+K0 -Wall -pedantic -W -Wpointer-arith -Wmissing-prototypes -Wwrite-strings $CXXFLAGS"
++        CXXFLAGS="+K0 -Wall -pedantic -W -Wpointer-arith -Wwrite-strings $CXXFLAGS"
+       else
+         if test "$kde_use_debug_code" = "full"; then
+           CXXFLAGS="-g3 $CXXFLAGS"
+@@ -2609,13 +2609,12 @@
+       if test "$GCC" = "yes"; then
+         case $host in
+           *-*-linux-gnu)	
+-            CFLAGS="-ansi -W -Wall -pedantic -Wshadow -Wpointer-arith -Wmissing-prototypes -Wwrite-strings -D_XOPEN_SOURCE=500 -D_BSD_SOURCE $CFLAGS"
++            CFLAGS="-ansi -W -Wall -pedantic -Wshadow -Wpointer-arith -Wwrite-strings -D_XOPEN_SOURCE=500 -D_BSD_SOURCE $CFLAGS"
+             CXXFLAGS="-ansi -D_XOPEN_SOURCE=500 -D_BSD_SOURCE -Wcast-align -Wconversion $CXXFLAGS"
+           ;;
+         esac
+-        CXXFLAGS="-Wall -pedantic -W -Wpointer-arith -Wmissing-prototypes -Wwrite-strings $CXXFLAGS"
++        CXXFLAGS="-Wall -pedantic -W -Wpointer-arith -Wwrite-strings $CXXFLAGS"
+         KDE_CHECK_COMPILER_FLAG(Wundef,[CXXFLAGS="-Wundef $CXXFLAGS"])
+-        KDE_CHECK_COMPILER_FLAG(Wbad-function-cast,[CXXFLAGS="-Wbad-function-cast $CXXFLAGS"])
+         KDE_CHECK_COMPILER_FLAG(Wno-long-long,[CXXFLAGS="-Wno-long-long $CXXFLAGS"])
+         KDE_CHECK_COMPILER_FLAG(Wnon-virtual-dtor,[CXXFLAGS="-Wnon-virtual-dtor $CXXFLAGS"])
+      fi
+@@ -2994,7 +2993,7 @@
+    AC_CACHE_VAL(kde_cv_func_stpcpy,
+    [
+    kde_safe_cxxflags=$CXXFLAGS
+-   CXXFLAGS="-Wmissing-prototypes -Werror"
++   CXXFLAGS="-Werror"
+    AC_LANG_SAVE
+    AC_LANG_CPLUSPLUS
+    AC_TRY_COMPILE([
diff --git a/x11-misc/switcher/files/switcher-0.3.7a-noarts.patch b/x11-misc/switcher/files/switcher-0.3.7a-noarts.patch
new file mode 100644
index 000000000000..ee3d78cc4fd7
--- /dev/null
+++ b/x11-misc/switcher/files/switcher-0.3.7a-noarts.patch
@@ -0,0 +1,161 @@
+diff -Naur switcher-0.3.7a-orig/admin/acinclude.m4.in switcher-0.3.7a/admin/acinclude.m4.in
+--- switcher-0.3.7a-orig/admin/acinclude.m4.in	2002-08-05 21:39:32.000000000 +0000
++++ switcher-0.3.7a/admin/acinclude.m4.in	2006-10-29 13:57:18.000000000 +0000
+@@ -509,13 +509,6 @@
+ ])
+ ])
+ 
+-AC_DEFUN(KDE_MISSING_ARTS_ERROR,
+-[
+-    AC_MSG_ERROR([The important program $1 was not found!
+-Please check whether you installed aRts correctly.
+-])
+-])
+-
+ AC_DEFUN(KDE_SUBST_PROGRAMS,
+ [
+ 
+@@ -531,8 +524,6 @@
+         kde_default_bindirs="$exec_prefix/bin $prefix/bin $kde_default_bindirs"
+         KDE_FIND_PATH(dcopidl, DCOPIDL, [$kde_default_bindirs], [KDE_MISSING_PROG_ERROR(dcopidl)])
+         KDE_FIND_PATH(dcopidl2cpp, DCOPIDL2CPP, [$kde_default_bindirs], [KDE_MISSING_PROG_ERROR(dcopidl2cpp)])
+-        KDE_FIND_PATH(mcopidl, MCOPIDL, [$kde_default_bindirs], [KDE_MISSING_ARTS_ERROR(mcopidl)])
+-        KDE_FIND_PATH(artsc-config, ARTSCCONFIG, [$kde_default_bindirs], [KDE_MISSING_ARTS_ERROR(artsc-config)])
+         KDE_FIND_PATH(kde-config, KDECONFIG, [$kde_default_bindirs])
+         KDE_FIND_PATH(meinproc, MEINPROC, [$kde_default_bindirs])
+       
+@@ -551,8 +542,6 @@
+         AC_SUBST(DCOPIDL)
+         AC_SUBST(DCOPIDL2CPP)
+         AC_SUBST(DCOP_DEPENDENCIES)
+-        AC_SUBST(MCOPIDL)
+-        AC_SUBST(ARTSCCONFIG)
+         AC_SUBST(KDECONFIG)
+ 	AC_SUBST(MEINPROC)
+  	AC_SUBST(KDE_XSL_STYLESHEET)
+@@ -1751,7 +1740,6 @@
+     printf("kde_wallpaperdir=\\"%s\\"\n",
+ 	KApplication::kde_wallpaperdir().data());
+     printf("kde_bindir=\\"%s\\"\n", KApplication::kde_bindir().data());
+-    printf("kde_partsdir=\\"%s\\"\n", KApplication::kde_partsdir().data());
+     printf("kde_servicesdir=\\"/tmp/dummy\\"\n");
+     printf("kde_servicetypesdir=\\"/tmp/dummy\\"\n");
+     printf("kde_moduledir=\\"/tmp/dummy\\"\n");
+@@ -1853,7 +1841,6 @@
+    AC_SUBST(LIB_KAB, "-lkab")
+    AC_SUBST(LIB_KHTML, "-lkhtml")
+    AC_SUBST(LIB_KSPELL, "-lkspell")
+-   AC_SUBST(LIB_KPARTS, "-lkparts")
+    AC_SUBST(LIB_KDEPRINT, "-lkdeprint")
+ # these are for backward compatibility
+    AC_SUBST(LIB_KSYCOCA, "-lkio")
+@@ -1868,7 +1855,6 @@
+    AC_SUBST(LIB_KAB, "-lkab")
+    AC_SUBST(LIB_KHTML, "-lkhtml")
+    AC_SUBST(LIB_KSPELL, "-lkspell")
+-   AC_SUBST(LIB_KPARTS, "-lkparts")
+    AC_SUBST(LIB_KDEPRINT, "-lkdeprint")
+ else
+    AC_SUBST(LIB_KDECORE, "-lkdecore -lXext $(LIB_QT)")
+diff -Naur switcher-0.3.7a/acinclude.m4 switcher-0.3.7a/work/switcher-0.3.7a/acinclude.m4
+--- switcher-0.3.7a/acinclude.m4	2003-05-03 12:45:30.000000000 +0000
++++ switcher-0.3.7a/work/switcher-0.3.7a/acinclude.m4	2006-10-29 14:02:24.000000000 +0000
+@@ -509,13 +509,6 @@
+ ])
+ ])
+ 
+-AC_DEFUN(KDE_MISSING_ARTS_ERROR,
+-[
+-    AC_MSG_ERROR([The important program $1 was not found!
+-Please check whether you installed aRts correctly.
+-])
+-])
+-
+ AC_DEFUN(KDE_SUBST_PROGRAMS,
+ [
+ 
+@@ -531,8 +524,6 @@
+         kde_default_bindirs="$exec_prefix/bin $prefix/bin $kde_default_bindirs"
+         KDE_FIND_PATH(dcopidl, DCOPIDL, [$kde_default_bindirs], [KDE_MISSING_PROG_ERROR(dcopidl)])
+         KDE_FIND_PATH(dcopidl2cpp, DCOPIDL2CPP, [$kde_default_bindirs], [KDE_MISSING_PROG_ERROR(dcopidl2cpp)])
+-        KDE_FIND_PATH(mcopidl, MCOPIDL, [$kde_default_bindirs], [KDE_MISSING_ARTS_ERROR(mcopidl)])
+-        KDE_FIND_PATH(artsc-config, ARTSCCONFIG, [$kde_default_bindirs], [KDE_MISSING_ARTS_ERROR(artsc-config)])
+         KDE_FIND_PATH(kde-config, KDECONFIG, [$kde_default_bindirs])
+         KDE_FIND_PATH(meinproc, MEINPROC, [$kde_default_bindirs])
+       
+@@ -551,8 +542,6 @@
+         AC_SUBST(DCOPIDL)
+         AC_SUBST(DCOPIDL2CPP)
+         AC_SUBST(DCOP_DEPENDENCIES)
+-        AC_SUBST(MCOPIDL)
+-        AC_SUBST(ARTSCCONFIG)
+         AC_SUBST(KDECONFIG)
+ 	AC_SUBST(MEINPROC)
+  	AC_SUBST(KDE_XSL_STYLESHEET)
+@@ -1853,7 +1842,6 @@
+    AC_SUBST(LIB_KAB, "-lkab")
+    AC_SUBST(LIB_KHTML, "-lkhtml")
+    AC_SUBST(LIB_KSPELL, "-lkspell")
+-   AC_SUBST(LIB_KPARTS, "-lkparts")
+    AC_SUBST(LIB_KDEPRINT, "-lkdeprint")
+ # these are for backward compatibility
+    AC_SUBST(LIB_KSYCOCA, "-lkio")
+@@ -1868,7 +1856,6 @@
+    AC_SUBST(LIB_KAB, "-lkab")
+    AC_SUBST(LIB_KHTML, "-lkhtml")
+    AC_SUBST(LIB_KSPELL, "-lkspell")
+-   AC_SUBST(LIB_KPARTS, "-lkparts")
+    AC_SUBST(LIB_KDEPRINT, "-lkdeprint")
+ else
+    AC_SUBST(LIB_KDECORE, "-lkdecore -lXext $(LIB_QT)")
+diff -Naur switcher-0.3.7a/aclocal.m4 switcher-0.3.7a/work/switcher-0.3.7a/aclocal.m4
+--- switcher-0.3.7a/aclocal.m4	2003-05-03 12:45:35.000000000 +0000
++++ switcher-0.3.7a/work/switcher-0.3.7a/aclocal.m4	2006-10-29 14:03:02.000000000 +0000
+@@ -521,13 +521,6 @@
+ ])
+ ])
+ 
+-AC_DEFUN(KDE_MISSING_ARTS_ERROR,
+-[
+-    AC_MSG_ERROR([The important program $1 was not found!
+-Please check whether you installed aRts correctly.
+-])
+-])
+-
+ AC_DEFUN(KDE_SUBST_PROGRAMS,
+ [
+ 
+@@ -543,8 +536,6 @@
+         kde_default_bindirs="$exec_prefix/bin $prefix/bin $kde_default_bindirs"
+         KDE_FIND_PATH(dcopidl, DCOPIDL, [$kde_default_bindirs], [KDE_MISSING_PROG_ERROR(dcopidl)])
+         KDE_FIND_PATH(dcopidl2cpp, DCOPIDL2CPP, [$kde_default_bindirs], [KDE_MISSING_PROG_ERROR(dcopidl2cpp)])
+-        KDE_FIND_PATH(mcopidl, MCOPIDL, [$kde_default_bindirs], [KDE_MISSING_ARTS_ERROR(mcopidl)])
+-        KDE_FIND_PATH(artsc-config, ARTSCCONFIG, [$kde_default_bindirs], [KDE_MISSING_ARTS_ERROR(artsc-config)])
+         KDE_FIND_PATH(kde-config, KDECONFIG, [$kde_default_bindirs])
+         KDE_FIND_PATH(meinproc, MEINPROC, [$kde_default_bindirs])
+       
+@@ -563,8 +554,6 @@
+         AC_SUBST(DCOPIDL)
+         AC_SUBST(DCOPIDL2CPP)
+         AC_SUBST(DCOP_DEPENDENCIES)
+-        AC_SUBST(MCOPIDL)
+-        AC_SUBST(ARTSCCONFIG)
+         AC_SUBST(KDECONFIG)
+ 	AC_SUBST(MEINPROC)
+  	AC_SUBST(KDE_XSL_STYLESHEET)
+@@ -1865,7 +1854,6 @@
+    AC_SUBST(LIB_KAB, "-lkab")
+    AC_SUBST(LIB_KHTML, "-lkhtml")
+    AC_SUBST(LIB_KSPELL, "-lkspell")
+-   AC_SUBST(LIB_KPARTS, "-lkparts")
+    AC_SUBST(LIB_KDEPRINT, "-lkdeprint")
+ # these are for backward compatibility
+    AC_SUBST(LIB_KSYCOCA, "-lkio")
+@@ -1880,7 +1868,6 @@
+    AC_SUBST(LIB_KAB, "-lkab")
+    AC_SUBST(LIB_KHTML, "-lkhtml")
+    AC_SUBST(LIB_KSPELL, "-lkspell")
+-   AC_SUBST(LIB_KPARTS, "-lkparts")
+    AC_SUBST(LIB_KDEPRINT, "-lkdeprint")
+ else
+    AC_SUBST(LIB_KDECORE, "-lkdecore -lXext $(LIB_QT)")
diff --git a/x11-misc/switcher/switcher-0.3.7a.ebuild b/x11-misc/switcher/switcher-0.3.7a.ebuild
index 2ae45354a4f8..916b6b1ec6f6 100644
--- a/x11-misc/switcher/switcher-0.3.7a.ebuild
+++ b/x11-misc/switcher/switcher-0.3.7a.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/switcher/switcher-0.3.7a.ebuild,v 1.6 2005/07/26 14:59:58 dholm Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/switcher/switcher-0.3.7a.ebuild,v 1.7 2006/10/30 20:41:36 troll Exp $
 
 inherit kde
 need-kde 3.1
@@ -13,3 +13,13 @@ LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~ppc x86"
 IUSE=""
+
+src_unpack() {
+	unpack ${A}
+
+	cd ${S}
+	epatch ${FILESDIR}/${P}-clear_from_warnings.patch
+	epatch ${FILESDIR}/${P}-noarts.patch
+
+	eautoconf
+}