Version bump, drop old

Package-Manager: portage-2.2.18/cvs/Linux x86_64
Manifest-Sign-Key: 0xA188FBD4

3 files changed, 50 insertions, 24 deletions

diff --git a/x11-wm/mutter/ChangeLog b/x11-wm/mutter/ChangeLog
index 41070ea96eaa..9e2f7f544404 100644
--- a/x11-wm/mutter/ChangeLog
+++ b/x11-wm/mutter/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for x11-wm/mutter
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/mutter/ChangeLog,v 1.54 2015/03/15 13:34:58 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/mutter/ChangeLog,v 1.55 2015/03/28 09:21:51 pacho Exp $
+
+*mutter-3.14.4 (28 Mar 2015)
+
+  28 Mar 2015; Pacho Ramos <pacho@gentoo.org> +mutter-3.14.4.ebuild,
+  -mutter-3.12.2.ebuild:
+  Version bump, drop old
 
   15 Mar 2015; Pacho Ramos <pacho@gentoo.org> mutter-3.14.3.ebuild:
   x86 stable, bug 534012
diff --git a/x11-wm/mutter/Manifest b/x11-wm/mutter/Manifest
index 5a9e759e3824..7ffdc85daa54 100644
--- a/x11-wm/mutter/Manifest
+++ b/x11-wm/mutter/Manifest
@@ -3,16 +3,16 @@ Hash: SHA256
 
 AUX mutter-3.14.2-automagic.patch 3729 SHA256 ecf81fe37f517451b9d207351a10d939f11ae42f2085e02336ed4b3164285717 SHA512 0bd1dd46dd7c7148ec7323d31962b6922be30d184a0ccb02311a69f029c21d9fc479eac6b6efb3bf48fca8b0ecb38487705bef9a93fdb6275bed393175b3c878 WHIRLPOOL aed80cb8c9724c38f3fe45ce07cd9e55570a5e706e27a69b369610179f44c60b11c2d04857306b740117910287badc4af19782df36b8e9bee88c22ea602b2d65
 AUX mutter-3.2.1-ignore-shadow-and-padding.patch 2640 SHA256 765c04ba4d177789407a25d3cbdf358e3fa125170cfd37c53095372bc4ec883d SHA512 ba04a2265be9b2816ada33cb2dcf71ff02eb8667ada7c41139fc9e44e85a37030b8f0b7eb8064af2b6e691539a6dae5a0f8e66e06e2e3b803287eec798f13b52 WHIRLPOOL e85a2e27c9f036156dca68276793ea4bee5381ca43acdd85e7a37b4f577c6ae581be70866fa390a62fa4edf57d78b133185062642c96f30053a0b36f8c946893
-DIST mutter-3.12.2.tar.xz 1695316 SHA256 e653cf3e8c29af8d8c086bebcaa06781c48695be949417b72278fee37fe9e173 SHA512 f13dfe1498f6b1d34850a81aeafed5429ed2536c4f81bc83d9ee9bf0892d9db4a4cdb7022e3fe6454265c0f2d8d3d4a4df191cf477a356f5bab8cffe87a3dc25 WHIRLPOOL fdc12dc9e59f8c30a725fe8dd71bfc4d05ffcf5fbc7494b7142f4651bf6c7afd3cd78d6002324863bd69a31d087eb2b0c8917d8e6c7a60220c848ae390851c83
 DIST mutter-3.14.3.tar.xz 1608232 SHA256 0b23a2d31980d9de8e92ef940e6f63e3ac0f6446e2afc69ecbc80163f6af3a23 SHA512 95e09a8361dfa3dca000f0a245d2c33eb135ee603f368cc4e6c63c3d28830a68658cc43eb114af285b7d2efbce256cbac8db2db7c84578f563dcdcf4032d246d WHIRLPOOL 7e06c9013a360d42dddc7ba844a375d4a5c5be441f265623c9c352a18b3f7d2e085a4698f4f61cc2527aa1a3a78c23d002603cd7eebe95f7afbe732adcdef0f5
