Fix glib dependency, bug #467334 by Pim Vullers; drop old.

Package-Manager: portage-2.1.11.62/cvs/Linux x86_64
Manifest-Sign-Key: 0xA188FBD4

7 files changed, 17 insertions, 205 deletions

diff --git a/x11-wm/mutter/ChangeLog b/x11-wm/mutter/ChangeLog
index f094026b9bdb..e61527a24c21 100644
--- a/x11-wm/mutter/ChangeLog
+++ b/x11-wm/mutter/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for x11-wm/mutter
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/mutter/ChangeLog,v 1.25 2013/04/20 09:55:16 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/mutter/ChangeLog,v 1.26 2013/04/26 19:36:11 pacho Exp $
+
+  26 Apr 2013; Pacho Ramos <pacho@gentoo.org>
+  -files/mutter-3.4.1-meta_window_move_frame-crash.patch,
+  -files/mutter-3.8.0-build-redefine.patch,
+  -files/mutter-3.8.0-font-crash.patch, -mutter-3.8.0.ebuild,
+  mutter-3.8.1.ebuild:
+  Fix glib dependency, bug #467334 by Pim Vullers; drop old.
 
 *mutter-3.8.1 (20 Apr 2013)
 
diff --git a/x11-wm/mutter/Manifest b/x11-wm/mutter/Manifest
index c6a4da048f9f..44907d1f4e14 100644
--- a/x11-wm/mutter/Manifest
+++ b/x11-wm/mutter/Manifest
@@ -2,21 +2,16 @@
 Hash: SHA256
 
 AUX mutter-3.2.1-ignore-shadow-and-padding.patch 2640 SHA256 765c04ba4d177789407a25d3cbdf358e3fa125170cfd37c53095372bc4ec883d SHA512 ba04a2265be9b2816ada33cb2dcf71ff02eb8667ada7c41139fc9e44e85a37030b8f0b7eb8064af2b6e691539a6dae5a0f8e66e06e2e3b803287eec798f13b52 WHIRLPOOL e85a2e27c9f036156dca68276793ea4bee5381ca43acdd85e7a37b4f577c6ae581be70866fa390a62fa4edf57d78b133185062642c96f30053a0b36f8c946893
-AUX mutter-3.4.1-meta_window_move_frame-crash.patch 1779 SHA256 5e8b565a223cab1055ecd65a85381ffd69f547b1efeb7b23ff69295869f6dfd8 SHA512 946b88a84b87d8f7a31120376633293e9dc3601a6aa1be846922f2333d0412a14c4b24712115bec88cc38cca027c88bd031cdb28d0be02ff2a736c3d891a791f WHIRLPOOL e8cfa08890a50d17acf5e004c2ddb265dc6c17c7549a53d462e93f15006b07970e7c0fccea647c3f02db3ded3cd7e9f031ebcfa9ed6d273fc5217c647938827f
-AUX mutter-3.8.0-build-redefine.patch 830 SHA256 8b3f0f879a959d17622ab278aab101e055613df14691c0a521ea82ac3ea15f34 SHA512 a145c79d019341771f00a4405c3d502f5aa931c5f7fb8d16667f760b75f6286fd65e721bf85b230583c27a56d00c45883f427a08999bfb0dcfe941878d70ef6c WHIRLPOOL ff8d582f33f6017acfbbdbac3e69ab8e2f2a6d1dcb62c52eef6d8ad852492bcf3df3c016e6d0cfb1ca546bb0e73498957c014e456674da1edb0d84d2e68e366d
-AUX mutter-3.8.0-font-crash.patch 1379 SHA256 ca10569f5179822351b136e129af5dd35376e0d6dd063efc9067233ca61087ce SHA512 257644194c6aadcf0f266badf9c46c025ec5e9cd6ad6a3cd75ac9ab69451ba77339b960a28451c128304306c310810f2ce86fbe985522f2d6e7a5ac841beb5ea WHIRLPOOL b08bb790d5258cf897b4fb2f26f715cbb4ce68151d9f93ce6ee25c6f8d0a6dce7288c46f83861df54698e1170ae03574641661175757cf893fcee02d623204fe
 DIST mutter-3.6.3.tar.xz 1619444 SHA256 aa1d558210d58f9a835a7e718a6b6eb8318ac8fb276c43234c47b1efde755c86 SHA512 e4b62b348fa993521b29b201a91f0682d862f5ddf08135e6e733c695562ca8a4e50500cfe2dd4f93c5b87198688e7913513cb1994b9b628acb10bec8ee0be404 WHIRLPOOL 3bb0f9d1d7ffdf6e9d064ced15d1120204dd319d3602f9ee88b5e44e95a101060c24354e93dd736341112648424cc879b38c36d837a64e69e4989f360d3b6906
