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

Package-Manager: portage-2.1.2.11

6 files changed, 147 insertions, 9 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/Manifest b/net-proxy/bfilter/Manifest
index 4f222f60d63c..f74be7b3dbc2 100644
--- a/net-proxy/bfilter/Manifest
+++ b/net-proxy/bfilter/Manifest
@@ -1,6 +1,14 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
+AUX bfilter-1.1-date-test.patch 620 RMD160 f2ee01b3358003f1dd3f370826776cb095efd291 SHA1 7ad044ed85dfcb49003ec90af112dee4b8362fc2 SHA256 533c43f97a2dbe9a6aa8562d022b1506ae8bca49e22c3cc8d812e2fa1727d6fd
+MD5 44f423d1923ef151b97feec8df18731a files/bfilter-1.1-date-test.patch 620
+RMD160 f2ee01b3358003f1dd3f370826776cb095efd291 files/bfilter-1.1-date-test.patch 620
+SHA256 533c43f97a2dbe9a6aa8562d022b1506ae8bca49e22c3cc8d812e2fa1727d6fd files/bfilter-1.1-date-test.patch 620
+AUX bfilter-1.1-external-boost.patch 1382 RMD160 f429150dbdcf5895881d064caf232b319d78ee92 SHA1 a83bc8e95e7e58c11da1b3b32cb2921da7ab0286 SHA256 2fcd4b045248a68dca91638b0dfa7e6eb86ab410e6ed8242b37218cf43842c31
+MD5 4cb9753ada0728eb71b3d1c42950905e files/bfilter-1.1-external-boost.patch 1382
+RMD160 f429150dbdcf5895881d064caf232b319d78ee92 files/bfilter-1.1-external-boost.patch 1382
+SHA256 2fcd4b045248a68dca91638b0dfa7e6eb86ab410e6ed8242b37218cf43842c31 files/bfilter-1.1-external-boost.patch 1382
 AUX bfilter.8 11933 RMD160 f905c1bb5f32e5e8b32d7e87111ba96721d1f1f7 SHA1 2b5df4780c9cb2063c40582d4c3e1468f7a7b249 SHA256 37e629ed5a29df82af067dd23c083260be1de9bb4399c75d081bfa47aef12562
 MD5 f90e9af9022576e75ff93a69b76fdb04 files/bfilter.8 11933
 RMD160 f905c1bb5f32e5e8b32d7e87111ba96721d1f1f7 files/bfilter.8 11933
@@ -14,14 +22,19 @@ MD5 caa4efdfba69567046fe1205231ed8b8 files/bfilter.init 918
 RMD160 d84d4ad2818bc988649c73a4ec8cb0f989b4a59f files/bfilter.init 918
 SHA256 3ac6347bf529fafc67c5fdaf7eeb27b9a43d8a7244cc8146486bc62e8720114a files/bfilter.init 918
 DIST bfilter-1.0.9.tar.gz 2870487 RMD160 ed18f231446f87e6e65eafde925df5f66a0e9b6f SHA1 146ff0ea831aede2fd132d26aa5259a8d30bec36 SHA256 bbb0141a3e90293de2bf79e440dc7783c46225573fd4788b896b75d3a55bfae7
+DIST bfilter-1.1.tar.gz 3032488 RMD160 2c410626db2b9afbbd3bd68eb69e213b037f25ae SHA1 d0fc3de77d4a83efb5a5847327e98405a0a28568 SHA256 78fde9cf8be7f2fa14d18d9b9b639d5a46870390f423cf7d53dd334363bee8fa
 EBUILD bfilter-1.0.9.ebuild 1242 RMD160 8d84890f80399320ed59c72517352b6df96bced6 SHA1 44f40ab3e18abc45dc7de9cbd8f1f685d56ddbd7 SHA256 8fa04004d6f466082ad09a22d94119008294ebb0768b93624530209561009d24
 MD5 256381317d2632c424943ebd525c46e7 bfilter-1.0.9.ebuild 1242
 RMD160 8d84890f80399320ed59c72517352b6df96bced6 bfilter-1.0.9.ebuild 1242
 SHA256 8fa04004d6f466082ad09a22d94119008294ebb0768b93624530209561009d24 bfilter-1.0.9.ebuild 1242
