Version bump.

(Portage version: 2.1.2.12)

6 files changed, 89 insertions, 12 deletions

diff --git a/net-proxy/bfilter/ChangeLog b/net-proxy/bfilter/ChangeLog
index f3165555d28e..f5d377a88322 100644
--- a/net-proxy/bfilter/ChangeLog
+++ b/net-proxy/bfilter/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for net-proxy/bfilter
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-proxy/bfilter/ChangeLog,v 1.20 2007/10/09 14:38:55 angelos Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-proxy/bfilter/ChangeLog,v 1.21 2007/11/02 16:56:49 mrness Exp $
+
+*bfilter-1.1.2 (02 Nov 2007)
+
+  02 Nov 2007; Alin Năstac <mrness@gentoo.org>
+  +files/bfilter-1.1.2-date-test.patch,
+  +files/bfilter-1.1.2-external-boost.patch, -bfilter-1.0.9.ebuild,
+  +bfilter-1.1.2.ebuild:
+  Version bump.
 
   09 Oct 2007; Christoph Mende <angelos@gentoo.org> bfilter-1.1.ebuild:
   Stable on amd64 wrt bug #192768
diff --git a/net-proxy/bfilter/bfilter-1.0.9.ebuild b/net-proxy/bfilter/bfilter-1.1.2.ebuild
index ee1aecc6c4e2..77189944bc9d 100644
--- a/net-proxy/bfilter/bfilter-1.0.9.ebuild
+++ b/net-proxy/bfilter/bfilter-1.1.2.ebuild
@@ -1,8 +1,11 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-proxy/bfilter/bfilter-1.0.9.ebuild,v 1.4 2007/07/04 17:53:24 angelos Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-proxy/bfilter/bfilter-1.1.2.ebuild,v 1.1 2007/11/02 16:56:49 mrness Exp $
 
-inherit eutils
+WANT_AUTOMAKE="1.9"
+WANT_AUTOCONF="none"
+
+inherit eutils autotools
 
 DESCRIPTION="An ad-filtering web proxy featuring an effective heuristic ad-detection algorithm"
 HOMEPAGE="http://bfilter.sourceforge.net/"
@@ -10,31 +13,47 @@ SRC_URI="mirror://sourceforge/bfilter/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 sparc x86"
+KEYWORDS="~amd64 ~sparc ~x86"
 IUSE="X debug"
 
 RDEPEND="sys-libs/zlib
 	>=dev-libs/ace-5.4.6
 	=dev-libs/libsigc++-2.0*
-	X? ( >=dev-cpp/gtkmm-2.4 )"
+	X? ( >=dev-cpp/gtkmm-2.4 )
+	dev-libs/boost"
 DEPEND="${RDEPEND}
 	dev-util/scons
 	dev-util/pkgconfig"
 
