Build knowledgebase plasmoid only if we USE attica, bug 391019

Package-Manager: portage-2.1.10.34/cvs/Linux x86_64

4 files changed, 110 insertions, 17 deletions

diff --git a/kde-base/kdeplasma-addons/ChangeLog b/kde-base/kdeplasma-addons/ChangeLog
index d1e1568d6630..762902a42ccd 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-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeplasma-addons/ChangeLog,v 1.107 2011/11/02 20:48:22 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeplasma-addons/ChangeLog,v 1.108 2011/11/20 16:09:59 dilfridge Exp $
+
+*kdeplasma-addons-4.7.3-r1 (20 Nov 2011)
+
+  20 Nov 2011; Andreas K. Huettel <dilfridge@gentoo.org>
+  +kdeplasma-addons-4.7.3-r1.ebuild,
+  +files/kdeplasma-addons-4.7.3-knowledge.patch:
+  Build knowledgebase plasmoid only if we USE attica, bug 391019
 
 *kdeplasma-addons-4.7.3 (02 Nov 2011)
 
diff --git a/kde-base/kdeplasma-addons/Manifest b/kde-base/kdeplasma-addons/Manifest
index 4f391482a611..c2105b16657d 100644
--- a/kde-base/kdeplasma-addons/Manifest
+++ b/kde-base/kdeplasma-addons/Manifest
@@ -1,9 +1,10 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA512
 
 AUX kdeplasma-addons-4.4.3-cmake.patch 2142 RMD160 42e9dab676b617686ef159752b4643491e0dfdd7 SHA1 2e1e74e01e64f277636b099af2b292af091ec33b SHA256 a19a933f282f1be4ab67949c1de9a4ead8e05d2ff78dafbdd600682f3c8e59b9
 AUX kdeplasma-addons-4.6.2-optional-akonadi.patch 1982 RMD160 3f6c7e4356369d1b59bd8c57d91afc4b655ce18c SHA1 01505b07c9fc41628cfcb881364367cab6b3d17a SHA256 c62b36eccb02517561d5ae88e50fbe3029c37b65b1075c1f94ab7d6bb0fd51c9
 AUX kdeplasma-addons-4.7.0-grid.patch 2222 RMD160 425ff4feb3a52d21ba995b87b7cf66e2b950a8e1 SHA1 18163a4349017376d42151899b36687e97db7fd9 SHA256 45ab4c980c63161df6d13391c5293c0e83ea87e21a139fb97eb4821c9243f572
+AUX kdeplasma-addons-4.7.3-knowledge.patch 729 RMD160 b1830e318577bc1a9ed85bc07c7f1dc225f15eca SHA1 ce7c8265232d127761e8c3f4acb69540f5700197 SHA256 f4590f36a81e118510e3b240e1430dc41725fa3feb74c759d58d075a995d0839
 DIST kdeplasma-addons-4.6.3.tar.bz2 1935272 RMD160 85c546d4aad35e3785980203d2f8ff0d154cafb6 SHA1 7a43dcfebc0316e681b04d0958d89272620a11b7 SHA256 6f8c11191aecb7cd8477c3c406515dc13991c4f6f73b892c0e25e89b12e58bcf
 DIST kdeplasma-addons-4.6.5.tar.bz2 1936845 RMD160 376beeb3e2bc9835a61f1089e7f2956c8d2912cf SHA1 3bce5e41160ec318dbea9128c3e9104a4428deb8 SHA256 0852f3444706c518fc242d174a614ff7d54b1826c3e5f884b10fbc7fb0755925
 DIST kdeplasma-addons-4.7.2.tar.bz2 1973434 RMD160 3c09f34c49ddd876a33be40cf79bb6f5665f7e9b SHA1 e1504ed7e21da8982610f42e70c3028b77ede6f1 SHA256 71956a99c943728696ba52bd7d0e165ae1d28f940da8c8676d79fdf18e1ec931
@@ -11,23 +12,24 @@ DIST kdeplasma-addons-4.7.3.tar.bz2 1974816 RMD160 3ee4aa11b4dbf9e520d9918638b45
 EBUILD kdeplasma-addons-4.6.3.ebuild 2013 RMD160 4bd6ccaad55ba7ee179f369637504472d8717a34 SHA1 7d0a3a15633b3fbc5e396b7fadecdc97f645b3b3 SHA256 717e593e1cb20a2701964ae9df26d8c4de572368a73c632a30d48f96b94a661a
 EBUILD kdeplasma-addons-4.6.5.ebuild 2018 RMD160 a7601bed560cbe870fcb32bfb1a6e1f951503e2a SHA1 17bc3d80dd43566bc3cec39c87d35f89a0324648 SHA256 3df63a34791edbe8aeab3f20d9129564ccc461fbdfd0a3b1fe25d99fba834a99
 EBUILD kdeplasma-addons-4.7.2.ebuild 1785 RMD160 2b492ad332dfe0c073e79d2f75cfac1886468732 SHA1 42c73428495bdc403bce60a6dc08b5bc36986b49 SHA256 78fd18a832c3ec721b3abe6b8ba9a8ecc51b868a39c3a561ab60104f80a99be6
