From 366d901062847db1e6822b85e35422cb31c09c92 Mon Sep 17 00:00:00 2001 From: Tomas Chvatal Date: Sat, 13 Jun 2009 11:28:44 +0000 Subject: Apply link icon fix per bug #254668. Remove old. Package-Manager: portage-2.2_rc33/cvs/Linux x86_64 --- kde-misc/krusader/ChangeLog | 9 +++- kde-misc/krusader/Manifest | 5 +- kde-misc/krusader/files/1.90.0-icon-overlay.patch | 24 +++++++++ kde-misc/krusader/krusader-1.90.0-r2.ebuild | 59 +++++++++++++++++++++++ kde-misc/krusader/krusader-1.90.0.ebuild | 55 --------------------- 5 files changed, 94 insertions(+), 58 deletions(-) create mode 100644 kde-misc/krusader/files/1.90.0-icon-overlay.patch create mode 100644 kde-misc/krusader/krusader-1.90.0-r2.ebuild delete mode 100644 kde-misc/krusader/krusader-1.90.0.ebuild (limited to 'kde-misc') 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 + +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 krusader-1.90.0-r1.ebuild: Marking krusader-1.90.0-r1 ppc64 for bug 269860 diff --git a/kde-misc/krusader/Manifest b/kde-misc/krusader/Manifest index 37d46a5a09b7..1f21447d7928 100644 --- a/kde-misc/krusader/Manifest +++ b/kde-misc/krusader/Manifest @@ -1,10 +1,11 @@ +AUX 1.90.0-icon-overlay.patch 686 RMD160 07b28911c81eb4d7f9a98b5feff5c0e76fde743f SHA1 fe52020eefec851bbf3b9daf9c4279695c07352a SHA256 80c7799863a2ac064ed1b0bcc96f1f1a533da2740d8f4e98e571a93dada612f2 AUX 2.0.0_beta2-gcc44.patch 456 RMD160 5942cefb63d7a9b26318ac2a48a9c4fd11b0e04c SHA1 a313b60f35b8e7920cafc2f214279edca7f08bd6 SHA256 a43e79c5ffe306904626b62ff3c643dca0ebbb0f46d699d67daef7d799d6cb53 AUX external-tools 739 RMD160 a441e3cf0783ccdc558854caa835dba91e086e58 SHA1 e2b7ad5389dc46a3fd38d1d0385c57a27bef53dc SHA256 ec90b45f9f89edde8232070596691c707a2acdbdf41a152ef769526c662da9ea DIST kde-admindir-3.5.3.tar.bz2 187248 RMD160 81eedc1b81f2cee6709b7c8ad08859024da090f6 SHA1 6847a0c05ce3c11fcbef0de49b0c0d599e864982 SHA256 0cd8bf32dad0affa56edf5723747275be2b1e0702abefc28ded8763ad58fe07b DIST krusader-1.90.0.tar.gz 4784153 RMD160 9e6b089f2baf02be1108f07bfa85c214c175419a SHA1 96b490d27a55e9502a427764284f56135c5ae617 SHA256 a7cc8264b4bcfdbc94f389d11542f591e5d5c8992ae1db7ffff13d661646e5ad DIST krusader-2.0.0.tar.gz 4665020 RMD160 b017b3291e0f3e52865bb9d4226efc5dc886b286 SHA1 e78abf03c910ef1f98251eb0959f8b3955bbd1f0 SHA256 dc74c47d6eaf1c28165a74750e5a1b0341fa1c0d436658d0d5f85a6149f4852c EBUILD krusader-1.90.0-r1.ebuild 1538 RMD160 dd6d91c8d6aabf0e951c474ed5d376d1b3cee19d SHA1 deaa1eb3af0a537cb288d049a5d3578d5c0c2804 SHA256 f269f95ad81c9e61f6e6cd66155f6001e3be70d6441bba74124e95672aa3d21d -EBUILD krusader-1.90.0.ebuild 1563 RMD160 ca2b85093cdcb408170e31125d5464cd3a05d7b6 SHA1 57200cce9852b88343d2bac728fa57b486418376 SHA256 3775277c1f9c36887f1cf12154d3e25d2b0abfe63e925637a29c8e3ccac157d5 +EBUILD krusader-1.90.0-r2.ebuild 1593 RMD160 19dccd4b1d36b341b016206a77f74a78baac4fe3 SHA1 812cc2e9f19912c5538e26b19a34e78efd1c4948 SHA256 5c7e99a8bf489d4edb445f1c9f9e2778a908aa21856a5e30546b88d7fde24760 EBUILD krusader-2.0.0-r1.ebuild 1068 RMD160 972b2be530411658acd52590fcdc918b360e310e SHA1 167339c084dd0968b634ddc48b6de48a48bb4098 SHA256 60d1ce3b5ec4a931a4a4577c8491a669a1c64a7c089ce1ac5857c05026dc68a8 -MISC ChangeLog 6124 RMD160 27e04d67596b1889933befbdb5d14329d66a2776 SHA1 ab89bc95d553f7cf82264edcdc4895513c0d47a0 SHA256 86371c07b510bb567d4421daabb26c94885918cf1730542485b0516f44b77bd0 +MISC ChangeLog 6360 RMD160 481dc7f055e7a7f1f93e81ae23484f75408cb39f SHA1 b521440e476fbd4d3e93871ed5d280014b8fbaf0 SHA256 670b4e6730a1ace3721d4c6e742566473764336c45e06a9df5a9c3d3ace0e6e1 MISC metadata.xml 156 RMD160 ecce3b981f150c45ae1e84e2d208e678d6124259 SHA1 b64f7c0b4e5db816d82ad19848f72118af129d35 SHA256 2f4da28506b9d4185f320f67a6191d30c7a921217ed4447ed46ea0bc4aefc79a 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 + #include + #include +- ++#include + + #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-r2.ebuild b/kde-misc/krusader/krusader-1.90.0-r2.ebuild new file mode 100644 index 000000000000..3d86937222ae --- /dev/null +++ b/kde-misc/krusader/krusader-1.90.0-r2.ebuild @@ -0,0 +1,59 @@ +# 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-r2.ebuild,v 1.1 2009/06/13 11:28:43 scarabeus Exp $ + +EAPI=1 +inherit kde + +MY_P="${P/_/-}" +S="${WORKDIR}/${MY_P}" + +DESCRIPTION="An advanced twin-panel (commander-style) file-manager for KDE with many extras." +HOMEPAGE="http://krusader.sourceforge.net/" +SRC_URI="mirror://sourceforge/krusader/${MY_P}.tar.gz + mirror://gentoo/kde-admindir-3.5.3.tar.bz2" +LICENSE="GPL-2" + +SLOT="0" +KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86" +IUSE="javascript kde" + +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 + +pkg_postinst() { + echo + elog "For information about additional features and tools such as remote file access, packers," + elog "etc. you may want to use, see \"external-tools\" in /usr/share/doc/${PF}." + echo +} + +src_unpack() { + # Don't use kde_src_unpack or the new admindir updating code + # will reset admindir before the configure.in.bot change is fixed. + unpack ${A} + + # Stupid thing to do, but upstream did it + mv "${S}/admin/configure.in.bot.end" "${S}/configure.in.bot" + + 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) --without-kiotar" + kde_src_compile +} + +src_install() { + kde_src_install + dodoc "${FILESDIR}/external-tools" || die "Installing docs failed." +} diff --git a/kde-misc/krusader/krusader-1.90.0.ebuild b/kde-misc/krusader/krusader-1.90.0.ebuild deleted file mode 100644 index 2f6fafaa70c4..000000000000 --- a/kde-misc/krusader/krusader-1.90.0.ebuild +++ /dev/null @@ -1,55 +0,0 @@ -# Copyright 1999-2008 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 $ - -inherit kde - -MY_P="${P/_/-}" -S="${WORKDIR}/${MY_P}" - -DESCRIPTION="An advanced twin-panel (commander-style) file-manager for KDE with many extras." -HOMEPAGE="http://krusader.sourceforge.net/" -SRC_URI="mirror://sourceforge/krusader/${MY_P}.tar.gz - mirror://gentoo/kde-admindir-3.5.3.tar.bz2" -LICENSE="GPL-2" - -SLOT="0" -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* )" - -RDEPEND="${DEPEND}" - -need-kde 3.5 - -pkg_postinst() { - echo - elog "For information about additional features and tools such as remote file access, packers," - elog "etc. you may want to use, see \"external-tools\" in /usr/share/doc/${PF}." - echo -} - -src_unpack() { - # Don't use kde_src_unpack or the new admindir updating code - # will reset admindir before the configure.in.bot change is fixed. - unpack ${A} - - # Stupid thing to do, but upstream did it - mv "${S}/admin/configure.in.bot.end" "${S}/configure.in.bot" - - rm -rf "${S}/admin" "${S}/configure" - ln -s "${WORKDIR}/admin" "${S}/admin" -} - -src_compile() { - local myconf="$(use_with kde konqueror) $(use_with javascript) --with-kiotar" - kde_src_compile -} - -src_install() { - kde_src_install - dodoc "${FILESDIR}/external-tools" || die "Installing docs failed." -} -- cgit v1.2.3-65-gdbad