[gentoo-commits] proj/kde:master commit in: kde-misc/kdiff3/

[Maciej Mrozowski]

commit:     5ec3458ec69ab3257673e9cdeedcd61cac77eaf1
Author:     Maciej Mrozowski <reavertm <AT> gentoo <DOT> org>
AuthorDate: Thu Jun 30 00:53:04 2011 +0000
Commit:     Maciej Mrozowski <reavertm <AT> gentoo <DOT> org>
CommitDate: Sun Jul  3 16:39:27 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=5ec3458e

[kde-misc/kdiff3] Filemanager integration is now handled by kfileitemactionplugin, the one using libkonq is now as a fallback (for < KDE-4.6.1), removing konqueror USE flag

---
 kde-misc/kdiff3/kdiff3-9999.ebuild |    8 ++------
 kde-misc/kdiff3/metadata.xml       |    3 ---
 2 files changed, 2 insertions(+), 9 deletions(-)

diff --git a/kde-misc/kdiff3/kdiff3-9999.ebuild b/kde-misc/kdiff3/kdiff3-9999.ebuild
index 20c987f..522057c 100644
--- a/kde-misc/kdiff3/kdiff3-9999.ebuild
+++ b/kde-misc/kdiff3/kdiff3-9999.ebuild
@@ -22,15 +22,12 @@ HOMEPAGE="http://kdiff3.sourceforge.net/"
 LICENSE="GPL-2"
 KEYWORDS=""
 SLOT="4"
-IUSE="debug kde konqueror"
+IUSE="debug kde"
 
 DEPEND="
 	>=x11-libs/qt-core-${QT_MINIMAL}
 	>=x11-libs/qt-gui-${QT_MINIMAL}
-	kde? (
-		$(add_kdebase_dep kdelibs)
-		konqueror? ( $(add_kdebase_dep libkonq) )
-	)
+	kde? ( $(add_kdebase_dep kdelibs) )
 "
 RDEPEND="${DEPEND}
 	sys-apps/diffutils
@@ -64,7 +61,6 @@ src_prepare() {
 
 src_configure() {
 	if use kde; then
-		mycmakeargs=( $(cmake-utils_use_with konqueror LibKonq) )
 		kde4-base_src_configure
 	else
 		eqmake4 "${S}"/src-QT4/kdiff3_fixed.pro

diff --git a/kde-misc/kdiff3/metadata.xml b/kde-misc/kdiff3/metadata.xml
index f356bc1..8d1e86a 100644
--- a/kde-misc/kdiff3/metadata.xml
+++ b/kde-misc/kdiff3/metadata.xml
@@ -2,7 +2,4 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <herd>kde</herd>
-<use>
-	<flag name="konqueror">Builds context menu extension plugin for <pkg>kde-base/konqueror</pkg>.</flag>
-</use>
 </pkgmetadata>