+EBUILD kdeplasma-addons-4.7.3-r1.ebuild 1847 RMD160 6498e5bbc7a8f8226942871d3554a1fef098b5a6 SHA1 8a851b0cdb9fbf9388b209d7d806a81ecd07b512 SHA256 1209c872f829dfc8756fb287824890314a4ea33e8fa45c2bf73afaf3065af817
 EBUILD kdeplasma-addons-4.7.3.ebuild 1785 RMD160 13bf8f5dafde578a89284620f06ee1e5fd1d9afd SHA1 2f1965fc2c81ff80da7f3381e225abc3313e1959 SHA256 a6bb928e465ac0b2319955655caa079316afc67dc209fb6a25e42d8e596531c6
-MISC ChangeLog 15726 RMD160 bdbe869856d08e9d0d69ee121ce06696346a1208 SHA1 b8faf2e87500b4bd23be3d2452c8f342da962f79 SHA256 2b62a8946e83fbbf68dfb9620b6741c67731660a16a1200356af0a404ec44ac6
+MISC ChangeLog 15980 RMD160 7f90b89c57f9c7c9c67207e0e4f09b19fc25d776 SHA1 aec986382a15bbb7faa105e73bbbdfc2eadac4b3 SHA256 01e64489afb5ff5b7f537f538830be782f1a3fd546c552fc7f01717781ebbd9f
 MISC metadata.xml 590 RMD160 348b8b1bc247366b339794cc2aec564b2226e067 SHA1 677e55796be545f56fc4b7351268fb7aff49aaa9 SHA256 f1b43f2d7869ec912de095ae4cac3d50bcd7cd8295d73f65e57e0ff7d8ca9ea6
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.18 (GNU/Linux)
+Version: GnuPG v2.0.17 (GNU/Linux)
 
-iQIcBAEBCAAGBQJOsa54AAoJEOf+E+/4L5LmVHoQAKhroraWg+xKdrue9SPfAlRx
-spIPiFTx6m/rvibu3QU9g1rWJ1oIy/787ukiX3O9gvMkv3h45+bX1cBgmhz2qYFi
-sZznlT56GHYdhxvOsbgo7xy8yuYnBWhaLnvRLv263OweJGbGj2sLuQIu8eAz0cJl
-ccBzQVuke44TSqdqUU+Vl2Gi5ZajryjKQKPmFViagl6YK7+04gSXrMJFiwt/nzzX
-W8vu5pFqxjtZ7oWakdhLgsX2XTfAKb/uxQAdmJBlrFByVGzfVNWqbdw1AV4Mc7LT
-8qHEN1JNZoI0SUg7AkQSEB4uZNWLv4DSQD+dGfqH7lwfIoA3o+hfNwgZhUsjjUe4
-sMLa+8CZr9k0X7okeuzWF1icx0H9ZqKtOXNdztwdl7IaW2e5iRUUUnES77nyaRZi
-lKgZVwggIABpFJxmGuLm27OodwBc60Mi3IeJ+j7mzzLCEggK13lQ5bWQL0+/eZ8d
-V1vmdiNrLqBC0Duxv71IhReAuTOW2k08lgVVoKROrConIrzb3kqoD5v4hxIrhJBW
-sSEEtwDU6KeorSAYifXjLgOEpGTGrYCRgiNNynY/Hw3NHhqfWQBYGzAdzX/6M2yQ
-nu1lsjrKblDYaZy5vnbS0Wdj4zuep8f/WqaryaoXhgRvycm1DOekmGpoMT928YaG
-3GGNRUbbpnSftz/0SSc2
-=6GXW
+iQIcBAEBCgAGBQJOyTSrAAoJENwGBM22xffebz8P/A3aPeuKBfXaCYrw6l30ZwgN
+9oZt20z5SUieIdfs3mZGeHBZIE5HTu8Q7dAU3O5RAJevtsH+fq2S+c2ns83Wym1v
+nANdCdZn3DhG1/QNRD07/ez9kepdx0B+P6alrfBBxOeuiJX6RxzWXeqlkcKY/ChX
+F1MER4FajBD1CbwfChEypakNbDpVIZ0t6ynFvE+fnN+WcxqjTES019vRldFvRZuP
+deSVHRhMpOC9aSTsyMMyBIponQeuUk5Oqd2tYcFi3PR3ogZdMfiOcItXelLR+XZ7
+zEheBwlz9T06+hQ9V11dARDpFQCHBBtq87REal2+S/zv9tMQYi4XiExZ9BM2kZAF
+euVdAp0tRmaG+xZp/KdAedaHoLMMuTZAkHTx/AlBHUbtnOZHacc2gU7NzErGny3K
+r1tbqPQZe72wUwMvx1pWrO909keMs5fOc6GFJ7OPqTfOnKOTXmgPOk5abxhtS4f0
+zMagHEFP4KWDkddryCqy3b3HgE6TnM+yP6KLhoX8SILBaIgZagoDjqsKkwomVAzf
+xCH3j1qQGnBty6fJuquAJCjD5nbeaLOUaSlxpkONrgyGqUjyWTvXqQTNIAh8fgEn
+GBWB4qU+yX6CNgnMEmGdGxBslOlWyM1NyB6h7GkOb/TpKxOZs6w7rO0t3lmxO6Ix
+vj5wkMMpiPv/78Gj6YPF
+=zjyd
 -----END PGP SIGNATURE-----
