Get Gentoo!
gentoo.org sites
gentoo.org Wiki Bugs Forums Packages
Planet Archives Sources
Infra Status
summaryrefslogtreecommitdiff
path: root/x11-wm
diff options
context:
space:
mode:
Diffstat (limited to 'x11-wm')
-rw-r--r--x11-wm/metacity/Manifest46
-rw-r--r--x11-wm/metacity/files/digest-metacity-2.10.33
-rw-r--r--x11-wm/metacity/files/digest-metacity-2.12.33
-rw-r--r--x11-wm/metacity/files/digest-metacity-2.16.23
-rw-r--r--x11-wm/metacity/files/metacity-2-logout.patch185
-rw-r--r--x11-wm/metacity/metacity-2.10.3.ebuild50
-rw-r--r--x11-wm/metacity/metacity-2.12.3.ebuild57
-rw-r--r--x11-wm/metacity/metacity-2.16.2.ebuild35
8 files changed, 14 insertions, 368 deletions
diff --git a/x11-wm/metacity/Manifest b/x11-wm/metacity/Manifest
index e4d89ad023ac..6b1c52ce754f 100644
--- a/x11-wm/metacity/Manifest
+++ b/x11-wm/metacity/Manifest
@@ -1,52 +1,34 @@
-AUX metacity-2-logout.patch 7363 RMD160 2e3a64b184d7d0714596025562cffe7903c89d6c SHA1 7caa72ce34ac9a56854bef0fab8d0cc9a0eb2799 SHA256 b2f8fea9a5c0b6220b6d87374ae6f636f23551a120dfb78d0ce5b8787c9ffde5
-MD5 98f6fd8a6545a37a2ddf9b0e11ce54f7 files/metacity-2-logout.patch 7363
-RMD160 2e3a64b184d7d0714596025562cffe7903c89d6c files/metacity-2-logout.patch 7363
-SHA256 b2f8fea9a5c0b6220b6d87374ae6f636f23551a120dfb78d0ce5b8787c9ffde5 files/metacity-2-logout.patch 7363
-DIST metacity-2.10.3.tar.bz2 1684968 RMD160 dfad68bde4a56bfda9f278ed5e87ef72ba18eb14 SHA1 ad69fca36a980b5d2cdc550093af0b58cfd25c67 SHA256 8d96c38765b5d850f2cb84db73601fa537743833b95339b1a556ba6937845257
-DIST metacity-2.12.3.tar.bz2 1672493 RMD160 d9f72f57f13acd10739b443e44742408bb08d13e SHA1 c7db4535a12aee68cfc128f4f931d7f7909e7c96 SHA256 90871a0a4e242054f5290e42d7e104ca5d9d2fc47761d3e075fbcfbd6be0ac60
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
DIST metacity-2.14.5.tar.bz2 1851552 RMD160 46fcdde1801b58f092fca64c300f195ec1852125 SHA1 e46b27c04b3cadd710384e15db8e7cca32058093 SHA256 5b0fb8c9ca34493bb7922e28d81706df8d628b3ea0f83e34c4d1f967409a0ed2
-DIST metacity-2.16.2.tar.bz2 1841679 RMD160 acbef4fd25dfc707d07e2efa63d7bf74e363020d SHA1 ab344be536c226af9967e97d856925d9962e2a28 SHA256 d44a4d0fcbf0c6e8a483abf25365e40b83d55367e1ffdcec90f265ba7a7c3665
DIST metacity-2.16.3.tar.bz2 1833738 RMD160 e85e10199739e9c39d24a3a61365093bec010757 SHA1 326f73a945b0df0dbe3a80b210c011278cc73763 SHA256 3405b2d80c43e532dc6303652e1de182ce2b65001a56c61fc837b7cd04522153
-EBUILD metacity-2.10.3.ebuild 1237 RMD160 090e9f8a029d04d255a455a172ef67c2458e89de SHA1 226e0cba0cf4925ddd88d378585155d53f6e1fb3 SHA256 8609520cf6f0e11005148edd2c094a819aa10052580dfa7de7f485875d59ca8c
-MD5 2e7664d8710c782ce6f90949f0302b82 metacity-2.10.3.ebuild 1237
-RMD160 090e9f8a029d04d255a455a172ef67c2458e89de metacity-2.10.3.ebuild 1237
-SHA256 8609520cf6f0e11005148edd2c094a819aa10052580dfa7de7f485875d59ca8c metacity-2.10.3.ebuild 1237
-EBUILD metacity-2.12.3.ebuild 1329 RMD160 d692eed0810c28f3bce0e038afd1c8449e2d1588 SHA1 1508c0c83c03210b09371cbbe29d0e911bfee9e7 SHA256 ad852cf38fe81a85f28c17bcdd13db17d78b7826f0b9a9b340512818b42bbf1b
-MD5 eaa9c091600fb288b421ab42c3d30aae metacity-2.12.3.ebuild 1329
-RMD160 d692eed0810c28f3bce0e038afd1c8449e2d1588 metacity-2.12.3.ebuild 1329
-SHA256 ad852cf38fe81a85f28c17bcdd13db17d78b7826f0b9a9b340512818b42bbf1b metacity-2.12.3.ebuild 1329
EBUILD metacity-2.14.5.ebuild 1034 RMD160 546968be4a54c45f97f74768413f633dc3ab5bfc SHA1 c442eac67481f19f5ef8989f1c41c05a3991f2db SHA256 3825796ff9ead962d5dda36b93b116798a51d9f97f48883fe1a577ea7341d613
MD5 b9bc616c3b41e72d90fcb712b89c2105 metacity-2.14.5.ebuild 1034
RMD160 546968be4a54c45f97f74768413f633dc3ab5bfc metacity-2.14.5.ebuild 1034
SHA256 3825796ff9ead962d5dda36b93b116798a51d9f97f48883fe1a577ea7341d613 metacity-2.14.5.ebuild 1034
-EBUILD metacity-2.16.2.ebuild 910 RMD160 14e43aef2e7e5ff70694fb95f46779a7c46a92a5 SHA1 ccc8aa757708d75eb6360c604bb04114dfe0283c SHA256 6fb6f817f4d6e5286ad364378f6d8edff42775ec223a09fefdfb978712028c07
-MD5 503cd85f8c75689f0a13da999f0661ed metacity-2.16.2.ebuild 910
-RMD160 14e43aef2e7e5ff70694fb95f46779a7c46a92a5 metacity-2.16.2.ebuild 910
-SHA256 6fb6f817f4d6e5286ad364378f6d8edff42775ec223a09fefdfb978712028c07 metacity-2.16.2.ebuild 910
EBUILD metacity-2.16.3.ebuild 909 RMD160 e3539566d3b2d47a06ad1ad5fb52ff45d80b62b0 SHA1 240146b5c25ae23e596e24cedb9868913a7abe83 SHA256 a5c5a3d09c04bf8e642190c048167a16fe27752cd08ff905e7bebab36778dd2a
MD5 4eacf5411db82c97eecf49a5b5cf197e metacity-2.16.3.ebuild 909
RMD160 e3539566d3b2d47a06ad1ad5fb52ff45d80b62b0 metacity-2.16.3.ebuild 909
SHA256 a5c5a3d09c04bf8e642190c048167a16fe27752cd08ff905e7bebab36778dd2a metacity-2.16.3.ebuild 909
-MISC ChangeLog 19449 RMD160 07148d003bba05dc12ce9d0aa61788ab7ac0176f SHA1 f152cee7efb8a74160dd56f084752f88db84ec27 SHA256 512c99d40c223fd7a94dc74147f654541d95b475e5f6ea57dcfa44c04b298fd7
-MD5 3576e6f45f5833e7e21e39ec56847e45 ChangeLog 19449
-RMD160 07148d003bba05dc12ce9d0aa61788ab7ac0176f ChangeLog 19449
-SHA256 512c99d40c223fd7a94dc74147f654541d95b475e5f6ea57dcfa44c04b298fd7 ChangeLog 19449
+MISC ChangeLog 19628 RMD160 718305a0cc02d269eef8d98a2fadcf0a286e77e4 SHA1 3be5181404155615d226a0148ef2c8c3568a93cc SHA256 c8d04844d3b7afed8f873710c089360992b96367575569bbf40dfe6a86f09b26
+MD5 f87cdffc83c0b9147f136774f5e46e8c ChangeLog 19628
+RMD160 718305a0cc02d269eef8d98a2fadcf0a286e77e4 ChangeLog 19628
+SHA256 c8d04844d3b7afed8f873710c089360992b96367575569bbf40dfe6a86f09b26 ChangeLog 19628
MISC metadata.xml 158 RMD160 c0e2bae8e91bb6be8922bac5e4f597302e06587e SHA1 38f78e9790bcd4382b4a49aa226aa6dda1d3a3d7 SHA256 3a7dbca0fdc557de69783e0663e2d76ddab129ea8a19b2d0ef6d3e5d1b947ce1
MD5 03ad2e6c4ab41244af1015a8bbb0b39f metadata.xml 158
RMD160 c0e2bae8e91bb6be8922bac5e4f597302e06587e metadata.xml 158
SHA256 3a7dbca0fdc557de69783e0663e2d76ddab129ea8a19b2d0ef6d3e5d1b947ce1 metadata.xml 158
-MD5 8d7749853346c9aff4641af75cd5b66f files/digest-metacity-2.10.3 253
-RMD160 c6520c8ea041da7ad44fbdc6b6aa61d50498485e files/digest-metacity-2.10.3 253
-SHA256 51454a68c38e1ea5e499cd681f5fe864b1c1c9edc96e82dbfa9243aa8dea9f7d files/digest-metacity-2.10.3 253
-MD5 82db570bc455da29b1d412e1c103d4ce files/digest-metacity-2.12.3 253
-RMD160 fcf018ebae11f71c99049d151bd6fc00f091c1cf files/digest-metacity-2.12.3 253
-SHA256 a8f9e5c7c4715d089bbdc1ba43202cd4c0a9d21772a2a4b6e0ff2b7059518cdf files/digest-metacity-2.12.3 253
MD5 8e6f796eba3d11cead323cd9ae2bbf60 files/digest-metacity-2.14.5 253
RMD160 5a36f6c7a75e6457193e8e9db371d744e5bd06e3 files/digest-metacity-2.14.5 253
SHA256 8764d2eedb1b221a97475efbcd611b393a970741701af5d004d351f377240b1f files/digest-metacity-2.14.5 253
-MD5 81f3ebe82ef1634a75816ac8bd2b3048 files/digest-metacity-2.16.2 253
-RMD160 492e1e1591cc68abe2fd95d10443f868dd61075e files/digest-metacity-2.16.2 253
-SHA256 c862f5623883351c5e6100780c84ae324d839db3e2b7aa8231e46d3d07dcb91e files/digest-metacity-2.16.2 253
MD5 fef99a9f02b61fb5db3b747d958994a2 files/digest-metacity-2.16.3 253
RMD160 2223e2c346ee7367ce7a3ddfe4fe0017787ba85f files/digest-metacity-2.16.3 253
SHA256 396b81ba5a84840c2c2d5f0734a676a4b1e04752bfe912a79601740f9106a341 files/digest-metacity-2.16.3 253
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.5 (GNU/Linux)
+
+iD8DBQFFYScnkeYb6olFHJcRAgJkAKChoE9/xy66VGJCNmNC9Z4NAD36UgCfSOew
+kVcsOMWNa1L551VgeUMUrec=
+=pn2B
+-----END PGP SIGNATURE-----
diff --git a/x11-wm/metacity/files/digest-metacity-2.10.3 b/x11-wm/metacity/files/digest-metacity-2.10.3
deleted file mode 100644
index d479c19c53da..000000000000
--- a/x11-wm/metacity/files/digest-metacity-2.10.3
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 ca60e4c135118dbc03f87dc10b164f45 metacity-2.10.3.tar.bz2 1684968
-RMD160 dfad68bde4a56bfda9f278ed5e87ef72ba18eb14 metacity-2.10.3.tar.bz2 1684968
-SHA256 8d96c38765b5d850f2cb84db73601fa537743833b95339b1a556ba6937845257 metacity-2.10.3.tar.bz2 1684968
diff --git a/x11-wm/metacity/files/digest-metacity-2.12.3 b/x11-wm/metacity/files/digest-metacity-2.12.3
deleted file mode 100644
index e355d2dc3954..000000000000
--- a/x11-wm/metacity/files/digest-metacity-2.12.3
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 15df85021a8aa1d95fe60551105129db metacity-2.12.3.tar.bz2 1672493
-RMD160 d9f72f57f13acd10739b443e44742408bb08d13e metacity-2.12.3.tar.bz2 1672493
-SHA256 90871a0a4e242054f5290e42d7e104ca5d9d2fc47761d3e075fbcfbd6be0ac60 metacity-2.12.3.tar.bz2 1672493
diff --git a/x11-wm/metacity/files/digest-metacity-2.16.2 b/x11-wm/metacity/files/digest-metacity-2.16.2
deleted file mode 100644
index 015012f3cc70..000000000000
--- a/x11-wm/metacity/files/digest-metacity-2.16.2
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 d0c3925130c824e2b02b0252d76c9250 metacity-2.16.2.tar.bz2 1841679
-RMD160 acbef4fd25dfc707d07e2efa63d7bf74e363020d metacity-2.16.2.tar.bz2 1841679
-SHA256 d44a4d0fcbf0c6e8a483abf25365e40b83d55367e1ffdcec90f265ba7a7c3665 metacity-2.16.2.tar.bz2 1841679
diff --git a/x11-wm/metacity/files/metacity-2-logout.patch b/x11-wm/metacity/files/metacity-2-logout.patch
deleted file mode 100644
index 87c03e130e76..000000000000
--- a/x11-wm/metacity/files/metacity-2-logout.patch
+++ /dev/null
@@ -1,185 +0,0 @@
-diff -ur metacity-2.8.6/src/keybindings.c metacity-2.8.6-patched/src/keybindings.c
---- metacity-2.8.6/src/keybindings.c 2004-10-11 23:42:37.000000000 +0800
-+++ metacity-2.8.6-patched/src/keybindings.c 2004-12-08 11:50:25.631274776 +0800
-@@ -30,6 +30,7 @@
- #include "place.h"
- #include "prefs.h"
- #include "effects.h"
-+#include "session.h"
-
- #include <X11/keysym.h>
- #include <string.h>
-@@ -84,6 +85,11 @@
- MetaWindow *window,
- XEvent *event,
- MetaKeyBinding *binding);
-+static void handle_logout (MetaDisplay *display,
-+ MetaScreen *screen,
-+ MetaWindow *window,
-+ XEvent *event,
-+ MetaKeyBinding *binding);
- static void handle_panel_keybinding (MetaDisplay *display,
- MetaScreen *screen,
- MetaWindow *window,
-@@ -285,6 +291,8 @@
- GINT_TO_POINTER (META_TAB_LIST_DOCKS) },
- { META_KEYBINDING_SHOW_DESKTOP, handle_toggle_desktop,
- NULL },
-+ { META_KEYBINDING_LOGOUT, handle_logout,
-+ NULL },
- { META_KEYBINDING_PANEL_MAIN_MENU, handle_panel_keybinding,
- GINT_TO_POINTER (META_KEYBINDING_ACTION_PANEL_MAIN_MENU) },
- { META_KEYBINDING_PANEL_RUN_DIALOG, handle_panel_keybinding,
-@@ -2785,6 +2793,16 @@
- }
-
- static void
-+handle_logout (MetaDisplay *display,
-+ MetaScreen *screen,
-+ MetaWindow *window,
-+ XEvent *event,
-+ MetaKeyBinding *binding)
-+{
-+ meta_session_request_logout ();
-+}
-+
-+static void
- handle_panel_keybinding (MetaDisplay *display,
- MetaScreen *screen,
- MetaWindow *window,
-diff -ur metacity-2.8.6/src/metacity.schemas metacity-2.8.6-patched/src/metacity.schemas
---- metacity-2.8.6/src/metacity.schemas 2004-10-04 01:25:40.000000000 +0800
-+++ metacity-2.8.6-patched/src/metacity.schemas 2004-12-08 11:50:25.652271584 +0800
-@@ -22578,6 +22578,29 @@
- </locale>
- </schema>
-
-+ <schema>
-+ <key>/schemas/apps/metacity/global_keybindings/logout</key>
-+ <applyto>/apps/metacity/global_keybindings/logout</applyto>
-+ <owner>metacity</owner>
-+ <type>string</type>
-+ <default>&lt;Control&gt;&lt;Alt&gt;Delete</default>
-+ <locale name="C">
-+ <short>Log out</short>
-+ <long>
-+ The keybinding that logs you out from the session.
-+
-+ The format looks like "&lt;Control&gt;&lt;Alt&gt;Delete" or
-+ "&lt;Shift&gt;&lt;Alt&gt;F1.
-+
-+ The parser is fairly liberal and allows lower or upper case,
-+ and also abbreviations such as "&lt;Ctl&gt;" and
-+ "&lt;Ctrl&gt;". If you set the option to the special string
-+ "disabled", then there will be no keybinding for this
-+ action.
-+ </long>
-+ </locale>
-+ </schema>
-+
- <schema>
- <key>/schemas/apps/metacity/global_keybindings/panel_main_menu</key>
- <applyto>/apps/metacity/global_keybindings/panel_main_menu</applyto>
-diff -ur metacity-2.8.6/src/metacity.schemas.in metacity-2.8.6-patched/src/metacity.schemas.in
---- metacity-2.8.6/src/metacity.schemas.in 2004-07-25 00:28:14.000000000 +0800
-+++ metacity-2.8.6-patched/src/metacity.schemas.in 2004-12-08 11:50:25.654271280 +0800
-@@ -1641,6 +1641,29 @@
- </locale>
- </schema>
-
-+ <schema>
-+ <key>/schemas/apps/metacity/global_keybindings/logout</key>
-+ <applyto>/apps/metacity/global_keybindings/logout</applyto>
-+ <owner>metacity</owner>
-+ <type>string</type>
-+ <default>&lt;Control&gt;&lt;Alt&gt;Delete</default>
-+ <locale name="C">
-+ <short>Log out</short>
-+ <long>
-+ The keybinding that logs you out from the session.
-+
-+ The format looks like "&lt;Control&gt;&lt;Alt&gt;Delete" or
-+ "&lt;Shift&gt;&lt;Alt&gt;F1.
-+
-+ The parser is fairly liberal and allows lower or upper case,
-+ and also abbreviations such as "&lt;Ctl&gt;" and
-+ "&lt;Ctrl&gt;". If you set the option to the special string
-+ "disabled", then there will be no keybinding for this
-+ action.
-+ </long>
-+ </locale>
-+ </schema>
-+
- <schema>
- <key>/schemas/apps/metacity/global_keybindings/panel_main_menu</key>
- <applyto>/apps/metacity/global_keybindings/panel_main_menu</applyto>
-diff -ur metacity-2.8.6/src/prefs.c metacity-2.8.6-patched/src/prefs.c
---- metacity-2.8.6/src/prefs.c 2004-09-18 23:54:31.000000000 +0800
-+++ metacity-2.8.6-patched/src/prefs.c 2004-12-08 11:50:25.655271128 +0800
-@@ -1421,6 +1421,7 @@
- { META_KEYBINDING_CYCLE_PANELS, 0, 0, TRUE },
- { META_KEYBINDING_CYCLE_PANELS_BACKWARD, 0, 0, TRUE },
- { META_KEYBINDING_SHOW_DESKTOP, 0, 0, FALSE },
-+ { META_KEYBINDING_LOGOUT, 0, 0, FALSE },
- { META_KEYBINDING_PANEL_MAIN_MENU, 0, 0, FALSE },
- { META_KEYBINDING_PANEL_RUN_DIALOG, 0, 0, FALSE },
- { META_KEYBINDING_COMMAND_1, 0, 0, FALSE },
-diff -ur metacity-2.8.6/src/prefs.h metacity-2.8.6-patched/src/prefs.h
---- metacity-2.8.6/src/prefs.h 2004-02-20 02:36:14.000000000 +0800
-+++ metacity-2.8.6-patched/src/prefs.h 2004-12-08 11:52:59.051951288 +0800
-@@ -111,6 +111,7 @@
- #define META_KEYBINDING_CYCLE_PANELS "cycle_panels"
- #define META_KEYBINDING_CYCLE_PANELS_BACKWARD "cycle_panels_backward"
- #define META_KEYBINDING_SHOW_DESKTOP "show_desktop"
-+#define META_KEYBINDING_LOGOUT "logout"
- #define META_KEYBINDING_PANEL_MAIN_MENU "panel_main_menu"
- #define META_KEYBINDING_PANEL_RUN_DIALOG "panel_run_dialog"
- #define META_KEYBINDING_COMMAND_1 "run_command_1"
-@@ -211,6 +212,7 @@
- META_KEYBINDING_ACTION_CYCLE_PANELS,
- META_KEYBINDING_ACTION_CYCLE_PANELS_BACKWARD,
- META_KEYBINDING_ACTION_SHOW_DESKTOP,
-+ META_KEYBINDING_ACTION_LOGOUT,
- META_KEYBINDING_ACTION_PANEL_MAIN_MENU,
- META_KEYBINDING_ACTION_PANEL_RUN_DIALOG,
- META_KEYBINDING_ACTION_COMMAND_1,
-diff -ur metacity-2.8.6/src/session.c metacity-2.8.6-patched/src/session.c
---- metacity-2.8.6/src/session.c 2004-08-30 14:14:25.000000000 +0800
-+++ metacity-2.8.6-patched/src/session.c 2004-12-08 11:50:25.656270976 +0800
-@@ -357,6 +357,24 @@
- g_free (saved_client_id);
- }
-
-+/**
-+ * meta_session_request_logout:
-+ *
-+ * Requests that a save_yourself be sent to the session manager so that we log
-+ * out.
-+ **/
-+void
-+meta_session_request_logout (void)
-+{
-+ if (!session_connection)
-+ {
-+ meta_warning (_("Cannot log out because we could not connect to the session manager\n"));
-+ return;
-+ }
-+
-+ SmcRequestSaveYourself (session_connection, SmSaveGlobal, TRUE, SmInteractStyleAny, FALSE, TRUE);
-+}
-+
- void
- meta_session_shutdown (void)
- {
-diff -ur metacity-2.8.6/src/session.h metacity-2.8.6-patched/src/session.h
---- metacity-2.8.6/src/session.h 2002-09-04 10:44:52.000000000 +0800
-+++ metacity-2.8.6-patched/src/session.h 2004-12-08 11:50:25.657270824 +0800
-@@ -72,7 +72,7 @@
- void meta_session_init (const char *client_id,
- const char *save_file);
-
--
-+void meta_session_request_logout (void);
- void meta_session_shutdown (void);
-
- #endif
diff --git a/x11-wm/metacity/metacity-2.10.3.ebuild b/x11-wm/metacity/metacity-2.10.3.ebuild
deleted file mode 100644
index ea6959aa6be2..000000000000
--- a/x11-wm/metacity/metacity-2.10.3.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/metacity/metacity-2.10.3.ebuild,v 1.13 2006/09/06 05:41:40 kumba Exp $
-
-inherit eutils gnome2
-
-DESCRIPTION="Gnome default windowmanager"
-HOMEPAGE="http://www.gnome.org/"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 sparc x86"
-IUSE="static xinerama"
-
-# not parallel-safe; see bug #14405
-MAKEOPTS="${MAKEOPTS} -j1"
-
-RDEPEND=">=x11-libs/pango-1.2
- >=x11-libs/gtk+-2.2
- >=gnome-base/gconf-2
- >=x11-libs/startup-notification-0.7
- !x11-misc/expocity"
-
-DEPEND="${RDEPEND}
- sys-devel/gettext
- dev-util/pkgconfig
- >=dev-util/intltool-0.21"
-
-# Compositor is too unreliable
-G2CONF="${G2CONF} $(use_enable xinerama) $(use_enable static) \
---disable-compositor"
-
-USE_DESTDIR="1"
-DOCS="AUTHORS ChangeLog HACKING NEWS README *.txt doc/*.txt"
-
-src_unpack() {
- unpack ${A}
- cd ${S}
-
- # Fix the logout shortcut problems, by moving the keybindings
- # into here, from control-center, fixes bug #52034
- epatch ${FILESDIR}/${PN}-2-logout.patch
-}
-
-pkg_postinst() {
- gnome2_pkg_postinst
-
- einfo "Metacity & Xorg X11 with composite enabled may cause unwanted"
- einfo "border effects"
-}
diff --git a/x11-wm/metacity/metacity-2.12.3.ebuild b/x11-wm/metacity/metacity-2.12.3.ebuild
deleted file mode 100644
index ff6a32295c06..000000000000
--- a/x11-wm/metacity/metacity-2.12.3.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/metacity/metacity-2.12.3.ebuild,v 1.11 2006/09/06 05:41:40 kumba Exp $
-
-inherit eutils gnome2
-
-DESCRIPTION="Gnome default windowmanager"
-HOMEPAGE="http://www.gnome.org/"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 sparc x86"
-IUSE="xinerama"
-
-# not parallel-safe; see bug #14405
-MAKEOPTS="${MAKEOPTS} -j1"
-
-RDEPEND=" >=x11-libs/gtk+-2.6
- >=x11-libs/pango-1.2
- >=gnome-base/gconf-2
- >=dev-libs/glib-2.6
- >=x11-libs/startup-notification-0.7
- !x11-misc/expocity"
-
-# Needed for compositor
-# x11-libs/libXdamage
-# x11-libs/libXcomposite
-DEPEND="${RDEPEND}
- sys-devel/gettext
- >=dev-util/pkgconfig-0.9
- >=dev-util/intltool-0.28"
-
-USE_DESTDIR="1"
-DOCS="AUTHORS ChangeLog HACKING NEWS README *.txt doc/*.txt"
-
-
-pkg_setup() {
- # Compositor is too unreliable
- G2CONF="$(use_enable xinerama) \
- --disable-compositor"
-}
-
-src_unpack() {
- unpack "${A}"
- cd "${S}"
-
- # Fix the logout shortcut problems, by moving the keybindings
- # into here, from control-center, fixes bug #52034
- epatch "${FILESDIR}"/${PN}-2-logout.patch
-}
-
-pkg_postinst() {
- gnome2_pkg_postinst
-
- einfo "Metacity & Xorg X11 with composite enabled may cause unwanted"
- einfo "border effects"
-}
diff --git a/x11-wm/metacity/metacity-2.16.2.ebuild b/x11-wm/metacity/metacity-2.16.2.ebuild
deleted file mode 100644
index 247f50c50166..000000000000
--- a/x11-wm/metacity/metacity-2.16.2.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/metacity/metacity-2.16.2.ebuild,v 1.2 2006/10/14 20:51:22 vapier Exp $
-
-inherit eutils gnome2
-
-DESCRIPTION="Gnome default windowmanager"
-HOMEPAGE="http://www.gnome.org/"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86"
-IUSE="xinerama"
-
-# not parallel-safe; see bug #14405
-MAKEOPTS="${MAKEOPTS} -j1"
-
-RDEPEND=">=x11-libs/gtk+-2.10
- >=x11-libs/pango-1.2
- >=gnome-base/gconf-2
- >=dev-libs/glib-2.6
- >=x11-libs/startup-notification-0.7
- !x11-misc/expocity"
-
-DEPEND="${RDEPEND}
- sys-devel/gettext
- >=dev-util/pkgconfig-0.9
- >=dev-util/intltool-0.35"
-
-DOCS="AUTHORS ChangeLog HACKING NEWS README *.txt doc/*.txt"
-
-pkg_setup() {
- # Compositor is in unstable branch
- G2CONF="$(use_enable xinerama) --disable-compositor"
-}