Fixes parallel make failure with included gsl (bug #112638).

Package-Manager: portage-2.1.2_rc3

diff --git a/mail-filter/bogofilter/ChangeLog b/mail-filter/bogofilter/ChangeLog
index 1aa0344a27142076eb87ac8180739ca364c296b7..e054b16a3ea96fd3a8fe4570976ea1d4d8afc15a 100644 (file)
--- a/mail-filter/bogofilter/ChangeLog
+++ b/mail-filter/bogofilter/ChangeLog
@@ -1,6 +1,11 @@
 # 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.75 2006/12/03 14:35:18 tove Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-filter/bogofilter/ChangeLog,v 1.76 2006/12/09 15:48:01 tove Exp $
+
+  09 Dec 2006; Torsten Veller <tove@gentoo.org>
+  +files/1.1.3-patch.1142.Makefile.am, bogofilter-1.1.3.ebuild:
+  Fixes parallel make failure with included gsl (bug #112638). Thanks to
+  Martin von Gagern and David Relson.
 
 *bogofilter-1.1.3 (03 Dec 2006)
 

diff --git a/mail-filter/bogofilter/Manifest b/mail-filter/bogofilter/Manifest
index 6edcfeaac00648f2097bb14c77895ae36e37ad90..91826bf697852697f901d1c1a7d642818e776a6f 100644 (file)
--- a/mail-filter/bogofilter/Manifest
+++ b/mail-filter/bogofilter/Manifest
@@ -5,25 +5,29 @@ AUX 1.1.1-patch.1107.lexer_v3_l 755 RMD160 2ff3ee1f380d56e45e4f1387ad78bef328c77
 MD5 b8a43b91ab58487dd09e5b0b85617dfc files/1.1.1-patch.1107.lexer_v3_l 755
 RMD160 2ff3ee1f380d56e45e4f1387ad78bef328c770f2 files/1.1.1-patch.1107.lexer_v3_l 755
 SHA256 7b6710873a76acba298b02772f37ae0fc9dda08d6ee7b5547a2e6e0a3591c719 files/1.1.1-patch.1107.lexer_v3_l 755
+AUX 1.1.3-patch.1142.Makefile.am 2028 RMD160 20fb02ece013acadd401611e64ceb64b3fb0735e SHA1 56561dfc261eac47b15d2d030bfdb4366636818c SHA256 4d0d3a2412e9a326700cf47e71bae4dce8ca22d0a72eacf631f0e3f549c35886
+MD5 bf36683b11f6fc4ead47e3be5c27610d files/1.1.3-patch.1142.Makefile.am 2028
+RMD160 20fb02ece013acadd401611e64ceb64b3fb0735e files/1.1.3-patch.1142.Makefile.am 2028
+SHA256 4d0d3a2412e9a326700cf47e71bae4dce8ca22d0a72eacf631f0e3f549c35886 files/1.1.3-patch.1142.Makefile.am 2028
 DIST bogofilter-0.92.8.tar.bz2 637420 RMD160 72b3d7426fca787fcb774b8d6c540a4668796e35 SHA1 ffaf181f71dfee7d4475d5c20fed4a8f50a3e7c4 SHA256 1f2f103b9e0038f789f842ecad11805bb8277f701b747ec3e851b02d3ebfc807
 DIST bogofilter-1.1.1.tar.bz2 790929 RMD160 0510317b5cac1197dc99e837b0fc67471422c9d3 SHA1 5c88e00f0b8415eb6a9b4274f5a4a335639a40b9 SHA256 98684dd687139af5c04ed73c3c64016f7ec9e951da8d435d9666a9a036099fa5
 DIST bogofilter-1.1.3.tar.bz2 798238 RMD160 78b778d3437e6bebaac0502e2e23166b87a1c2e4 SHA1 df20fb72b8b1d2535015fc339cfa58fa449ba0e2 SHA256 7219d5d2949fc7a956cf9a31fc84d085138c167634f846239488d1f518f12955
-EBUILD bogofilter-0.92.8.ebuild 1629 RMD160 b6cf5e8ff7e8ffe569e1cbd629888e8e0c391c88 SHA1 099a853f4ae264729fa87da36acb4db4af3c8870 SHA256 744cf13b10fb1e4af12896d385b1a29c9dc2d9bddd43da06215f30dc13f96e12
-MD5 f41e22ab3c5f16112d9b429963069f98 bogofilter-0.92.8.ebuild 1629
-RMD160 b6cf5e8ff7e8ffe569e1cbd629888e8e0c391c88 bogofilter-0.92.8.ebuild 1629
-SHA256 744cf13b10fb1e4af12896d385b1a29c9dc2d9bddd43da06215f30dc13f96e12 bogofilter-0.92.8.ebuild 1629
+EBUILD bogofilter-0.92.8.ebuild 1617 RMD160 50c7628653cf37f28aac07b0f8a2022bf230e08a SHA1 32f58c2423584c37b185bb87fe379db21cf8e15d SHA256 0e859f805a67b9cea882fe5b60d4dd11b70eeff72f58c5cf95e6a0cdba9b5d29
+MD5 ef1740d2a5bbfdab78c56256134f1513 bogofilter-0.92.8.ebuild 1617
+RMD160 50c7628653cf37f28aac07b0f8a2022bf230e08a bogofilter-0.92.8.ebuild 1617
+SHA256 0e859f805a67b9cea882fe5b60d4dd11b70eeff72f58c5cf95e6a0cdba9b5d29 bogofilter-0.92.8.ebuild 1617
 EBUILD bogofilter-1.1.1-r1.ebuild 2235 RMD160 d4eae2c80ce6e0b59aaf23a9cafeac0f7e7fccb1 SHA1 f0a09c099e758685cc649d7df6dc3318507393a1 SHA256 8cf949da0034adbb651770eb3234c163ad54e4a504640ad5bd6a3ef1ad26ea99
 MD5 c59bc8750b3080a7bafcba6e9de29a28 bogofilter-1.1.1-r1.ebuild 2235
 RMD160 d4eae2c80ce6e0b59aaf23a9cafeac0f7e7fccb1 bogofilter-1.1.1-r1.ebuild 2235
 SHA256 8cf949da0034adbb651770eb3234c163ad54e4a504640ad5bd6a3ef1ad26ea99 bogofilter-1.1.1-r1.ebuild 2235
-EBUILD bogofilter-1.1.3.ebuild 2158 RMD160 dec978247f33b7fe6a507deb05dd7cc15ab6f1b6 SHA1 158869c06d2810942018f5a0e74b971cacdbddf4 SHA256 bf295b5dff04918d0f21432f5a453d2a11fd4805500fecbc10693ce5fa36a6be
-MD5 ab8291191a83f9914d344bf59e7771da bogofilter-1.1.3.ebuild 2158
-RMD160 dec978247f33b7fe6a507deb05dd7cc15ab6f1b6 bogofilter-1.1.3.ebuild 2158
-SHA256 bf295b5dff04918d0f21432f5a453d2a11fd4805500fecbc10693ce5fa36a6be bogofilter-1.1.3.ebuild 2158
-MISC ChangeLog 17352 RMD160 306df142063aa0472dfc9321e6f1a10d52354c1d SHA1 b5ece8d3d4685c978893366766cb899666193e7d SHA256 e53adb4a106fcd1569c9f6900ffcdaf19a86202a0cd690d67497110f101f02a7
-MD5 90f0c5955db521b7baf7c31381f9a66f ChangeLog 17352
-RMD160 306df142063aa0472dfc9321e6f1a10d52354c1d ChangeLog 17352
-SHA256 e53adb4a106fcd1569c9f6900ffcdaf19a86202a0cd690d67497110f101f02a7 ChangeLog 17352
+EBUILD bogofilter-1.1.3.ebuild 2306 RMD160 f51f906e0b361cdf63455d40e8375be2d9d578bb SHA1 e450ca04599bc44d714a3bf4da2752dcf4bb4a16 SHA256 33c5a5b3a0607c08a02f34db35ce038418408645bbed270f038e6fac13662c0b
+MD5 e72cd6fc34994fccc296a6db6b49a52f bogofilter-1.1.3.ebuild 2306
+RMD160 f51f906e0b361cdf63455d40e8375be2d9d578bb bogofilter-1.1.3.ebuild 2306
+SHA256 33c5a5b3a0607c08a02f34db35ce038418408645bbed270f038e6fac13662c0b bogofilter-1.1.3.ebuild 2306
+MISC ChangeLog 17576 RMD160 6549266ef9e6362591b9a1725d1b4077f6c02d2a SHA1 9bcc7bb1460e07e7c396b520aa507f4ee8e67a40 SHA256 ceddf2981e04eca378dfc30ac32f0a3d7fa498d2d75f18fedf2538a6c9a8956d
+MD5 8df719b2b58cab417684c2a00d1a8952 ChangeLog 17576
+RMD160 6549266ef9e6362591b9a1725d1b4077f6c02d2a ChangeLog 17576
+SHA256 ceddf2981e04eca378dfc30ac32f0a3d7fa498d2d75f18fedf2538a6c9a8956d ChangeLog 17576
 MISC metadata.xml 424 RMD160 7780bbf745ba6b51f837cdc076b1b315ba8d33b9 SHA1 0b17aa0a89b5854ee1850da8e222b95015e1afd9 SHA256 ace8b08d5d5b207b9226c509b6d1f9610da16264d08033e28713df61063563d9
 MD5 48bd0f185b30f8151e8da04a025e0373 metadata.xml 424
 RMD160 7780bbf745ba6b51f837cdc076b1b315ba8d33b9 metadata.xml 424
@@ -38,9 +42,9 @@ MD5 35e59f9a751fc4fe98942148e85180ce files/digest-bogofilter-1.1.3 253
 RMD160 f449ac3911efbda7127ed585bc9eb96f3140bc26 files/digest-bogofilter-1.1.3 253
 SHA256 c5369fe9bfa4a1054371abc154d2f80b52cac9809ccae694fdcbdc78c6c1857c files/digest-bogofilter-1.1.3 253
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.5 (GNU/Linux)
+Version: GnuPG v1.4.6 (GNU/Linux)
 
-iD8DBQFFcuCtV3J2n04EauwRAqesAKDF3dbbYi+vZNDMwC24JBN7rbzvswCg2bYa
-qTQvS7mF8koPLC8Lm+BAHoM=
-=VROn
+iD8DBQFFetrAV3J2n04EauwRAr7DAJ9T98Rk/XSg2AucZAaqhuRhyLUPcQCeKmT3
+4S9ao7Y7rmMq5l3a2G48WmA=
+=sLQ9
 -----END PGP SIGNATURE-----

diff --git a/mail-filter/bogofilter/bogofilter-0.92.8.ebuild b/mail-filter/bogofilter/bogofilter-0.92.8.ebuild
index 8d023e81580fa1cd1dfb37d63e8393a3ff7a4be0..90fe53dcdc8aa962e2798bac6df64c979be8c9ad 100644 (file)
--- a/mail-filter/bogofilter/bogofilter-0.92.8.ebuild
+++ b/mail-filter/bogofilter/bogofilter-0.92.8.ebuild
@@ -1,6 +1,6 @@
 # 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-0.92.8.ebuild,v 1.12 2006/10/29 09:18:20 tove Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-filter/bogofilter/bogofilter-0.92.8.ebuild,v 1.13 2006/12/09 15:48:01 tove Exp $
 
 DESCRIPTION="Bayesian spam filter designed with fast algorithms, and tuned for speed."
 HOMEPAGE="http://bogofilter.sourceforge.net/"
@@ -14,7 +14,7 @@ IUSE="doc"
 RDEPEND="virtual/libc
        >=sys-libs/db-3.2"
 DEPEND="${DEPEND}
-       !ppc64? ( doc? ( app-text/xmlto ) )"
+       doc? ( app-text/xmlto )"
 
 src_compile() {
        econf --with-included-gsl || die "configure failed"

diff --git a/mail-filter/bogofilter/bogofilter-1.1.3.ebuild b/mail-filter/bogofilter/bogofilter-1.1.3.ebuild
index e82145013f3f54ae4dbade8c4ec96743004b3b49..0447cb6d203715e9831d84dc0da4ee89a7abae10 100644 (file)
--- a/mail-filter/bogofilter/bogofilter-1.1.3.ebuild
+++ b/mail-filter/bogofilter/bogofilter-1.1.3.ebuild
@@ -1,6 +1,11 @@
 # 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.1 2006/12/03 14:35:18 tove Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-filter/bogofilter/bogofilter-1.1.3.ebuild,v 1.2 2006/12/09 15:48:01 tove Exp $
+
+WANT_AUTOCONF=latest
+WANT_AUTOMAKE=latest
+
+inherit eutils autotools
 
 DESCRIPTION="Bayesian spam filter designed with fast algorithms, and tuned for speed."
 HOMEPAGE="http://bogofilter.sourceforge.net/"
@@ -16,10 +21,16 @@ DEPEND="virtual/libiconv
        !berkdb? (
                sqlite?  ( >=dev-db/sqlite-3.2.6 )
                !sqlite? ( >=sys-libs/db-3.2 ) )
-       gsl? ( sci-libs/gsl )
-       >=sys-devel/flex-2.5.33"
+       gsl? ( sci-libs/gsl )"
 #      app-arch/pax" # only needed for bf_tar
 
+src_unpack() {
+       unpack ${A}
+       cd "${S}"
+       epatch "${FILESDIR}"/1.1.3-patch.1142.Makefile.am
+       eautomake
+}
+
 src_compile() {
        local myconf=""
        myconf="$(use_with !gsl included-gsl)"

diff --git a/mail-filter/bogofilter/files/1.1.3-patch.1142.Makefile.am b/mail-filter/bogofilter/files/1.1.3-patch.1142.Makefile.am
new file mode 100644 (file)
index 0000000..d33e1ab
--- /dev/null
+++ b/mail-filter/bogofilter/files/1.1.3-patch.1142.Makefile.am
@@ -0,0 +1,59 @@
+Index: src/Makefile.am
+===================================================================
+RCS file: /cvsroot/bogofilter/bogofilter/src/Makefile.am,v
+retrieving revision 1.141
+retrieving revision 1.142
+diff -u -B -r1.141 -r1.142
+--- src/Makefile.am    30 Nov 2006 00:14:16 -0000      1.141
++++ src/Makefile.am    9 Dec 2006 13:53:57 -0000       1.142
+@@ -12,22 +12,6 @@
+ 
+ noinst_LIBRARIES = libbogofilter.a
+ 
+-if NEED_GSL
+-libbf_gsl_a_CFLAGS=$(AM_CFLAGS) -DRENAMEFILES
+-libbf_gsl_a_SOURCES= \
+-../gsl/cdf/chisq.c ../gsl/cdf/gamma.c \
+-../gsl/specfunc/gamma_inc.c ../gsl/err/error.c \
+-../gsl/sys/infnan.c ../gsl/sys/fdiv.c \
+-../gsl/specfunc/exp.c ../gsl/specfunc/trig.c \
+-../gsl/specfunc/log.c ../gsl/specfunc/psi.c \
+-../gsl/specfunc/zeta.c ../gsl/specfunc/elementary.c \
+-../gsl/err/stream.c ../gsl/specfunc/expint.c \
+-../gsl/specfunc/erfc.c ../gsl/sys/coerce.c \
+-../gsl/sys/pow_int.c ../gsl/sys/minmax.c
+-noinst_LIBRARIES += libbf_gsl.a
+-libbf_gsl_a_CPPFLAGS= -I$(top_srcdir)
+-endif
+-
+ if USE_GCC4
+ AM_CPPFLAGS = -iquote$(top_srcdir)/gnugetopt -iquote$(top_srcdir)/trio \
+             -I$(srcdir) @GSL_CFLAGS@ -I$(top_srcdir)/gsl/specfunc -I$(top_srcdir)
+@@ -59,8 +43,27 @@
+ bogofilter_LDADD = $(LDADD) $(LIBDB) $(GSL_LIBS)
+ bogoutil_LDADD = $(LDADD) $(LIBDB)
+ configtest_LDADD = $(LDADD) $(LIBDB)
++bogofilter_DEPENDENCIES = $(LDADD)
++
++if NEED_GSL
++libbf_gsl_a_CFLAGS=$(AM_CFLAGS) -DRENAMEFILES
++libbf_gsl_a_SOURCES= \
++../gsl/cdf/chisq.c ../gsl/cdf/gamma.c \
++../gsl/specfunc/gamma_inc.c ../gsl/err/error.c \
++../gsl/sys/infnan.c ../gsl/sys/fdiv.c \
++../gsl/specfunc/exp.c ../gsl/specfunc/trig.c \
++../gsl/specfunc/log.c ../gsl/specfunc/psi.c \
++../gsl/specfunc/zeta.c ../gsl/specfunc/elementary.c \
++../gsl/err/stream.c ../gsl/specfunc/expint.c \
++../gsl/specfunc/erfc.c ../gsl/sys/coerce.c \
++../gsl/sys/pow_int.c ../gsl/sys/minmax.c
++noinst_LIBRARIES += libbf_gsl.a
++libbf_gsl_a_CPPFLAGS= -I$(top_srcdir)
++bogofilter_DEPENDENCIES += libbf_gsl.a
++endif
+ 
+ EXTRA_PROGRAMS=panicenv
++
+ panicenv_SOURCES=panicenv.c
+ panicenv_LDADD=$(LIBDB)
+