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

Package-Manager: portage-2.1.4.4

5 files changed, 46 insertions, 12 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/Manifest b/gnome-base/libbonobo/Manifest
index d9b30a5fba59..3d7565e6cf4a 100644
--- a/gnome-base/libbonobo/Manifest
+++ b/gnome-base/libbonobo/Manifest
@@ -4,15 +4,15 @@ Hash: SHA1
 DIST libbonobo-2.18.0.tar.bz2 1441461 RMD160 2a95cf29b60e900ce1979d97afaf778d0c515137 SHA1 eb397ca58f9fd3f751422b461803a0d14e3835ff SHA256 55b37d7863683d6947bdff6da7caec9ddd8a8001aac3e97a7b9d5e91898685aa
 DIST libbonobo-2.20.3.tar.bz2 1423158 RMD160 326ebf58d8540a8be27593617af1df9da11d75eb SHA1 4200a3d6812368fe43fb469873e50063013ccacb SHA256 1a146483a836a4dbd7f01a73eed8815fcde996d49ef5c94f15741a9dc4b2f295
 DIST libbonobo-2.20.4.tar.bz2 1446532 RMD160 9d417058f20154daabf9885e4606f87ee1e0055a SHA1 15928d04861eedda6377b83375e9de66b6683bbe SHA256 81796573e99c2a70255684e49d3326d2341cd6dd918082e53fdf9792c3f9168a
-EBUILD libbonobo-2.18.0.ebuild 810 RMD160 83ce76ed529da905d798c4367356d520dd373015 SHA1 687e8ed1144fbcb7904df95fdd8f0e0180c7a9ec SHA256 cac21c07bd191d0002b46c7a1115ed75e146e3283844fad57c0258f35bb18b12
-EBUILD libbonobo-2.20.3.ebuild 820 RMD160 9f7976a2593da905046adee3a6191700dded48db SHA1 debbb6e90d93706aa27b9ed137f84b2179c2e70d SHA256 142038fa978024f7c5a9b588dccf41b545f933569a43922ca55d0c231d60cea6
-EBUILD libbonobo-2.20.4.ebuild 829 RMD160 5112d9498247c77c0996708500f6094ea504ff3d SHA1 57dc023ed60e13718129c2f101644bf25c3c2cc3 SHA256 86f21547e2ee3babf9c913d0d7bf19e734b21fb4ac3c8a74826cf5ba87a602cc
-MISC ChangeLog 16442 RMD160 a01ee50467f19d458a40556af30c8cbe6a7d34d8 SHA1 cf6d5b3b1c0e4bc054e8f145b38e1e7ebd58128c SHA256 bb9d5d72b3e9fe8422d5f91cb00513e4fb4738398c5588b1f97e62017b3f3620
+EBUILD libbonobo-2.18.0.ebuild 1144 RMD160 b14ee6076e42c7a5229a6c1f9fe7f88383afeaac SHA1 50d38af6a7697c5c59297c32699e14c837082be0 SHA256 7d08a730d07252a6dcfe63648882125b5969240f96270d874523a880bbcb1b85
+EBUILD libbonobo-2.20.3.ebuild 1156 RMD160 da98db066ffe75ffd061a998f97337c57e3ec248 SHA1 55c20767dd98e76aa27c1e452594a25b60d4ea63 SHA256 616be1c801bbbc4c0088c77f71ae2d4fa7392a69b47a0b1ff9209947d75554ee
+EBUILD libbonobo-2.20.4.ebuild 1164 RMD160 27950525c3ea5fb5073bd113d40bda419d4fe2af SHA1 e466a2b941805db1986a884a518e57f6020a7873 SHA256 c4b308fbf81f108d1b9a001e0e697e3b99fe2efeb1e8989d2a68365f46a1dd83
+MISC ChangeLog 16645 RMD160 d5bc46318d1049e1a9764729eb54e9fbbf09620e SHA1 8bc3931a9b5adfee84502661a886db806ae676ed SHA256 8df7c461239427b076caddab6441d28df2d1a13f45e0cae503d69234a464eb27
 MISC metadata.xml 158 RMD160 c0e2bae8e91bb6be8922bac5e4f597302e06587e SHA1 38f78e9790bcd4382b4a49aa226aa6dda1d3a3d7 SHA256 3a7dbca0fdc557de69783e0663e2d76ddab129ea8a19b2d0ef6d3e5d1b947ce1
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.8 (GNU/Linux)
 
-iEYEARECAAYFAkfUWisACgkQkeYb6olFHJcwxgCg0h53lIUZODEYwp1+/k2L6mih
-OYUAnRXJUESrWsjY+1Pqr/5VeBhkzM8Q
-=01TS
+iEYEARECAAYFAkfW9UsACgkQkeYb6olFHJdjawCeJg+CAs6K8mqEd0fwG/zhRdHv
+194AoP9ovmKKsKfMSGNLZN+7HCFappVb
+=1HMa
 -----END PGP SIGNATURE-----
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"
+}