Clean up old revisions.

(Portage version: 2.2_rc65/cvs/Linux x86_64)

7 files changed, 8 insertions, 246 deletions

diff --git a/x11-wm/metacity/ChangeLog b/x11-wm/metacity/ChangeLog
index 32ee3d05b8cc..bbe7157d63dd 100644
--- a/x11-wm/metacity/ChangeLog
+++ b/x11-wm/metacity/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for x11-wm/metacity
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/metacity/ChangeLog,v 1.245 2010/02/06 18:18:03 mrpouet Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/metacity/ChangeLog,v 1.246 2010/03/07 21:24:48 eva Exp $
+
+  07 Mar 2010; Gilles Dartiguelongue <eva@gentoo.org>
+  -metacity-2.24.0-r2.ebuild, -files/metacity-2.24.0-crash-login.patch,
+  -files/metacity-2.24.0-fbsd.patch,
+  -files/metacity-2.24.0-gslist-leak.patch,
+  -files/metacity-2.24.0-string-leak.patch, -metacity-2.28.0.ebuild:
+  Clean up old revisions.
 
 *metacity-2.28.1 (06 Feb 2010)
 
diff --git a/x11-wm/metacity/files/metacity-2.24.0-crash-login.patch b/x11-wm/metacity/files/metacity-2.24.0-crash-login.patch
deleted file mode 100644
index f274f4cc05a2..000000000000
--- a/x11-wm/metacity/files/metacity-2.24.0-crash-login.patch
+++ /dev/null
@@ -1,52 +0,0 @@
-# https://bugzilla.gnome.org/show_bug.cgi?id=553980
---- a/src/core/main.c	2008-10-08 00:10:39.000000000 -0400
-+++ b/src/core/main.c	2008-10-08 00:18:44.000000000 -0400
-@@ -312,6 +312,23 @@ void meta_select_display (gchar *display
-   /* DO NOT FREE envVar, putenv() sucks */
-   putenv (envVar);
- }
-+
-+static
-+void meta_finalize (void)
-+{
-+  meta_display_close (meta_get_display (),
-+                      CurrentTime); /* I doubt correct timestamps matter here */
-+
-+  meta_session_shutdown ();
-+}
-+
-+static
-+void sigterm_handler (int signum)
-+{
-+	meta_finalize ();
-+
-+	exit (meta_exit_code);
-+}
-     
- /**
-  * This is where the story begins. It parses commandline options and
-@@ -352,6 +369,11 @@ main (int argc, char **argv)
-                 g_strerror (errno));
- #endif
- 
-+  act.sa_handler = &sigterm_handler;
-+  if (sigaction (SIGTERM, &act, NULL) < 0)
-+    g_printerr ("Failed to register SIGTERM handler: %s\n",
-+		g_strerror (errno));
-+
-   if (g_getenv ("METACITY_VERBOSE"))
-     meta_set_verbose (TRUE);
-   if (g_getenv ("METACITY_DEBUG"))
-@@ -478,11 +500,8 @@ main (int argc, char **argv)
-   
-   g_main_loop_run (meta_main_loop);
- 
--  meta_display_close (meta_get_display (),
--                      CurrentTime); /* I doubt correct timestamps matter here */
-+  meta_finalize ();
- 
--  meta_session_shutdown ();
--  
-   if (meta_restart_after_quit)
-     {
-       GError *err;
diff --git a/x11-wm/metacity/files/metacity-2.24.0-fbsd.patch b/x11-wm/metacity/files/metacity-2.24.0-fbsd.patch
deleted file mode 100644
index 2212b0d7b38d..000000000000
--- a/x11-wm/metacity/files/metacity-2.24.0-fbsd.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-# https://bugs.gentoo.org/show_bug.cgi?id=256224
-# https://bugzilla.gnome.org/show_bug.cgi?id=561962
-Index: b/src/core/util.c
-===================================================================
---- a/src/core/util.c	(revision 4025)
-+++ b/src/core/util.c	(revision 4026)
-@@ -23,7 +23,7 @@
-  */
- 
- #define _GNU_SOURCE
--#define _POSIX_C_SOURCE /* for fdopen() */
-+#define _POSIX_C_SOURCE 200112L /* for fdopen() */
- 
- #include <config.h>
- #include "util.h"
diff --git a/x11-wm/metacity/files/metacity-2.24.0-gslist-leak.patch b/x11-wm/metacity/files/metacity-2.24.0-gslist-leak.patch
deleted file mode 100644
index 39c35087e4c7..000000000000
--- a/x11-wm/metacity/files/metacity-2.24.0-gslist-leak.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-# https://bugs.gentoo.org/attachment.cgi?id=181415
-diff -up a/src/core/edge-resistance.c b/src/core/edge-resistance.c
---- a/src/core/edge-resistance.c	2008-09-14 22:39:38.000000000 -0400
-+++ b/src/core/edge-resistance.c	2008-09-14 22:43:28.000000000 -0400
-@@ -985,8 +985,8 @@ meta_display_compute_resistance_and_snap
-       cur_window_iter = cur_window_iter->next;
-     }
-   /* Put 'em in bottom to top order */
--  rem_windows       = g_slist_reverse (obscuring_windows);
--  rem_win_stacking  = g_slist_reverse (window_stacking);
-+  rem_windows = obscuring_windows = g_slist_reverse (obscuring_windows);
-+  rem_win_stacking = window_stacking = g_slist_reverse (window_stacking);
- 
-   /*
-    * 3rd: loop over the windows again, this time getting the edges from
diff --git a/x11-wm/metacity/files/metacity-2.24.0-string-leak.patch b/x11-wm/metacity/files/metacity-2.24.0-string-leak.patch
deleted file mode 100644
index e2cd71771377..000000000000
--- a/x11-wm/metacity/files/metacity-2.24.0-string-leak.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-# https://bugs.gentoo.org/show_bug.cgi?id=258302
-diff -up a/src/ui/ui.c b/src/ui/ui.c
---- a/src/ui/ui.c	2008-08-18 08:29:07.000000000 -0400
-+++ b/src/ui/ui.c	2008-09-15 18:05:20.000000000 -0400
-@@ -657,10 +657,12 @@ meta_text_property_to_utf8 (Display     
-                                           &list);
- 
-   if (count == 0)
--    return NULL;
--
--  retval = list[0];
--  list[0] = g_strdup (""); /* something to free */
-+    retval = NULL;
-+  else
-+    {
-+      retval = list[0];
-+      list[0] = g_strdup (""); /* something to free */
-+    }
-   
-   g_strfreev (list);
- 
diff --git a/x11-wm/metacity/metacity-2.24.0-r2.ebuild b/x11-wm/metacity/metacity-2.24.0-r2.ebuild
deleted file mode 100644
index c3612e8af904..000000000000
--- a/x11-wm/metacity/metacity-2.24.0-r2.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/metacity/metacity-2.24.0-r2.ebuild,v 1.10 2009/04/28 11:22:40 armin76 Exp $
-
-inherit eutils gnome2
-
-DESCRIPTION="GNOME default window manager"
-HOMEPAGE="http://blogs.gnome.org/metacity/"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 sh sparc x86 ~x86-fbsd"
-IUSE="xinerama"
-
-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-libs/libXcomposite-0.2
-	x11-libs/libXfixes
-	x11-libs/libXrender
-	x11-libs/libXdamage
-	x11-libs/libXcursor
-	x11-libs/libX11
-	xinerama? ( x11-libs/libXinerama )
-	x11-libs/libXext
-	x11-libs/libXrandr
-	x11-libs/libSM
-	x11-libs/libICE
-	!x11-misc/expocity"
-DEPEND="${RDEPEND}
-	sys-devel/gettext
-	>=dev-util/pkgconfig-0.9
-	>=dev-util/intltool-0.35
-	xinerama? ( x11-proto/xineramaproto )
-	x11-proto/xextproto
-	x11-proto/xproto"
-
-DOCS="AUTHORS ChangeLog HACKING NEWS README *.txt doc/*.txt"
-
-pkg_setup() {
-	G2CONF="${G2CONF} $(use_enable xinerama)"
-}
-
-src_unpack() {
-	gnome2_src_unpack
-
-	# Fix compilation on *bsd, bug #256224
-	epatch "${FILESDIR}/${P}-fbsd.patch"
-
-	# Fix crash on login, upstream bug #553980
-	epatch "${FILESDIR}/${P}-crash-login.patch"
-
-	# Fix a leak misused gslist function, bug #258301
-	epatch "${FILESDIR}/${P}-gslist-leak.patch"
-
-	# Fix a string leak, bug #258302
-	epatch "${FILESDIR}/${P}-string-leak.patch"
-}
diff --git a/x11-wm/metacity/metacity-2.28.0.ebuild b/x11-wm/metacity/metacity-2.28.0.ebuild
deleted file mode 100644
index 2257bcd30895..000000000000
--- a/x11-wm/metacity/metacity-2.28.0.ebuild
+++ /dev/null
@@ -1,82 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/metacity/metacity-2.28.0.ebuild,v 1.2 2009/11/06 15:43:38 mrpouet Exp $
-
-EAPI="2"
-# debug only changes CFLAGS
-GCONF_DEBUG="no"
-
-inherit eutils gnome2
-
-DESCRIPTION="GNOME default window manager"
-HOMEPAGE="http://blogs.gnome.org/metacity/"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd"
-IUSE="test xinerama"
-
-# XXX: libgtop is automagic, hard-enabled instead
-RDEPEND=">=x11-libs/gtk+-2.10
-	>=x11-libs/pango-1.2[X]
-	>=gnome-base/gconf-2
-	>=dev-libs/glib-2.6
-	>=x11-libs/startup-notification-0.7
-	>=x11-libs/libXcomposite-0.2
-	x11-libs/libXfixes
-	x11-libs/libXrender
-	x11-libs/libXdamage
-	x11-libs/libXcursor
-	x11-libs/libX11
-	xinerama? ( x11-libs/libXinerama )
-	x11-libs/libXext
-	x11-libs/libXrandr
-	x11-libs/libSM
-	x11-libs/libICE
-	media-libs/libcanberra[gtk]
-	gnome-base/libgtop
-	gnome-extra/zenity
-	!x11-misc/expocity"
-DEPEND="${RDEPEND}
-	>=app-text/gnome-doc-utils-0.8
-	sys-devel/gettext
-	>=dev-util/pkgconfig-0.9
-	>=dev-util/intltool-0.35
-	test? ( app-text/docbook-xml-dtd:4.5 )
-	xinerama? ( x11-proto/xineramaproto )
-	x11-proto/xextproto
-	x11-proto/xproto"
-
-DOCS="AUTHORS ChangeLog HACKING NEWS README *.txt doc/*.txt"
-
-pkg_setup() {
-	G2CONF="${G2CONF}
-		--enable-compositor
-		--enable-gconf
-		--enable-render
-		--enable-shape
-		--enable-sm
-		--enable-startup-notification
-		--enable-xsync
-		$(use_enable xinerama)"
-}
-
-src_prepare() {
-	gnome2_src_prepare
-
-	# Fix intltoolize broken file, see upstream #577133
-	sed "s:'\^\$\$lang\$\$':\^\$\$lang\$\$:g" -i po/Makefile.in.in \
-		|| die "sed failed"
-
-	# Remove stupid CFLAGS, bug #259179
-	sed "s:-Werror::g" -i configure.in configure || die "sed failed"
-	# Should set RestartStyleHint to RestartIfRunning when replaced,
-	# this fix a strange issue with gnome-session (100% of the CPU,
-	# and try to restart metacity infinitively when compiz is started)
-	# patch import from upstream bug #588119.
-	epatch "${FILESDIR}/${P}-restartstylehint-when-replace.patch"
-
-	# Use sys/wait.h header instead of wait.h as described in posix specs,
-	# bug 292009
-	epatch "${FILESDIR}/${P}-sys-wait-header.patch"
-}