[kde-base] Add KDE SC 4.6.1

Package-Manager: portage-2.2.0_alpha26/cvs/Linux x86_64

3 files changed, 152 insertions, 122 deletions

diff --git a/kde-base/plasma-workspace/ChangeLog b/kde-base/plasma-workspace/ChangeLog
index 7f4b9bd11997..103366944709 100644
--- a/kde-base/plasma-workspace/ChangeLog
+++ b/kde-base/plasma-workspace/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for kde-base/plasma-workspace
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/plasma-workspace/ChangeLog,v 1.91 2011/02/05 13:28:43 tampakrap Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/plasma-workspace/ChangeLog,v 1.92 2011/03/04 18:00:00 alexxy Exp $
+
+*plasma-workspace-4.6.1 (04 Mar 2011)
+
+  04 Mar 2011; Alexey Shvetsov <alexxy@gentoo.org>
+  files/plasma-workspace-4.6.0-optional_akonadi-server.patch,
+  +plasma-workspace-4.6.1.ebuild:
+  Version bump KDE SC 4.6.1
 
   05 Feb 2011; Theo Chatzimichos <tampakrap@gentoo.org>
   files/plasma-workspace-4.6.0-optional_akonadi-server.patch:
diff --git a/kde-base/plasma-workspace/files/plasma-workspace-4.6.0-optional_akonadi-server.patch b/kde-base/plasma-workspace/files/plasma-workspace-4.6.0-optional_akonadi-server.patch
index 839734d6f59f..de333bca99a2 100644
--- a/kde-base/plasma-workspace/files/plasma-workspace-4.6.0-optional_akonadi-server.patch
+++ b/kde-base/plasma-workspace/files/plasma-workspace-4.6.0-optional_akonadi-server.patch
@@ -1,130 +1,16 @@
-diff --git a/plasma/generic/dataengines/CMakeLists.txt b/plasma/generic/dataengines/CMakeLists.txt
-index 4664a02..1278224 100644
---- a/plasma/generic/dataengines/CMakeLists.txt
-+++ b/plasma/generic/dataengines/CMakeLists.txt
-@@ -25,10 +25,15 @@ if (NEPOMUK_FOUND)
- endif (NEPOMUK_FOUND)
- 
- macro_optional_find_package(KdepimLibs 4.5.60)
--macro_log_feature(KDEPIMLIBS_FOUND "kdepimlibs" "KDE PIM libraries" "http://www.kde.org" FALSE "" "Needed for building several plasma dataengines")
-+macro_log_feature(KDEPIMLIBS_FOUND "kdepimlibs" "KDE PIM libraries" "http://www.kde.org" FALSE "" "Needed for building several Plasma DataEngines")
-+
-+macro_optional_find_package(Akonadi)
-+macro_log_feature(AKONADI_FOUND "Akonadi" "Akonadi libraries" "http://pim.kde.org/akonadi/" FALSE "" "Needed for event support in the calendar DataEngine")
+diff -r -u plasma-workspace-4.6.0-orig/plasma/generic/dataengines/CMakeLists.txt plasma-workspace-4.6.0/plasma/generic/dataengines/CMakeLists.txt
+--- plasma-workspace-4.6.0-orig/plasma/generic/dataengines/CMakeLists.txt	2011-02-03 18:58:47.884000165 -0500
++++ plasma-workspace-4.6.0/plasma/generic/dataengines/CMakeLists.txt	2011-02-03 19:24:21.511000165 -0500
+@@ -28,8 +28,10 @@
+ macro_log_feature(KDEPIMLIBS_FOUND "kdepimlibs" "KDE PIM libraries" "http://www.kde.org" FALSE "" "Needed for building several plasma dataengines")
  
  if(KDEPIMLIBS_FOUND)
 -   add_subdirectory(akonadi)
+-   add_subdirectory(calendar)
 +   if(AKONADI_FOUND)
 +      add_subdirectory(akonadi)
++      add_subdirectory(calendar)
 +   endif(AKONADI_FOUND)
-    add_subdirectory(calendar)
     add_subdirectory(rss)
  endif(KDEPIMLIBS_FOUND)
