New version (#84462), and cleanup.

(Portage version: 2.0.51.19)

7 files changed, 46 insertions, 65 deletions

diff --git a/net-ftp/kasablanca/ChangeLog b/net-ftp/kasablanca/ChangeLog
index 764dc0ffd290..ac4744433ad8 100644
--- a/net-ftp/kasablanca/ChangeLog
+++ b/net-ftp/kasablanca/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-ftp/kasablanca
-# Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-ftp/kasablanca/ChangeLog,v 1.9 2004/09/15 00:21:54 kugelfang Exp $
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-ftp/kasablanca/ChangeLog,v 1.10 2005/03/08 11:13:26 greg_g Exp $
+
+*kasablanca-0.4.0.2 (08 Mar 2005)
+
+  08 Mar 2005; Gregorio Guidi <greg_g@gentoo.org> metadata.xml,
+  +files/kasablanca-0.4.0.2-64bit.patch, -kasablanca-0.3.1.ebuild,
+  +kasablanca-0.4.0.2.ebuild:
+  New version (#84462), and cleanup.
 
   15 Sep 2004; Danny van Dyk <kugelfang@gentoo.org>
   files/kasablanca-0.4.0.1-64bit.patch:
diff --git a/net-ftp/kasablanca/files/digest-kasablanca-0.3.1 b/net-ftp/kasablanca/files/digest-kasablanca-0.3.1
deleted file mode 100644
index cab9e1f9b3ea..000000000000
--- a/net-ftp/kasablanca/files/digest-kasablanca-0.3.1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 7c7022cc9bb7c49da4fed2d8952c90cf kasablanca-0.3.1.tar.gz 654294
diff --git a/net-ftp/kasablanca/files/digest-kasablanca-0.4.0.2 b/net-ftp/kasablanca/files/digest-kasablanca-0.4.0.2
new file mode 100644
index 000000000000..d0f8c0a2ddde
--- /dev/null
+++ b/net-ftp/kasablanca/files/digest-kasablanca-0.4.0.2
@@ -0,0 +1 @@
+MD5 033bec75f0dac75c1dd892392a4a01ae kasablanca-0.4.0.2.tar.gz 699799
diff --git a/net-ftp/kasablanca/files/kasablanca-0.4.0.2-64bit.patch b/net-ftp/kasablanca/files/kasablanca-0.4.0.2-64bit.patch
new file mode 100644
index 000000000000..88a8f21ed3c7
--- /dev/null
+++ b/net-ftp/kasablanca/files/kasablanca-0.4.0.2-64bit.patch
@@ -0,0 +1,12 @@
+diff -Nur kasablanca-0.4.0.2.orig/src/ftpthread.cpp kasablanca-0.4.0.2/src/ftpthread.cpp
+--- kasablanca-0.4.0.2.orig/src/ftpthread.cpp	2005-01-31 14:24:47.000000000 +0100
++++ kasablanca-0.4.0.2/src/ftpthread.cpp	2005-03-08 11:54:15.000000000 +0100
+@@ -1095,7 +1095,7 @@
+ bool FtpThread::FormatFilelist(const char *filename, QString current, filist *dirtable, filist *filetable)
+ {
+ 	int i, blocks, space, month_int = 1;
+-	unsigned int loc, fileloc, datebegin, sizebegin = 0;
++	string::size_type loc, fileloc, datebegin, sizebegin = 0;
+ 	string buffer, filestring;
+ 
+ 	FILE* dirfile;
diff --git a/net-ftp/kasablanca/kasablanca-0.3.1.ebuild b/net-ftp/kasablanca/kasablanca-0.3.1.ebuild
deleted file mode 100644
index ac939ca204e3..000000000000
--- a/net-ftp/kasablanca/kasablanca-0.3.1.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-ftp/kasablanca/kasablanca-0.3.1.ebuild,v 1.2 2004/06/24 22:46:20 agriffis Exp $
-
-inherit kde
-need-kde 3.1
-
-DESCRIPTION="a graphical ftp client for kde. among its features are support for ssl/tls encryption (both commands and data using auth tls, not sftp), fxp (direct ftp to ftp transfer) bookmarks, and queues."
-HOMEPAGE="http://kasablanca.berlios.de/"
-SRC_URI="http://download.berlios.de/kasablanca/kasablanca-${PV}.tar.gz"
-LICENSE="GPL-2"
-RESTRICT="nomirror"
-SLOT="0"
-KEYWORDS="x86 ~ppc"
-IUSE=""
-
-# commondpends based on (ldd /usr/bin/kasablanca ; ldd /usr/bin/kbftp ) |\
-# cut -f3 -d ' ' | xargs -n1 qpkg -f -v  | sort | uniq
-COMMONDEPENDS="dev-libs/expat
-	dev-libs/openssl
-	kde-base/kdelibs
-	media-libs/fontconfig
-	media-libs/freetype
-	media-libs/jpeg
-	media-libs/libart_lgpl
-	media-libs/libmng
-	media-libs/libpng
-	media-libs/nas
-	sys-devel/gcc
-	sys-libs/glibc
-	sys-libs/zlib
-	virtual/x11
-	x11-libs/qt"
-
-DEPEND="${DEPEND}
-	sys-apps/gawk
-	sys-apps/sed
-	sys-devel/libtool
-	>=sys-devel/automake-1.6
-	sys-devel/autoconf
-	sys-devel/gettext
-	${COMMONDEPENDS}"
-
-
-RDEPEND="${RDEPEND}
-	${COMMONDEPENDS}"
-
-
-
-
-src_install() {
-	kde_src_install all
-	mv ${D}/usr/share/doc/HTML ${D}/usr/share/doc/${PF}
-}
diff --git a/net-ftp/kasablanca/kasablanca-0.4.0.2.ebuild b/net-ftp/kasablanca/kasablanca-0.4.0.2.ebuild
new file mode 100644
index 000000000000..0f59c4904f17
--- /dev/null
+++ b/net-ftp/kasablanca/kasablanca-0.4.0.2.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-ftp/kasablanca/kasablanca-0.4.0.2.ebuild,v 1.1 2005/03/08 11:13:26 greg_g Exp $
+
+inherit kde eutils
+
+DESCRIPTION="A graphical ftp client for KDE. It supports ssl/tls encryption, fxp, bookmarks, and queues."
+HOMEPAGE="http://kasablanca.berlios.de/"
+SRC_URI="http://download.berlios.de/kasablanca/${P}.tar.gz"
+LICENSE="GPL-2"
+
+SLOT="0"
+KEYWORDS="~x86 ~ppc ~amd64"
+IUSE=""
+
+need-kde 3.1
+
+src_unpack() {
+	kde_src_unpack
+
+	# Fix for 64-bit archs
+	epatch ${FILESDIR}/${P}-64bit.patch
+}
diff --git a/net-ftp/kasablanca/metadata.xml b/net-ftp/kasablanca/metadata.xml
index b9fc2b9c6f11..b435a8440ccd 100644
--- a/net-ftp/kasablanca/metadata.xml
+++ b/net-ftp/kasablanca/metadata.xml
@@ -1,12 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>no-herd</herd>
-<maintainer>
-  <email>dragonheart@gentoo.org</email>
-    <name>Daniel Black</name>
-    <description>A user ebuild that I felt obliged to include. Please take over if you want 
-it</description>
-</maintainer>
-<longdescription></longdescription>
+<herd>kde-other</herd>
 </pkgmetadata>