Remove unneeded patches.

(Portage version: 2.1.2-r7)

4 files changed, 7 insertions, 162 deletions

diff --git a/kde-base/juk/ChangeLog b/kde-base/juk/ChangeLog
index 990b5950dfb3..1bd1251a6ec3 100644
--- a/kde-base/juk/ChangeLog
+++ b/kde-base/juk/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for kde-base/juk
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/juk/ChangeLog,v 1.77 2007/02/04 01:40:11 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/juk/ChangeLog,v 1.78 2007/02/05 11:43:08 flameeyes Exp $
+
+  05 Feb 2007; Diego Pettenò <flameeyes@gentoo.org>
+  -files/juk-3.5.2-do_not_use_gstreamer-0.10.diff,
+  -files/juk-3.5.2-filerename.diff,
+  -files/configure-fix-kdemultimedia-juk.patch:
+  Remove unneeded patches.
 
   04 Feb 2007; Diego Pettenò <flameeyes@gentoo.org> -juk-3.5.2-r1.ebuild:
   Remove old versions.
diff --git a/kde-base/juk/files/configure-fix-kdemultimedia-juk.patch b/kde-base/juk/files/configure-fix-kdemultimedia-juk.patch
deleted file mode 100644
index c96da48765cf..000000000000
--- a/kde-base/juk/files/configure-fix-kdemultimedia-juk.patch
+++ /dev/null
@@ -1,135 +0,0 @@
-Index: juk/configure.in.in
-===================================================================
---- juk/configure.in.in	(revision 433763)
-+++ juk/configure.in.in	(working copy)
-@@ -20,39 +20,60 @@
- AC_SUBST(LIB_ARTS)
- AC_SUBST(ARTS_CFLAGS)
- 
--KDE_CHECK_HEADER(tunepimp/tp_c.h,
--[
--	AC_DEFINE(HAVE_MUSICBRAINZ, 1, [have MusicBrainz])
--	have_musicbrainz=true
--], [
--	AC_DEFINE(HAVE_MUSICBRAINZ, 0, [have MusicBrainz])
--	have_musicbrainz=false
--])
-+AC_ARG_WITH(musicbrainz,
-+  [AS_HELP_STRING(--with-musicbrainz,
-+    [enable support for MusicBrainz @<:@default=check@:>@])],
-+  [], with_musicbrainz=check)
- 
--AM_CONDITIONAL(link_lib_MB, test x$have_musicbrainz = xtrue)
-+have_musicbrainz=no
-+if test "x$with_musicbrainz" != xno; then
-+  KDE_CHECK_HEADER(tunepimp/tp_c.h, have_musicbrainz=yes)
- 
--# pkg-config seems to have a bug where it masks needed -L entries when it
--# shouldn't, so disable that.
-+  if test "x$with_musicbrainz" != xcheck && test "x$have_musicbrainz" != xyes; then
-+    AC_MSG_FAILURE([--with-musicbrainz was given, but test for MusicBrainz failed])
-+  fi
-+fi
- 
--PKG_CONFIG_ALLOW_SYSTEM_LIBS=1
--export PKG_CONFIG_ALLOW_SYSTEM_LIBS
-+if test "x$have_musicbrainz" = xyes; then
-+  AC_DEFINE(HAVE_MUSICBRAINZ, 1, [have MusicBrainz])
-+else
-+  AC_DEFINE(HAVE_MUSICBRAINZ, 0, [have MusicBrainz])
-+fi
- 
--dnl start with 0.8
--GST_MAJORMINOR=0.8
--GST_REQ=0.8.0
-+AM_CONDITIONAL(link_lib_MB, test "x$have_musicbrainz" = xyes)
- 
--PKG_CHECK_MODULES(GST, \
--	gstreamer-$GST_MAJORMINOR >= $GST_REQ \
--	gstreamer-control-$GST_MAJORMINOR >= $GST_REQ \
--	gstreamer-libs-$GST_MAJORMINOR >= $GST_REQ,
--	have_gst=yes, have_gst=no)
-+AC_ARG_WITH(gstreamer,
-+  [AS_HELP_STRING(--with-gstreamer,
-+    [enable support for GStreamer @<:@default=check@:>@])],
-+  [], with_gstreamer=check)
- 
--dnl Give error if we don't have gstreamer
-+have_gst=no
-+if test "x$with_gstreamer" != xno; then
-+  # pkg-config seems to have a bug where it masks needed -L entries when it
-+  # shouldn't, so disable that.
-+
-+  PKG_CONFIG_ALLOW_SYSTEM_LIBS=1
-+  export PKG_CONFIG_ALLOW_SYSTEM_LIBS
-+
-+  dnl start with 0.8
-+  GST_MAJORMINOR=0.8
-+  GST_REQ=0.8.0
-+
-+  PKG_CHECK_MODULES(GST, \
-+    gstreamer-$GST_MAJORMINOR >= $GST_REQ \
-+    gstreamer-control-$GST_MAJORMINOR >= $GST_REQ \
-+    gstreamer-libs-$GST_MAJORMINOR >= $GST_REQ,
-+    have_gst=yes, have_gst=no)
-+
-+  if test "x$with_gstreamer" != xcheck && test "x$have_gst" != xyes; then
-+    AC_MSG_FAILURE([--with-gstreamer was given, but test for GStreamer failed])
-+  fi
-+fi
-+
- if test "x$have_gst" = "xno"; then
- 	GST_CFLAGS=""
- 	LDADD_GST=""
- 	LDFLAGS_GST=""
--	AC_MSG_WARN([GStreamer version >= $GST_REQ required.])
- 	AC_DEFINE(HAVE_GSTREAMER, 0, [have GStreamer])
- else
- 	LDADD_GST=`$PKG_CONFIG --libs-only-l gstreamer-$GST_MAJORMINOR`
-@@ -63,13 +84,14 @@
- 	LIBDIRS_GST=`$PKG_CONFIG --libs-only-L gstreamer-$GST_MAJORMINOR`
- 	LDADD_GST="$LDADD_GST $LIBDIRS_GST"
- 
--	AC_SUBST(GST_CFLAGS)
--	AC_SUBST(LDADD_GST)
--	AC_SUBST(LDFLAGS_GST)
- 	AC_MSG_NOTICE([GStreamer version >= $GST_REQ found.])
- 	AC_DEFINE(HAVE_GSTREAMER, 1, [have GStreamer])
- fi
- 
--if test "x$have_taglib" = "xfalse" || ( test "x$build_arts" = "xno" && test "x$have_gst" = "xno" ) ; then
-+AC_SUBST(GST_CFLAGS)
-+AC_SUBST(LDADD_GST)
-+AC_SUBST(LDFLAGS_GST)
-+
-+if test "x$have_taglib" != xyes || ( test "x$build_arts" = "xno" && test "x$have_gst" = "xno" ) ; then
- 	DO_NOT_COMPILE="$DO_NOT_COMPILE juk"
- fi
-Index: juk/configure.in.bot
-===================================================================
---- juk/configure.in.bot	(revision 433763)
-+++ juk/configure.in.bot	(working copy)
-@@ -1,4 +1,4 @@
--if test "x$have_taglib" = "xfalse"; then
-+if test "x$with_taglib" = xcheck && test "x$have_taglib" != xyes; then
- 	echo "**************************************************"
- 	echo "*"
- 	echo "* JuK will not be built without TagLib." 
-@@ -7,7 +7,7 @@
- 	echo "**************************************************"
- fi
- 
--if test "x$have_gst" = "xno"; then
-+if test "x$with_gstreamer" = xcheck && test "x$have_gst" = xno; then
- 	echo "**************************************************"
- 	echo "*"
- 	echo "* You do not seem to have GStreamer >= 0.8 installed."
-@@ -19,7 +19,7 @@
- 	echo "**************************************************"
- fi
- 
--if test "x$have_musicbrainz" = "xfalse"; then
-+if test "x$with_musicbrainz" = xcheck && test "x$have_musicbrainz" = xno; then
- 	echo "**************************************************"
- 	echo "*"
- 	echo "* You do not seem to have libmusicbrainz and"
diff --git a/kde-base/juk/files/juk-3.5.2-do_not_use_gstreamer-0.10.diff b/kde-base/juk/files/juk-3.5.2-do_not_use_gstreamer-0.10.diff
deleted file mode 100644
index fcc5afd0799c..000000000000
--- a/kde-base/juk/files/juk-3.5.2-do_not_use_gstreamer-0.10.diff
+++ /dev/null
@@ -1,15 +0,0 @@
---- juk/configure.in.in.orig	2006-04-06 20:28:55.000000000 +0200
-+++ juk/configure.in.in	2006-04-06 20:29:33.000000000 +0200
-@@ -59,9 +59,9 @@
-   	PKG_CONFIG_ALLOW_SYSTEM_LIBS=1
- 	export PKG_CONFIG_ALLOW_SYSTEM_LIBS
- 
--	GST_MAJORMINOR=0.10
--	GST_REQ=0.10.0
--	GST_VERSION=10
-+	GST_MAJORMINOR=0.8
-+	GST_REQ=0.8.0
-+	GST_VERSION=8
- 
- 	PKG_CHECK_MODULES(GST, \
- 		gstreamer-$GST_MAJORMINOR >= $GST_REQ, \
diff --git a/kde-base/juk/files/juk-3.5.2-filerename.diff b/kde-base/juk/files/juk-3.5.2-filerename.diff
deleted file mode 100644
index 6a2d66d332b0..000000000000
--- a/kde-base/juk/files/juk-3.5.2-filerename.diff
+++ /dev/null
@@ -1,11 +0,0 @@
---- juk/tagrenameroptions.cpp.orig	2006-04-05 17:08:35.000000000 +0200
-+++ juk/tagrenameroptions.cpp	2006-04-05 17:08:59.000000000 +0200
-@@ -147,7 +147,7 @@
- TagType TagRenamerOptions::tagFromCategoryText(const QString &text)
- {
-     for(unsigned i = StartTag; i < NumTypes; ++i)
--        if(tagTypeText(static_cast<TagType>(i), false) == text)
-+        if(tagTypeText(static_cast<TagType>(i), true) == text)
-             return static_cast<TagType>(i);
- 
-     return Unknown;