-MISC ChangeLog 2347 RMD160 bf6464e7250e06959a424defb17a592f51d4e959 SHA1 4e7f6c194996c333fa2fd016748db6c62447977a SHA256 31bae7ec78e1e91d36eb666109c88f3d16cd2f2e0fec0a68481c5efca65ccc32
-MD5 d4d38b2f25d3b987a6beb0958139d785 ChangeLog 2347
-RMD160 bf6464e7250e06959a424defb17a592f51d4e959 ChangeLog 2347
-SHA256 31bae7ec78e1e91d36eb666109c88f3d16cd2f2e0fec0a68481c5efca65ccc32 ChangeLog 2347
+EBUILD bfilter-1.1.ebuild 1405 RMD160 abb0196c22d1fb5cc294dfdc65cba3a39c1139a9 SHA1 d9c9b56079d43d0b59c3dd34740b6c832b93625a SHA256 e16280ce36b5c5b3315f9c12a85962227faf4e025be62070236923a3878460eb
+MD5 44c23c92a6f648327d96c8637e9761c2 bfilter-1.1.ebuild 1405
+RMD160 abb0196c22d1fb5cc294dfdc65cba3a39c1139a9 bfilter-1.1.ebuild 1405
+SHA256 e16280ce36b5c5b3315f9c12a85962227faf4e025be62070236923a3878460eb bfilter-1.1.ebuild 1405
+MISC ChangeLog 2605 RMD160 f6cda0d8ae1538789e6363cefacc2e09f7151411 SHA1 79d2c377362f8cdd84f8a857f721a698b3da590e SHA256 1ccc25e2aa68bed8b65aa06af1006858e158ddb9b247b7cfef6fada878b9e45c
+MD5 df71683454f7b0cbe9615fa4c7637fc0 ChangeLog 2605
+RMD160 f6cda0d8ae1538789e6363cefacc2e09f7151411 ChangeLog 2605
+SHA256 1ccc25e2aa68bed8b65aa06af1006858e158ddb9b247b7cfef6fada878b9e45c ChangeLog 2605
 MISC metadata.xml 1179 RMD160 8c400bff89b9b1d57734d02e398dafab91ac3617 SHA1 26ef9a1488d051ec492969dc21e00cae5db09271 SHA256 b2001c292c1d59a2797b9861713b2d3c0ef3e453d0daeeaaa03d9d914a725d3a
 MD5 2b32df81d3a9693c235baddd9386cce9 metadata.xml 1179
 RMD160 8c400bff89b9b1d57734d02e398dafab91ac3617 metadata.xml 1179
@@ -29,10 +42,13 @@ SHA256 b2001c292c1d59a2797b9861713b2d3c0ef3e453d0daeeaaa03d9d914a725d3a metadata
 MD5 d513b95b3bf87edabe1629f88227f48c files/digest-bfilter-1.0.9 244
 RMD160 f75874a4b2f3b9731ca595b259c0ec3b178de391 files/digest-bfilter-1.0.9 244
 SHA256 93d3864643fd8409892efb443fa99d646f11e43048d9161bf39d4310061132e5 files/digest-bfilter-1.0.9 244
+MD5 b829690ef94547190f13af5d0740746f files/digest-bfilter-1.1 238
+RMD160 ee33dfdf41377c93d1594922459fcaf8a76acff0 files/digest-bfilter-1.1 238
+SHA256 d0a6ecd7b0890c117a0786ceaa947e6c6c0032a0a76844dc8a88339c7b3b0958 files/digest-bfilter-1.1 238
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.4 (GNU/Linux)
+Version: GnuPG v2.0.5 (GNU/Linux)
 
-iD8DBQFGschmVSA5X31g7/gRAlB7AJ9l5WI+DYi30KkSufWE8WPik64r9ACggA7a
-Jq5jTJwqox7a2SGyQXRzTxw=
-=XWlw
+iD8DBQFGxvO5VSA5X31g7/gRApzMAJkBw7bMTW4EVwvS29mKDUuu/kNLzgCbB+aT
+x3ttR1h4jnLpWf5Eou/8s3Y=
+=FkNv
 -----END PGP SIGNATURE-----
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