x11-wm/mutter: 2.91.90 → 2.91.91

4 files changed, 55 insertions, 15 deletions

diff --git a/x11-wm/mutter/Manifest b/x11-wm/mutter/Manifest
index 1ab77e03..0d2dfda9 100644
--- a/x11-wm/mutter/Manifest
+++ b/x11-wm/mutter/Manifest
@@ -1,3 +1,4 @@
-DIST mutter-2.91.90.tar.bz2 2026046 RMD160 a68ff2c0e0779408d2d3aa8349a4aa5cd868274a SHA1 7e3deee64e952e5c4a9f478c62068e4dacbd1887 SHA256 aa10cb7caeae48ecea1903cbdd13d13cdf1b173b4c79684beaa451e4583d01ea
-EBUILD mutter-2.91.90.ebuild 1708 RMD160 e4bb119fe9bbdcb89900baddbb8fe8486dbfcf4c SHA1 cffffd70505b57e4ed42d35bd800f48564faa8fd SHA256 51cd9a9d61974d9ee25163ac253852f5fd907890a46075b9ac5608da4b25bf31
-EBUILD mutter-9999.ebuild 1708 RMD160 e4bb119fe9bbdcb89900baddbb8fe8486dbfcf4c SHA1 cffffd70505b57e4ed42d35bd800f48564faa8fd SHA256 51cd9a9d61974d9ee25163ac253852f5fd907890a46075b9ac5608da4b25bf31
+AUX mutter-fix-ld-failure.patch 1206 RMD160 3fbc9f3c0b9d4e7a8b681489548cea69bb84a3ee SHA1 55f5ec5624f213fe3a415baf9060ff6a4b85e290 SHA256 7565852e6b26c6b4a5bc16e011975768063aab9d5fe4ac4d557a482ab26fec6b
+DIST mutter-2.91.91.tar.bz2 2022660 RMD160 59da93e17a1ac89e2a5840f3b2a1398983692dc4 SHA1 823bd36c5607a7073208acaff8444b7be9c530e6 SHA256 2b894a9f57891853438b8f5b774bfb4b985e482c2a8dbdffa01398aa9139cb3d
+EBUILD mutter-2.91.91.ebuild 1678 RMD160 1093d9722324c7b34dc6eaf6953008aba439838a SHA1 0cd04792b25819490c94d86f645f85adbb780f62 SHA256 f416cad32fa1d951de5857356186349169f03e222933467dc1441f270f440047
+EBUILD mutter-9999.ebuild 1718 RMD160 0fd072d01d7661bcff046d18d24730251b3e37be SHA1 d1bfded90dfb93d77331ef39ae0e84f08b0f05fb SHA256 636a14501d302b8e4568f124d1eaa2d7e78b644e9378588818df31b53e45f027
diff --git a/x11-wm/mutter/files/mutter-fix-ld-failure.patch b/x11-wm/mutter/files/mutter-fix-ld-failure.patch
new file mode 100644
index 00000000..ef365739
--- /dev/null
+++ b/x11-wm/mutter/files/mutter-fix-ld-failure.patch
@@ -0,0 +1,39 @@
+From bbd98e7b8612a1bba82a397525a673643cff3d6e Mon Sep 17 00:00:00 2001
+From: Rico Tzschichholz <ricotz@t-online.de>
+Date: Tue, 8 Mar 2011 12:20:08 +0100
+Subject: [PATCH] Fix ld failure caused by several incomplete LDADD statements
+
+https://bugzilla.gnome.org/show_bug.cgi?id=644188
+---
+ src/Makefile.am |    8 ++++----
+ 1 files changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/src/Makefile.am b/src/Makefile.am
+index 4e02816..f87453d 100644
+--- a/src/Makefile.am
++++ b/src/Makefile.am
+@@ -218,7 +218,7 @@ mutter_theme_viewer_SOURCES=  \
+ bin_PROGRAMS=mutter mutter-theme-viewer
+ 
+ mutter_SOURCES = core/mutter.c
+-mutter_LDADD = libmutter-wm.la
++mutter_LDADD = $(MUTTER_LIBS) libmutter-wm.la
+ 
+ if HAVE_INTROSPECTION
+ include $(INTROSPECTION_MAKEFILE)
+@@ -257,9 +257,9 @@ testasyncgetprop_SOURCES = core/testasyncgetprop.c
+ 
+ noinst_PROGRAMS=testboxes testgradient testasyncgetprop
+ 
+-testboxes_LDADD = libmutter-wm.la
+-testgradient_LDADD = libmutter-wm.la
+-testasyncgetprop_LDADD = libmutter-wm.la
++testboxes_LDADD = $(MUTTER_LIBS) libmutter-wm.la
++testgradient_LDADD = $(MUTTER_LIBS) libmutter-wm.la
++testasyncgetprop_LDADD = $(MUTTER_LIBS) libmutter-wm.la
+ 
+ @INTLTOOL_DESKTOP_RULE@
+ 
+-- 
+1.7.3.4
+
diff --git a/x11-wm/mutter/mutter-2.91.90.ebuild b/x11-wm/mutter/mutter-2.91.91.ebuild
index c09aa97e..25e2dded 100644
--- a/x11-wm/mutter/mutter-2.91.90.ebuild
+++ b/x11-wm/mutter/mutter-2.91.91.ebuild
@@ -5,14 +5,14 @@
 EAPI="2"
 GNOME2_LA_PUNT="yes"
 