-DIST mutter-3.8.0.tar.xz 1733000 SHA256 93ab8b7fac58582d9178766118046c4255a7f2f302c74391d7f9f32fde57aa1a SHA512 8e6309bd049a90fa61d8e87a68d34209b1e8d3b0725f1ebde2c0004e793e19a196a74b878f48b7c88282a96c3d6618cf6e9eabed02d49bc3305ab5df16eb0c9a WHIRLPOOL cf1f5f313f6a55b42188a5092cf0857aa2b2c1910169cb6ef3c5d93bf3163562f25efbf8e1639d4bec4d1bdc168aa03f77a6c63061971a058b408fb0df792680
 DIST mutter-3.8.1.tar.xz 1733380 SHA256 a41a992620e7e51b6a34709db26a215e86f03927e828b4db03e9111d925ef52f SHA512 e29cdebb3d996be1c88d0b2f6447a7026c1b26287ced61a2de2dba1bf2ae942eb35b74122ad2bfc53852d2eadb86c367757bbfd84fecaecbbfee8b7813954957 WHIRLPOOL 0a0bdcbd290c922e411e4480aa74cdc231ce25b7fb77f7ff969895203fca823ca3e535495b247ddd2bc136753ae27078ebc1aa0e84f1c6fb65babbcb71143f23
 EBUILD mutter-3.6.3.ebuild 1984 SHA256 7d26010d27f5340c46e658f4d76222874800c291b2fa1b681cbd2cda7e5bc4df SHA512 f120c24232fa54d0e08b68d32c97405c6519f6aff87d855e740b314ce9dec231e380c8d895b6c9bf3df07f2d5f65257727d0444e7a293249331da183e72900c0 WHIRLPOOL 4abf5f1a187ea8dedbbdc0be96999f96d7fed63dc49cc5e9edf97ab230cb089310c9d162e1829f061f67dd1ef2300093d8479ff7353c85a7c9efa42e8d96ce99
