Patch src/Makefile.in instead of src/Makefile.am to avoid having to run autoconf, thus fixing bug #159088.

Package-Manager: portage-2.1.2_rc4-r1

3 files changed, 57 insertions, 8 deletions

diff --git a/mail-filter/bogofilter/ChangeLog b/mail-filter/bogofilter/ChangeLog
index 0988374ac7de..1008046c77d5 100644
--- a/mail-filter/bogofilter/ChangeLog
+++ b/mail-filter/bogofilter/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for mail-filter/bogofilter
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/mail-filter/bogofilter/ChangeLog,v 1.78 2006/12/26 21:25:40 ticho Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-filter/bogofilter/ChangeLog,v 1.79 2006/12/26 22:49:36 ticho Exp $
+
+  26 Dec 2006; Andrej Kacian <ticho@gentoo.org>
+  -files/1.1.3-patch.1142.Makefile.am, +files/1.1.3-patch.1142.Makefile.in,
+  bogofilter-1.1.3.ebuild:
+  Patch src/Makefile.in instead of src/Makefile.am to avoid having to run
+  autoconf, thus fixing bug #159088.
 
   26 Dec 2006; Andrej Kacian <ticho@gentoo.org> bogofilter-1.1.3.ebuild:
   Revert last change, this was not a proper fix.
diff --git a/mail-filter/bogofilter/bogofilter-1.1.3.ebuild b/mail-filter/bogofilter/bogofilter-1.1.3.ebuild
index 9b8012dcb88d..b396f125c022 100644
--- a/mail-filter/bogofilter/bogofilter-1.1.3.ebuild
+++ b/mail-filter/bogofilter/bogofilter-1.1.3.ebuild
@@ -1,11 +1,8 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-filter/bogofilter/bogofilter-1.1.3.ebuild,v 1.4 2006/12/26 21:25:40 ticho Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-filter/bogofilter/bogofilter-1.1.3.ebuild,v 1.5 2006/12/26 22:49:36 ticho Exp $
 
-WANT_AUTOCONF=latest
-WANT_AUTOMAKE=latest
-
-inherit eutils autotools
+inherit eutils
 
 DESCRIPTION="Bayesian spam filter designed with fast algorithms, and tuned for speed."
 HOMEPAGE="http://bogofilter.sourceforge.net/"
@@ -27,8 +24,7 @@ DEPEND="virtual/libiconv
 src_unpack() {
 	unpack ${A}
 	cd "${S}"
-	epatch "${FILESDIR}"/1.1.3-patch.1142.Makefile.am
-	eautomake
+	epatch "${FILESDIR}"/1.1.3-patch.1142.Makefile.in
 }
 
 src_compile() {
diff --git a/mail-filter/bogofilter/files/1.1.3-patch.1142.Makefile.in b/mail-filter/bogofilter/files/1.1.3-patch.1142.Makefile.in
new file mode 100644
index 000000000000..9d284e0fbf17
--- /dev/null
+++ b/mail-filter/bogofilter/files/1.1.3-patch.1142.Makefile.in
@@ -0,0 +1,47 @@
+diff -burN bogofilter-1.1.3.orig/src/Makefile.in bogofilter-1.1.3/src/Makefile.in
+--- bogofilter-1.1.3.orig/src/Makefile.in	2006-12-26 23:14:36.000000000 +0100
++++ bogofilter-1.1.3/src/Makefile.in	2006-12-26 23:20:13.000000000 +0100
+@@ -496,19 +496,7 @@
+ @ENABLE_MEMDEBUG_TRUE@MEMDEBUG_SRC = memdebug.c memdebug.h
+ noinst_LIBRARIES = libbogofilter.a $(am__append_1) $(am__append_4) \
+ 	$(am__append_9)
+-@NEED_GSL_TRUE@libbf_gsl_a_CFLAGS = $(AM_CFLAGS) -DRENAMEFILES
+-@NEED_GSL_TRUE@libbf_gsl_a_SOURCES = \
+-@NEED_GSL_TRUE@../gsl/cdf/chisq.c ../gsl/cdf/gamma.c \
+-@NEED_GSL_TRUE@../gsl/specfunc/gamma_inc.c ../gsl/err/error.c \
+-@NEED_GSL_TRUE@../gsl/sys/infnan.c ../gsl/sys/fdiv.c \
+-@NEED_GSL_TRUE@../gsl/specfunc/exp.c ../gsl/specfunc/trig.c \
+-@NEED_GSL_TRUE@../gsl/specfunc/log.c ../gsl/specfunc/psi.c \
+-@NEED_GSL_TRUE@../gsl/specfunc/zeta.c ../gsl/specfunc/elementary.c \
+-@NEED_GSL_TRUE@../gsl/err/stream.c ../gsl/specfunc/expint.c \
+-@NEED_GSL_TRUE@../gsl/specfunc/erfc.c ../gsl/sys/coerce.c \
+-@NEED_GSL_TRUE@../gsl/sys/pow_int.c ../gsl/sys/minmax.c
+ 
+-@NEED_GSL_TRUE@libbf_gsl_a_CPPFLAGS = -I$(top_srcdir)
+ @USE_GCC4_FALSE@AM_CPPFLAGS = -I$(top_srcdir)/gnugetopt -I$(top_srcdir)/trio -I- -I. \
+ @USE_GCC4_FALSE@	      -I$(srcdir) @GSL_CFLAGS@ -I$(top_srcdir)/gsl/specfunc -I$(top_srcdir)
+ 
+@@ -527,6 +515,23 @@
+ bogofilter_LDADD = $(LDADD) $(LIBDB) $(GSL_LIBS)
+ bogoutil_LDADD = $(LDADD) $(LIBDB)
+ configtest_LDADD = $(LDADD) $(LIBDB)
++bogofilter_DEPENDENCIES = $(LDADD)
++
++@NEED_GSL_TRUE@libbf_gsl_a_CFLAGS = $(AM_CFLAGS) -DRENAMEFILES
++@NEED_GSL_TRUE@libbf_gsl_a_SOURCES = \
++@NEED_GSL_TRUE@../gsl/cdf/chisq.c ../gsl/cdf/gamma.c \
++@NEED_GSL_TRUE@../gsl/specfunc/gamma_inc.c ../gsl/err/error.c \
++@NEED_GSL_TRUE@../gsl/sys/infnan.c ../gsl/sys/fdiv.c \
++@NEED_GSL_TRUE@../gsl/specfunc/exp.c ../gsl/specfunc/trig.c \
++@NEED_GSL_TRUE@../gsl/specfunc/log.c ../gsl/specfunc/psi.c \
++@NEED_GSL_TRUE@../gsl/specfunc/zeta.c ../gsl/specfunc/elementary.c \
++@NEED_GSL_TRUE@../gsl/err/stream.c ../gsl/specfunc/expint.c \
++@NEED_GSL_TRUE@../gsl/specfunc/erfc.c ../gsl/sys/coerce.c \
++@NEED_GSL_TRUE@../gsl/sys/pow_int.c ../gsl/sys/minmax.c
++
++@NEED_GSL_TRUE@libbf_gsl_a_CPPFLAGS = -I$(top_srcdir)
++@NEED_GSL_TRUE@bogofilter_DEPENDENCIES += libbf_gsl.a
++
+ panicenv_SOURCES = panicenv.c
+ panicenv_LDADD = $(LIBDB)
+ @NEEDTRIO_TRUE@libtrio_a_SOURCES = ../trio/triostr.c ../trio/trio.c ../trio/trionan.c \