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

[Mart Raudsepp]

commit:     07f0ffba86c1293e37852864be2f4f65bfc6597c
Author:     Mart Raudsepp <leio <AT> gentoo <DOT> org>
AuthorDate: Sun May  5 11:48:16 2019 +0000
Commit:     Mart Raudsepp <leio <AT> gentoo <DOT> org>
CommitDate: Sun May  5 11:54:00 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=07f0ffba

gnome-base/gnome-shell: remove old

Package-Manager: Portage-2.3.62, Repoman-2.3.12
Signed-off-by: Mart Raudsepp <leio <AT> gentoo.org>

 gnome-base/gnome-shell/Manifest                    |   1 -
 .../files/3.28.3-optional-bluetooth.patch          |  59 -------
 gnome-base/gnome-shell/gnome-shell-3.30.2.ebuild   | 189 ---------------------
 3 files changed, 249 deletions(-)

diff --git a/gnome-base/gnome-shell/Manifest b/gnome-base/gnome-shell/Manifest
index d640ce135a8..320563d499f 100644
--- a/gnome-base/gnome-shell/Manifest
+++ b/gnome-base/gnome-shell/Manifest
@@ -2,6 +2,5 @@ DIST gnome-shell-3.24.3.tar.xz 1982088 BLAKE2B 608b3e73d546dea543a23c31a64b03c32
 DIST gnome-shell-3.26.2-patchset.tar.xz 55492 BLAKE2B 745b8549f7480b004f4df9b81508c94c9224f77a5a503f45dfda20105e9c305f8cae6ae5e420e597cea9f98899933bb19efd8cf0e9811dc35d0844a3c2920143 SHA512 93a730082e84807c23f4b7e390c2d0fb02d3666fc32241de02b3534cc271b160bd9a6a6a2e908ed5bdde91cef383c1e400b0f7cbf04ac104f7f9758218e635ed
 DIST gnome-shell-3.26.2.tar.xz 1405580 BLAKE2B ccbb8ad374931335fdc6e752a7feedcba4fe2b61112404b62bc9711b1736216d46fd6e85c6f06439cae50af86a174359d7df0e111e8db6ffed567e91b4292b14 SHA512 0e13bc7abff2367d24ea748cd69a1879ff14a6755ef27d17cf20cef61bc6d15bf6e9d18362142a2d6462689f64eada833f9bba21ebaac3a33765a5be0ae48d3a
 DIST gnome-shell-3.30.2-patchset-r1.tar.xz 41324 BLAKE2B 4d051a327d106e8431c7b75d56932137dd3af2694c313656bf4751a385a86ef43dd635f31902be0426899746c63f1cd1aa782e9c0827f750fe61683512fbd43c SHA512 3761688e86694be00d81eac2bcd8774d8fdff62f44cdcd26c29b9e7513d2db0edc0ba097e0fea474a232496e3f9b8797e6215a040915a0832517235b26cbc265
-DIST gnome-shell-3.30.2-patchset.tar.xz 39864 BLAKE2B 61c02e5ae87ab24f30d28865f4444f20e32fef63eefbfc1134bf0582eb25933700902aad08176fd2011781262552385bcb3ffaf35fc2d7a060c09ba0d27cb9a8 SHA512 8ad976c05488a6b7447d29105a566d0bb975c8e0798be18c1dc07295c51a27578274e611da4979397fc6c4da538f6d9f48072e043829a63faf87a781518ee531
 DIST gnome-shell-3.30.2-r2-patchset.tar.xz 41852 BLAKE2B f854a42b0ba0be8019487edfc1a0e73d11d406537ffe288d1a5d81e9a512b8fb02e6af466fbe4d0d0e8644aa6f57cad1d381b5e873223749c88d1dccdae72b9e SHA512 c0c935206048c961e70f319b67133dcf0f5253c2283aefd6283db910950f8cd645888f6a6b7bbbfc620a023e0b5ae85394e5f5ce0fb2ff120b18ab7640f9859e
 DIST gnome-shell-3.30.2.tar.xz 1439556 BLAKE2B 547ccf5571ea431d15c6430619640bd497a381191cad56bbf1a5c9992c5df47eb48527cc2749ea4d417cbe5fd7cc2acb44915ee35d3d89cd386541f19d743877 SHA512 5cdf2b9a4dc9dbcc75d76020a01b953ae3922d5820b692d1bc1cf62daf1f00d04b95d6ec076920563f555115c4f4ad11a019e4523a353ef4dd2189a5240239c6

