Add patch to fix bug 288154

Package-Manager: portage-2.2_rc67/cvs/Linux x86_64

5 files changed, 107 insertions, 22 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/Manifest b/kde-base/kdeplasma-addons/Manifest
index 92aa6d9c8813..cad8cbe5ef0d 100644
--- a/kde-base/kdeplasma-addons/Manifest
+++ b/kde-base/kdeplasma-addons/Manifest
@@ -1,20 +1,11 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
+AUX kdeplasma-addons-4.4.3-cmake.patch 2142 RMD160 42e9dab676b617686ef159752b4643491e0dfdd7 SHA1 2e1e74e01e64f277636b099af2b292af091ec33b SHA256 a19a933f282f1be4ab67949c1de9a4ead8e05d2ff78dafbdd600682f3c8e59b9
 DIST kdeplasma-addons-4.3.3.tar.bz2 1451797 RMD160 04c6524d5f97c371d384a5162a57a64404f0a277 SHA1 c474a193c951fbcb2566d0da1167214b88412ff2 SHA256 239bba902687a3368066f1c8c593d28e9f16cf5d42d35389ed7fa3e412761874
 DIST kdeplasma-addons-4.3.5.tar.bz2 1451610 RMD160 fa21680ae52bc8d59dc238d005946a74d0924d99 SHA1 b128bbb567bd1bba7be6e29e09869f1fc094ad97 SHA256 b75f6fb618da099d2c73f81dc65ea49b59e0485b5a3e44bfce2076ee217cb53a
 DIST kdeplasma-addons-4.4.2.tar.bz2 1644395 RMD160 8d3d9389a3cb5eff0b31f82d667d5bed181a2289 SHA1 bffded71b27b9f0675cdf06804cee4834b2dc4f9 SHA256 2dde50452a58a313f6b4fdb61f061cca364ff9a15577273f608fa32489769d10
 DIST kdeplasma-addons-4.4.3.tar.bz2 1645196 RMD160 3d37024d414c0be4f1c762af7e6752ee51fd50e9 SHA1 8041118514589d09df30de6e771d83b5d1c5e77b SHA256 275d60b32ffa878be97ccd34070ee23e89c6642ba39a4dd4b11c210c3a39f902
 EBUILD kdeplasma-addons-4.3.3.ebuild 1992 RMD160 8a3ae434c02c0f5d606ef2672987bd106f86b2f7 SHA1 946c15f5acf46bb9ce31622c36b0b59b441a5c25 SHA256 a42282ae84366bc2678528561a75887f9129081997bebf839c4ebe0d6e249493
 EBUILD kdeplasma-addons-4.3.5.ebuild 1922 RMD160 0fd13ef7b823ab5405375b4027e6057150ca1cc7 SHA1 7778ea27d786f60fb67d24f82dac00708aec5da2 SHA256 7fb5d562388eb5d772e42a9ebdbef9414f8d46043d883e303d1b74cf9faee2cc
-EBUILD kdeplasma-addons-4.4.2.ebuild 2029 RMD160 803b79c519af57909df5b5a9c445b13a18f64e91 SHA1 aedba04714e9e3ee5923c7e369404a277e10d25e SHA256 7c73e26bcd6d3efeb9326c680afe805a31ac6cd761cdd6bb3944f0c325545cdf
-EBUILD kdeplasma-addons-4.4.3.ebuild 2030 RMD160 2a2de8cfe7caecf34eee4d6b64df82cd21a40711 SHA1 cfe136e4929a3a98bea5153acf4cf53f47f62e38 SHA256 4b3c4bbf4dae37e13104938f2e3cbb7a1f41282629bf32f415eeb8a8b7ee9120
-MISC ChangeLog 7506 RMD160 0177d8174378e09ab87029288d83d84b480de175 SHA1 1c13efce62d99967d7caa998ffed54bf358de4c4 SHA256 49ca77707936ca65afa6594e80e69caa604fb48689891f6b9ed738a93c4d73f3
+EBUILD kdeplasma-addons-4.4.2-r1.ebuild 2158 RMD160 5fc9e27aac9483b1430f989eda3b66e1b88c289a SHA1 e24776b003595b2d1b1cd1e3b970b7a917db2046 SHA256 cbdfbf66c9a0f2746b4df78fd6b846b4f1318a17855d9719380bb310177d6d7f
+EBUILD kdeplasma-addons-4.4.3.ebuild 2155 RMD160 a1612e517278dd4169e7c95dab8256c09fbef135 SHA1 293aa1325e1807280ab0999ea39138730efb6fdf SHA256 88f2b3d78b2ee581bd9f9acf93cd12c2bb9f3785b0e7dc69c57c73c6b7771900
+MISC ChangeLog 7780 RMD160 ab7e4cc550fb90535c740e862ce658a4c0c2363d SHA1 58ae5addd19aa784b96fbef284903e5f25f23fe1 SHA256 1529df0d7704dc6ca3f47adefea2eec41e95ec154f238a0e74159f3b2b6968ce
 MISC metadata.xml 513 RMD160 c7aded626277a79aa0a0b879476ecb5377f97f86 SHA1 cd2f44eccf545b4232bf77415d6aa5b79015e702 SHA256 f682111bd3c2ed82effd027c8fe51d56704be560452a101db8e3557ef0e0a572
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.15 (GNU/Linux)
-
-iEYEARECAAYFAkvfQe0ACgkQ5BmOA85PVLiJHQCdGk8ebnIl+GSmLMOHT63bOJN9
-nFMAnjpJNZrJ3/9IXLEy/bA+7XU8Wj+g
-=dBJR
------END PGP SIGNATURE-----
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)
 	)