Fix build with libtool 2.4 by patching up the build system to work with automake 1.11; dependency tracking is broken though, so make sure to hard-disable it (we don't need it anyway). Also make it more obvious that libtool is a _runtime_ dependency for this package.

(Portage version: 2.2.0_alpha6/cvs/Linux x86_64)

3 files changed, 162 insertions, 8 deletions

diff --git a/net-analyzer/ettercap/ChangeLog b/net-analyzer/ettercap/ChangeLog
index df8529d0ac66..a4b7a588cdea 100644
--- a/net-analyzer/ettercap/ChangeLog
+++ b/net-analyzer/ettercap/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-analyzer/ettercap
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/ettercap/ChangeLog,v 1.76 2009/10/17 18:27:12 hwoarang Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/ettercap/ChangeLog,v 1.77 2010/12/01 06:04:16 flameeyes Exp $
+
+  01 Dec 2010; Diego E. Pettenò <flameeyes@gentoo.org>
+  ettercap-0.7.3-r4.ebuild, +files/ettercap-0.7.3-autotools.patch:
+  Fix build with libtool 2.4 by patching up the build system to work with
+  automake 1.11; dependency tracking is broken though, so make sure to
+  hard-disable it (we don't need it anyway). Also make it more obvious that
+  libtool is a _runtime_ dependency for this package.
 
 *ettercap-0.7.3-r4 (17 Oct 2009)
 
diff --git a/net-analyzer/ettercap/ettercap-0.7.3-r4.ebuild b/net-analyzer/ettercap/ettercap-0.7.3-r4.ebuild
index 2439f4ba11b7..b0a46b4cdddf 100644
--- a/net-analyzer/ettercap/ettercap-0.7.3-r4.ebuild
+++ b/net-analyzer/ettercap/ettercap-0.7.3-r4.ebuild
@@ -1,15 +1,12 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/ettercap/ettercap-0.7.3-r4.ebuild,v 1.1 2009/10/17 18:27:12 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/ettercap/ettercap-0.7.3-r4.ebuild,v 1.2 2010/12/01 06:04:16 flameeyes Exp $
 
 # the actual version is "NG-0.7.0" but I suppose portage people will not be
 # happy with it (as for the 0.6.b version), so let's set it to "0.7.0".
 # since 'ettercap NG' has to be intended as an upgrade to 0.6.x series and not as
 # a new project or branch, this will be fine...
 
-WANT_AUTOMAKE="1.8"
-
-# libtool is needed because it provides libltdl (needed for plugins)
 inherit autotools flag-o-matic libtool
 
 MY_P="${PN}-NG-${PV}"
@@ -22,8 +19,10 @@ SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
 IUSE="debug gtk ncurses ssl"
 
+# libtool is needed because it provides libltdl (needed for plugins)
 RDEPEND=">=net-libs/libnet-1.1.2.1-r1
 	net-libs/libpcap
+	sys-devel/libtool
 	ncurses? ( sys-libs/ncurses )
 	ssl? ( dev-libs/openssl )
 	gtk? ( >=x11-libs/gtk+-2.2.2 )"
@@ -40,6 +39,7 @@ src_unpack() {
 	#patch from Timothy Redaelli <timothy@redaelli.eu> which fixes crash
 	# on 64bit CPU systems
 	epatch "${FILESDIR}"/${P}-64bit-casting.patch
+	epatch "${FILESDIR}"/${P}-autotools.patch
 	eautoreconf
 }
 
@@ -55,7 +55,9 @@ src_compile() {
 		myconf="${myconf} --without-openssl"
 	fi
 
-	econf ${myconf} \
+	econf \
+		--disable-dependency-tracking \
+		${myconf} \
 		$(use_enable gtk) \
 		$(use_enable debug) \
 		$(use_with ncurses)
diff --git a/net-analyzer/ettercap/files/ettercap-0.7.3-autotools.patch b/net-analyzer/ettercap/files/ettercap-0.7.3-autotools.patch
new file mode 100644
index 000000000000..6a7a0145ff03
--- /dev/null
+++ b/net-analyzer/ettercap/files/ettercap-0.7.3-autotools.patch
@@ -0,0 +1,145 @@
+Index: ettercap-NG-0.7.3/configure.in
+===================================================================
+--- ettercap-NG-0.7.3.orig/configure.in
++++ ettercap-NG-0.7.3/configure.in
+@@ -20,7 +20,7 @@ dnl
+ dnl    $Id: ettercap-0.7.3-autotools.patch,v 1.1 2010/12/01 06:04:16 flameeyes Exp $
+ dnl
+ 
+-AC_INIT
++AC_INIT(ettercap, 0.7.3)
+ AC_CONFIG_SRCDIR([include/ec.h])
+ 
+ dnl Force autoconf 2.57 
+@@ -32,16 +32,8 @@ dnl AM_INIT_AUTOMAKE(1.7.0)
+ dnl Do not recompile configure Makefile et similia
+ AM_MAINTAINER_MODE
+ 
+-VERSION=`grep EC_VERSION\  ./include/ec_version.h | cut -f2 -d"\""`
+-SB=`./shtool echo -n -e %B`
+-EB=`./shtool echo -n -e %b`
+-AC_SUBST(SB)
+-AC_SUBST(EB)
+-AC_SUBST(VERSION)
+-EC_MESSAGE(Configuring ettercap $VERSION)
+-
+ AC_CONFIG_SRCDIR(src)
+-AM_INIT_AUTOMAKE(ettercap, $VERSION)
++AM_INIT_AUTOMAKE([subdir-objects])
+ 
+ AC_CONFIG_HEADERS([include/config.h])
+ dnl AC_CONFIG_HEADERS(include/config.h)
+@@ -282,29 +274,18 @@ EC_MESSAGE(Checking for missing function
+ 
+ AC_CONFIG_LIBOBJ_DIR(src/missing)
+ 
+-AM_CONDITIONAL(MISSING_STRLCPY, false)
+-AM_CONDITIONAL(MISSING_STRLCAT, false)
+-AM_CONDITIONAL(MISSING_STRSEP, false)
+-AM_CONDITIONAL(MISSING_MEMMEM, false)
+-AM_CONDITIONAL(MISSING_MEMCMP, false)
+-AM_CONDITIONAL(MISSING_BASENAME, false)
+-AM_CONDITIONAL(MISSING_GETOPT_LONG, false)
+-AM_CONDITIONAL(MISSING_STRCASESTR, false)
+-AM_CONDITIONAL(MISSING_INET_ATON, false)
+-AM_CONDITIONAL(MISSING_SCANDIR, false)
+-
+ dnl AC_REPLACE_FUNCS(strlcpy)
+ 
+-AC_CHECK_FUNCS([strlcpy], , [AC_LIBOBJ(missing/strlcpy) AM_CONDITIONAL(MISSING_STRLCPY, true)])
+-AC_CHECK_FUNCS([strlcat], , [AC_LIBOBJ(missing/strlcat) AM_CONDITIONAL(MISSING_STRLCAT, true)])
+-AC_CHECK_FUNCS([strsep], , [AC_LIBOBJ(missing/strsep) AM_CONDITIONAL(MISSING_STRSEP, true)])
+-AC_CHECK_FUNCS([memmem], , [AC_LIBOBJ(missing/memmem) AM_CONDITIONAL(MISSING_MEMMEM, true)])
+-AC_CHECK_FUNCS([memcmp], , [AC_LIBOBJ(missing/memcmp) AM_CONDITIONAL(MISSING_MEMCMP, true)])
+-AC_CHECK_FUNCS([basename], , [AC_LIBOBJ(missing/basename) AM_CONDITIONAL(MISSING_BASENAME, true)])
+-AC_CHECK_FUNCS([getopt_long], , [AC_LIBOBJ(missing/getopt) AM_CONDITIONAL(MISSING_GETOPT_LONG, true)])
+-AC_CHECK_FUNCS([strcasestr], , [AC_LIBOBJ(missing/strcasestr) AM_CONDITIONAL(MISSING_STRCASESTR, true)])
+-AC_CHECK_FUNCS([scandir], , [AC_LIBOBJ(missing/scandir) AM_CONDITIONAL(MISSING_SCANDIR, true)])
+-AC_CHECK_FUNCS([inet_aton], , [AC_LIBOBJ(missing/inet_aton) AM_CONDITIONAL(MISSING_INET_ATON, true)])
++AC_CHECK_FUNCS([strlcpy], , [AC_LIBOBJ(strlcpy)])
++AC_CHECK_FUNCS([strlcat], , [AC_LIBOBJ(strlcat)])
++AC_CHECK_FUNCS([strsep], , [AC_LIBOBJ(strsep)])
++AC_CHECK_FUNCS([memmem], , [AC_LIBOBJ(memmem)])
++AC_CHECK_FUNCS([memcmp], , [AC_LIBOBJ(memcmp)])
++AC_CHECK_FUNCS([basename], , [AC_LIBOBJ(basename)])
++AC_CHECK_FUNCS([getopt_long], , [AC_LIBOBJ(getopt)])
++AC_CHECK_FUNCS([strcasestr], , [AC_LIBOBJ(strcasestr)])
++AC_CHECK_FUNCS([scandir], , [AC_LIBOBJ(scandir)])
++AC_CHECK_FUNCS([inet_aton], , [AC_LIBOBJ(inet_aton)])
+ 
+ AC_CHECK_LIB(resolv, inet_aton,
+    AM_CONDITIONAL(INET_ATON_WANTS_RESOLV, true), 
+Index: ettercap-NG-0.7.3/utils/etterlog/Makefile.am
+===================================================================
+--- ettercap-NG-0.7.3.orig/utils/etterlog/Makefile.am
++++ ettercap-NG-0.7.3/utils/etterlog/Makefile.am
+@@ -30,32 +30,10 @@ etterlog_SOURCES = el_analyze.c \
+                    $(top_srcdir)/src/ec_passive.c \
+                    $(top_srcdir)/src/ec_strings.c \
+                    $(top_srcdir)/src/ec_format.c
+-                   
+-if MISSING_STRSEP
+-   etterlog_SOURCES += $(top_srcdir)/src/missing/strsep.c
+-endif
+-if MISSING_STRLCAT
+-   etterlog_SOURCES += $(top_srcdir)/src/missing/strlcat.c
+-endif
+-if MISSING_STRCASESTR
+-   etterlog_SOURCES += $(top_srcdir)/src/missing/strcasestr.c
+-endif
+-if MISSING_MEMMEM
+-   etterlog_SOURCES += $(top_srcdir)/src/missing/memmem.c
+-endif
+-if MISSING_BASENAME
+-   etterlog_SOURCES += $(top_srcdir)/src/missing/basename.c
+-endif
+-if MISSING_INET_ATON
+-   etterlog_SOURCES += $(top_srcdir)/src/missing/inet_aton.c
+-endif
+-if MISSING_GETOPT_LONG
+-   etterlog_SOURCES += $(top_srcdir)/src/missing/getopt.c
+-endif
+ 
+ etterlog_CFLAGS = @EC_CFLAGS@
+ 
+-etterlog_LDADD = -lz @ICONVLIB@
++etterlog_LDADD = -lz @ICONVLIB@ @LIBOBJS@
+ 
+ if INET_ATON_WANTS_RESOLV
+    etterlog_LDADD += -lresolv
+Index: ettercap-NG-0.7.3/utils/etterfilter/Makefile.am
+===================================================================
+--- ettercap-NG-0.7.3.orig/utils/etterfilter/Makefile.am
++++ ettercap-NG-0.7.3/utils/etterfilter/Makefile.am
+@@ -26,22 +26,6 @@ etterfilter_SOURCES = ef_compiler.c \
+                       $(top_srcdir)/src/ec_strings.c
+ 
+ noinst_HEADERS = ef_grammar.h
+-                   
+-if MISSING_STRSEP
+-   etterfilter_SOURCES += $(top_srcdir)/src/missing/strsep.c
+-endif
+-if MISSING_STRLCPY
+-   etterfilter_SOURCES += $(top_srcdir)/src/missing/strlcpy.c
+-endif
+-if MISSING_MEMMEM
+-   etterfilter_SOURCES += $(top_srcdir)/src/missing/memmem.c
+-endif
+-if MISSING_INET_ATON
+-   etterfilter_SOURCES += $(top_srcdir)/src/missing/inet_aton.c
+-endif
+-if MISSING_GETOPT_LONG
+-   etterfilter_SOURCES += $(top_srcdir)/src/missing/getopt.c
+-endif
+ 
+ etterfilter_CFLAGS = @EC_CFLAGS@
+ 
+@@ -49,7 +33,7 @@ if BSD
+    etterfilter_CFLAGS += -pthread
+ endif
+    
+-etterfilter_LDADD = 
++etterfilter_LDADD = @LIBOBJS@
+ 
+ if INET_ATON_WANTS_RESOLV
+    etterfilter_LDADD += -lresolv