public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
From: "Gilles Dartiguelongue" <eva@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] proj/gnome:master commit in: x11-wm/mutter/
Date: Tue, 10 Dec 2013 23:31:15 +0000 (UTC)	[thread overview]
Message-ID: <1386718233.33e1669a8c505b74edbebf1daa2d6c696ab91846.eva@gentoo> (raw)

commit:     33e1669a8c505b74edbebf1daa2d6c696ab91846
Author:     Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
AuthorDate: Tue Dec 10 22:03:25 2013 +0000
Commit:     Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
CommitDate: Tue Dec 10 23:30:33 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=33e1669a

x11-wm/mutter: 3.8.4 → 3.10.2

---
 .../{mutter-9999.ebuild => mutter-3.10.2.ebuild}   | 55 +++++++++++-----------
 x11-wm/mutter/mutter-9999.ebuild                   | 48 +++++++++++--------
 2 files changed, 56 insertions(+), 47 deletions(-)

diff --git a/x11-wm/mutter/mutter-9999.ebuild b/x11-wm/mutter/mutter-3.10.2.ebuild
similarity index 61%
copy from x11-wm/mutter/mutter-9999.ebuild
copy to x11-wm/mutter/mutter-3.10.2.ebuild
index 402d55d..a130e6e 100644
--- a/x11-wm/mutter/mutter-9999.ebuild
+++ b/x11-wm/mutter/mutter-3.10.2.ebuild
@@ -1,14 +1,11 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
 EAPI="5"
-GNOME2_LA_PUNT="yes"
+GCONF_DEBUG="yes"
 
 inherit eutils 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/"
@@ -16,23 +13,22 @@ 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
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 
-COMMON_DEPEND=">=x11-libs/pango-1.2[X,introspection?]
+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[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?]
+	>=x11-libs/gtk+-3.9.11:3[X,introspection?]
+	>=dev-libs/glib-2.36.0:2
+	>=media-libs/clutter-1.14.3:1.0[introspection?]
+	>=media-libs/cogl-1.15.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?]
+	>=gnome-base/gsettings-desktop-schemas-3.7.3[introspection?]
+	gnome-base/gnome-desktop:3=
+	>sys-power/upower-0.9.11
 
 	x11-libs/libICE
 	x11-libs/libSM
@@ -44,12 +40,14 @@ COMMON_DEPEND=">=x11-libs/pango-1.2[X,introspection?]
 	x11-libs/libXinerama
 	x11-libs/libXrandr
 	x11-libs/libXrender
+	>=x11-libs/libXi-1.7
 
 	gnome-extra/zenity
 
 	introspection? ( >=dev-libs/gobject-introspection-0.9.5 )
 "
 DEPEND="${COMMON_DEPEND}
+	>=dev-util/gtk-doc-am-1.15
 	>=dev-util/intltool-0.35
 	sys-devel/gettext
 	virtual/pkgconfig
@@ -59,23 +57,26 @@ DEPEND="${COMMON_DEPEND}
 	test? ( app-text/docbook-xml-dtd:4.5 )
 "
 RDEPEND="${COMMON_DEPEND}
-	!x11-misc/expocity"
+	!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
 }
+
+src_configure() {
+	gnome2_src_configure \
+		--disable-static \
+		--enable-shape \
+		--enable-sm \
+		--enable-startup-notification \
+		--enable-xsync \
+		--enable-verbose-mode \
+		--with-libcanberra \
+		$(use_enable introspection)
+}

diff --git a/x11-wm/mutter/mutter-9999.ebuild b/x11-wm/mutter/mutter-9999.ebuild
index 402d55d..27729a3 100644
--- a/x11-wm/mutter/mutter-9999.ebuild
+++ b/x11-wm/mutter/mutter-9999.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
 EAPI="5"
-GNOME2_LA_PUNT="yes"
+GCONF_DEBUG="yes"
 
 inherit eutils gnome2
 if [[ ${PV} = 9999 ]]; then
@@ -19,20 +19,23 @@ IUSE="+introspection test"
 if [[ ${PV} = 9999 ]]; then
 	KEYWORDS=""
 else
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 fi
 
-COMMON_DEPEND=">=x11-libs/pango-1.2[X,introspection?]
+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[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?]
+	>=x11-libs/gtk+-3.9.11:3[X,introspection?]
+	>=dev-libs/glib-2.36.0:2
+	>=media-libs/clutter-1.14.3:1.0[introspection?]
+	>=media-libs/cogl-1.15.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?]
+	>=gnome-base/gsettings-desktop-schemas-3.7.3[introspection?]
+	gnome-base/gnome-desktop:3=
+	>sys-power/upower-0.9.11
 
 	x11-libs/libICE
 	x11-libs/libSM