diff --git a/kde-base/kdeplasma-addons/files/kdeplasma-addons-4.7.3-knowledge.patch b/kde-base/kdeplasma-addons/files/kdeplasma-addons-4.7.3-knowledge.patch
new file mode 100644
index 000000000000..3a7f89f852ee
--- /dev/null
+++ b/kde-base/kdeplasma-addons/files/kdeplasma-addons-4.7.3-knowledge.patch
@@ -0,0 +1,19 @@
+diff -ruN kdeplasma-addons-4.7.3.orig/applets/CMakeLists.txt kdeplasma-addons-4.7.3/applets/CMakeLists.txt
+--- kdeplasma-addons-4.7.3.orig/applets/CMakeLists.txt	2011-10-02 15:26:40.000000000 +0200
++++ kdeplasma-addons-4.7.3/applets/CMakeLists.txt	2011-11-20 18:05:27.833155727 +0100
+@@ -26,7 +26,6 @@
+ add_subdirectory(kolourpicker)
+ add_subdirectory(konqprofiles)
+ add_subdirectory(konsoleprofiles)
+-add_subdirectory(knowledgebase)
+ add_subdirectory(life)
+ add_subdirectory(luna)
+ add_subdirectory(magnifique)
+@@ -34,6 +33,7 @@
+ add_subdirectory(notes)
+ add_subdirectory(nowplaying)
+ if(LIBATTICA_FOUND)
++  add_subdirectory(knowledgebase)
+   add_subdirectory(community)
+   add_subdirectory(social-news)
+ endif(LIBATTICA_FOUND)
diff --git a/kde-base/kdeplasma-addons/kdeplasma-addons-4.7.3-r1.ebuild b/kde-base/kdeplasma-addons/kdeplasma-addons-4.7.3-r1.ebuild
new file mode 100644
index 000000000000..c6e7af590cd5
--- /dev/null
+++ b/kde-base/kdeplasma-addons/kdeplasma-addons-4.7.3-r1.ebuild
@@ -0,0 +1,65 @@
+# Copyright 1999-2011 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.7.3-r1.ebuild,v 1.1 2011/11/20 16:09:59 dilfridge Exp $
+
+EAPI=4
+
+KDE_SCM="git"
+inherit kde4-base
+
+DESCRIPTION="Extra Plasma applets and engines."
+HOMEPAGE="http://www.kde.org/"
+LICENSE="GPL-2 LGPL-2"
+
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+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
+	$(add_kdebase_dep kdelibs 'semantic-desktop=')
+	$(add_kdebase_dep krunner)
+	$(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')
+		$(add_kdebase_dep plasma-workspace 'rss')
+	)
+"
+DEPEND="${COMMON_DEPEND}
+	dev-cpp/eigen:2
+"
+RDEPEND="${COMMON_DEPEND}
+"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-4.7.3-knowledge.patch"
+)
+
+src_prepare() {
+	use semantic-desktop || epatch "${FILESDIR}/${PN}-4.6.2-optional-akonadi.patch"
+	kde4-base_src_prepare
+}
+
+src_configure() {
+	mycmakeargs=(
+		-DDBUS_INTERFACES_INSTALL_DIR="${EPREFIX}/usr/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)
+	)
+
+	kde4-base_src_configure
+}