Apply link icon fix per bug #254668. Remove old.

(Portage version: 2.2_rc33/cvs/Linux x86_64)

3 files changed, 44 insertions, 9 deletions

diff --git a/kde-misc/krusader/ChangeLog b/kde-misc/krusader/ChangeLog
index 9e0f98b8908e..a1d83a5c00b6 100644
--- a/kde-misc/krusader/ChangeLog
+++ b/kde-misc/krusader/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for kde-misc/krusader
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-misc/krusader/ChangeLog,v 1.89 2009/05/31 13:54:56 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-misc/krusader/ChangeLog,v 1.90 2009/06/13 11:28:43 scarabeus Exp $
+
+*krusader-1.90.0-r2 (13 Jun 2009)
+
+  13 Jun 2009; Tomáš Chvátal <scarabeus@gentoo.org>
+  +files/1.90.0-icon-overlay.patch, -krusader-1.90.0.ebuild,
+  +krusader-1.90.0-r2.ebuild:
+  Apply link icon fix per bug #254668. Remove old.
 
   31 May 2009; Brent Baude <ranger@gentoo.org> krusader-1.90.0-r1.ebuild:
   Marking krusader-1.90.0-r1 ppc64 for bug 269860
diff --git a/kde-misc/krusader/files/1.90.0-icon-overlay.patch b/kde-misc/krusader/files/1.90.0-icon-overlay.patch
new file mode 100644
index 000000000000..adc06d81af46
--- /dev/null
+++ b/kde-misc/krusader/files/1.90.0-icon-overlay.patch
@@ -0,0 +1,24 @@
+--- krview.orig	2006-03-23 21:59:47.000000000 +0100
++++ krview.cpp	2009-01-12 19:39:07.000000000 +0100
+@@ -39,7 +39,7 @@
+ #include <kmimetype.h>
+ #include <klocale.h>
+ #include <kinputdialog.h>
+-
++#include <qpainter.h>
+ 
+ #define VF	getVfile()
+ 
+@@ -107,9 +107,9 @@
+    }
+    // if it's a symlink - add an arrow overlay
+    if ( vf->vfile_isSymLink() ) {
+-      QPixmap link( link_xpm );
+-      bitBlt ( &icon, 0, icon.height() - 11, &link, 0, 21, 10, 11, Qt::CopyROP, false );
+-      icon.setMask( icon.createHeuristicMask( false ) );
++	QPixmap link( link_xpm );
++	QPainter painter( &icon );
++	painter.drawPixmap( 0, icon.height() - 11, link, 0, 21, 10, 11 );
+    }
+ 
+    return icon;
diff --git a/kde-misc/krusader/krusader-1.90.0.ebuild b/kde-misc/krusader/krusader-1.90.0-r2.ebuild
index 2f6fafaa70c4..3d86937222ae 100644
--- a/kde-misc/krusader/krusader-1.90.0.ebuild
+++ b/kde-misc/krusader/krusader-1.90.0-r2.ebuild
@@ -1,7 +1,8 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-misc/krusader/krusader-1.90.0.ebuild,v 1.5 2008/05/24 13:48:24 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-misc/krusader/krusader-1.90.0-r2.ebuild,v 1.1 2009/06/13 11:28:43 scarabeus Exp $
 
+EAPI=1
 inherit kde
 
 MY_P="${P/_/-}"
@@ -14,13 +15,15 @@ SRC_URI="mirror://sourceforge/krusader/${MY_P}.tar.gz
 LICENSE="GPL-2"
 
 SLOT="0"
-KEYWORDS="amd64 ppc ppc64 sparc x86"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86"
 IUSE="javascript kde"
 
-DEPEND="kde? ( || ( ( =kde-base/libkonq-3.5* =kde-base/kdebase-kioslaves-3.5* )
-			=kde-base/kdebase-3.5* ) )
-		javascript? ( =kde-base/kjsembed-3.5* )"
-
+DEPEND="
+	kde? (
+		kde-base/libkonq:3.5
+		kde-base/kdebase-kioslaves:3.5
+	)
+	javascript? ( kde-base/kjsembed:3.5 )"
 RDEPEND="${DEPEND}"
 
 need-kde 3.5
@@ -42,10 +45,11 @@ src_unpack() {
 
 	rm -rf "${S}/admin" "${S}/configure"
 	ln -s "${WORKDIR}/admin" "${S}/admin"
+	epatch "${FILESDIR}/${PV}-icon-overlay.patch"
 }
 
 src_compile() {
-	local myconf="$(use_with kde konqueror) $(use_with javascript) --with-kiotar"
+	local myconf="$(use_with kde konqueror) $(use_with javascript) --without-kiotar"
 	kde_src_compile
 }