Fix gcc-3.4 compile error - bug #324405. Thanks to Roman Barczyński

(Portage version: 2.1.10/cvs/Linux x86_64)

3 files changed, 39 insertions, 5 deletions

diff --git a/mail-filter/bogofilter/ChangeLog b/mail-filter/bogofilter/ChangeLog
index ac33c99a678a..6694c8e49f46 100644
--- a/mail-filter/bogofilter/ChangeLog
+++ b/mail-filter/bogofilter/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for mail-filter/bogofilter
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/mail-filter/bogofilter/ChangeLog,v 1.138 2010/10/11 07:39:08 tove Exp $
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/mail-filter/bogofilter/ChangeLog,v 1.139 2011/06/10 12:32:39 eras Exp $
+
+  10 Jun 2011; Eray Aslan <eras@gentoo.org> bogofilter-1.2.2.ebuild,
+  +files/bogofilter-1.2.2-gcc34.patch:
+  Fix gcc-3.4 compile error - bug #324405. Thanks to Roman Barczyński.
 
   11 Oct 2010; Torsten Veller <tove@gentoo.org> bogofilter-1.2.2.ebuild:
   Bump EAPI for has_version atoms (#340473)
diff --git a/mail-filter/bogofilter/bogofilter-1.2.2.ebuild b/mail-filter/bogofilter/bogofilter-1.2.2.ebuild
index 9b1d47b4d46b..a160a75eaeca 100644
--- a/mail-filter/bogofilter/bogofilter-1.2.2.ebuild
+++ b/mail-filter/bogofilter/bogofilter-1.2.2.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-filter/bogofilter/bogofilter-1.2.2.ebuild,v 1.7 2010/10/11 07:39:08 tove Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-filter/bogofilter/bogofilter-1.2.2.ebuild,v 1.8 2011/06/10 12:32:39 eras Exp $
 
 EAPI=2
 
-inherit db-use flag-o-matic
+inherit db-use flag-o-matic toolchain-funcs
 
 DESCRIPTION="Bayesian spam filter designed with fast algorithms, and tuned for speed."
 HOMEPAGE="http://bogofilter.sourceforge.net/"
@@ -26,6 +26,7 @@ DEPEND="virtual/libiconv
 	)
 	sci-libs/gsl"
 #	app-arch/pax" # only needed for bf_tar
+RDEPEND="${DEPEND}"
 
 pkg_setup() {
 	has_version mail-filter/bogofilter || return 0
@@ -76,6 +77,11 @@ src_configure() {
 		append-flags "-I$(db_includedir)"
 	fi
 
+	# bug #324405
+	if [[ $(gcc-version) == "3.4" ]] ; then
+		epatch "${FILESDIR}"/${P}-gcc34.patch
+	fi
+
 	econf ${myconf} || die "configure failed"
 }
 
diff --git a/mail-filter/bogofilter/files/bogofilter-1.2.2-gcc34.patch b/mail-filter/bogofilter/files/bogofilter-1.2.2-gcc34.patch
new file mode 100644
index 000000000000..80e4d787cf87
--- /dev/null
+++ b/mail-filter/bogofilter/files/bogofilter-1.2.2-gcc34.patch
@@ -0,0 +1,24 @@
+diff -ruN bogofilter-1.2.1-orig/src/Makefile.am bogofilter-1.2.1/src/Makefile.am
+--- bogofilter-1.2.1-orig/src/Makefile.am	2009-05-28 22:59:05.000000000 +0200
++++ bogofilter-1.2.1/src/Makefile.am	2010-06-16 22:52:36.000000000 +0200
+@@ -16,7 +16,7 @@
+ AM_CPPFLAGS = -iquote$(top_srcdir)/gnugetopt -iquote$(top_srcdir)/trio \
+ 	      -I$(srcdir) @GSL_CFLAGS@ -I$(top_srcdir)/gsl/specfunc -I$(top_srcdir)
+ else
+-AM_CPPFLAGS = -I$(top_srcdir)/gnugetopt -I$(top_srcdir)/trio -I- -I. \
++AM_CPPFLAGS = -I$(top_srcdir)/gnugetopt -I$(top_srcdir)/trio -I. \
+ 	      -I$(srcdir) @GSL_CFLAGS@ -I$(top_srcdir)/gsl/specfunc -I$(top_srcdir)
+ endif
+ 
+diff -ruN bogofilter-1.2.1-orig/src/Makefile.in bogofilter-1.2.1/src/Makefile.in
+--- bogofilter-1.2.1-orig/src/Makefile.in	2009-08-01 21:00:51.000000000 +0200
++++ bogofilter-1.2.1/src/Makefile.in	2010-06-16 22:52:23.000000000 +0200
+@@ -483,7 +483,7 @@
+ @ENABLE_MEMDEBUG_TRUE@MEMDEBUG_SRC = memdebug.c memdebug.h
+ noinst_LIBRARIES = libbogofilter.a $(am__append_3) $(am__append_5) \
+ 	$(am__append_10)
+-@USE_GCC4_FALSE@AM_CPPFLAGS = -I$(top_srcdir)/gnugetopt -I$(top_srcdir)/trio -I- -I. \
++@USE_GCC4_FALSE@AM_CPPFLAGS = -I$(top_srcdir)/gnugetopt -I$(top_srcdir)/trio -I. \
+ @USE_GCC4_FALSE@	      -I$(srcdir) @GSL_CFLAGS@ -I$(top_srcdir)/gsl/specfunc -I$(top_srcdir)
+ 
+ @USE_GCC4_TRUE@AM_CPPFLAGS = -iquote$(top_srcdir)/gnugetopt -iquote$(top_srcdir)/trio \