-inherit autotools gnome2
+inherit gnome2
 
 DESCRIPTION="Upcoming GNOME 3 window manager (derived from metacity)"
 HOMEPAGE="http://blogs.gnome.org/metacity/"
 
 LICENSE="GPL-2"
 SLOT="0"
-IUSE="debug +introspection +sound test xinerama"
+IUSE="debug +introspection test xinerama"
 if [[ ${PV} = 9999 ]]; then
 	inherit gnome2-live
 	KEYWORDS=""
@@ -23,12 +23,13 @@ fi
 RDEPEND=">=x11-libs/pango-1.2[X,introspection?]
 	>=x11-libs/cairo-1.10[X]
 	>=x11-libs/gtk+-2.91.7:3[introspection?]
-	>=gnome-base/gconf-2
-	>=dev-libs/glib-2.14
+	>=gnome-base/gconf-2:2
+	>=dev-libs/glib-2.14:2
+	>=media-libs/clutter-1.2:1.0
+	>=media-libs/libcanberra-0.26[gtk3]
 	>=x11-libs/startup-notification-0.7
 	>=x11-libs/libXcomposite-0.2
 
-	>=media-libs/clutter-1.2
 	x11-libs/libICE
 	x11-libs/libSM
 	x11-libs/libX11
@@ -40,7 +41,6 @@ RDEPEND=">=x11-libs/pango-1.2[X,introspection?]
 	x11-libs/libXrender
 
 	introspection? ( >=dev-libs/gobject-introspection-0.9.5 )
-	sound? (  >=media-libs/libcanberra-0.26[gtk3] )
 	xinerama? ( x11-libs/libXinerama )
 	gnome-extra/zenity
 	!x11-misc/expocity"
@@ -66,8 +66,8 @@ src_prepare() {
 		--enable-xsync
 		--enable-verbose-mode
 		--enable-compile-warnings=maximum
-		$(use_with sound libcanberra)
-		$(use_with introspection)
+		--with-libcanberra
+		$(use_enable introspection)
 		$(use_enable xinerama)"
 	gnome2_src_prepare
 }
diff --git a/x11-wm/mutter/mutter-9999.ebuild b/x11-wm/mutter/mutter-9999.ebuild
index c09aa97e..c16fc692 100644
--- a/x11-wm/mutter/mutter-9999.ebuild
+++ b/x11-wm/mutter/mutter-9999.ebuild
@@ -23,12 +23,12 @@ fi
 RDEPEND=">=x11-libs/pango-1.2[X,introspection?]
 	>=x11-libs/cairo-1.10[X]
 	>=x11-libs/gtk+-2.91.7:3[introspection?]
-	>=gnome-base/gconf-2
-	>=dev-libs/glib-2.14
+	>=gnome-base/gconf-2:2
+	>=dev-libs/glib-2.14:2
+	>=media-libs/clutter-1.2:1.0
 	>=x11-libs/startup-notification-0.7
 	>=x11-libs/libXcomposite-0.2
 
-	>=media-libs/clutter-1.2
 	x11-libs/libICE
 	x11-libs/libSM
 	x11-libs/libX11
@@ -67,7 +67,7 @@ src_prepare() {
 		--enable-verbose-mode
 		--enable-compile-warnings=maximum
 		$(use_with sound libcanberra)
-		$(use_with introspection)
+		$(use_enable introspection)
 		$(use_enable xinerama)"
 	gnome2_src_prepare
 }