-EBUILD mutter-3.12.2.ebuild 2054 SHA256 55a5feab3bafbb9496c955a131dfc827545100b35d3ca180e89ab92603c8679b SHA512 d139065543c4cfbfde296a069241ad2fd1b554f69fbf18627aaa0e3c92039ba3e6874b44bdc33d172c4c67cbfe0fcf5c587e9e6a15f6277d0376ac337ace7467 WHIRLPOOL 699b36bbcfc48979edc3dc036b37e5942d062360df4b5fe9c2a8154a41c1ee5e14608efc874d105779c5d700b00b0b6fe785423a822ea6c76e9ad9ae5ec3ba5b
+DIST mutter-3.14.4.tar.xz 1608836 SHA256 b4fbcc0664484d6215fc1f2101e9b636303de63544b786f2f87ebf2f6a616a8b SHA512 5b6e2d969e9a328e23bedb9fd0409da1af0d2ae8ded6a940992d4cff18a8cbfe2aa6582a56a2c8bd549a560a84d8cbffe953f151bcadf235315b8ec8bc7d1267 WHIRLPOOL 45c0329832999f14a5eaa77df3a6c7bbc72556b779fc55b3db9505594efec40252996bf8d96083da47fdb67b6bf5a9402f526d8bbb1e5436e5de16a8520e4acf
 EBUILD mutter-3.14.3.ebuild 2579 SHA256 3d3d1640b04a5acf713f5e7607ee8932df3269ed77a26dcb9d9aa9c8245506ad SHA512 c164909302281c49154f527fda5cd1f8a144a8f993cc95acf37bd05a1b4a178a3fdbf516ab662006cd8ad85ef55b9171347913f067e53c85db0158c465bd9bd7 WHIRLPOOL 2c2b10277430f05e68f2e406d1fc845f660ddf35d17025aea15971f19b7a1ef9ac7cf4dcfc984022e76a2f6ff075b29259aa68f5a411e7b2ee74673c78a293cb
-MISC ChangeLog 8684 SHA256 ea6bb059ec6c3313a3a0c519f60feb8a6c27cdaa177ab365ca00dca2611ab8c3 SHA512 58f299eb2f02ea38e0fe649ed8d2412be5000cd60ffd7d1c5c800674dd234832c552d3af0f0582d601df86992050b6c4376e57b7b2193ec3964706e8e68eb24d WHIRLPOOL 0fc31aa2568f3f4619414c023fbd35fbb96bc7b6658d36b56856cf4220e782f0b08985d1ae39ea0ebc216076af2b4a512a4d1b8640dfd714f906e067e5910a21
+EBUILD mutter-3.14.4.ebuild 2611 SHA256 6f0a2ed14c6a6885554ffd559eacfb1dfb1b07dd69485dd8d22e99801d5da5aa SHA512 d5a6367bf4defec846c8a3e1d72416f769fd09e96b8b2abf042ae893d924d22ef5e645f48d103edcc850a9df1b8fcb68c71f162fe19d3275d0ff38a6bc2939bc WHIRLPOOL 2a95d8a6329e33bc2feb8723c2a7126abee6968d529451b479e5c56e05ac89c9f1cd092c89d56dceaa4eb2c1eb76cec3dbfc08b92fe5838b4cd110574b7abb62
+MISC ChangeLog 8834 SHA256 8d085c78d6d2cf517d9a0c25b0b52b2d5140474036bf7c3d7257a5f79bbb3d35 SHA512 27502acf33ae0294d37555e0caa0ea3110c99d4d5cb089146d967a890e372d48076a64463cf7d6302e1352d1d03e6eff904a04e9d53cccc0d8dd982b3b12459a WHIRLPOOL 8c9056faa3c8d82f9f3c92db47b9bf56c5a190db3b0eb254a09d003492b176f4933b2af01ab818e67e3ad00a50fad74ee291ec767d6cb542f1ef8f53fc3d3989
 MISC metadata.xml 220 SHA256 c8529b9b3e1e8f43611e9431beebf801acec0d5df9fb467db8cb6ac17717bebb SHA512 0a65108bef9b975d46c24eda273bbb36457442275685140267285ea176fefe1bb53ff4c301e746cd2563805c26e11392413b02ffd67d9f4888c1026f10d77d38 WHIRLPOOL 9314aaf1e1d6554f10dc9751105f1eebd5d4d632bb56610d1fc8ff34032f2fd14d9df7b178cebc0bea1eaa27525634f95548d05498773aa5feb0dc46dd248049
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iEYEAREIAAYFAlUFinQACgkQCaWpQKGI+9T6UQCeIrCLIsUr/teG7ItuYp7fLMGz
-AgQAn0Z12L+oVFQ0qXob968Fv7bFbxEv
-=yJO9
+iEYEAREIAAYFAlUWcrAACgkQCaWpQKGI+9RzfwCdG9QNgjGhAs7nr7AChyTDCe9N
+MmEAn2uXgXQ/k/onbsSBkYWnK3oY6BY/
+=SNii
 -----END PGP SIGNATURE-----
