summaryrefslogtreecommitdiff
path: root/kde-misc
diff options
context:
space:
mode:
authorMaciej Mrozowski <reavertm@gentoo.org>2011-06-30 02:53:04 +0200
committerMaciej Mrozowski <reavertm@gentoo.org>2011-07-03 18:39:27 +0200
commit5ec3458ec69ab3257673e9cdeedcd61cac77eaf1 (patch)
tree421b22fee000a7fe4320d496211e378870b6af66 /kde-misc
parent1c6a2382c21e6707f5d98eee6a1f27ed8dcc4f3f (diff)
downloadkde-5ec3458ec69ab3257673e9cdeedcd61cac77eaf1.tar.gz
kde-5ec3458ec69ab3257673e9cdeedcd61cac77eaf1.tar.bz2
kde-5ec3458ec69ab3257673e9cdeedcd61cac77eaf1.zip
[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
Diffstat (limited to 'kde-misc')
-rw-r--r--kde-misc/kdiff3/Manifest24
-rw-r--r--kde-misc/kdiff3/kdiff3-9999.ebuild8
-rw-r--r--kde-misc/kdiff3/metadata.xml3
3 files changed, 4 insertions, 31 deletions
diff --git a/kde-misc/kdiff3/Manifest b/kde-misc/kdiff3/Manifest
index 7f8188088d3..3febb255720 100644
--- a/kde-misc/kdiff3/Manifest
+++ b/kde-misc/kdiff3/Manifest
@@ -1,22 +1,2 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
-
-EBUILD kdiff3-9999.ebuild 1836 RMD160 0e4f6160ad528a8ad1efd9cf96455558813b0d5c SHA1 3f6a4b5c91357e00d4140e7b0a6e00717be69c87 SHA256 3e8e4c5f3e382d16a153346645fbe2f8209ead736a1d299f7cf1bdd6bb430f14
-MISC metadata.xml 272 RMD160 13741b05a0a212384a26dfa158a82c6a370fb522 SHA1 f25ebed93ced9da6bbb189cb5d64e98ed4205236 SHA256 d05363662a508f4e4ec9a8bf9089942548391002a2427b25985232d9c16cce01
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
-
-iQIcBAEBCgAGBQJN/HvdAAoJELHSF2kinlg4lPwP/j1/cnH590o/QjrCbrJiJgJ4
-2fJG++7u+LjtQ4k0acLqMDysGLNpzhey0MdmcJpHy2S4uuCt01sus3giXU2UeSmL
-MdepzCyOeayT/jBmNXGb16vDr3/QoaL80/7I7cw2bE7te+M5ZcSRunFXWtpa0O+u
-CB2sF/mS1t7+/b+L3elq6hv6Fdc4afzMe/Ra0Au23Qv8UByu0Fy9PNEd/cnFweFh
-Y2dxFfd1y6U8KYuJQBdeGBu3vQHOd7X1+JGZdDxwg9LEHHe5GQKDhyTklPoztKJx
-HDKF6d2flMSlbsmlNOBramKiUhnQ2yKMhfHShQILERtcwtfgm9c3KKqN7OVbmGyQ
-s+qFXCl16BrOkXqoifHTPHkQV7ex662tif7CAnVOERi5aKOwJd9dzGzc4Opvwb8B
-yk2YBjO7TpZUZjvongVZskMiQCEmilDXHBIEOqojVWU0A1TWPFFx3VYmpj5RGb5P
-ymuoz54fwwm5UYALY6+++5UU5EDePbUdM5cNCJ5F9rffRui9tdX2Xp4Er8ERLrrb
-2kpcxQKswmOhJPxTlltLGr0KIZh/BhU6lFYK2bayq6aR0p/OIpvQRJybWQXGIyvT
-dhS7ZrjLyse555/5yPIvk5dAeAsObrtybp+pCak73uQMmJu+APFZ4G00XxxPCbTc
-iGJMT+WOpYpvXX7/VyhJ
-=BDcd
------END PGP SIGNATURE-----
+EBUILD kdiff3-9999.ebuild 1719 RMD160 c91564f52cb6068ca1449ef1e477a602b609c443 SHA1 0dfefdd04dc149fad48847812fb82d891d3e2860 SHA256 da31f2f285cf77d56f1302c52534b39cb3e3c51be446abac48e6773ec268371b
+MISC metadata.xml 156 RMD160 ecce3b981f150c45ae1e84e2d208e678d6124259 SHA1 b64f7c0b4e5db816d82ad19848f72118af129d35 SHA256 2f4da28506b9d4185f320f67a6191d30c7a921217ed4447ed46ea0bc4aefc79a
diff --git a/kde-misc/kdiff3/kdiff3-9999.ebuild b/kde-misc/kdiff3/kdiff3-9999.ebuild
index 20c987fefed..522057c8cc3 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 f356bc1a8af..8d1e86a9cef 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>