Version bump, bug #207579

Package-Manager: portage-2.1.4.4

4 files changed, 51 insertions, 40 deletions

diff --git a/net-misc/wput/ChangeLog b/net-misc/wput/ChangeLog
index 6bc025d4a5d6..cc8ded5de17e 100644
--- a/net-misc/wput/ChangeLog
+++ b/net-misc/wput/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-misc/wput
 # Copyright 2000-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/wput/ChangeLog,v 1.17 2008/01/26 17:21:43 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/wput/ChangeLog,v 1.18 2008/02/24 16:11:37 armin76 Exp $
+
+*wput-0.6.1 (24 Feb 2008)
+
+  24 Feb 2008; Raúl Porcel <armin76@gentoo.org>
+  -files/wput-0.5-gentoo.diff, +wput-0.6.1.ebuild:
+  Version bump, bug #207579
 
   26 Jan 2008; Raúl Porcel <armin76@gentoo.org> -wput-0.5.ebuild:
   old
diff --git a/net-misc/wput/Manifest b/net-misc/wput/Manifest
index 4a2e426a2c8a..10a6484cbfbd 100644
--- a/net-misc/wput/Manifest
+++ b/net-misc/wput/Manifest
@@ -1,7 +1,8 @@
-AUX wput-0.5-gentoo.diff 1164 RMD160 48f524d593bbafe62f51fbf4d7146b10fcb0f968 SHA1 fe36a3b56b7c0bf9ad6c6f9965a55989afff5269 SHA256 74ad0396d475a881b1a6c1baeb25532203998824d96a2dcf651662f4baf10dfe
 AUX wput-0.6-gentoo.diff 641 RMD160 e725ce22fac960e6a14a1d651b9791d203c12d72 SHA1 3783cbd0886d6cf9ec0f4803fce04c6119cd4331 SHA256 e72d178f76b6f877ae4379f6c729fdb95267f28e9efd887c29abe862957c9c40
 AUX wput-0.6-respectldflags.patch 391 RMD160 e68430076fca2ebba4435e4641a3eb24d7d2e252 SHA1 0014904099a917127788fb137ba307d2a75421f3 SHA256 27ca4093b3abeb4ba4bf9c201f5a0588bab5af991d1dc7146b0431fb8fb43b59
+DIST wput-0.6.1.tgz 312342 RMD160 7089af96008eee036ba027e05d0936ba51d07993 SHA1 1c11d831b2403d838babe4416d4c7af434a7e300 SHA256 67125acab1d520e5d2a0429cd9cf7fc379987f30d5bbed0b0e97b92b554fcc13
 DIST wput-0.6.tgz 252823 RMD160 ebe32dd745b0d713102980268acce65aa8f41d51 SHA1 83c2a538041f667398b23611a993eafa738ab01d SHA256 98548282c031433be3222fbdadded7c1ad780137dda9bb00314ebbf5958cd4b5
+EBUILD wput-0.6.1.ebuild 1095 RMD160 cf3c63c5c489c24936cec9da40fdfd703a28cd91 SHA1 c351f90dd5fd9f0f68edd0461ffda18bb22b317a SHA256 b6c98ab94380cbeeb9da6c00c64d2fa98f8917bfd63b2b5557830c08a3a859e9
 EBUILD wput-0.6.ebuild 972 RMD160 0d774f52668dd078094d3b67964802fe64bd46b2 SHA1 a7507baf1f3a307c2cee5615325ae8ddc4b39cbd SHA256 eebd44fec82a8bf03b0b7e281a6888bfdaae362c089a51fdf738c272c93a98cd
