Fix glib-2.32 compilation, bug #412671 by Mark. Drop old.

(Portage version: 2.1.10.56/cvs/Linux x86_64)

4 files changed, 52 insertions, 80 deletions

diff --git a/net-proxy/bfilter/ChangeLog b/net-proxy/bfilter/ChangeLog
index 9ee4d29af12c..93ad202128f4 100644
--- a/net-proxy/bfilter/ChangeLog
+++ b/net-proxy/bfilter/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-proxy/bfilter
-# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-proxy/bfilter/ChangeLog,v 1.28 2011/03/29 06:17:49 nirbheek Exp $
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-proxy/bfilter/ChangeLog,v 1.29 2012/04/20 19:36:53 pacho Exp $
+
+  20 Apr 2012; Pacho Ramos <pacho@gentoo.org>
+  +files/bfilter-1.1.4-glib-2.32.patch, -bfilter-1.1.4.ebuild,
+  bfilter-1.1.4-r1.ebuild:
+  Fix glib-2.32 compilation, bug #412671 by Mark. Drop old.
 
   29 Mar 2011; Nirbheek Chauhan <nirbheek@gentoo.org> bfilter-1.1.4.ebuild,
   bfilter-1.1.4-r1.ebuild:
diff --git a/net-proxy/bfilter/bfilter-1.1.4-r1.ebuild b/net-proxy/bfilter/bfilter-1.1.4-r1.ebuild
index 93d2c26930d0..69df1d2dfd0d 100644
--- a/net-proxy/bfilter/bfilter-1.1.4-r1.ebuild
+++ b/net-proxy/bfilter/bfilter-1.1.4-r1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 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.2 2011/03/29 06:17:49 nirbheek Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-proxy/bfilter/bfilter-1.1.4-r1.ebuild,v 1.3 2012/04/20 19:36:53 pacho Exp $
 
-EAPI=2
+EAPI=4
 
 inherit eutils autotools
 
@@ -27,6 +27,7 @@ DEPEND="${RDEPEND}
 RESTRICT="test" # boost's test API has changed
 
 src_prepare() {
+	epatch "${FILESDIR}"/${P}-glib-2.32.patch
 	epatch "${FILESDIR}"/${P}-external-boost.patch
 	rm -rf "${S}"/boost
 	eautoreconf
@@ -36,11 +37,11 @@ src_configure() {
 	econf \
 		$(use_enable debug) \
 		$(use_with X gui) \
-		--without-builtin-boost || die "econf failed"
+		--without-builtin-boost
 }
 
 src_install() {
-	emake DESTDIR="${D}" install || die "make install failed"
+	emake DESTDIR="${D}" install
 	insinto /etc/bfilter
 	doins "${FILESDIR}"/forwarding.xml
 
diff --git a/net-proxy/bfilter/bfilter-1.1.4.ebuild b/net-proxy/bfilter/bfilter-1.1.4.ebuild
deleted file mode 100644
index 38a682fca077..000000000000
--- a/net-proxy/bfilter/bfilter-1.1.4.ebuild
+++ /dev/null
@@ -1,73 +0,0 @@
-# Copyright 1999-2011 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.ebuild,v 1.4 2011/03/29 06:17:49 nirbheek Exp $
-
-EAPI=1 # needed for slot dependencies
-
-WANT_AUTOMAKE="latest"
-WANT_AUTOCONF="none"
-
-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
-
-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
-	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.4-glib-2.32.patch b/net-proxy/bfilter/files/bfilter-1.1.4-glib-2.32.patch
new file mode 100644
index 000000000000..7b4068b758e3
--- /dev/null
+++ b/net-proxy/bfilter/files/bfilter-1.1.4-glib-2.32.patch
@@ -0,0 +1,39 @@
+Index: bfilter-1.1.4/main/gui/gtk/CompiledImage.h
+===================================================================
+--- bfilter-1.1.4.orig/main/gui/gtk/CompiledImage.h
++++ bfilter-1.1.4/main/gui/gtk/CompiledImage.h
+@@ -24,7 +24,7 @@
+ #include <config.h>
+ #endif
+ 
+-#include <glib/gtypes.h>
++#include <glib.h>
+ #include <glibmm/refptr.h>
+ #include <gdkmm/pixbuf.h>
+ #include <stddef.h>
+Index: bfilter-1.1.4/main/gui/gtk/TrayMenu.h
+===================================================================
+--- bfilter-1.1.4.orig/main/gui/gtk/TrayMenu.h
++++ bfilter-1.1.4/main/gui/gtk/TrayMenu.h
+@@ -25,7 +25,7 @@
+ #endif
+ 
+ #include "NonCopyable.h"
+-#include <glib/gtypes.h>
++#include <glib.h>
+ #include <memory>
+ 
+ namespace GtkGUI
+Index: bfilter-1.1.4/main/gui/gtk/img2src.sh
+===================================================================
+--- bfilter-1.1.4.orig/main/gui/gtk/img2src.sh
++++ bfilter-1.1.4/main/gui/gtk/img2src.sh
+@@ -4,7 +4,7 @@ cat <<END
+ /* This file was generated by img2src.sh */
+ 
+ #include "CompiledImage.h"
+-#include <glib/gtypes.h>
++#include <glib.h>
+ 
+ END
+