kde-testing merge: commit not commited stuff due to missing deps.

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

6 files changed, 112 insertions, 4 deletions

diff --git a/kde-base/dolphin/ChangeLog b/kde-base/dolphin/ChangeLog
index 3833922b8e94..af153dffd817 100644
--- a/kde-base/dolphin/ChangeLog
+++ b/kde-base/dolphin/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for kde-base/dolphin
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/dolphin/ChangeLog,v 1.24 2009/03/08 18:54:09 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/dolphin/ChangeLog,v 1.25 2009/03/16 19:27:19 scarabeus Exp $
+
+*dolphin-4.2.1-r1 (16 Mar 2009)
+
+  16 Mar 2009; Tomas Chvatal <scarabeus@gentoo.org> metadata.xml,
+  +dolphin-4.2.1-r1.ebuild:
+  kde-testing merge: commit not commited stuff due to missing deps.
 
   08 Mar 2009; Alexey Shvetsov <alexxy@gentoo.org> -dolphin-4.2.0.ebuild:
   Drop KDE 4.2.0
diff --git a/kde-base/dolphin/dolphin-4.2.1-r1.ebuild b/kde-base/dolphin/dolphin-4.2.1-r1.ebuild
new file mode 100644
index 000000000000..8bced317ba6e
--- /dev/null
+++ b/kde-base/dolphin/dolphin-4.2.1-r1.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/kde-base/dolphin/dolphin-4.2.1-r1.ebuild,v 1.1 2009/03/16 19:27:19 scarabeus Exp $
+
+EAPI="2"
+
+KMNAME="kdebase-apps"
+inherit kde4-meta
+
+DESCRIPTION="A KDE filemanager focusing on usability"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+IUSE="debug +semantic-desktop thumbnail"
+
+DEPEND="
+	>=kde-base/kdelibs-${PV}:${SLOT}[kdeprefix=,semantic-desktop=]
+	>=kde-base/libkonq-${PV}:${SLOT}[kdeprefix=]
+"
+RDEPEND="${DEPEND}
+	semantic-desktop? ( >=kde-base/nepomuk-${PV}:${SLOT}[kdeprefix=] )
+	thumbnail? ( media-video/mplayerthumbs:1[kdeprefix=] )
+"
+
+KMEXTRA="
+	doc/${PN}
+"
+
+KMLOADLIBS="libkonq"
+
+src_configure() {
+	mycmakeargs="${mycmakeargs}
+		$(cmake-utils_use_with semantic-desktop Nepomuk)
+		$(cmake-utils_use_with semantic-desktop Soprano)"
+
+	kde4-meta_src_configure
+}
diff --git a/kde-base/dolphin/metadata.xml b/kde-base/dolphin/metadata.xml
index 8d1e86a9cefb..1a91b6a89bec 100644
--- a/kde-base/dolphin/metadata.xml
+++ b/kde-base/dolphin/metadata.xml
@@ -1,5 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
+<use>
+	<flag name="semantic-desktop">
+		Semantic desktop allows for storage of digital information and its
+		metadata to allow the user to express his personal mental models,
+		making all information become intuitively accessible.
+	</flag>
+	<flag name="thumbnail">
+		Enables video thumbnails generation for <pkg>kde-base/dolphin</pkg> file manager.
+	</flag>
+</use>
 <herd>kde</herd>
 </pkgmetadata>
diff --git a/kde-base/konqueror/ChangeLog b/kde-base/konqueror/ChangeLog
index be74fe83f3da..56154ea60840 100644
--- a/kde-base/konqueror/ChangeLog
+++ b/kde-base/konqueror/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for kde-base/konqueror
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/konqueror/ChangeLog,v 1.132 2009/03/08 20:11:16 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/konqueror/ChangeLog,v 1.133 2009/03/16 19:25:45 scarabeus Exp $
+
+*konqueror-4.2.1-r1 (16 Mar 2009)
+
+  16 Mar 2009; Tomas Chvatal <scarabeus@gentoo.org> metadata.xml,
+  +konqueror-4.2.1-r1.ebuild:
+  kde-testing merge: commit not commited stuff due to missing deps.
 
   08 Mar 2009; Alexey Shvetsov <alexxy@gentoo.org> -konqueror-4.2.0.ebuild,
   -konqueror-4.2.0-r1.ebuild:
diff --git a/kde-base/konqueror/konqueror-4.2.1-r1.ebuild b/kde-base/konqueror/konqueror-4.2.1-r1.ebuild
new file mode 100644
index 000000000000..c9f60b007b1b
--- /dev/null
+++ b/kde-base/konqueror/konqueror-4.2.1-r1.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/kde-base/konqueror/konqueror-4.2.1-r1.ebuild,v 1.1 2009/03/16 19:25:45 scarabeus Exp $
+
+EAPI="2"
+
+KMNAME="kdebase-apps"
+inherit kde4-meta
+
+DESCRIPTION="KDE: Web browser, file manager, ..."
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+IUSE="+auth +bookmarks debug thumbnail"
+# 4 of 4 tests fail. Last checked for 4.0.3
+RESTRICT="test"
+
+DEPEND="
+	>=kde-base/libkonq-${PV}:${SLOT}[kdeprefix=]
+"
+RDEPEND="${DEPEND}
+	>=kde-base/kdebase-kioslaves-${PV}:${SLOT}[kdeprefix=]
+	>=kde-base/kfind-${PV}:${SLOT}[kdeprefix=]
+	>=kde-base/kurifilter-plugins-${PV}:${SLOT}[kdeprefix=]
+	auth? ( >=kde-base/kpasswdserver-${PV}:${SLOT}[kdeprefix=] )
+	bookmarks? ( >=kde-base/keditbookmarks-${PV}:${SLOT}[kdeprefix=] )
+	thumbnail? ( media-video/mplayerthumbs:1[kdeprefix=] )
+"
+
+KMEXTRA="
+	doc/${PN}/
+"
+KMEXTRACTONLY="
+	lib/konq/
+"
+
+pkg_postinst() {
+	kde4-meta_pkg_postinst
+
+	echo
+	elog "If you want to use konqueror as a filemanager, install the dolphin kpart:"
+	elog "emerge -1 kde-base/dolphin:${SLOT}"
+	elog
+	elog "To use Java on webpages: emerge jre"
+	echo
+}
diff --git a/kde-base/konqueror/metadata.xml b/kde-base/konqueror/metadata.xml
index 299f7bb2d031..334134cc4235 100644
--- a/kde-base/konqueror/metadata.xml
+++ b/kde-base/konqueror/metadata.xml
@@ -3,7 +3,14 @@
 <pkgmetadata>
 	<herd>kde</herd>
 	<use>
-		<flag name="auth">Add dependency on authentization packages</flag>
-		<flag name="bookmarks">Add dependency on bookmark package.</flag>
+		<flag name="auth">
+			Add dependency on authentization packages.
+		</flag>
+		<flag name="bookmarks">
+			Add dependency on bookmark package.
+		</flag>
+		<flag name="thumbnail">
+			Enables video thumbnails generation for <pkg>kde-base/konqueror</pkg> file manager.
+		</flag>
 	</use>
 </pkgmetadata>