Remove -DG_DISABLE_DEPRECATED and -DGDK_PIXBUF_DISABLE_DEPRECATED also from Makefile...

Package-Manager: portage-2.2.0_alpha59/cvs/Linux x86_64

diff --git a/gnome-base/nautilus/ChangeLog b/gnome-base/nautilus/ChangeLog
index e0ebb1a387669a0a191bdd5cd9f35e55d1183e7e..05037f40e0f0cca36575fd85b534798b2ba3af10 100644 (file)
--- a/gnome-base/nautilus/ChangeLog
+++ b/gnome-base/nautilus/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for gnome-base/nautilus
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/nautilus/ChangeLog,v 1.382 2011/09/22 15:43:04 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/nautilus/ChangeLog,v 1.383 2011/10/01 21:10:09 ssuominen Exp $
+
+  01 Oct 2011; Samuli Suominen <ssuominen@gentoo.org>
+  nautilus-2.32.2.1-r1.ebuild:
+  Remove -DG_DISABLE_DEPRECATED and -DGDK_PIXBUF_DISABLE_DEPRECATED also from
+  Makefile in eel/ to allow building against glib-2.30 and pango-1.28.
 
   22 Sep 2011; Pacho Ramos <pacho@gentoo.org> nautilus-2.32.2.1-r1.ebuild,
   nautilus-3.0.2.ebuild:

diff --git a/gnome-base/nautilus/Manifest b/gnome-base/nautilus/Manifest
index 77eadaaa1b192d689c368c2cc0fb3cb22cf78b56..2cfc253eeb938c0b0fb8084d881acf86d40b2a6e 100644 (file)
--- a/gnome-base/nautilus/Manifest
+++ b/gnome-base/nautilus/Manifest
@@ -5,15 +5,19 @@ AUX nautilus-3.0.2-segfault-in-gtk_icon_info_load_symbolic.patch 3222 RMD160 34d
 DIST nautilus-2.32.2.1-patches.tar.bz2 6984 RMD160 44f6fd3f76dd96f265a9e47220930bf65055c4b6 SHA1 2d839f3f358828d9779a20f4792193b53c369c88 SHA256 0b756ba661d1f9ed0d2e49a469e6f390e941530309e08a7f9e6ac07b566180bb
 DIST nautilus-2.32.2.1.tar.bz2 6350203 RMD160 4498fc3c5dd2a4f13935b0366c175ad1b87bac1e SHA1 7b0a89cd965f4ca1531115d353b208bb2ba9db33 SHA256 802dacc98c697afea2e6201dab1c8c800809f235fff39857983efb4340ecc303
 DIST nautilus-3.0.2.tar.bz2 5636620 RMD160 f133abc4934e6fec0e2a2688ba5a212e923279a6 SHA1 f2a926132a8f6c21be1a0c931588b7fb526ea04a SHA256 6a4c6b75593f0e815763d0040878cd908da72318f18b05f33d24040e0d602b22
-EBUILD nautilus-2.32.2.1-r1.ebuild 2253 RMD160 1965996cb8997e83a90335d20ae083fc5a61ff63 SHA1 37e225ad251e687404a2b74f2f8dd9713bc5aae6 SHA256 c990beb18853b2f81ba989bdc334ec2cdf0f73841b7ca23a7bcb2e388d530889
+EBUILD nautilus-2.32.2.1-r1.ebuild 2263 RMD160 6bd8689474809be1cbd62fad4de8267bd94fb138 SHA1 a26ecf3f4d65e6b4dd2fc7ed978e1e0026bfdd9d SHA256 ee74bd2b394a5e0ba51712d17d03bec87b288b329aef8e911f69299266efef76
 EBUILD nautilus-2.32.2.1.ebuild 2077 RMD160 649e3c582283c58d51c4be76a9e11920e308d226 SHA1 65b8bb73a3a8103503fb045736eefb39a4b6d748 SHA256 b593e355936851547e90e65c0ed608ab6e1369d4bbd485a82cc6b8c06d45f354
 EBUILD nautilus-3.0.2.ebuild 2464 RMD160 51291b11286faf352a3a667801e5670deb94ca55 SHA1 c1381b03bda3a372e677c77d472ab574bf7413bd SHA256 26d328dfa3af2d57d5b89e3878309bb8c9281579bcb8767c96a38a1fe0e5628f
