remove old revisions, fix QA warnings, add live ebuild.

(Portage version: 2.2_rc3/cvs/Linux 2.6.24-gentoo-r8-mactel x86_64)

5 files changed, 66 insertions, 93 deletions

diff --git a/net-ftp/gftp/ChangeLog b/net-ftp/gftp/ChangeLog
index 322dadcdde17..7a4affc1f8de 100644
--- a/net-ftp/gftp/ChangeLog
+++ b/net-ftp/gftp/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-ftp/gftp
 # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-ftp/gftp/ChangeLog,v 1.66 2008/01/21 19:33:43 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-ftp/gftp/ChangeLog,v 1.67 2008/07/27 21:02:52 eva Exp $
+
+  27 Jul 2008; Gilles Dartiguelongue <eva@gentoo.org>
+  -gftp-2.0.18-r4.ebuild, -gftp-2.0.18-r5.ebuild,
+  gftp-2.0.18-r6.ebuild, +gftp-9999.ebuild:
+  remove old revisions, fix QA warnings, add live ebuild.
 
   25 Sep 2007; Tobias Scherbaum <dertobi123@gentoo.org>
   gftp-2.0.18-r6.ebuild:
diff --git a/net-ftp/gftp/gftp-2.0.18-r4.ebuild b/net-ftp/gftp/gftp-2.0.18-r4.ebuild
deleted file mode 100644
index 1d5bcf672317..000000000000
--- a/net-ftp/gftp/gftp-2.0.18-r4.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-ftp/gftp/gftp-2.0.18-r4.ebuild,v 1.9 2008/01/21 19:33:43 armin76 Exp $
-
-inherit eutils
-
-DESCRIPTION="Gnome based FTP Client"
-SRC_URI="http://www.gftp.org/${P}.tar.bz2"
-HOMEPAGE="http://www.gftp.org"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 ppc ppc64 sparc x86"
-IUSE="gtk ssl"
-
-RDEPEND=">=dev-libs/glib-2
-		 sys-devel/gettext
-		 sys-libs/ncurses
-		 sys-libs/readline
-		 gtk? ( >=x11-libs/gtk+-2 )
-		 ssl? ( dev-libs/openssl )"
-DEPEND="${RDEPEND}
-		>=dev-util/pkgconfig-0.9"
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-
-	# patch to allow fetching of ssh2 files
-	# that are read-only, see bug #91269 and upstream link.
-	epatch ${FILESDIR}/${P}-ssh2-read.patch
-}
-
-src_compile() {
-	econf $(use_enable gtk gtkport) $(use_enable ssl) || die "configure failed"
-	emake || die "make failed"
-}
-
-src_install() {
-	make DESTDIR=${D} install || die "install failed"
-	dodoc ChangeLog README* THANKS TODO docs/USERS-GUIDE
-}
diff --git a/net-ftp/gftp/gftp-2.0.18-r5.ebuild b/net-ftp/gftp/gftp-2.0.18-r5.ebuild
deleted file mode 100644
index 5ce06bd57914..000000000000
--- a/net-ftp/gftp/gftp-2.0.18-r5.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-ftp/gftp/gftp-2.0.18-r5.ebuild,v 1.3 2008/01/21 19:33:43 armin76 Exp $
-
-inherit eutils
-
-DESCRIPTION="Gnome based FTP Client"
-SRC_URI="http://www.gftp.org/${P}.tar.bz2"
-HOMEPAGE="http://www.gftp.org"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE="gtk ssl"
-
-RDEPEND=">=dev-libs/glib-2
-		 sys-devel/gettext
-		 sys-libs/ncurses
-		 sys-libs/readline
-		 gtk? ( >=x11-libs/gtk+-2 )
-		 ssl? ( dev-libs/openssl )"
-DEPEND="${RDEPEND}
-		>=dev-util/pkgconfig-0.9"
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-
-	# patch to allow fetching of ssh2 files
-	# that are read-only, see bug #91269 and upstream link.
-	epatch "${FILESDIR}/${P}-ssh2-read.patch"
-	# patch to allow for wildcard SSL certificates
-	epatch "${FILESDIR}/${P}-ssl-wildcardcert.patch"
-	# patch to not crash on IPv6 enabled hosts or on IPv4 transfer with the "ignore PASV address" function
-	epatch "${FILESDIR}/${P}-ipv6.patch"
-
-}
-
-src_compile() {
-	econf $(use_enable gtk gtkport) $(use_enable ssl) || die "configure failed"
-	emake || die "make failed"
-}
-
-src_install() {
-	make DESTDIR=${D} install || die "install failed"
-	dodoc ChangeLog* README* THANKS TODO docs/USERS-GUIDE
-}
diff --git a/net-ftp/gftp/gftp-2.0.18-r6.ebuild b/net-ftp/gftp/gftp-2.0.18-r6.ebuild
index 66fcca0aee92..3c97596ddaf1 100644
--- a/net-ftp/gftp/gftp-2.0.18-r6.ebuild
+++ b/net-ftp/gftp/gftp-2.0.18-r6.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-ftp/gftp/gftp-2.0.18-r6.ebuild,v 1.7 2007/09/25 17:01:59 dertobi123 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-ftp/gftp/gftp-2.0.18-r6.ebuild,v 1.8 2008/07/27 21:02:52 eva Exp $
 
 inherit eutils
 
