Add patch to fix bug 288154

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

4 files changed, 103 insertions, 9 deletions

diff --git a/kde-base/kdeplasma-addons/ChangeLog b/kde-base/kdeplasma-addons/ChangeLog
index c2bce85f3356..b5ce37f2cdfb 100644
--- a/kde-base/kdeplasma-addons/ChangeLog
+++ b/kde-base/kdeplasma-addons/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for kde-base/kdeplasma-addons
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeplasma-addons/ChangeLog,v 1.56 2010/05/03 21:34:27 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeplasma-addons/ChangeLog,v 1.57 2010/05/05 01:15:51 reavertm Exp $
+
+*kdeplasma-addons-4.4.2-r1 (05 May 2010)
+
+  05 May 2010; Maciej Mrozowski <reavertm@gentoo.org>
+  -kdeplasma-addons-4.4.2.ebuild, +kdeplasma-addons-4.4.2-r1.ebuild,
+  kdeplasma-addons-4.4.3.ebuild, +files/kdeplasma-addons-4.4.3-cmake.patch:
+  Add patch to fix bug 288154
 
   03 May 2010; Alexey Shvetsov <alexxy@gentoo.org>
   -kdeplasma-addons-4.4.1.ebuild:
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
new file mode 100644
index 000000000000..589954b9613a
--- /dev/null
+++ b/kde-base/kdeplasma-addons/files/kdeplasma-addons-4.4.3-cmake.patch
@@ -0,0 +1,77 @@
+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/kdeplasma-addons-4.4.2.ebuild b/kde-base/kdeplasma-addons/kdeplasma-addons-4.4.2-r1.ebuild
index 4373c8310215..bcf7e772dd42 100644
--- a/kde-base/kdeplasma-addons/kdeplasma-addons-4.4.2.ebuild
+++ b/kde-base/kdeplasma-addons/kdeplasma-addons-4.4.2-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeplasma-addons/kdeplasma-addons-4.4.2.ebuild,v 1.1 2010/03/30 20:50:44 spatz Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeplasma-addons/kdeplasma-addons-4.4.2-r1.ebuild,v 1.1 2010/05/05 01:15:51 reavertm Exp $
 
 EAPI="3"
 
@@ -13,20 +13,20 @@ HOMEPAGE="http://www.kde.org/"
 LICENSE="GPL-2 LGPL-2"
 
 KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
-IUSE="debug desktopglobe exif qalculate qwt scim semantic-desktop"
+IUSE="debug desktopglobe exif qalculate qwt rss scim semantic-desktop"
 
 # krunner is only needed to generate dbus interface for lancelot
 COMMON_DEPEND="
 	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 'rss?')
 	x11-misc/shared-mime-info
 	desktopglobe? ( $(add_kdebase_dep marble) )
 	exif? ( $(add_kdebase_dep libkexiv2) )
 	qalculate? ( sci-libs/libqalculate )
 	qwt? ( x11-libs/qwt:5 )
+	rss? ( $(add_kdebase_dep kdepimlibs 'akonadi') )
 	scim? ( app-i18n/scim )
 "
 DEPEND="${COMMON_DEPEND}
@@ -40,6 +40,10 @@ RDEPEND="${COMMON_DEPEND}
 # kdebase-data: some svg icons moved from data directly here.
 add_blocker kdebase-data '<4.2.88'
 
+PATCHES=(
+	"${FILESDIR}/${PN}-4.4.3-cmake.patch"
+)
+
 src_prepare() {
 	sed -e 's/${KDE4WORKSPACE_PLASMACLOCK_LIBRARY}/plasmaclock/g' \
 		-e 's/${KDE4WORKSPACE_WEATHERION_LIBRARY}/weather_ion/g' \
@@ -57,6 +61,7 @@ src_configure() {
 		$(cmake-utils_use_with exif Kexiv2)
 		$(cmake-utils_use_with qalculate)
 		$(cmake-utils_use_with qwt)
+		$(cmake-utils_use_with rss KdepimLibs)
 		$(cmake-utils_use_with semantic-desktop Nepomuk)
 		$(cmake-utils_use_with scim)
 	)
diff --git a/kde-base/kdeplasma-addons/kdeplasma-addons-4.4.3.ebuild b/kde-base/kdeplasma-addons/kdeplasma-addons-4.4.3.ebuild
index 74e37102aac6..3bc21c6a2d4f 100644
--- a/kde-base/kdeplasma-addons/kdeplasma-addons-4.4.3.ebuild
+++ b/kde-base/kdeplasma-addons/kdeplasma-addons-4.4.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeplasma-addons/kdeplasma-addons-4.4.3.ebuild,v 1.1 2010/05/03 20:43:17 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeplasma-addons/kdeplasma-addons-4.4.3.ebuild,v 1.2 2010/05/05 01:15:51 reavertm Exp $
 
 EAPI="3"
 
@@ -13,20 +13,20 @@ HOMEPAGE="http://www.kde.org/"
 LICENSE="GPL-2 LGPL-2"
 
 KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
-IUSE="debug desktopglobe exif qalculate qwt scim semantic-desktop"
+IUSE="debug desktopglobe exif qalculate qwt rss scim semantic-desktop"
 
 # krunner is only needed to generate dbus interface for lancelot
 COMMON_DEPEND="
 	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 'rss?')
 	x11-misc/shared-mime-info
 	desktopglobe? ( $(add_kdebase_dep marble) )
 	exif? ( $(add_kdebase_dep libkexiv2) )
 	qalculate? ( sci-libs/libqalculate )
 	qwt? ( x11-libs/qwt:5 )
+	rss? ( $(add_kdebase_dep kdepimlibs 'akonadi') )
 	scim? ( app-i18n/scim )
 "
 DEPEND="${COMMON_DEPEND}
@@ -40,6 +40,10 @@ RDEPEND="${COMMON_DEPEND}
 # kdebase-data: some svg icons moved from data directly here.
 add_blocker kdebase-data '<4.2.88'
 
+PATCHES=(
+	"${FILESDIR}/${PN}-4.4.3-cmake.patch"
+)
+
 src_prepare() {
 	sed -e 's/${KDE4WORKSPACE_PLASMACLOCK_LIBRARY}/plasmaclock/g' \
 		-e 's/${KDE4WORKSPACE_WEATHERION_LIBRARY}/weather_ion/g' \
@@ -57,6 +61,7 @@ src_configure() {
 		$(cmake-utils_use_with exif Kexiv2)
 		$(cmake-utils_use_with qalculate)
 		$(cmake-utils_use_with qwt)
+		$(cmake-utils_use_with rss KdepimLibs)
 		$(cmake-utils_use_with semantic-desktop Nepomuk)
 		$(cmake-utils_use_with scim)
 	)