version bump, cleanups and changelog cleanup

9 files changed, 56 insertions, 69 deletions

diff --git a/net-ftp/ftpcube/ChangeLog b/net-ftp/ftpcube/ChangeLog
index 34baffa7b5a8..314f905d3684 100644
--- a/net-ftp/ftpcube/ChangeLog
+++ b/net-ftp/ftpcube/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for net-ftp/ftpcube
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# Author: José Alberto Suárez López <bass@gentoo.org>
+# $Header: /var/cvsroot/gentoo-x86/net-ftp/ftpcube/ChangeLog,v 1.11 2003/03/31 02:12:48 liquidx Exp $
+
+*ftpcube-0.4.1 (31 Mar 2003)
+
+  31 Mar 2003; Alastair Tse <liquidx@gentoo.org> ftpcube-0.3.2-r2.ebuild,
+  ftpcube-0.3.2-r2.ebuild, ftpcube-0.3.3.ebuild, ftpcube-0.3.3.ebuild,
+  ftpcube-0.4.1.ebuild, files/ftpcube-0.4.1-gentoo.patch,
+  files/setup.cfg.patch:
+  version bump and clean up to use distutils
 
 *ftpcube-0.4.4 (22 Dic 2002)
 
diff --git a/net-ftp/ftpcube/files/digest-ftpcube-0.3.2-r2 b/net-ftp/ftpcube/files/digest-ftpcube-0.3.2-r2
deleted file mode 100644
index dfbbf655c9ba..000000000000
--- a/net-ftp/ftpcube/files/digest-ftpcube-0.3.2-r2
+++ /dev/null
@@ -1 +0,0 @@
-MD5 0786b2466030dc4f63e9619d5b7c0566 ftpcube-0.3.2.tar.gz 82407
diff --git a/net-ftp/ftpcube/files/digest-ftpcube-0.3.3 b/net-ftp/ftpcube/files/digest-ftpcube-0.3.3
deleted file mode 100644
index 9db8133236b3..000000000000
--- a/net-ftp/ftpcube/files/digest-ftpcube-0.3.3
+++ /dev/null
@@ -1 +0,0 @@
-MD5 ef95c4c94e964c0b80863b7b36048ea0 ftpcube-0.3.3.tar.gz 94478
diff --git a/net-ftp/ftpcube/files/digest-ftpcube-0.4.1 b/net-ftp/ftpcube/files/digest-ftpcube-0.4.1
new file mode 100644
index 000000000000..c7b09dc84854
--- /dev/null
+++ b/net-ftp/ftpcube/files/digest-ftpcube-0.4.1
@@ -0,0 +1 @@
+MD5 b80bd0f0ae182837b53a9e3c1c82a1a7 ftpcube-0.4.1.tar.gz 83868
diff --git a/net-ftp/ftpcube/files/ftpcube-0.4.1-gentoo.patch b/net-ftp/ftpcube/files/ftpcube-0.4.1-gentoo.patch
new file mode 100644
index 000000000000..84af6380d9cd
--- /dev/null
+++ b/net-ftp/ftpcube/files/ftpcube-0.4.1-gentoo.patch
@@ -0,0 +1,24 @@
+diff -u -r ftpcube-0.4.1/setup.cfg ftpcube-0.4.1-new/setup.cfg
+--- ftpcube-0.4.1/setup.cfg	2002-11-16 04:51:05.000000000 +0000
++++ ftpcube-0.4.1-new/setup.cfg	2003-03-31 02:49:22.000000000 +0100
+@@ -1,3 +1,3 @@
+ [install]
+-install_data=/usr/local/share
+-install_scripts=/usr/local/bin
++install_data=/usr/share
++install_scripts=/usr/bin
+Only in ftpcube-0.4.1-new: setup.cfg~
+diff -u -r ftpcube-0.4.1/setup.py ftpcube-0.4.1-new/setup.py
+--- ftpcube-0.4.1/setup.py	2002-12-30 06:32:48.000000000 +0000
++++ ftpcube-0.4.1-new/setup.py	2003-03-31 02:49:33.000000000 +0100
+@@ -58,8 +58,7 @@
+ 	url = "http://ftpcube.sourceforge.net",
+ 	license = "Artistic",
+ 	packages = [ 'libftpcube',
+-	             'libftpcube/archtypes',
+-	             'libftpcube/wxPyColourChooser' ],
++	             'libftpcube/archtypes' ],
+ 	data_files = _data_files,
+ 	scripts = [ _ftpcube_script ],
+ )
+Only in ftpcube-0.4.1-new: setup.py~
diff --git a/net-ftp/ftpcube/files/setup.cfg.patch b/net-ftp/ftpcube/files/setup.cfg.patch
deleted file mode 100644
index 69eedf41dd2c..000000000000
--- a/net-ftp/ftpcube/files/setup.cfg.patch
+++ /dev/null
@@ -1,8 +0,0 @@
---- setup.cfg	2001-11-29 19:49:30.000000000 +0100
-+++ patch	2002-06-12 19:30:03.000000000 +0200
-@@ -1,3 +1,3 @@
- [install]
--install_data=/usr/local/share/ftpcube
--install_scripts=/usr/local/bin
-+install_data=${D}/usr/share/ftpcube
-+install_scripts=${D}/usr/bin
diff --git a/net-ftp/ftpcube/ftpcube-0.3.2-r2.ebuild b/net-ftp/ftpcube/ftpcube-0.3.2-r2.ebuild
deleted file mode 100644
index ec929000a002..000000000000
--- a/net-ftp/ftpcube/ftpcube-0.3.2-r2.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-ftp/ftpcube/ftpcube-0.3.2-r2.ebuild,v 1.7 2003/02/13 14:03:24 vapier Exp $
-
-S="${WORKDIR}/${P}"
-DESCRIPTION="Graphic ftp client written in python and gtk"
-SRC_URI="mirror://sourceforge/ftpcube/${P}.tar.gz"
-HOMEPAGE="http://ftpcube.sourceforge.net/"
-DEPEND="<dev-python/pygtk-1.99.0"
-
-SLOT="0"
-LICENSE="Artistic"
-KEYWORDS="x86 sparc "
-
-src_compile() {
-	python setup.py clean || die "clean fails"
-}
-
-src_install() {
-	dobin ftpcube
-	dodir /usr/lib/python2.2/site-packages/libftpcube
-	insinto /usr/lib/python2.2/site-packages/libftpcube
-	doins libftpcube/*
-	dodir /usr/share/ftpcube/icons
-	insinto /usr/share/ftpcube/icons
-	doins icons/*
-	dosym /usr/share/ftpcube/icons/ftpcube.xpm /usr/share/icons
-	dodoc CHANGELOG README
-}
diff --git a/net-ftp/ftpcube/ftpcube-0.3.3.ebuild b/net-ftp/ftpcube/ftpcube-0.3.3.ebuild
deleted file mode 100644
index aa39b7f51d2b..000000000000
--- a/net-ftp/ftpcube/ftpcube-0.3.3.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-ftp/ftpcube/ftpcube-0.3.3.ebuild,v 1.6 2003/02/13 14:03:30 vapier Exp $
-
-S="${WORKDIR}/${P}"
-DESCRIPTION="Graphic ftp client written in python and gtk"
-SRC_URI="mirror://sourceforge/ftpcube/${P}.tar.gz"
-HOMEPAGE="http://ftpcube.sourceforge.net/"
-DEPEND="|| ( <dev-python/pygtk-1.99.0 <dev-python/gnome-python-1.99 )"
-
-SLOT="0"
-LICENSE="Artistic"
-KEYWORDS="x86 sparc "
-
-src_compile() {
-	python setup.py clean || die "clean fails"
-}
-
-src_install() {
-	dobin ftpcube
-	dodir /usr/lib/python2.2/site-packages/libftpcube
-	insinto /usr/lib/python2.2/site-packages/libftpcube
-	doins libftpcube/*
-	dodir /usr/share/ftpcube/icons
-	insinto /usr/share/ftpcube/icons
-	doins icons/*
-	dosym /usr/share/ftpcube/icons/ftpcube.xpm /usr/share/icons
-	dodoc CHANGELOG README
-}
diff --git a/net-ftp/ftpcube/ftpcube-0.4.1.ebuild b/net-ftp/ftpcube/ftpcube-0.4.1.ebuild
new file mode 100644
index 000000000000..f3fd7df24fba
--- /dev/null
+++ b/net-ftp/ftpcube/ftpcube-0.4.1.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-ftp/ftpcube/ftpcube-0.4.1.ebuild,v 1.1 2003/03/31 02:12:48 liquidx Exp $
+
+IUSE=""
+
+inherit distutils
+
+S="${WORKDIR}/${P}"
+DESCRIPTION="Graphical FTP client using wxPython"
+SRC_URI="mirror://sourceforge/ftpcube/${P}.tar.gz"
+HOMEPAGE="http://ftpcube.sourceforge.net/"
+DEPEND=">=dev-python/wxPython-2.4.0.2"
+
+SLOT="0"
+LICENSE="Artistic"
+KEYWORDS="~x86 ~sparc"
+
+src_unpack() {
+	unpack ${A}
+	epatch ${FILESDIR}/${P}-gentoo.patch || die "patch failed"
+}