-EBUILD mutter-3.8.0.ebuild 2200 SHA256 d2c2a5ae68c1469ca084f45f2c64943f09ab2cd6563a3822c12368058d0197be SHA512 b12a1b3e8b530100be6c43547ca74e9c9c07e355cc9977e70b4d71112359f95f91bbb955eb6252b153ff9b9b2147a0aa2a3e7796316c64103bb81443b34e7d3d WHIRLPOOL e9b0db7432a56b27879239bebd6e78026d765a05f3b2c90a04cd55f7f1ced470d5f69848bf50ef77ad3532b1bbbaee32372b49fe8135fc742566d132180ec328
-EBUILD mutter-3.8.1.ebuild 2009 SHA256 0b86d7362050bf3640b7d5c14449d6cebb0d60d2cd42e41a652aa85a4893d8a8 SHA512 692d38fafde09d9281c1501514a13e348f607f2bd7090ec79bef195e17eac79bebbad29c84028aab917460132c04ebdc3d1d4d72aca9ee7f19b7db72d722970a WHIRLPOOL 84759dc9fdb7bb863e79b400368df49e65f4557eb07778254b8aa4091e3d8e43f8620637e0eae42d29dcd271d423685b861d49e38ef000906637824da1b480b2
-MISC ChangeLog 4582 SHA256 3ec1449316a30a843d5f1e4cfc5e211a03f0078b3187ae60207b1eb509bafd0d SHA512 2ccf0ec62a486f0b2354cc081f1f39c755c25b7ffef76cee068f37a493a051959a1af10b1417a464febb181a5fc2a612bee03b663035815c62eb798ef36a5785 WHIRLPOOL ff78ed475f0b28743a35ab45459682ed3ae3f9d0cbbcc03e953e4010b110e23994917fd379d431eda7b0ebb698f3085835e38c4c56f61bb891bf90cb8ae7de3c
+EBUILD mutter-3.8.1.ebuild 2010 SHA256 40d7532666c4e54c519099bbe08e6317adc04aeac10f02b2dcea17f02613bc90 SHA512 4dab88b41a76edccfdcc0783ee6c6b05601ed14303203d1f4dd57d727bfc8ba19dbdd01b9e25d86c8361e0ba37718065e03ac5421f8c418cb4422dc1c0cd28ad WHIRLPOOL 82777133d009e2e0b14206c42855d82d4071c649222653a38b11c4e5a74778d14ef67bb18b073f5f359a978c26021aff4dc22e9d27080c5629e4aa692c8d67d6
+MISC ChangeLog 4877 SHA256 35ec939a19c2827652f71b8cf54a5c88b6c7406fab4e1f970f26a4319b471f87 SHA512 5b78250cb5038408f2b1f7475c2871c92fef5fbde0cfefaeb94ee436f45d7375efa4af41b714f93bfc237a29cbd0001a6fce13a2b9057d45e855babc47afc5cf WHIRLPOOL a9e457aa2cc3d538f67a50c19aec2aa014723185bfc3f3d275955e3feaa9f08e8451d3f01cc5090de0addd64ee751df9eeaf1054bccbf5a4a9f407827eaa8d34
 MISC metadata.xml 158 SHA256 3a7dbca0fdc557de69783e0663e2d76ddab129ea8a19b2d0ef6d3e5d1b947ce1 SHA512 7fbfbd2b3ed1b81867d55648509f778fdbe2091af53727b3426a3c7f453ae7e1663a99fdd2101508b8d6c85b3158459c93551b77a6a394f02d7e11cbc8a5ecf4 WHIRLPOOL 4bcd5662974877d42ebc4361b6eb412bfeea2af7144b436ce7ed152327d554afc321c376625ba0bb85a704b70d86e3c4882dff3573047acddd8ffccf655d4f7e
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEAREIAAYFAlFyZgUACgkQCaWpQKGI+9TXVQCeKi3JNjW2+E5RqBsg6yBMDG5v
-rnAAn2IuJ+3QWDW3sWuVtx3efHHBxk1w
-=Vl10
+iEYEAREIAAYFAlF61ywACgkQCaWpQKGI+9QGYgCff4u/dYx27wayeE/ASKDTFowl
+u5QAn3nSbd4HNhAbOeAOkyjLVrRO3AHS
+=U93b
 -----END PGP SIGNATURE-----
