commit: a7a9616f6f484a4e250e9211f5c42fcd4980dd3e
Author: Ole Reifschneider <tranquility <AT> gentoo <DOT> org>
AuthorDate: Sun Sep 13 22:04:02 2015 +0000
Commit: Ole Reifschneider <tranquility <AT> gentoo <DOT> org>
CommitDate: Sun Sep 13 22:04:02 2015 +0000
URL: https://gitweb.gentoo.org/proj/gnome.git/commit/?id=a7a9616f
gnome-base/gnome-shell: Bump version to 3.17.91
Package-Manager: portage-2.2.20.1
Manifest-Sign-Key: 7E8B4D42
...hell-9999.ebuild => gnome-shell-3.17.91.ebuild} | 65 +++++++++-------------
gnome-base/gnome-shell/gnome-shell-9999.ebuild | 30 +++++-----
2 files changed, 41 insertions(+), 54 deletions(-)
diff --git a/gnome-base/gnome-shell/gnome-shell-9999.ebuild
b/gnome-base/gnome-shell/gnome-shell-3.17.91.ebuild
similarity index 79%
copy from gnome-base/gnome-shell/gnome-shell-9999.ebuild
copy to gnome-base/gnome-shell/gnome-shell-3.17.91.ebuild
index 6ca3a9c..9c601d4 100644
--- a/gnome-base/gnome-shell/gnome-shell-9999.ebuild
+++ b/gnome-base/gnome-shell/gnome-shell-3.17.91.ebuild
@@ -5,12 +5,9 @@
EAPI="5"
GCONF_DEBUG="no"
GNOME2_LA_PUNT="yes"
-PYTHON_COMPAT=( python2_{6,7} )
+PYTHON_COMPAT=( python{3_3,3_4} )
inherit autotools eutils gnome2 multilib pax-utils python-r1 systemd
-if [[ ${PV} = 9999 ]]; then
- inherit gnome2-live
-fi
DESCRIPTION="Provides core UI functions for the GNOME 3 desktop"
HOMEPAGE="https://wiki.gnome.org/Projects/GnomeShell";
@@ -19,11 +16,7 @@ LICENSE="GPL-2+ LGPL-2+"
SLOT="0"
IUSE="+bluetooth +i18n +networkmanager -openrc-force"
REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-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"
# libXfixes-5.0 needed for pointer barriers
# FIXME:
@@ -32,25 +25,26 @@ COMMON_DEPEND="
>=app-accessibility/at-spi2-atk-2.5.3
>=dev-libs/atk-2[introspection]
>=app-crypt/gcr-3.7.5[introspection]
- >=dev-libs/glib-2.39.1:2
+ >=dev-libs/glib-2.45.3:2[dbus]
>=dev-libs/gjs-1.39
- >=dev-libs/gobject-introspection-0.10.1
- >=x11-libs/gtk+-3.13.2:3[introspection]
- >=media-libs/clutter-1.15.90:1.0[introspection]
+ >=dev-libs/gobject-introspection-0.10.1:=
+ dev-libs/libical:=
+ >=x11-libs/gtk+-3.15.0:3[introspection]
+ >=media-libs/clutter-1.21.5:1.0[introspection]
>=dev-libs/json-glib-0.13.2
>=dev-libs/libcroco-0.6.8:0.6
>=gnome-base/gnome-desktop-3.7.90:3=[introspection]
- >=gnome-base/gsettings-desktop-schemas-3.12
+ >=gnome-base/gsettings-desktop-schemas-3.14
>=gnome-base/gnome-keyring-3.3.90
gnome-base/libgnome-keyring
- >=gnome-extra/evolution-data-server-3.5.3:=
+ >=gnome-extra/evolution-data-server-3.17.2:=
>=media-libs/gstreamer-0.11.92:1.0
>=net-im/telepathy-logger-0.2.4[introspection]
>=net-libs/telepathy-glib-0.19[introspection]
>=sys-auth/polkit-0.100[introspection]
>=x11-libs/libXfixes-5.0
x11-libs/libXtst
- >=x11-wm/mutter-3.14.3[introspection]
+ >=x11-wm/mutter-3.17.91[introspection]
>=x11-libs/startup-notification-0.11
${PYTHON_DEPS}
@@ -97,7 +91,6 @@ RDEPEND="${COMMON_DEPEND}
>=gnome-base/gnome-session-2.91.91
>=gnome-base/gnome-settings-daemon-3.8.3
- >=gnome-base/gnome-control-center-3.8.3[bluetooth(+)?]
!openrc-force? ( >=sys-apps/systemd-31 )
@@ -111,8 +104,10 @@ RDEPEND="${COMMON_DEPEND}
net-misc/mobile-broadband-provider-info
sys-libs/timezone-data )
"
-# avoid circular dependency
-PDEPEND=">=gnome-base/gdm-3.5[introspection]
+# avoid circular dependency, see bug #546134
+PDEPEND="
+ >=gnome-base/gdm-3.5[introspection]
+
>=gnome-base/gnome-control-center-3.8.3[bluetooth(+)?,networkmanager(+)?]
"
DEPEND="${COMMON_DEPEND}
dev-libs/libxslt
@@ -127,18 +122,18 @@ DEPEND="${COMMON_DEPEND}
src_prepare() {
# Change favorites defaults, bug #479918
- epatch "${FILESDIR}/${PN}-3.14.0-defaults.patch"
+ epatch "${FILESDIR}"/${PN}-3.14.0-defaults.patch
# Fix automagic gnome-bluetooth dep, bug #398145
- epatch "${FILESDIR}/${PN}-3.12.0-bluetooth-flag.patch"
+ epatch "${FILESDIR}"/${PN}-3.12-bluetooth-flag.patch
# Fix silent bluetooth linking failure with ld.gold, bug #503952
# https://bugzilla.gnome.org/show_bug.cgi?id=726435
- epatch "${FILESDIR}/${PN}-3.14.0-bluetooth-gold.patch"
+ epatch "${FILESDIR}"/${PN}-3.14.0-bluetooth-gold.patch
epatch_user
- [[ ${PV} != 9999 ]] && eautoreconf
+ eautoreconf
gnome2_src_prepare
}
@@ -161,14 +156,15 @@ src_install() {
# Required for gnome-shell on hardened/PaX, bug #398941
# Future-proof for >=spidermonkey-1.8.7 following polkit's example
if has_version '<dev-lang/spidermonkey-1.8.7'; then
- pax-mark mr "${ED}usr/bin/gnome-shell"
+ pax-mark mr "${ED}usr/bin/gnome-shell"{,-extension-prefs}
elif has_version '>=dev-lang/spidermonkey-1.8.7[jit]'; then
- pax-mark m "${ED}usr/bin/gnome-shell"
- fi
+ pax-mark m "${ED}usr/bin/gnome-shell"{,-extension-prefs}
# Required for gnome-shell on hardened/PaX #457146 and #457194
# PaX EMUTRAMP need to be on
- if has_version '>=dev-libs/libffi-3.0.13[pax_kernel]'; then
- pax-mark E "${ED}usr/bin/gnome-shell"
+ elif has_version '>=dev-libs/libffi-3.0.13[pax_kernel]'; then
+ pax-mark E "${ED}usr/bin/gnome-shell"{,-extension-prefs}
+ else
+ pax-mark m "${ED}usr/bin/gnome-shell"{,-extension-prefs}
fi
}
@@ -195,17 +191,6 @@ pkg_postinst() {
ewarn "drivers."
fi
- if has_version "media-libs/mesa[video_cards_radeon]" ||
- has_version "media-libs/mesa[video_cards_r300]" ||
- has_version "media-libs/mesa[video_cards_r600]"; then
- elog "GNOME Shell is unstable under classic-mode r300/r600 mesa
drivers."
- elog "Make sure that gallium architecture for r300 and r600
drivers is"
- elog "selected using 'eselect mesa'."
- if ! has_version "media-libs/mesa[gallium]"; then
- ewarn "You will need to emerge media-libs/mesa with
USE=gallium."
- fi
- fi
-
if ! has_version "media-libs/mesa[llvm]"; then
elog "llvmpipe is used as fallback when no 3D acceleration"
elog "is available. You will need to enable llvm USE for"
@@ -215,7 +200,7 @@ pkg_postinst() {
if ! systemd_is_booted; then
ewarn "${PN} needs Systemd to be *running* for working"
ewarn "properly. Please follow this guide to migrate:"
- ewarn "http://wiki.gentoo.org/wiki/Systemd";
+ ewarn "https://wiki.gentoo.org/wiki/Systemd";
fi
if use openrc-force; then
diff --git a/gnome-base/gnome-shell/gnome-shell-9999.ebuild
b/gnome-base/gnome-shell/gnome-shell-9999.ebuild
index 6ca3a9c..b5ae944 100644
--- a/gnome-base/gnome-shell/gnome-shell-9999.ebuild
+++ b/gnome-base/gnome-shell/gnome-shell-9999.ebuild
@@ -5,7 +5,7 @@
EAPI="5"
GCONF_DEBUG="no"
GNOME2_LA_PUNT="yes"
-PYTHON_COMPAT=( python2_{6,7} )
+PYTHON_COMPAT=( python{3_3,3_4} )
inherit autotools eutils gnome2 multilib pax-utils python-r1 systemd
if [[ ${PV} = 9999 ]]; then
@@ -32,25 +32,26 @@ COMMON_DEPEND="
>=app-accessibility/at-spi2-atk-2.5.3
>=dev-libs/atk-2[introspection]
>=app-crypt/gcr-3.7.5[introspection]
- >=dev-libs/glib-2.39.1:2
+ >=dev-libs/glib-2.45.3:2[dbus]
>=dev-libs/gjs-1.39
- >=dev-libs/gobject-introspection-0.10.1
- >=x11-libs/gtk+-3.13.2:3[introspection]
- >=media-libs/clutter-1.15.90:1.0[introspection]
+ >=dev-libs/gobject-introspection-0.10.1:=
+ dev-libs/libical:=
+ >=x11-libs/gtk+-3.15.0:3[introspection]
+ >=media-libs/clutter-1.21.5:1.0[introspection]
>=dev-libs/json-glib-0.13.2
>=dev-libs/libcroco-0.6.8:0.6
>=gnome-base/gnome-desktop-3.7.90:3=[introspection]
- >=gnome-base/gsettings-desktop-schemas-3.12
+ >=gnome-base/gsettings-desktop-schemas-3.14
>=gnome-base/gnome-keyring-3.3.90
gnome-base/libgnome-keyring
- >=gnome-extra/evolution-data-server-3.5.3:=
+ >=gnome-extra/evolution-data-server-3.17.2:=
>=media-libs/gstreamer-0.11.92:1.0
>=net-im/telepathy-logger-0.2.4[introspection]
>=net-libs/telepathy-glib-0.19[introspection]
>=sys-auth/polkit-0.100[introspection]
>=x11-libs/libXfixes-5.0
x11-libs/libXtst
- >=x11-wm/mutter-3.14.3[introspection]
+ >=x11-wm/mutter-3.17.91[introspection]
>=x11-libs/startup-notification-0.11
${PYTHON_DEPS}
@@ -97,7 +98,6 @@ RDEPEND="${COMMON_DEPEND}
>=gnome-base/gnome-session-2.91.91
>=gnome-base/gnome-settings-daemon-3.8.3
- >=gnome-base/gnome-control-center-3.8.3[bluetooth(+)?]
!openrc-force? ( >=sys-apps/systemd-31 )
@@ -111,8 +111,10 @@ RDEPEND="${COMMON_DEPEND}
net-misc/mobile-broadband-provider-info
sys-libs/timezone-data )
"
-# avoid circular dependency
-PDEPEND=">=gnome-base/gdm-3.5[introspection]
+# avoid circular dependency, see bug #546134
+PDEPEND="
+ >=gnome-base/gdm-3.5[introspection]
+
>=gnome-base/gnome-control-center-3.8.3[bluetooth(+)?,networkmanager(+)?]
"
DEPEND="${COMMON_DEPEND}
dev-libs/libxslt
@@ -127,14 +129,14 @@ DEPEND="${COMMON_DEPEND}
src_prepare() {
# Change favorites defaults, bug #479918
- epatch "${FILESDIR}/${PN}-3.14.0-defaults.patch"
+ epatch "${FILESDIR}"/${PN}-3.14.0-defaults.patch
# Fix automagic gnome-bluetooth dep, bug #398145
- epatch "${FILESDIR}/${PN}-3.12.0-bluetooth-flag.patch"
+ epatch "${FILESDIR}"/${PN}-3.12-bluetooth-flag.patch
# Fix silent bluetooth linking failure with ld.gold, bug #503952
# https://bugzilla.gnome.org/show_bug.cgi?id=726435
- epatch "${FILESDIR}/${PN}-3.14.0-bluetooth-gold.patch"
+ epatch "${FILESDIR}"/${PN}-3.14.0-bluetooth-gold.patch
epatch_user