-MISC ChangeLog 2103 RMD160 7364e0c6d01716e5d12cb500922167bcd9178220 SHA1 89e547829588e2c919f622b4c1aae65a1cfddc8d SHA256 6fcd5185d5bb1d9f850352465d20bbf3bd88d42207e83896c52d434009285fe4
+MISC ChangeLog 2259 RMD160 2f30295dd3150877db78903fa3752096612806a1 SHA1 302a33b575314bb5817eda9933403e28a7e69ab9 SHA256 8b7c23e2995eb9edb3855ea7fb692faecca838014c51dc11e58eda2f262c58d1
 MISC metadata.xml 259 RMD160 fef2d90923eca53380db43d32c61bf2ddbb746dd SHA1 e12bd9c4c1126e7a59ff94d9bd9b2a91ae1bdbc6 SHA256 ac17b4389ba9663c039d266e0b37ac6bde7799f169310ee8b4761fd492ab4c5a
diff --git a/net-misc/wput/files/wput-0.5-gentoo.diff b/net-misc/wput/files/wput-0.5-gentoo.diff
deleted file mode 100644
index f362ab45aa52..000000000000
--- a/net-misc/wput/files/wput-0.5-gentoo.diff
+++ /dev/null
@@ -1,37 +0,0 @@
-diff -urN wput.orig/Makefile.in wput/Makefile.in
---- wput.orig/Makefile.in	2004-12-12 13:40:04.146801506 -0500
-+++ wput/Makefile.in	2004-12-12 13:48:08.352295485 -0500
-@@ -1,14 +1,18 @@
- #wput makefile
-+
- prefix      = @prefix@
--mandir	    = $(prefix)/man/man1
-+datadir     = $(prefix)/share
-+mandir	    = $(datadir)/man/man1
- exec_prefix = @exec_prefix@
- bindir=@bindir@
- 
- all clean win-clean: 
- 	cd src && $(MAKE) $@
- install: all
--	cp wput $(bindir)
--	cp doc/wput.1.gz $(mandir) 
-+	install -d $(DESTDIR)$(bindir)
-+	install -m0755 wput $(DESTDIR)$(bindir)
-+	install -d $(DESTDIR)$(mandir)
-+	install -m0644 doc/wput.1.gz $(DESTDIR)$(mandir) 
- 	@echo "----------------"
- 	@echo "Wput installed. See 'wput -h' or 'man wput' for usage information."
- 	@echo "Further documentation is located in the doc/USAGE.* files."
-diff -urN wput.orig/src/ftp.c wput/src/ftp.c
---- wput.orig/src/ftp.c	2004-12-12 13:40:04.085811666 -0500
-+++ wput/src/ftp.c	2004-12-12 13:42:26.493103988 -0500
-@@ -531,7 +531,7 @@
- 
- #define DBUFSIZE 1024
- 
--	int         fd;
-+	int         fd		= -1;
- 	FILE *      pipe        = NULL;
- 	char        databuf[DBUFSIZE];
- 	int         readbytes   = 0;
diff --git a/net-misc/wput/wput-0.6.1.ebuild b/net-misc/wput/wput-0.6.1.ebuild
new file mode 100644
index 000000000000..faa23eb09028
--- /dev/null
+++ b/net-misc/wput/wput-0.6.1.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/wput/wput-0.6.1.ebuild,v 1.1 2008/02/24 16:11:37 armin76 Exp $
+
+inherit eutils
+
+DESCRIPTION="A tiny program that looks like wget and is designed to upload files or whole directories to remote ftp-servers"
+HOMEPAGE="http://wput.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tgz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+IUSE="debug nls ssl"
+
+RDEPEND="ssl? ( net-libs/gnutls )"
+DEPEND="${RDEPEND}
+		nls? ( sys-devel/gettext )"
+
+
+src_unpack() {
+	unpack "${A}"
+	cd "${S}"
+	epatch "${FILESDIR}/${PN}-0.6-gentoo.diff"
+	# Fix bug 126828
+	epatch "${FILESDIR}/wput-0.6-respectldflags.patch"
+}
+
+src_compile() {
+	local myconf
+	use debug && myconf="--enable-memdbg=yes" || myconf="--enable-g-switch=no"
+	econf ${myconf} \
+		$(use_enable nls) \
+		$(use_with ssl) || die "econf failed"
+	emake || die "emake failed"
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die "make install failed"
+	dodoc ChangeLog INSTALL TODO
+}