diff --git a/x11-wm/mutter/files/mutter-3.4.1-meta_window_move_frame-crash.patch b/x11-wm/mutter/files/mutter-3.4.1-meta_window_move_frame-crash.patch
deleted file mode 100644
index 1d23c1bf3064..000000000000
--- a/x11-wm/mutter/files/mutter-3.4.1-meta_window_move_frame-crash.patch
+++ /dev/null
@@ -1,53 +0,0 @@
-From 5e453f41befcd86f96ab0f0493fa64ac0f45d87b Mon Sep 17 00:00:00 2001
-From: "Owen W. Taylor" <otaylor@fishsoup.net>
-Date: Tue, 1 May 2012 13:40:08 -0400
-Subject: [PATCH] meta_window_move_frame(): fix crash when frame is NULL
-
-When meta_frame_calc_borders() was made to take a NULL frame argument,
-a crash was accidentally introduced into meta_window_move_frame().
-
-This partially reverts 8c1b2d5.
-
-https://bugzilla.gnome.org/show_bug.cgi?id=675254
----
- src/core/window.c |   22 ++++++++++++----------
- 1 files changed, 12 insertions(+), 10 deletions(-)
-
-diff --git a/src/core/window.c b/src/core/window.c
-index 204bc0c..9e4b93c 100644
---- a/src/core/window.c
-+++ b/src/core/window.c
-@@ -5108,18 +5108,20 @@ meta_window_move_frame (MetaWindow  *window,
- {
-   int x = root_x_nw;
-   int y = root_y_nw;
--  MetaFrameBorders borders;
--
--  meta_frame_calc_borders (window->frame, &borders);
- 
--  /* root_x_nw and root_y_nw correspond to where the top of
--   * the visible frame should be. Offset by the distance between
--   * the origin of the window and the origin of the enclosing
--   * window decorations.
--   */
--  x += window->frame->child_x - borders.invisible.left;
--  y += window->frame->child_y - borders.invisible.top;
-+  if (window->frame)
-+    {
-+      MetaFrameBorders borders;
-+      meta_frame_calc_borders (window->frame, &borders);
- 
-+      /* root_x_nw and root_y_nw correspond to where the top of
-+       * the visible frame should be. Offset by the distance between
-+       * the origin of the window and the origin of the enclosing
-+       * window decorations.
-+       */
-+      x += window->frame->child_x - borders.invisible.left;
-+      y += window->frame->child_y - borders.invisible.top;
-+    }
-   meta_window_move (window, user_op, x, y);
- }
- 
--- 
-1.7.8.6
-
diff --git a/x11-wm/mutter/files/mutter-3.8.0-build-redefine.patch b/x11-wm/mutter/files/mutter-3.8.0-build-redefine.patch
deleted file mode 100644
index f62ffda33e75..000000000000
--- a/x11-wm/mutter/files/mutter-3.8.0-build-redefine.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-From 992a15e6401114a67450dcf10b080044caab6b31 Mon Sep 17 00:00:00 2001
-From: Jasper Lievisse Adriaanse <jasper@humppa.nl>
-Date: Fri, 29 Mar 2013 15:59:26 +0000
-Subject: Don't redefine MetaBackgroundPrivate, fixing a build issue:
-
-compositor/meta-background.c:64: error: redefinition of typedef 'MetaBackgroundPrivate'
-./meta/meta-background.h:51: error: previous declaration of 'MetaBackgroundPrivate' was here
----
-diff --git a/src/compositor/meta-background.c b/src/compositor/meta-background.c
-index d15b06c..727000f 100644
---- a/src/compositor/meta-background.c
-+++ b/src/compositor/meta-background.c
-@@ -61,7 +61,6 @@
-  *
-  * This object provides a ClutterContent object to assist in sharing between actors.
-  */
--typedef struct _MetaBackgroundPrivate MetaBackgroundPrivate;
- 
- struct _MetaBackgroundPrivate
- {
---
-cgit v0.9.1
diff --git a/x11-wm/mutter/files/mutter-3.8.0-font-crash.patch b/x11-wm/mutter/files/mutter-3.8.0-font-crash.patch
deleted file mode 100644
index f345b2db0372..000000000000
--- a/x11-wm/mutter/files/mutter-3.8.0-font-crash.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-From f1620abfad0caf85b5958e32736accb3fecef7f1 Mon Sep 17 00:00:00 2001
-From: Bastien Nocera <hadess@hadess.net>
-Date: Fri, 29 Mar 2013 07:38:46 +0000
-Subject: ui: Fix crash getting default font
-
-A correctly constructed GtkStyleContext must have its screen
-and widget paths set. Getting the frame font caused crashes
-on some systems because those were not correctly initialised.
-
-https://bugzilla.gnome.org/show_bug.cgi?id=696814
----
-diff --git a/src/ui/ui.c b/src/ui/ui.c
-index 2f2fc3a..af28263 100644
---- a/src/ui/ui.c
-+++ b/src/ui/ui.c
-@@ -744,7 +744,17 @@ meta_ui_theme_get_frame_borders (MetaUI *ui,
- 
-       if (!font_desc)
-         {
-+          GdkDisplay *display = gdk_x11_lookup_xdisplay (ui->xdisplay);
-+          GdkScreen *screen = gdk_display_get_screen (display, XScreenNumberOfScreen (ui->xscreen));
-+          GtkWidgetPath *widget_path;
-+
-           style = gtk_style_context_new ();
-+          gtk_style_context_set_screen (style, screen);
-+          widget_path = gtk_widget_path_new ();
-+          gtk_widget_path_append_type (widget_path, GTK_TYPE_WINDOW);
-+          gtk_style_context_set_path (style, widget_path);
-+          gtk_widget_path_free (widget_path);
-+
-           gtk_style_context_get (style, GTK_STATE_FLAG_NORMAL, "font", &free_font_desc, NULL);
-           font_desc = (const PangoFontDescription *) free_font_desc;
-         }
---
-cgit v0.9.1
diff --git a/x11-wm/mutter/mutter-3.8.0.ebuild b/x11-wm/mutter/mutter-3.8.0.ebuild
deleted file mode 100644
index 17cb33644765..000000000000
--- a/x11-wm/mutter/mutter-3.8.0.ebuild
+++ /dev/null
@@ -1,81 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/mutter/mutter-3.8.0.ebuild,v 1.2 2013/03/31 13:23:41 pacho Exp $
-
-EAPI="5"
-GCONF_DEBUG="yes"
-
-inherit eutils gnome2
-
-DESCRIPTION="GNOME 3 compositing window manager based on Clutter"
-HOMEPAGE="http://git.gnome.org/browse/mutter/"
-
-LICENSE="GPL-2+"
-SLOT="0"
-IUSE="+introspection test"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-
-COMMON_DEPEND=">=x11-libs/pango-1.2[X,introspection?]
-	>=x11-libs/cairo-1.10[X]
-	x11-libs/gdk-pixbuf:2[introspection?]
-	>=x11-libs/gtk+-3.3.7:3[X,introspection?]
-	>=dev-libs/glib-2.25.11:2
-	>=media-libs/clutter-1.13.5:1.0[introspection?]
-	>=media-libs/cogl-1.13.3:1.0=[introspection?]
-	>=media-libs/libcanberra-0.26[gtk3]
-	>=x11-libs/startup-notification-0.7
-	>=x11-libs/libXcomposite-0.2
-	>=gnome-base/gsettings-desktop-schemas-3.7.3[introspection?]
-
-	x11-libs/libICE
-	x11-libs/libSM
-	x11-libs/libX11
-	x11-libs/libXcursor
-	x11-libs/libXdamage
-	x11-libs/libXext
-	x11-libs/libXfixes
-	x11-libs/libXinerama
-	x11-libs/libXrandr
-	x11-libs/libXrender
-	>=x11-libs/libXi-1.6.2
-
-	gnome-extra/zenity
-
-	introspection? ( >=dev-libs/gobject-introspection-0.9.5 )
-"
-DEPEND="${COMMON_DEPEND}
-	>=dev-util/intltool-0.35
-	sys-devel/gettext
-	virtual/pkgconfig
-	x11-proto/xextproto
-	x11-proto/xineramaproto
-	x11-proto/xproto
-	test? ( app-text/docbook-xml-dtd:4.5 )
-"
-RDEPEND="${COMMON_DEPEND}
-	!x11-misc/expocity"
-
-src_prepare() {
-	DOCS="AUTHORS ChangeLog HACKING MAINTAINERS NEWS README *.txt doc/*.txt"
-	G2CONF="${G2CONF}
-		--disable-static
-		--enable-shape
-		--enable-sm
-		--enable-startup-notification
-		--enable-xsync
-		--enable-verbose-mode
-		--enable-compile-warnings=maximum
-		--with-libcanberra
-		$(use_enable introspection)"
-
-	# Compat with Ubuntu metacity themes (e.g. x11-themes/light-themes)
-	epatch "${FILESDIR}/${PN}-3.2.1-ignore-shadow-and-padding.patch"
-
-	# Fix crash getting default font (from master)
-	epatch "${FILESDIR}/${PN}-3.8.0-font-crash.patch"
-
-	# Don't redefine MetaBackgroundPrivate, fixing a build issue (from master)
-	epatch "${FILESDIR}/${PN}-3.8.0-build-redefine.patch"
-
-	gnome2_src_prepare
-}
diff --git a/x11-wm/mutter/mutter-3.8.1.ebuild b/x11-wm/mutter/mutter-3.8.1.ebuild
index 37f3b3cf9212..7945c2b9ae47 100644
--- a/x11-wm/mutter/mutter-3.8.1.ebuild
+++ b/x11-wm/mutter/mutter-3.8.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/mutter/mutter-3.8.1.ebuild,v 1.1 2013/04/20 09:55:16 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/mutter/mutter-3.8.1.ebuild,v 1.2 2013/04/26 19:36:11 pacho Exp $
 
 EAPI="5"
 GCONF_DEBUG="yes"
@@ -15,11 +15,12 @@ SLOT="0"
 IUSE="+introspection test"
 KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 
-COMMON_DEPEND=">=x11-libs/pango-1.2[X,introspection?]
+COMMON_DEPEND="
+	>=x11-libs/pango-1.2[X,introspection?]
 	>=x11-libs/cairo-1.10[X]
 	x11-libs/gdk-pixbuf:2[introspection?]
 	>=x11-libs/gtk+-3.3.7:3[X,introspection?]
-	>=dev-libs/glib-2.25.11:2
+	>=dev-libs/glib-2.36.0:2
 	>=media-libs/clutter-1.13.5:1.0[introspection?]
 	>=media-libs/cogl-1.13.3:1.0=[introspection?]
 	>=media-libs/libcanberra-0.26[gtk3]