get rid of gtk2 useflag, clean up old ebuilds, fixes #108555

(Portage version: 2.0.51.22-r3)

11 files changed, 34 insertions, 221 deletions

diff --git a/net-ftp/gftp/ChangeLog b/net-ftp/gftp/ChangeLog
index 561156874eb4..998b161870ff 100644
--- a/net-ftp/gftp/ChangeLog
+++ b/net-ftp/gftp/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-ftp/gftp
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-ftp/gftp/ChangeLog,v 1.45 2005/09/15 23:19:03 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-ftp/gftp/ChangeLog,v 1.46 2005/10/14 23:05:57 allanonjl Exp $
+
+*gftp-2.0.18-r2 (14 Oct 2005)
+
+  14 Oct 2005; John N. Laliberte <allanonjl@gentoo.org> -gftp-2.0.14.ebuild,
+  -gftp-2.0.15.ebuild, -gftp-2.0.16-r1.ebuild, -gftp-2.0.17.ebuild,
+  +gftp-2.0.18-r2.ebuild:
+  get rid of gtk2 useflag, clean up old ebuilds, fixes #108555
 
   15 Sep 2005; Aron Griffis <agriffis@gentoo.org> gftp-2.0.18-r1.ebuild:
   Mark 2.0.18-r1 stable on alpha
diff --git a/net-ftp/gftp/Manifest b/net-ftp/gftp/Manifest
index e04612bc61da..f7afa10a69d9 100644
--- a/net-ftp/gftp/Manifest
+++ b/net-ftp/gftp/Manifest
@@ -1,15 +1,9 @@
 MD5 3a75b54355e3e9dab04a8612c5044c27 gftp-2.0.18-r1.ebuild 1468
+MD5 c648612a27bb745b4eb32c6152b699b5 gftp-2.0.18-r2.ebuild 1136
+MD5 3fd52486236703d025df2d7b59e1c2ae ChangeLog 6109
 MD5 03ad2e6c4ab41244af1015a8bbb0b39f metadata.xml 158
-MD5 6ef5440de3a798c71361cf506fefe9b4 ChangeLog 5843
-MD5 c1c9e5da9bb3075d73a9ca6938f35537 gftp-2.0.17.ebuild 1303
-MD5 eb32a9a12641bb35892806c33d63cc4e gftp-2.0.16-r1.ebuild 1439
-MD5 330492be1ee2136babdeb216af8a9132 gftp-2.0.15.ebuild 1447
-MD5 78d63cb9cc2782d47f9e63c25457e0e0 gftp-2.0.14.ebuild 968
-MD5 77ce85d4218034ac35a17bf59af5b790 files/digest-gftp-2.0.16-r1 65
+MD5 429ea419b557eb768b0be6daa3c8b7e7 files/digest-gftp-2.0.18-r1 65
+MD5 429ea419b557eb768b0be6daa3c8b7e7 files/digest-gftp-2.0.18-r2 65
 MD5 ce3187f3e4f80bfb35cf8bef798eb40d files/gftp-2.0.15-64bit_fixes.patch 16360
 MD5 81d77310a3638462af932e435590ab5d files/gftp-2.0.18-fix_gtk1.patch 1095
 MD5 23e7696a3f6f2c368d11ca9aaadb7797 files/gftp-2.0.16-ipv6_fix.patch 3279
