Migrate to EAPI 2. Install default forwarding.xml and forwarding-proxy.xml example (#288100).

Package-Manager: portage-2.1.6.13/cvs/Linux x86_64
RepoMan-Options: --force

6 files changed, 142 insertions, 16 deletions

diff --git a/net-proxy/bfilter/ChangeLog b/net-proxy/bfilter/ChangeLog
index cd396506ab1a..f8471d371623 100644
--- a/net-proxy/bfilter/ChangeLog
+++ b/net-proxy/bfilter/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for net-proxy/bfilter
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-proxy/bfilter/ChangeLog,v 1.26 2009/02/18 19:22:48 mrness Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-proxy/bfilter/ChangeLog,v 1.27 2009/10/19 22:29:22 mrness Exp $
+
+*bfilter-1.1.4-r1 (19 Oct 2009)
+
+  19 Oct 2009; Alin Năstac <mrness@gentoo.org> +bfilter-1.1.4-r1.ebuild,
+  files/bfilter-1.1.4-external-boost.patch, +files/forwarding.xml,
+  +files/forwarding-proxy.xml:
+  Migrate to EAPI 2. Install default forwarding.xml and forwarding-proxy.xml
+  example (#288100).
 
   18 Feb 2009; Alin Năstac <mrness@gentoo.org>
   -files/bfilter-1.1.1-date-test.patch,
diff --git a/net-proxy/bfilter/Manifest b/net-proxy/bfilter/Manifest
index 52c98d4a79c7..3832fb1ae874 100644
--- a/net-proxy/bfilter/Manifest
+++ b/net-proxy/bfilter/Manifest
@@ -1,17 +1,20 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-AUX bfilter-1.1.4-external-boost.patch 1403 RMD160 f35bafe36113937fb168420f609dd603e7723677 SHA1 75391670baaaf342432593bc2a745a7d986f90ab SHA256 6fcfe8fb351a09f3f25f066f1ba2d1e9ab5c15ab04c3661f1be5eeb6e7854c82
+AUX bfilter-1.1.4-external-boost.patch 2435 RMD160 5baaf162c6c497fe7b6896850348af1308f29adc SHA1 c3f2bc06b1f38e73ae05c3eabfc76e13ba7a9b60 SHA256 0e82a8afe9b15eab6010ed65e442d7e0f949d0e50d29eb60760ebbd41ac8332c
 AUX bfilter.conf 156 RMD160 45e1082757bbd399830dc9988876e760d4326699 SHA1 c88555637683eeee8f9035d009faaeba9826e579 SHA256 feb103fc8138122d6cb70d0fc267fb5783740cf5a35edb194717b6d4ac2e400c
 AUX bfilter.init 918 RMD160 d84d4ad2818bc988649c73a4ec8cb0f989b4a59f SHA1 218702cd44efb58d51f9d4a7a5abb0877f52938f SHA256 3ac6347bf529fafc67c5fdaf7eeb27b9a43d8a7244cc8146486bc62e8720114a
+AUX forwarding-proxy.xml 581 RMD160 773b6d2a89db3c8a68c22e99d63355b3a6c09871 SHA1 8f7335dfd70134273a23c1f70a1d56d26c67cfe1 SHA256 70c5654c7e56cc1468abf3ae92b063be7b151580f1e10804c9f3a5722055b4a3
+AUX forwarding.xml 127 RMD160 a2f2c5afcdb7f6369246daedc1c3e65b31656b4f SHA1 ca3eca45d41cec7d6c0e202a31c4d717b2f85ff2 SHA256 672b2cd2ae5aa10d7f295adbe8c0d0ab9b4366eabf9f47dbd829a708ac95d76d
 DIST bfilter-1.1.4.tar.gz 3055651 RMD160 5dacc6d111e84fbc3c778153aa02f054265e52f3 SHA1 d183cd239b57bdf3d4eea8062d0aebf469182c53 SHA256 04fda3f2d0c19199cb47c3e0743ba1160f4dee10099ab63f5b174fdd81b49b6a
+EBUILD bfilter-1.1.4-r1.ebuild 1584 RMD160 1ea2fc30544f32441eb35e70b425bb91c49d8cd2 SHA1 438e2ba9dbe80482008bfaaa31365eedd1f063f0 SHA256 215665c8c4726c002a7262ce6fffab8fa5dfaf0cefcd6ff13a2224ed108af0f6
 EBUILD bfilter-1.1.4.ebuild 1660 RMD160 8e345c236676f809ef8ba266673de2b3365879b4 SHA1 60092b6a9c867630d0efcc7803ab5b54bda791db SHA256 6a8e9e7a4f5547d4b02ee20facccead06e68dc0ce13a705bec7ea3c8d16f512e
-MISC ChangeLog 4531 RMD160 5487618bf503049a877d538b995eb5b65e2a46cd SHA1 edd614d455dc1bf223fb29971bc4e57c2581885c SHA256 91ced1c879171ecc0cf951197059044c1760f5d219dac991ca738ad482a85a89
+MISC ChangeLog 4835 RMD160 4581097098e9a2dadcc160edff4a7f9a9f9808fb SHA1 54144005288b4df2e47345dc340ba72f23e25b4e SHA256 b1711c24ca2068173d4ce47e83a951b5ead92fa3704469bca9b440c31d2328f2
 MISC metadata.xml 1179 RMD160 8c400bff89b9b1d57734d02e398dafab91ac3617 SHA1 26ef9a1488d051ec492969dc21e00cae5db09271 SHA256 b2001c292c1d59a2797b9861713b2d3c0ef3e453d0daeeaaa03d9d914a725d3a
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.9 (GNU/Linux)
+Version: GnuPG v2.0.11 (GNU/Linux)
 
-iEYEARECAAYFAkmcYCEACgkQts85UDFmaOWUoACeK+S5PFXazUF8RXRLYsyjkWk1
-AxYAn3wjFmwL5iW8wzeHrfbAiSqsh7+c
-=0Ky7
+iEYEARECAAYFAkrc6FIACgkQ9A5kJBGSrsveuACdH9fxlAa/PX3mQjgEumhjdg1V
+lPYAn1ZQUEMxxTO51kgm4cf34AkRqy6R
+=e7iJ
 -----END PGP SIGNATURE-----
diff --git a/net-proxy/bfilter/bfilter-1.1.4-r1.ebuild b/net-proxy/bfilter/bfilter-1.1.4-r1.ebuild
new file mode 100644
index 000000000000..86921835c0f3
--- /dev/null
+++ b/net-proxy/bfilter/bfilter-1.1.4-r1.ebuild
@@ -0,0 +1,64 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-proxy/bfilter/bfilter-1.1.4-r1.ebuild,v 1.1 2009/10/19 22:29:22 mrness Exp $
+
+EAPI=2
+
+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
+	dev-libs/libsigc++:2
+	X? ( >=dev-cpp/gtkmm-2.4 )
+	dev-libs/boost"
+DEPEND="${RDEPEND}
+	dev-util/scons
+	dev-util/pkgconfig"
+
+RESTRICT="test" # boost's test API has changed
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-external-boost.patch
+	rm -rf "${S}"/boost
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		$(use_enable debug) \
+		$(use_with X gui) \
+		--without-builtin-boost || die "econf failed"
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die "make install failed"
+	insinto /etc/bfilter
+	doins "${FILESDIR}"/forwarding.xml
+
+	dodoc AUTHORS ChangeLog "${FILESDIR}"/forwarding-proxy.xml
+	dohtml doc/*
+
+	newinitd "${FILESDIR}/bfilter.init" bfilter
+	newconfd "${FILESDIR}/bfilter.conf" bfilter
+}
+
+pkg_preinst() {
+	enewgroup bfilter
+	enewuser bfilter -1 -1 -1 bfilter
+}
+
+pkg_postinst() {
+	elog "The documentation is available at"
+	elog "   http://bfilter.sourceforge.net/documentation.php"
+	elog "For forwarding bfilter service traffic through a proxy,"
+	elog "see forwarding-proxy.xml example installed in the doc directory."
+}
diff --git a/net-proxy/bfilter/files/bfilter-1.1.4-external-boost.patch b/net-proxy/bfilter/files/bfilter-1.1.4-external-boost.patch
index 65a4000a90fc..6f185ca9f41b 100644
--- a/net-proxy/bfilter/files/bfilter-1.1.4-external-boost.patch
+++ b/net-proxy/bfilter/files/bfilter-1.1.4-external-boost.patch
@@ -1,6 +1,21 @@
-diff -ur bfilter-1.1.4.orig/main/daemon/Makefile.am bfilter-1.1.4/main/daemon/Makefile.am
---- bfilter-1.1.4.orig/main/daemon/Makefile.am	2007-01-19 19:21:02.000000000 +0000
-+++ bfilter-1.1.4/main/daemon/Makefile.am	2008-07-13 08:49:46.000000000 +0000
+diff -Nru bfilter-1.1.4.orig/configure.in bfilter-1.1.4/configure.in
+--- bfilter-1.1.4.orig/configure.in	2007-11-11 23:14:49.000000000 +0100
++++ bfilter-1.1.4/configure.in	2009-10-18 18:26:32.000000000 +0200
+@@ -260,11 +260,6 @@
+ Makefile
+ binreloc/Makefile
+ foundation/Makefile
+-boost/Makefile
+-boost/libs/Makefile
+-boost/libs/regex/Makefile
+-boost/libs/program_options/Makefile
+-boost/libs/test/Makefile
+ reactor/Makefile
+ mkskel/Makefile
+ lexgen/Makefile
+diff -Nru bfilter-1.1.4.orig/main/daemon/Makefile.am bfilter-1.1.4/main/daemon/Makefile.am
+--- bfilter-1.1.4.orig/main/daemon/Makefile.am	2007-01-19 20:21:02.000000000 +0100
++++ bfilter-1.1.4/main/daemon/Makefile.am	2009-10-18 18:25:52.000000000 +0200
 @@ -6,7 +6,7 @@
  $(top_builddir)/boost/libs/program_options/libprogram_options.la
  else
@@ -10,9 +25,9 @@ diff -ur bfilter-1.1.4.orig/main/daemon/Makefile.am bfilter-1.1.4/main/daemon/Ma
  endif
  
  AM_CPPFLAGS = -DSYSCONFDIR=\"$(sysconfdir)\" \
-diff -ur bfilter-1.1.4.orig/main/gui/gtk/Makefile.am bfilter-1.1.4/main/gui/gtk/Makefile.am
---- bfilter-1.1.4.orig/main/gui/gtk/Makefile.am	2008-06-02 15:25:27.000000000 +0000
-+++ bfilter-1.1.4/main/gui/gtk/Makefile.am	2008-07-13 08:49:46.000000000 +0000
+diff -Nru bfilter-1.1.4.orig/main/gui/gtk/Makefile.am bfilter-1.1.4/main/gui/gtk/Makefile.am
+--- bfilter-1.1.4.orig/main/gui/gtk/Makefile.am	2008-06-02 17:25:27.000000000 +0200
++++ bfilter-1.1.4/main/gui/gtk/Makefile.am	2009-10-18 18:25:52.000000000 +0200
 @@ -50,7 +50,7 @@
  BOOST_LIBS     = $(top_builddir)/boost/libs/regex/libregex.la
  else
@@ -22,9 +37,21 @@ diff -ur bfilter-1.1.4.orig/main/gui/gtk/Makefile.am bfilter-1.1.4/main/gui/gtk/
  endif
  
  if WITH_GUI
-diff -ur bfilter-1.1.4.orig/tests/Makefile.am bfilter-1.1.4/tests/Makefile.am
---- bfilter-1.1.4.orig/tests/Makefile.am	2007-05-07 14:19:40.000000000 +0000
-+++ bfilter-1.1.4/tests/Makefile.am	2008-07-13 08:49:46.000000000 +0000
+diff -Nru bfilter-1.1.4.orig/Makefile.am bfilter-1.1.4/Makefile.am
+--- bfilter-1.1.4.orig/Makefile.am	2007-11-11 23:16:04.000000000 +0100
++++ bfilter-1.1.4/Makefile.am	2009-10-18 18:26:46.000000000 +0200
+@@ -1,7 +1,7 @@
+ EXTRA_DIST = doc cmake bootstrap m4 VERSION CMakeLists.txt types.h pstdint.h \
+ config.h.cm bfilter.desktop bfilter.png Doxyfile
+ DISTCLEANFILES = itypes.h
+-SUBDIRS = binreloc foundation boost reactor mkskel lexgen libjs main conf \
++SUBDIRS = binreloc foundation reactor mkskel lexgen libjs main conf \
+ packaging tests
+ 
+ dist_man_MANS = bfilter.8
+diff -Nru bfilter-1.1.4.orig/tests/Makefile.am bfilter-1.1.4/tests/Makefile.am
+--- bfilter-1.1.4.orig/tests/Makefile.am	2007-05-07 16:19:40.000000000 +0200
++++ bfilter-1.1.4/tests/Makefile.am	2009-10-18 18:25:52.000000000 +0200
 @@ -6,7 +6,7 @@
                   $(top_builddir)/boost/libs/regex/libregex.la
  else
diff --git a/net-proxy/bfilter/files/forwarding-proxy.xml b/net-proxy/bfilter/files/forwarding-proxy.xml
new file mode 100644
index 000000000000..dafcbb1ed664
--- /dev/null
+++ b/net-proxy/bfilter/files/forwarding-proxy.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<forwarding>
+    <option name="Direct">
+    </option>
+    <option name="ISP Proxy" selected="selected">
+        <bypass>
+            <simple-hostnames/>
+            <host-mask>*.isp.com</host-mask>
+            <host-mask>192.168.*</host-mask>
+        </bypass>
+        <proxy-chain>
+            <proxy>
+                <type>socks4</type><!-- available types: http, socks4, socks4a and socks5 -->
+                <host>localhost</host>
+                <port>9050</port>
+            </proxy>
+        </proxy-chain>
+    </option>
+</forwarding>
diff --git a/net-proxy/bfilter/files/forwarding.xml b/net-proxy/bfilter/files/forwarding.xml
new file mode 100644
index 000000000000..9b62c6bfc4a9
--- /dev/null
+++ b/net-proxy/bfilter/files/forwarding.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<forwarding>
+    <option name="Direct" selected="selected">
+    </option>
+</forwarding>