Introduce semantic-desktop use flag to fix bug #427784 requested by Nikoli <nikoli@lavabit.com>. Make opera sync handler optional via new use flag opera.

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

4 files changed, 36 insertions, 15 deletions

diff --git a/www-client/rekonq/ChangeLog b/www-client/rekonq/ChangeLog
index f70935c7d4cd..20e8368451f0 100644
--- a/www-client/rekonq/ChangeLog
+++ b/www-client/rekonq/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for www-client/rekonq
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/rekonq/ChangeLog,v 1.46 2012/07/21 15:23:33 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/rekonq/ChangeLog,v 1.47 2012/07/24 13:09:34 johu Exp $
+
+  24 Jul 2012; Johannes Huber <johu@gentoo.org> metadata.xml, rekonq-1.0.ebuild:
+  Introduce semantic-desktop use flag to fix bug #427784 requested by Nikoli
+  <nikoli@lavabit.com>. Make opera sync handler optional via new use flag opera.
 
 *rekonq-1.0 (21 Jul 2012)
 
diff --git a/www-client/rekonq/Manifest b/www-client/rekonq/Manifest
index e7039e27a0c7..412608ca9442 100644
--- a/www-client/rekonq/Manifest
+++ b/www-client/rekonq/Manifest
@@ -4,17 +4,17 @@ Hash: SHA256
 DIST rekonq-0.9.2.tar.bz2 3708470 SHA256 ddd569bd8cf2c51afae6d9d745dd62c7cad95f7a38275116455324caf7788d4f SHA512 4001db68ff6267f761b2e7fe2cb9eb247ce34b7c8b141f69d151dadd50de06cdfd7a0a38031e3b70cee2add4880334975ed02c51d15e097f9dc3ddb0d3a31f5a WHIRLPOOL e267c0b0f419bb21c4d2c369dbdda65e0e82cc26c6f253fe00769f0c7a81e0819c77f9c5f0ac1e697c6c295fcb7d635fcfa75bfeeb41cdfd85aae053478ac07e
 DIST rekonq-1.0.tar.bz2 3848577 SHA256 5970acebc9f2a35eb49152eb0d015c1cb8d85929ee6ae3f8a11869cf5391659e SHA512 e030133f0c15c26b2190f4ccef8d7ba8ebe5021976ac19267af8358f8a1c47b23484c9f98af9d07e7cd02f7baaa1d59cad8cd58dba3ed49c6e67d7ee551ab009 WHIRLPOOL 9a046cba7f82ff2f3079e25d67f4033cde9149aabf1661f74ee94f178d4ce16ca5c04b06171103cb184e9cd190377c0d34b25ccd8e9ee4019b03bf556d0905cf
 EBUILD rekonq-0.9.2.ebuild 1198 SHA256 884b83503a29fbbfe912007418303472c086b25aa29cde75f70646d70e1a5991 SHA512 4bc56565c2f98e47098392f3484e5dc39a0f34190eb232d5a1193870f0985cadfb9f8eb48dbaf199c90f32f801dc20cece78d12664d2f525d99fb594407776d8 WHIRLPOOL 74ff7cf2a91ccc3dea4b58d730bfea71d1ac61ef7a2a560ecc2db0839d84804e0f8102efcb27ec208e6a1dbd0b956a8d29bf8629687d71b881131bcd6b32c6bc
