Drop akonadi use flag from 4.8.x and merge build options with semantic-desktop, because the two build features are to close together. Build fails if akonadi is enabled and semantic-desktop disabled. Fixes bug #411489.

Package-Manager: portage-2.2.0_alpha100/cvs/Linux i686

4 files changed, 27 insertions, 21 deletions

diff --git a/kde-base/smokekde/ChangeLog b/kde-base/smokekde/ChangeLog
index f962b1d2edc8..d1b7a8826215 100644
--- a/kde-base/smokekde/ChangeLog
+++ b/kde-base/smokekde/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for kde-base/smokekde
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/smokekde/ChangeLog,v 1.20 2012/04/04 23:59:07 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/smokekde/ChangeLog,v 1.21 2012/04/12 10:42:35 johu Exp $
+
+  12 Apr 2012; Johannes Huber <johu@gentoo.org> smokekde-4.8.1.ebuild,
+  smokekde-4.8.2.ebuild:
+  Drop akonadi use flag from 4.8.x and merge build options with semantic-
+  desktop, because the two build features are to close together. Build fails if
+  akonadi is enabled and semantic-desktop disabled. Fixes bug #411489.
 
 *smokekde-4.8.2 (04 Apr 2012)
 
diff --git a/kde-base/smokekde/Manifest b/kde-base/smokekde/Manifest
index b6da7ec02a37..49e22212113f 100644
--- a/kde-base/smokekde/Manifest
+++ b/kde-base/smokekde/Manifest
@@ -5,18 +5,18 @@ DIST smokekde-4.7.4.tar.bz2 37507 RMD160 a79ee4f9c1cc54f93be23c9090137712a7f521a
 DIST smokekde-4.8.1.tar.xz 37160 RMD160 42884d56446d24ac6e9bda9e309444ff5ea6ba54 SHA1 680a29725c4b04629befafcd6c74dbc8cc6238f6 SHA256 232a5d103a92cdb94202037115987fe82b938a68748af89f087d1666f6e4d0fc
 DIST smokekde-4.8.2.tar.xz 38112 RMD160 f49204275a1b1e602867dda02f4d913d666e9596 SHA1 5cc24772b72c13555dd716ef7b6d77e81d826d79 SHA256 594bb0a0223054ee6ae6e6441ca69da9076b8bdac399abe9599b35db18bdae3b
 EBUILD smokekde-4.7.4.ebuild 1045 RMD160 ef121fe305809df5b2780fbb27c7de77e1c0a302 SHA1 f0bd3c58b4687f8cb7fb98c8e266da13e957b0e4 SHA256 a8777e855499333d700d0ca4820e7255b69e4ee08ebd25f472263081a1284bd9
-EBUILD smokekde-4.8.1.ebuild 1063 RMD160 d0fbc9c7f557317e5b71816aad922086838c01ff SHA1 a369f0ee7c5cbbdb769e75c8247be5dec1c457c5 SHA256 ee9d9ce7263b1da9e4a231f3538355ad380e3912b09dd6c653e27f0ad8aba19b
-EBUILD smokekde-4.8.2.ebuild 1065 RMD160 f3a128c2f77c670ba60f202d99291d6ba2772d68 SHA1 b2cc47d9a6efbbdac3d8ba618ea0432b7374f151 SHA256 b4ffe83ce7fc6de56912f53e41a082cf1804480ad0b7a412d7f04d340de9f3df
-MISC ChangeLog 2543 RMD160 2d0a30c66c2dfa4fbeaf9e5ae32b3b77df12bd91 SHA1 f03abd2726647720aec21a251531810f11d39e91 SHA256 8826863ce033362fad8f093ec5aa5f56c35c170421e188d951907062c75a55ba
+EBUILD smokekde-4.8.1.ebuild 1091 RMD160 2727d8a07cff6bc4ea156cad27c9574388a956d9 SHA1 9642fcb4d9fd3dcc062e21fe2bba68d6c563fd71 SHA256 a84ec323fe5534bdaa614a1111198cd270008d9065b55c5347d8dbaf159b0638
+EBUILD smokekde-4.8.2.ebuild 1092 RMD160 4768163c8615eaa9cf56aade5d078a6756d29497 SHA1 29fe9e96c8482ec39c6ddd5f22d1da3818d375e7 SHA256 861bf5acc57de49a9c859189913ac6dde9f7e10f2e9cee98c707d15fbd1c35d5
+MISC ChangeLog 2865 RMD160 cfd934c820aa5ac88b9a22e03d9c1d23a64fc3d2 SHA1 2ed11ce34231fa93622ffff17231ead3fac39a16 SHA256 2317c4664b4797374f420d4748e32cb72238adc4b463d8640f217a0e89011585
 MISC metadata.xml 458 RMD160 51858a1f3844a181e03010f72fc85de63acb95b2 SHA1 96c7b178c96e3e847f2f2fcb1fdb36cb31d118ba SHA256 9a7333b4d0bd67b4d5f02ffd11017102c3cc261f19f4ddc5550a836d862811a9
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iQEcBAEBCgAGBQJPfOKJAAoJEO+t9ga+3I3a2nwIAJGhzvuDW3Y/Z+OfHr3otc61
-CKxgYNx1XPEMYmdFYcx9/LtDZpshTxOJvHDoEht1UrJw4fTcz+Yk7yTbY7Wz6flI
-nREQxS1T/hwmNbLfHyM7W590yxfE0AIAHHSavQU+TwHobeFmxlmTlMEUtALMXfGs
-KFElYjZ9Btsv5q07Hmy1rgBpEZBb8TwFimlgNqCV5v3Ng1JNvMgZhcikOX4hi9OJ
-CgSu2QZYO/nmACMIeIWo9CprHG+YTLaMBs5lYqBy9buwywLIPAlGKDfTyt0y5x0K
-v3BL0pgXdRkiLogA+hSsqr0NA667KbnMvuJ4jaDCKaqiE+wSFXWzE11Nwxr0FYM=
-=0nfO
+iQEcBAEBCgAGBQJPhrHKAAoJEO+t9ga+3I3a10kH/RIlirNrK8VI5mRwGuxXR4fd
+/pszmV0eU8F9cqnU113eC+VifvIOS4baDnrdFG2KcGeu1gpaw7hw+sfMLxXhIfV0
+e3QS5NxsNCwfUbZ1o19oD0ZeDspPSrUIRi5jXTJSocgjUUaJnhdfTFbWv9iPj7bR
+RMMt/xxrmk1IKRjRu07aJIHzMRgDEv/wSosx88fbfl9Tz20TFO+6dic8Dsdb45jp
+bzKZRPx8j6L1nIrCKsvHojP3+lOUf7zDhn1KVvmsgVNPfkW0kbD4BhDFSS5lnxY7
+2x1IuLul2yZU84HTjiNti3dBnSIv/I/Ix5Tvg+XsPiroN6fBh+0kqhP20NgZZSk=
+=oEnG
 -----END PGP SIGNATURE-----
