[gentoo-commits] proj/kde:master commit in: kde-base/kdeplasma-addons/files/, kde-base/kdeplasma-addons/

["Theo Chatzimichos" <tampakrap@gentoo.org>]

commit:     9306418c967c28877829c6353913a5223063e393
Author:     Theo Chatzimichos <tampakrap <AT> gentoo <DOT> org>
AuthorDate: Tue Apr 12 01:44:23 2011 +0000
Commit:     Theo Chatzimichos <tampakrap <AT> gentoo <DOT> org>
CommitDate: Tue Apr 12 01:44:23 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=9306418c

[kde-base/kdeplasma-addons] Reorder of the deps:
 - better handling of semantic-desktop (not ready yet, will be as soon as upstream REVIEW
101095 gets resolved)
 - add attica useflag
Remove the cmake patch we had there (why wasn't it upstreamfied? anyway, it seems useless, I removed it)

---
 .../files/4.5.0-fix_lancelot.patch                 |   21 -----
 .../files/kdeplasma-addons-4.4.3-cmake.patch       |   77 ----------------
 .../files/kdeplasma-addons-4.4.74-cmake.patch      |   94 --------------------
 .../files/kdeplasma-addons-4.4.92-lancelot.patch   |   11 ---
 .../files/kdeplasma-addons-4.5.56-cmake.patch      |   47 ----------
 .../kdeplasma-addons-4.6.9999.ebuild               |   14 ++--
 .../kdeplasma-addons/kdeplasma-addons-9999.ebuild  |   14 ++--
 kde-base/kdeplasma-addons/metadata.xml             |    1 +
 8 files changed, 13 insertions(+), 266 deletions(-)

diff --git a/kde-base/kdeplasma-addons/files/4.5.0-fix_lancelot.patch b/kde-base/kdeplasma-addons/files/4.5.0-fix_lancelot.patch
deleted file mode 100644
index 4ae4319..0000000
--- a/kde-base/kdeplasma-addons/files/4.5.0-fix_lancelot.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-Index: trunk/KDE/kdeplasma-addons/libs/lancelot-datamodels/MessagesKmail_p.h
-===================================================================
---- trunk/KDE/kdeplasma-addons/libs/lancelot-datamodels/MessagesKmail_p.h	(revision 1162199)
-+++ trunk/KDE/kdeplasma-addons/libs/lancelot-datamodels/MessagesKmail_p.h	(revision 1162200)
-@@ -21,11 +21,14 @@
- #include <QHash>
- #include <KIcon>
- #include <KJob>
-+
-+#include "config-lancelot-datamodels.h"
-+
-+#ifdef LANCELOT_DATAMODELS_HAS_PIMLIBS
- #include <Akonadi/Entity>
- #include <Akonadi/Collection>
-+#endif
- 
--#include "config-lancelot-datamodels.h"
--
- namespace Lancelot {
- namespace Models {
- 

diff --git a/kde-base/kdeplasma-addons/files/kdeplasma-addons-4.4.3-cmake.patch b/kde-base/kdeplasma-addons/files/kdeplasma-addons-4.4.3-cmake.patch
deleted file mode 100644
index 589954b..0000000
--- a/kde-base/kdeplasma-addons/files/kdeplasma-addons-4.4.3-cmake.patch
+++ /dev/null
@@ -1,77 +0,0 @@
-Index: applets/CMakeLists.txt
-===================================================================
---- applets/CMakeLists.txt	(revision 1122757)
-+++ applets/CMakeLists.txt	(working copy)
-@@ -15,6 +15,7 @@
- add_subdirectory(calculator)
- add_subdirectory(charselect)
- add_subdirectory(comic)
-+add_subdirectory(dict)
- add_subdirectory(fifteenPuzzle)
- add_subdirectory(fileWatcher)
- add_subdirectory(frame)
-@@ -29,14 +30,21 @@
- add_subdirectory(microblog)
- add_subdirectory(notes)
- add_subdirectory(nowplaying)
-+
- if(LIBATTICA_FOUND)
-   add_subdirectory(opendesktop)
-   add_subdirectory(opendesktop-activities)
- endif(LIBATTICA_FOUND)
-+
- add_subdirectory(pastebin)
- add_subdirectory(previewer)
- add_subdirectory(rememberthemilk)
--add_subdirectory(rssnow)
-+
-+if(KDEPIMLIBS_FOUND)
-+  add_subdirectory(news)
-+  add_subdirectory(rssnow)
-+endif(KDEPIMLIBS_FOUND)
-+
- add_subdirectory(spellcheck)
- add_subdirectory(showdashboard)
- add_subdirectory(timer)
-@@ -47,11 +55,6 @@
- add_subdirectory(weatherstation)
- add_subdirectory(weather)
- 
--if(QT_QTWEBKIT_FOUND)
--  add_subdirectory(dict)
--  add_subdirectory(news)
--endif(QT_QTWEBKIT_FOUND)
--
- if(PHONON_FOUND)
-   add_subdirectory(mediaplayer)
- endif(PHONON_FOUND)
-Index: runners/CMakeLists.txt
-===================================================================
---- runners/CMakeLists.txt	(revision 1122757)
-+++ runners/CMakeLists.txt	(working copy)
-@@ -8,10 +8,9 @@
- add_subdirectory(spellchecker)
- 
- if(KDEPIMLIBS_FOUND)
--add_subdirectory(contacts)
-+   add_subdirectory(contacts)
- endif(KDEPIMLIBS_FOUND)
- 
- if(NOT WIN32)
-- add_subdirectory(konsolesessions)
-+   add_subdirectory(konsolesessions)
- endif(NOT WIN32)
--
-Index: runners/contacts/CMakeLists.txt
-===================================================================
---- runners/contacts/CMakeLists.txt	(revision 1122757)
-+++ runners/contacts/CMakeLists.txt	(working copy)
-@@ -5,7 +5,7 @@
- 
- kde4_add_plugin(krunner_contacts ${krunner_contacts_SRCS})
- target_link_libraries(krunner_contacts ${KDE4_KIO_LIBS} ${KDE4_PLASMA_LIBS}
--${KDE4_KABC_LIBS})
-+${KDEPIMLIBS_KABC_LIBS})
- 
- install(TARGETS krunner_contacts DESTINATION ${PLUGIN_INSTALL_DIR} )
- 

diff --git a/kde-base/kdeplasma-addons/files/kdeplasma-addons-4.4.74-cmake.patch b/kde-base/kdeplasma-addons/files/kdeplasma-addons-4.4.74-cmake.patch
deleted file mode 100644
index 56a1e78..0000000
--- a/kde-base/kdeplasma-addons/files/kdeplasma-addons-4.4.74-cmake.patch
+++ /dev/null
@@ -1,94 +0,0 @@
-Index: applets/CMakeLists.txt
-===================================================================
---- applets/CMakeLists.txt	(revision 1122904)
-+++ applets/CMakeLists.txt	(working copy)
-@@ -16,6 +16,7 @@
- add_subdirectory(calculator)
- add_subdirectory(charselect)
- add_subdirectory(comic)
-+add_subdirectory(dict)
- add_subdirectory(fifteenPuzzle)
- add_subdirectory(fileWatcher)
- add_subdirectory(frame)
-@@ -30,14 +31,21 @@
- add_subdirectory(microblog)
- add_subdirectory(notes)
- add_subdirectory(nowplaying)
-+
- if(LIBATTICA_FOUND)
-   add_subdirectory(community)
-   add_subdirectory(social-news)
- endif(LIBATTICA_FOUND)
-+
- add_subdirectory(pastebin)
- add_subdirectory(previewer)
- add_subdirectory(rememberthemilk)
--add_subdirectory(rssnow)
-+
-+if(KDEPIMLIBS_FOUND)
-+  add_subdirectory(news)
-+  add_subdirectory(rssnow)
-+endif(KDEPIMLIBS_FOUND)
-+
- add_subdirectory(spellcheck)
- add_subdirectory(showdashboard)
- add_subdirectory(timer)
-@@ -48,11 +56,6 @@
- add_subdirectory(weatherstation)
- add_subdirectory(weather)
- 
--if(QT_QTWEBKIT_FOUND)
--  add_subdirectory(dict)
--  add_subdirectory(news)
--endif(QT_QTWEBKIT_FOUND)
--
- if(PHONON_FOUND)
-   add_subdirectory(mediaplayer)
- endif(PHONON_FOUND)
-Index: libs/lancelot-datamodels/CMakeLists.txt
-===================================================================
---- libs/lancelot-datamodels/CMakeLists.txt	(revision 1122904)
-+++ libs/lancelot-datamodels/CMakeLists.txt	(working copy)
-@@ -23,10 +23,8 @@
- 
-    set (ADDITIONAL_LINK_LIBRARIES
-         ${ADDITIONAL_LINK_LIBRARIES}
--        ${KDE4_AKONADI_LIBS}
--        )
--
--
-+        ${KDEPIMLIBS_AKONADI_LIBS}
-+   )
- endif(KDEPIMLIBS_FOUND)
- 
- macro_log_feature(LANCELOT_DATAMODELS_HAS_PIMLIBS
-Index: runners/CMakeLists.txt
-===================================================================
---- runners/CMakeLists.txt	(revision 1122904)
-+++ runners/CMakeLists.txt	(working copy)
-@@ -9,10 +9,9 @@
- add_subdirectory(characters)
- 
- if(KDEPIMLIBS_FOUND)
--add_subdirectory(contacts)
-+   add_subdirectory(contacts)
- endif(KDEPIMLIBS_FOUND)
- 
- if(NOT WIN32)
-- add_subdirectory(konsolesessions)
-+   add_subdirectory(konsolesessions)
- endif(NOT WIN32)
--
-Index: runners/contacts/CMakeLists.txt
-===================================================================
---- runners/contacts/CMakeLists.txt	(revision 1122904)
-+++ runners/contacts/CMakeLists.txt	(working copy)
-@@ -5,7 +5,7 @@
- 
- kde4_add_plugin(krunner_contacts ${krunner_contacts_SRCS})
- target_link_libraries(krunner_contacts ${KDE4_KIO_LIBS} ${KDE4_PLASMA_LIBS}
--${KDE4_KABC_LIBS})
-+${KDEPIMLIBS_KABC_LIBS})
- 
- install(TARGETS krunner_contacts DESTINATION ${PLUGIN_INSTALL_DIR} )
- 

diff --git a/kde-base/kdeplasma-addons/files/kdeplasma-addons-4.4.92-lancelot.patch b/kde-base/kdeplasma-addons/files/kdeplasma-addons-4.4.92-lancelot.patch
deleted file mode 100644
index 2a2ceef..0000000
--- a/kde-base/kdeplasma-addons/files/kdeplasma-addons-4.4.92-lancelot.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- libs/lancelot-datamodels/BaseModel.cpp	2010/06/24 19:25:17	1142379
-+++ libs/lancelot-datamodels/BaseModel.cpp	2010/07/29 09:07:25	1156567
-@@ -165,7 +165,7 @@
- {
-     const KService::Ptr service = KService::serviceByStorageId(serviceName);
- 
--    qDebug() << "BaseModel::addService Applic:" << service->isValid() << " " << serviceName;
-+    // qDebug() << "BaseModel::addService Applic:" << service->isValid() << " " << serviceName;
- 
-     return addService(service);
- }

diff --git a/kde-base/kdeplasma-addons/files/kdeplasma-addons-4.5.56-cmake.patch b/kde-base/kdeplasma-addons/files/kdeplasma-addons-4.5.56-cmake.patch
deleted file mode 100644
index 1e326a5..0000000
--- a/kde-base/kdeplasma-addons/files/kdeplasma-addons-4.5.56-cmake.patch
+++ /dev/null
@@ -1,47 +0,0 @@
-Index: applets/CMakeLists.txt
-===================================================================
---- applets/CMakeLists.txt	(revision 1172136)
-+++ applets/CMakeLists.txt	(working copy)
-@@ -16,6 +16,7 @@
- add_subdirectory(calculator)
- add_subdirectory(charselect)
- add_subdirectory(comic)
-+add_subdirectory(dict)
- add_subdirectory(fifteenPuzzle)
- add_subdirectory(fileWatcher)
- add_subdirectory(frame)
-@@ -30,14 +31,21 @@
- add_subdirectory(microblog)
- add_subdirectory(notes)
- add_subdirectory(nowplaying)
-+
- if(LIBATTICA_FOUND)
-   add_subdirectory(community)
-   add_subdirectory(social-news)
- endif(LIBATTICA_FOUND)
-+
- add_subdirectory(pastebin)
- add_subdirectory(previewer)
- add_subdirectory(rememberthemilk)
--add_subdirectory(rssnow)
-+
-+if(KDEPIMLIBS_FOUND)
-+  add_subdirectory(news)
-+  add_subdirectory(rssnow)
-+endif(KDEPIMLIBS_FOUND)
-+
- add_subdirectory(spellcheck)
- add_subdirectory(showdashboard)
- add_subdirectory(timer)
-@@ -48,11 +56,6 @@
- add_subdirectory(weatherstation)
- add_subdirectory(weather)
- 
--if(QT_QTWEBKIT_FOUND)
--  add_subdirectory(dict)
--  add_subdirectory(news)
--endif(QT_QTWEBKIT_FOUND)
--
- if(PHONON_FOUND)
-   add_subdirectory(mediaplayer)
- endif(PHONON_FOUND)

diff --git a/kde-base/kdeplasma-addons/kdeplasma-addons-4.6.9999.ebuild b/kde-base/kdeplasma-addons/kdeplasma-addons-4.6.9999.ebuild
index 2e5950f..67633f4 100644
--- a/kde-base/kdeplasma-addons/kdeplasma-addons-4.6.9999.ebuild
+++ b/kde-base/kdeplasma-addons/kdeplasma-addons-4.6.9999.ebuild
@@ -13,23 +13,23 @@ HOMEPAGE="http://www.kde.org/"
 LICENSE="GPL-2 LGPL-2"
 
 KEYWORDS=""
-IUSE="debug desktopglobe exif qalculate qwt scim semantic-desktop"
+IUSE="attica debug desktopglobe exif qalculate qwt scim semantic-desktop"
 
 # krunner is only needed to generate dbus interface for lancelot
 COMMON_DEPEND="
 	app-crypt/qca:2
 	app-crypt/qca-ossl:2
-	dev-libs/libattica
 	$(add_kdebase_dep kdelibs 'semantic-desktop?')
-	$(add_kdebase_dep kdepimlibs)
 	$(add_kdebase_dep krunner)
-	$(add_kdebase_dep plasma-workspace)
+	$(add_kdebase_dep plasma-workspace 'semantic-desktop?')
 	x11-misc/shared-mime-info
+	attica? ( dev-libs/libattica )
 	desktopglobe? ( $(add_kdebase_dep marble) )
 	exif? ( $(add_kdebase_dep libkexiv2) )
 	qalculate? ( sci-libs/libqalculate )
 	qwt? ( x11-libs/qwt:5 )
 	scim? ( app-i18n/scim )
+	semantic-desktop? ( $(add_kdebase_dep kdepimlibs 'semantic-desktop') )
 "
 DEPEND="${COMMON_DEPEND}
 	dev-cpp/eigen:2
@@ -46,10 +46,6 @@ RDEPEND="${COMMON_DEPEND}
 # kdebase-data: some svg icons moved from data directly here.
 add_blocker kdebase-data '<4.2.88'
 
-PATCHES=(
-	"${FILESDIR}/${PN}-4.5.56-cmake.patch"
-)
-
 src_prepare() {
 	find "${S}" -name CMakeLists.txt | \
 		xargs sed -i \
@@ -64,10 +60,12 @@ src_prepare() {
 src_configure() {
 	mycmakeargs=(
 		-DDBUS_INTERFACES_INSTALL_DIR="${EKDEDIR}/share/dbus-1/interfaces/"
+		$(cmake-utils_use_with attica LibAttica)
 		$(cmake-utils_use_with desktopglobe Marble)
 		$(cmake-utils_use_with exif Kexiv2)
 		$(cmake-utils_use_with qalculate)
 		$(cmake-utils_use_with qwt)
+		$(cmake-utils_use_with semantic-desktop KdepimLibs)
 		$(cmake-utils_use_with semantic-desktop Nepomuk)
 		$(cmake-utils_use_with scim)
 	)

diff --git a/kde-base/kdeplasma-addons/kdeplasma-addons-9999.ebuild b/kde-base/kdeplasma-addons/kdeplasma-addons-9999.ebuild
index 2e5950f..67633f4 100644
--- a/kde-base/kdeplasma-addons/kdeplasma-addons-9999.ebuild
+++ b/kde-base/kdeplasma-addons/kdeplasma-addons-9999.ebuild
@@ -13,23 +13,23 @@ HOMEPAGE="http://www.kde.org/"
 LICENSE="GPL-2 LGPL-2"
 
 KEYWORDS=""
-IUSE="debug desktopglobe exif qalculate qwt scim semantic-desktop"
+IUSE="attica debug desktopglobe exif qalculate qwt scim semantic-desktop"
 
 # krunner is only needed to generate dbus interface for lancelot
 COMMON_DEPEND="
 	app-crypt/qca:2
 	app-crypt/qca-ossl:2
-	dev-libs/libattica
 	$(add_kdebase_dep kdelibs 'semantic-desktop?')
-	$(add_kdebase_dep kdepimlibs)
 	$(add_kdebase_dep krunner)
-	$(add_kdebase_dep plasma-workspace)
+	$(add_kdebase_dep plasma-workspace 'semantic-desktop?')
 	x11-misc/shared-mime-info
+	attica? ( dev-libs/libattica )
 	desktopglobe? ( $(add_kdebase_dep marble) )
 	exif? ( $(add_kdebase_dep libkexiv2) )
 	qalculate? ( sci-libs/libqalculate )
 	qwt? ( x11-libs/qwt:5 )
 	scim? ( app-i18n/scim )
+	semantic-desktop? ( $(add_kdebase_dep kdepimlibs 'semantic-desktop') )
 "
 DEPEND="${COMMON_DEPEND}
 	dev-cpp/eigen:2
@@ -46,10 +46,6 @@ RDEPEND="${COMMON_DEPEND}
 # kdebase-data: some svg icons moved from data directly here.
 add_blocker kdebase-data '<4.2.88'
 
-PATCHES=(
-	"${FILESDIR}/${PN}-4.5.56-cmake.patch"
-)
-
 src_prepare() {
 	find "${S}" -name CMakeLists.txt | \
 		xargs sed -i \
@@ -64,10 +60,12 @@ src_prepare() {
 src_configure() {
 	mycmakeargs=(
 		-DDBUS_INTERFACES_INSTALL_DIR="${EKDEDIR}/share/dbus-1/interfaces/"
+		$(cmake-utils_use_with attica LibAttica)
 		$(cmake-utils_use_with desktopglobe Marble)
 		$(cmake-utils_use_with exif Kexiv2)
 		$(cmake-utils_use_with qalculate)
 		$(cmake-utils_use_with qwt)
+		$(cmake-utils_use_with semantic-desktop KdepimLibs)
 		$(cmake-utils_use_with semantic-desktop Nepomuk)
 		$(cmake-utils_use_with scim)
 	)

diff --git a/kde-base/kdeplasma-addons/metadata.xml b/kde-base/kdeplasma-addons/metadata.xml
index c912e97..e4b97e4 100644
--- a/kde-base/kdeplasma-addons/metadata.xml
+++ b/kde-base/kdeplasma-addons/metadata.xml
@@ -3,6 +3,7 @@
 <pkgmetadata>
 <herd>kde</herd>
 <use>
+	<flag name="attica">Enable support for <pkg>dev-libs/libattica</pkg></flag>
 	<flag name="desktopglobe">Enable Desktop Globe wallpaper using <pkg>kde-base/marble</pkg></flag>
 	<flag name="qalculate">Enable Qalculate runner using <pkg>sci-libs/libqalculate</pkg></flag>
 	<flag name="qwt">Enable applets that use <pkg>x11-libs/qwt:5</pkg>.</flag>