Remove ayatana support

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

5 files changed, 15 insertions, 16 deletions

diff --git a/kde-base/kmail/ChangeLog b/kde-base/kmail/ChangeLog
index 5eab66cca8bd..f63773d563f7 100644
--- a/kde-base/kmail/ChangeLog
+++ b/kde-base/kmail/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for kde-base/kmail
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kmail/ChangeLog,v 1.207 2010/06/05 14:56:10 reavertm Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kmail/ChangeLog,v 1.208 2010/06/06 00:53:11 reavertm Exp $
+
+  06 Jun 2010; Maciej Mrozowski <reavertm@gentoo.org> kmail-4.4.2.ebuild,
+  kmail-4.4.3.ebuild:
+  Disable libindicate (ayatana) support
 
   05 Jun 2010; Maciej Mrozowski <reavertm@gentoo.org> kmail-4.4.2.ebuild,
   kmail-4.4.3.ebuild:
diff --git a/kde-base/kmail/Manifest b/kde-base/kmail/Manifest
index 80ea6e84c6c4..05916418a5f6 100644
--- a/kde-base/kmail/Manifest
+++ b/kde-base/kmail/Manifest
@@ -5,7 +5,7 @@ DIST kdepim-4.4.2.tar.bz2 9356719 RMD160 c0f6f851c7bece45a884fadfca703f917f325f8
 DIST kdepim-4.4.3.tar.bz2 9355438 RMD160 992e304bf98f2401da24bc165c37e38321353dd9 SHA1 0bfd843e03836664758baac95e1127d96077993f SHA256 0ad3a23d98932a1fe966a91e79d8b795978a604ccc17529a101c2674034ef952
 EBUILD kmail-4.3.3.ebuild 1784 RMD160 c3534c5a833ac89a05262ec62d05b998e7ad6508 SHA1 8cc65fe84f13fe8c9aa35f19e789d262727b71d2 SHA256 4f78696f44e8aa7e6fe3aa3367b7fb22e606b8c9d2e83eb8c9aa519c18df5e7a
 EBUILD kmail-4.3.5.ebuild 1769 RMD160 0d888dd62adf05b3685209233fe6c48423e762e8 SHA1 aa3f6e09572a50f7cfdc6b1a4d7f2f09d93d8092 SHA256 cbc3115d8e51bd00d04c226615b9bb4c3b7194a4a6f974c7a383969e5fed1b91
-EBUILD kmail-4.4.2.ebuild 1903 RMD160 9fe24dbea5f26bcd44c97908b9dc505c80de0c6b SHA1 736c5356f15d618fedf680cfd60ceda4958b3dcc SHA256 8280e6a7b18cb935cfe7ec30a999c12e68064566cfd4d60d478d9776ded4b51d
-EBUILD kmail-4.4.3.ebuild 1903 RMD160 73c7a85e610f4c181c3d6f75fb6dbc67a6023531 SHA1 d3caca9920f8b70ec2d39e8ecb38dcc7dcb98e4c SHA256 23fad53af177a9c93de7733f8b51e41b34111408e603a02f335c86ec0719c482
-MISC ChangeLog 27359 RMD160 2f80bcd235cf5efa5c66f90e8582917d35d6fc72 SHA1 ef5101b58bdaecfc26451b6df183515f8df8e969 SHA256 213a1e79331e431377b38a2e9f507711950bebf7d535b8c9565f336129aba4b5
-MISC metadata.xml 279 RMD160 8e4afc55339c16ac4ff11c986a73243696bd9940 SHA1 238511afd59478eb71e701ce58e30a7d8fde1784 SHA256 becb9880c6456e35b6099918612ce90460d9b7555c669f1a970d0e88f7dce28a
+EBUILD kmail-4.4.2.ebuild 1828 RMD160 de80f77ef5dc1bea1817d1d0ce4a24c3f2e0ae3a SHA1 6f671a8b8da4248448804e4742c73b82718416cb SHA256 c55266d4f2afc6d61ca583a598e91fee19d3db874b8344c47838cb40e42c4cb3
+EBUILD kmail-4.4.3.ebuild 1828 RMD160 5199be69b662d08ba010760fe5b3af3b0b3b59d6 SHA1 7b43b8c88f1f2af9bbd0e14e3e3708cd0039b5b3 SHA256 0a340f9e70fa437e5ae12255a9fbf1de5671f26ca8fa88801ad30bf36a66ff8f
+MISC ChangeLog 27496 RMD160 5b3dba8c6b4ebd9f732c6c210bdde01b62d7095e SHA1 1df6866a3f7f02de5f4f34e5e22b2f261cb813ef SHA256 0bc0ed54fc32d4cbf0ade560a770b90ce4efe568f8c9e5214eb8ef7c4f67517f
+MISC metadata.xml 156 RMD160 ecce3b981f150c45ae1e84e2d208e678d6124259 SHA1 b64f7c0b4e5db816d82ad19848f72118af129d35 SHA256 2f4da28506b9d4185f320f67a6191d30c7a921217ed4447ed46ea0bc4aefc79a
diff --git a/kde-base/kmail/kmail-4.4.2.ebuild b/kde-base/kmail/kmail-4.4.2.ebuild
index 2204f19596e6..0fbc9baec447 100644
--- a/kde-base/kmail/kmail-4.4.2.ebuild
+++ b/kde-base/kmail/kmail-4.4.2.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/kmail/kmail-4.4.2.ebuild,v 1.3 2010/06/05 14:56:10 reavertm Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kmail/kmail-4.4.2.ebuild,v 1.4 2010/06/06 00:53:11 reavertm Exp $
 
 EAPI="3"
 
