Clean up old revisions.

(Portage version: 2.2.0_alpha6/cvs/Linux x86_64)

5 files changed, 6 insertions, 358 deletions

diff --git a/x11-wm/metacity/ChangeLog b/x11-wm/metacity/ChangeLog
index 4900c3693555..000d0c5002af 100644
--- a/x11-wm/metacity/ChangeLog
+++ b/x11-wm/metacity/ChangeLog
@@ -1,6 +1,11 @@
 # 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.262 2010/10/17 15:12:41 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/metacity/ChangeLog,v 1.263 2010/12/05 17:43:33 eva Exp $
+
+  05 Dec 2010; Gilles Dartiguelongue <eva@gentoo.org>
+  -metacity-2.26.0-r1.ebuild, -files/metacity-2.26.0-panel-behavior.patch,
+  -metacity-2.28.1.ebuild, -metacity-2.30.2.ebuild:
+  Clean up old revisions.
 
   17 Oct 2010; Raúl Porcel <armin76@gentoo.org> metacity-2.30.1.ebuild:
   alpha/ia64/sh/sparc stable wrt #324077
diff --git a/x11-wm/metacity/files/metacity-2.26.0-panel-behavior.patch b/x11-wm/metacity/files/metacity-2.26.0-panel-behavior.patch
deleted file mode 100644
index 971970b965ef..000000000000
--- a/x11-wm/metacity/files/metacity-2.26.0-panel-behavior.patch
+++ /dev/null
@@ -1,112 +0,0 @@
-# Upstream : http://bugzilla.gnome.org/show_bug.cgi?id=572573
-# Ubuntu : https://bugs.launchpad.net/ubuntu/+source/metacity/+bug/341487
-# Gentoo : https://bugs.gentoo.org/268699
---- src/core/window-props.c	2009/03/11 14:21:33	4190
-+++ src/core/window-props.c	2009/03/12 01:09:41	4191
-@@ -73,12 +73,6 @@
-   ReloadValueFunc   reload_func;
- } MetaWindowPropHooks;
- 
--static void init_prop_value            (MetaDisplay   *display,
--                                        Atom           property,
--                                        MetaPropValue *value);
--static void reload_prop_value          (MetaWindow    *window,
--                                        MetaPropValue *value,
--                                        gboolean       initial);
- static MetaWindowPropHooks* find_hooks (MetaDisplay *display,
-                                         Atom         property);
- 
-@@ -128,23 +122,34 @@
-   g_return_if_fail (n_properties > 0);
-   
-   values = g_new0 (MetaPropValue, n_properties);
--  
--  i = 0;
--  while (i < n_properties)
-+
-+  for (i=0; i<n_properties; i++)
-     {
--      init_prop_value (window->display, properties[i], &values[i]);
--      ++i;
-+      MetaWindowPropHooks *hooks = find_hooks (window->display,
-+                                               properties[i]);
-+    
-+      if (!hooks || hooks->type == META_PROP_VALUE_INVALID)
-+        {
-+          values[i].type = META_PROP_VALUE_INVALID;
-+          values[i].atom = None;
-+        }
-+      else
-+        {
-+          values[i].type = hooks->type;
-+          values[i].atom = properties[i];
-+        }
-     }
-   
-   meta_prop_get_values (window->display, xwindow,
-                         values, n_properties);
- 
--  i = 0;
--  while (i < n_properties)
-+  for (i=0; i<n_properties; i++)
-     {
--      reload_prop_value (window, &values[i], initial);
--      
--      ++i;
-+      MetaWindowPropHooks *hooks = find_hooks (window->display,
-+                                               properties[i]);
-+
-+      if (hooks && hooks->reload_func != NULL)
-+        (* hooks->reload_func) (window, &values[i], initial);
-     }
- 
-   meta_prop_free_values (values, n_properties);
-@@ -152,37 +157,6 @@
-   g_free (values);
- }
- 
--/* Fill in the MetaPropValue used to get the value of "property" */
--static void
--init_prop_value (MetaDisplay   *display,
--                 Atom           property,
--                 MetaPropValue *value)
--{
--  MetaWindowPropHooks *hooks = find_hooks (display, property);
--    
--  if (!hooks || hooks->type == META_PROP_VALUE_INVALID)
--    {
--      value->type = META_PROP_VALUE_INVALID;
--      value->atom = None;
--    }
--  else
--    {
--      value->type = hooks->type;
--      value->atom = property;
--    }
--}
--
--static void
--reload_prop_value (MetaWindow    *window,
--                   MetaPropValue *value,
--                   gboolean       initial)
--{
--  MetaWindowPropHooks *hooks = find_hooks (window->display, value->atom);
--
--  if (hooks && hooks->reload_func != NULL)
--    (* hooks->reload_func) (window, value, initial);
--}
--
- static void
- reload_wm_client_machine (MetaWindow    *window,
-                           MetaPropValue *value,
-@@ -1566,6 +1540,9 @@
-   display->prop_hooks_table = NULL;
- }
- 
-+/**
-+ * Finds the hooks for a particular property.
-+ */
- static MetaWindowPropHooks*
- find_hooks (MetaDisplay *display,
-             Atom         property)
-
diff --git a/x11-wm/metacity/metacity-2.26.0-r1.ebuild b/x11-wm/metacity/metacity-2.26.0-r1.ebuild
deleted file mode 100644
index 97d9925abd60..000000000000
--- a/x11-wm/metacity/metacity-2.26.0-r1.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/metacity/metacity-2.26.0-r1.ebuild,v 1.10 2010/07/20 02:36:12 jer Exp $
-
-EAPI="2"
-
-inherit eutils gnome2
-
-DESCRIPTION="GNOME default window manager"
-HOMEPAGE="http://blogs.gnome.org/metacity/"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm ia64 ppc ppc64 sh sparc x86 ~x86-fbsd"
-IUSE="test xinerama"
-
-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
-	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
-
-	# Remove stupid CFLAGS, bug #259179
-	sed "s:-Werror::g" -i configure.in configure || die "sed failed"
-
-	# Fix behavior wrt. panel overlap, bug #268699
-	epatch "${FILESDIR}/${P}-panel-behavior.patch"
-}
diff --git a/x11-wm/metacity/metacity-2.28.1.ebuild b/x11-wm/metacity/metacity-2.28.1.ebuild
deleted file mode 100644
index 4a1e9eb3d3ba..000000000000
--- a/x11-wm/metacity/metacity-2.28.1.ebuild
+++ /dev/null
@@ -1,88 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/metacity/metacity-2.28.1.ebuild,v 1.8 2010/08/18 21:55:29 maekke 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 ia64 ~ppc ~ppc64 sh sparc x86 ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~x86-solaris"
-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}/${PN}-2.28.0-restartstylehint-when-replace.patch"
-
-	# Use sys/wait.h header instead of wait.h as described in posix specs,
-	# bug 292009
-	epatch "${FILESDIR}/${PN}-2.28.0-sys-wait-header.patch"
-
-	# WIFEXITED and friends are defined in sys/wait.h
-	# Fixes a build failure on BSD.
-	# https://bugs.gentoo.org/show_bug.cgi?id=309443
-	# https://bugzilla.gnome.org/show_bug.cgi?id=605460
-	epatch "${FILESDIR}/${PN}-2.28.1-wif_macros.patch"
-}
diff --git a/x11-wm/metacity/metacity-2.30.2.ebuild b/x11-wm/metacity/metacity-2.30.2.ebuild
deleted file mode 100644
index 59123ee5bc19..000000000000
--- a/x11-wm/metacity/metacity-2.30.2.ebuild
+++ /dev/null
@@ -1,90 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/metacity/metacity-2.30.2.ebuild,v 1.1 2010/09/16 21:00:39 eva 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 ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~x86-solaris"
-IUSE="test xinerama"
-
-# XXX: libgtop is automagic, hard-enabled instead
-RDEPEND=">=x11-libs/gtk+-2.20:2
-	>=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
-		--with-gtk=2.0
-		$(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}/${PN}-2.28.0-restartstylehint-when-replace.patch"
-
-	# Use sys/wait.h header instead of wait.h as described in posix specs,
-	# bug 292009
-	epatch "${FILESDIR}/${PN}-2.28.0-sys-wait-header.patch"
-
-	# WIFEXITED and friends are defined in sys/wait.h
-	# Fixes a build failure on BSD.
-	# https://bugs.gentoo.org/show_bug.cgi?id=309443
-	# https://bugzilla.gnome.org/show_bug.cgi?id=605460
-	epatch "${FILESDIR}/${PN}-2.28.1-wif_macros.patch"
-}