[gentoo-commits] proj/kde:master commit in: www-client/rekonq/

["Johannes Huber" <johu@gentoo.org>]

commit:     892d1ff56c59b4d3f6406dfa5266914c4d4e1ed2
Author:     Johannes Huber <johu <AT> gentoo <DOT> org>
AuthorDate: Thu May  2 21:10:01 2013 +0000
Commit:     Johannes Huber <johu <AT> gentoo <DOT> org>
CommitDate: Thu May  2 21:10:01 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=892d1ff5

[www-client/rekonq] Moved updated to tree. Sync live version.

Package-Manager: portage-2.2.0_alpha173

---
 www-client/rekonq/rekonq-9999.ebuild               |    6 ++++--
 ...rekonq-2.3.0.ebuild => rekonq-9999.ebuild.orig} |   13 ++-----------
 2 files changed, 6 insertions(+), 13 deletions(-)

diff --git a/www-client/rekonq/rekonq-9999.ebuild b/www-client/rekonq/rekonq-9999.ebuild
index b907aa1..d11453d 100644
--- a/www-client/rekonq/rekonq-9999.ebuild
+++ b/www-client/rekonq/rekonq-9999.ebuild
@@ -5,7 +5,7 @@
 EAPI=5
 
 WEBKIT_REQUIRED="always"
-KDE_LINGUAS="ca da de el es et fi fr hu ia it km mr nb nl pl pt pt_BR sk sl
+KDE_LINGUAS="cs da de el es et fi fr hu ia it km lt mr nb nl pl pt pt_BR sk sl
 sr sr@ijekavian sr@ijekavianlatin sr@latin sv tr uk zh_CN zh_TW"
 KDE_HANDBOOK="optional"
 KDE_MINIMAL="4.10"
@@ -18,10 +18,11 @@ HOMEPAGE="http://rekonq.kde.org/"
 LICENSE="GPL-3"
 SLOT="4"
 KEYWORDS=""
-IUSE="debug opera semantic-desktop"
+IUSE="debug kde opera semantic-desktop"
 
 DEPEND="
 	$(add_kdebase_dep kdelibs 'semantic-desktop?')
+	kde? ( $(add_kdebase_dep kactivities) )
 	opera? (
 		app-crypt/qca:2
 		dev-libs/qoauth
@@ -35,6 +36,7 @@ RDEPEND="${DEPEND}"
 
 src_configure() {
 	local mycmakeargs=(
+		$(cmake-utils_use_with kde KActivities)
 		$(cmake-utils_use_with opera QCA2)
 		$(cmake-utils_use_with opera QtOAuth)
 		$(cmake-utils_use_find_package semantic-desktop NepomukCore)

diff --git a/www-client/rekonq/rekonq-2.3.0.ebuild b/www-client/rekonq/rekonq-9999.ebuild.orig
similarity index 68%
rename from www-client/rekonq/rekonq-2.3.0.ebuild
rename to www-client/rekonq/rekonq-9999.ebuild.orig
index 75f7bbb..61b8670 100644
--- a/www-client/rekonq/rekonq-2.3.0.ebuild
+++ b/www-client/rekonq/rekonq-9999.ebuild.orig
@@ -5,7 +5,7 @@
 EAPI=5
 
 WEBKIT_REQUIRED="always"
-KDE_LINGUAS="cs da de el es et fi fr hu ia it km mr nb nl pl pt pt_BR sk sl
+KDE_LINGUAS="cs da de el es et fi fr hu ia it km lt mr nb nl pl pt pt_BR sk sl
 sr sr@ijekavian sr@ijekavianlatin sr@latin sv tr uk zh_CN zh_TW"
 KDE_HANDBOOK="optional"
 KDE_MINIMAL="4.10"
@@ -17,7 +17,7 @@ HOMEPAGE="http://rekonq.kde.org/"
 
 LICENSE="GPL-3"
 SLOT="4"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS=""
 IUSE="debug opera semantic-desktop"
 
 DEPEND="
@@ -33,15 +33,6 @@ DEPEND="
 "
 RDEPEND="${DEPEND}"
 
-src_prepare() {
-	# KDE_LINGUAS is also used to install appropriate handbooks
-	# since there is no en_US 'translation', it cannot be added
-	# hence making this impossible to install
-	mv doc/en_US doc/en || die "doc move failed"
-	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)