+pkg_setup() {
+	if ! built_with_use --missing true dev-libs/boost threads ; then
+		eerror "${PN} needs dev-libs/boost with threads support."
+		die "Re-compile dev-libs/boost with USE=threads."
+	fi
+}
+
+src_unpack() {
+	unpack ${A}
+
+	cd "${S}"
+	epatch "${FILESDIR}"/${P}-external-boost.patch
+	epatch "${FILESDIR}"/${P}-date-test.patch
+	eautomake
+}
+
 src_compile() {
 	econf \
 		$(use_enable debug) \
-		$(use_with X gui) || die "econf failed"
+		$(use_with X gui) \
+		--without-builtin-boost || die "econf failed"
 	emake -j1 || die "emake failed"
 }
 
 src_install() {
 	make DESTDIR="${D}" install || die "make install failed"
 
-	doman "${FILESDIR}/bfilter.8"
-
 	dodoc AUTHORS ChangeLog
-	dohtml doc/*.png doc/*.jpg doc/*.html
+	dohtml doc/*
 
 	newinitd "${FILESDIR}/bfilter.init" bfilter
 	newconfd "${FILESDIR}/bfilter.conf" bfilter
diff --git a/net-proxy/bfilter/files/bfilter-1.1.2-date-test.patch b/net-proxy/bfilter/files/bfilter-1.1.2-date-test.patch
new file mode 100644
index 000000000000..aed46326210f
--- /dev/null
+++ b/net-proxy/bfilter/files/bfilter-1.1.2-date-test.patch
@@ -0,0 +1,14 @@
+diff -Nru bfilter-1.1.2.orig/tests/DateTestSuite.cpp bfilter-1.1.2/tests/DateTestSuite.cpp
+--- bfilter-1.1.2.orig/tests/DateTestSuite.cpp	2007-06-12 16:56:51.000000000 +0300
++++ bfilter-1.1.2/tests/DateTestSuite.cpp	2007-11-02 18:40:32.000000000 +0200
+@@ -48,7 +48,9 @@
+ 	time_t const y2k = Date::parse(BString("Thu, 01 Jan 2000 00:00:00 GMT"));
+ 	
+ 	for (int i = 0; i < 1000; ++i) {
+-		time_t const time = rand() - rand();
++		time_t time = rand() - rand();
++		if (time < 0)
++			time *= -1;
+ 		BOOST_REQUIRE(check_time(time, Date::RFC822));
+ 		BOOST_REQUIRE(check_time(time, Date::ASCTIME));
+ 		if (time >= low && time < y2k) {
diff --git a/net-proxy/bfilter/files/bfilter-1.1.2-external-boost.patch b/net-proxy/bfilter/files/bfilter-1.1.2-external-boost.patch
new file mode 100644
index 000000000000..6a65984cfe9d
--- /dev/null
+++ b/net-proxy/bfilter/files/bfilter-1.1.2-external-boost.patch
@@ -0,0 +1,36 @@
+diff -Nru bfilter-1.1.2.orig/main/daemon/Makefile.am bfilter-1.1.2/main/daemon/Makefile.am
+--- bfilter-1.1.2.orig/main/daemon/Makefile.am	2007-01-19 21:21:02.000000000 +0200
++++ bfilter-1.1.2/main/daemon/Makefile.am	2007-11-02 18:39:37.000000000 +0200
+@@ -6,7 +6,7 @@
+ $(top_builddir)/boost/libs/program_options/libprogram_options.la
+ else
+ BOOST_CPPFLAGS =
+-BOOST_LIBS     =
++BOOST_LIBS     = -lboost_regex-mt -lboost_program_options-mt
+ endif
+ 
+ AM_CPPFLAGS = -DSYSCONFDIR=\"$(sysconfdir)\" \
+diff -Nru bfilter-1.1.2.orig/main/gui/gtk/Makefile.am bfilter-1.1.2/main/gui/gtk/Makefile.am
+--- bfilter-1.1.2.orig/main/gui/gtk/Makefile.am	2007-01-12 23:22:57.000000000 +0200
++++ bfilter-1.1.2/main/gui/gtk/Makefile.am	2007-11-02 18:39:37.000000000 +0200
+@@ -49,7 +49,7 @@
+ BOOST_LIBS     = $(top_builddir)/boost/libs/regex/libregex.la
+ else
+ BOOST_CPPFLAGS =
+-BOOST_LIBS     =
++BOOST_LIBS     = -lboost_regex-mt
+ endif
+ 
+ if WITH_GUI
+diff -Nru bfilter-1.1.2.orig/tests/Makefile.am bfilter-1.1.2/tests/Makefile.am
+--- bfilter-1.1.2.orig/tests/Makefile.am	2007-05-07 17:19:40.000000000 +0300
++++ bfilter-1.1.2/tests/Makefile.am	2007-11-02 18:39:37.000000000 +0200
+@@ -6,7 +6,7 @@
+                  $(top_builddir)/boost/libs/regex/libregex.la
+ else
+ BOOST_CPPFLAGS =
+-BOOST_LIBS     =
++BOOST_LIBS     = -lboost_regex-mt -lboost_unit_test_framework-mt
+ endif
+ 
+ AM_CPPFLAGS = -I$(top_srcdir) -I$(top_builddir) \
diff --git a/net-proxy/bfilter/files/digest-bfilter-1.0.9 b/net-proxy/bfilter/files/digest-bfilter-1.0.9
deleted file mode 100644
index be129109bae1..000000000000
--- a/net-proxy/bfilter/files/digest-bfilter-1.0.9
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 d2f0a6da940c0f004b77f0cad9719859 bfilter-1.0.9.tar.gz 2870487
-RMD160 ed18f231446f87e6e65eafde925df5f66a0e9b6f bfilter-1.0.9.tar.gz 2870487
-SHA256 bbb0141a3e90293de2bf79e440dc7783c46225573fd4788b896b75d3a55bfae7 bfilter-1.0.9.tar.gz 2870487
diff --git a/net-proxy/bfilter/files/digest-bfilter-1.1.2 b/net-proxy/bfilter/files/digest-bfilter-1.1.2
new file mode 100644
index 000000000000..48035f52b79d
--- /dev/null
+++ b/net-proxy/bfilter/files/digest-bfilter-1.1.2
@@ -0,0 +1,3 @@
+MD5 29ef89bf6df5f8634643db01094f066c bfilter-1.1.2.tar.gz 3033376
+RMD160 0cfcbe2deda77dbd7d8cc1c89dd0360e780c341e bfilter-1.1.2.tar.gz 3033376
+SHA256 ecacc334fdc71433285b3218d020e9ad6ef3505c77b3b214286451ccb434e5ca bfilter-1.1.2.tar.gz 3033376