Version bump. Use dev-lib/boost instead the included version of the library.

(Portage version: 2.1.2.11)

5 files changed, 123 insertions, 1 deletions

diff --git a/net-proxy/bfilter/ChangeLog b/net-proxy/bfilter/ChangeLog
index 34ea15ff2ccf..fa5d8191cce7 100644
--- a/net-proxy/bfilter/ChangeLog
+++ b/net-proxy/bfilter/ChangeLog
@@ -1,6 +1,13 @@
 # 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.14 2007/08/02 12:04:48 mrness Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-proxy/bfilter/ChangeLog,v 1.15 2007/08/18 13:27:09 mrness Exp $
+
+*bfilter-1.1 (18 Aug 2007)
+
+  18 Aug 2007; Alin Năstac <mrness@gentoo.org>
+  +files/bfilter-1.1-date-test.patch,
+  +files/bfilter-1.1-external-boost.patch, +bfilter-1.1.ebuild:
+  Version bump. Use dev-lib/boost instead the included version of the library.
 
   02 Aug 2007; Alin Năstac <mrness@gentoo.org> -bfilter-1.0.6.ebuild,
   -bfilter-1.0.7.ebuild:
diff --git a/net-proxy/bfilter/bfilter-1.1.ebuild b/net-proxy/bfilter/bfilter-1.1.ebuild
new file mode 100644
index 000000000000..a79130d13f24
--- /dev/null
+++ b/net-proxy/bfilter/bfilter-1.1.ebuild
@@ -0,0 +1,62 @@
+# 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.1.ebuild,v 1.1 2007/08/18 13:27:09 mrness Exp $
+
+WANT_AUTOMAKE="1.9"
+
+inherit eutils autotools
+
+DESCRIPTION="An ad-filtering web proxy featuring an effective heuristic ad-detection algorithm"
+HOMEPAGE="http://bfilter.sourceforge.net/"
+SRC_URI="mirror://sourceforge/bfilter/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+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 )"
+DEPEND="${RDEPEND}
+	dev-util/scons
+	dev-util/pkgconfig
+	dev-libs/boost"
+
+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) \
+		--without-builtin-boost || die "econf failed"
+	emake -j1 || die "emake failed"
+}
+
+src_install() {
+	make DESTDIR="${D}" install || die "make install failed"
+
+	dodoc AUTHORS ChangeLog
+	dohtml doc/*
+
+	newinitd "${FILESDIR}/bfilter.init" bfilter
+	newconfd "${FILESDIR}/bfilter.conf" bfilter
+}
+
+pkg_preinst() {
+	enewgroup bfilter
+	enewuser bfilter -1 -1 -1 bfilter
+}
+
+pkg_postinst() {
+	einfo "The documentation is available at"
+	einfo "   http://bfilter.sourceforge.net/documentation.php"
+}
diff --git a/net-proxy/bfilter/files/bfilter-1.1-date-test.patch b/net-proxy/bfilter/files/bfilter-1.1-date-test.patch
new file mode 100644
index 000000000000..c69fa0b47fdf
--- /dev/null
+++ b/net-proxy/bfilter/files/bfilter-1.1-date-test.patch
@@ -0,0 +1,14 @@
+diff -Nru bfilter-1.1.orig/tests/DateTestSuite.cpp bfilter-1.1/tests/DateTestSuite.cpp
+--- bfilter-1.1.orig/tests/DateTestSuite.cpp	2007-06-12 16:56:51.000000000 +0300
++++ bfilter-1.1/tests/DateTestSuite.cpp	2007-08-18 15:06:15.000000000 +0300
+@@ -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-external-boost.patch b/net-proxy/bfilter/files/bfilter-1.1-external-boost.patch
new file mode 100644
index 000000000000..43a982f033fc
--- /dev/null
+++ b/net-proxy/bfilter/files/bfilter-1.1-external-boost.patch
@@ -0,0 +1,36 @@
+diff -Nru bfilter-1.1.orig/main/daemon/Makefile.am bfilter-1.1/main/daemon/Makefile.am
+--- bfilter-1.1.orig/main/daemon/Makefile.am	2007-01-19 21:21:02.000000000 +0200
++++ bfilter-1.1/main/daemon/Makefile.am	2007-08-18 13:09:38.000000000 +0300
+@@ -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.orig/main/gui/gtk/Makefile.am bfilter-1.1/main/gui/gtk/Makefile.am
+--- bfilter-1.1.orig/main/gui/gtk/Makefile.am	2007-01-12 23:22:57.000000000 +0200
++++ bfilter-1.1/main/gui/gtk/Makefile.am	2007-08-18 13:08:22.000000000 +0300
+@@ -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.orig/tests/Makefile.am bfilter-1.1/tests/Makefile.am
+--- bfilter-1.1.orig/tests/Makefile.am	2007-05-07 17:19:40.000000000 +0300
++++ bfilter-1.1/tests/Makefile.am	2007-08-18 13:10:15.000000000 +0300
+@@ -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.1 b/net-proxy/bfilter/files/digest-bfilter-1.1
new file mode 100644
index 000000000000..c8faac6dcd7d
--- /dev/null
+++ b/net-proxy/bfilter/files/digest-bfilter-1.1
@@ -0,0 +1,3 @@
+MD5 06f98631e29a7311f9eeb80d4008909e bfilter-1.1.tar.gz 3032488
+RMD160 2c410626db2b9afbbd3bd68eb69e213b037f25ae bfilter-1.1.tar.gz 3032488
+SHA256 78fde9cf8be7f2fa14d18d9b9b639d5a46870390f423cf7d53dd334363bee8fa bfilter-1.1.tar.gz 3032488