Re-add old patch to build without semantic-desktop wrt bug #414573.

Package-Manager: portage-2.2.0_alpha101/cvs/Linux x86_64

3 files changed, 19 insertions, 11 deletions

diff --git a/kde-base/kdeplasma-addons/ChangeLog b/kde-base/kdeplasma-addons/ChangeLog
index 2b05499c8b9e..a0415f054ff3 100644
--- a/kde-base/kdeplasma-addons/ChangeLog
+++ b/kde-base/kdeplasma-addons/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for kde-base/kdeplasma-addons
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeplasma-addons/ChangeLog,v 1.130 2012/05/03 20:08:11 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeplasma-addons/ChangeLog,v 1.131 2012/05/04 14:31:32 johu Exp $
+
+  04 May 2012; Johannes Huber <johu@gentoo.org> kdeplasma-addons-4.8.3.ebuild:
+  Re-add old patch to build without semantic-desktop wrt bug #414573.
 
 *kdeplasma-addons-4.8.3 (03 May 2012)
 
diff --git a/kde-base/kdeplasma-addons/Manifest b/kde-base/kdeplasma-addons/Manifest
index c27a3f005e11..7cdc93a1081a 100644
--- a/kde-base/kdeplasma-addons/Manifest
+++ b/kde-base/kdeplasma-addons/Manifest
@@ -11,17 +11,17 @@ DIST kdeplasma-addons-4.8.3.tar.xz 1773328 RMD160 f8416aea7e478932d568e511c68697
 EBUILD kdeplasma-addons-4.7.4.ebuild 1838 RMD160 4b103316c24780b3cf7dc98bd1400d57b4bb8e29 SHA1 507331777087ae8c3125094e193925a6019ac66a SHA256 ec219a1c960c8228a001628efa5029313616a56f06ff7ac20b8676d1721ecae3
 EBUILD kdeplasma-addons-4.8.1.ebuild 1901 RMD160 14e88158fddf828ba99be8a8e15f934a61cb46c0 SHA1 24eb8fd49277075c9b13de4f86253d77e7c9bde7 SHA256 0884555aadcb6c92d136d4d1282d3485e1b2211a0dc56a4efb1050a11c00762e
 EBUILD kdeplasma-addons-4.8.2.ebuild 1870 RMD160 de733bc221db8b5fb28e7d9f36489aef79b4b9ae SHA1 e06c93130e2d0aee232e148683c8dce35a9c9c2c SHA256 677afa8ad6e352d30a42b85880cabb5a6bddd84974b5d9a1df11217b2aaeb932
-EBUILD kdeplasma-addons-4.8.3.ebuild 1747 RMD160 ee69cb948c47c664721b85f68f9373182f8f494c SHA1 5039e64ccdd8f856250d7db4db0a3ef6b3a98d81 SHA256 a069dbed3004eb1f87e5a15556a69e77deb6ae0f7a30b24a56e587cd31f6f547
-MISC ChangeLog 18838 RMD160 28a3301390127b18662fc615d9938959fc22e865 SHA1 ee662d5ede37d5feaf4f6b440b84f841d8918b82 SHA256 20ba10a559373369609573a94831e46716b7833a2334cf7caacfcdcdae2f0d69
+EBUILD kdeplasma-addons-4.8.3.ebuild 1870 RMD160 d326cf45d746aed6196c63eda4c37518f9424445 SHA1 abb7f8094ddf4b9bf42317601a26569419107a29 SHA256 68e5c4d5a159cac90894288fac1ee36d839678870a9e0f0f6520d2c9456a4eea
+MISC ChangeLog 18988 RMD160 ae74251920e5e3c37940fc36f9c9bd2f774ec07a SHA1 dbac1843e57c932f9d2b8c6b71cb8627d90e5ee0 SHA256 32d6e1ee72e2e479b3a0afe088075dafcfc8b599bbff24fdbbb5830551b9c09f
 MISC metadata.xml 747 RMD160 94a681ccf466d424b89a0a30e0dfccd00489f8bf SHA1 2d50ded643aac8cc732de8c7045f9c32f1ad0d31 SHA256 c9d04479cf9bdb16f30a1e338c3b1ab726fd6e69ad699eda8d35ff4646d860e5
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQEcBAEBCgAGBQJPouYQAAoJEO+t9ga+3I3alQ4H/iwGgmM8vWGEo2FkOA0NGRsr
-eRXwPd3HxGYTNUHtoYY+1nVVC2R6DzBhPb4i+PG02Qcf+BxDKQ5YepECoCcJy79i
-xaGHqPJJxlMqKZr7Sx9cymF9tWL9MeFQ30vXkduFZtwhDZxRbFFwywR57eMUwSAF
-Sc1CTBPRxwmMNiBzjra7cX4KzAFukfA6VDEOxc72x6IoNDhcgWDN7tio7CLBaJEe
-EJhL4sOG+A3sE3riQQxt4evWBSwlP9IZCi8INGuwnCHO6KlIhu70kodNchCO9AvH
-sdtjLjWHdI1dg7kbiWNhWZkoElumy5Y8+XStRiRs+CiN0XMxueJzslRJ5NUB4LM=
-=RpKr
+iQEcBAEBCgAGBQJPo+hKAAoJEO+t9ga+3I3aVR4IALTG14+uNHofPEX0nGaJ+dyi
+U1mzar8xwn6WpNrAM3XM8rCWwrzj/WP2eK3KjcHemork6NjhTKeOZ0++zepxo/K1
+ywyF9HMD6ydqmIgIp6ILrvTGhVDJAYmPypUHkvSm551tnI89Jp+X1I9PJ+yUIs1I
+xEt/hmpLFqz5Kmkznay7UGiR91vDok3kv7mSoHZX9pH++af4fqVlGvTbbkzoEgo9
+KewPejxKPUf86AGC9y4sGrD++IaVVEe5RF+/AUjn5Qp5EL1yfYJR0ryBQO/QszNj
+yE3/SfKC1JJn914KKcQVsAP9sTX5Kjmpigo3nTw7Asayk0qke8zY+aZ+WFd2OuQ=
+=ass+
 -----END PGP SIGNATURE-----
diff --git a/kde-base/kdeplasma-addons/kdeplasma-addons-4.8.3.ebuild b/kde-base/kdeplasma-addons/kdeplasma-addons-4.8.3.ebuild
index a60504da982f..3e0f2a1514de 100644
--- a/kde-base/kdeplasma-addons/kdeplasma-addons-4.8.3.ebuild
+++ b/kde-base/kdeplasma-addons/kdeplasma-addons-4.8.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 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.8.3.ebuild,v 1.1 2012/05/03 20:08:11 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeplasma-addons/kdeplasma-addons-4.8.3.ebuild,v 1.2 2012/05/04 14:31:32 johu Exp $
 
 EAPI=4
 
@@ -41,6 +41,11 @@ DEPEND="${COMMON_DEPEND}
 RDEPEND="${COMMON_DEPEND}
 "
 
+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/"