Fix bashism in init script. Patch gtkmm X11 underlinking; fixes bug #489328, reported by Mark (chaseguard).

(Portage version: HEAD/cvs/Linux x86_64, signed Manifest commit with key 6D34E57D)

4 files changed, 29 insertions, 9 deletions

diff --git a/net-proxy/bfilter/ChangeLog b/net-proxy/bfilter/ChangeLog
index 8e2502bdc7fc..071d92fe65d5 100644
--- a/net-proxy/bfilter/ChangeLog
+++ b/net-proxy/bfilter/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-proxy/bfilter
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-proxy/bfilter/ChangeLog,v 1.31 2012/07/29 16:14:37 armin76 Exp $
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-proxy/bfilter/ChangeLog,v 1.32 2013/11/30 16:28:06 tomwij Exp $
+
+  30 Nov 2013; Tom Wijsman <TomWij@gentoo.org>
+  +files/bfilter-1.1.4-gtkmm-X11-underlinking.patch, bfilter-1.1.4-r1.ebuild,
+  files/bfilter.init:
+  Fix bashism in init script. Patch gtkmm X11 underlinking; fixes bug #489328,
+  reported by Mark (chaseguard).
 
   29 Jul 2012; Raúl Porcel <armin76@gentoo.org> bfilter-1.1.4-r1.ebuild:
   Drop sparc keywords
@@ -153,4 +159,3 @@
   +files/bfilter.conf, +files/bfilter.init, +metadata.xml,
   +bfilter-0.9.4.ebuild:
   Initial import from bug #103947, thanks to Alan Swanson <swanson@ukfsn.org>.
-
diff --git a/net-proxy/bfilter/bfilter-1.1.4-r1.ebuild b/net-proxy/bfilter/bfilter-1.1.4-r1.ebuild
index fc4ef6690bcc..b00a94dc57be 100644
--- a/net-proxy/bfilter/bfilter-1.1.4-r1.ebuild
+++ b/net-proxy/bfilter/bfilter-1.1.4-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 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.5 2012/07/29 16:14:37 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-proxy/bfilter/bfilter-1.1.4-r1.ebuild,v 1.6 2013/11/30 16:28:06 tomwij Exp $
 
 EAPI=4
 
@@ -18,8 +18,9 @@ IUSE="X debug"
 RDEPEND="sys-libs/zlib
 	dev-libs/ace
 	dev-libs/libsigc++:2
-	X? ( dev-cpp/gtkmm:2.4 )
+	X? ( dev-cpp/gtkmm:2.4 x11-libs/libX11 )
 	dev-libs/boost"
+
 DEPEND="${RDEPEND}
 	dev-util/scons
 	virtual/pkgconfig"
@@ -29,6 +30,8 @@ RESTRICT="test" # boost's test API has changed
 src_prepare() {
 	epatch "${FILESDIR}"/${P}-glib-2.32.patch
 	epatch "${FILESDIR}"/${P}-external-boost.patch
+	epatch "${FILESDIR}"/${P}-gtkmm-X11-underlinking.patch
+
 	rm -rf "${S}"/boost
 	eautoreconf
 }
diff --git a/net-proxy/bfilter/files/bfilter-1.1.4-gtkmm-X11-underlinking.patch b/net-proxy/bfilter/files/bfilter-1.1.4-gtkmm-X11-underlinking.patch
new file mode 100644
index 000000000000..2a474e5d3867
--- /dev/null
+++ b/net-proxy/bfilter/files/bfilter-1.1.4-gtkmm-X11-underlinking.patch
@@ -0,0 +1,12 @@
+diff -Naur -u a/configure.in b/configure.in
+--- a/configure.in	2013-11-30 17:03:04.733971428 +0100
++++ b/configure.in	2013-11-30 17:03:21.231971410 +0100
+@@ -205,7 +205,7 @@
+   [ with_gui="no" ])
+ AM_CONDITIONAL(WITH_GUI, [test "$with_gui" = "yes"])
+ if test "$with_gui" = "yes"; then
+-  PKG_CHECK_MODULES(GTKMM, gtkmm-2.4 >= 2.4)
++  PKG_CHECK_MODULES(GTKMM, gtkmm-2.4 >= 2.4 x11)
+ dnl  PKG_CHECK_MODULES(GTHREAD, gthread-2.0 >= 2.0)
+ dnl  GTKMM_LIBS="$GTKMM_LIBS $GTHREAD_LIBS"
+   AC_SUBST(GTKMM_CFLAGS)
diff --git a/net-proxy/bfilter/files/bfilter.init b/net-proxy/bfilter/files/bfilter.init
index 3108e4db0f47..331d444d2b3a 100644
--- a/net-proxy/bfilter/files/bfilter.init
+++ b/net-proxy/bfilter/files/bfilter.init
@@ -1,7 +1,7 @@
 #!/sbin/runscript
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-proxy/bfilter/files/bfilter.init,v 1.2 2006/03/05 08:31:31 mrness Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-proxy/bfilter/files/bfilter.init,v 1.3 2013/11/30 16:28:06 tomwij Exp $
 
 depend() {
 	need net
@@ -9,7 +9,7 @@ depend() {
 
 checkresolvconf() {
 	#make /etc/bfilter/etc/resolv.conf if chroot is set
-	if [[ ${BFILTER_OPTS} == *" -r "* ]] ; then
+	if [ "${BFILTER_OPTS#* -r *}" != "${BFILTER_OPTS}" ] ; then
 		local CHROOTDIR="${BFILTER_OPTS#* -r }"
 		CHROOTDIR="${CHROOTDIR%% *}"
 		mkdir -p "${CHROOTDIR}/etc" || return 1