Revbump to fix bug #269860. Remove not needed patch. Remove old.

Package-Manager: portage-2.2_rc33/cvs/Linux x86_64

5 files changed, 74 insertions, 17 deletions

diff --git a/kde-misc/krusader/ChangeLog b/kde-misc/krusader/ChangeLog
index 82215ba12dd2..534da09f9b65 100644
--- a/kde-misc/krusader/ChangeLog
+++ b/kde-misc/krusader/ChangeLog
@@ -1,6 +1,14 @@
 # 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.82 2009/04/15 18:51:07 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-misc/krusader/ChangeLog,v 1.83 2009/05/15 11:28:22 scarabeus Exp $
+
+*krusader-2.0.0-r1 (15 May 2009)
+*krusader-1.90.0-r1 (15 May 2009)
+
+  15 May 2009; Tomas Chvatal <scarabeus@gentoo.org>
+  -files/actionproperty-qt45.patch, +krusader-1.90.0-r1.ebuild,
+  -krusader-2.0.0.ebuild, +krusader-2.0.0-r1.ebuild:
+  Revbump to fix bug #269860. Remove not needed patch. Remove old.
 
   15 Apr 2009; Brent Baude <ranger@gentoo.org> krusader-2.0.0.ebuild:
   Marking krusader-2.0.0 ~ppc and ~ppc64 as requested by scarabeus
diff --git a/kde-misc/krusader/Manifest b/kde-misc/krusader/Manifest
index 46ff23b1edb0..8024760e33f5 100644
--- a/kde-misc/krusader/Manifest
+++ b/kde-misc/krusader/Manifest
@@ -1,10 +1,10 @@
 AUX 2.0.0_beta2-gcc44.patch 456 RMD160 5942cefb63d7a9b26318ac2a48a9c4fd11b0e04c SHA1 a313b60f35b8e7920cafc2f214279edca7f08bd6 SHA256 a43e79c5ffe306904626b62ff3c643dca0ebbb0f46d699d67daef7d799d6cb53
-AUX actionproperty-qt45.patch 349 RMD160 42d65126f3740cd2ebcef8d3e9b3db46d4c3a49b SHA1 5d047cfa4e92a8d369491c5f630321df8ce7c96b SHA256 3c8ecc51b5242f15b5cf8e4c8c21f7e7977fe447d94cf513fad3b24fa77771d8
 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 1663 RMD160 dbb4b7c16fa070d9ca7261d427063476b60ab4d4 SHA1 02e8b726f339ad8422bc7c17594eac04dc1cd7ea SHA256 e35a2bd504dc81da04737099b267f21c0c53d655b6bfd831c378eee186c647bf
 EBUILD krusader-1.90.0.ebuild 1563 RMD160 ca2b85093cdcb408170e31125d5464cd3a05d7b6 SHA1 57200cce9852b88343d2bac728fa57b486418376 SHA256 3775277c1f9c36887f1cf12154d3e25d2b0abfe63e925637a29c8e3ccac157d5
-EBUILD krusader-2.0.0.ebuild 1085 RMD160 261dca24df95ff1c994db31d7c6d6d9a008485eb SHA1 67c76c955bfe48f3eeeb49a25f1886fbf998b555 SHA256 eeed3850879911b1d7436923f8a761a5c54e93a9ce2f87cb1e25c436be141bce
-MISC ChangeLog 5097 RMD160 d472683c03228fd4cb9fe5a8ae67d9c7d1ed6af6 SHA1 4a622bfdebf02eb7f1b6a004c1d582e69c8e51bf SHA256 5c3abb393ff6c325615e3bbfcd8cc49a33e76ef90a74dc39c25cc225ae6790d6
+EBUILD krusader-2.0.0-r1.ebuild 1068 RMD160 972b2be530411658acd52590fcdc918b360e310e SHA1 167339c084dd0968b634ddc48b6de48a48bb4098 SHA256 60d1ce3b5ec4a931a4a4577c8491a669a1c64a7c089ce1ac5857c05026dc68a8
+MISC ChangeLog 5405 RMD160 36ee0b4f0705dbf71812500679fa6a707cffaaa7 SHA1 c9bd5c5c001307cff72dc8a31f4e211514945539 SHA256 d84271a16f3bb65d0b7a21e5db8b9260ddee5c98de44c8ee9381f632e61007fc
 MISC metadata.xml 156 RMD160 ecce3b981f150c45ae1e84e2d208e678d6124259 SHA1 b64f7c0b4e5db816d82ad19848f72118af129d35 SHA256 2f4da28506b9d4185f320f67a6191d30c7a921217ed4447ed46ea0bc4aefc79a
diff --git a/kde-misc/krusader/files/actionproperty-qt45.patch b/kde-misc/krusader/files/actionproperty-qt45.patch
deleted file mode 100644
index 0c5f8ade7d03..000000000000
--- a/kde-misc/krusader/files/actionproperty-qt45.patch
+++ /dev/null
@@ -1,9 +0,0 @@
---- krusader/ActionMan/actionproperty.ui.orig	2009-02-23 14:41:17.000000000 +0100
-+++ krusader/ActionMan/actionproperty.ui	2009-02-23 14:41:22.000000000 +0100
-@@ -1,6 +1,5 @@
- <ui version="4.0" >
-  <class>ActionProperty</class>
-- <extends>QWidget</extends>
-  <widget class="QWidget" name="ActionProperty" >
-   <property name="geometry" >
-    <rect>
diff --git a/kde-misc/krusader/krusader-1.90.0-r1.ebuild b/kde-misc/krusader/krusader-1.90.0-r1.ebuild
new file mode 100644
index 000000000000..2e3866a5b007
--- /dev/null
+++ b/kde-misc/krusader/krusader-1.90.0-r1.ebuild
@@ -0,0 +1,60 @@
+# 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-r1.ebuild,v 1.1 2009/05/15 11:28:22 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"
+}
+
+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."
+	# remove collisions
+	rm -rf "${D}/${KDEDIR}/"{$(get_libdir)/kde3/kio_tar.{so,la},share/services/{ar,tar,zip}.protocol}
+}
diff --git a/kde-misc/krusader/krusader-2.0.0.ebuild b/kde-misc/krusader/krusader-2.0.0-r1.ebuild
index 116167ee8032..72d96a5387a1 100644
--- a/kde-misc/krusader/krusader-2.0.0.ebuild
+++ b/kde-misc/krusader/krusader-2.0.0-r1.ebuild
@@ -1,6 +1,6 @@
 # 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-2.0.0.ebuild,v 1.2 2009/04/15 18:51:07 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-misc/krusader/krusader-2.0.0-r1.ebuild,v 1.1 2009/05/15 11:28:22 scarabeus Exp $
 
 EAPI="2"
 
@@ -19,9 +19,7 @@ SLOT="2"
 KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
 IUSE="debug doc"
 
-RDEPEND="
-	!kde-misc/krusader:0
-"
+RDEPEND=""
 DEPEND="${RDEPEND}
 	sys-devel/gettext
 "