@@ -9,7 +9,7 @@ inherit kde4-meta
 
 DESCRIPTION="KMail is the email component of Kontact, the integrated personal information manager of KDE."
 KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
-IUSE="ayatana debug +handbook"
+IUSE="debug +handbook"
 
 DEPEND="
 	$(add_kdebase_dep kdelibs 'semantic-desktop')
@@ -17,7 +17,6 @@ DEPEND="
 	$(add_kdebase_dep libkdepim)
 	$(add_kdebase_dep libkleo)
 	$(add_kdebase_dep libkpgp)
-	ayatana? ( >=dev-libs/libindicate-qt-0.2.1 )
 "
 RDEPEND="${DEPEND}
 	$(add_kdebase_dep kdepim-runtime)
@@ -49,7 +48,7 @@ KMLOADLIBS="libkdepim"
 
 src_configure() {
 	mycmakeargs=(
-		$(cmake-utils_use_with ayatana IndicateQt)
+		-DWITH_IndicateQt=OFF
 	)
 
 	kde4-meta_src_configure
diff --git a/kde-base/kmail/kmail-4.4.3.ebuild b/kde-base/kmail/kmail-4.4.3.ebuild
index c3220057ac24..b75f766f6bbf 100644
--- a/kde-base/kmail/kmail-4.4.3.ebuild
+++ b/kde-base/kmail/kmail-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/kmail/kmail-4.4.3.ebuild,v 1.2 2010/06/05 14:56:10 reavertm Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kmail/kmail-4.4.3.ebuild,v 1.3 2010/06/06 00:53:11 reavertm Exp $
 
 EAPI="3"
 
@@ -9,7 +9,7 @@ inherit kde4-meta
 
 DESCRIPTION="KMail is the email component of Kontact, the integrated personal information manager of KDE."
 KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
-IUSE="ayatana debug +handbook"
+IUSE="debug +handbook"
 
 DEPEND="
 	$(add_kdebase_dep kdelibs 'semantic-desktop')
@@ -17,7 +17,6 @@ DEPEND="
 	$(add_kdebase_dep libkdepim)
 	$(add_kdebase_dep libkleo)
 	$(add_kdebase_dep libkpgp)
-	ayatana? ( >=dev-libs/libindicate-qt-0.2.1 )
 "
 RDEPEND="${DEPEND}
 	$(add_kdebase_dep kdepim-runtime)
@@ -49,7 +48,7 @@ KMLOADLIBS="libkdepim"
 
 src_configure() {
 	mycmakeargs=(
-		$(cmake-utils_use_with ayatana IndicateQt)
+		-DWITH_IndicateQt=OFF
 	)
 
 	kde4-meta_src_configure
diff --git a/kde-base/kmail/metadata.xml b/kde-base/kmail/metadata.xml
index 4d3668fef8fb..8d1e86a9cefb 100644
--- a/kde-base/kmail/metadata.xml
+++ b/kde-base/kmail/metadata.xml
@@ -2,7 +2,4 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <herd>kde</herd>
-<use>
-	<flag name="ayatana">Build in support for Ayatana notification via <pkg>dev-libs/libindicate-qt</pkg></flag>
-</use>
 </pkgmetadata>