diff --git a/gnome-base/gnome-shell/files/3.28.3-optional-bluetooth.patch b/gnome-base/gnome-shell/files/3.28.3-optional-bluetooth.patch
deleted file mode 100644
index 3138c6d2b73..00000000000
--- a/gnome-base/gnome-shell/files/3.28.3-optional-bluetooth.patch
+++ /dev/null
@@ -1,59 +0,0 @@
-From 26dbbd15fabd3c35135105720dc821edccb128fa Mon Sep 17 00:00:00 2001
-From: Mart Raudsepp <leio@g.o>
-Date: Thu, 28 Feb 2019 00:50:19 +0200
-Subject: [PATCH] build: Make bluetooth support optional
-
----
- js/misc/meson.build | 2 +-
- meson.build         | 7 ++++++-
- meson_options.txt   | 6 ++++++
- 3 files changed, 13 insertions(+), 2 deletions(-)
-
-diff --git a/js/misc/meson.build b/js/misc/meson.build
-index 5a4871762..3c5e02368 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 f38798caf..e1bcd1892 100644
---- a/meson.build
-+++ b/meson.build
-@@ -92,7 +92,12 @@ ibus_dep = dependency('ibus-1.0', version: ibus_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)
-+if get_option('bluetooth')
-+  bt_dep = dependency('gnome-bluetooth-1.0', version: bt_req)
-+  have_bluetooth = true
-+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 65188c7ff..b6d49dfb5 100644
---- a/meson_options.txt
-+++ b/meson_options.txt
-@@ -1,3 +1,9 @@
-+option('bluetooth',
-+  type: 'boolean',
-+  value: true,
-+  description: 'Enable bluetooth support'
-+)
-+
- option('browser_plugin',
-   type: 'boolean',
-   value: true,
--- 
-2.17.0
-

diff --git a/gnome-base/gnome-shell/gnome-shell-3.30.2.ebuild b/gnome-base/gnome-shell/gnome-shell-3.30.2.ebuild
deleted file mode 100644
index b76502772cb..00000000000
--- a/gnome-base/gnome-shell/gnome-shell-3.30.2.ebuild
+++ /dev/null
@@ -1,189 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python3_{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 gtk-doc +ibus +networkmanager nsplugin systemd telepathy"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}
-	?? ( elogind systemd )"
-
-KEYWORDS="~amd64 ~arm ~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.57.2:2
-	>=dev-libs/gobject-introspection-1.49.1:=
-	>=dev-libs/gjs-1.54.0
-	>=x11-libs/gtk+-3.15.0:3[introspection]
-	nsplugin? ( >=dev-libs/json-glib-0.13.2 )
-	>=x11-wm/mutter-3.30.1:0/3[introspection]
-	>=sys-auth/polkit-0.100[introspection]
-	>=gnome-base/gsettings-desktop-schemas-3.27.90
-	>=x11-libs/startup-notification-0.11
-	>=app-i18n/ibus-1.5.2
-	bluetooth? ( >=net-wireless/gnome-bluetooth-3.9[introspection] )
-	>=media-libs/gstreamer-0.11.92:1.0
-	networkmanager? (
-		>=net-misc/networkmanager-1.10.4:=[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
-	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. Cantarell font used in gnome-shell global CSS (if removing this for some reason, make sure it's pulled in somehow for non-meta users still too)
-# 11. 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-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] )
-	media-fonts/cantarell
-"
-# 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-lang/sassc
-	dev-libs/libxslt
-	>=dev-util/gdbus-codegen-2.45.3
-	dev-util/glib-utils
-	gtk-doc? ( >=dev-util/gtk-doc-1.17 )
-	>=sys-devel/gettext-0.19.8
-	virtual/pkgconfig
-"
-
-PATCHES=(
-	# Patches from gnome-3-28 branch on top of 3.30.2
-	"${WORKDIR}"/patches/
-	# Change favorites defaults, bug #479918
-	"${FILESDIR}"/3.28.3-defaults.patch
-	# Fix automagic gnome-bluetooth dep, bug #398145
-	"${FILESDIR}"/3.28.3-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 bluetooth)
-		$(meson_use nsplugin browser_plugin)
-		$(meson_use gtk-doc gtk_doc)
-		-Dman=true
-		$(meson_use networkmanager)
-		$(meson_use systemd) # 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
-	# TODO: Is this still the case after various fixed in 3.28 for detecting non-working KMS for wayland (to fall back to X)?
-	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
-}