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 6F6941381FB for ; Wed, 26 Dec 2012 22:49:11 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 59DBF21C090; Wed, 26 Dec 2012 22:49:04 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id BDFFC21C090 for ; Wed, 26 Dec 2012 22:49:03 +0000 (UTC) Received: from hornbill.gentoo.org (hornbill.gentoo.org [94.100.119.163]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id AFAFC33D9F7 for ; Wed, 26 Dec 2012 22:49:02 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id 4DD3EE544B for ; Wed, 26 Dec 2012 22:49:01 +0000 (UTC) From: "Gilles Dartiguelongue" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Gilles Dartiguelongue" Message-ID: <1356562122.1d1fe418b74e2cd48cbca220cf9c456cf41963bf.eva@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.6.2.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: eva X-VCS-Committer-Name: Gilles Dartiguelongue X-VCS-Revision: 1d1fe418b74e2cd48cbca220cf9c456cf41963bf X-VCS-Branch: master Date: Wed, 26 Dec 2012 22:49:01 +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: f455ee02-cd68-47c9-9a1c-04eaac1ed90b X-Archives-Hash: 7a2c37f5ead62390e4cdda0fb4ef65c6 commit: 1d1fe418b74e2cd48cbca220cf9c456cf41963bf Author: Gilles Dartiguelongue gentoo org> AuthorDate: Wed Dec 26 22:48:42 2012 +0000 Commit: Gilles Dartiguelongue gentoo org> CommitDate: Wed Dec 26 22:48:42 2012 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=1d1fe418 gnome-base/gnome-shell: moved to gx86 Sync live ebuild and metadata with gx86 changes. --- gnome-base/gnome-shell/gnome-shell-3.6.2.ebuild | 203 ----------------------- gnome-base/gnome-shell/gnome-shell-9999.ebuild | 50 +++--- gnome-base/gnome-shell/metadata.xml | 2 + 3 files changed, 28 insertions(+), 227 deletions(-) diff --git a/gnome-base/gnome-shell/gnome-shell-3.6.2.ebuild b/gnome-base/gnome-shell/gnome-shell-3.6.2.ebuild deleted file mode 100644 index 5bad729..0000000 --- a/gnome-base/gnome-shell/gnome-shell-3.6.2.ebuild +++ /dev/null @@ -1,203 +0,0 @@ -# Copyright 1999-2012 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: $ - -EAPI="4" -GCONF_DEBUG="no" -GNOME2_LA_PUNT="yes" -PYTHON_DEPEND="2:2.5" - -inherit autotools eutils gnome2 multilib pax-utils python -if [[ ${PV} = 9999 ]]; then - inherit gnome2-live -fi - -DESCRIPTION="Provides core UI functions for the GNOME 3 desktop" -HOMEPAGE="http://live.gnome.org/GnomeShell" - -LICENSE="GPL-2+ LGPL-2+" -SLOT="0" -IUSE="+bluetooth +i18n +networkmanager systemd" -if [[ ${PV} = 9999 ]]; then - KEYWORDS="" -else - KEYWORDS="~amd64 ~x86" -fi - -# libXfixes-5.0 needed for pointer barriers -# TODO: gstreamer support is currently automagical: -# gstreamer? ( >=media-libs/gstreamer-0.11.92 ) -COMMON_DEPEND=" - >=app-accessibility/at-spi2-atk-2.5.3 - >=app-crypt/gcr-3.3.90[introspection] - >=dev-libs/glib-2.31.6:2 - >=dev-libs/gjs-1.33.2 - >=dev-libs/gobject-introspection-0.10.1 - >=x11-libs/gtk+-3.3.9:3[introspection] - >=media-libs/clutter-1.11.11:1.0[introspection] - >=dev-libs/json-glib-0.13.2 - >=dev-libs/libcroco-0.6.2:0.6 - >=gnome-base/gnome-desktop-3.5.1:3[introspection] - >=gnome-base/gsettings-desktop-schemas-3.5.4 - >=gnome-base/gnome-keyring-3.3.90 - >=gnome-base/gnome-menus-3.5.3:3[introspection] - gnome-base/libgnome-keyring - >=gnome-extra/evolution-data-server-3.5.3 - >=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-wm/mutter-${PV}[introspection] - >=x11-libs/startup-notification-0.11 - - dev-libs/dbus-glib - dev-libs/libxml2:2 - gnome-base/librsvg - media-libs/libcanberra - media-libs/mesa - media-sound/pulseaudio - net-libs/libsoup:2.4[introspection] - x11-libs/libX11 - x11-libs/gdk-pixbuf:2[introspection] - x11-libs/pango[introspection] - x11-apps/mesa-progs - - bluetooth? ( >=net-wireless/gnome-bluetooth-3.5[introspection] ) - networkmanager? ( >=net-misc/networkmanager-0.8.999[introspection] ) - systemd? ( >=sys-apps/systemd-31 ) -" -# Runtime-only deps are probably incomplete and approximate. -# Introspection deps generated using: -# grep -roe "imports.gi.*" gnome-shell-* | cut -f2 -d: | sort | uniq -# Each block: -# 1. Pull in polkit-0.101 for pretty authorization dialogs -# 2. Introspection stuff needed via imports.gi.* -# 3. gnome-session is needed for gnome-session-quit -# 4. Control shell settings -# 5. xdg-utils needed for xdg-open, used by extension tool -# 6. gnome-icon-theme-symbolic and dejavu font neeed for various icons & arrows -# 7. IBus is needed for i18n integration -# 8. mobile-broadband-provider-info, timezone-data for shell-mobile-providers.c -RDEPEND="${COMMON_DEPEND} - >=sys-auth/polkit-0.101[introspection] - - >=app-accessibility/caribou-0.3 - >=gnome-base/gdm-3.5[introspection] - >=gnome-base/libgnomekbd-2.91.4[introspection] - media-libs/cogl[introspection] - >=sys-apps/accountsservice-0.6.14[introspection] - sys-power/upower[introspection] - - >=gnome-base/gnome-session-2.91.91 - - >=gnome-base/gnome-settings-daemon-2.91 - >=gnome-base/gnome-control-center-2.91.92-r1[bluetooth(+)?] - - x11-misc/xdg-utils - - 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 ) - - !systemd? ( sys-auth/consolekit ) -" -DEPEND="${COMMON_DEPEND} - >=sys-devel/gettext-0.17 - dev-libs/libxslt - >=dev-util/intltool-0.40 - gnome-base/gnome-common - virtual/pkgconfig - !!=dev-lang/spidermonkey-1.8.2*" -# libmozjs.so is picked up from /usr/lib while compiling, so block at build-time -# https://bugs.gentoo.org/show_bug.cgi?id=360413 - -pkg_setup() { - python_set_active_version 2 - python_pkg_setup -} - -src_prepare() { - DOCS="AUTHORS NEWS README" - # Don't error out on warnings - G2CONF="${G2CONF} - --enable-man - --enable-compile-warnings=maximum - --disable-jhbuild-wrapper-script - $(use_with bluetooth) - $(use_enable networkmanager) - $(use_with systemd) - BROWSER_PLUGIN_DIR=${EPREFIX}/usr/$(get_libdir)/nsbrowser/plugins" - - # Fix automagic gnome-bluetooth dep, bug #398145 - epatch "${FILESDIR}/${PN}-3.5.x-bluetooth-flag.patch" - - # Make networkmanager optional, bug #398593 - epatch "${FILESDIR}/${PN}-3.6.0-networkmanager-flag.patch" - - [[ ${PV} != 9999 ]] && eautoreconf - gnome2_src_prepare -} - -src_install() { - gnome2_src_install - python_convert_shebangs 2 "${ED}/usr/bin/gnome-shell-extension-tool" - - # 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 -} - -pkg_postinst() { - gnome2_pkg_postinst - - if ! has_version 'media-libs/gst-plugins-good:1.0' || \ - ! has_version 'media-plugins/gst-plugins-vpx:1.0'; then - ewarn "To make use of GNOME Shell's built-in screen recording utility," - ewarn "you need to either install media-libs/gst-plugins-good:1.0" - ewarn "and media-plugins/gst-plugins-vp8:1.0, or use dconf-editor to change" - ewarn "apps.gnome-shell.recorder/pipeline to what you want to use." - fi - - if ! has_version ">=x11-base/xorg-server-1.11"; then - ewarn "If you use multiple screens, it is highly recommended that you" - ewarn "upgrade to >=x11-base/xorg-server-1.11 to be able to make use of" - ewarn "pointer barriers which will make it easier to use hot corners." - fi - - if has_version "=media-libs/gstreamer-0.11.92 ) COMMON_DEPEND=" >=app-accessibility/at-spi2-atk-2.5.3 + >=dev-libs/atk-2[introspection] >=app-crypt/gcr-3.3.90[introspection] >=dev-libs/glib-2.31.6:2 >=dev-libs/gjs-1.33.2 @@ -37,12 +38,12 @@ COMMON_DEPEND=" >=media-libs/clutter-1.11.11:1.0[introspection] >=dev-libs/json-glib-0.13.2 >=dev-libs/libcroco-0.6.2:0.6 - >=gnome-base/gnome-desktop-3.5.1:3[introspection] + >=gnome-base/gnome-desktop-3.5.1:3=[introspection] >=gnome-base/gsettings-desktop-schemas-3.5.4 >=gnome-base/gnome-keyring-3.3.90 >=gnome-base/gnome-menus-3.5.3:3[introspection] gnome-base/libgnome-keyring - >=gnome-extra/evolution-data-server-3.5.3 + >=gnome-extra/evolution-data-server-3.5.3:= >=media-libs/gstreamer-0.11.92:1.0 >=net-im/telepathy-logger-0.2.4[introspection] >=net-libs/telepathy-glib-0.19[introspection] @@ -51,6 +52,9 @@ COMMON_DEPEND=" >=x11-wm/mutter-${PV}[introspection] >=x11-libs/startup-notification-0.11 + ${PYTHON_DEPS} + dev-python/pygobject:3[${PYTHON_USEDEP}] + dev-libs/dbus-glib dev-libs/libxml2:2 gnome-base/librsvg @@ -90,7 +94,6 @@ RDEPEND="${COMMON_DEPEND} sys-power/upower[introspection] >=gnome-base/gnome-session-2.91.91 - >=gnome-base/gnome-settings-daemon-2.91 >=gnome-base/gnome-control-center-2.91.92-r1[bluetooth(+)?] @@ -107,23 +110,29 @@ RDEPEND="${COMMON_DEPEND} !systemd? ( sys-auth/consolekit ) " DEPEND="${COMMON_DEPEND} - >=sys-devel/gettext-0.17 dev-libs/libxslt + >=dev-util/gtk-doc-am-1.17 >=dev-util/intltool-0.40 gnome-base/gnome-common + >=sys-devel/gettext-0.17 virtual/pkgconfig !!=dev-lang/spidermonkey-1.8.2*" # libmozjs.so is picked up from /usr/lib while compiling, so block at build-time # https://bugs.gentoo.org/show_bug.cgi?id=360413 -pkg_setup() { - python_set_active_version 2 - python_pkg_setup +src_prepare() { + # Fix automagic gnome-bluetooth dep, bug #398145 + epatch "${FILESDIR}/${PN}-3.5.x-bluetooth-flag.patch" + + # Make networkmanager optional, bug #398593 + epatch "${FILESDIR}/${PN}-3.6.0-networkmanager-flag.patch" + + [[ ${PV} != 9999 ]] && eautoreconf + gnome2_src_prepare } -src_prepare() { - DOCS="AUTHORS NEWS README" - # Don't error out on warnings +src_configure() { + # Do not error out on warnings G2CONF="${G2CONF} --enable-man --enable-compile-warnings=maximum @@ -132,20 +141,13 @@ src_prepare() { $(use_enable networkmanager) $(use_with systemd) BROWSER_PLUGIN_DIR=${EPREFIX}/usr/$(get_libdir)/nsbrowser/plugins" - - # Fix automagic gnome-bluetooth dep, bug #398145 - epatch "${FILESDIR}/${PN}-3.5.x-bluetooth-flag.patch" - - # Make networkmanager optional, bug #398593 - epatch "${FILESDIR}/${PN}-3.6.0-networkmanager-flag.patch" - - [[ ${PV} != 9999 ]] && eautoreconf - gnome2_src_prepare + gnome2_src_configure } src_install() { gnome2_src_install - python_convert_shebangs 2 "${ED}/usr/bin/gnome-shell-extension-tool" + python_replicate_script "${ED}/usr/bin/gnome-shell-extension-tool" + python_replicate_script "${ED}/usr/bin/gnome-shell-perf-tool" # Required for gnome-shell on hardened/PaX, bug #398941 # Future-proof for >=spidermonkey-1.8.7 following polkit's example @@ -163,7 +165,7 @@ pkg_postinst() { ! has_version 'media-plugins/gst-plugins-vpx:1.0'; then ewarn "To make use of GNOME Shell's built-in screen recording utility," ewarn "you need to either install media-libs/gst-plugins-good:1.0" - ewarn "and media-plugins/gst-plugins-vp8:1.0, or use dconf-editor to change" + ewarn "and media-plugins/gst-plugins-vpx:1.0, or use dconf-editor to change" ewarn "apps.gnome-shell.recorder/pipeline to what you want to use." fi diff --git a/gnome-base/gnome-shell/metadata.xml b/gnome-base/gnome-shell/metadata.xml index 4961103..68a012a 100644 --- a/gnome-base/gnome-shell/metadata.xml +++ b/gnome-base/gnome-shell/metadata.xml @@ -3,6 +3,8 @@ gnome + Enable support for enhanced input methods through + app-i18n/ibus Use sys-apps/systemd instead of sys-auth/consolekit for session tracking