gnome-base/gnome-shell: make bluetooth support optional again

Package-Manager: Portage-2.3.49, Repoman-2.3.10
Manifest-Sign-Key: 0x5A56C8CD0C13248A

3 files changed, 94 insertions, 19 deletions

diff --git a/gnome-base/gnome-shell/Manifest b/gnome-base/gnome-shell/Manifest
index 3c65c32b..e9dc5481 100644
--- a/gnome-base/gnome-shell/Manifest
+++ b/gnome-base/gnome-shell/Manifest
@@ -5,19 +5,19 @@ DIST gnome-shell-3.26.2.tar.xz 1405580 BLAKE2B ccbb8ad374931335fdc6e752a7feedcba
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQKTBAEBCAB9FiEEhjiDzgE0H6m8d3Z/4FucaN0bWf0FAlr1L2BfFIAAAAAALgAo
-aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldDg2
-Mzg4M0NFMDEzNDFGQTlCQzc3NzY3RkUwNUI5QzY4REQxQjU5RkQACgkQ4FucaN0b
-Wf02gA/+NRyxHCKVElyel9w9dZ5HCfL5Lhw7p4eggus2Y9JQPMijpIDYQv7hhiDI
-IsqgehUkuhIL78bcXnXpthBRhWQyfDy+GX6rVMrtabkpzoOWNPD6/m/oZzonOs1K
-HbtE19tycg6zKMCfdfDq9pRm8be3aqjAx7uuSMiRGIbfLVy3saCfbYx8O+88s+De
-TLujUMHXtoCdcIUo678gPFhzcHwQuVUUrcmBye0/gu+SErAw8XU7jj790OwZib2u
-JQKBya4Nab42u61Tv0G64MhegbxOWPy3j9PwIuE5l2LtwkEM5laa5BkOVkFEvZtv
-/qjE5gvq/cMaCCjERFJEXjXPoZEBV57Sd2/0QhTa0kLAozLesuNCr61WEm5119qg
-G8Lt5hl+3R7hUx97s3aRN5cpx2UOSpYfwVc2qqeDAh8qK7cpMk7q+zWMNg8q3ufC
-p/+pW1JOIhnvb1WKnyTY4/fw5+Q2ekv4ADFf/uZILlXpbuJ8T7PkcGMhOB1cci06
-+sGrZVmlNjA/cOGxWSMLxffVTBdgZP7Cy27ZBwfgi+RQmGNl5a9PPM0GAbWWU8gq
-lYJabQxOjwvR2LJrO1ffW6L5AF8TiVgQvYHN4+OiIuBrLGADwZn5DImgDuHjhc3b
-H9Xr5baha0SSrX+/57y/hIJfMqAEWRWS+66j0wp9LGmIuw8NrWk=
-=n7Tr
+iQKTBAEBCAB9FiEEX+aBqe7MmoWBwzA1lSmjXZiBxnkFAluWVA1fFIAAAAAALgAo
+aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldDVG
+RTY4MUE5RUVDQzlBODU4MUMzMzAzNTk1MjlBMzVEOTg4MUM2NzkACgkQlSmjXZiB
+xnnZixAAoZD+Z6PMjeQgb57JZ6fGe7IOAkCzcgQbaZhT08VvS1MfnGxpTu+i5Rns
+aTxp9nyrMNpUm6WPET9IQSE6NdSlFdG9OTLd7aJuvHUE0gWUSzdxScfyuPcsBoWG
+7Hq8Ry0KzwnM5owTeMkPrGgViEX70tPgVHO+pNLO/QgOlBl1H8aeF/E+sueyZ4bQ
+mWp5S8mZzAGG1qjzcTuo2/CR5HtGXC5JvkbsZG35KTW5AXbQm8EdeKaM88/ekqdr
+6vJ0RzaqqCjEkQ4IC0OudRUrJpUVUXgtWYY+zBSiQ06H+s/JEPScnsOEGYbWO3AS
+FqmYlu1nIW3Y9Pi3N/hJS650zHW1DObd4AmHvFLSig+Mn2ndY/WXXBbH4LM/MdQm
+mVvwwrUyn38nrSEgojWR046UbgwPom0uiQr4OfyAOljI5izu4oM5BvfVX9+kbPtP
+m+V+W/stw2zG9aBHkwm1fsUyks10Ak/QdYuDYg97kszf90r88KLfejKHbVWItieP
+49b9YCKEekt7p/Gg9pTfcClwJULes8xC1GV8/t6o+XybMYdfszWOSCC+vkrY+E35
+ZkxS1bhJ3q+KG0bsqaafs12FWL+A3+507o4MKsj4KW1LFOT/kF8PhNgHBV293dzt
+JhuC1q/cKLU3eCy4WXI5/D92ntbRkeCQsJ2nmy8r93bg2t/vDuA=
+=QxMj
 -----END PGP SIGNATURE-----
