From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id 1B67E1381F3 for ; Sun, 16 Dec 2012 19:23:31 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id D15BD21C063; Sun, 16 Dec 2012 19:23:23 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 3FDAB21C063 for ; Sun, 16 Dec 2012 19:23:23 +0000 (UTC) Received: from hornbill.gentoo.org (hornbill.gentoo.org [94.100.119.163]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 2F15D33DC63 for ; Sun, 16 Dec 2012 19:23:22 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id C1B4AE543C for ; Sun, 16 Dec 2012 19:23:20 +0000 (UTC) From: "Gilles Dartiguelongue" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Gilles Dartiguelongue" Message-ID: <1355684813.57a564734efe75474e34d235d3dcac8f1754ac5b.eva@gentoo> Subject: [gentoo-commits] proj/gnome:master commit in: x11-wm/mutter/ X-VCS-Repository: proj/gnome X-VCS-Files: x11-wm/mutter/metadata.xml x11-wm/mutter/mutter-3.6.2.ebuild x11-wm/mutter/mutter-9999.ebuild X-VCS-Directories: x11-wm/mutter/ X-VCS-Committer: eva X-VCS-Committer-Name: Gilles Dartiguelongue X-VCS-Revision: 57a564734efe75474e34d235d3dcac8f1754ac5b X-VCS-Branch: master Date: Sun, 16 Dec 2012 19:23:20 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 8bf5ca5e-f51a-4fc8-b0b4-6ecf997c83f3 X-Archives-Hash: 93c186e1cabb37efc7d1bb94b1b90ee4 commit: 57a564734efe75474e34d235d3dcac8f1754ac5b Author: Gilles Dartiguelongue gentoo org> AuthorDate: Sun Dec 16 19:06:53 2012 +0000 Commit: Gilles Dartiguelongue gentoo org> CommitDate: Sun Dec 16 19:06:53 2012 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=57a56473 x11-wm/mutter: moved to gx86 * sync live ebuild * USE=introspection is now global --- x11-wm/mutter/metadata.xml | 4 -- x11-wm/mutter/mutter-3.6.2.ebuild | 80 ------------------------------------- x11-wm/mutter/mutter-9999.ebuild | 11 +++-- 3 files changed, 6 insertions(+), 89 deletions(-) diff --git a/x11-wm/mutter/metadata.xml b/x11-wm/mutter/metadata.xml index 99b3795..6e0e2ec 100644 --- a/x11-wm/mutter/metadata.xml +++ b/x11-wm/mutter/metadata.xml @@ -2,8 +2,4 @@ gnome - - Use dev-libs/gobject-introspection - for introspection - diff --git a/x11-wm/mutter/mutter-3.6.2.ebuild b/x11-wm/mutter/mutter-3.6.2.ebuild deleted file mode 100644 index c476bc0..0000000 --- a/x11-wm/mutter/mutter-3.6.2.ebuild +++ /dev/null @@ -1,80 +0,0 @@ -# Copyright 1999-2012 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: $ - -EAPI="4" -GNOME2_LA_PUNT="yes" - -inherit gnome2 -if [[ ${PV} = 9999 ]]; then - inherit gnome2-live -fi - -DESCRIPTION="GNOME 3 compositing window manager based on Clutter" -HOMEPAGE="http://git.gnome.org/browse/mutter/" - -LICENSE="GPL-2+" -SLOT="0" -IUSE="+introspection test" -if [[ ${PV} = 9999 ]]; then - KEYWORDS="" -else - KEYWORDS="~amd64 ~x86" -fi - -COMMON_DEPEND=">=x11-libs/pango-1.2[X,introspection?] - >=x11-libs/cairo-1.10[X] - x11-libs/gdk-pixbuf:2[introspection?] - >=x11-libs/gtk+-3.3.7:3[introspection?] - >=dev-libs/glib-2.25.11:2 - >=media-libs/clutter-1.9.10:1.0[introspection?] - >=media-libs/cogl-1.9.6:1.0[introspection?] - >=media-libs/libcanberra-0.26[gtk3] - >=x11-libs/startup-notification-0.7 - >=x11-libs/libXcomposite-0.2 - >=gnome-base/gsettings-desktop-schemas-3.3.0[introspection?] - - x11-libs/libICE - x11-libs/libSM - x11-libs/libX11 - x11-libs/libXcursor - x11-libs/libXdamage - x11-libs/libXext - x11-libs/libXfixes - x11-libs/libXinerama - x11-libs/libXrandr - x11-libs/libXrender - - gnome-extra/zenity - - introspection? ( >=dev-libs/gobject-introspection-0.9.5 ) -" -DEPEND="${COMMON_DEPEND} - >=dev-util/intltool-0.35 - sys-devel/gettext - virtual/pkgconfig - test? ( app-text/docbook-xml-dtd:4.5 ) - x11-proto/xextproto - x11-proto/xineramaproto - x11-proto/xproto" -RDEPEND="${COMMON_DEPEND} - !x11-misc/expocity" - -src_prepare() { - DOCS="AUTHORS ChangeLog HACKING MAINTAINERS NEWS README *.txt doc/*.txt" - G2CONF="${G2CONF} - --disable-static - --enable-shape - --enable-sm - --enable-startup-notification - --enable-xsync - --enable-verbose-mode - --enable-compile-warnings=maximum - --with-libcanberra - $(use_enable introspection)" - - # Compat with Ubuntu metacity themes (e.g. x11-themes/light-themes) - epatch "${FILESDIR}/${PN}-3.2.1-ignore-shadow-and-padding.patch" - - gnome2_src_prepare -} diff --git a/x11-wm/mutter/mutter-9999.ebuild b/x11-wm/mutter/mutter-9999.ebuild index c476bc0..402d55d 100644 --- a/x11-wm/mutter/mutter-9999.ebuild +++ b/x11-wm/mutter/mutter-9999.ebuild @@ -2,10 +2,10 @@ # Distributed under the terms of the GNU General Public License v2 # $Header: $ -EAPI="4" +EAPI="5" GNOME2_LA_PUNT="yes" -inherit gnome2 +inherit eutils gnome2 if [[ ${PV} = 9999 ]]; then inherit gnome2-live fi @@ -25,7 +25,7 @@ fi COMMON_DEPEND=">=x11-libs/pango-1.2[X,introspection?] >=x11-libs/cairo-1.10[X] x11-libs/gdk-pixbuf:2[introspection?] - >=x11-libs/gtk+-3.3.7:3[introspection?] + >=x11-libs/gtk+-3.3.7:3[X,introspection?] >=dev-libs/glib-2.25.11:2 >=media-libs/clutter-1.9.10:1.0[introspection?] >=media-libs/cogl-1.9.6:1.0[introspection?] @@ -53,10 +53,11 @@ DEPEND="${COMMON_DEPEND} >=dev-util/intltool-0.35 sys-devel/gettext virtual/pkgconfig - test? ( app-text/docbook-xml-dtd:4.5 ) x11-proto/xextproto x11-proto/xineramaproto - x11-proto/xproto" + x11-proto/xproto + test? ( app-text/docbook-xml-dtd:4.5 ) +" RDEPEND="${COMMON_DEPEND} !x11-misc/expocity"