Version bump. Clean up old revisions.

(Portage version: 2.2.0_alpha141/cvs/Linux x86_64, signed Manifest commit with key C6085806)

3 files changed, 12 insertions, 81 deletions

diff --git a/x11-wm/metacity/ChangeLog b/x11-wm/metacity/ChangeLog
index 71e5d5171ad6..8c664139c71b 100644
--- a/x11-wm/metacity/ChangeLog
+++ b/x11-wm/metacity/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for x11-wm/metacity
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/metacity/ChangeLog,v 1.274 2012/09/04 23:34:37 nirbheek Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/metacity/ChangeLog,v 1.275 2012/10/28 21:15:49 eva Exp $
+
+*metacity-2.34.13 (28 Oct 2012)
+
+  28 Oct 2012; Gilles Dartiguelongue <eva@gentoo.org> -metacity-2.34.1.ebuild,
+  -metacity-2.34.3.ebuild, +metacity-2.34.13.ebuild:
+  Version bump. Clean up old revisions.
 
 *metacity-2.34.8 (04 Sep 2012)
 
diff --git a/x11-wm/metacity/metacity-2.34.1.ebuild b/x11-wm/metacity/metacity-2.34.1.ebuild
deleted file mode 100644
index b5a966462438..000000000000
--- a/x11-wm/metacity/metacity-2.34.1.ebuild
+++ /dev/null
@@ -1,74 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/metacity/metacity-2.34.1.ebuild,v 1.2 2012/05/04 08:58:57 jdhore Exp $
-
-EAPI="4"
-# debug only changes CFLAGS
-GCONF_DEBUG="no"
-GNOME2_LA_PUNT="yes"
-
-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:2
-	>=dev-libs/glib-2.6:2
-	>=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
-	x11-libs/libXext
-	x11-libs/libXrandr
-	x11-libs/libSM
-	x11-libs/libICE
-	media-libs/libcanberra[gtk]
-	gnome-base/libgtop
-	gnome-extra/zenity
-	xinerama? ( x11-libs/libXinerama )
-	!x11-misc/expocity"
-DEPEND="${RDEPEND}
-	>=app-text/gnome-doc-utils-0.8
-	sys-devel/gettext
-	virtual/pkgconfig
-	>=dev-util/intltool-0.35
-	test? ( app-text/docbook-xml-dtd:4.5 )
-	xinerama? ( x11-proto/xineramaproto )
-	x11-proto/xextproto
-	x11-proto/xproto"
-
-pkg_setup() {
-	DOCS="AUTHORS ChangeLog HACKING NEWS README *.txt doc/*.txt"
-	G2CONF="${G2CONF}
-		--disable-static
-		--enable-canberra
-		--enable-compositor
-		--enable-gconf
-		--enable-render
-		--enable-shape
-		--enable-sm
-		--enable-startup-notification
-		--enable-xsync
-		$(use_enable xinerama)"
-}
-
-src_prepare() {
-	gnome2_src_prepare
-
-	# 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.34.3.ebuild b/x11-wm/metacity/metacity-2.34.13.ebuild
index 8326c561a5ac..424f54af2ea3 100644
--- a/x11-wm/metacity/metacity-2.34.3.ebuild
+++ b/x11-wm/metacity/metacity-2.34.13.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/metacity/metacity-2.34.3.ebuild,v 1.1 2012/05/14 00:03:35 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/metacity/metacity-2.34.13.ebuild,v 1.1 2012/10/28 21:15:49 eva Exp $
 
-EAPI="4"
+EAPI="5"
 # debug only changes CFLAGS
 GCONF_DEBUG="no"
 GNOME2_LA_PUNT="yes"
@@ -39,7 +39,6 @@ RDEPEND=">=x11-libs/gtk+-2.24:2
 	xinerama? ( x11-libs/libXinerama )
 	!x11-misc/expocity"
 DEPEND="${RDEPEND}
-	>=app-text/gnome-doc-utils-0.8
 	sys-devel/gettext
 	>=dev-util/intltool-0.35
 	virtual/pkgconfig
@@ -48,9 +47,10 @@ DEPEND="${RDEPEND}
 	x11-proto/xextproto
 	x11-proto/xproto"
 
-pkg_setup() {
+src_prepare() {
 	DOCS="AUTHORS ChangeLog HACKING NEWS README *.txt doc/*.txt"
 	G2CONF="${G2CONF}
+		ITSTOOL=$(type -P true)
 		--disable-static
 		--enable-canberra
 		--enable-compositor
@@ -59,10 +59,9 @@ pkg_setup() {
 		--enable-sm
 		--enable-startup-notification
 		--enable-xsync
+		--enable-themes-documentation
 		$(use_enable xinerama)"
-}
 
-src_prepare() {
 	gnome2_src_prepare
 
 	# WIFEXITED and friends are defined in sys/wait.h