Clean up old revisions.
authorGilles Dartiguelongue <eva@gentoo.org>
Sun, 7 Mar 2010 21:24:49 +0000 (21:24 +0000)
committerGilles Dartiguelongue <eva@gentoo.org>
Sun, 7 Mar 2010 21:24:49 +0000 (21:24 +0000)
Package-Manager: portage-2.2_rc65/cvs/Linux x86_64

x11-wm/metacity/ChangeLog
x11-wm/metacity/Manifest
x11-wm/metacity/files/metacity-2.24.0-crash-login.patch [deleted file]
x11-wm/metacity/files/metacity-2.24.0-fbsd.patch [deleted file]
x11-wm/metacity/files/metacity-2.24.0-gslist-leak.patch [deleted file]
x11-wm/metacity/files/metacity-2.24.0-string-leak.patch [deleted file]
x11-wm/metacity/metacity-2.24.0-r2.ebuild [deleted file]
x11-wm/metacity/metacity-2.28.0.ebuild [deleted file]

index 32ee3d05b8ccc50850a266f4facec95ae5e33bd8..bbe7157d63ddf6337fd6429d0d4fd105a2bc6b88 100644 (file)
@@ -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)
 
index 025067ae80ae8d823546803dc0123db14f739910..f77c5b4a4e00f4ad2306fd961545b90a4ef4f907 100644 (file)
@@ -1,17 +1,19 @@
-AUX metacity-2.24.0-crash-login.patch 1381 RMD160 43f4622195e22971a2b806d9f4e4bb042479d818 SHA1 1c1e722322f18735b95b31fad9d02186f939ecb6 SHA256 c1d2ae0e5e425dd8daca501da654db0e979421a0502441d69b5ce0318b863254
-AUX metacity-2.24.0-fbsd.patch 454 RMD160 b105d90b271710930ba56adb0d26a881e808265f SHA1 bfd3101b865ee4d0ad1d425a50141b498df0a8df SHA256 4bb15fd9b0a9db418dd50dedd99a1cb1ec75a39a0608c8c39ccad9b8bbcd6e74
-AUX metacity-2.24.0-gslist-leak.patch 760 RMD160 18264a62e94ce8528c7b34b8c859207fdd3159e1 SHA1 81d0f88e3d43166b0962142fe9a9ecab5aa86203 SHA256 56bdf2afeadda49d38b0c99c903ba7dc543e627921995c3565314e074ee0c820
-AUX metacity-2.24.0-string-leak.patch 573 RMD160 fb139a74e26f75a1ecfa44c34efd791841a2f550 SHA1 30c8a1d76196c4708175932527b1a6059d26dec0 SHA256 e2ebb8487f275461a28acdb9004d69dd6869bfe234b749b4093a024a8a6abad4
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX metacity-2.26.0-panel-behavior.patch 3374 RMD160 1793a72ce7e6e1904746c1c4d4113a2a66271ee2 SHA1 58bf8a33abb86026abc80d8e1dc04133f6fccc29 SHA256 02ad2a002af64ebc107a5481744e946a1e34402a10cf8ada12fb03fa846ebdb8
 AUX metacity-2.28.0-restartstylehint-when-replace.patch 4709 RMD160 da983b21c50dbacd8f5df06f50d233eef6c25331 SHA1 248f8dce5fc3b88ce43e796ba7995bf0d76a9d99 SHA256 3a7e484ec2eb97e7b7f1baaa33e5d925e67a35c84e49c5abe6c32cf2c25f16eb
 AUX metacity-2.28.0-sys-wait-header.patch 480 RMD160 5f3cb891f1f1e5e122db1b4a20af345df1963e48 SHA1 fb9cb941e877c552dd1aef8c49470bcdd300007f SHA256 7bcaa2ba358e8666cef98abeea30d7a01d8c9c9e60ead7ec0b2dee3ee6f84be0