-MISC ChangeLog 56773 RMD160 302ad8848957353c72e848b62d6677764288ffb4 SHA1 02effa4798de9cc4e5961b1ccb940e9cc0642c12 SHA256 cff9c3ea34708bf044b566a8216765de459999c95ab803245f4d3fed19782dad
+MISC ChangeLog 57012 RMD160 96af6d99274bf05488850b9ae9c5daddeb71fc19 SHA1 5b4d5b71409c768996e97724bbe86af2588cbdcf SHA256 7084fbba90077f6bd312d76e31d2e8bedc18cae384cc6672319fef2404761249
 MISC metadata.xml 382 RMD160 1ebea648fbaed962049cb7f95f8c12dc530afc31 SHA1 f651d184f369b1aface2ab9a7d2ba13869ae0453 SHA256 c7243f8999b72a07e46dedc00e9e2568b30ab261971b9eb78a85595f4e2b07a5
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
+Version: GnuPG v2.0.18 (GNU/Linux)
 
-iEYEARECAAYFAk57V44ACgkQCaWpQKGI+9RozQCfUNaUcMNEOoSK5Bn2ahpSAzYY
-Lg8AnAoUJzkGYzB6nbc2JZOkB6/MjNQp
-=T5bT
+iQEcBAEBAgAGBQJOh4HXAAoJEEdUh39IaPFNBy0H/3eFRwBOvfNzgUy/Oenq4OzT
+Xu15ypfRkY6uD2A4gz1axSHQdOrh6y/ZBksvX5UBmr+6O/Fi8wD5IKl4Pw/Q/gTC
+T3qArZRT6rZl2FH8vL04a2h96u5ktorT7ZnU6BxvdYtjPRPvDe4oLYRvBoZq//wz
+/40isILcCLa0unv7QybosY6PyAVBoD0wxxi27iA0ISuoHTdoCkql1EX3eSczA9Hj
+x7rTcDsmAIJDrBoTYTgtv2CGHG7PW61k7/iO1Gm+DQWq5N1KHv534EqrW+dkbN4v
+RcXFf5lOoHp8AQoi1XGDbpH/x7fBb78cNKEXdKa6Bk8Gut0tidfx24u+4yxr4kY=
+=RBeN
 -----END PGP SIGNATURE-----

diff --git a/gnome-base/nautilus/nautilus-2.32.2.1-r1.ebuild b/gnome-base/nautilus/nautilus-2.32.2.1-r1.ebuild
index ddb45025abcd59e07f1d4cc1a00dffae78e1530a..49f20424ea50389ca3f5b4b8003a66dec9700743 100644 (file)
--- a/gnome-base/nautilus/nautilus-2.32.2.1-r1.ebuild
+++ b/gnome-base/nautilus/nautilus-2.32.2.1-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/nautilus/nautilus-2.32.2.1-r1.ebuild,v 1.7 2011/09/22 15:43:04 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/nautilus/nautilus-2.32.2.1-r1.ebuild,v 1.8 2011/10/01 21:10:09 ssuominen Exp $
 
 EAPI="3"
 GCONF_DEBUG="no"
@@ -60,8 +60,9 @@ src_prepare() {
        epatch "${WORKDIR}/${P}-patches"/*.patch
 
        # Remove crazy CFLAGS
-       sed 's:-DG.*DISABLE_DEPRECATED::g' -i configure.in configure \
-               || die "sed 1 failed"
+       sed -i \
+               -e 's:-DG.*DISABLE_DEPRECATED::g' \
+               configure{,.in} eel/Makefile.{am,in} || die
 }
 
 src_test() {