Remove KDE 3.5.10.

(Portage version: 2.2_rc50/cvs/Linux x86_64)

5 files changed, 6 insertions, 215 deletions

diff --git a/kde-base/kscd/ChangeLog b/kde-base/kscd/ChangeLog
index b3a8dcef7fca..59cb5462795a 100644
--- a/kde-base/kscd/ChangeLog
+++ b/kde-base/kscd/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for kde-base/kscd
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kscd/ChangeLog,v 1.136 2009/11/08 23:57:22 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kscd/ChangeLog,v 1.137 2009/11/20 03:41:10 ssuominen Exp $
+
+  20 Nov 2009; Samuli Suominen <ssuominen@gentoo.org>
+  -files/kscd-3.5.6-alsa-tests.patch, -files/kscd-3.5.6-arts.patch,
+  -kscd-3.5.10.ebuild, -files/kscd-3.5-strict-fix.diff:
+  Remove KDE 3.5.10.
 
   08 Nov 2009; Alexey Shvetsov <alexxy@gentoo.org> -kscd-4.3.2.ebuild:
   Drop KDE 4.3.2
diff --git a/kde-base/kscd/files/kscd-3.5-strict-fix.diff b/kde-base/kscd/files/kscd-3.5-strict-fix.diff
deleted file mode 100644
index 353d0a595829..000000000000
--- a/kde-base/kscd/files/kscd-3.5-strict-fix.diff
+++ /dev/null
@@ -1,19 +0,0 @@
-Fixes compiler warning:
- plat_linux_cdda.c:142: warning: implicit declaration of function 'free'
-which prevents kdemultimedia to be built with FEATURES="strict stricter"
-
-Added missing header file.
-
-Signed-off-by: Peter Huewe <peterhuewe@gmx.de>
----
-
---- kdemultimedia-3.5.9/kscd/libwm/plat_linux_cdda.c
-+++ kdemultimedia-3.5.9/kscd/libwm/plat_linux_cdda.c
-@@ -44,6 +44,7 @@
- #undef inline
- 
- #include <stdio.h>
-+#include <stdlib.h>
- #include <math.h>
- #include <sys/ioctl.h>
- #include <sys/types.h>
diff --git a/kde-base/kscd/files/kscd-3.5.6-alsa-tests.patch b/kde-base/kscd/files/kscd-3.5.6-alsa-tests.patch
deleted file mode 100644
index bec0893b66ca..000000000000
--- a/kde-base/kscd/files/kscd-3.5.6-alsa-tests.patch
+++ /dev/null
@@ -1,154 +0,0 @@
-Index: kdemultimedia-3.5.6/configure.in.in
-===================================================================
---- kdemultimedia-3.5.6.orig/configure.in.in
-+++ kdemultimedia-3.5.6/configure.in.in
-@@ -152,88 +152,19 @@ AC_DEFUN([KDE_CHECK_OSSAUDIO],
- 
- AC_DEFUN([KDE_CHECK_ALSA],
- [
--  have_alsa=no
-+  AC_CHECK_LIB([asound], [snd_pcm_open], [have_alsa05=yes], [have_alsa04=no])
- 
--  AC_CHECK_HEADERS([sys/asoundlib.h alsa/asoundlib.h],
--    [have_alsa=yes])
-+  PKG_CHECK_MODULES([ALSA], [alsa >= 0.9], [have_alsa09=yes], [have_alsa09=no])
- 
--  AC_CHECK_LIB(asound, snd_seq_create_simple_port,
--    [:], [have_alsa=no])
--
--  AC_LANG_SAVE
--  AC_LANG_C
--  if test "x$have_alsa" = xyes; then
--    AC_TRY_COMPILE([
--      #include "confdefs.h"
--      #ifdef HAVE_SYS_ASOUNDLIB_H
--      #include <sys/asoundlib.h>
--      #endif
--      #ifdef HAVE_ALSA_ASOUNDLIB_H
--      #include <alsa/asoundlib.h>
--      #endif
--    ],[
--      #if (SND_LIB_MAJOR == 0) && (SND_LIB_MINOR == 5)
--        /* we have ALSA 0.5.x */
--      #else
--        #error not ALSA 0.5.x
--      #endif
--    ],
--    have_alsa_0_5=yes)
--
--    AC_TRY_COMPILE([
--      #include "confdefs.h"
--      #ifdef HAVE_SYS_ASOUNDLIB_H
--      #include <sys/asoundlib.h>
--      #endif
--      #ifdef HAVE_ALSA_ASOUNDLIB_H
--      #include <alsa/asoundlib.h>
--      #endif
--    ],[
--      #if (SND_LIB_MAJOR == 0) && (SND_LIB_MINOR == 9)
--        /* we have ALSA 0.9.x */
--      #else
--        #error not ALSA 0.9.x
--      #endif
--    ],
--    have_alsa_0_9=yes)
--
--    AC_TRY_COMPILE([
--      #include "confdefs.h"
--      #ifdef HAVE_SYS_ASOUNDLIB_H
--      #include <sys/asoundlib.h>
--      #endif
--      #ifdef HAVE_ALSA_ASOUNDLIB_H
--      #include <alsa/asoundlib.h>
--      #endif
--    ],[
--      #if (SND_LIB_MAJOR == 1)
--        /* we have ALSA 1.x */
--      #else
--        #error not ALSA 1.x
--      #endif
--    ],
--    have_alsa_1=yes)
--  fi
--  AC_LANG_RESTORE
--
--  if test "x$have_alsa_0_9" = xyes || test "x$have_alsa_1" = xyes; then
--    # for kmix/ and akode/
--    LIBASOUND="-lasound"
-+  if test "x$have_alsa09" = "xyes"; then
-+    have_alsa="yes"
-     AC_DEFINE(HAVE_LIBASOUND2, 1, [Define if you have libasound.so.2 (required for ALSA 0.9.x/1.x support)])
--
--    # for arts/
--    ARTS_LIBASOUND="-lasound"
--    AC_DEFINE(HAVE_ARTS_LIBASOUND2, 1, [Define if you have libasound.so.2 (required for ALSA 0.9.x/1.x support)])
-+  elif test "x$have_alsa05" = "xyes"; then
-+    have_alsa="yes"
-+    AC_DEFINE(HAVE_LIBASOUND1, 1, [Define if you have libasound.so.1 (required for ALSA 0.5.x support)])
-+    ALSA_LIBS="-lasound"
-+    AC_SUBST([ALSA_LIBS])
-   fi
--
--  if test "x$have_alsa_0_5" = xyes; then
--    # for arts/
--    ARTS_LIBASOUND="-lasound"
--    AC_DEFINE(HAVE_ARTS_LIBASOUND, 1, [Define if you have libasound.so.1 (required for ALSA 0.5.x support)])
--  fi
--
--  AC_SUBST(LIBASOUND)
--  AC_SUBST(ARTS_LIBASOUND)
- ])
- 
- AC_DEFUN([KDE_CHECK_CDPARANOIA],
-Index: kdemultimedia-3.5.6/kscd/kscd.cpp
-===================================================================
---- kdemultimedia-3.5.6.orig/kscd/kscd.cpp
-+++ kdemultimedia-3.5.6/kscd/kscd.cpp
-@@ -108,7 +108,7 @@ KSCD::KSCD( QWidget *parent, const char 
- #if defined(BUILD_CDDA)
-   audio_systems_list
-                      << "arts"
--#if defined(HAVE_ARTS_LIBASOUND2)
-+#if defined(HAVE_LIBASOUND2)
-                      << "alsa"
- #endif
- #ifdef USE_SUN_AUDIO
-Index: kdemultimedia-3.5.6/kscd/libwm/audio/audio_alsa.c
-===================================================================
---- kdemultimedia-3.5.6.orig/kscd/libwm/audio/audio_alsa.c
-+++ kdemultimedia-3.5.6/kscd/libwm/audio/audio_alsa.c
-@@ -18,7 +18,7 @@
- 
- #include <config.h>
- 
--#if defined(HAVE_ARTS_LIBASOUND2)
-+#if defined(HAVE_LIBASOUND2)
- 
- #include <alsa/asoundlib.h>
- #include "audio.h"
-Index: kdemultimedia-3.5.6/kscd/libwm/audio/audio.c
-===================================================================
---- kdemultimedia-3.5.6.orig/kscd/libwm/audio/audio.c
-+++ kdemultimedia-3.5.6/kscd/libwm/audio/audio.c
-@@ -16,7 +16,7 @@ struct audio_oops* setup_soundsystem(con
-   if(!strcmp(ss, "arts"))
-     return setup_arts(dev, ctl);
- #endif
--#if defined(HAVE_ARTS_LIBASOUND2)
-+#if defined(HAVE_LIBASOUND2)
-   if(!strcmp(ss, "alsa"))
-     return setup_alsa(dev, ctl);
- #endif
-Index: kdemultimedia-3.5.6/kscd/libwm/Makefile.am
-===================================================================
---- kdemultimedia-3.5.6.orig/kscd/libwm/Makefile.am
-+++ kdemultimedia-3.5.6/kscd/libwm/Makefile.am
-@@ -10,7 +10,7 @@ INCLUDES = $(all_includes) 
- noinst_LTLIBRARIES  = libworkman.la
- 
- libworkman_la_LDFLAGS = $(ARTSC_LIBS) $(all_libraries)
--libworkman_la_LIBADD = audio/libworkmanaudio.la $(ARTS_LIBASOUND)
-+libworkman_la_LIBADD = audio/libworkmanaudio.la $(ALSA_LIBS)
- 
- libworkman_la_SOURCES = cddb.c cdinfo.c cdrom.c wm_helpers.c cdtext.c\
- database.c index.c scsi.c cdda.c plat_linux_cdda.c plat_sun_cdda.c\
diff --git a/kde-base/kscd/files/kscd-3.5.6-arts.patch b/kde-base/kscd/files/kscd-3.5.6-arts.patch
deleted file mode 100644
index fd9c0a5872e5..000000000000
--- a/kde-base/kscd/files/kscd-3.5.6-arts.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- kscd-3.5.6/configure.in.in.orig	2007-03-18 00:52:38.000000000 -0100
-+++ kscd-3.5.6/configure.in.in	2007-03-18 01:02:16.000000000 -0100
-@@ -328,7 +328,7 @@
-   dnl but if we find arts we need the include
-   dnl path for it.
- 
--  if test x$kde_artsplug_compiles = xyes; then
-+  if test "x$build_arts" = "xyes" && test x$kde_artsplug_compiles = xyes; then
-     ARTSC_INCLUDE=`${ARTSCCONFIG} --cflags`
-     AC_MSG_RESULT([arts includes... $ARTSC_INCLUDE])
-     AC_SUBST(ARTSC_INCLUDE)
diff --git a/kde-base/kscd/kscd-3.5.10.ebuild b/kde-base/kscd/kscd-3.5.10.ebuild
deleted file mode 100644
index d14d06394749..000000000000
--- a/kde-base/kscd/kscd-3.5.10.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kscd/kscd-3.5.10.ebuild,v 1.7 2009/07/12 12:03:23 armin76 Exp $
-
-KMNAME=kdemultimedia
-EAPI="1"
-inherit kde-meta eutils
-
-SRC_URI="${SRC_URI}"
-
-DESCRIPTION="KDE CD player"
-KEYWORDS="alpha amd64 hppa ia64 ~mips ppc ppc64 sparc x86 ~x86-fbsd"
-IUSE=""
-
-DEPEND="x11-libs/libXext
-	>=kde-base/libkcddb-${PV}:${SLOT}"
-
-KMCOPYLIB="libkcddb libkcddb"
-KMCOMPILEONLY="libkcddb"
-
-PATCHES=( "${FILESDIR}/kscd-3.5.6-alsa-tests.patch"
-		"${FILESDIR}/kscd-3.5.6-arts.patch"
-		"${FILESDIR}/kscd-3.5-strict-fix.diff" )
-
-src_compile() {
-	DO_NOT_COMPILE=libkcddb kde-meta_src_compile myconf configure
-	cd "$S"/libkcddb && emake configbase.h
-	cd "$S"/libkcddb && emake cdinfodialogbase.h
-	DO_NOT_COMPILE=libkcddb kde-meta_src_compile make
-}