diff --git a/kde-base/smokekde/smokekde-4.8.1.ebuild b/kde-base/smokekde/smokekde-4.8.1.ebuild
index 373db3e82c9d..b53b6fd592b7 100644
--- a/kde-base/smokekde/smokekde-4.8.1.ebuild
+++ b/kde-base/smokekde/smokekde-4.8.1.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/smokekde/smokekde-4.8.1.ebuild,v 1.2 2012/04/04 19:24:19 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/smokekde/smokekde-4.8.1.ebuild,v 1.3 2012/04/12 10:42:35 johu Exp $
 
 EAPI=4
 
@@ -10,15 +10,15 @@ inherit kde4-base
 
 DESCRIPTION="Scripting Meta Object Kompiler Engine - KDE bindings"
 KEYWORDS="amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="akonadi attica debug kate okular semantic-desktop"
+IUSE="attica debug kate okular semantic-desktop"
 
 DEPEND="
 	$(add_kdebase_dep kdelibs 'semantic-desktop=')
 	$(add_kdebase_dep smokeqt)
-	akonadi? ( $(add_kdebase_dep kdepimlibs) )
 	attica? ( dev-libs/libattica )
 	kate? ( $(add_kdebase_dep kate) )
 	okular? ( $(add_kdebase_dep okular) )
+	semantic-desktop? ( $(add_kdebase_dep kdepimlibs) )
 "
 RDEPEND="${DEPEND}"
 
@@ -26,11 +26,11 @@ add_blocker smoke
 
 src_configure() {
 	mycmakeargs=(
-		$(cmake-utils_use_with akonadi)
-		$(cmake-utils_use_with akonadi KdepimLibs)
 		$(cmake-utils_use_with attica LibAttica)
 		$(cmake-utils_use_disable kate)
 		$(cmake-utils_use_with okular)
+		$(cmake-utils_use_with semantic-desktop Akonadi)
+		$(cmake-utils_use_with semantic-desktop KdepimLibs)
 		$(cmake-utils_use_with semantic-desktop Nepomuk)
 		$(cmake-utils_use_with semantic-desktop Soprano)
 	)
diff --git a/kde-base/smokekde/smokekde-4.8.2.ebuild b/kde-base/smokekde/smokekde-4.8.2.ebuild
index d5393d93d576..d6fe1c3bdb30 100644
--- a/kde-base/smokekde/smokekde-4.8.2.ebuild
+++ b/kde-base/smokekde/smokekde-4.8.2.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/smokekde/smokekde-4.8.2.ebuild,v 1.1 2012/04/04 23:59:07 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/smokekde/smokekde-4.8.2.ebuild,v 1.2 2012/04/12 10:42:35 johu Exp $
 
 EAPI=4
 
@@ -10,15 +10,15 @@ inherit kde4-base
 
 DESCRIPTION="Scripting Meta Object Kompiler Engine - KDE bindings"
 KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="akonadi attica debug kate okular semantic-desktop"
+IUSE="attica debug kate okular semantic-desktop"
 
 DEPEND="
 	$(add_kdebase_dep kdelibs 'semantic-desktop=')
 	$(add_kdebase_dep smokeqt)
-	akonadi? ( $(add_kdebase_dep kdepimlibs) )
 	attica? ( dev-libs/libattica )
 	kate? ( $(add_kdebase_dep kate) )
 	okular? ( $(add_kdebase_dep okular) )
+	semantic-desktop? ( $(add_kdebase_dep kdepimlibs) )
 "
 RDEPEND="${DEPEND}"
 
@@ -26,11 +26,11 @@ add_blocker smoke
 
 src_configure() {
 	mycmakeargs=(
-		$(cmake-utils_use_with akonadi)
-		$(cmake-utils_use_with akonadi KdepimLibs)
 		$(cmake-utils_use_with attica LibAttica)
 		$(cmake-utils_use_disable kate)
 		$(cmake-utils_use_with okular)
+		$(cmake-utils_use_with semantic-desktop Akonadi)
+		$(cmake-utils_use_with semantic-desktop KdepimLibs)
 		$(cmake-utils_use_with semantic-desktop Nepomuk)
 		$(cmake-utils_use_with semantic-desktop Soprano)
 	)