Add 2 new flags introducing auth and bookmarks, so user can emerge konqueror with these deps. Per bug #257355.

Package-Manager: portage-2.2_rc23/cvs/Linux i686

4 files changed, 55 insertions, 4 deletions

diff --git a/kde-base/konqueror/ChangeLog b/kde-base/konqueror/ChangeLog
index f42206723679..b0dcf3a4c1d7 100644
--- a/kde-base/konqueror/ChangeLog
+++ b/kde-base/konqueror/ChangeLog
@@ -1,6 +1,13 @@
 # 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.128 2009/02/01 07:42:34 jmbsvicetto Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/konqueror/ChangeLog,v 1.129 2009/02/04 18:35:21 scarabeus Exp $
+
+*konqueror-4.2.0-r1 (04 Feb 2009)
+
+  04 Feb 2009; Tomas Chvatal <scarabeus@gentoo.org> metadata.xml,
+  +konqueror-4.2.0-r1.ebuild:
+  Add 2 new flags introducing auth and bookmarks, so user can emerge
+  konqueror with these deps. Per bug #257355.
 
   01 Feb 2009; Jorge Manuel B. S. Vicetto <jmbsvicetto@gentoo.org>
   konqueror-4.2.0.ebuild:
diff --git a/kde-base/konqueror/Manifest b/kde-base/konqueror/Manifest
index 0e4bcdefb080..24050328cb86 100644
--- a/kde-base/konqueror/Manifest
+++ b/kde-base/konqueror/Manifest
@@ -8,6 +8,7 @@ DIST kdebase-4.2.0.tar.bz2 4249816 RMD160 5717f77b050f1aff109b6f5ede5c40d67d86aa
 EBUILD konqueror-3.5.10.ebuild 1831 RMD160 30b05c7eac80c5f4536a9d69580f0a158029099f SHA1 2a07149ab7e2d7310488ebadaeffbdcf813ce2fa SHA256 4ff2659655a5ad8998493d16f0d77e0dcd4abfb909a1864604045c5231ad9830
 EBUILD konqueror-3.5.9.ebuild 1889 RMD160 c7ffd1800bbd8038def253dbc47a2a4fa43542d8 SHA1 9915bf1fdb6c1b871df78fd30721b5f1d9b71d86 SHA256 0b0a988cf079e5515e9103095b77545fbcd7db99ac90597b51e42e867f639742
 EBUILD konqueror-4.1.4.ebuild 946 RMD160 f9bcad2b3d7e596ff620a51a9be976313b204c44 SHA1 9fe0f6cae093f27ae474a1c8acfdd843876342f3 SHA256 84d1cd46e44dc726fa8b48d4b377f4fba059cf2a859073f1f0ff17b4217d410a
+EBUILD konqueror-4.2.0-r1.ebuild 1068 RMD160 c93de2d5376a02c3c81312fd2e004718055584aa SHA1 2177ff49f8d8e7add1d1fbb67276a3b8efe41593 SHA256 da42a68103fdd0ce7590169ac5d110a5ec00fd641e09186eaaf3649bc274c4fb
 EBUILD konqueror-4.2.0.ebuild 938 RMD160 453bacbf5a2f3638e49506c1c739f060b11ff5ae SHA1 a05976b42fadce4f741a265f3358ffb029e65ef5 SHA256 bfffe206ac21f18b796b9d79acada33ea627933d34dc76f03168b0fa5e9a20cc
-MISC ChangeLog 17402 RMD160 21bcdfe17ac0e6c619966e9b41f38a495c4807f1 SHA1 865b1ee5c4c75eb05899a322e37da33e1dd14777 SHA256 4b7d55c38a9db79f1aaf9253d52e516e03db14306ed06b16ffe3bf21cd815102
-MISC metadata.xml 156 RMD160 ecce3b981f150c45ae1e84e2d208e678d6124259 SHA1 b64f7c0b4e5db816d82ad19848f72118af129d35 SHA256 2f4da28506b9d4185f320f67a6191d30c7a921217ed4447ed46ea0bc4aefc79a
+MISC ChangeLog 17647 RMD160 831ee584d4bc7fcaf659bea8edf792e5b70efc20 SHA1 849faa86d011588f703ec566b31c0d7b50bd0c77 SHA256 15ad5324980a946f98e08841a13249ac1d3b47854d0d500e90ad207844fea932
+MISC metadata.xml 309 RMD160 c5c32de1c71cccf1a3582d27cff9646ebb5053fb SHA1 da4e93ee655fe0573c08eb46cdd1534299a4c523 SHA256 d66c93f8487c00edc0bee1234a7b5f394bc417cce9d012cbffb320efdcdfbcb8
diff --git a/kde-base/konqueror/konqueror-4.2.0-r1.ebuild b/kde-base/konqueror/konqueror-4.2.0-r1.ebuild
new file mode 100644
index 000000000000..4efc38d9ffba
--- /dev/null
+++ b/kde-base/konqueror/konqueror-4.2.0-r1.ebuild
@@ -0,0 +1,39 @@
+# 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.0-r1.ebuild,v 1.1 2009/02/04 18:35:21 scarabeus Exp $
+
+EAPI="2"
+
+KMNAME="kdebase"
+KMMODULE="apps/${PN}"
+inherit kde4-meta
+
+DESCRIPTION="KDE: Web browser, file manager, ..."
+IUSE="+auth +bookmarks debug htmlhandbook"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+# 4 of 4 tests fail. Last checked for 4.0.3
+RESTRICT="test"
+
+DEPEND="
+	>=kde-base/libkonq-${PV}:${SLOT}
+	auth? ( >=kde-base/kpasswdserver-${PV}:${SLOT} )
+	bookmarks? ( >=kde-base/keditbookmarks-${PV}:${SLOT} )
+"
+RDEPEND="${DEPEND}
+	>=kde-base/kdebase-kioslaves-${PV}:${SLOT}
+	>=kde-base/kfind-${PV}:${SLOT}
+	>=kde-base/kurifilter-plugins-${PV}:${SLOT}"
+
+KMEXTRA="apps/doc/${PN}"
+KMEXTRACTONLY="apps/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 8d1e86a9cefb..299f7bb2d031 100644
--- a/kde-base/konqueror/metadata.xml
+++ b/kde-base/konqueror/metadata.xml
@@ -1,5 +1,9 @@
 <?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="auth">Add dependency on authentization packages</flag>
+		<flag name="bookmarks">Add dependency on bookmark package.</flag>
+	</use>
 </pkgmetadata>