-diff --git a/plasma/generic/dataengines/calendar/CMakeLists.txt b/plasma/generic/dataengines/calendar/CMakeLists.txt
-index d3d76e6..a6abcdc 100644
---- a/plasma/generic/dataengines/calendar/CMakeLists.txt
-+++ b/plasma/generic/dataengines/calendar/CMakeLists.txt
-@@ -1,7 +1,6 @@
- project(calendar_engine)
- 
- find_package(KdepimLibs REQUIRED)
--find_package(Akonadi REQUIRED)
- find_package(Boost REQUIRED)
- 
- include_directories(
-@@ -14,14 +13,20 @@ set( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${KDE4_ENABLE_EXCEPTIONS}" )
- 
- set(calendar_engine_srcs
-     calendarengine.cpp
--    eventdatacontainer.cpp
--# taken from kdepim/akonadi/kcal as long as it's not yet exported:
--    akonadi/calendar.cpp
--    akonadi/calendarmodel.cpp
--    akonadi/calfilterproxymodel.cpp
--    akonadi/utils.cpp
- )
- 
-+if(AKONADI_FOUND)
-+    ADD_DEFINITIONS(-DAKONADI_FOUND)
-+    set(calendar_engine_srcs ${calendar_engine_srcs}
-+        eventdatacontainer.cpp
-+        # taken from kdepim/akonadi/kcal as long as it's not yet exported:
-+        akonadi/calendar.cpp
-+        akonadi/calendarmodel.cpp
-+        akonadi/calfilterproxymodel.cpp
-+        akonadi/utils.cpp
-+    )
-+endif(AKONADI_FOUND)
-+
- kde4_add_plugin(plasma_engine_calendar ${calendar_engine_srcs})
- 
- target_link_libraries(
-@@ -29,13 +34,19 @@ target_link_libraries(
-     ${KDEPIMLIBS_KHOLIDAYS_LIBRARY}
-     ${KDE4_KDECORE_LIBS}
-     ${KDE4_PLASMA_LIBS}
--    ${KDE4_AKONADI_LIBS}
-     ${KDE4_KMIME_LIBS}
-     ${KDE4_KCALCORE_LIBS}
-     ${KDE4_KCALUTILS_LIBS}
--    ${KDEPIMLIBS_AKONADI_KCAL_LIBS}
- )
- 
-+if(AKONADI_FOUND)
-+    target_link_libraries(
-+        plasma_engine_calendar
-+        ${KDE4_AKONADI_LIBS}
-+        ${KDEPIMLIBS_AKONADI_KCAL_LIBS}
-+    )
-+endif(AKONADI_FOUND)
-+
- install(TARGETS plasma_engine_calendar DESTINATION ${PLUGIN_INSTALL_DIR})
- install(FILES plasma-dataengine-calendar.desktop DESTINATION ${SERVICES_INSTALL_DIR})
- 
-diff --git a/plasma/generic/dataengines/calendar/calendarengine.cpp b/plasma/generic/dataengines/calendar/calendarengine.cpp
-index 0fdd65d..53f98c0 100644
---- a/plasma/generic/dataengines/calendar/calendarengine.cpp
-+++ b/plasma/generic/dataengines/calendar/calendarengine.cpp
-@@ -32,6 +32,7 @@
- #include <KCalCore/Todo>
- #include <KCalCore/Journal>
- 
-+#ifdef AKONADI_FOUND
- #include <Akonadi/ChangeRecorder>
- #include <Akonadi/Session>
- #include <Akonadi/Collection>
-@@ -41,6 +42,7 @@
- #include "akonadi/calendar.h"
- #include "akonadi/calendarmodel.h"
- #include "eventdatacontainer.h"
-+#endif
- 
- CalendarEngine::CalendarEngine(QObject* parent, const QVariantList& args)
-               : Plasma::DataEngine(parent),
-@@ -74,9 +76,11 @@ bool CalendarEngine::sourceRequestEvent(const QString &request)
-         return holidayCalendarSourceRequest(requestKey, requestTokens, request);
-     }
- 
-+#ifdef AKONADI_FOUND
-     if (requestKey == "events" || requestKey == "eventsInMonth") {
-         return akonadiCalendarSourceRequest(requestKey, requestTokens, request);
-     }
-+#endif
- 
-     return false;
- }
-@@ -272,6 +276,7 @@ bool CalendarEngine::holidayCalendarSourceRequest(const QString& key, const QStr
-     return false;
- }
- 
-+#ifdef AKONADI_FOUND
- bool CalendarEngine::akonadiCalendarSourceRequest(const QString& key, const QStringList& args, const QString& request)
- {
-     // figure out what time range was requested from the source string
-@@ -339,5 +344,6 @@ void CalendarEngine::initAkonadiCalendar()
-     calendarModel->setCollectionFetchStrategy(Akonadi::EntityTreeModel::InvisibleCollectionFetch);
-     m_calendar = new CalendarSupport::Calendar(calendarModel, calendarModel, KSystemTimeZones::local());
- }
-+#endif
  
- #include "calendarengine.moc"
diff --git a/kde-base/plasma-workspace/plasma-workspace-4.6.1.ebuild b/kde-base/plasma-workspace/plasma-workspace-4.6.1.ebuild
new file mode 100644
index 000000000000..1f12e22cf0b7
--- /dev/null
+++ b/kde-base/plasma-workspace/plasma-workspace-4.6.1.ebuild
@@ -0,0 +1,137 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/kde-base/plasma-workspace/plasma-workspace-4.6.1.ebuild,v 1.1 2011/03/04 18:00:00 alexxy Exp $
+
+EAPI=3
+
+KDE_HANDBOOK="optional"
+KMNAME="kdebase-workspace"
+KMMODULE="plasma"
+PYTHON_DEPEND="python? 2"
+inherit python kde4-meta
+
+DESCRIPTION="Plasma: KDE desktop framework"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="debug google-gadgets gps python qalculate semantic-desktop xinerama"
+
+COMMONDEPEND="
+	$(add_kdebase_dep kdelibs 'semantic-desktop?')
+	$(add_kdebase_dep kdepimlibs 'semantic-desktop?')
+	$(add_kdebase_dep kephal)
+	$(add_kdebase_dep ksysguard)
+	$(add_kdebase_dep libkworkspace)
+	$(add_kdebase_dep libplasmaclock)
+	$(add_kdebase_dep libplasmagenericshell)
+	$(add_kdebase_dep libtaskmanager)
+	$(add_kdebase_dep solid)
+	x11-libs/libXcomposite
+	x11-libs/libXdamage
+	x11-libs/libXfixes
+	x11-libs/libXrender
+	google-gadgets? ( >=x11-misc/google-gadgets-0.11.0[qt4] )
+	gps? ( >=sci-geosciences/gpsd-2.37 )
+	python? (
+		>=dev-python/PyQt4-4.4.0[X]
+		>=dev-python/sip-4.7.1
+		$(add_kdebase_dep pykde4)
+	)
+	qalculate? ( sci-libs/libqalculate )
+	xinerama? ( x11-libs/libXinerama )
+"
+DEPEND="${COMMONDEPEND}
+	x11-proto/compositeproto
+	x11-proto/damageproto
+	x11-proto/fixesproto
+	x11-proto/renderproto
+	xinerama? ( x11-proto/xineramaproto )
+"
+RDEPEND="${COMMONDEPEND}
+	$(add_kdebase_dep activitymanager)
+	$(add_kdebase_dep plasma-runtime)
+"
+
+KMEXTRA="
+	statusnotifierwatcher/
+"
+KMEXTRACTONLY="
+	krunner/dbus/org.freedesktop.ScreenSaver.xml
+	krunner/dbus/org.kde.krunner.App.xml
+	ksmserver/org.kde.KSMServerInterface.xml
+	libs/kephal/
+	libs/kworkspace/
+	libs/taskmanager/
+	libs/plasmagenericshell/
+	libs/ksysguard/
+	ksysguard/
+"
+
+KMLOADLIBS="libkworkspace libplasmaclock libplasmagenericshell libtaskmanager"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-4.4.2-xinerama_cmake_automagic.patch"
+	"${FILESDIR}/${PN}-4.6.0-optional_akonadi-server.patch"
+)
+
+pkg_setup() {
+	python_set_active_version 2
+	kde4-meta_pkg_setup
+}
+
+src_unpack() {
+	if use handbook; then
+		KMEXTRA+=" doc/plasma-desktop"
+	fi
+
+	kde4-meta_src_unpack
+}
+
+src_prepare() {
+	sed -i -e '1ifind_package(KdepimLibs)' plasma/CMakeLists.txt || die
+
+	kde4-meta_src_prepare
+}
+
+src_configure() {
+	mycmakeargs=(
+		$(cmake-utils_use_with google-gadgets Googlegadgets)
+		$(cmake-utils_use_with gps libgps)
+		$(cmake-utils_use_with python SIP)
+		$(cmake-utils_use_with python PyQt4)
+		$(cmake-utils_use_with python PyKDE4)
+		$(cmake-utils_use_with qalculate)
+		$(cmake-utils_use_with semantic-desktop Nepomuk)
+		$(cmake-utils_use_with semantic-desktop Soprano)
+		$(cmake-utils_use_with xinerama X11_Xinerama)
+		-DWITH_Xmms=OFF
+	)
+
+	kde4-meta_src_configure
+}
+
+src_install() {
+	kde4-meta_src_install
+
+	rm -f \
+		"${ED}$(python_get_sitedir)"/PyKDE4/*.py[co] \
+		"${ED}${KDEDIR}"/share/apps/plasma_scriptengine_python/*.py[co]
+}
+
+pkg_postinst() {
+	kde4-meta_pkg_postinst
+
+	if use python; then
+		python_mod_optimize \
+			PyKDE4 \
+			"${KDEDIR}"/share/apps/plasma_scriptengine_python
+	fi
+}
+
+pkg_postrm() {
+	kde4-meta_pkg_postrm
+
+	if [[ -d ${EKDEDIR}/share/apps/plasma_scriptengine_python ]]; then
+		python_mod_cleanup \
+			PyKDE4 \
+			"${KDEDIR}"/share/apps/plasma_scriptengine_python
+	fi
+}