Use eautoreconf (#226789).

(Portage version: 2.1.6.13/cvs/Linux x86_64)

3 files changed, 319 insertions, 1 deletions

diff --git a/net-dialup/lrzsz/ChangeLog b/net-dialup/lrzsz/ChangeLog
index 1e4831250a6c..ebc1a06c6479 100644
--- a/net-dialup/lrzsz/ChangeLog
+++ b/net-dialup/lrzsz/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-dialup/lrzsz
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-dialup/lrzsz/ChangeLog,v 1.19 2009/05/09 13:27:07 mrness Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dialup/lrzsz/ChangeLog,v 1.20 2009/07/09 23:46:22 mrness Exp $
+
+*lrzsz-0.12.20-r3 (09 Jul 2009)
+
+  09 Jul 2009; Alin Năstac <mrness@gentoo.org>
+  +files/lrzsz-autotools.patch, +lrzsz-0.12.20-r3.ebuild:
+  Use eautoreconf (#226789).
 
   09 May 2009; Alin Năstac <mrness@gentoo.org> -lrzsz-0.12.20-r1.ebuild:
   Remove obsolete revision.
diff --git a/net-dialup/lrzsz/files/lrzsz-autotools.patch b/net-dialup/lrzsz/files/lrzsz-autotools.patch
new file mode 100644
index 000000000000..b76aad666d6b
--- /dev/null
+++ b/net-dialup/lrzsz/files/lrzsz-autotools.patch
@@ -0,0 +1,252 @@
+diff -Nru lrzsz-0.12.20.orig/acinclude.m4 lrzsz-0.12.20/acinclude.m4
+--- lrzsz-0.12.20.orig/acinclude.m4	1998-12-27 23:08:59.000000000 +0100
++++ lrzsz-0.12.20/acinclude.m4	2009-07-10 01:18:40.000000000 +0200
+@@ -13,7 +13,7 @@
+ lrzsz_cv_decl_errno=yes, lrzsz_cv_decl_errno=no)])
+ AC_MSG_RESULT($lrzsz_cv_decl_errno)
+ if test $lrzsz_cv_decl_errno = yes; then
+-  AC_DEFINE([HAVE_ERRNO_DECLARATION])
++  AC_DEFINE([HAVE_ERRNO_DECLARATION], 1, [[HAVE_ERRNO_DECLARATION]])
+ fi
+ ])
+ 
+@@ -57,7 +57,7 @@
+ ], ac_cv_type_speed_t=yes, ac_cv_type_speed_t=no)])dnl
+ AC_MSG_RESULT($ac_cv_type_speed_t)
+ if test $ac_cv_type_speed_t = no; then
+-  AC_DEFINE([speed_t],long)
++  AC_DEFINE([speed_t],long, [speed_t])
+ fi
+ ])
+ 
+@@ -69,7 +69,7 @@
+ #include <sys/select.h>],
+ [struct tm *tp;], lrzsz_cv_header_sys_select=yes, lrzsz_cv_header_sys_select=no)])
+ if test $lrzsz_cv_header_sys_select = no; then
+-  AC_DEFINE(SYS_TIME_WITHOUT_SYS_SELECT)
++  AC_DEFINE(SYS_TIME_WITHOUT_SYS_SELECT, 1, [SYS_TIME_WITHOUT_SYS_SELECT])
+ fi
+ ])
+ 
+diff -Nru lrzsz-0.12.20.orig/configure.in lrzsz-0.12.20/configure.in
+--- lrzsz-0.12.20.orig/configure.in	1998-12-30 08:50:07.000000000 +0100
++++ lrzsz-0.12.20/configure.in	2009-07-10 01:18:40.000000000 +0200
+@@ -33,25 +33,25 @@
+ 	[if test "$enableval" = "no" ; then 
+ 		:
+ 	  else
+-		AC_DEFINE(ENABLE_TIMESYNC)
++		AC_DEFINE(ENABLE_TIMESYNC, 1, [ENABLE_TIMESYNC])
+ 	  fi],
+-	[AC_DEFINE(ENABLE_TIMESYNC)])
++	[AC_DEFINE(ENABLE_TIMESYNC, 1, [ENABLE_TIMESYNC])])
+ AC_SUBST(ENABLE_TIMESYNC)
+ AC_ARG_ENABLE(pubdir,
+ 	[--enable-pubdir=/path   include support for a public writeable directory],
+ 	[if test "$enableval" = "no" ; then 
+ 		: 
+ 	  else 
+-	    AC_DEFINE_UNQUOTED(PUBDIR,"$enableval")
++	    AC_DEFINE_UNQUOTED(PUBDIR,"$enableval", [PUBDIR])
+ 	  fi])
+ AC_ARG_ENABLE(mkdir,
+ 	[--disable-mkdir   disable support for creating directories (lrz)],
+ 	[if test "$enableval" = "no" ; then 
+ 		:
+ 	  else
+-	  	AC_DEFINE(ENABLE_MKDIR)
++	  	AC_DEFINE(ENABLE_MKDIR, 1, [ENABLE_MKDIR])
+ 	  fi],
+-	[AC_DEFINE(ENABLE_MKDIR)])
++	[AC_DEFINE(ENABLE_MKDIR, 1, [ENABLE_MKDIR])])
+ AC_ARG_ENABLE(syslog,
+ 	[--enable-syslog=FACILITY,{force,default,optional} include syslogsupport],
+ 	[
+@@ -62,7 +62,7 @@
+ 	    *,*)
+ 			level=`echo $enableval|sed -e 's/^.*,//'`
+ 			fac=`echo $enableval|sed -e 's/,.*$//'`
+-			AC_DEFINE_UNQUOTED(ENABLE_SYSLOG,$fac)
++			AC_DEFINE_UNQUOTED(ENABLE_SYSLOG,$fac, [ENABLE_SYSLOG])
+ 			;;
+ 		*)
+ 			lookup_facility=LOG_UUCP
+@@ -70,16 +70,16 @@
+ 			;;
+ 		esac
+ 	  	if test "$level" = "force" ; then
+-		  AC_DEFINE(ENABLE_SYSLOG_FORCE)
++		  AC_DEFINE(ENABLE_SYSLOG_FORCE, 1, [ENABLE_SYSLOG_FORCE])
+ 	  	else 
+ 	  	  if test "$level" = "optional" ; then
+ 	  	    :
+ 	  	  else
+-		    AC_DEFINE(ENABLE_SYSLOG_DEFAULT)
++		    AC_DEFINE(ENABLE_SYSLOG_DEFAULT, 1, [ENABLE_SYSLOG_DEFAULT])
+ 		  fi
+ 	  	fi
+ 	  fi],[
+-		AC_DEFINE(ENABLE_SYSLOG_DEFAULT)
++		AC_DEFINE(ENABLE_SYSLOG_DEFAULT, 1, [ENABLE_SYSLOG_DEFAULT])
+ 		lookup_facility=LOG_UUCP
+ 	  ])
+ 
+@@ -90,8 +90,8 @@
+ dnl AC_PROG_MAKE_SET included in AM_INIT_AUTOMAKE
+ AC_PROG_RANLIB
+ AC_ISC_POSIX
+-AC_AIX
+-AC_MINIX
++AC_USE_SYSTEM_EXTENSIONS
++AM_GNU_GETTEXT
+ AM_C_PROTOTYPES
+ AC_C_CONST
+ AC_C_INLINE
+@@ -113,7 +113,7 @@
+ fi
+ case "$CFLAGS" in
+ *-Wstrict-prototypes*)
+-	AC_DEFINE(STRICT_PROTOTYPES)
++	AC_DEFINE(STRICT_PROTOTYPES, 1, [STRICT_PROTOTYPES])
+ 	;;
+ esac
+ 
+@@ -131,7 +131,7 @@
+ LRZSZ_HEADERS_TERM_IO
+ AC_CHECK_HEADERS(termios.h sys/termios.h termio.h sys/termio.h sgtty.h)
+ AC_CHECK_HEADERS(sys/mman.h utime.h syslog.h sys/syslog.h sys/param.h)
+-AC_CHECK_HEADERS(sys/select.h strings.h arpa/inet.h)
++AC_CHECK_HEADERS(sys/select.h strings.h locale.h arpa/inet.h)
+ 
+ dnl Checks for typedefs, structures, and compiler characteristics.
+ AC_TYPE_SIZE_T
+@@ -153,7 +153,7 @@
+ dnl AC_FUNC_UTIME_NULL
+ AC_FUNC_MMAP
+ AC_FUNC_ALLOCA
+-AC_EGREP_HEADER([struct.*utimbuf], utime.h, AC_DEFINE(HAVE_STRUCT_UTIMBUF))
++AC_EGREP_HEADER([struct.*utimbuf], utime.h, AC_DEFINE(HAVE_STRUCT_UTIMBUF, 1, [HAVE_STRUCT_UTIMBUF]))
+ 
+ AC_CHECK_FUNCS(gettimeofday settimeofday)
+ AC_CHECK_FUNCS(strchr memcpy select vprintf)
+@@ -206,10 +206,10 @@
+ lrzsz_cv_sys_ftime_ok=no,
+ lrzsz_cv_sys_ftime_ok=runtime)])
+ case $lrzsz_cv_sys_ftime_ok in
+-yes) AC_DEFINE(HAVE_FTIME) AC_MSG_RESULT(yes) ;;
++yes) AC_DEFINE(HAVE_FTIME, 1, [HAVE_FTIME]) AC_MSG_RESULT(yes) ;;
+ no)  AC_MSG_RESULT(no)
+ 	AC_MSG_WARN(ftime seems to be buggy) ;;
+-runtime) AC_DEFINE(HAVE_FTIME)
++runtime) AC_DEFINE(HAVE_FTIME, 1, [HAVE_FTIME])
+ 	AC_MSG_RESULT(will check at run time) ;;
+ esac
+ ])
+@@ -223,7 +223,7 @@
+ ])
+ if test $libquark_cv_var_timezone = yes ; then
+ 	AC_MSG_RESULT(yes)
+-	AC_DEFINE(HAVE_TIMEZONE_VAR)
++	AC_DEFINE(HAVE_TIMEZONE_VAR, 1, [HAVE_TIMEZONE_VAR])
+ else
+ 	AC_MSG_RESULT(no)
+ fi
+@@ -245,9 +245,9 @@
+ 	])
+ 	if test $lrzsz_cv_lookup_facility = yes ; then
+ 		AC_MSG_RESULT(yes)
+-		AC_DEFINE_UNQUOTED(ENABLE_SYSLOG,$lookup_facility)
++		AC_DEFINE_UNQUOTED(ENABLE_SYSLOG,$lookup_facility, [ENABLE_SYSLOG])
+ 	else
+-		AC_DEFINE(ENABLE_SYSLOG,LOG_USER)
++		AC_DEFINE(ENABLE_SYSLOG,LOG_USER, [ENABLE_SYSLOG])
+ 		AC_MSG_RESULT(no)
+ 	fi
+ fi
+@@ -257,9 +257,8 @@
+ AC_SUBST(LDFLAGS)
+ AC_SUBST(LIBS)
+ 
+-AM_GNU_GETTEXT
+ 
+-AC_DEFINE_UNQUOTED(LOCALEDIR,"$prefix/$DATADIRNAME")
++AC_DEFINE_UNQUOTED(LOCALEDIR,"$prefix/$DATADIRNAME", [LOCALEDIR])
+ AC_LINK_FILES($nls_cv_header_libgt, $nls_cv_header_intl)
+ 
+ AC_OUTPUT([Makefile intl/Makefile lib/Makefile testsuite/Makefile \
+diff -Nru lrzsz-0.12.20.orig/lib/Makefile.am lrzsz-0.12.20/lib/Makefile.am
+--- lrzsz-0.12.20.orig/lib/Makefile.am	1998-12-27 17:25:26.000000000 +0100
++++ lrzsz-0.12.20/lib/Makefile.am	2009-07-10 01:18:40.000000000 +0200
+@@ -1,5 +1,4 @@
+ noinst_LIBRARIES=libzmodem.a
+-CFLAGS=@CFLAGS@
+ AUTOMAKE_OPTIONS=ansi2knr
+ 
+ EXTRA_DIST = alloca.c ansi2knr.1 ansi2knr.c \
+diff -Nru lrzsz-0.12.20.orig/po/Makefile.in.in lrzsz-0.12.20/po/Makefile.in.in
+--- lrzsz-0.12.20.orig/po/Makefile.in.in	1998-04-26 15:22:40.000000000 +0200
++++ lrzsz-0.12.20/po/Makefile.in.in	2009-07-10 01:19:23.000000000 +0200
+@@ -51,7 +51,7 @@
+ 
+ POTFILES = \
+ 
+-CATALOGS = @CATALOGS@
++CATALOGS = de.gmo
+ CATOBJEXT = @CATOBJEXT@
+ INSTOBJEXT = @INSTOBJEXT@
+ 
+@@ -118,8 +118,8 @@
+ 	for cat in $$catalogs; do \
+ 	  cat=`basename $$cat`; \
+ 	  case "$$cat" in \
+-	    *.gmo) destdir=$(gnulocaledir);; \
+-	    *)     destdir=$(localedir);; \
++	    *.gmo) destdir=$(DESTDIR)$(gnulocaledir);; \
++	    *)     destdir=$(DESTDIR)$(localedir);; \
+ 	  esac; \
+ 	  lang=`echo $$cat | sed 's/\$(CATOBJEXT)$$//'`; \
+ 	  dir=$$destdir/$$lang/LC_MESSAGES; \
+diff -Nru lrzsz-0.12.20.orig/src/Makefile.am lrzsz-0.12.20/src/Makefile.am
+--- lrzsz-0.12.20.orig/src/Makefile.am	1998-12-28 09:38:47.000000000 +0100
++++ lrzsz-0.12.20/src/Makefile.am	2009-07-10 01:18:40.000000000 +0200
+@@ -4,7 +4,6 @@
+ noinst_HEADERS = timing.h zglobal.h zmodem.h
+ datadir = $(prefix)/@DATADIRNAME@
+ localedir = $(datadir)/locale
+-CFLAGS=@CFLAGS@
+ DISTCLEAN_FILES=lrzszbug
+ 
+ LDADD = ../lib/libzmodem.a @INTLLIBS@
+@@ -14,22 +13,16 @@
+ #DEFS = -DLOCALEDIR=\"$(localedir)\" -DOS=\"@host_os@\" -DCPU=\"@host_cpu@\"
+ DEFS = -DNFGVMIN @DEFS@ -DLOCALEDIR=\"$(localedir)\"
+ 
+-install-exec-local:
+-	rm -f $(DESTDIR)/$(bindir)/`echo lsb | sed -e '$(transform)'`
+-	ln $(DESTDIR)/$(bindir)/`echo lsz |sed -e '$(transform)'` \
+-		$(DESTDIR)/$(bindir)/`echo lsb |sed -e '$(transform)'` 
+-	rm -f $(bindir)/`echo lsx | sed -e '$(transform)'`
+-	ln $(DESTDIR)/$(bindir)/`echo lsz |sed -e '$(transform)'` \
+-		$(DESTDIR)/$(bindir)/`echo lsx |sed -e '$(transform)'` 
+-	rm -f $(bindir)/`echo lrb | sed -e '$(transform)'`
+-	ln $(DESTDIR)/$(bindir)/`echo lrz |sed -e '$(transform)'` \
+-		$(DESTDIR)/$(bindir)/`echo lrb |sed -e '$(transform)'` 
+-	rm -f $(bindir)/`echo lrx | sed -e '$(transform)'`
+-	ln $(DESTDIR)/$(bindir)/`echo lrz |sed -e '$(transform)'` \
+-		$(DESTDIR)/$(bindir)/`echo lrx |sed -e '$(transform)'` 
+-#	rm -f $(bindir)/`echo lrzszbug | sed -e '$(transform)'`
+-#	ln $(bindir)/`echo lrzszbug |sed -e '$(transform)'` \
+-#		$(bindir)/`echo lrzszbug |sed -e '$(transform)'` 
++# Caveat: program name transformation is ignored here.
++$(DESTDIR)$(bindir)/lsz $(DESTDIR)$(bindir)/lrz: install-binPROGRAMS
++
++$(DESTDIR)$(bindir)/lsb $(DESTDIR)$(bindir)/lsx: $(DESTDIR)$(bindir)/lsz
++	rm -f $@ ; ln -s `basename $<` $@
++
++$(DESTDIR)$(bindir)/lrb $(DESTDIR)$(bindir)/lrx: $(DESTDIR)$(bindir)/lrz
++	rm -f $@ ; ln -s `basename $<` $@
++
++install-exec-local: $(DESTDIR)$(bindir)/lsb $(DESTDIR)$(bindir)/lsx $(DESTDIR)$(bindir)/lrb $(DESTDIR)$(bindir)/lrx
+ 
+ uninstall-local:
+ 	rm -f $(DESTDIR)/$(bindir)/`echo lsb |sed -e '$(transform)'` 
diff --git a/net-dialup/lrzsz/lrzsz-0.12.20-r3.ebuild b/net-dialup/lrzsz/lrzsz-0.12.20-r3.ebuild
new file mode 100644
index 000000000000..d9f3bcf635ea
--- /dev/null
+++ b/net-dialup/lrzsz/lrzsz-0.12.20-r3.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-dialup/lrzsz/lrzsz-0.12.20-r3.ebuild,v 1.1 2009/07/09 23:46:22 mrness Exp $
+
+EAPI="2"
+
+inherit autotools flag-o-matic eutils toolchain-funcs
+
+DESCRIPTION="Communication package providing the X, Y, and ZMODEM file transfer protocols"
+HOMEPAGE="http://www.ohse.de/uwe/software/lrzsz.html"
+SRC_URI="http://www.ohse.de/uwe/releases/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
+IUSE="nls"
+
+DEPEND="nls? ( virtual/libintl )"
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${PN}-autotools.patch
+	epatch "${FILESDIR}"/${PN}-implicit-decl.patch
+
+	# automake is unhappy if this is missing
+	>> config.rpath
+	# This is too old.  Remove it so automake puts in a newer copy.
+	rm -f missing
+	# Autoheader does not like seeing this file.
+	rm -f acconfig.h
+
+	eautoreconf
+}
+
+src_configure() {
+	tc-export CC
+	append-flags -Wstrict-prototypes
+	econf $(use_enable nls) || die "econf failed"
+}
+
+src_test() {
+	#Don't use check target.
+	#See bug #120748 before changing this function.
+	make vcheck || die "tests failed"
+}
+
+src_install() {
+	emake \
+		DESTDIR="${D}" \
+		install || die "make install failed"
+
+	local x
+	for x in {r,s}{b,x,z} ; do
+		dosym l${x} /usr/bin/${x}
+		dosym l${x:0:1}z.1 /usr/share/man/man1/${x}.1
+		[ "${x:1:1}" = "z" ] || dosym l${x:0:1}z.1 /usr/share/man/man1/l${x}.1
+	done
+
+	dodoc AUTHORS COMPATABILITY ChangeLog NEWS README* THANKS TODO
+}