commit: 691968ab295ed5cfb4aa2e5c99838c7c7bf3ba5c
Author: Ole Reifschneider <tranquility <AT> gentoo <DOT> org>
AuthorDate: Sun Sep 13 18:55:48 2015 +0000
Commit: Ole Reifschneider <tranquility <AT> gentoo <DOT> org>
CommitDate: Sun Sep 13 18:55:48 2015 +0000
URL: https://gitweb.gentoo.org/proj/gnome.git/commit/?id=691968ab
x11-wm/mutter: Bump version to 3.17.91
Package-Manager: portage-2.2.20.1
Manifest-Sign-Key: 7E8B4D42
.../{mutter-9999.ebuild => mutter-3.17.91.ebuild} | 31 +++++++++-------------
x11-wm/mutter/mutter-9999.ebuild | 22 ++++++++-------
2 files changed, 25 insertions(+), 28 deletions(-)
diff --git a/x11-wm/mutter/mutter-9999.ebuild
b/x11-wm/mutter/mutter-3.17.91.ebuild
similarity index 75%
copy from x11-wm/mutter/mutter-9999.ebuild
copy to x11-wm/mutter/mutter-3.17.91.ebuild
index 6cf55c9..14cb414 100644
--- a/x11-wm/mutter/mutter-9999.ebuild
+++ b/x11-wm/mutter/mutter-3.17.91.ebuild
@@ -6,35 +6,30 @@ EAPI="5"
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/"
+HOMEPAGE="https://git.gnome.org/browse/mutter/"
LICENSE="GPL-2+"
SLOT="0"
IUSE="+introspection +kms test wayland"
-if [[ ${PV} = 9999 ]]; then
- KEYWORDS=""
-else
- KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-fi
+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/gtk+-3.9.11:3[X,introspection?]
- >=dev-libs/glib-2.36.0:2
- >=media-libs/clutter-1.19.5:1.0[introspection?]
+ >=dev-libs/glib-2.36.0:2[dbus]
+ >=media-libs/clutter-1.23.4:1.0[introspection?]
>=media-libs/cogl-1.17.1: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.7.3[introspection?]
+ >=gnome-base/gsettings-desktop-schemas-3.15.92[introspection?]
gnome-base/gnome-desktop:3=
- >sys-power/upower-0.99
+ >sys-power/upower-0.99:=
x11-libs/libICE
x11-libs/libSM
@@ -44,9 +39,9 @@ COMMON_DEPEND="
x11-libs/libXdamage
x11-libs/libXext
x11-libs/libXfixes
- >=x11-libs/libXi-1.7
+ >=x11-libs/libXi-1.7.4
x11-libs/libXinerama
- x11-libs/libXrandr
+ >=x11-libs/libXrandr-1.5.0
x11-libs/libXrender
x11-libs/libxcb
x11-libs/libxkbfile
@@ -55,10 +50,10 @@ COMMON_DEPEND="
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[egl]
+ >=media-libs/clutter-1.20[egl]
media-libs/cogl:1.0=[kms]
>=media-libs/mesa-10.3[gbm]
sys-apps/systemd
@@ -66,7 +61,7 @@ COMMON_DEPEND="
x11-libs/libdrm:= )
wayland? (
>=dev-libs/wayland-1.6.90
- media-libs/clutter[wayland]
+ >=media-libs/clutter-1.20[wayland]
x11-base/xorg-server[wayland] )
"
DEPEND="${COMMON_DEPEND}
diff --git a/x11-wm/mutter/mutter-9999.ebuild b/x11-wm/mutter/mutter-9999.ebuild
index 6cf55c9..6f10ef4 100644
--- a/x11-wm/mutter/mutter-9999.ebuild
+++ b/x11-wm/mutter/mutter-9999.ebuild
@@ -11,7 +11,7 @@ if [[ ${PV} = 9999 ]]; then
fi
DESCRIPTION="GNOME 3 compositing window manager based on Clutter"
-HOMEPAGE="http://git.gnome.org/browse/mutter/"
+HOMEPAGE="https://git.gnome.org/browse/mutter/"
LICENSE="GPL-2+"
SLOT="0"
@@ -22,19 +22,21 @@ else
KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86"
fi
+# 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/gtk+-3.9.11:3[X,introspection?]
- >=dev-libs/glib-2.36.0:2
- >=media-libs/clutter-1.19.5:1.0[introspection?]
+ >=dev-libs/glib-2.36.0:2[dbus]
+ >=media-libs/clutter-1.23.4:1.0[introspection?]
>=media-libs/cogl-1.17.1: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.7.3[introspection?]
+ >=gnome-base/gsettings-desktop-schemas-3.15.92[introspection?]
gnome-base/gnome-desktop:3=
- >sys-power/upower-0.99
+ >sys-power/upower-0.99:=
x11-libs/libICE
x11-libs/libSM
@@ -44,9 +46,9 @@ COMMON_DEPEND="
x11-libs/libXdamage
x11-libs/libXext
x11-libs/libXfixes
- >=x11-libs/libXi-1.7
+ >=x11-libs/libXi-1.7.4
x11-libs/libXinerama
- x11-libs/libXrandr
+ >=x11-libs/libXrandr-1.5.0
x11-libs/libXrender
x11-libs/libxcb
x11-libs/libxkbfile
@@ -55,10 +57,10 @@ COMMON_DEPEND="
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[egl]
+ >=media-libs/clutter-1.20[egl]
media-libs/cogl:1.0=[kms]
>=media-libs/mesa-10.3[gbm]
sys-apps/systemd
@@ -66,7 +68,7 @@ COMMON_DEPEND="
x11-libs/libdrm:= )
wayland? (
>=dev-libs/wayland-1.6.90
- media-libs/clutter[wayland]
+ >=media-libs/clutter-1.20[wayland]
x11-base/xorg-server[wayland] )
"
DEPEND="${COMMON_DEPEND}