-DIST metacity-2.24.0.tar.bz2 2160557 RMD160 758c26e163fdc84dcee1e386ab8cbefc38cdd7a5 SHA1 0b2e37e372498e26a6926fbb68e96556c6db6497 SHA256 90eed0a36aae302db52af12220c4cf863c9cccebd233015104f2d88cb17ec076
 DIST metacity-2.26.0.tar.bz2 2289848 RMD160 26b75abb9b705f9fd7711dfbbff134e600dcfd56 SHA1 70593f69148960a0248527c8ae8d442a3d251d08 SHA256 29ba16411899d963bae69a4d72d37dec38a33e62412fe769d497de4555559078
-DIST metacity-2.28.0.tar.bz2 2288241 RMD160 0eec1900fad87604bc531757d0e878d2da8cb89d SHA1 d64dc861ac00fffc503bf9acdc705b67b772d772 SHA256 0621553a6f21fcf40c5dc4c7907b5745c6d853e6b7637bb45b863ec39f595545
 DIST metacity-2.28.1.tar.bz2 2348762 RMD160 3d93c7f0a771f8ba2d82ef03b13d79e90af4b62c SHA1 752d1aff3a1a96d63069bcf58de5cc21de9a240d SHA256 38e4d389d6fb375e82544fd572b3a32bbcd6d26ebe58a9a0a92c461edadf95e2
-EBUILD metacity-2.24.0-r2.ebuild 1513 RMD160 a007c6d28f0184533086d6114202ceea6e3f489a SHA1 a8871bcb693b9b6e193170399c93c3e397ecd46c SHA256 d789c688ac30fbb9a4a6c5c5682c9c80d31cfad5880b67ef7e71ed56cfb03a28
 EBUILD metacity-2.26.0-r1.ebuild 1618 RMD160 a08daa67044e9eb72558bb0c7a01df85e7218ed0 SHA1 44a5fcc3f33849ae518d06af7e9b55fdbd18fded SHA256 9129d7f87a1ca85795f9e9f8b9422a90fe76116f35483421a73ada16899dfecb
-EBUILD metacity-2.28.0.ebuild 2255 RMD160 d96f282ba2d6a295c0ddfb612d266f562cf64580 SHA1 42ef7ee6538729dc2199a0486648577873533878 SHA256 dfc09dd866309d8e41d1b777937056bfe94323d78dc41672b2e5b3b294cd6405
 EBUILD metacity-2.28.1.ebuild 2271 RMD160 e8030572925654c85a5b986b0ad33e96bad2c5e0 SHA1 345a7c71add071c45db0e961049275eb31848b90 SHA256 ddfcee580496ca1e0fcadceb7fc40d66447a25adde0f8b34006570205d57db13
-MISC ChangeLog 29383 RMD160 b81ea4384ceb5712759007b9a332d5719b7826ea SHA1 abfe08e86f92c5119df0a72189c9d7c1e21b3844 SHA256 5e465c4df5580959ecd1c2202650d005658f1bbbee7120124395e72910bdf1c9
+MISC ChangeLog 29682 RMD160 d4a7dc1bfe10a4a07223d9c1fcc524a70f8fae80 SHA1 4f1459762b616f46b4993fbd7e76c623771e6df6 SHA256 80587e6280f7137f641f221a357def0a0822c0209f7481d103c09d8e27814913
 MISC metadata.xml 409 RMD160 cd76d1e78c03fb5379abca2a1e136cba116eacae SHA1 703d6a46d96d2734062f1496880b983b89f837c9 SHA256 cbc77bb6077444f8b66e4f8a4cd4cf1af7dbbe8d410b4819ef5e1af049378218
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.14 (GNU/Linux)
+
+iEYEARECAAYFAkuUGaYACgkQ1fmVwcYIWAa0vACgue9HAR5iWNMA8C3VSIqPT8RX
+x9EAnR0hHDJ0tEG64/mat3sQ+SglgrO8
+=rtsG
+-----END PGP SIGNATURE-----
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 (file)
index f274f4c..0000000
+++ /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 (file)
index 2212b0d..0000000
+++ /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 (file)
index 39c3508..0000000
+++ /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 (file)
index e2cd717..0000000
+++ /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 (file)
index c3612e8..0000000
+++ /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 (file)
index 2257bcd..0000000
+++ /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"
-}