commit: 5ae0605452a6888c708248860ae290afdf7a0ccc Author: Mart Raudsepp <leio <AT> gentoo <DOT> org> AuthorDate: Thu Mar 23 12:03:17 2017 +0000 Commit: Mart Raudsepp <leio <AT> gentoo <DOT> org> CommitDate: Thu Mar 23 12:04:13 2017 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5ae06054
gnome-base/gnome-shell: pull in chrome-gnome-shell by default for extensions.g.o management, rename nls->ibus USE flag gnome-control-center used to use USE=i18n for ibus stuff, which got changed to USE=ibus. Rename it here to USE=ibus as well, instead of yet another different USE=nls. Pull in chrome-gnome-shell via IUSE=+browser-extension in a revbump (as keywords need to be dropped) ...ome-shell-3.22.3.ebuild => gnome-shell-3.22.3-r1.ebuild} | 13 ++++--------- gnome-base/gnome-shell/gnome-shell-3.22.3.ebuild | 4 ++-- gnome-base/gnome-shell/metadata.xml | 4 ++++ 3 files changed, 10 insertions(+), 11 deletions(-) diff --git a/gnome-base/gnome-shell/gnome-shell-3.22.3.ebuild b/gnome-base/gnome-shell/gnome-shell-3.22.3-r1.ebuild similarity index 94% copy from gnome-base/gnome-shell/gnome-shell-3.22.3.ebuild copy to gnome-base/gnome-shell/gnome-shell-3.22.3-r1.ebuild index ca7a754d5ec..de0b6badd89 100644 --- a/gnome-base/gnome-shell/gnome-shell-3.22.3.ebuild +++ b/gnome-base/gnome-shell/gnome-shell-3.22.3-r1.ebuild @@ -12,10 +12,10 @@ HOMEPAGE="https://wiki.gnome.org/Projects/GnomeShell"; LICENSE="GPL-2+ LGPL-2+" SLOT="0" -IUSE="+bluetooth +networkmanager nsplugin +nls -openrc-force" +IUSE="+bluetooth +browser-extension +ibus +networkmanager nsplugin -openrc-force" REQUIRED_USE="${PYTHON_REQUIRED_USE}" -KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~x86" +KEYWORDS="~amd64 ~x86" # libXfixes-5.0 needed for pointer barriers # FIXME: @@ -96,12 +96,13 @@ RDEPEND="${COMMON_DEPEND} networkmanager? ( net-misc/mobile-broadband-provider-info sys-libs/timezone-data ) - nls? ( >=app-i18n/ibus-1.4.99[dconf(+),gtk3,introspection] ) + ibus? ( >=app-i18n/ibus-1.4.99[dconf(+),gtk3,introspection] ) " # avoid circular dependency, see bug #546134 PDEPEND=" >=gnome-base/gdm-3.5[introspection] >=gnome-base/gnome-control-center-3.8.3[bluetooth(+)?,networkmanager(+)?] + browser-extension? ( gnome-extra/chrome-gnome-shell ) " DEPEND="${COMMON_DEPEND} dev-libs/libxslt @@ -172,12 +173,6 @@ pkg_postinst() { ewarn "apps.gnome-shell.recorder/pipeline to what you want to use." fi - if has_version "<x11-drivers/ati-drivers-12"; then - ewarn "GNOME Shell has been reported to show graphical corruption under" - ewarn "x11-drivers/ati-drivers-11.*; you may want to switch to open-source" - ewarn "drivers." - 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" diff --git a/gnome-base/gnome-shell/gnome-shell-3.22.3.ebuild b/gnome-base/gnome-shell/gnome-shell-3.22.3.ebuild index ca7a754d5ec..ab476dccc84 100644 --- a/gnome-base/gnome-shell/gnome-shell-3.22.3.ebuild +++ b/gnome-base/gnome-shell/gnome-shell-3.22.3.ebuild @@ -12,7 +12,7 @@ HOMEPAGE="https://wiki.gnome.org/Projects/GnomeShell"; LICENSE="GPL-2+ LGPL-2+" SLOT="0" -IUSE="+bluetooth +networkmanager nsplugin +nls -openrc-force" +IUSE="+bluetooth +ibus +networkmanager nsplugin -openrc-force" REQUIRED_USE="${PYTHON_REQUIRED_USE}" KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~x86" @@ -96,7 +96,7 @@ RDEPEND="${COMMON_DEPEND} networkmanager? ( net-misc/mobile-broadband-provider-info sys-libs/timezone-data ) - nls? ( >=app-i18n/ibus-1.4.99[dconf(+),gtk3,introspection] ) + ibus? ( >=app-i18n/ibus-1.4.99[dconf(+),gtk3,introspection] ) " # avoid circular dependency, see bug #546134 PDEPEND=" diff --git a/gnome-base/gnome-shell/metadata.xml b/gnome-base/gnome-shell/metadata.xml index d312bdad48e..3d91d2b59fe 100644 --- a/gnome-base/gnome-shell/metadata.xml +++ b/gnome-base/gnome-shell/metadata.xml @@ -6,6 +6,10 @@ <name>Gentoo GNOME Desktop</name> </maintainer> <use> + <flag name="browser-extension">Ensure the presence of extensions.gnome.org + native connector <pkg>gnome-extra/chrome-gnome-shell</pkg></flag> + <flag name="ibus">Enable support for enhanced input methods through + <pkg>app-i18n/ibus</pkg></flag> <flag name="openrc-force">Skip systemd dependency (#480336), enabling this flag will become your setup to be fully unsupported by upstream and downstream Gnome team. Do not