-MD5 429ea419b557eb768b0be6daa3c8b7e7 files/digest-gftp-2.0.18-r1 65
-MD5 f016b30f08a26f30a03721cff7a19ac9 files/digest-gftp-2.0.15 65
-MD5 f65f1e254dd63668b5f0db33b4158383 files/digest-gftp-2.0.17 65
-MD5 4a567cc97f7b5318979193135b98eafd files/digest-gftp-2.0.14 64
diff --git a/net-ftp/gftp/files/digest-gftp-2.0.14 b/net-ftp/gftp/files/digest-gftp-2.0.14
deleted file mode 100644
index 10c437204bb3..000000000000
--- a/net-ftp/gftp/files/digest-gftp-2.0.14
+++ /dev/null
@@ -1 +0,0 @@
-MD5 4e846cb105a552f10b9926942a3421bb gftp-2.0.14.tar.bz2 784470
diff --git a/net-ftp/gftp/files/digest-gftp-2.0.15 b/net-ftp/gftp/files/digest-gftp-2.0.15
deleted file mode 100644
index da0c3f69b548..000000000000
--- a/net-ftp/gftp/files/digest-gftp-2.0.15
+++ /dev/null
@@ -1 +0,0 @@
-MD5 776244d1c93ffe3a583564830eeeb701 gftp-2.0.15.tar.bz2 1045038
diff --git a/net-ftp/gftp/files/digest-gftp-2.0.16-r1 b/net-ftp/gftp/files/digest-gftp-2.0.16-r1
deleted file mode 100644
index 9ea9117b1698..000000000000
--- a/net-ftp/gftp/files/digest-gftp-2.0.16-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 a51cbe1a9077fba4e12218cd02ebefdf gftp-2.0.16.tar.bz2 1102827
diff --git a/net-ftp/gftp/files/digest-gftp-2.0.17 b/net-ftp/gftp/files/digest-gftp-2.0.17
deleted file mode 100644
index 68cda13fc6f3..000000000000
--- a/net-ftp/gftp/files/digest-gftp-2.0.17
+++ /dev/null
@@ -1 +0,0 @@
-MD5 a869315be1f59624a3abf5fb25d5b7bb gftp-2.0.17.tar.bz2 1228736
diff --git a/net-ftp/gftp/files/digest-gftp-2.0.18-r2 b/net-ftp/gftp/files/digest-gftp-2.0.18-r2
new file mode 100644
index 000000000000..c99f186437a4
--- /dev/null
+++ b/net-ftp/gftp/files/digest-gftp-2.0.18-r2
@@ -0,0 +1 @@
+MD5 44b19442d06f6dc68c7211d66029d826 gftp-2.0.18.tar.bz2 1374850
diff --git a/net-ftp/gftp/gftp-2.0.14.ebuild b/net-ftp/gftp/gftp-2.0.14.ebuild
deleted file mode 100644
index e8bf1f8f7371..000000000000
--- a/net-ftp/gftp/gftp-2.0.14.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-ftp/gftp/gftp-2.0.14.ebuild,v 1.12 2005/02/04 18:58:47 joem Exp $
-
-IUSE="nls gtk2"
-DESCRIPTION="Gnome based FTP Client"
-SRC_URI="http://www.gftp.org/${P}.tar.bz2"
-HOMEPAGE="http://www.gftp.org"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="x86 ppc sparc "
-
-DEPEND="virtual/x11
-	gtk2? ( >=x11-libs/gtk+-2.0.0 )
-	!gtk2? ( =x11-libs/gtk+-1.2* )"
-
-RDEPEND="nls? ( sys-devel/gettext )"
-
-src_compile() {
-	local myconf
-
-	use nls \
-		&& myconf="--enable-nls" \
-		|| myconf="--disable-nls"
-
-	# do not use enable-{gtk20,gtkport} they are not recognized
-	# and will disable building the gtkport alltogether
-	use gtk2 \
-		&& myconf="${myconf}" \
-		|| myconf="${myconf} --disable-gtk20"
-
-	econf ${myconf} || die
-	emake || die
-}
-
-src_install() {
-	einstall || die
-
-	dodoc COPYING ChangeLog AUTHORS README* THANKS \
-		TODO docs/USERS-GUIDE NEWS
-
-}
diff --git a/net-ftp/gftp/gftp-2.0.15.ebuild b/net-ftp/gftp/gftp-2.0.15.ebuild
deleted file mode 100644
index e7448e95df02..000000000000
--- a/net-ftp/gftp/gftp-2.0.15.ebuild
+++ /dev/null
@@ -1,69 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-ftp/gftp/gftp-2.0.15.ebuild,v 1.13 2005/02/04 18:58:47 joem Exp $
-
-inherit eutils
-
-IUSE="nls gtk gtk2 ssl"
-DESCRIPTION="Gnome based FTP Client"
-SRC_URI="http://www.gftp.org/${P}.tar.bz2"
-HOMEPAGE="http://www.gftp.org"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="x86 ppc sparc amd64"
-
-DEPEND="virtual/x11
-	ssl? ( dev-libs/openssl )
-	gtk? (
-		gtk2? ( >=x11-libs/gtk+-2 )
-		!gtk2? ( =x11-libs/gtk+-1.2* ) )
-	!gtk? ( sys-libs/readline
-		sys-libs/ncurses
-		=dev-libs/glib-1.2* )"
-
-RDEPEND="nls? ( sys-devel/gettext )"
-
-src_unpack() {
-	unpack ${A} ; cd ${S}
-
-	if [ "${ARCH}" == "amd64" ]; then
-		epatch ${FILESDIR}/${P}-64bit_fixes.patch
-	fi
-}
-
-src_compile() {
-	local myconf
-
-	use nls \
-		&& myconf="--enable-nls" \
-		|| myconf="--disable-nls"
-
-	# do not use enable-{gtk20,gtkport} they are not recognized
-	# and will disable building the gtkport alltogether
-	if use gtk
-	then
-		einfo "gtk+ enabled"
-		use gtk2 \
-			&& einfo "gtk2 enabled" \
-			|| myconf="${myconf} --disable-gtk20"
-	else
-		einfo "gtk+ and gtk2 disabled"
-		myconf="${myconf} --disable-gtkport --disable-gtk20"
-	fi
-
-	use ssl \
-		&& myconf="${myconf}" \
-		|| myconf="${myconf} --disable-ssl"
-
-	econf ${myconf} || die
-	emake || die
-}
-
-src_install() {
-	einstall || die
-
-	dodoc COPYING ChangeLog AUTHORS README* THANKS \
-		TODO docs/USERS-GUIDE NEWS
-
-}
diff --git a/net-ftp/gftp/gftp-2.0.16-r1.ebuild b/net-ftp/gftp/gftp-2.0.16-r1.ebuild
deleted file mode 100644
index 59e563e48dd2..000000000000
--- a/net-ftp/gftp/gftp-2.0.16-r1.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-ftp/gftp/gftp-2.0.16-r1.ebuild,v 1.10 2005/02/04 18:58:47 joem Exp $
-
-inherit eutils
-
-DESCRIPTION="Gnome based FTP Client"
-SRC_URI="http://www.gftp.org/${P}.tar.bz2"
-HOMEPAGE="http://www.gftp.org"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="x86 ppc sparc -amd64"
-IUSE="nls gtk gtk2 ssl"
-
-DEPEND="virtual/x11
-	ssl? ( dev-libs/openssl )
-	gtk? (
-		gtk2? ( >=x11-libs/gtk+-2 )
-		!gtk2? ( =x11-libs/gtk+-1.2* ) )
-	!gtk? ( sys-libs/readline
-		sys-libs/ncurses
-		=dev-libs/glib-1.2* )"
-
-#RDEPEND="nls? ( sys-devel/gettext )"
-
-src_unpack() {
-
-	unpack ${A}
-
-	cd ${S}/lib
-	# fix problem in #34475
-	epatch ${FILESDIR}/${P}-ipv6_fix.patch
-
-}
-
-src_compile() {
-	local myconf
-
-	use nls \
-		&& myconf="--enable-nls" \
-		|| myconf="--disable-nls"
-
-	# do not use enable-{gtk20,gtkport} they are not recognized
-	# and will disable building the gtkport alltogether
-	if use gtk
-	then
-		einfo "gtk+ enabled"
-		use gtk2 \
-			&& einfo "gtk2 enabled" \
-			|| myconf="${myconf} --disable-gtk20"
-	else
-		einfo "gtk+ and gtk2 disabled"
-		myconf="${myconf} --disable-gtkport --disable-gtk20"
-	fi
-
-	use ssl \
-		&& myconf="${myconf}" \
-		|| myconf="${myconf} --disable-ssl"
-
-	econf ${myconf} || die
-	emake || die
-}
-
-src_install() {
-	einstall || die
-
-	dodoc COPYING ChangeLog AUTHORS README* THANKS \
-		TODO docs/USERS-GUIDE NEWS
-
-}
diff --git a/net-ftp/gftp/gftp-2.0.17.ebuild b/net-ftp/gftp/gftp-2.0.18-r2.ebuild
index 4fe3fd572fce..5bed3b0991e9 100644
--- a/net-ftp/gftp/gftp-2.0.17.ebuild
+++ b/net-ftp/gftp/gftp-2.0.18-r2.ebuild
@@ -1,6 +1,8 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-ftp/gftp/gftp-2.0.17.ebuild,v 1.9 2005/02/04 18:58:47 joem Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-ftp/gftp/gftp-2.0.18-r2.ebuild,v 1.1 2005/10/14 23:05:57 allanonjl Exp $
+
+inherit eutils
 
 DESCRIPTION="Gnome based FTP Client"
 SRC_URI="http://www.gftp.org/${P}.tar.bz2"
