From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id 0E0FD59CA5 for ; Fri, 25 Mar 2016 00:56:23 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id B91BA21C016; Fri, 25 Mar 2016 00:56:20 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 3844A21C00F for ; Fri, 25 Mar 2016 00:56:19 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 43E86340D31 for ; Fri, 25 Mar 2016 00:56:18 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id DB25286C for ; Fri, 25 Mar 2016 00:56:15 +0000 (UTC) From: "Ole Reifschneider" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Ole Reifschneider" Message-ID: <1458867195.2bcfebf7a1f8562ea11f569a8c152165cb086fa4.tranquility@gentoo> Subject: [gentoo-commits] proj/gnome:master commit in: gnome-base/gnome-shell/ X-VCS-Repository: proj/gnome X-VCS-Files: gnome-base/gnome-shell/gnome-shell-3.18.0.ebuild gnome-base/gnome-shell/gnome-shell-3.20.0.ebuild gnome-base/gnome-shell/gnome-shell-9999.ebuild gnome-base/gnome-shell/metadata.xml X-VCS-Directories: gnome-base/gnome-shell/ X-VCS-Committer: tranquility X-VCS-Committer-Name: Ole Reifschneider X-VCS-Revision: 2bcfebf7a1f8562ea11f569a8c152165cb086fa4 X-VCS-Branch: master Date: Fri, 25 Mar 2016 00:56:15 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: cc7b8458-c0cd-4095-8819-d46f1c876a49 X-Archives-Hash: b187338bd341b5f4f437e2f2178d34c1 commit: 2bcfebf7a1f8562ea11f569a8c152165cb086fa4 Author: Ole Reifschneider gentoo org> AuthorDate: Sat Mar 19 16:56:39 2016 +0000 Commit: Ole Reifschneider gentoo org> CommitDate: Fri Mar 25 00:53:15 2016 +0000 URL: https://gitweb.gentoo.org/proj/gnome.git/commit/?id=2bcfebf7 gnome-base/gnome-shell: Bump version to 3.20.0 Package-Manager: portage-2.2.28 Manifest-Sign-Key: 0xE9E568677E8B4D42 ...ell-3.18.0.ebuild => gnome-shell-3.20.0.ebuild} | 20 +++++++---- gnome-base/gnome-shell/gnome-shell-9999.ebuild | 42 ++++++++++------------ gnome-base/gnome-shell/metadata.xml | 2 -- 3 files changed, 32 insertions(+), 32 deletions(-) diff --git a/gnome-base/gnome-shell/gnome-shell-3.18.0.ebuild b/gnome-base/gnome-shell/gnome-shell-3.20.0.ebuild similarity index 92% rename from gnome-base/gnome-shell/gnome-shell-3.18.0.ebuild rename to gnome-base/gnome-shell/gnome-shell-3.20.0.ebuild index 39b973d..af77e1f 100644 --- a/gnome-base/gnome-shell/gnome-shell-3.18.0.ebuild +++ b/gnome-base/gnome-shell/gnome-shell-3.20.0.ebuild @@ -1,11 +1,11 @@ -# Copyright 1999-2015 Gentoo Foundation +# Copyright 1999-2016 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ EAPI="5" GCONF_DEBUG="no" GNOME2_LA_PUNT="yes" -PYTHON_COMPAT=( python{3_3,3_4} ) +PYTHON_COMPAT=( python{3_3,3_4,3_5} ) inherit autotools eutils gnome2 multilib pax-utils python-r1 systemd @@ -14,7 +14,7 @@ HOMEPAGE="https://wiki.gnome.org/Projects/GnomeShell" LICENSE="GPL-2+ LGPL-2+" SLOT="0" -IUSE="+bluetooth +i18n +networkmanager -openrc-force" +IUSE="+bluetooth +networkmanager +nls -openrc-force" REQUIRED_USE="${PYTHON_REQUIRED_USE}" KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86" @@ -34,7 +34,7 @@ COMMON_DEPEND=" >=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.14 + >=gnome-base/gsettings-desktop-schemas-3.19.2 >=gnome-base/gnome-keyring-3.3.90 gnome-base/libgnome-keyring >=gnome-extra/evolution-data-server-3.17.2:= @@ -44,7 +44,7 @@ COMMON_DEPEND=" >=sys-auth/polkit-0.100[introspection] >=x11-libs/libXfixes-5.0 x11-libs/libXtst - >=x11-wm/mutter-3.17.91[introspection] + >=x11-wm/mutter-3.20.0[introspection] >=x11-libs/startup-notification-0.11 ${PYTHON_DEPS} @@ -79,7 +79,7 @@ COMMON_DEPEND=" # 5. Systemd needed for suspending support # 6. xdg-utils needed for xdg-open, used by extension tool # 7. gnome-icon-theme-symbolic and dejavu font neeed for various icons & arrows -# 8. IBus is needed for i18n integration +# 8. IBus is needed for nls integration # 9. mobile-broadband-provider-info, timezone-data for shell-mobile-providers.c RDEPEND="${COMMON_DEPEND} >=sys-auth/polkit-0.101[introspection] @@ -99,10 +99,10 @@ RDEPEND="${COMMON_DEPEND} media-fonts/dejavu x11-themes/gnome-icon-theme-symbolic - i18n? ( >=app-i18n/ibus-1.4.99[dconf(+),gtk3,introspection] ) networkmanager? ( net-misc/mobile-broadband-provider-info sys-libs/timezone-data ) + nls? ( >=app-i18n/ibus-1.4.99[dconf(+),gtk3,introspection] ) " # avoid circular dependency, see bug #546134 PDEPEND=" @@ -197,6 +197,12 @@ pkg_postinst() { elog "media-libs/mesa." fi + # https://bugs.gentoo.org/show_bug.cgi?id=563084 + if has_version "x11-drivers/nvidia-drivers[-kms]"; then + ewarn "You will need to enable kms support in x11-drivers/nvidia-drivers," + ewarn "otherwise Gnome will fail to start" + fi + if ! systemd_is_booted; then ewarn "${PN} needs Systemd to be *running* for working" ewarn "properly. Please follow this guide to migrate:" diff --git a/gnome-base/gnome-shell/gnome-shell-9999.ebuild b/gnome-base/gnome-shell/gnome-shell-9999.ebuild index e95780d..183ce49 100644 --- a/gnome-base/gnome-shell/gnome-shell-9999.ebuild +++ b/gnome-base/gnome-shell/gnome-shell-9999.ebuild @@ -1,11 +1,11 @@ -# Copyright 1999-2015 Gentoo Foundation +# Copyright 1999-2016 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ EAPI="5" GCONF_DEBUG="no" GNOME2_LA_PUNT="yes" -PYTHON_COMPAT=( python{3_3,3_4} ) +PYTHON_COMPAT=( python{3_3,3_4,3_5} ) inherit autotools eutils gnome2 multilib pax-utils python-r1 systemd if [[ ${PV} = 9999 ]]; then @@ -17,7 +17,7 @@ HOMEPAGE="https://wiki.gnome.org/Projects/GnomeShell" LICENSE="GPL-2+ LGPL-2+" SLOT="0" -IUSE="+bluetooth +i18n +networkmanager -openrc-force" +IUSE="+bluetooth +networkmanager +nls -openrc-force" REQUIRED_USE="${PYTHON_REQUIRED_USE}" if [[ ${PV} = 9999 ]]; then KEYWORDS="" @@ -41,7 +41,7 @@ COMMON_DEPEND=" >=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.14 + >=gnome-base/gsettings-desktop-schemas-3.19.2 >=gnome-base/gnome-keyring-3.3.90 gnome-base/libgnome-keyring >=gnome-extra/evolution-data-server-3.17.2:= @@ -51,7 +51,7 @@ COMMON_DEPEND=" >=sys-auth/polkit-0.100[introspection] >=x11-libs/libXfixes-5.0 x11-libs/libXtst - >=x11-wm/mutter-3.17.91[introspection] + >=x11-wm/mutter-3.19.92[introspection] >=x11-libs/startup-notification-0.11 ${PYTHON_DEPS} @@ -86,7 +86,7 @@ COMMON_DEPEND=" # 5. Systemd needed for suspending support # 6. xdg-utils needed for xdg-open, used by extension tool # 7. gnome-icon-theme-symbolic and dejavu font neeed for various icons & arrows -# 8. IBus is needed for i18n integration +# 8. IBus is needed for nls integration # 9. mobile-broadband-provider-info, timezone-data for shell-mobile-providers.c RDEPEND="${COMMON_DEPEND} >=sys-auth/polkit-0.101[introspection] @@ -106,10 +106,10 @@ RDEPEND="${COMMON_DEPEND} media-fonts/dejavu x11-themes/gnome-icon-theme-symbolic - i18n? ( >=app-i18n/ibus-1.4.99[dconf(+),gtk3,introspection] ) networkmanager? ( net-misc/mobile-broadband-provider-info sys-libs/timezone-data ) + nls? ( >=app-i18n/ibus-1.4.99[dconf(+),gtk3,introspection] ) " # avoid circular dependency, see bug #546134 PDEPEND=" @@ -163,14 +163,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[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 } @@ -197,23 +198,18 @@ 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" elog "media-libs/mesa." fi + # https://bugs.gentoo.org/show_bug.cgi?id=563084 + if has_version "x11-drivers/nvidia-drivers[-kms]"; then + ewarn "You will need to enable kms support in x11-drivers/nvidia-drivers," + ewarn "otherwise Gnome will fail to start" + fi + if ! systemd_is_booted; then ewarn "${PN} needs Systemd to be *running* for working" ewarn "properly. Please follow this guide to migrate:" diff --git a/gnome-base/gnome-shell/metadata.xml b/gnome-base/gnome-shell/metadata.xml index e08281c..d312bda 100644 --- a/gnome-base/gnome-shell/metadata.xml +++ b/gnome-base/gnome-shell/metadata.xml @@ -6,8 +6,6 @@ Gentoo GNOME Desktop - Enable support for enhanced input methods through - app-i18n/ibus Skip systemd dependency (#480336), enabling this flag will become your setup to be fully unsupported by upstream and downstream Gnome team. Do not