summaryrefslogtreecommitdiff
path: root/x11-wm
diff options
context:
space:
mode:
authorPacho Ramos <pacho@gentoo.org>2016-06-25 16:34:35 +0200
committerPacho Ramos <pacho@gentoo.org>2016-06-25 18:25:29 +0200
commit3d24f986e11bc027e9a32c742b543436004257d5 (patch)
treefc1c9734df0b86b538bd209916ccedfe8e2aeb7f /x11-wm
parentmedia-libs/clutter: Version bump (diff)
downloadgentoo-3d24f986e11bc027e9a32c742b543436004257d5.tar.gz
gentoo-3d24f986e11bc027e9a32c742b543436004257d5.tar.bz2
gentoo-3d24f986e11bc027e9a32c742b543436004257d5.zip
x11-wm/mutter: Drop old
Package-Manager: portage-2.3.0_rc1
Diffstat (limited to 'x11-wm')
-rw-r--r--x11-wm/mutter/Manifest3
-rw-r--r--x11-wm/mutter/files/mutter-3.16.3-fallback-keymap.patch28
-rw-r--r--x11-wm/mutter/files/mutter-3.18.2-bypass-hint.patch30
-rw-r--r--x11-wm/mutter/files/mutter-3.18.2-configure-notify.patch56
-rw-r--r--x11-wm/mutter/files/mutter-3.18.2-cursor-renderer.patch56
-rw-r--r--x11-wm/mutter/files/mutter-3.18.2-logical-monitors.patch35
-rw-r--r--x11-wm/mutter/files/mutter-3.18.2-wayland-crash.patch41
-rw-r--r--x11-wm/mutter/mutter-3.16.4.ebuild97
-rw-r--r--x11-wm/mutter/mutter-3.18.2-r1.ebuild111
-rw-r--r--x11-wm/mutter/mutter-3.18.2.ebuild90
-rw-r--r--x11-wm/mutter/mutter-3.18.3.ebuild90
11 files changed, 0 insertions, 637 deletions
diff --git a/x11-wm/mutter/Manifest b/x11-wm/mutter/Manifest
index 30d876d6cac..59877224e4d 100644
--- a/x11-wm/mutter/Manifest
+++ b/x11-wm/mutter/Manifest
@@ -1,4 +1 @@
-DIST mutter-3.16.4.tar.xz 1535572 SHA256 23e8601a594a207fcfdf570e10710539176d41dd43304ef7b274a59d09e305da SHA512 b2d199ad883bb90adfbc96317f4ccc655ed6ff700307503551cb8a4d0a42b7dc9024d1b914935b57c6f50bed90e9ce592179b07a4061a3664443aa012e6b4fd9 WHIRLPOOL 8084e9e43643ce65947856fe81ce29619a2dae22866fb5c42d83563b10dfe55104f18cf8c7f06bce650681df94f658a5438be8fbcc8a0da8a2c2ceaa880f7ab2
-DIST mutter-3.18.2.tar.xz 1468660 SHA256 8a69326f216c7575ed6cd53938b9cfc49b3b359cde95d3b6a7ed46c837261181 SHA512 99c138187e28a152d44421e240a9e644c56c74142ab125a0bf208ffaa3e711df9c319b37bbb9827ee3c79abce908aaf4ae6b6cb271b92d90add2642a39b74726 WHIRLPOOL 3c4f1e45a7306dedf8c9350ef130139f69a8d6a56c24ad4c1b52fd9120e72901b2898df0684fabb33a17ceec5261adfc340e09a65cbb1f90045aa34b9ec13342
-DIST mutter-3.18.3.tar.xz 1469556 SHA256 58dd88d5596bb0377ae3aed692b306995de45aefae9e215cfaf4b13287526846 SHA512 20829fc1cabbb507c81a68320d7807b07ae79745a28ae857fcfb05ea2324a0ba61c87fcd35d0f57de4861bc21ed67770d594db84325b5c0a9092c96897ae0fe5 WHIRLPOOL f23b5598ab6fb81d0234eaf64612c9ff78f8d9f413c2217e48cadf5db2b283ff8c4ef3e8eb0d6a189a87e4d6bd6e8a62e5450b09c531c9f3b5dc35db2b0b173f
DIST mutter-3.18.4.tar.xz 1469140 SHA256 3cd2d49ac269139a8860d84dfba4d5d5a8318c1510515b99681916ba8334d393 SHA512 2324de33f98fc7e1f6eca217411f289929eb22771b78e7615f569413ad90f63cadc5d3a4d280eb20cdb5490f1772fd64ca519bf7dc9246720569dba958b8d8b7 WHIRLPOOL 082370d2263885d8a3ec5f24bfb5fcdc5ff61c0f957e87ec9020b81a4fcdcd861ae51a0784b4a9fba6584422b2b163003de509dd09a4d126c2fa8a52bf99988f
diff --git a/x11-wm/mutter/files/mutter-3.16.3-fallback-keymap.patch b/x11-wm/mutter/files/mutter-3.16.3-fallback-keymap.patch
deleted file mode 100644
index f77234ba3b2..00000000000
--- a/x11-wm/mutter/files/mutter-3.16.3-fallback-keymap.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From 9abc0712836c9e56ed08796645874cc0d10b1826 Mon Sep 17 00:00:00 2001
-From: Rui Matos <tiagomatos@gmail.com>
-Date: Mon, 21 Sep 2015 17:25:40 +0200
-Subject: backend-x11: Fallback to a default keymap if getting it from X fails
-
-This shouldn't fail but apparently sometimes it does and in that case
-having a possibly wrong idea of the keymap is still better than
-crashing.
-
-https://bugzilla.gnome.org/show_bug.cgi?id=754979
-
-diff --git a/src/backends/x11/meta-backend-x11.c b/src/backends/x11/meta-backend-x11.c
-index 7ad28fd..dbcd13f 100644
---- a/src/backends/x11/meta-backend-x11.c
-+++ b/src/backends/x11/meta-backend-x11.c
-@@ -760,6 +760,9 @@ meta_backend_x11_get_keymap (MetaBackend *backend)
- priv->xcb,
- xkb_x11_get_core_keyboard_device_id (priv->xcb),
- XKB_KEYMAP_COMPILE_NO_FLAGS);
-+ if (priv->keymap == NULL)
-+ priv->keymap = xkb_keymap_new_from_names (context, NULL, XKB_KEYMAP_COMPILE_NO_FLAGS);
-+
- xkb_context_unref (context);
- }
-
---
-cgit v0.10.2
-
diff --git a/x11-wm/mutter/files/mutter-3.18.2-bypass-hint.patch b/x11-wm/mutter/files/mutter-3.18.2-bypass-hint.patch
deleted file mode 100644
index 9206cd78435..00000000000
--- a/x11-wm/mutter/files/mutter-3.18.2-bypass-hint.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From e5067368f5379af21a16ecbc890cbc9b80f46a55 Mon Sep 17 00:00:00 2001
-From: Rui Matos <tiagomatos@gmail.com>
-Date: Mon, 23 Nov 2015 15:17:38 +0100
-Subject: x11/window-props: Initialize bypass compositor hint
-
-If a client only ever sets the hint on window creation we'd never pick
-the value. Also, include override redirect windows since the hint is
-relevant to them too.
-
-https://bugzilla.gnome.org/show_bug.cgi?id=758544
----
- src/x11/window-props.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/x11/window-props.c b/src/x11/window-props.c
-index 3268bbc..0a67980 100644
---- a/src/x11/window-props.c
-+++ b/src/x11/window-props.c
-@@ -1843,7 +1843,7 @@ meta_display_init_window_prop_hooks (MetaDisplay *display)
- { display->atom__NET_WM_WINDOW_TYPE, META_PROP_VALUE_ATOM_LIST, reload_net_wm_window_type, LOAD_INIT | INCLUDE_OR | FORCE_INIT },
- { display->atom__NET_WM_STRUT, META_PROP_VALUE_INVALID, reload_struts, NONE },
- { display->atom__NET_WM_STRUT_PARTIAL, META_PROP_VALUE_INVALID, reload_struts, NONE },
-- { display->atom__NET_WM_BYPASS_COMPOSITOR, META_PROP_VALUE_CARDINAL, reload_bypass_compositor, NONE },
-+ { display->atom__NET_WM_BYPASS_COMPOSITOR, META_PROP_VALUE_CARDINAL, reload_bypass_compositor, LOAD_INIT | INCLUDE_OR },
- { display->atom__NET_WM_WINDOW_OPACITY, META_PROP_VALUE_CARDINAL, reload_window_opacity, LOAD_INIT | INCLUDE_OR },
- { 0 },
- };
---
-cgit v0.11.2
-
diff --git a/x11-wm/mutter/files/mutter-3.18.2-configure-notify.patch b/x11-wm/mutter/files/mutter-3.18.2-configure-notify.patch
deleted file mode 100644
index e697838e3b7..00000000000
--- a/x11-wm/mutter/files/mutter-3.18.2-configure-notify.patch
+++ /dev/null
@@ -1,56 +0,0 @@
-From 26a18e83125529605eda88a5eb60a884914c311c Mon Sep 17 00:00:00 2001
-From: Rui Matos <tiagomatos@gmail.com>
-Date: Wed, 16 Dec 2015 18:26:23 +0100
-Subject: x11/window: Ensure we send a ConfigureNotify to just mapped windows
-
-When managing a non-OR window we're required by the ICCCM to behave as
-if we received a ConfigureRequest which means that we must generate a
-synthetic ConfigureNotify even if the window isn't moved or resized
-from its current (initial) geometry.
-
-During MetaWindow's x11/wayland split a slight behavior change for x11
-windows crept in. Before the code split, MetaWindow->rect was
-initialized with the X window's geometry, but now we're not
-initializing MetaWindowX11Private->client_rect which causes the checks
-for whether it's necessary to move/resize the window in
-meta_window_x11_move_resize_internal() to tell us that we do need to
-move/resize which means we do an XConfigureWindow() call and don't
-send the sythetic ConfigureNotify. But since the X window isn't really
-moving, the XConfigureWindow() call doesn't cause the X server to
-generate a ConfigureNotify which breaks some clients such as Java's
-AWT.
-
-We can fix this by setting MetaWindowX11Privatew->client_rect for both
-OR and non-OR windows. We can set buffer_rect for non-OR windows as
-well to simplify the code since it will be assigned the correct value
-in meta_window_x11_move_resize_internal() .
-
-https://bugzilla.gnome.org/show_bug.cgi?id=759492
----
- src/x11/window-x11.c | 9 +++------
- 1 file changed, 3 insertions(+), 6 deletions(-)
-
-diff --git a/src/x11/window-x11.c b/src/x11/window-x11.c
-index b6e5621..de9f725 100644
---- a/src/x11/window-x11.c
-+++ b/src/x11/window-x11.c
-@@ -542,13 +542,10 @@ meta_window_x11_manage (MetaWindow *window)
- * For normal windows, do a full ConfigureRequest based on the
- * window hints, as that's what the ICCCM says to do.
- */
-+ priv->client_rect = window->rect;
-+ window->buffer_rect = window->rect;
-
-- if (window->override_redirect)
-- {
-- priv->client_rect = window->rect;
-- window->buffer_rect = window->rect;
-- }
-- else
-+ if (!window->override_redirect)
- {
- MetaRectangle rect;
- MetaMoveResizeFlags flags;
---
-cgit v0.11.2
-
diff --git a/x11-wm/mutter/files/mutter-3.18.2-cursor-renderer.patch b/x11-wm/mutter/files/mutter-3.18.2-cursor-renderer.patch
deleted file mode 100644
index b888cbd31de..00000000000
--- a/x11-wm/mutter/files/mutter-3.18.2-cursor-renderer.patch
+++ /dev/null
@@ -1,56 +0,0 @@
-From 58d2bd05815a8917460ec7231a1e50ed8cedf19f Mon Sep 17 00:00:00 2001
-From: Marek Chalupa <mchqwerty@gmail.com>
-Date: Mon, 9 Nov 2015 15:51:02 +0100
-Subject: cursor-renderer: do not update cursor if it is out of monitor
-
-if the cursor coordinates are out of monitor, just don't render the
-cursor
-
-https://bugzilla.gnome.org/show_bug.cgi?id=756698
----
- src/backends/meta-cursor-renderer.c | 15 +++++++++++++++
- 1 file changed, 15 insertions(+)
-
-diff --git a/src/backends/meta-cursor-renderer.c b/src/backends/meta-cursor-renderer.c
-index 48cd239..a76241b 100644
---- a/src/backends/meta-cursor-renderer.c
-+++ b/src/backends/meta-cursor-renderer.c
-@@ -27,6 +27,8 @@
- #include "meta-cursor-renderer.h"
-
- #include <meta/meta-backend.h>
-+#include <backends/meta-backend-private.h>
-+#include <backends/meta-monitor-manager-private.h>
- #include <meta/util.h>
-
- #include <cogl/cogl.h>
-@@ -116,6 +118,14 @@ meta_cursor_renderer_calculate_rect (MetaCursorRenderer *renderer,
- };
- }
-
-+static gboolean
-+is_cursor_in_monitors_area (int x, int y)
-+{
-+ MetaMonitorManager *monitor_manager = meta_backend_get_monitor_manager (meta_get_backend ());
-+ return meta_monitor_manager_get_monitor_at_point (monitor_manager,
-+ (gfloat) x, (gfloat) y) >= 0;
-+}
-+
- static void
- update_cursor (MetaCursorRenderer *renderer,
- MetaCursorSprite *cursor_sprite)
-@@ -124,6 +134,11 @@ update_cursor (MetaCursorRenderer *renderer,
- gboolean handled_by_backend;
- gboolean should_redraw = FALSE;
-
-+ /* do not render cursor if it is not on any monitor. Such situation
-+ * can occur e. g. after monitor hot-plug */
-+ if (!is_cursor_in_monitors_area (priv->current_x, priv->current_y))
-+ return;
-+
- if (cursor_sprite)
- meta_cursor_sprite_prepare_at (cursor_sprite,
- priv->current_x,
---
-cgit v0.11.2
-
diff --git a/x11-wm/mutter/files/mutter-3.18.2-logical-monitors.patch b/x11-wm/mutter/files/mutter-3.18.2-logical-monitors.patch
deleted file mode 100644
index 73962f094b5..00000000000
--- a/x11-wm/mutter/files/mutter-3.18.2-logical-monitors.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-From 958cdd5117cd2056076edc6cc52af1a3a929d262 Mon Sep 17 00:00:00 2001
-From: Rui Matos <tiagomatos@gmail.com>
-Date: Fri, 3 Jul 2015 18:01:14 +0200
-Subject: monitor-manager: Fix the max potential number of logical monitors
-
-The max potential number of logical monitors (i.e. MetaMonitorInfos)
-is the number of CRTCs, not the number of outputs.
-
-In cases where we have more enabled CRTCs than connected outputs we
-would end up appending more MetaMonitorInfos to the GArray than the
-size it was initialized with which means the array would get
-re-allocated rendering invalid some MetaCRTC->logical_monitor pointers
-assigned previously and thus ending in crashes later on.
-
-https://bugzilla.gnome.org/show_bug.cgi?id=751638
----
- src/backends/meta-monitor-manager.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/backends/meta-monitor-manager.c b/src/backends/meta-monitor-manager.c
-index 38ccc72..56a52bb 100644
---- a/src/backends/meta-monitor-manager.c
-+++ b/src/backends/meta-monitor-manager.c
-@@ -178,7 +178,7 @@ make_logical_config (MetaMonitorManager *manager)
- unsigned int i, j;
-
- monitor_infos = g_array_sized_new (FALSE, TRUE, sizeof (MetaMonitorInfo),
-- manager->n_outputs);
-+ manager->n_crtcs);
-
- /* Walk the list of MetaCRTCs, and build a MetaMonitorInfo
- for each of them, unless they reference a rectangle that
---
-cgit v0.11.2
-
diff --git a/x11-wm/mutter/files/mutter-3.18.2-wayland-crash.patch b/x11-wm/mutter/files/mutter-3.18.2-wayland-crash.patch
deleted file mode 100644
index a59c75e711a..00000000000
--- a/x11-wm/mutter/files/mutter-3.18.2-wayland-crash.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-From 2ea121a1869d21ef0726aca27abd02a3245d1d74 Mon Sep 17 00:00:00 2001
-From: Marek Chalupa <mchqwerty@gmail.com>
-Date: Thu, 2 Jul 2015 10:41:37 +0200
-Subject: wayland: bind wayland socket after xwayland is initialized
-
-During xwayland initialization we run main loop and dispatch wayland
-events, so that xwayland can initialize. If some client during this
-phase connects and creates surface, mutter crashes because
-it is not initialized yet. If we bind wayland socket after xwayland
-is initialized and main loop is not running anymore, no client can
-connect to mutter during initialization and that is what we want.
-
-https://bugzilla.gnome.org/show_bug.cgi?id=751845
----
- src/wayland/meta-wayland.c | 6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/src/wayland/meta-wayland.c b/src/wayland/meta-wayland.c
-index 0d37489..d51e8b5 100644
---- a/src/wayland/meta-wayland.c
-+++ b/src/wayland/meta-wayland.c
-@@ -337,13 +337,13 @@ meta_wayland_init (void)
- meta_wayland_pointer_gestures_init (compositor);
- meta_wayland_seat_init (compositor);
-
-+ if (!meta_xwayland_start (&compositor->xwayland_manager, compositor->wayland_display))
-+ g_error ("Failed to start X Wayland");
-+
- compositor->display_name = wl_display_add_socket_auto (compositor->wayland_display);
- if (compositor->display_name == NULL)
- g_error ("Failed to create socket");
-
-- if (!meta_xwayland_start (&compositor->xwayland_manager, compositor->wayland_display))
-- g_error ("Failed to start X Wayland");
--
- set_gnome_env ("DISPLAY", meta_wayland_get_xwayland_display_name (compositor));
- set_gnome_env ("WAYLAND_DISPLAY", meta_wayland_get_wayland_display_name (compositor));
- }
---
-cgit v0.11.2
-
diff --git a/x11-wm/mutter/mutter-3.16.4.ebuild b/x11-wm/mutter/mutter-3.16.4.ebuild
deleted file mode 100644
index 17f3d6e17a4..00000000000
--- a/x11-wm/mutter/mutter-3.16.4.ebuild
+++ /dev/null
@@ -1,97 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-GCONF_DEBUG="yes"
-
-inherit eutils gnome2
-
-DESCRIPTION="GNOME 3 compositing window manager based on Clutter"
-HOMEPAGE="https://git.gnome.org/browse/mutter/"
-
-LICENSE="GPL-2+"
-SLOT="0"
-IUSE="+introspection +kms test wayland"
-KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc x86"
-
-# libXi-1.7.4 or newer needed per:
-# https://bugzilla.gnome.org/show_bug.cgi?id=738944
-COMMON_DEPEND="
- >=x11-libs/pango-1.2[X,introspection?]
- >=x11-libs/cairo-1.10[X]
- >=x11-libs/gtk+-3.9.11:3[X,introspection?]
- >=dev-libs/glib-2.36.0:2[dbus]
- >=media-libs/clutter-1.21.3:1.0[introspection?]
- >=media-libs/cogl-1.17.1: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.15.92[introspection?]
- gnome-base/gnome-desktop:3=
- >sys-power/upower-0.99:=
-
- x11-libs/libICE
- x11-libs/libSM
- x11-libs/libX11
- >=x11-libs/libXcomposite-0.2
- x11-libs/libXcursor
- x11-libs/libXdamage
- x11-libs/libXext
- x11-libs/libXfixes
- >=x11-libs/libXi-1.7.4
- x11-libs/libXinerama
- x11-libs/libXrandr
- x11-libs/libXrender
- x11-libs/libxcb
- x11-libs/libxkbfile
- >=x11-libs/libxkbcommon-0.4.3[X]
- x11-misc/xkeyboard-config
-
- gnome-extra/zenity
-
- introspection? ( >=dev-libs/gobject-introspection-1.42:= )
- kms? (
- dev-libs/libinput
- >=media-libs/clutter-1.20[egl]
- media-libs/cogl:1.0=[kms]
- >=media-libs/mesa-10.3[gbm]
- sys-apps/systemd
- virtual/libgudev
- x11-libs/libdrm:= )
- wayland? (
- >=dev-libs/wayland-1.6.90
- >=media-libs/clutter-1.20[wayland]
- x11-base/xorg-server[wayland] )
-"
-DEPEND="${COMMON_DEPEND}
- >=dev-util/gtk-doc-am-1.15
- >=dev-util/intltool-0.41
- 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() {
- # Fallback to a default keymap if getting it from X fails (from 'master')
- epatch "${FILESDIR}"/${PN}-3.16.3-fallback-keymap.patch
- gnome2_src_prepare
-}
-
-src_configure() {
- gnome2_src_configure \
- --disable-static \
- --enable-sm \
- --enable-startup-notification \
- --enable-verbose-mode \
- --with-libcanberra \
- $(use_enable introspection) \
- $(use_enable kms native-backend) \
- $(use_enable wayland)
-}
diff --git a/x11-wm/mutter/mutter-3.18.2-r1.ebuild b/x11-wm/mutter/mutter-3.18.2-r1.ebuild
deleted file mode 100644
index 25916f4b63a..00000000000
--- a/x11-wm/mutter/mutter-3.18.2-r1.ebuild
+++ /dev/null
@@ -1,111 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-GCONF_DEBUG="yes"
-
-inherit eutils gnome2
-
-DESCRIPTION="GNOME 3 compositing window manager based on Clutter"
-HOMEPAGE="https://git.gnome.org/browse/mutter/"
-
-LICENSE="GPL-2+"
-SLOT="0"
-IUSE="+introspection +kms test wayland"
-KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc x86"
-
-# libXi-1.7.4 or newer needed per:
-# https://bugzilla.gnome.org/show_bug.cgi?id=738944
-COMMON_DEPEND="
- >=x11-libs/pango-1.2[X,introspection?]
- >=x11-libs/cairo-1.10[X]
- >=x11-libs/gtk+-3.9.11:3[X,introspection?]
- >=dev-libs/glib-2.36.0:2[dbus]
- >=media-libs/clutter-1.23.4:1.0[X,introspection?]
- >=media-libs/cogl-1.17.1: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.15.92[introspection?]
- gnome-base/gnome-desktop:3=
- >sys-power/upower-0.99:=
-
- x11-libs/libICE
- x11-libs/libSM
- x11-libs/libX11
- >=x11-libs/libXcomposite-0.2
- x11-libs/libXcursor
- x11-libs/libXdamage
- x11-libs/libXext
- x11-libs/libXfixes
- >=x11-libs/libXi-1.7.4
- x11-libs/libXinerama
- >=x11-libs/libXrandr-1.5
- x11-libs/libXrender
- x11-libs/libxcb
- x11-libs/libxkbfile
- >=x11-libs/libxkbcommon-0.4.3[X]
- x11-misc/xkeyboard-config
-
- gnome-extra/zenity
-
- introspection? ( >=dev-libs/gobject-introspection-1.42:= )
- kms? (
- dev-libs/libinput
- >=media-libs/clutter-1.20[egl]
- media-libs/cogl:1.0=[kms]
- >=media-libs/mesa-10.3[gbm]
- sys-apps/systemd
- virtual/libgudev
- x11-libs/libdrm:= )
- wayland? (
- >=dev-libs/wayland-1.6.90
- >=media-libs/clutter-1.20[wayland]
- x11-base/xorg-server[wayland] )
-"
-DEPEND="${COMMON_DEPEND}
- >=dev-util/intltool-0.41
- 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() {
- # Multiple patches from gnome-3.18 branch
-
- # x11/window-props: Initialize bypass compositor hint
- epatch "${FILESDIR}"/${P}-bypass-hint.patch
-
- # cursor-renderer: do not update cursor if it is out of monitor
- epatch "${FILESDIR}"/${P}-cursor-renderer.patch
-
- # monitor-manager: Fix the max potential number of logical monitors
- epatch "${FILESDIR}"/${P}-logical-monitors.patch
-
- # wayland: bind wayland socket after xwayland is initialized
- epatch "${FILESDIR}"/${P}-wayland-crash.patch
-
- # x11/window: Ensure we send a ConfigureNotify to just mapped windows
- epatch "${FILESDIR}"/${P}-configure-notify.patch
-
- gnome2_src_prepare
-}
-
-src_configure() {
- gnome2_src_configure \
- --disable-static \
- --enable-sm \
- --enable-startup-notification \
- --enable-verbose-mode \
- --with-libcanberra \
- $(use_enable introspection) \
- $(use_enable kms native-backend) \
- $(use_enable wayland)
-}
diff --git a/x11-wm/mutter/mutter-3.18.2.ebuild b/x11-wm/mutter/mutter-3.18.2.ebuild
deleted file mode 100644
index fc309947f46..00000000000
--- a/x11-wm/mutter/mutter-3.18.2.ebuild
+++ /dev/null
@@ -1,90 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-GCONF_DEBUG="yes"
-
-inherit eutils gnome2
-
-DESCRIPTION="GNOME 3 compositing window manager based on Clutter"
-HOMEPAGE="https://git.gnome.org/browse/mutter/"
-
-LICENSE="GPL-2+"
-SLOT="0"
-IUSE="+introspection +kms test wayland"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-
-# libXi-1.7.4 or newer needed per:
-# https://bugzilla.gnome.org/show_bug.cgi?id=738944
-COMMON_DEPEND="
- >=x11-libs/pango-1.2[X,introspection?]
- >=x11-libs/cairo-1.10[X]
- >=x11-libs/gtk+-3.9.11:3[X,introspection?]
- >=dev-libs/glib-2.36.0:2[dbus]
- >=media-libs/clutter-1.23.4:1.0[X,introspection?]
- >=media-libs/cogl-1.17.1: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.15.92[introspection?]
- gnome-base/gnome-desktop:3=
- >sys-power/upower-0.99:=
-
- x11-libs/libICE
- x11-libs/libSM
- x11-libs/libX11
- >=x11-libs/libXcomposite-0.2
- x11-libs/libXcursor
- x11-libs/libXdamage
- x11-libs/libXext
- x11-libs/libXfixes
- >=x11-libs/libXi-1.7.4
- x11-libs/libXinerama
- >=x11-libs/libXrandr-1.5
- x11-libs/libXrender
- x11-libs/libxcb
- x11-libs/libxkbfile
- >=x11-libs/libxkbcommon-0.4.3[X]
- x11-misc/xkeyboard-config
-
- gnome-extra/zenity
-
- introspection? ( >=dev-libs/gobject-introspection-1.42:= )
- kms? (
- dev-libs/libinput
- >=media-libs/clutter-1.20[egl]
- media-libs/cogl:1.0=[kms]
- >=media-libs/mesa-10.3[gbm]
- sys-apps/systemd
- virtual/libgudev
- x11-libs/libdrm:= )
- wayland? (
- >=dev-libs/wayland-1.6.90
- >=media-libs/clutter-1.20[wayland]
- x11-base/xorg-server[wayland] )
-"
-DEPEND="${COMMON_DEPEND}
- >=dev-util/intltool-0.41
- 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_configure() {
- gnome2_src_configure \
- --disable-static \
- --enable-sm \
- --enable-startup-notification \
- --enable-verbose-mode \
- --with-libcanberra \
- $(use_enable introspection) \
- $(use_enable kms native-backend) \
- $(use_enable wayland)
-}
diff --git a/x11-wm/mutter/mutter-3.18.3.ebuild b/x11-wm/mutter/mutter-3.18.3.ebuild
deleted file mode 100644
index 75eb3ab81f4..00000000000
--- a/x11-wm/mutter/mutter-3.18.3.ebuild
+++ /dev/null
@@ -1,90 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-GCONF_DEBUG="yes"
-
-inherit eutils gnome2
-
-DESCRIPTION="GNOME 3 compositing window manager based on Clutter"
-HOMEPAGE="https://git.gnome.org/browse/mutter/"
-
-LICENSE="GPL-2+"
-SLOT="0"
-IUSE="+introspection +kms test wayland"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-
-# libXi-1.7.4 or newer needed per:
-# https://bugzilla.gnome.org/show_bug.cgi?id=738944
-COMMON_DEPEND="
- >=x11-libs/pango-1.2[X,introspection?]
- >=x11-libs/cairo-1.10[X]
- >=x11-libs/gtk+-3.9.11:3[X,introspection?]
- >=dev-libs/glib-2.36.0:2[dbus]
- >=media-libs/clutter-1.23.4:1.0[X,introspection?]
- >=media-libs/cogl-1.17.1: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.15.92[introspection?]
- gnome-base/gnome-desktop:3=
- >sys-power/upower-0.99:=
-
- x11-libs/libICE
- x11-libs/libSM
- x11-libs/libX11
- >=x11-libs/libXcomposite-0.2
- x11-libs/libXcursor
- x11-libs/libXdamage
- x11-libs/libXext
- x11-libs/libXfixes
- >=x11-libs/libXi-1.7.4
- x11-libs/libXinerama
- >=x11-libs/libXrandr-1.5
- x11-libs/libXrender
- x11-libs/libxcb
- x11-libs/libxkbfile
- >=x11-libs/libxkbcommon-0.4.3[X]
- x11-misc/xkeyboard-config
-
- gnome-extra/zenity
-
- introspection? ( >=dev-libs/gobject-introspection-1.42:= )
- kms? (
- dev-libs/libinput
- >=media-libs/clutter-1.20[egl]
- media-libs/cogl:1.0=[kms]
- >=media-libs/mesa-10.3[gbm]
- sys-apps/systemd
- virtual/libgudev
- x11-libs/libdrm:= )
- wayland? (
- >=dev-libs/wayland-1.6.90
- >=media-libs/clutter-1.20[wayland]
- x11-base/xorg-server[wayland] )
-"
-DEPEND="${COMMON_DEPEND}
- >=dev-util/intltool-0.41
- 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_configure() {
- gnome2_src_configure \
- --disable-static \
- --enable-sm \
- --enable-startup-notification \
- --enable-verbose-mode \
- --with-libcanberra \
- $(use_enable introspection) \
- $(use_enable kms native-backend) \
- $(use_enable wayland)
-}