Be compatible with newer glib and in general more future proof, bug 212246

(Portage version: 2.1.4.4)

4 files changed, 39 insertions, 5 deletions

diff --git a/gnome-base/libbonobo/ChangeLog b/gnome-base/libbonobo/ChangeLog
index 6a1e9f5366a2..d21a4b4d3629 100644
--- a/gnome-base/libbonobo/ChangeLog
+++ b/gnome-base/libbonobo/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for gnome-base/libbonobo
 # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/libbonobo/ChangeLog,v 1.148 2008/02/04 04:37:31 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/libbonobo/ChangeLog,v 1.149 2008/03/11 21:11:27 leio Exp $
+
+  11 Mar 2008; Mart Raudsepp <leio@gentoo.org> libbonobo-2.18.0.ebuild,
+  libbonobo-2.20.3.ebuild, libbonobo-2.20.4.ebuild:
+  Be compatible with newer glib and in general more future proof, bug 212246
 
   04 Feb 2008; Jeroen Roovers <jer@gentoo.org> libbonobo-2.20.3.ebuild:
   Stable for HPPA (bug #208366).
diff --git a/gnome-base/libbonobo/libbonobo-2.18.0.ebuild b/gnome-base/libbonobo/libbonobo-2.18.0.ebuild
index 265d2e18f532..2e4c47adf10c 100644
--- a/gnome-base/libbonobo/libbonobo-2.18.0.ebuild
+++ b/gnome-base/libbonobo/libbonobo-2.18.0.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/libbonobo/libbonobo-2.18.0.ebuild,v 1.12 2007/09/22 05:31:09 tgall Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/libbonobo/libbonobo-2.18.0.ebuild,v 1.13 2008/03/11 21:11:27 leio Exp $
 
 inherit gnome2
 
@@ -28,3 +28,13 @@ DOCS="AUTHORS ChangeLog NEWS README TODO"
 pkg_setup() {
 	G2CONF="$(use_enable debug bonobo-activation-debug)"
 }
+
+src_unpack() {
+	gnome2_src_unpack
+
+	sed -i -e '/DISABLE_DEPRECATED/d' \
+		"${S}/activation-server/Makefile.am" "${S}/activation-server/Makefile.in" \
+		"${S}/bonobo/Makefile.am" "${S}/bonobo/Makefile.in"
+	sed -i -e 's:-DG_DISABLE_DEPRECATED ::g' \
+		"${S}/tests/test-activation/Makefile.am" "${S}/tests/test-activation/Makefile.in"
+}
diff --git a/gnome-base/libbonobo/libbonobo-2.20.3.ebuild b/gnome-base/libbonobo/libbonobo-2.20.3.ebuild
index 870c271475e7..ebc6379468fc 100644
--- a/gnome-base/libbonobo/libbonobo-2.20.3.ebuild
+++ b/gnome-base/libbonobo/libbonobo-2.20.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/libbonobo/libbonobo-2.20.3.ebuild,v 1.7 2008/02/04 04:37:31 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/libbonobo/libbonobo-2.20.3.ebuild,v 1.8 2008/03/11 21:11:27 leio Exp $
 
 inherit gnome2
 
@@ -28,3 +28,13 @@ DOCS="AUTHORS ChangeLog NEWS README TODO"
 pkg_setup() {
 	G2CONF="${G2CONF} $(use_enable debug bonobo-activation-debug)"
 }
+
+src_unpack() {
+	gnome2_src_unpack
+
+	sed -i -e '/DISABLE_DEPRECATED/d' \
+		"${S}/activation-server/Makefile.am" "${S}/activation-server/Makefile.in" \
+		"${S}/bonobo/Makefile.am" "${S}/bonobo/Makefile.in"
+	sed -i -e 's:-DG_DISABLE_DEPRECATED ::g' \
+		"${S}/tests/test-activation/Makefile.am" "${S}/tests/test-activation/Makefile.in"
+}
diff --git a/gnome-base/libbonobo/libbonobo-2.20.4.ebuild b/gnome-base/libbonobo/libbonobo-2.20.4.ebuild
index 59cc6500d96d..2a0f6e630832 100644
--- a/gnome-base/libbonobo/libbonobo-2.20.4.ebuild
+++ b/gnome-base/libbonobo/libbonobo-2.20.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/libbonobo/libbonobo-2.20.4.ebuild,v 1.1 2008/02/03 22:02:56 leio Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/libbonobo/libbonobo-2.20.4.ebuild,v 1.2 2008/03/11 21:11:27 leio Exp $
 
 inherit gnome2
 
@@ -28,3 +28,13 @@ DOCS="AUTHORS ChangeLog NEWS README TODO"
 pkg_setup() {
 	G2CONF="${G2CONF} $(use_enable debug bonobo-activation-debug)"
 }
+
+src_unpack() {
+	gnome2_src_unpack
+
+	sed -i -e '/DISABLE_DEPRECATED/d' \
+		"${S}/activation-server/Makefile.am" "${S}/activation-server/Makefile.in" \
+		"${S}/bonobo/Makefile.am" "${S}/bonobo/Makefile.in"
+	sed -i -e 's:-DG_DISABLE_DEPRECATED ::g' \
+		"${S}/tests/test-activation/Makefile.am" "${S}/tests/test-activation/Makefile.in"
+}