From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id DED5A139694 for ; Fri, 14 Jul 2017 08:52:16 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 0E4A91FC05C; Fri, 14 Jul 2017 08:52:12 +0000 (UTC) Received: from smtp.gentoo.org (mail.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id CF68A1FC058 for ; Fri, 14 Jul 2017 08:52:11 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id BA5B9341A3C for ; Fri, 14 Jul 2017 08:52:10 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 8BD0474B9 for ; Fri, 14 Jul 2017 08:52:07 +0000 (UTC) From: "Mart Raudsepp" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Mart Raudsepp" Message-ID: <1500022259.d991bddbdf67e8577a88a5a14dd10ca58db4871c.leio@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: gnome-base/gnome-shell/ X-VCS-Repository: repo/gentoo X-VCS-Files: gnome-base/gnome-shell/gnome-shell-3.24.2.ebuild X-VCS-Directories: gnome-base/gnome-shell/ X-VCS-Committer: leio X-VCS-Committer-Name: Mart Raudsepp X-VCS-Revision: d991bddbdf67e8577a88a5a14dd10ca58db4871c X-VCS-Branch: master Date: Fri, 14 Jul 2017 08:52:07 +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: bbd6a3b7-06ec-425e-93c6-2b97fef909bb X-Archives-Hash: 7a973d1d10ebabe930fec1621306c43f commit: d991bddbdf67e8577a88a5a14dd10ca58db4871c Author: Mart Raudsepp gentoo org> AuthorDate: Fri Jul 14 07:53:59 2017 +0000 Commit: Mart Raudsepp gentoo org> CommitDate: Fri Jul 14 08:50:59 2017 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d991bddb gnome-base/gnome-shell-3.24.2: Sync in changes done over time in the 3.22 series Package-Manager: Portage-2.3.5, Repoman-2.3.2 gnome-base/gnome-shell/gnome-shell-3.24.2.ebuild | 36 ++++++++---------------- 1 file changed, 12 insertions(+), 24 deletions(-) diff --git a/gnome-base/gnome-shell/gnome-shell-3.24.2.ebuild b/gnome-base/gnome-shell/gnome-shell-3.24.2.ebuild index 4b2dd7cd2fa..7df0c777a34 100644 --- a/gnome-base/gnome-shell/gnome-shell-3.24.2.ebuild +++ b/gnome-base/gnome-shell/gnome-shell-3.24.2.ebuild @@ -3,19 +3,20 @@ EAPI=6 GNOME2_LA_PUNT="yes" +GNOME2_EAUTORECONF="yes" PYTHON_COMPAT=( python{3_4,3_5} ) -inherit autotools gnome2 multilib pax-utils python-r1 systemd +inherit gnome2 multilib pax-utils python-r1 systemd DESCRIPTION="Provides core UI functions for the GNOME 3 desktop" 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 ~ia64 ~x86" # libXfixes-5.0 needed for pointer barriers # FIXME: @@ -96,43 +97,36 @@ 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 >=dev-util/gdbus-codegen-2.45.3 >=dev-util/gtk-doc-am-1.17 gnome-base/gnome-common + sys-devel/autoconf-archive >=sys-devel/gettext-0.19.6 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 -src_prepare() { +PATCHES=( # Change favorites defaults, bug #479918 - eapply "${FILESDIR}"/${PN}-3.22.0-defaults.patch - + "${FILESDIR}"/${PN}-3.22.0-defaults.patch # Fix automagic gnome-bluetooth dep, bug #398145 - eapply "${FILESDIR}"/${PN}-3.12-bluetooth-flag.patch - + "${FILESDIR}"/${PN}-3.12-bluetooth-flag.patch # Add missing path to libmutter-clutter when building .gir, bug #597842 - eapply "${FILESDIR}"/${PN}-3.22.0-gir-build-fix.patch - - eautoreconf - gnome2_src_prepare -} + "${FILESDIR}"/${PN}-3.22.0-gir-build-fix.patch +) src_configure() { # Do not error out on warnings gnome2_src_configure \ - --enable-browser-plugin \ --enable-man \ $(use_enable !openrc-force systemd) \ $(use_with bluetooth) \ @@ -172,12 +166,6 @@ pkg_postinst() { ewarn "apps.gnome-shell.recorder/pipeline to what you want to use." fi - if has_version "