@@ -8,50 +10,46 @@ HOMEPAGE="http://www.gftp.org"
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="~x86 ~ppc ~sparc -amd64 ppc64"
-IUSE="nls gtk gtk2 ssl"
+KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="nls gtk ssl"
 
 DEPEND="virtual/x11
 	ssl? ( dev-libs/openssl )
-	gtk? (
-		gtk2? ( >=x11-libs/gtk+-2 )
-		!gtk2? ( =x11-libs/gtk+-1.2* ) )
+	gtk? ( >=x11-libs/gtk+-2 )
 	!gtk? ( sys-libs/readline
 		sys-libs/ncurses
 		=dev-libs/glib-1.2* )"
 
 #RDEPEND="nls? ( sys-devel/gettext )"
 
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+}
+
 src_compile() {
-	local myconf
 
-	use nls \
-		&& myconf="--enable-nls" \
-		|| myconf="--disable-nls"
+	local myconf
 
 	# do not use enable-{gtk20,gtkport} they are not recognized
 	# and will disable building the gtkport alltogether
-	if use gtk
-	then
-		einfo "gtk+ enabled"
-		use gtk2 \
-			&& einfo "gtk2 enabled" \
-			|| myconf="${myconf} --disable-gtk20"
-	else
-		einfo "gtk+ and gtk2 disabled"
+	if ! use gtk; then
+		einfo "gtk+ disabled"
 		myconf="${myconf} --disable-gtkport --disable-gtk20"
 	fi
 
-	use ssl \
-		&& myconf="${myconf}" \
-		|| myconf="${myconf} --disable-ssl"
+	econf \
+			$(use_enable nls) \
+			$(use_enable ssl) \
+			${myconf} \
+			|| die
 
-	econf ${myconf} || die
 	emake || die
+
 }
 
 src_install() {
-	einstall || die
+	make DESTDIR=${D} install || die
 
 	dodoc COPYING ChangeLog README* THANKS \
 		TODO docs/USERS-GUIDE