diff --git a/x11-wm/mutter/mutter-3.12.2.ebuild b/x11-wm/mutter/mutter-3.14.4.ebuild
index 7f686f611d8e..f0693ed27cce 100644
--- a/x11-wm/mutter/mutter-3.12.2.ebuild
+++ b/x11-wm/mutter/mutter-3.14.4.ebuild
@@ -1,27 +1,28 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/mutter/mutter-3.12.2.ebuild,v 1.4 2014/09/26 20:39:59 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/mutter/mutter-3.14.4.ebuild,v 1.1 2015/03/28 09:21:51 pacho Exp $
 
 EAPI="5"
 GCONF_DEBUG="yes"
 
-inherit eutils gnome2
+inherit autotools eutils gnome2
 
 DESCRIPTION="GNOME 3 compositing window manager based on Clutter"
 HOMEPAGE="http://git.gnome.org/browse/mutter/"
 
 LICENSE="GPL-2+"
 SLOT="0"
-IUSE="+introspection test"
-KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc x86"
+IUSE="+introspection +kms test wayland"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 
+# libXi-1.7.4 or newer needed per:
+# https://bugzilla.gnome.org/show_bug.cgi?id=738944
 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.9.11:3[X,introspection?]
-	>=dev-libs/glib-2.36.0:2
-	>=media-libs/clutter-1.14.3:1.0[introspection?]
+	>=dev-libs/glib-2.36.0:2[dbus]
+	>=media-libs/clutter-1.19.5:1.0[introspection?]
 	>=media-libs/cogl-1.17.1:1.0=[introspection?]
 	>=media-libs/libcanberra-0.26[gtk3]
 	>=x11-libs/startup-notification-0.7
@@ -33,22 +34,39 @@ COMMON_DEPEND="
 	x11-libs/libICE
 	x11-libs/libSM
 	x11-libs/libX11
+	>=x11-libs/libXcomposite-0.2
 	x11-libs/libXcursor
 	x11-libs/libXdamage
 	x11-libs/libXext
 	x11-libs/libXfixes
+	>=x11-libs/libXi-1.7.4
 	x11-libs/libXinerama
 	x11-libs/libXrandr
 	x11-libs/libXrender
-	>=x11-libs/libXi-1.7
+	x11-libs/libxcb
+	x11-libs/libxkbfile
+	>=x11-libs/libxkbcommon-0.4.3[X]
+	x11-misc/xkeyboard-config
 
 	gnome-extra/zenity
 
-	introspection? ( >=dev-libs/gobject-introspection-0.9.5 )
+	introspection? ( >=dev-libs/gobject-introspection-1.42:= )
+	kms? (
+		dev-libs/libinput
+		>=media-libs/clutter-1.20[egl]
+		media-libs/cogl:1.0=[kms]
+		>=media-libs/mesa-10.3[gbm]
+		sys-apps/systemd
+		virtual/libgudev
+		x11-libs/libdrm:= )
+	wayland? (
+		>=dev-libs/wayland-1.5.90
+		>=media-libs/clutter-1.20[wayland]
+		x11-base/xorg-server[wayland] )
 "
 DEPEND="${COMMON_DEPEND}
 	>=dev-util/gtk-doc-am-1.15
-	>=dev-util/intltool-0.35
+	>=dev-util/intltool-0.41
 	sys-devel/gettext
 	virtual/pkgconfig
 	x11-proto/xextproto
@@ -61,22 +79,24 @@ RDEPEND="${COMMON_DEPEND}
 "
 
 src_prepare() {
-	DOCS="AUTHORS ChangeLog HACKING MAINTAINERS NEWS README *.txt doc/*.txt"
-
 	# Compat with Ubuntu metacity themes (e.g. x11-themes/light-themes)
-	epatch "${FILESDIR}/${PN}-3.2.1-ignore-shadow-and-padding.patch"
+	epatch "${FILESDIR}"/${PN}-3.2.1-ignore-shadow-and-padding.patch
+
+	# Automagic fixes, upstream bug #746929
+	epatch "${FILESDIR}"/${PN}-3.14.2-automagic.patch
 
+	eautoreconf
 	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)
+		$(use_enable introspection) \
+		$(use_enable kms native-backend) \
+		$(use_enable wayland)
 }