Merge branch 'master' into kde-git

Conflicts:
	kde-base/pykde4/Manifest
	kde-base/pykde4/pykde4-9999.ebuild

3 files changed, 81 insertions, 2 deletions

diff --git a/kde-base/kdeplasma-addons/Manifest b/kde-base/kdeplasma-addons/Manifest
index 09e6206e8b4..2e0e59dde1a 100644
--- a/kde-base/kdeplasma-addons/Manifest
+++ b/kde-base/kdeplasma-addons/Manifest
@@ -3,8 +3,10 @@ AUX kdeplasma-addons-4.4.3-cmake.patch 2142 RMD160 42e9dab676b617686ef159752b464
 AUX kdeplasma-addons-4.4.74-cmake.patch 2623 RMD160 dd1fc6913c715184fdb4e0681507ad46207f25c5 SHA1 67809abb832d8f4e3f5c521be54bf8eacbd9c0c5 SHA256 d2e3ea559e422cc0fd822f9a014bf2d4621525deb40e86181be65ddc51a1d745
 AUX kdeplasma-addons-4.4.92-lancelot.patch 474 RMD160 8734c038e6fe0d7a9fb9055eeda408d4ba1cd440 SHA1 e67f1206b9eb94aec5e9e252e814175e16d64b0a SHA256 2f68494810746ac83cb0fc650c7a2d573076c6fa00db6ef14aa067fc9e6c10ec
 AUX kdeplasma-addons-4.5.56-cmake.patch 1187 RMD160 ad64390a6e6849f6aa5bbe7977a00c0fae07d3e8 SHA1 7578d9ac836da26dd2bf5e0cea9b35026d3ba0e3 SHA256 c6f79442c1e3e65b71da6dcc112377461dc3154201a01d506a13020f20428618
-DIST kdeplasma-addons-4.5.90.tar.bz2 1868102 RMD160 5e152af247533d85569b69bf85f1a88f9243e406 SHA1 59eaefd008b1e181f84852257a29f309f1d44fcb SHA256 ef8716a3c75c6b90b484a969fa7e575ce6dc720827bef51db5c6474050a18674
-EBUILD kdeplasma-addons-4.5.90.ebuild 1953 RMD160 f3fb637a2e6e0ff0ac52ebe1492bea905739e8a8 SHA1 c783b92f99bb901dd36e93b6838be2ced4685290 SHA256 f148bf5b9c8522517b787b9223a913f8bc778bec716d9fc1329179214c5c3abc
+DIST kdeplasma-addons-4.5.5.tar.bz2 1756700 RMD160 bc62035aca745b667576efb13273a72adc982d43 SHA1 12eac8b330b9abf7b3739ed6490aee52a5f4c35e SHA256 99872f8e0d454a494facfcfe12b5effec695fc7c7f78a7fe01b077ecded2108e
+DIST kdeplasma-addons-4.5.95.tar.bz2 1909583 RMD160 71de718f389505272672d61ca989881946eb5e30 SHA1 abffc4539e12f3e75ff98395c723bfd074f118e7 SHA256 ef981e90f12473cc16dacaae8c27518942eac3a334f7050d2cd290e3dd64ad97
+EBUILD kdeplasma-addons-4.5.5.ebuild 2069 RMD160 a49b34ecd36ae66cb7bb6dff4213eb7eeefe6cbe SHA1 fb3d81e7f72a751afe60122280e4bc9138845015 SHA256 d7ec9f199faa50f43774cd4e1678cb4fe24b5bc2b363a902c62e717bbfa91150
+EBUILD kdeplasma-addons-4.5.95.ebuild 1953 RMD160 f3fb637a2e6e0ff0ac52ebe1492bea905739e8a8 SHA1 c783b92f99bb901dd36e93b6838be2ced4685290 SHA256 f148bf5b9c8522517b787b9223a913f8bc778bec716d9fc1329179214c5c3abc
 EBUILD kdeplasma-addons-4.5.9999.ebuild 2022 RMD160 5949d03d57c0ea83d80be8d698ab26b85733c2f7 SHA1 9b2aff3860d51cb8b4b8e76c677007c651f78a0b SHA256 38b69f0f46f2b8e423fbee4c6b90aff023c230b37b604129ded24242c7fceb9e
 EBUILD kdeplasma-addons-4.6.9999.ebuild 1942 RMD160 72029adf0ec6bf145d961a6ac1c08a2134b10e0a SHA1 2f2aa934214c713841c8c8240064a049a5bc0ed8 SHA256 d3af5ac8c4cc9062d24069f3ff7d5064a551a77543750534c513e1e50b149325
 EBUILD kdeplasma-addons-9999.ebuild 1942 RMD160 72029adf0ec6bf145d961a6ac1c08a2134b10e0a SHA1 2f2aa934214c713841c8c8240064a049a5bc0ed8 SHA256 d3af5ac8c4cc9062d24069f3ff7d5064a551a77543750534c513e1e50b149325
diff --git a/kde-base/kdeplasma-addons/kdeplasma-addons-4.5.5.ebuild b/kde-base/kdeplasma-addons/kdeplasma-addons-4.5.5.ebuild
new file mode 100644
index 00000000000..5e4e772d132
--- /dev/null
+++ b/kde-base/kdeplasma-addons/kdeplasma-addons-4.5.5.ebuild
@@ -0,0 +1,77 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI="3"
+
+KMNAME="kdeplasma-addons"
+WEBKIT_REQUIRED="always"
+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="debug desktopglobe exif qalculate qwt rss 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 krunner)
+	$(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 'semantic-desktop') )
+	scim? ( app-i18n/scim )
+"
+DEPEND="${COMMON_DEPEND}
+	dev-cpp/eigen:2
+"
+# kde-misc/plasmaboard: moved here in 4.3.65
+# kde-misc/qalculate-applet: since 4.4.0
+RDEPEND="${COMMON_DEPEND}
+	!kdeprefix? (
+		!kde-misc/plasmaboard
+		!kde-misc/qalculate-applet
+	)
+"
+
+# kdebase-data: some svg icons moved from data directly here.
+add_blocker kdebase-data '<4.2.88'
+
+PATCHES=(
+	"${FILESDIR}/${PN}-4.4.74-cmake.patch"
+)
+
+src_prepare() {
+	find "${S}" -name CMakeLists.txt | \
+		xargs sed -i \
+			-e 's/${KDE4WORKSPACE_PLASMACLOCK_LIBRARY}/plasmaclock/g' \
+			-e 's/${KDE4WORKSPACE_WEATHERION_LIBRARY}/weather_ion/g' \
+			-e 's/${KDE4WORKSPACE_TASKMANAGER_LIBRARY}/taskmanager/g' \
+		|| die "Failed to patch CMake files"
+
+	kde4-base_src_prepare
+}
+
+src_configure() {
+	mycmakeargs=(
+		-DDBUS_INTERFACES_INSTALL_DIR="${EKDEDIR}/share/dbus-1/interfaces/"
+		$(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 rss KdepimLibs)
+		$(cmake-utils_use_with semantic-desktop Nepomuk)
+		$(cmake-utils_use_with scim)
+	)
+
+	kde4-base_src_configure
+}
diff --git a/kde-base/kdeplasma-addons/kdeplasma-addons-4.5.90.ebuild b/kde-base/kdeplasma-addons/kdeplasma-addons-4.5.95.ebuild
index 4b3034e4833..4b3034e4833 100644
--- a/kde-base/kdeplasma-addons/kdeplasma-addons-4.5.90.ebuild
+++ b/kde-base/kdeplasma-addons/kdeplasma-addons-4.5.95.ebuild