[gentoo-commits] proj/gnome:master commit in: gnome-base/gnome-shell/files/, gnome-base/gnome-shell/

[Mart Raudsepp]

commit:     9e6660b64b9f9e71af7be6c8679bb2b131c65917
Author:     Mart Raudsepp <leio <AT> gentoo <DOT> org>
AuthorDate: Thu Sep 27 21:39:53 2018 +0000
Commit:     Mart Raudsepp <leio <AT> gentoo <DOT> org>
CommitDate: Thu Sep 27 21:39:53 2018 +0000
URL:        https://gitweb.gentoo.org/proj/gnome.git/commit/?id=9e6660b6

gnome-base/gnome-shell: remove, moved to ::gentoo

 .../files/3.26-optional-bluetooth.patch            |  73 --------
 .../files/gnome-shell-3.22.0-defaults.patch        |  26 ---
 .../gnome-shell/gnome-shell-3.26.2-r4.ebuild       | 186 ---------------------
 gnome-base/gnome-shell/metadata.xml                |  24 ---
 4 files changed, 309 deletions(-)

diff --git a/gnome-base/gnome-shell/files/3.26-optional-bluetooth.patch b/gnome-base/gnome-shell/files/3.26-optional-bluetooth.patch
deleted file mode 100644
index 9f7e5aea..00000000
--- a/gnome-base/gnome-shell/files/3.26-optional-bluetooth.patch
+++ /dev/null
@@ -1,73 +0,0 @@
-From 7ca3e1a9d18e6f6154b4479bcd94d420bc69798c Mon Sep 17 00:00:00 2001
-From: Gilles Dartiguelongue <eva@g.o>
-Date: Mon, 10 Sep 2018 13:17:39 +0200
-Subject: [PATCH] Make bluetooth support optional
-
-https://bugs.gentoo.org/show_bug.cgi?id=398145
-leio: Fixed enable_bluetooth get_option string
----
- js/misc/meson.build |  2 +-
- meson.build         | 15 ++++++++++++++-
- meson_options.txt   |  7 +++++++
- 3 files changed, 22 insertions(+), 2 deletions(-)
-
-diff --git a/js/misc/meson.build b/js/misc/meson.build
-index 20489496c..3071f9dfb 100644
---- a/js/misc/meson.build
-+++ b/js/misc/meson.build
-@@ -3,7 +3,7 @@ jsconf.set('PACKAGE_NAME', meson.project_name())
- jsconf.set('PACKAGE_VERSION', meson.project_version())
- jsconf.set('GETTEXT_PACKAGE', meson.project_name())
- jsconf.set('LIBMUTTER_API_VERSION', mutter_api_version)
--jsconf.set10('HAVE_BLUETOOTH', bt_dep.found())
-+jsconf.set10('HAVE_BLUETOOTH', have_bluetooth)
- jsconf.set10('HAVE_NETWORKMANAGER', have_networkmanager)
- jsconf.set('datadir', datadir)
- jsconf.set('libexecdir', libexecdir)
-diff --git a/meson.build b/meson.build
-index b82c41398..7d342ff61 100644
---- a/meson.build
-+++ b/meson.build
-@@ -91,7 +91,20 @@ startup_dep = dependency('libstartup-notification-1.0', version: startup_req)
- x11_dep = dependency('x11')
- schemas_dep = dependency('gsettings-desktop-schemas', version: schemas_req)
- 
--bt_dep = dependency('gnome-bluetooth-1.0', version: bt_req, required: false)
-+bt_dep = []
-+enable_bluetooth = get_option('enable-bluetooth')
-+if enable_bluetooth != 'no'
-+  want_bluetooth = enable_bluetooth == 'yes'
-+  bt_dep = dependency('gnome-bluetooth-1.0', version: bt_req, required: want_bluetooth)
-+  have_bluetooth = bt_dep.found()
-+
-+  if not have_bluetooth
-+    bt_dep = []
-+  endif
-+else
-+  have_bluetooth = false
-+endif
-+
- gst_dep = dependency('gstreamer-1.0', version: gst_req, required: false)
- gst_base_dep = dependency('gstreamer-base-1.0', required: false)
- 
-diff --git a/meson_options.txt b/meson_options.txt
-index 18899ffdb..9191f8c0e 100644
---- a/meson_options.txt
-+++ b/meson_options.txt
-@@ -16,6 +16,13 @@ option('enable-man',
-   description: 'Generate man pages'
- )
- 
-+option('enable-bluetooth',
-+  type: 'combo',
-+  choices: ['yes', 'no', 'auto'],
-+  value: 'auto',
-+  description: 'Enable bluetooth support'
-+)
-+
- option('enable-networkmanager',
-   type: 'combo',
-   choices: ['yes', 'no', 'auto'],
--- 
-2.18.0
-

diff --git a/gnome-base/gnome-shell/files/gnome-shell-3.22.0-defaults.patch b/gnome-base/gnome-shell/files/gnome-shell-3.22.0-defaults.patch
deleted file mode 100644
index b80dbc3a..00000000
--- a/gnome-base/gnome-shell/files/gnome-shell-3.22.0-defaults.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From 7a671f99b7ef2d5f38be67668aac762764b32a42 Mon Sep 17 00:00:00 2001
-From: Gilles Dartiguelongue <eva@g.o>
-Date: Tue, 10 Dec 2013 23:33:51 +0100
-Subject: [PATCH 1/2] Alter list of default applications
-
-Signed-off-by: Gilles Dartiguelongue <eva@g.o>
----
- data/org.gnome.shell.gschema.xml.in | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/data/org.gnome.shell.gschema.xml.in b/data/org.gnome.shell.gschema.xml.in
-index c1e6b21..368c654 100644
---- a/data/org.gnome.shell.gschema.xml.in
-+++ b/data/org.gnome.shell.gschema.xml.in
-@@ -31,7 +31,7 @@
-       </description>
-     </key>
-     <key name="favorite-apps" type="as">
--      <default>[ 'epiphany.desktop', 'evolution.desktop', 'rhythmbox.desktop', 'shotwell.desktop', 'org.gnome.Nautilus.desktop', 'org.gnome.Software.desktop' ]</default>
-+      <default>[ 'chromium-browser-chromium.desktop', 'firefox.desktop', 'firefox-bin.desktop', 'evolution.desktop', 'rhythmbox.desktop', 'shotwell.desktop', 'org.gnome.Nautilus.desktop', 'org.gnome.Software.desktop' ]</default>
-       <summary>List of desktop file IDs for favorite applications</summary>
-       <description>
-         The applications corresponding to these identifiers
--- 
-2.10.1
-

diff --git a/gnome-base/gnome-shell/gnome-shell-3.26.2-r4.ebuild b/gnome-base/gnome-shell/gnome-shell-3.26.2-r4.ebuild
deleted file mode 100644
index 91f301b9..00000000
--- a/gnome-base/gnome-shell/gnome-shell-3.26.2-r4.ebuild
+++ /dev/null
@@ -1,186 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python3_{4,5,6} )
-
-inherit gnome.org gnome2-utils meson pax-utils python-single-r1 virtualx xdg
-
-DESCRIPTION="Provides core UI functions for the GNOME 3 desktop"
-HOMEPAGE="https://wiki.gnome.org/Projects/GnomeShell"
-SRC_URI+=" https://dev.gentoo.org/~leio/distfiles/${P}-patchset.tar.xz"
-
-LICENSE="GPL-2+ LGPL-2+"
-SLOT="0"
-IUSE="+bluetooth +browser-extension elogind +ibus +networkmanager nsplugin systemd telepathy"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}
-	?? ( elogind systemd )"
-
-KEYWORDS="~amd64 ~ia64 ~ppc ~ppc64 ~x86"
-
-# libXfixes-5.0 needed for pointer barriers and #include <X11/extensions/Xfixes.h>
-# FIXME:
-#  * gstreamer support is currently automagic
-COMMON_DEPEND="
-	>=dev-libs/libcroco-0.6.8:0.6
-	>=gnome-extra/evolution-data-server-3.17.2:=
-	>=app-crypt/gcr-3.7.5[introspection]
-	>=gnome-base/gnome-desktop-3.7.90:3=[introspection]
-	>=dev-libs/glib-2.53.0:2
-	>=dev-libs/gobject-introspection-1.49.1:=
-	>=dev-libs/gjs-1.47.0
-	>=x11-libs/gtk+-3.15.0:3[introspection]
-	nsplugin? ( >=dev-libs/json-glib-0.13.2 )
-	>=x11-wm/mutter-3.24.0:0/1[introspection]
-	>=sys-auth/polkit-0.100[introspection]
-	>=gnome-base/gsettings-desktop-schemas-3.21.3
-	>=x11-libs/startup-notification-0.11
-	bluetooth? ( >=net-wireless/gnome-bluetooth-3.9[introspection] )
-	>=media-libs/gstreamer-0.11.92:1.0
-	networkmanager? (
-		>=gnome-extra/nm-applet-0.9.8[introspection]
-		>=net-misc/networkmanager-0.9.8:=[introspection]
-		>=app-crypt/libsecret-0.18
-		dev-libs/dbus-glib )
-	systemd? ( >=sys-apps/systemd-31 )
-	elogind? ( >=sys-auth/elogind-237 )
-
-	>=app-accessibility/at-spi2-atk-2.5.3
-	media-libs/libcanberra[gtk3]
-	x11-libs/gdk-pixbuf:2[introspection]
-	dev-libs/libxml2:2
-	>=net-libs/libsoup-2.40:2.4[introspection]
-	x11-libs/libX11
-
-	>=media-sound/pulseaudio-2[glib]
-	>=dev-libs/atk-2[introspection]
-	dev-libs/libical:=
-	>=x11-libs/libXfixes-5.0
-
-	${PYTHON_DEPS}
-	dev-python/pygobject:3[${PYTHON_USEDEP}]
-	media-libs/mesa
-"
-# 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. Introspection stuff needed via imports.gi.*
-# 2. gnome-session needed for shutdown/reboot/inhibitors/etc
-# 3. Control shell settings
-# 4. logind interface needed for suspending support
-# 5. xdg-utils needed for xdg-open, used by extension tool
-# 6. adwaita-icon-theme needed for various icons & arrows (3.26 for new video-joined-displays-symbolic and co icons; review for 3.28+)
-# 7. mobile-broadband-provider-info, timezone-data for shell-mobile-providers.c  # TODO: Review
-# 8. IBus is needed for nls integration
-# 9. Optional telepathy chat integration
-# 10. TODO: semi-optional webkit-gtk[introspection] for captive portal helper
-RDEPEND="${COMMON_DEPEND}
-	>=sys-apps/accountsservice-0.6.14[introspection]
-	app-accessibility/at-spi2-core:2[introspection]
-	>=app-accessibility/caribou-0.4.8
-	app-misc/geoclue[introspection]
-	>=dev-libs/libgweather-3.26:2[introspection]
-	>=sys-power/upower-0.99:=[introspection]
-	x11-libs/pango[introspection]
-	gnome-base/librsvg:2[introspection]
-
-	>=gnome-base/gnome-session-2.91.91
-	>=gnome-base/gnome-settings-daemon-3.8.3
-
-	x11-misc/xdg-utils
-
-	>=x11-themes/adwaita-icon-theme-3.26
-
-	networkmanager? (
-		net-misc/mobile-broadband-provider-info
-		sys-libs/timezone-data )
-	ibus? ( >=app-i18n/ibus-1.4.99[dconf(+),gtk,introspection] )
-	telepathy? (
-		>=net-im/telepathy-logger-0.2.4[introspection]
-		>=net-libs/telepathy-glib-0.19[introspection] )
-"
-# avoid circular dependency, see bug #546134
-PDEPEND="
-	>=gnome-base/gdm-3.5[introspection]
-	>=gnome-base/gnome-control-center-3.26[bluetooth(+)?,networkmanager(+)?]
-	browser-extension? ( gnome-extra/chrome-gnome-shell )
-"
-DEPEND="${COMMON_DEPEND}
-	dev-libs/libxslt
-	>=dev-util/gdbus-codegen-2.45.3
-	dev-util/glib-utils
-	>=sys-devel/gettext-0.19.6
-	virtual/pkgconfig
-" #gtk-doc? ( >=dev-util/gtk-doc-1.17 )
-
-PATCHES=(
-	# Patches from gnome-3-26 branch on top of 3.26.2
-	"${WORKDIR}"/patches/
-	# Change favorites defaults, bug #479918
-	"${FILESDIR}"/${PN}-3.22.0-defaults.patch
-	# Fix automagic gnome-bluetooth dep, bug #398145
-	"${FILESDIR}"/3.26-optional-bluetooth.patch
-)
-
-src_prepare() {
-	xdg_src_prepare
-	# We want nsplugins in /usr/$(get_libdir)/nsbrowser/plugins not .../mozilla/plugins
-	sed -e 's/mozilla/nsbrowser/' -i meson.build || die
-	# Hack in correct python shebang
-	sed -e "s:python\.path():'/usr/bin/env ${EPYTHON}':" -i src/meson.build || die
-}
-
-src_configure() {
-	local emesonargs=(
-		$(meson_use nsplugin enable-browser-plugin)
-		#$(meson_use gtk-doc enable-documentation) # fails in gtkdoc-scangobj call with gtk-doc-1.25 (perl regex parenthesis issue); probably needs newer python-based gtk-doc to work
-		-Denable-man=true
-		-Denable-bluetooth=$(usex bluetooth yes no)
-		-Denable-networkmanager=$(usex networkmanager yes no)
-		-Denable-systemd=$(usex systemd yes no) # this controls journald integration only as of 3.26.2 (structured logging and having gnome-shell launched apps use its own identifier instead of gnome-session)
-		# suspend support is runtime optional via /run/systemd/seats presence and org.freedesktop.login1.Manager dbus interface; elogind should provide what's necessary
-	)
-	meson_src_configure
-}
-
-src_install() {
-	meson_src_install
-
-	# Required for gnome-shell on hardened/PaX, bug #398941; FIXME: Is this still relevant?
-	pax-mark m "${ED}usr/bin/gnome-shell"{,-extension-prefs}
-}
-
-src_test() {
-	virtx meson_src_test
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-	gnome2_schemas_update
-
-	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-vpx:1.0, or use dconf-editor to change"
-		ewarn "apps.gnome-shell.recorder/pipeline to what you want to use."
-	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 if you do not have hardware 3D setup."
-	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
-}
-
-pkg_postrm() {
-	xdg_pkg_postrm
-	gnome2_schemas_update
-}

diff --git a/gnome-base/gnome-shell/metadata.xml b/gnome-base/gnome-shell/metadata.xml
deleted file mode 100644
index 6f32c6fd..00000000
--- a/gnome-base/gnome-shell/metadata.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-	<email>gnome@g.o</email>
-	<name>Gentoo GNOME Desktop</name>
-</maintainer>
-<longdescription>
-	GNOME Shell provides core user interface functions for the GNOME 3
-	desktop, like switching to windows and launching applications.
-	GNOME Shell takes advantage of the capabilities of modern graphics
-	hardware and introduces innovative user interface concepts to
-	provide a visually attractive and easy to use experience.
-</longdescription>
-<use>
-	<flag name="browser-extension">Ensure the presence of extensions.gnome.org
-		native connector <pkg>gnome-extra/chrome-gnome-shell</pkg></flag>
-	<flag name="elogind">Use <pkg>sys-auth/elogind</pkg> for session tracking
-		and suspend support.</flag>
-	<flag name="ibus">Enable support for enhanced input methods through
-		<pkg>app-i18n/ibus</pkg></flag>
-	<flag name="telepathy">Ensure presence of telepathy chat integration</flag>
-</use>
-</pkgmetadata>