@@ -24,7 +24,7 @@ DEPEND="${RDEPEND}
 
 src_unpack() {
 	unpack ${A}
-	cd ${S}
+	cd "${S}"
 
 	# patch to allow fetching of ssh2 files
 	# that are read-only, see bug #91269 and upstream link.
@@ -44,6 +44,6 @@ src_compile() {
 }
 
 src_install() {
-	make DESTDIR=${D} install || die "install failed"
+	make DESTDIR="${D}" install || die "install failed"
 	dodoc ChangeLog* README* THANKS TODO docs/USERS-GUIDE
 }
diff --git a/net-ftp/gftp/gftp-9999.ebuild b/net-ftp/gftp/gftp-9999.ebuild
new file mode 100644
index 000000000000..fe26325fc983
--- /dev/null
+++ b/net-ftp/gftp/gftp-9999.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-ftp/gftp/gftp-9999.ebuild,v 1.1 2008/07/27 21:02:52 eva Exp $
+
+inherit autotools eutils subversion
+
+DESCRIPTION="Gnome based FTP Client"
+ESVN_REPO_URI="http://svn.gnome.org/svn/${PN}/trunk"
+#SRC_URI="http://www.gftp.org/${P}.tar.bz2"
+HOMEPAGE="http://www.gftp.org"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS=""
+IUSE="gtk ssl"
+
+RDEPEND=">=dev-libs/glib-2
+		 sys-libs/ncurses
+		 sys-libs/readline
+		 gtk? ( >=x11-libs/gtk+-2 )
+		 ssl? ( dev-libs/openssl )"
+DEPEND="${RDEPEND}
+		  sys-devel/gettext
+		>=dev-util/intltool-0.35.5
+		>=dev-util/pkgconfig-0.9"
+
+src_unpack() {
+	subversion_src_unpack
+	cd "${S}"
+
+	# remove annoying/deprecated macros
+	sed -i -e "s/^\(AC_AIX\|AC_MINIX\)//g" configure.in
+	sed -i -e "s/AM_PATH_\(GLIB\|GTK\).*/AC_DEFINE(dummy, 1, [dummy])/g" configure.in
+
+	# Switching gettext to intltool
+	sed -i "s/AM_GNU_GETTEXT/IT_PROG_INTLTOOL(0.35.5)\nGETTEXT_PACKAGE=gftp\nAC_SUBST(GETTEXT_PACKAGE)\nAM_GLIB_GNU_GETTEXT/" configure.in
+	sed -i "s:intl/Makefile::" configure.in
+	sed -i "s:intl::g" Makefile.am
+	sed -i "s:LIBINTL:INTLLIBS:g" src/{gtk,text}/Makefile.am
+
+	intltoolize --force || die "intltoolize failed"
+	AT_M4DIR="." eautoreconf
+}
+
+src_compile() {
+	econf \
+		$(use_enable gtk gtkport) \
+		$(use_enable gtk gtk20) \
+		$(use_enable ssl) \
+		--enable-textport || die "configure failed"
+	emake || die "make failed"
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die "install failed"
+	dodoc ChangeLog* README* THANKS TODO docs/USERS-GUIDE
+}