Fix compilation for *bsd, bug #256224. Clean up old revisions.

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

5 files changed, 35 insertions, 45 deletions

diff --git a/x11-wm/metacity/ChangeLog b/x11-wm/metacity/ChangeLog
index b5b58a158d7b..1f4469cabcb1 100644
--- a/x11-wm/metacity/ChangeLog
+++ b/x11-wm/metacity/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for x11-wm/metacity
-# Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/metacity/ChangeLog,v 1.220 2008/11/13 19:15:19 ranger Exp $
+# Copyright 2002-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/metacity/ChangeLog,v 1.221 2009/01/31 11:46:54 eva Exp $
+
+  31 Jan 2009; Gilles Dartiguelongue <eva@gentoo.org>
+  +files/metacity-2.24.0-fbsd.patch, metacity-2.20.1.ebuild,
+  -metacity-2.20.2.ebuild, metacity-2.24.0.ebuild:
+  Fix compilation for *bsd, bug #256224. Clean up old revisions.
 
   13 Nov 2008; Brent Baude <ranger@gentoo.org> metacity-2.22.0.ebuild:
   Marking metacity-2.22.0 ppc64 stable for bug 236971
diff --git a/x11-wm/metacity/files/metacity-2.24.0-fbsd.patch b/x11-wm/metacity/files/metacity-2.24.0-fbsd.patch
new file mode 100644
index 000000000000..2212b0d7b38d
--- /dev/null
+++ b/x11-wm/metacity/files/metacity-2.24.0-fbsd.patch
@@ -0,0 +1,15 @@
+# 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/metacity-2.20.1.ebuild b/x11-wm/metacity/metacity-2.20.1.ebuild
index fcc3bc9f6942..06aede5e88dc 100644
--- a/x11-wm/metacity/metacity-2.20.1.ebuild
+++ b/x11-wm/metacity/metacity-2.20.1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2008 Gentoo Foundation
+# 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.20.1.ebuild,v 1.9 2008/07/23 22:36:14 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/metacity/metacity-2.20.1.ebuild,v 1.10 2009/01/31 11:46:54 eva Exp $
 
 inherit eutils gnome2
 
@@ -9,7 +9,7 @@ HOMEPAGE="http://blogs.gnome.org/metacity/"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 sh sparc x86 ~x86-fbsd"
+KEYWORDS="arm sh"
 IUSE="xinerama"
 # compositor needs libcm as well, not activating it for the time being
 
diff --git a/x11-wm/metacity/metacity-2.20.2.ebuild b/x11-wm/metacity/metacity-2.20.2.ebuild
deleted file mode 100644
index f5a3daa36015..000000000000
--- a/x11-wm/metacity/metacity-2.20.2.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/metacity/metacity-2.20.2.ebuild,v 1.8 2008/07/23 22:36:14 eva Exp $
-
-inherit gnome2
-
-DESCRIPTION="Gnome default windowmanager"
-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"
-# compositor needs libcm as well, not activating it for the time being
-
-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"
-
-# needs libcm too
-#	compositor? ( >=x11-libs/libXcomposite-0.2 )
-
-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() {
-	G2CONF="${G2CONF}
-		$(use_enable xinerama)
-		--disable-compositor"
-}
diff --git a/x11-wm/metacity/metacity-2.24.0.ebuild b/x11-wm/metacity/metacity-2.24.0.ebuild
index 6f26e491a4b1..b1e4629e614b 100644
--- a/x11-wm/metacity/metacity-2.24.0.ebuild
+++ b/x11-wm/metacity/metacity-2.24.0.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2008 Gentoo Foundation
+# 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.ebuild,v 1.2 2008/10/11 17:45:39 leio Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/metacity/metacity-2.24.0.ebuild,v 1.3 2009/01/31 11:46:54 eva Exp $
 
-inherit gnome2
+inherit eutils gnome2
 
 DESCRIPTION="GNOME default window manager"
 HOMEPAGE="http://blogs.gnome.org/metacity/"
@@ -42,3 +42,10 @@ 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"
+}