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

Package-Manager: portage-2.1.10.56/cvs/Linux x86_64

5 files changed, 58 insertions, 96 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/Manifest b/net-proxy/bfilter/Manifest
index 861712cf5f37..9c4b74ebae34 100644
--- a/net-proxy/bfilter/Manifest
+++ b/net-proxy/bfilter/Manifest
@@ -2,29 +2,19 @@
 Hash: SHA1
 
 AUX bfilter-1.1.4-external-boost.patch 2435 RMD160 5baaf162c6c497fe7b6896850348af1308f29adc SHA1 c3f2bc06b1f38e73ae05c3eabfc76e13ba7a9b60 SHA256 0e82a8afe9b15eab6010ed65e442d7e0f949d0e50d29eb60760ebbd41ac8332c
+AUX bfilter-1.1.4-glib-2.32.patch 1084 RMD160 a85266470663eafd568e53f241f0607fa9c341c1 SHA1 54636ac868b6290d9cdee89c0faeb1d9b40e707a SHA256 231dda9fd40017ce913bd047cb9fa8d5cc2d43f2790f92780b8dc23268cc9875
 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 9411da4200ebafc04f05e749421b9901119c93c9 SHA1 16fd1cf78eef264180bd3b34afb76850547fe7ff SHA256 a8ae3ecf24dd27074c9862b3d466931ba7d139f1e25d78cb46ba6243b358d514
-EBUILD bfilter-1.1.4.ebuild 1659 RMD160 1d0c0a4f9fedc687fd83decf6dc414a7222d774d SHA1 50bf06992ef220f9df70b5a0ac4f1f5b84c4ba65 SHA256 1f02dcccb561e6e52f4fbd9757dfdf11bd0bd044ee3780dc3c33f78ef54ee4c4
-MISC ChangeLog 4973 RMD160 f5c85730425a6904c292494335b58cbb07537fb2 SHA1 3e4dd36b172654e1b294dc0d5eebbd5c55e7da8b SHA256 a1502349a881f30d83dbbb6d31462431e865cb756dfb6afb41ce35c03126cb45
+EBUILD bfilter-1.1.4-r1.ebuild 1573 RMD160 af5861c62d56dc54d8c275b7a4ba96cb8a3ca0ae SHA1 fc9678ec57b0ba82258a84eb4d05c4585a462a42 SHA256 48c543fd7662b24bfaa96a9fce0734844169a726f460a5c005c23207dff25550
+MISC ChangeLog 5167 RMD160 1554191c8479ebf9719db93070772bfb26f0b69c SHA1 a3fb1223158257bbb0efa6d65d57f8866d4c10eb SHA256 15ebcb5786c47857ddac3f858ab0ba5ed96d8dbffceed4588cd7c0683242454b
 MISC metadata.xml 1179 RMD160 8c400bff89b9b1d57734d02e398dafab91ac3617 SHA1 26ef9a1488d051ec492969dc21e00cae5db09271 SHA256 b2001c292c1d59a2797b9861713b2d3c0ef3e453d0daeeaaa03d9d914a725d3a
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iQIcBAEBAgAGBQJNkXmUAAoJEO/kOhxWD91kPfAP/j1VNmXGwq2DRNqgR4K5zs+k
-cp3+TuorOpbMYr5niZUY4qi/+a+5y+2RJv7eT8n059vhQRjsW7yqTPNCmVHBDSJR
-6B/hdOTujW6yE0H+GvNKQDyShuIlpg2lucS+nuNh+HAM+h50jVPHtpCukT4y1qcq
-3TD5Pxwb6IQHIgQ1TXjl7biwkHT19gQNJBC6hnEcxSNCmXbfP4dplwobV6imW+oA
-BTvtssleMQD5TZvWRzTPcCPBJhgxPFA7QMmy4pfq56b7SW4TRQL13NtPz/IG+ILq
-b6WQX23nEVaLwss50gbVtpbQboafYAdi263hU6aR5wf+KPJlZnfQdrKCdUZMf+ac
-d3D3qe5BY3M67xDqCDy74xLJUupF3iWrJaIw93Bf1vq1qbBhNtCOQak9fs5ZH/dT
-LINBpd7xB2Q5c2bgtxN2KbXPUDxiqDIqFwl7hFSnE+uHGuMG9X5OUPtzITpgPhPZ
-DGY8Ev2szwmF+ZUueEr6qYrpKRlyWhM+ex/Z0wLCkTNFNig0/GqH9tZ2MuhsleHf
-eEJ0tQtu9gv7gJuAaywEEVsMSdViXMagpyDuf8jMvVPrcsge/ZqQtMZJjDUeClEv
-NXQpMek5hdD45parZNP69QlEQOSlUuiDVSTnuiNmJTtpxy6/Z1sLqotD3Qng5eQU
-ZIYDW5rPGE+kjSPuecGU
-=K/hL
+iEYEARECAAYFAk+RutsACgkQCaWpQKGI+9RKkQCePHzNgNTjCTnLQDmOIjFpjkgq
+sYIAn2ouuAXL+UpI35eM8QqPomXp58bo
+=XgzO
 -----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
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
+