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

Package-Manager: portage-2.1.4.4

diff --git a/gnome-base/gnome-vfs/ChangeLog b/gnome-base/gnome-vfs/ChangeLog
index f6505211af91749298e2ac86003e1664e8af82b8..a9038cbe33c746647c43f0679be7fb522b52bee2 100644 (file)
--- a/gnome-base/gnome-vfs/ChangeLog
+++ b/gnome-base/gnome-vfs/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for gnome-base/gnome-vfs
 # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-vfs/ChangeLog,v 1.282 2008/02/04 04:45:21 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-vfs/ChangeLog,v 1.283 2008/03/11 21:58:27 leio Exp $
+
+  11 Mar 2008; Mart Raudsepp <leio@gentoo.org> gnome-vfs-2.18.1.ebuild,
+  gnome-vfs-2.20.1-r1.ebuild:
+  Be compatible with newer glib and in general more future proof, bug 212163
 
   04 Feb 2008; Jeroen Roovers <jer@gentoo.org> gnome-vfs-2.20.1-r1.ebuild:
   Stable for HPPA (bug #208366).

diff --git a/gnome-base/gnome-vfs/Manifest b/gnome-base/gnome-vfs/Manifest
index f8743a950e55bb1bbbb3fad342db65fa1f2c7ad1..ab7c966fc8a91e3e18b9d9b15b1403b9aae829c1 100644 (file)
--- a/gnome-base/gnome-vfs/Manifest
+++ b/gnome-base/gnome-vfs/Manifest
@@ -10,14 +10,14 @@ AUX gnome-vfs-2.20.0-home_dir_fakeroot.patch 5197 RMD160 1d2b5909c8ea2c901597ed3
 AUX gnome-vfs-2.20.1-automagic-deps.patch 643 RMD160 0e984be0bf21114192174b87ed9cb9b91df38ff9 SHA1 75c330ed9dd352aae758c7691d766ba7df1a7885 SHA256 7d50fa5944125190ce0b0d47013bc4ff4fbfe2908520828dc9ced80d9b47ed02
 DIST gnome-vfs-2.18.1.tar.bz2 1916897 RMD160 ff2fc7a7c47b85a03d65964a8ad1d7d585698f3d SHA1 e939fe4fe2e75516ae6c4d476f8fb44f59ec8bdc SHA256 098d920cb7d4a50e245deaafabfd8e06b86c88771d56be567597c09c09207f5e
 DIST gnome-vfs-2.20.1.tar.bz2 1890300 RMD160 faa5fffb5495d1e161cb6c3b47612cf39cbb1629 SHA1 03afa10e84425f7f38e05f0db0ecf55ae5fb7b15 SHA256 37475d17350b0e54b2e0b7bdcd7effd04eafd96b4b07604ff7d941377dd112d3
-EBUILD gnome-vfs-2.18.1.ebuild 2446 RMD160 300a9074d471041aab06e3d8dc15daf375231e6c SHA1 6413bcf8ed4687d191bf14ca9c3ed4069fdd3e82 SHA256 27358725fc9ca7c204f82ee61914240c2de93ae628f109f71245ad99764cb7b0
-EBUILD gnome-vfs-2.20.1-r1.ebuild 2694 RMD160 e9ee8f5c27b016fe4de6de36f4b810ae474125c6 SHA1 d4fe1d22ad1ecb70c57a88d3cd934b982dd5c929 SHA256 5c13481b82d244fd159db8eec4c9cb42d3fc0834bdc2b442d7a44d64a0ebcd1d
-MISC ChangeLog 36668 RMD160 3364edc5cef72d0bc5c120b049316c3500e464f8 SHA1 0486b9cf2654854d4b6ae36eae54e8e911c6ba40 SHA256 0a5f241fb88901c8b004a597037c93661194f6b62809a13f51c0cea0ec7d4fb3
+EBUILD gnome-vfs-2.18.1.ebuild 2911 RMD160 84258e4951db9ea461409d8e22df3e2500c83d2a SHA1 990b855f774d9e23efcb26c07bec2c7f8ed4245f SHA256 3b4958fba8e9f363f3a4cb92f3650c4ccfad65366a295df62cda5c0b71e833cf
+EBUILD gnome-vfs-2.20.1-r1.ebuild 3160 RMD160 75e2dae79f0311ca9fe23ac908c5a59ed16e5b0f SHA1 a4d71c02e725c69c061a918975c3d9ee4c1e7909 SHA256 65585d78fbaf08aa2e34a544ed7dd0ef741a4c1047df5ace5c196a070d496398
+MISC ChangeLog 36849 RMD160 d6fc864970c17a324fcabbddeebb23f951db4d83 SHA1 a47e8a5822ec9ff329e99f28f95c7fb73d1798a9 SHA256 a97a1913c295cfba19c10484b5898760bc3749407e3f1df8c9becef8e96b919a
 MISC metadata.xml 158 RMD160 c0e2bae8e91bb6be8922bac5e4f597302e06587e SHA1 38f78e9790bcd4382b4a49aa226aa6dda1d3a3d7 SHA256 3a7dbca0fdc557de69783e0663e2d76ddab129ea8a19b2d0ef6d3e5d1b947ce1
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.8 (GNU/Linux)
 
-iEYEARECAAYFAkfVt6gACgkQkeYb6olFHJff+gCcDQltKd2xJiDkkowCHCkJcjjJ
-+xsAoNjgSAlvIiSzowYSbjTsb0XmMOhV
-=bH7q
+iEYEARECAAYFAkfXAFIACgkQkeYb6olFHJdwzACgq7NplKqxDzr4alFhcOzNOaSN
+nqoAnAx/CHYpKwqq/Td8TOUHY6uEmjQv
+=bY/v
 -----END PGP SIGNATURE-----

diff --git a/gnome-base/gnome-vfs/gnome-vfs-2.18.1.ebuild b/gnome-base/gnome-vfs/gnome-vfs-2.18.1.ebuild
index b825bdbc0fc3ceefcf46a164b126dfde9a52f254..3cdf1b65d81c36fcd1cfc526133da4f9aa7d6b49 100644 (file)
--- a/gnome-base/gnome-vfs/gnome-vfs-2.18.1.ebuild
+++ b/gnome-base/gnome-vfs/gnome-vfs-2.18.1.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/gnome-vfs/gnome-vfs-2.18.1.ebuild,v 1.13 2008/03/10 22:35:59 leio Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-vfs/gnome-vfs-2.18.1.ebuild,v 1.14 2008/03/11 21:58:27 leio Exp $
 
 WANT_AUTOMAKE=1.8
 inherit eutils gnome2 autotools
@@ -87,6 +87,15 @@ src_unpack() {
 
        use doc || epatch "${FILESDIR}/${PN}-2.18.1-drop-gtk-doc-check.patch"
 
+       # Fix deprecated API disabling in used libraries - this is not future-proof, bug 212163
+       sed -i -e '/DISABLE_DEPRECATED/d' \
+               "${S}/daemon/Makefile.am" "${S}/daemon/Makefile.in" \
+               "${S}/libgnomevfs/Makefile.am" "${S}/libgnomevfs/Makefile.in" \
+               "${S}/modules/Makefile.am" "${S}/modules/Makefile.in" \
+               "${S}/test/Makefile.am" "${S}/test/Makefile.in"
+       sed -i -e 's:-DG_DISABLE_DEPRECATED:$(NULL):g' \
+               "${S}/programs/Makefile.am" "${S}/programs/Makefile.in"
+
        eautoreconf
        intltoolize --force
 }

diff --git a/gnome-base/gnome-vfs/gnome-vfs-2.20.1-r1.ebuild b/gnome-base/gnome-vfs/gnome-vfs-2.20.1-r1.ebuild
index 7993a65e7e3e60db45d684356cc2181783bb15eb..a2473854cf9c3f6d94984db2cb03c5d252b62465 100644 (file)
--- a/gnome-base/gnome-vfs/gnome-vfs-2.20.1-r1.ebuild
+++ b/gnome-base/gnome-vfs/gnome-vfs-2.20.1-r1.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/gnome-vfs/gnome-vfs-2.20.1-r1.ebuild,v 1.7 2008/02/04 04:45:21 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-vfs/gnome-vfs-2.20.1-r1.ebuild,v 1.8 2008/03/11 21:58:27 leio Exp $
 
 WANT_AUTOMAKE=1.8
 inherit eutils gnome2 autotools
@@ -100,6 +100,15 @@ src_unpack() {
 
        use doc || epatch "${FILESDIR}/${PN}-2.18.1-drop-gtk-doc-check.patch"
 
+       # Fix deprecated API disabling in used libraries - this is not future-proof, bug 212163
+       sed -i -e '/DISABLE_DEPRECATED/d' \
+               "${S}/daemon/Makefile.am" "${S}/daemon/Makefile.in" \
+               "${S}/libgnomevfs/Makefile.am" "${S}/libgnomevfs/Makefile.in" \
+               "${S}/modules/Makefile.am" "${S}/modules/Makefile.in" \
+               "${S}/test/Makefile.am" "${S}/test/Makefile.in"
+       sed -i -e 's:-DG_DISABLE_DEPRECATED:$(NULL):g' \
+               "${S}/programs/Makefile.am" "${S}/programs/Makefile.in"
+
        eautoreconf
        intltoolize --force
 }