From d659f2b6398604d0aa9fe982223232bd13897874 Mon Sep 17 00:00:00 2001 From: Alexandre Rostovtsev Date: Wed, 14 Dec 2011 19:58:13 +0000 Subject: [PATCH] Do not use gnome2_schemas_update --uninstall; --uninstall has no effect since glib-2.25.11, and has been removed in 2.31.x (bug #394501, thanks to Marc-Antoine Perennou for reporting). Package-Manager: portage-2.2.0_alpha80/cvs/Linux x86_64 --- x11-libs/gtk+/ChangeLog | 9 ++++++++- x11-libs/gtk+/Manifest | 18 +++++++++--------- x11-libs/gtk+/gtk+-3.0.12-r1.ebuild | 4 ++-- x11-libs/gtk+/gtk+-3.0.12.ebuild | 4 ++-- x11-libs/gtk+/gtk+-3.2.1.ebuild | 4 ++-- x11-libs/gtk+/gtk+-3.2.2-r1.ebuild | 4 ++-- x11-libs/gtk+/gtk+-3.2.2.ebuild | 4 ++-- 7 files changed, 27 insertions(+), 20 deletions(-) diff --git a/x11-libs/gtk+/ChangeLog b/x11-libs/gtk+/ChangeLog index a58d363f2ebf..910bcefe9559 100644 --- a/x11-libs/gtk+/ChangeLog +++ b/x11-libs/gtk+/ChangeLog @@ -1,6 +1,13 @@ # ChangeLog for x11-libs/gtk+ # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/x11-libs/gtk+/ChangeLog,v 1.552 2011/11/17 03:15:34 tetromino Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-libs/gtk+/ChangeLog,v 1.553 2011/12/14 19:58:13 tetromino Exp $ + + 14 Dec 2011; Alexandre Rostovtsev gtk+-3.0.12.ebuild, + gtk+-3.0.12-r1.ebuild, gtk+-3.2.1.ebuild, gtk+-3.2.2.ebuild, + gtk+-3.2.2-r1.ebuild: + Do not use gnome2_schemas_update --uninstall; --uninstall has no effect since + glib-2.25.11, and has been removed in 2.31.x (bug #394501, thanks to + Marc-Antoine Perennou for reporting). *gtk+-2.24.8-r1 (17 Nov 2011) diff --git a/x11-libs/gtk+/Manifest b/x11-libs/gtk+/Manifest index cf3133a7b37c..b01913f3add2 100644 --- a/x11-libs/gtk+/Manifest +++ b/x11-libs/gtk+/Manifest @@ -39,17 +39,17 @@ EBUILD gtk+-2.24.5-r1.ebuild 7811 RMD160 42262f81762fc564a77438335d9780fe0b33934 EBUILD gtk+-2.24.6.ebuild 7676 RMD160 b36290f910c27eee2fc2ddd0a4c506c71b92a6f3 SHA1 845a413728db1fc707b641175808ea97785c02ad SHA256 a02fc317af27b02b9dea43adab64c1845ae5f3a2b7ed346875cadd9e4f5d6ba2 EBUILD gtk+-2.24.7.ebuild 7680 RMD160 72bb82e782cf3cbc41509b8d353186fdc781e821 SHA1 a5bd93f5415443d7b3c8a9413c99140aa9d68801 SHA256 a92648d881e6b15915136bde60e473ebb6f078b3554eae8d1988e3af47a7401c EBUILD gtk+-2.24.8-r1.ebuild 7989 RMD160 519f95e20f118fd572e341d775ea5f10532b2ffe SHA1 1c440bf3b9675fbfda789f6bb92a719042e7b306 SHA256 18fbc8c2be538883368ba9469e7ccf39757dba0f28625295cbe6c15d3df1bd8e -EBUILD gtk+-3.0.12-r1.ebuild 6168 RMD160 0f1671e21ae1d8f5296cef76abc76e8529d5fcf3 SHA1 ce3f023df86242370b1ce92a5dfeaa008e9019ce SHA256 bfb696209c581aff44462759223770dea30cc41a2be608fd96169dc34ec9faab -EBUILD gtk+-3.0.12.ebuild 5924 RMD160 304c8786053b789687d2179b017e2bc8b6538943 SHA1 b15b6ffc22ae2c709af8249f8283d1150e209d20 SHA256 a28b2ead97e9a6d44d2aab8db2811befd406444ca7733ca5d4eb3851301f4c9e -EBUILD gtk+-3.2.1.ebuild 6248 RMD160 78c1cb16b8ed44fdcf8d9dc30b9d68be006cb230 SHA1 a792484cda6857875f17b163b39aba3908c5507e SHA256 c0389b5bb1f3537f096b6229f72bec022503f0ceda061a5646d1150d75b41a25 -EBUILD gtk+-3.2.2-r1.ebuild 6487 RMD160 a97e95a52550b20f499aa022a495e81950953983 SHA1 f9da3a0e020fca36ec4d3fe1026768c139e78d9c SHA256 830169ea374d0d4b2c1a64f5a45d33bb894557e4842b56ed83cbe0a6975e59c1 -EBUILD gtk+-3.2.2.ebuild 6400 RMD160 b56f4af2dcd010df43ea2d8608d519a31ce7e1ae SHA1 1d71a0979bc6bbd936aca03dcfa1c8988679b5f5 SHA256 813f9a4f6c2bd5d497808bf3ad5f605f36e12bc85e29efa40c7561f45c37cb1f -MISC ChangeLog 83990 RMD160 a12e539e12504c76379d1e75a7daedb959eef61f SHA1 7e487bd1feb248ba421c38eb508da0228d0c0a05 SHA256 25fb3e2fbf7b8b89d171e30ca35567fcf936865151283046422e29498cd8e2bd +EBUILD gtk+-3.0.12-r1.ebuild 6158 RMD160 d2fa789aa709cfe016e52c35c4c4eea72001b3de SHA1 71e7290bda484de1ec4f8d4b3b361c3e9eb280be SHA256 b71bfe7153b7b1d3b128a435157c59aeaea06a930ae5f9179ba27e45793462cf +EBUILD gtk+-3.0.12.ebuild 5914 RMD160 855ced0d7473e2c06411ffe7b88bc667663e8443 SHA1 b573ae7f942ba95de6c485b0884ad28c4f9432d4 SHA256 955f5ab87289a900b1ed275a803d910497067b4a5c9dba682b202b4aae8f0c6a +EBUILD gtk+-3.2.1.ebuild 6236 RMD160 513668f35c2bc20dbcd3721bcada49ea36694297 SHA1 9aaf2156ac04521c65af2506a13357400b6fa633 SHA256 d7587f9be4ad79401bf7cae3d5a8db1135f89f91d31d6ce9be48f637fe47ba3e +EBUILD gtk+-3.2.2-r1.ebuild 6476 RMD160 af140bb2a3ca691a8e0983545e1dfcbea80d1ad6 SHA1 8b243a68f5d616403127f9308ddfed3c0f34c9f7 SHA256 03681c40256004ba29f398adedba6a0cbb490fb2c134f4adbc1816268a5cf1fd +EBUILD gtk+-3.2.2.ebuild 6388 RMD160 f47e3cc109f30c01a10e61855377a43ad618e9ac SHA1 4ec8d5ddf43686bf4420cebf85b7d7eab81bd415 SHA256 47f511c2d4911d4eaa5569205063b74a76b0b93146142c5332d79825841d2aea +MISC ChangeLog 84348 RMD160 a6b9b6a286b28f8e965471b8350c1a3d28fc368a SHA1 c081e6366a03b709b2e30cfa748e2bdb6183f63b SHA256 eafd82f4f42d949ddd03d2bd676f69e0c84cdd056e22d8c790af150a0104dc51 MISC metadata.xml 798 RMD160 9c1c01af06ea6cb0d398d66eda999eba1ec6880a SHA1 13f2860e4e48abb065d70fd85b7073074624ec28 SHA256 634c27d323d01eecbcda3159df57a7cc64557e2a0087eac60e6d9e3d94acd85c -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.18 (GNU/Linux) -iF4EAREIAAYFAk7EfFwACgkQdjK8w9WeBnD4ewD9FD4N1z/E2vrYD9HaW00dL8jE -HXH/xIJgXy7FPbLRTkcBAKaruefaS+IMJP2abTa7QS8IVxnberAj9ym4wtZO/4ot -=6JqF +iF4EAREIAAYFAk7o/9wACgkQdjK8w9WeBnCzzwEAgX7FIzay4dStCeNQGiEBBSCt +zirqzhctZzx7OA+sOjIA/ihv0sVQYc3BeaI66G/19VbiBPNRoyiTQzw5PcYUaQsq +=b6Yf -----END PGP SIGNATURE----- diff --git a/x11-libs/gtk+/gtk+-3.0.12-r1.ebuild b/x11-libs/gtk+/gtk+-3.0.12-r1.ebuild index fa98f7b5b3f2..8ef423dec8fb 100644 --- a/x11-libs/gtk+/gtk+-3.0.12-r1.ebuild +++ b/x11-libs/gtk+/gtk+-3.0.12-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/x11-libs/gtk+/gtk+-3.0.12-r1.ebuild,v 1.7 2011/10/30 15:50:41 armin76 Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-libs/gtk+/gtk+-3.0.12-r1.ebuild,v 1.8 2011/12/14 19:58:13 tetromino Exp $ EAPI="4" @@ -190,5 +190,5 @@ pkg_postinst() { } pkg_postrm() { - gnome2_schemas_update --uninstall + gnome2_schemas_update } diff --git a/x11-libs/gtk+/gtk+-3.0.12.ebuild b/x11-libs/gtk+/gtk+-3.0.12.ebuild index 4e0f3bf659a0..ca52fa5f9bb8 100644 --- a/x11-libs/gtk+/gtk+-3.0.12.ebuild +++ b/x11-libs/gtk+/gtk+-3.0.12.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/x11-libs/gtk+/gtk+-3.0.12.ebuild,v 1.3 2011/09/04 09:10:11 grobian Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-libs/gtk+/gtk+-3.0.12.ebuild,v 1.4 2011/12/14 19:58:13 tetromino Exp $ EAPI="4" @@ -183,5 +183,5 @@ pkg_postinst() { } pkg_postrm() { - gnome2_schemas_update --uninstall + gnome2_schemas_update } diff --git a/x11-libs/gtk+/gtk+-3.2.1.ebuild b/x11-libs/gtk+/gtk+-3.2.1.ebuild index e9d8904fa47b..f8a57c259a3a 100644 --- a/x11-libs/gtk+/gtk+-3.2.1.ebuild +++ b/x11-libs/gtk+/gtk+-3.2.1.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/x11-libs/gtk+/gtk+-3.2.1.ebuild,v 1.5 2011/10/28 05:09:08 tetromino Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-libs/gtk+/gtk+-3.2.1.ebuild,v 1.6 2011/12/14 19:58:13 tetromino Exp $ EAPI="4" @@ -191,5 +191,5 @@ pkg_postinst() { } pkg_postrm() { - gnome2_schemas_update --uninstall + gnome2_schemas_update } diff --git a/x11-libs/gtk+/gtk+-3.2.2-r1.ebuild b/x11-libs/gtk+/gtk+-3.2.2-r1.ebuild index c314f0fcf048..124c3b18a331 100644 --- a/x11-libs/gtk+/gtk+-3.2.2-r1.ebuild +++ b/x11-libs/gtk+/gtk+-3.2.2-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/x11-libs/gtk+/gtk+-3.2.2-r1.ebuild,v 1.1 2011/11/16 23:44:46 nirbheek Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-libs/gtk+/gtk+-3.2.2-r1.ebuild,v 1.2 2011/12/14 19:58:13 tetromino Exp $ EAPI="4" @@ -196,5 +196,5 @@ pkg_postinst() { } pkg_postrm() { - gnome2_schemas_update --uninstall + gnome2_schemas_update } diff --git a/x11-libs/gtk+/gtk+-3.2.2.ebuild b/x11-libs/gtk+/gtk+-3.2.2.ebuild index 076b77fb8cb9..d6770ae2e0ee 100644 --- a/x11-libs/gtk+/gtk+-3.2.2.ebuild +++ b/x11-libs/gtk+/gtk+-3.2.2.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/x11-libs/gtk+/gtk+-3.2.2.ebuild,v 1.3 2011/11/16 21:54:12 tetromino Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-libs/gtk+/gtk+-3.2.2.ebuild,v 1.4 2011/12/14 19:58:13 tetromino Exp $ EAPI="4" @@ -194,5 +194,5 @@ pkg_postinst() { } pkg_postrm() { - gnome2_schemas_update --uninstall + gnome2_schemas_update } -- 2.26.2