From cdc8a18e2a6cfc9ee7abb9e1a7b2c060cafdc4eb Mon Sep 17 00:00:00 2001 From: Nirbheek Chauhan <nirbheek@gentoo.org> Date: Sun, 27 Mar 2011 13:06:12 +0000 Subject: Fix slot-deps on gnome libs, remove old Package-Manager: portage-2.1.9.44/cvs/Linux x86_64 --- x11-wm/metacity/ChangeLog | 6 ++- x11-wm/metacity/metacity-2.30.1.ebuild | 88 ---------------------------------- x11-wm/metacity/metacity-2.30.3.ebuild | 6 +-- 3 files changed, 8 insertions(+), 92 deletions(-) delete mode 100644 x11-wm/metacity/metacity-2.30.1.ebuild (limited to 'x11-wm/metacity') diff --git a/x11-wm/metacity/ChangeLog b/x11-wm/metacity/ChangeLog index 5909ccca7540..57a2cf553adc 100644 --- a/x11-wm/metacity/ChangeLog +++ b/x11-wm/metacity/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for x11-wm/metacity # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/x11-wm/metacity/ChangeLog,v 1.268 2011/03/22 19:55:12 ranger Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-wm/metacity/ChangeLog,v 1.269 2011/03/27 13:04:59 nirbheek Exp $ + + 27 Mar 2011; Nirbheek Chauhan <nirbheek@gentoo.org> + -metacity-2.30.1.ebuild, metacity-2.30.3.ebuild: + Fix slot-deps on gnome libs, remove old 22 Mar 2011; Brent Baude <ranger@gentoo.org> metacity-2.30.3.ebuild: Marking metacity-2.30.3 ppc stable for bug 353436 diff --git a/x11-wm/metacity/metacity-2.30.1.ebuild b/x11-wm/metacity/metacity-2.30.1.ebuild deleted file mode 100644 index ec6dedb361bc..000000000000 --- a/x11-wm/metacity/metacity-2.30.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.30.1.ebuild,v 1.8 2010/10/17 15:12:41 armin76 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.3.ebuild b/x11-wm/metacity/metacity-2.30.3.ebuild index d70f41056426..f1cd93465f80 100644 --- a/x11-wm/metacity/metacity-2.30.3.ebuild +++ b/x11-wm/metacity/metacity-2.30.3.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/x11-wm/metacity/metacity-2.30.3.ebuild,v 1.6 2011/03/22 19:55:12 ranger Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-wm/metacity/metacity-2.30.3.ebuild,v 1.7 2011/03/27 13:04:59 nirbheek Exp $ EAPI="3" # debug only changes CFLAGS @@ -19,8 +19,8 @@ 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 + >=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 -- cgit v1.2.3-65-gdbad