Drop live ebuild (dead); port to EAPI=5; fix openssl and readline slots

Package-Manager: portage-2.2.18/cvs/Linux x86_64
Manifest-Sign-Key: 0x84AD142F

4 files changed, 73 insertions, 67 deletions

diff --git a/net-ftp/gftp/ChangeLog b/net-ftp/gftp/ChangeLog
index a49b14f9d967..36356b6acaac 100644
--- a/net-ftp/gftp/ChangeLog
+++ b/net-ftp/gftp/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-ftp/gftp
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-ftp/gftp/ChangeLog,v 1.85 2012/05/03 05:37:17 jdhore Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-ftp/gftp/ChangeLog,v 1.86 2015/05/02 15:58:12 dilfridge Exp $
+
+*gftp-2.0.19-r2 (02 May 2015)
+
+  02 May 2015; Andreas K. Huettel <dilfridge@gentoo.org>
+  +gftp-2.0.19-r2.ebuild, -gftp-9999.ebuild:
+  Drop live ebuild (dead); port to EAPI=5; fix openssl and readline slots
 
   03 May 2012; Jeff Horelick <jdhore@gentoo.org> gftp-2.0.19-r1.ebuild,
   gftp-9999.ebuild:
diff --git a/net-ftp/gftp/Manifest b/net-ftp/gftp/Manifest
index 1fc90054d73d..91fe7ac1b3c4 100644
--- a/net-ftp/gftp/Manifest
+++ b/net-ftp/gftp/Manifest
@@ -1,6 +1,26 @@
-AUX gftp-2.0.19-gftp-expand-path-sigsegv.patch 640 RMD160 b763dd908273ad5ef13237b783a7f60da99a0adb SHA1 0f70c5f1be7f135c7bbb5aac90c6f5b0278c0bdb SHA256 79bbc67cf428dc323d6aedd8b047d8f8fdad42cf11a1e75fa5c118d358f85def
-DIST gftp-2.0.19.tar.bz2 1687167 RMD160 74c272b8cb2dfa6561bb9e0dc9ef0b81d079dc07 SHA1 a5516403edf199e31194806478d4d8ac00daf828 SHA256 5306a46be96d6f4d23906cb1836fb3d732039621a6c7fcfa921acc21ac110bfd
-EBUILD gftp-2.0.19-r1.ebuild 1055 RMD160 26937c0a19d8ae7b4d82ddb8a7592a9ef1ccce04 SHA1 a313a251d9431ee58a4047e98489daba8520c756 SHA256 ccb44611e1e95425d28f70ce5a59286dea09e0ec6e1933825dac7f4aac244034
-EBUILD gftp-9999.ebuild 1606 RMD160 f52f77c880e2132ff4a7d8d90272fe55cb3cfe12 SHA1 b6db5d05ea2a99b0358cd62bc4be21dd7d7544e7 SHA256 7e083906c34b8bc485d1754492779116c91e653bc27ffbbfc8d484f9b0e66f7f
-MISC ChangeLog 11275 RMD160 88d196c6058a0887d0812531a01cb4c767e2e5f5 SHA1 0bdb947df8cfda30094fa7a8a44d687f4ab4839d SHA256 39e7ce2b4fdcd3798f4e388511079f5cd4508844309e5643dc93a8f1b32482d4
-MISC metadata.xml 158 RMD160 c0e2bae8e91bb6be8922bac5e4f597302e06587e SHA1 38f78e9790bcd4382b4a49aa226aa6dda1d3a3d7 SHA256 3a7dbca0fdc557de69783e0663e2d76ddab129ea8a19b2d0ef6d3e5d1b947ce1
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
+AUX gftp-2.0.19-gftp-expand-path-sigsegv.patch 640 SHA256 79bbc67cf428dc323d6aedd8b047d8f8fdad42cf11a1e75fa5c118d358f85def SHA512 4ee09d50955fc91dea33bb71d8bd65a7c481f02c7bdf6dce53bbd630307c2ab898b533babe7597b1e434d0defdde3be6e145c0c5344d21e8a23c1537eb5f2bbf WHIRLPOOL cd34afa4b1426170b781544868a1f6d091a43b0edb8e3b67fe00d3957254edcf3d0d536d4da0b54529bcbd8be63948a4485e8482f1f4705ac148d8cf8ab79770
+DIST gftp-2.0.19.tar.bz2 1687167 SHA256 5306a46be96d6f4d23906cb1836fb3d732039621a6c7fcfa921acc21ac110bfd SHA512 59968786d66aaf6fb520f73d52ed0f8b57751a5ed222a5c65a7257628cd9addfd0ff3213206311bfd24441d7e6cc6d245d74d6687a1ad9739361da61ca078172 WHIRLPOOL 511572735b97d504e660cc6db2acc9898cb75bf4ef00304b9c225a2340aa4378ad1aa341a83db1c5c0ad637c4645655616effca901fc6990632c2c8a401df1b2
+EBUILD gftp-2.0.19-r1.ebuild 1055 SHA256 ccb44611e1e95425d28f70ce5a59286dea09e0ec6e1933825dac7f4aac244034 SHA512 09be5a24f085009d57be62af4c5c2912f502f74c778c20b79445d5acd233c6d8013577976acc2ed262205b2156c78c1df33cc9cc2e3c30995e1893e958e8f7a8 WHIRLPOOL f305810b83a583d5a521cc740f00c01962aaed94c707ab30ee8355e61560796cf1aba678c72df8c36d0abc8c4f4e020ab7d877cb47cd5baa0345794de3d4eaa2
+EBUILD gftp-2.0.19-r2.ebuild 944 SHA256 bfdd1b8d872c2db0bec38f76188d2b92b9adddd7d47f4bc24e34d35bc22b1dce SHA512 e13de759cf5be954492f419b5d894ec3ee236b6c8f0d16712650d8a5737e16c743f248837abfc6fa5db6aaf39d1be869936ae432a1a59d05825ba8045cf3de81 WHIRLPOOL 336fcc65e595ab49fee9ee26f9d61be7c177c6d9b3695cb7078ba136e130db273e8c3435c46598b2b3545283abf4d0a23cec526bfd47686c70177d88a076a9fd
+MISC ChangeLog 11486 SHA256 ed58ebe60fc50b978d2b935d8d44cfe22eff0421ffa374f7ea2c1dd04c561890 SHA512 5975088ac3cbb2358034e29c4c4aac611883626d59917462d1360f1ef5cf4ef443d3f3514b2806f81085ebe06fd5439770ed6306fedb170e6b2aa0d38a9a3148 WHIRLPOOL 34a6dd73b9bf77d07698dc3747c89b1d27c59751041cd15a785253b47c4ae54cf96d37d978ef038324255b972b51e2f8ebd92a4481b2f1176b32f8af6ab829be
+MISC metadata.xml 158 SHA256 3a7dbca0fdc557de69783e0663e2d76ddab129ea8a19b2d0ef6d3e5d1b947ce1 SHA512 7fbfbd2b3ed1b81867d55648509f778fdbe2091af53727b3426a3c7f453ae7e1663a99fdd2101508b8d6c85b3158459c93551b77a6a394f02d7e11cbc8a5ecf4 WHIRLPOOL 4bcd5662974877d42ebc4361b6eb412bfeea2af7144b436ce7ed152327d554afc321c376625ba0bb85a704b70d86e3c4882dff3573047acddd8ffccf655d4f7e
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2
+
+iQIcBAEBCAAGBQJVRPToAAoJEB9VdM6hupKVfpcP/0l5eSJYGuDtk4o6mm+V9niM
+J7nc3RcF5dKN+eC9Nx7nGLxQCW+5rfmE2Bi0B7lmgTEtrpjjZxe0Ue8O5FwTqm/p
+mxGgUI35X/AndrtNXgfl01YsElv2oYC19gvFFo5lMhAnDpQ0rSkAZPy7Z9c3C/2b
+j8rdaCYKdcYfiSGL3bzR+ej0Mcbt1unZ7PpMJvhYTK4jhvrJL/3nGZun4z0pcEmC
+b+W56pjYwNU/2yeWSM0ISjM8h35enCuOdJVpOWreN6GuJPNy6lQ6wh7hfASQtiIJ
+IDvZdT0THolnzloK6/wuWSWgSmRMqGTxO/hpQHp2Jroe221wJP2YKz96aYElP3M2
+pS/CQXj49DEj+r/LH8DfrZpn2FkRmA2kJrO4NYEk869Ai6HfFO/sSe2vGCHG0An6
+Ud8CNzsv60IlxoypvAO9uhlskUHynplNxx3OuT8Y66Al9TD3l4md6SKQGGgzP7OI
+pY4gvyUeyZhEFvQrB2IU73Eyp58XUxQB6OJ8QU23ueTvgB/80CQg7zS1M6B1L1g+
+B6UE5KIXnpbHcAnwVPEPsyNECr4UfpKMA66u78hVF1F8+sDKfpDH1FodYKul71Fj
+Rhuvwo6ZkKbaq5UjOvWXapAAGL63+4/Vka28izpwQfFdlb9QrQEryvL6XWhqD+s3
+Gu3MF1ClbN3ZvIG0FwMS
+=U4VO
+-----END PGP SIGNATURE-----
diff --git a/net-ftp/gftp/gftp-2.0.19-r2.ebuild b/net-ftp/gftp/gftp-2.0.19-r2.ebuild
new file mode 100644
index 000000000000..6dbce99846ad
--- /dev/null
+++ b/net-ftp/gftp/gftp-2.0.19-r2.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-ftp/gftp/gftp-2.0.19-r2.ebuild,v 1.1 2015/05/02 15:58:12 dilfridge Exp $
+
+EAPI=5
+
+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 ~x86-fbsd"
+IUSE="gtk ssl"
+
+RDEPEND="dev-libs/glib:2
+		 sys-devel/gettext
+		 sys-libs/ncurses
+		 sys-libs/readline:0
+		 gtk? ( x11-libs/gtk+:2 )
+		 ssl? ( dev-libs/openssl:0 )"
+DEPEND="${RDEPEND}
+		virtual/pkgconfig"
+
+src_prepare() {
+	# Fix SIGSEGV for gftp_expand_path function
+	epatch "${FILESDIR}/${P}-${PN}-expand-path-sigsegv.patch"
+}
+
+src_configure() {
+	econf $(use_enable gtk gtkport) $(use_enable ssl)
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+	dodoc ChangeLog* README* THANKS TODO docs/USERS-GUIDE
+}
diff --git a/net-ftp/gftp/gftp-9999.ebuild b/net-ftp/gftp/gftp-9999.ebuild
deleted file mode 100644
index 96fb2f33566b..000000000000
--- a/net-ftp/gftp/gftp-9999.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2012 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.3 2012/05/03 05:37:17 jdhore Exp $
-
-EAPI="1"
-
-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
-		virtual/pkgconfig"
-
-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
-}