@@ -44,12 +47,14 @@ COMMON_DEPEND=">=x11-libs/pango-1.2[X,introspection?]
 	x11-libs/libXinerama
 	x11-libs/libXrandr
 	x11-libs/libXrender
+	>=x11-libs/libXi-1.7
 
 	gnome-extra/zenity
 
 	introspection? ( >=dev-libs/gobject-introspection-0.9.5 )
 "
 DEPEND="${COMMON_DEPEND}
+	>=dev-util/gtk-doc-am-1.15
 	>=dev-util/intltool-0.35
 	sys-devel/gettext
 	virtual/pkgconfig
@@ -59,23 +64,26 @@ DEPEND="${COMMON_DEPEND}
 	test? ( app-text/docbook-xml-dtd:4.5 )
 "
 RDEPEND="${COMMON_DEPEND}
-	!x11-misc/expocity"
+	!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
 }
+
+src_configure() {
+	gnome2_src_configure \
+		--disable-static \
+		--enable-shape \
+		--enable-sm \
+		--enable-startup-notification \
+		--enable-xsync \
+		--enable-verbose-mode \
+		--with-libcanberra \
+		$(use_enable introspection)
+}


             reply	other threads:[~2013-12-10 23:31 UTC|newest]

Thread overview: 49+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2013-12-10 23:31 Gilles Dartiguelongue [this message]
  -- strict thread matches above, loose matches on Subject: below --
2018-12-28 23:32 [gentoo-commits] proj/gnome:master commit in: x11-wm/mutter/ Gilles Dartiguelongue
2018-12-28 23:32 Gilles Dartiguelongue
2018-12-26  4:19 Sobhan Mohammadpour
2018-12-26  4:11 Sobhan Mohammadpour
2018-09-28 17:58 Mart Raudsepp
2018-09-26 22:14 Mart Raudsepp
2018-09-26 22:14 Mart Raudsepp
2018-09-19 10:14 Mart Raudsepp
2018-05-29 22:47 Sobhan Mohammadpour
2018-05-29 22:45 Sobhan Mohammadpour
2018-01-31 20:24 Sobhan Mohammadpour
2018-01-12 15:08 Dennis Lamm
2016-05-11  6:10 Remi Cardona
2016-03-25  0:56 Ole Reifschneider
2015-10-02 12:50 Ole Reifschneider
2015-09-13 22:03 Ole Reifschneider
2015-09-01 18:48 Ole Reifschneider
2015-05-14 18:22 Gilles Dartiguelongue
2014-12-26 21:53 Gilles Dartiguelongue
2014-12-21 13:28 Gilles Dartiguelongue
2014-11-24  7:26 Remi Cardona
2014-11-03 23:24 Gilles Dartiguelongue
2014-10-26  9:28 Gilles Dartiguelongue
2014-10-18 14:55 Gilles Dartiguelongue
2014-10-12 23:19 Gilles Dartiguelongue
2014-10-12 23:19 Gilles Dartiguelongue
2014-10-11 16:43 Gilles Dartiguelongue
2014-04-21 22:31 Gilles Dartiguelongue
2014-04-15 22:05 Gilles Dartiguelongue
2014-02-12 23:48 Gilles Dartiguelongue
2012-12-16 19:23 Gilles Dartiguelongue
2012-11-22 22:49 Gilles Dartiguelongue
2012-10-24  9:04 Alexandre Rostovtsev
2012-10-24  9:04 Alexandre Rostovtsev
2012-09-30  0:15 Alexandre Rostovtsev
2012-09-03 17:08 Priit Laes
2012-08-18 12:09 Priit Laes
2012-05-24  9:11 Alexandre Restovtsev
2012-04-20  7:12 Alexandre Restovtsev
2012-04-06  6:34 Priit Laes
2012-04-03  6:36 Alexandre Restovtsev
2011-11-05 23:55 Alexandre Restovtsev
2011-04-27 22:22 Gilles Dartiguelongue
2011-04-08 10:52 Gilles Dartiguelongue
2011-04-05  0:57 Nirbheek Chauhan
2011-03-23  5:20 Nirbheek Chauhan
2011-03-19 23:22 Nirbheek Chauhan
2011-02-23 14:40 Nirbheek Chauhan

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1386718233.33e1669a8c505b74edbebf1daa2d6c696ab91846.eva@gentoo \
    --to=eva@gentoo.org \
    --cc=gentoo-commits@lists.gentoo.org \
    --cc=gentoo-dev@lists.gentoo.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox