Remove unneeded patches.

(Portage version: 2.1.2-r7)

7 files changed, 7 insertions, 275 deletions

diff --git a/kde-base/arts/ChangeLog b/kde-base/arts/ChangeLog
index ab0c01fdf8ba..8558b3fb4e44 100644
--- a/kde-base/arts/ChangeLog
+++ b/kde-base/arts/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for kde-base/arts
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/arts/ChangeLog,v 1.249 2007/02/04 01:33:50 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/arts/ChangeLog,v 1.250 2007/02/05 11:44:38 flameeyes Exp $
+
+  05 Feb 2007; Diego Pettenò <flameeyes@gentoo.org>
+  -files/1.3.0-jack-configure.in.in.patch, -files/arts-1.2.x.diff,
+  -files/arts-1.3.2-alsa-bigendian.patch, -files/arts-1.4-mcopidl.patch,
+  -files/arts-3.4.1-configure.patch, -files/arts-3.4.1-cpu-overload.patch:
+  Remove unneeded patches.
 
   04 Feb 2007; Diego Pettenò <flameeyes@gentoo.org> -arts-3.5.2-r1.ebuild:
   Remove old versions.
diff --git a/kde-base/arts/files/1.3.0-jack-configure.in.in.patch b/kde-base/arts/files/1.3.0-jack-configure.in.in.patch
deleted file mode 100644
index a707f01f711b..000000000000
--- a/kde-base/arts/files/1.3.0-jack-configure.in.in.patch
+++ /dev/null
@@ -1,24 +0,0 @@
---- configure.in.in	2004-08-05 13:53:14.000000000 -0500
-+++ configure.in.in	2004-08-26 14:15:51.901070600 -0500
-@@ -697,6 +697,12 @@
- AC_SUBST(GLIB_LIBADD)
- AC_SUBST(GLIB_LDFLAGS)
- 
-+dnl Check jack
-+AC_ARG_ENABLE(jack,
-+[  --disable-jack             disable support for Jack Audio Connection Kit],
-+[arts_with_jack="$enableval"],[arts_with_jack=yes])
-+
-+if test "x$arts_with_jack" = "xyes"; then
- AC_MSG_CHECKING(for Jack Audio Connection Kit)
- if $PKG_CONFIG --atleast-version 0.90 jack >/dev/null 2>&1 ; then
-   JACK_CFLAGS="`$PKG_CONFIG --cflags jack`"
-@@ -708,6 +714,8 @@
- else
-   AC_MSG_RESULT(not installed)
- fi
-+fi
-+
- AC_SUBST(JACK_CFLAGS)
- AC_SUBST(JACK_LIBADD)
- AC_SUBST(JACK_LDFLAGS)
diff --git a/kde-base/arts/files/arts-1.2.x.diff b/kde-base/arts/files/arts-1.2.x.diff
deleted file mode 100644
index 377fecb704c1..000000000000
--- a/kde-base/arts/files/arts-1.2.x.diff
+++ /dev/null
@@ -1,33 +0,0 @@
-Index: soundserver/artswrapper.c
-===================================================================
---- soundserver/artswrapper.c	(revision 546970)
-+++ soundserver/artswrapper.c	(working copy)
-@@ -95,6 +95,10 @@ int main(int argc, char **argv)
- #else
- 		setreuid(-1, getuid());
- #endif
-+		if (geteuid() != getuid()) {
-+			perror("setuid()");
-+			return 2;
-+		}
- 	}
- 
- 	if(argc == 0)
-Index: soundserver/crashhandler.cc
-===================================================================
---- soundserver/crashhandler.cc	(revision 546970)
-+++ soundserver/crashhandler.cc	(working copy)
-@@ -196,7 +196,12 @@ CrashHandler::defaultCrashHandler (int s
-           argv[i++] = NULL;
- 
-           setgid(getgid());
--          setuid(getuid());
-+          if (getuid() != geteuid())
-+            setuid(getuid());
-+          if (getuid() != geteuid()) {
-+	    perror("setuid()");
-+            exit(255);
-+          }
- 
-           execvp(crashApp, argv);
- 
diff --git a/kde-base/arts/files/arts-1.3.2-alsa-bigendian.patch b/kde-base/arts/files/arts-1.3.2-alsa-bigendian.patch
deleted file mode 100644
index c4dc0754c29f..000000000000
--- a/kde-base/arts/files/arts-1.3.2-alsa-bigendian.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-diff -ruN arts-1.3.1.orig/flow/audioioalsa.cc arts-1.3.1/flow/audioioalsa.cc
---- arts-1.3.1.orig/flow/audioioalsa.cc	2004-11-14 17:58:25.343403280 +0100
-+++ arts-1.3.1/flow/audioioalsa.cc	2004-11-14 17:54:27.951492336 +0100
-@@ -114,7 +114,11 @@
- 	 */
-     m_card = snd_defaults_pcm_card();  //!! need interface !!
-     m_device = snd_defaults_pcm_device(); //!!
-+#ifdef WORDS_BIGENDIAN
-+    m_format = SND_PCM_SFMT_S16_BE;
-+#else
-     m_format = SND_PCM_SFMT_S16_LE;
-+#endif
-     m_bufferMode = block;  //block/stream (stream mode doesn't work yet)
- 
- 	if(m_card >= 0) {
diff --git a/kde-base/arts/files/arts-1.4-mcopidl.patch b/kde-base/arts/files/arts-1.4-mcopidl.patch
deleted file mode 100644
index 2e51ba3bff67..000000000000
--- a/kde-base/arts/files/arts-1.4-mcopidl.patch
+++ /dev/null
@@ -1,9 +0,0 @@
-diff -uNr arts-1.3.91.orig/mcopidl/Makefile.am arts-1.3.91/mcopidl/Makefile.am
---- arts-1.3.91.orig/mcopidl/Makefile.am	2005-01-14 23:56:06.310717856 +0100
-+++ arts-1.3.91/mcopidl/Makefile.am	2005-01-15 00:02:29.459470392 +0100
-@@ -1,4 +1,4 @@
--KDE_CXXFLAGS = $(NOOPT_CXXFLAGS) 
-+KDE_CXXFLAGS = $(NOOPT_CXXFLAGS) -fno-stack-protector -fno-stack-protector-all
- INCLUDES = -I$(top_srcdir)/mcop -I$(top_builddir)/mcop $(all_includes)
- ####### Files
- 
diff --git a/kde-base/arts/files/arts-3.4.1-configure.patch b/kde-base/arts/files/arts-3.4.1-configure.patch
deleted file mode 100644
index 1b424c947055..000000000000
--- a/kde-base/arts/files/arts-3.4.1-configure.patch
+++ /dev/null
@@ -1,148 +0,0 @@
-diff -Nur arts-1.4.1.orig/configure.in.in arts-1.4.1/configure.in.in
---- arts-1.4.1.orig/configure.in.in	2005-05-23 13:28:37.000000000 +0200
-+++ arts-1.4.1/configure.in.in	2005-06-05 21:54:05.000000000 +0200
-@@ -242,7 +242,6 @@
-       arts_audiolib_found=yes
-       ])
-   fi
--  AM_CONDITIONAL(HAVE_WAVSUPPORT,  test "x$arts_audiolib_found" = "xyes")
-   AC_SUBST(LIBAUDIOFILE)
-   AC_SUBST(LIBAUDIOFILE_LDFLAGS)
-   AC_LANG_RESTORE
-@@ -491,12 +490,85 @@
- ])
- 
- dnl call the tests
--AC_CHECK_LIBAUDIOIO
--AC_CHECK_LIBAUDIONAS
--AC_CHECK_LIBESD
--AC_CHECK_LIBAUDIOFILE
--AC_CHECK_SGILIBAUDIO
--AC_CHECK_LIBMAS
-+AC_ARG_WITH(libaudioio,
-+  [AS_HELP_STRING(--with-libaudioio,
-+    [enable support for libaudioio @<:@default=check@:>@])],
-+  [], with_libaudioio=check)
-+
-+if test "x$with_libaudioio" != xno; then
-+  AC_CHECK_LIBAUDIOIO
-+
-+  if test "x$with_libaudioio" != xcheck && test -z "$LIBAUDIOIO"; then
-+    AC_MSG_FAILURE([--with-libaudioio was given, but test for libaudioio failed])
-+  fi
-+fi
-+
-+AC_ARG_WITH(nas,
-+  [AS_HELP_STRING(--with-nas,
-+    [enable support for NAS @<:@default=check@:>@])],
-+  [], with_nas=check)
-+
-+if test "x$with_nas" != xno; then
-+  AC_CHECK_LIBAUDIONAS
-+
-+  if test "x$with_nas" != xcheck && test -z "$LIBAUDIONAS"; then
-+    AC_MSG_FAILURE([--with-nas was given, but test for NAS failed])
-+  fi
-+fi
-+
-+AC_ARG_WITH(esd,
-+  [AS_HELP_STRING(--with-esd,
-+    [enable support for EsounD @<:@default=check@:>@])],
-+  [], with_esd=check)
-+
-+if test "x$with_esd" != xno; then
-+  AC_CHECK_LIBESD
-+
-+  if test "x$with_esd" != xcheck && test -z "$LIBESD"; then
-+    AC_MSG_FAILURE([--with-esd was given, but test for EsounD failed])
-+  fi
-+fi
-+
-+AC_ARG_WITH(audiofile,
-+  [AS_HELP_STRING(--with-audiofile,
-+    [enable support for audiofile @<:@default=check@:>@])],
-+  [], with_audiofile=check)
-+
-+if test "x$with_audiofile" != xno; then
-+  AC_CHECK_LIBAUDIOFILE
-+
-+  if test "x$with_audiofile" != xcheck && test -z "$LIBAUDIOFILE"; then
-+    AC_MSG_FAILURE([--with-audiofile was given, but test for audiofile failed])
-+  fi
-+fi
-+AM_CONDITIONAL(HAVE_WAVSUPPORT, test -n "$LIBAUDIOFILE")
-+
-+AC_ARG_WITH(sgilibaudio,
-+  [AS_HELP_STRING(--with-sgilibaudio,
-+    [enable support for SGI libaudio @<:@default=check@:>@])],
-+  [], with_sgilibaudio=check)
-+
-+if test "x$with_sgilibaudio" != xno; then
-+  AC_CHECK_SGILIBAUDIO
-+
-+  if test "x$with_sgilibaudio" != xcheck && test -z "$SGILIBAUDIO"; then
-+    AC_MSG_FAILURE([--with-sgilibaudio was given, but test for SGI libaudio failed])
-+  fi
-+fi
-+
-+AC_ARG_WITH(mas,
-+  [AS_HELP_STRING(--with-mas,
-+    [enable support for MAS @<:@default=check@:>@])],
-+  [], with_mas=check)
-+
-+if test "x$with_mas" != xno; then
-+  AC_CHECK_LIBMAS
-+
-+  if test "x$with_mas" != xcheck && test -z "$LIBMAS"; then
-+    AC_MSG_FAILURE([--with-mas was given, but test for MAS failed])
-+  fi
-+fi
-+
- AC_CHECK_REALTIME_SCHED
- AC_CHECK_GETDOMAINNAME
- AC_CHECK_IOCTL_TYPE
-@@ -704,20 +776,31 @@
- AC_SUBST(GLIB_LIBADD)
- AC_SUBST(GLIB_LDFLAGS)
- 
--AC_MSG_CHECKING(for Jack Audio Connection Kit)
--if $PKG_CONFIG --atleast-version 0.90 jack >/dev/null 2>&1 ; then
--  JACK_CFLAGS="`$PKG_CONFIG --cflags jack`"
--  JACK_LIBADD="`$PKG_CONFIG --libs-only-l jack`"
--  JACK_LDFLAGS="`$PKG_CONFIG --libs-only-L jack`"
--  AC_MSG_RESULT(yes)
--  AC_DEFINE(HAVE_LIBJACK, 1,
--        [Define if you have libjack (required if you want Jack support)])
--else
--  AC_MSG_RESULT(not installed)
-+AC_ARG_WITH(jack,
-+  [AS_HELP_STRING(--with-jack,
-+    [enable support for Jack @<:@default=check@:>@])],
-+  [], with_jack=check)
-+
-+if test "x$with_jack" != xno; then
-+  AC_MSG_CHECKING(for Jack Audio Connection Kit)
-+  if $PKG_CONFIG --atleast-version 0.90 jack >/dev/null 2>&1 ; then
-+    JACK_CFLAGS="`$PKG_CONFIG --cflags jack`"
-+    JACK_LIBADD="`$PKG_CONFIG --libs-only-l jack`"
-+    JACK_LDFLAGS="`$PKG_CONFIG --libs-only-L jack`"
-+    AC_MSG_RESULT(yes)
-+    AC_DEFINE(HAVE_LIBJACK, 1,
-+          [Define if you have libjack (required if you want Jack support)])
-+  else
-+    AC_MSG_RESULT(not installed)
-+  fi
-+  AC_SUBST(JACK_CFLAGS)
-+  AC_SUBST(JACK_LIBADD)
-+  AC_SUBST(JACK_LDFLAGS)
-+
-+  if test "x$with_jack" != xcheck && test -z "$JACK_LIBADD"; then
-+    AC_MSG_FAILURE([--with-jack was given, but test for Jack failed])
-+  fi
- fi
--AC_SUBST(JACK_CFLAGS)
--AC_SUBST(JACK_LIBADD)
--AC_SUBST(JACK_LDFLAGS)
- 
- dnl OpenBSD requires an -lossaudio and soundcard.h to provide OSS audio I/O
- AC_CHECK_HEADERS(soundcard.h)
diff --git a/kde-base/arts/files/arts-3.4.1-cpu-overload.patch b/kde-base/arts/files/arts-3.4.1-cpu-overload.patch
deleted file mode 100644
index 6eca5bf467d5..000000000000
--- a/kde-base/arts/files/arts-3.4.1-cpu-overload.patch
+++ /dev/null
@@ -1,45 +0,0 @@
---- arts-1.3.2.orig/flow/audioioalsa9.cc	2004-05-26 20:50:18.000000000 +0200
-+++ arts-1.3.2/flow/audioioalsa9.cc	2005-05-20 11:08:54.000000000 +0200
-@@ -263,15 +263,40 @@
- 
- int AudioIOALSA::getParam(AudioParam p)
- {
-+	snd_pcm_sframes_t avail;
- 	switch(p) {
- 
-         case canRead:
- 		if (! m_pcm_capture) return -1;
--		return snd_pcm_frames_to_bytes(m_pcm_capture, snd_pcm_avail_update(m_pcm_capture));
-+		while ((avail = snd_pcm_avail_update(m_pcm_capture)) < 0) {
-+			if (avail == -EPIPE)
-+				avail = xrun(m_pcm_capture);
-+#ifdef HAVE_SND_PCM_RESUME
-+			else if (avail == -ESTRPIPE)
-+				avail = resume(m_pcm_capture);
-+#endif
-+			if (avail < 0) {
-+				arts_info("Capture error: %s", snd_strerror(avail));
-+				return -1;
-+			}
-+		}
-+		return snd_pcm_frames_to_bytes(m_pcm_capture, avail);
- 
- 	case canWrite:
- 		if (! m_pcm_playback) return -1;
--		return snd_pcm_frames_to_bytes(m_pcm_playback, snd_pcm_avail_update(m_pcm_playback));
-+		while ((avail = snd_pcm_avail_update(m_pcm_playback)) < 0) {
-+			if (avail == -EPIPE)
-+				avail = xrun(m_pcm_playback);
-+#ifdef HAVE_SND_PCM_RESUME
-+			else if (avail == -ESTRPIPE)
-+				avail = resume(m_pcm_playback);
-+#endif
-+			if (avail < 0) {
-+				arts_info("Playback error: %s", snd_strerror(avail));
-+				return -1;
-+			}
-+		}
-+		return snd_pcm_frames_to_bytes(m_pcm_playback, avail);
- 
- 	case selectReadFD:
- 		return -1;