Use $(get_kde_version) instead of ${SLOT} to allow changing the SLOT properly; remove old patches

(Portage version: 2.2.0_alpha38/cvs/Linux x86_64)

9 files changed, 16 insertions, 253 deletions

diff --git a/kde-base/kdelibs/ChangeLog b/kde-base/kdelibs/ChangeLog
index 78bc129543e2..0750a996ec1f 100644
--- a/kde-base/kdelibs/ChangeLog
+++ b/kde-base/kdelibs/ChangeLog
@@ -1,6 +1,17 @@
 # ChangeLog for kde-base/kdelibs
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdelibs/ChangeLog,v 1.767 2011/06/10 21:37:58 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdelibs/ChangeLog,v 1.768 2011/06/12 23:04:45 abcd Exp $
+
+  12 Jun 2011; Jonathan Callen <abcd@gentoo.org>
+  -files/kdelibs-4.3.3-klauncher_kdeinit.patch,
+  -files/kdelibs-4.3.3-klauncher_kioslave.patch,
+  -files/kdelibs-4.4.3-mimetypes.patch,
+  -files/dist/02_gentoo_append_xdg_config_dirs.patch,
+  -files/dist/23_solid_no_double_build.patch,
+  -files/kdelibs-4.3.3-klauncher_mac.patch, kdelibs-4.6.2-r3.ebuild,
+  kdelibs-4.6.3-r2.ebuild:
+  Use $(get_kde_version) instead of ${SLOT} to allow changing the SLOT
+  properly; remove old patches
 
   10 Jun 2011; Andreas K. Huettel <dilfridge@gentoo.org>
   +files/dist/01_gentoo_set_xdg_menu_prefix-1.patch:
diff --git a/kde-base/kdelibs/files/dist/02_gentoo_append_xdg_config_dirs.patch b/kde-base/kdelibs/files/dist/02_gentoo_append_xdg_config_dirs.patch
deleted file mode 100644
index 072f0ffbf366..000000000000
--- a/kde-base/kdelibs/files/dist/02_gentoo_append_xdg_config_dirs.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-Set up XDG_CONFIG_DIRS lookup in order:
-1. custom XDG_CONFIG_DIRS from env
-2. kdeprefix xdg config dirs
-3. /etc/xdg
-
-Index: kdecore/kernel/kstandarddirs.cpp
-===================================================================
---- kdecore/kernel/kstandarddirs.cpp	(revision 1014759)
-+++ kdecore/kernel/kstandarddirs.cpp	(working copy)
-@@ -1664,16 +1664,13 @@
-     {
-         tokenize(xdgdirList, xdgdirs, QString(QChar(KPATH_SEPARATOR)));
-     }
--    else
--    {
--        xdgdirList.clear();
--        xdgdirList.append("/etc/xdg");
-+
- #ifdef Q_WS_WIN
--        xdgdirList.append(installPath("kdedir") + "etc/xdg");
-+    xdgdirList.append(installPath("kdedir") + "etc/xdg");
- #else
--        xdgdirList.append(KDESYSCONFDIR "/xdg");
-+    xdgdirList.append(KDESYSCONFDIR "/xdg");
- #endif
--    }
-+    xdgdirList.append("/etc/xdg");
- 
-     QString localXdgDir = readEnvPath("XDG_CONFIG_HOME");
-     if (!localXdgDir.isEmpty())
diff --git a/kde-base/kdelibs/files/dist/23_solid_no_double_build.patch b/kde-base/kdelibs/files/dist/23_solid_no_double_build.patch
deleted file mode 100644
index fa71eb975cb0..000000000000
--- a/kde-base/kdelibs/files/dist/23_solid_no_double_build.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-
---- a/solid/solid/CMakeLists.txt
-+++ b/solid/solid/CMakeLists.txt
-@@ -194,7 +194,14 @@
- install(FILES org.freedesktop.PowerManagement.Inhibit.xml DESTINATION ${DBUS_INTERFACES_INSTALL_DIR})
- 
- ########### static lib for tests  ###############
-+macro(AUTOMOC_COPY _from_target _to_target)
-+    set(_srcfile ${CMAKE_CURRENT_BINARY_DIR}/${_from_target}_automoc.cpp)
-+    set(_dstfile ${CMAKE_CURRENT_BINARY_DIR}/${_to_target}_automoc.cpp)
-+    add_custom_command(OUTPUT ${_dstfile} COMMAND ${CMAKE_COMMAND} -E copy
-+        ${_srcfile} ${_dstfile} MAIN_DEPENDENCY ${_srcfile})
-+endmacro(AUTOMOC_COPY _from_target _to_target)
- 
-+automoc_copy(solid solid_static)
- kde4_add_library(solid_static STATIC ${solid_LIB_SRCS})
- 
- target_link_libraries(solid_static ${QT_QTCORE_LIBRARY} ${QT_QTDBUS_LIBRARY} ${QT_QTXML_LIBRARY} ${QT_QTGUI_LIBRARY})
-
diff --git a/kde-base/kdelibs/files/kdelibs-4.3.3-klauncher_kdeinit.patch b/kde-base/kdelibs/files/kdelibs-4.3.3-klauncher_kdeinit.patch
deleted file mode 100644
index 24d6f1632f30..000000000000
--- a/kde-base/kdelibs/files/kdelibs-4.3.3-klauncher_kdeinit.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-Please refer to
-  https://bugs.kde.org/show_bug.cgi?id=209903
-
-  http://bugsfiles.kde.org/attachment.cgi?id=37552
-
-Index: kdelibs-4.3.2/kinit/kinit.cpp
-===================================================================
---- kdelibs-4.3.2.orig/kinit/kinit.cpp	2009-10-13 07:31:16.000000000 +0200
-+++ kdelibs-4.3.2/kinit/kinit.cpp	2009-10-13 07:31:52.000000000 +0200
-@@ -489,6 +489,13 @@
-       init_startup_info( startup_id, name, envc, envs );
- #endif
- 
-+  // Don't run this inside the child process, it crashes on OS/X 10.6
-+  const QByteArray docPath = QFile::encodeName(KGlobalSettings::documentPath());
-+#ifdef Q_WS_MAC
-+  QString bundlepath = s_instance->dirs()->findExe(QFile::decodeName(execpath));
-+  QString argvexe = s_instance->dirs()->findExe(QString::fromLatin1(_name));
-+#endif
-+
-   d.errorMsg = 0;
-   d.fork = fork();
-   switch(d.fork) {
-@@ -513,7 +520,6 @@
-      if (cwd && *cwd) {
-          (void)chdir(cwd);
-      } else {
--         const QByteArray docPath = QFile::encodeName(KGlobalSettings::documentPath());
-          (void)chdir(docPath.constData());
-      }
- 
diff --git a/kde-base/kdelibs/files/kdelibs-4.3.3-klauncher_kioslave.patch b/kde-base/kdelibs/files/kdelibs-4.3.3-klauncher_kioslave.patch
deleted file mode 100644
index 788e8025a70f..000000000000
--- a/kde-base/kdelibs/files/kdelibs-4.3.3-klauncher_kioslave.patch
+++ /dev/null
@@ -1,77 +0,0 @@
-Please refer to
-  https://bugs.kde.org/show_bug.cgi?id=209903
-
-  http://www.davidfaure.fr/2009/klauncher_kioslave.diff
-
-Index: klauncher.cpp
-===================================================================
---- kdelibs-4.3.3/kinit/klauncher.cpp	(revision 1034932)
-+++ kdelibs-4.3.3/kinit/klauncher.cpp	(working copy)
-@@ -621,7 +621,7 @@
- void
- KLauncher::requestStart(KLaunchRequest *request)
- {
--#ifdef Q_WS_WIN
-+#ifdef USE_KPROCESS_FOR_KIOSLAVES
-    requestList.append( request );
-    lastRequest = request;
- 
-@@ -1126,12 +1126,15 @@
-     }
- 
-     QStringList arg_list;
--#ifdef Q_WS_WIN
-+#ifdef USE_KPROCESS_FOR_KIOSLAVES
-     arg_list << name;
-     arg_list << protocol;
-     arg_list << mConnectionServer.address();
-     arg_list << app_socket;
-     name = KStandardDirs::findExe(QLatin1String("kioslave"));
-+#ifdef Q_OS_UNIX
-+    QString arg1 = protocol;
-+#endif
- #else
-     QString arg1 = protocol;
-     QString arg2 = mConnectionServer.address();
-@@ -1268,7 +1268,7 @@
-       slave->reparseConfiguration();
- }
- 
--#ifdef Q_WS_WIN
-+#ifdef USE_KPROCESS_FOR_KIOSLAVES
- void
- KLauncher::slotGotOutput()
- {
-Index: klauncher.h
-===================================================================
---- kdelibs-4.3.3/kinit/klauncher.h	(revision 1034932)
-+++ kdelibs-4.3.3/kinit/klauncher.h	(working copy)
-@@ -31,6 +31,10 @@
- #include <fixx11h.h>
- #endif
- 
-+#if defined(Q_WS_WIN) || defined(Q_WS_MAC)
-+#define USE_KPROCESS_FOR_KIOSLAVES
-+#endif
-+
- #include <QtCore/QString>
- #include <QtCore/QSocketNotifier>
- #include <QtCore/QTimer>
-@@ -105,7 +105,7 @@ public:
- #endif
-    QStringList envs; // env. variables to be app's environment
-    QString cwd;
--#ifdef Q_WS_WIN
-+#ifdef USE_KPROCESS_FOR_KIOSLAVES
- protected:
-    KProcess *process;
-    friend class KLauncher;
-@@ -286,7 +290,7 @@
-    void processRequestReturn(int status, const QByteArray &requestData);
- 
- protected Q_SLOTS:
--#ifdef Q_WS_WIN
-+#ifdef USE_KPROCESS_FOR_KIOSLAVES
-     void slotGotOutput();
-     void slotFinished(int exitCode, QProcess::ExitStatus exitStatus);
- #endif
diff --git a/kde-base/kdelibs/files/kdelibs-4.3.3-klauncher_mac.patch b/kde-base/kdelibs/files/kdelibs-4.3.3-klauncher_mac.patch
deleted file mode 100644
index 83d415703fa9..000000000000
--- a/kde-base/kdelibs/files/kdelibs-4.3.3-klauncher_mac.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-Please refer to
-  https://bugs.kde.org/show_bug.cgi?id=209903
-
-  http://www.davidfaure.fr/2009/klauncher_mac.diff
-
-Index: klauncher.cpp
-===================================================================
---- kdelibs-4.3.3/kinit/klauncher.cpp	(revision 1034932)
-+++ kdelibs-4.3.3/kinit/klauncher.cpp	(working copy)
-@@ -1144,6 +1144,12 @@
-     kDebug(7016) << "KLauncher: launching new slave " << name << " with protocol=" << protocol
-      << " args=" << arg_list << endl;
- 
-+#ifdef Q_WS_MAC
-+    arg_list.prepend(KLibLoader::findLibrary(name));
-+    name = KStandardDirs::locate("exe", QString::fromLatin1("kioslave"));
-+    arg_list.prepend(name);
-+#endif
-+
- #ifdef Q_OS_UNIX
-     if (mSlaveDebug == arg1)
-     {
-@@ -1154,8 +1160,10 @@
-     }
-     if (mSlaveValgrind == arg1)
-     {
-+#ifndef Q_WS_MAC
-        arg_list.prepend(KLibLoader::findLibrary(name));
-        arg_list.prepend(KStandardDirs::locate("exe", QString::fromLatin1("kioslave")));
-+#endif
-        name = QString::fromLatin1("valgrind");
-        if (!mSlaveValgrindSkin.isEmpty()) {
-            arg_list.prepend(QLatin1String("--tool=") + mSlaveValgrindSkin);
diff --git a/kde-base/kdelibs/files/kdelibs-4.4.3-mimetypes.patch b/kde-base/kdelibs/files/kdelibs-4.4.3-mimetypes.patch
deleted file mode 100644
index 687f24032826..000000000000
--- a/kde-base/kdelibs/files/kdelibs-4.4.3-mimetypes.patch
+++ /dev/null
@@ -1,58 +0,0 @@
-diff -r -u kdelibs-4.4.3.orig/mimetypes/kde.xml kdelibs-4.4.3/mimetypes/kde.xml
---- kdelibs-4.4.3.orig/mimetypes/kde.xml	2009-10-06 23:37:48.000000000 +0200
-+++ kdelibs-4.4.3/mimetypes/kde.xml	2010-05-28 22:48:51.000000000 +0200
-@@ -180,41 +180,6 @@
-     <root-XML namespaceURI="http://www.gribuser.ru/xml/fictionbook/2.0" localName="FictionBook"/>
-   </mime-type>
- 
--  <!-- all/ fake mime types -->
--  <mime-type type="all/all">
--    <comment>all files and folders</comment>
--  </mime-type>
--  <mime-type type="all/allfiles">
--    <comment>all files</comment>
--  </mime-type>
--
--  <!-- uri/ fake mime types -->
--  <mime-type type="uri/mms">
--    <comment>mms: URIs</comment>
--  </mime-type>
--  <mime-type type="uri/mmst">
--    <comment>mmst: URIs</comment>
--  </mime-type>
--  <mime-type type="uri/mmsu">
--    <comment>mmsu: URIs</comment>
--  </mime-type>
--  <mime-type type="uri/pnm">
--    <comment>pnm: URIs</comment>
--  </mime-type>
--  <mime-type type="uri/rtspt">
--    <comment>rtspt: URIs</comment>
--  </mime-type>
--  <mime-type type="uri/rtspu">
--    <comment>rtspu: URIs</comment>
--  </mime-type>
--
--  <!-- fonts/ fake mime types -->
--  <mime-type type="fonts/package">
--    <sub-class-of type="application/zip"/>
--    <comment>fonts package</comment>
--    <glob pattern="*.fonts.zip"/>
--  </mime-type>
--
-   <mime-type type="application/x-konsole">
-     <comment>file to open a shell</comment>
-     <glob pattern="*.shell"/>
-@@ -349,12 +314,6 @@
-     <glob pattern="*.icq"/>
-   </mime-type>
- 
--  <mime-type type="interface/x-winamp-skin">
--    <sub-class-of type="application/zip"/>
--    <comment>compressed Winamp skin</comment>
--    <glob pattern="*.wsz"/>
--  </mime-type>
--
-   <mime-type type="video/x-ms-wmp"> <!-- fdo #19671, rejected because "not a file type, only a plugin type" -->
-     <comment>Microsoft Media Format</comment>
-     <sub-class-of type="video/x-ms-wmv"/>
diff --git a/kde-base/kdelibs/kdelibs-4.6.2-r3.ebuild b/kde-base/kdelibs/kdelibs-4.6.2-r3.ebuild
index 6bc1bec57d5a..b7eafa00a14d 100644
--- a/kde-base/kdelibs/kdelibs-4.6.2-r3.ebuild
+++ b/kde-base/kdelibs/kdelibs-4.6.2-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdelibs/kdelibs-4.6.2-r3.ebuild,v 1.10 2011/06/06 21:09:12 abcd Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdelibs/kdelibs-4.6.2-r3.ebuild,v 1.11 2011/06/12 23:04:45 abcd Exp $
 
 EAPI=4
 
@@ -151,7 +151,7 @@ src_prepare() {
 	use arm && epatch "${FILESDIR}/${PN}-4.6.2-armlinking.patch"
 
 	# Rename applications.menu (needs 01_gentoo_set_xdg_menu_prefix.patch to work)
-	local menu_prefix="kde-${SLOT}-"
+	local menu_prefix="kde-$(get_kde_version)-"
 	sed -e "s|FILES[[:space:]]applications.menu|FILES applications.menu RENAME ${menu_prefix}applications.menu|g" \
 		-i kded/CMakeLists.txt || die "Sed on CMakeLists.txt for applications.menu failed."
 	sed -e "s|@REPLACE_MENU_PREFIX@|${menu_prefix}|g" \
diff --git a/kde-base/kdelibs/kdelibs-4.6.3-r2.ebuild b/kde-base/kdelibs/kdelibs-4.6.3-r2.ebuild
index 686a34521f30..c8bb696fd0dc 100644
--- a/kde-base/kdelibs/kdelibs-4.6.3-r2.ebuild
+++ b/kde-base/kdelibs/kdelibs-4.6.3-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdelibs/kdelibs-4.6.3-r2.ebuild,v 1.5 2011/06/10 11:50:40 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdelibs/kdelibs-4.6.3-r2.ebuild,v 1.6 2011/06/12 23:04:45 abcd Exp $
 
 EAPI=4
 
@@ -148,7 +148,7 @@ src_prepare() {
 	use arm && epatch "${FILESDIR}/${PN}-4.6.2-armlinking.patch"
 
 	# Rename applications.menu (needs 01_gentoo_set_xdg_menu_prefix.patch to work)
-	local menu_prefix="kde-${SLOT}-"
+	local menu_prefix="kde-$(get_kde_version)-"
 	sed -e "s|FILES[[:space:]]applications.menu|FILES applications.menu RENAME ${menu_prefix}applications.menu|g" \
 		-i kded/CMakeLists.txt || die "Sed on CMakeLists.txt for applications.menu failed."
 	sed -e "s|@REPLACE_MENU_PREFIX@|${menu_prefix}|g" \