diff --git a/gnome-base/gnome-shell/files/3.26-bluetooth-flag.patch b/gnome-base/gnome-shell/files/3.26-bluetooth-flag.patch
new file mode 100644
index 00000000..65686954
--- /dev/null
+++ b/gnome-base/gnome-shell/files/3.26-bluetooth-flag.patch
@@ -0,0 +1,72 @@
+From 7ca3e1a9d18e6f6154b4479bcd94d420bc69798c Mon Sep 17 00:00:00 2001
+From: Gilles Dartiguelongue <eva@gentoo.org>
+Date: Mon, 10 Sep 2018 13:17:39 +0200
+Subject: [PATCH] Make bluetooth support optional
+
+https://bugs.gentoo.org/show_bug.cgi?id=398145
+---
+ 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-networkmanager')
++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/gnome-shell-3.26.2-r1.ebuild b/gnome-base/gnome-shell/gnome-shell-3.26.2-r2.ebuild
index 3346d08b..84ff9806 100644
--- a/gnome-base/gnome-shell/gnome-shell-3.26.2-r1.ebuild
+++ b/gnome-base/gnome-shell/gnome-shell-3.26.2-r2.ebuild
@@ -6,7 +6,7 @@ GNOME2_LA_PUNT="yes"
 GNOME2_EAUTORECONF="yes"
 PYTHON_COMPAT=( python3_{4,5,6} )
 
-inherit gnome-meson multilib pax-utils python-r1 systemd
+inherit gnome-meson multilib pax-utils python-r1 systemd virtualx
 
 DESCRIPTION="Provides core UI functions for the GNOME 3 desktop"
 HOMEPAGE="https://wiki.gnome.org/Projects/GnomeShell"
@@ -21,8 +21,6 @@ KEYWORDS="~amd64 ~ia64 ~ppc ~ppc64 ~x86"
 # libXfixes-5.0 needed for pointer barriers
 # FIXME:
 #  * gstreamer support is currently automagic
-#  * gnome-bluetooth is automagic
-#  * BROWSER_PLUGIN_DIR is not set
 COMMON_DEPEND="
 	>=app-accessibility/at-spi2-atk-2.5.3
 	>=dev-libs/atk-2[introspection]
@@ -121,6 +119,7 @@ PATCHES=(
 	# Change favorites defaults, bug #479918
 	"${FILESDIR}"/${PN}-3.22.0-defaults.patch
 	# Fix automagic gnome-bluetooth dep, bug #398145
+	"${FILESDIR}"/3.26-bluetooth-flag.patch
 )
 
 src_configure() {
@@ -129,7 +128,11 @@ src_configure() {
 		-Denable-documentation=false \
 		-Denable-systemd=$(usex !openrc-force yes no) \
 		-Denable-networkmanager=$(usex networkmanager yes no) \
-		$(meson_use nsplugin enable-browser-plugin) 
+		$(meson_use nsplugin enable-browser-plugin)
+}
+
+src_test() {
+	virtx meson_src_test
 }
 
 src_install() {