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

Package-Manager: portage-2.2_rc3/cvs/Linux 2.6.24-gentoo-r8-mactel x86_64

6 files changed, 79 insertions, 97 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/Manifest b/net-ftp/gftp/Manifest
index 2541dd5443d7..0fcf26b8290e 100644
--- a/net-ftp/gftp/Manifest
+++ b/net-ftp/gftp/Manifest
@@ -1,10 +1,19 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX gftp-2.0.18-188252.patch 2499 RMD160 c62486bb65aa0cebec5a7aa051715f796448e872 SHA1 225d30f18d4b3ee052056ed8eb90247b147713ea SHA256 2804e400d6052873a0d5fcf24536febc96eb8bda14cac536e5979f5467fed1a6
 AUX gftp-2.0.18-ipv6.patch 1227 RMD160 b6a88043177ecc3535249fc6527a8716c4c76fee SHA1 c758a847c3d794955ad802e5634b9f25ced8add1 SHA256 97d047539828f9a6512c920a24915978bfa003daeb8046e49c6a380b403ab307
 AUX gftp-2.0.18-ssh2-read.patch 326 RMD160 512c6ffb7b31588a63c8efa48c15f70c33854862 SHA1 78d2d8e1a7921a8cfb456f8e414b11a6a04d11f3 SHA256 3ae9e62999aef08911dcc374433fa1797d277494cb86fdbb54e969098230582d
 AUX gftp-2.0.18-ssl-wildcardcert.patch 1004 RMD160 10a192946d56d6c830e7afc1172892f544c44fad SHA1 838669715273a265c3207b825386b281c41b2d4a SHA256 9f7c483ad83f7e12b492c9227ba548e089a4af455af3e8ea2ceff2b8e515e0c9
 DIST gftp-2.0.18.tar.bz2 1374850 RMD160 0e0daea8543ae822b25635647360193362a2648d SHA1 c2468f1ff1fe978a5fab3a198e513558f3b48f5a SHA256 8145e18d1edf13e8cb6cd7a69bb69de5c46307086997755654488fb8282d38a2
-EBUILD gftp-2.0.18-r4.ebuild 1054 RMD160 43b0e0ff3414519aa221bc36ea41229e277dd211 SHA1 51b1b5c46fb281f9cbceb9a322b11b5d072618b9 SHA256 6d649714cfc496c6f795f84a6f597c7169d0aee46d2fb216add993fb0d294ade
-EBUILD gftp-2.0.18-r5.ebuild 1304 RMD160 e784cd2b44e49c3c269c017224bc51483d796409 SHA1 0e1e29e14bdbd2f94df2684224f894dbb3c5e6b6 SHA256 8a56dbd2a4a237d207a150808d79f12ad390ed2074e8240d6af2b860e97e438c
-EBUILD gftp-2.0.18-r6.ebuild 1370 RMD160 d208d1e891734ca583c6edb38e5a80bc71b1d8ed SHA1 868ee3d76b5a7f9b2f4ba7e22737040baf936323 SHA256 2df5eb483805e3c76a763e2e4cfd921fdd10c24fead476d90f1a51dd4abd3e9f
-MISC ChangeLog 8822 RMD160 53c983d0c2622eb04e4e2895dfa9bd598dec7315 SHA1 aeb7f5f5b1cc7fb3ce49539a9b36216e2670217b SHA256 12b555c023be93a09c28f90271a35e949df4fcbb80798f6ebbec94de0bf46d58
+EBUILD gftp-2.0.18-r6.ebuild 1367 RMD160 255d7edd38958c1b413aa14e923c621614d9f4c7 SHA1 c4f81db4c37edd027b6275edffd9037b6aee5b2e SHA256 d8d5939771448c0a93bb3b8b3bd060e2215ea6a340bd9d4f79edc2c4cb28ccd3
+EBUILD gftp-9999.ebuild 1604 RMD160 4912b5dbac117d156d594e905a8104ede59b2552 SHA1 dc6e59e40c3f185a91f3a2881602fe05da07cd4f SHA256 43d2bf2a8ffb9282de555c290fdf11a9cf5c095a1e8d9c8d8bc87b5cc4aa8987
+MISC ChangeLog 9025 RMD160 a4c162f23fa6c8b204176b98c13512f64a1c99c7 SHA1 395b51af6c97b4dd59bddd7cafd8af6c36b0ba3a SHA256 64685ec045a44dc4d457320d29d3938e90c3f9786bd4e66f097397535ee9d512
 MISC metadata.xml 158 RMD160 c0e2bae8e91bb6be8922bac5e4f597302e06587e SHA1 38f78e9790bcd4382b4a49aa226aa6dda1d3a3d7 SHA256 3a7dbca0fdc557de69783e0663e2d76ddab129ea8a19b2d0ef6d3e5d1b947ce1
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.9 (GNU/Linux)
+
+iEYEARECAAYFAkiM4okACgkQ1fmVwcYIWAbjYQCglttJlZ/uHF+X7qIa/G3a48Co
+MKgAnjWAMZClInNcWzJuN46GpuxbVv+V
+=iwMq
+-----END PGP SIGNATURE-----
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
+}