-EBUILD rekonq-1.0.ebuild 1226 SHA256 347fd06d42239c404fb73613124c4e2889ec06bb78b9169458c81afaa23f0da0 SHA512 17861ff2a63c293305a38c37a28dac12739250010d44f74b96ff91df93dfaeb43a656d61f76fb370dd59a5b5b3a8b1672012d4ede0658fd275dcdc6712fd3887 WHIRLPOOL a190d363a5d252e1bb82fd6d6e52d2c6c1eb5bf7de2c588c28d3f98c8074eb9044d58f49b9c5ab7d5fdfcd89b94eea34ea4a73669f847e0608878f3ede8b4963
-MISC ChangeLog 6463 SHA256 cd989c30bbf463447255383c4458b0d1d0f2dbbce006a72dd4c7c25597325e8c SHA512 b1e9f40c4ebfae8ecd767c378c57c2186484571572c33be6258e3728669f743f61a8c676a0c1fac4aee2483306e54c2a4b713906a423adc9ab465bcad7797bf9 WHIRLPOOL 6a8fec79716cbcacdf7dd2726bab70ee6fc17abaf6ba5c2e5955a5403afa667d91977bd611baaa225a8d496876099c49796ed7e34f83de246f3607c61bc421c7
-MISC metadata.xml 156 SHA256 2f4da28506b9d4185f320f67a6191d30c7a921217ed4447ed46ea0bc4aefc79a SHA512 0dcd7cfb246c4518ed1653cb06f5d2c7220ea90160a4b1a1da43edf5124b76d7104fe35a545178b6b3df19f5f3a3eb3f31ac1b4d169e3ca90d78be3e20e58b05 WHIRLPOOL df162e3d521df7decdd84d980e4bc71531bb8e05486c07102c554b529c10a1fb3374dda79d56b13bc037a2d230b4b8ff25702c7a1b86d703a24e8bfe7fe57642
+EBUILD rekonq-1.0.ebuild 1528 SHA256 de7aeee80cc41264188c0b290fd623f0ce03cef53be393ab8d89312c3bf38ee7 SHA512 2c27ad42b112531d740fa029a32a97d49a8b5927e6a4f52445905bf54acc877bbad5354c752da8ee526f37080de999e6d02f809d4cc7b056ce8de9c5c30f9185 WHIRLPOOL 61fa3fc243b9c59d6c3f651ebab73281d93fee5538fa78dd4205f269eae8e99b2ae8af11fb1eeade1a329ab429160bf3112a846ddc21c4edb4015cb8c882309c
+MISC ChangeLog 6703 SHA256 4e799bc2f90cfd0e0ea21812efe4fb977e40ed53f30229c18aa0e34792fc74a8 SHA512 cc76abd9be6ec3b8252a2125c91baecd70fd10b1e2287daab452efb62e840013a90e3d19d801999b17f9c0211aad4d504e8fe954f4f9408520621a021da86eba WHIRLPOOL f7b991a01831e897e9d0dddfca9567921f33e558b023342b60ecc961f8017eb3b4b45ab7f18aad4b538435e2afec75caac516353c5a8a31f844526bd24538113
+MISC metadata.xml 231 SHA256 f9f444905a2f663487ceae58056706bc3dae4e109278dca8938332e7a2ccfecb SHA512 d6f870b273ef83dcebd0e3793cac21b76dd9e84ecd3ba5e08f931c9e699089d4eb2ccc6bcb5da2f33fc87ed67865529d8b7556d59ee81d84a2c046fe926ba871 WHIRLPOOL 36f074fd17b7bde8813c6e1c10cc2f6a61efc59c381843320f71434f5cc49ccedba619795a45fa86cc1e29323c4f83da7a8b8820ccfd20d470780f6e4d885ad6
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQEcBAEBCAAGBQJQCslnAAoJEO+t9ga+3I3aou0IALPWGAnbshTmYGckkVhBXQM1
-Rl+51eKZEJr8yQOWSv1mQseMAcLg6812V1qXErLDsZ/q0lU9PwcRSgY88BKEVu6Q
-HtHEkDnxBFrAcvVUTiOWEIVZ4NDXtUeP78tiuVYF5YwVVNxbz6siE021IKZPbsWQ
-YTpkI/TOUZqgHzrBkE0i3BnYJt0RLMyc9lSZt8w0mdUEI3cBbndmj29vArURJOYO
-zWq7GwO2OJa67spcM/EIfG+cN6lgZMoUdu01rvEFZbJZMo6ySbit7suAVYe2Kydy
-SdqcvYzzgNvmBIEEyC3TfdZmzZ/vSSOEC3HJpzHvAEsrrlQty9lLR9utpMMfOoI=
-=WDem
+iQEcBAEBCAAGBQJQDp6UAAoJEO+t9ga+3I3appQH/jtX2hZzZVhSBTUVBictkyqj
+1pO0vJj3KCy2oPxQ7vEG89kFX36lhAuPEakZN6DSfxuCwn66NtJgR4PGoW6vI1G4
+Vtft38yBt+WxgDqjVuCzuJ9Uyfg9BFr3nk/uEivE6TbP92YWnzRY8iIzPtZYVS6/
+CU+JqsiSE01o+kS/2Bw08OtpmzyMWQb2tO6KjpSCsz0i8Dyio+8isgpNHh6O41sC
+jBKHWipLgT775+huo4RYKuembJwxPmsLEw8rNg3XeP0bsxDq9BS7CbP9YkbPIetH
+uLaGUEel+JJaYDNpA8PTwJjDkegJHqpp1yzd65tIkW4VgBWgHis7a2DfZvfsBl0=
+=o7D/
 -----END PGP SIGNATURE-----
diff --git a/www-client/rekonq/metadata.xml b/www-client/rekonq/metadata.xml
index 8d1e86a9cefb..ea92aab027ca 100644
--- a/www-client/rekonq/metadata.xml
+++ b/www-client/rekonq/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>kde</herd>
+	<herd>kde</herd>
+	<use>
+		<flag name="opera">Support for Opera sync handler</flag>
+	</use>
 </pkgmetadata>
diff --git a/www-client/rekonq/rekonq-1.0.ebuild b/www-client/rekonq/rekonq-1.0.ebuild
index a0f228dcf76a..0ca6b84d91b6 100644
--- a/www-client/rekonq/rekonq-1.0.ebuild
+++ b/www-client/rekonq/rekonq-1.0.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/www-client/rekonq/rekonq-1.0.ebuild,v 1.1 2012/07/21 15:23:33 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/rekonq/rekonq-1.0.ebuild,v 1.2 2012/07/24 13:09:34 johu Exp $
 
 EAPI=4
 
@@ -22,11 +22,15 @@ HOMEPAGE="http://rekonq.kde.org/"
 LICENSE="GPL-3"
 SLOT="4"
 KEYWORDS="~amd64 ~x86"
-IUSE="debug"
+IUSE="debug opera semantic-desktop"
 
 DEPEND="
-	dev-libs/qoauth
+	$(add_kdebase_dep kdelibs 'semantic-desktop=')
 	>=x11-libs/qt-dbus-${QT_MINIMAL}:4
+	opera? (
+		app-crypt/qca:2
+		dev-libs/qoauth
+	)
 "
 RDEPEND="${DEPEND}"
 
@@ -41,3 +45,13 @@ src_prepare() {
 	sed -i -e 's/en_US/en/' doc/CMakeLists.txt || die "sed failed"
 	kde4-base_src_prepare
 }
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake-utils_use_with opera QCA2)
+		$(cmake-utils_use_with opera QtOAuth)
+		$(cmake-utils_use_with semantic-desktop Nepomuk)
+	)
+
+	kde4-base_src_configure
+}