gentoo resync : 15.06.2021

2 files changed, 0 insertions, 63 deletions

diff --git a/gnome-base/dconf/Manifest b/gnome-base/dconf/Manifest
index 0ec660381c92..ee73e8dc9422 100644
--- a/gnome-base/dconf/Manifest
+++ b/gnome-base/dconf/Manifest
@@ -1,4 +1,3 @@
-AUX 0.30.1-bash-completion-dir.patch 3222 BLAKE2B 977be3dd9cbee50bc976fbae125b058579587dcf55918b07b4bc9708dc9cc19192acddfb225c540806b4866a2e431acc42d461f91fdd935626af366341617595 SHA512 aeaba2126d4e87caf7c467118f2e2d42330fbf5c1d0786c52a2782550c64f41e482034c08e4624cc231e49ec9f39e824d29796b4078090613cfe54adbd420eaa
 AUX 0.32.0-drop-vapigen-dep.patch 1123 BLAKE2B 921e0bfebf9dfa67e55cda7c410c790e07d5d55d9c24d897fd43bacf524bde2de4fce07905a8c2298130af5c94a309a8bd82d0d549f2e344d653f9c9e1335965 SHA512 c26e44fd38e46f1df60d2a13cc40415af9298629ad3c0d12a203bf483a0577c24af2bedfb8c1e8e35855eefa317a0afced78b74f217a13a2429bb8ae73d8413f
 AUX 0.40.0-bash-completion-dir.patch 3029 BLAKE2B 6695d75088c96060b0b0a34f928d8db9b06528d97ff3fe44b5911ef1c04b1a68aa807eea507213e316283db8b1d73218255e12c378aafb3fc920ab39d3f092b4 SHA512 4fead302c92327787f26b0001ced07dcd176abbc5142119a19be0b48893d777f1cfc4559f37a37a5c589221cb2c81f1627626371d8a3ad58bb8c542806ac7b87
 DIST dconf-0.40.0.tar.xz 117764 BLAKE2B bdbc48b71e46fdc4353358cd08fb96933d07af587300a6f91bc45826aeafb3f34f482fe6e09041dd839e507b863a8e33d09bad88a91c1c868983f8afb52c5c85 SHA512 71396d71f24f47653181482b052fdfc63795c50c373de34e2fb93e16101745daa7e81192b79a102d5389911cea34138eedf3ac32bc80562018e8a7f31963559a
diff --git a/gnome-base/dconf/files/0.30.1-bash-completion-dir.patch b/gnome-base/dconf/files/0.30.1-bash-completion-dir.patch
deleted file mode 100644
index 5d256f7efec5..000000000000
--- a/gnome-base/dconf/files/0.30.1-bash-completion-dir.patch
+++ /dev/null
@@ -1,62 +0,0 @@
-From 012b92b115ed96cc66818adbd31557765078be65 Mon Sep 17 00:00:00 2001
-From: Mart Raudsepp <leio@gentoo.org>
-Date: Fri, 22 Feb 2019 22:06:18 +0200
-Subject: [PATCH] build: Allow passing bash-completion dir and have a generic
- fallback
-
-With autotools the installation path was just hardcoded to the usual
-location. In meson it was made to always check the path from
-bash-completion.pc, but some downstream might want to install the
-file without a bash-completion build-dep. Allow installing the
-completion file to a passed directory, and add back the fallback
-path if an explicit directory isn't passed and bash-completion
-package isn't found. This is also what the tracker project does.
----
- meson.build       | 20 ++++++++++++++++----
- meson_options.txt |  2 +-
- 2 files changed, 17 insertions(+), 5 deletions(-)
-
-diff --git a/meson.build b/meson.build
-index aa87823..a74d5c7 100644
---- a/meson.build
-+++ b/meson.build
-@@ -48,10 +48,22 @@ glib_dep = dependency('glib-2.0', version: '>= 2.44.0')
- gio_module_dir = gio_dep.get_pkgconfig_variable('giomoduledir', define_variable: ['libdir', dconf_libdir])
- dbus_session_service_dir = dependency('dbus-1').get_pkgconfig_variable('session_bus_services_dir', define_variable: ['datadir', dconf_datadir])
- 
--enable_bash_completion = get_option('bash_completion')
--if enable_bash_completion
--  # FIXME: the `.pc` file is wrong because `completionsdir` should be relative to `datadir`, not `prefix`
--  completions_dir = dependency('bash-completion').get_pkgconfig_variable('completionsdir', define_variable: ['prefix', dconf_prefix])
-+enable_bash_completion = false
-+if get_option('bash_completion_dir') == 'yes' or get_option('bash_completion_dir') == 'auto'
-+  bash_completion_package = dependency('bash-completion', required: false)
-+  if bash_completion_package.found()
-+    # FIXME: the `.pc` file is wrong because `completionsdir` should be relative to `datadir`, not `prefix`
-+    completions_dir = bash_completion_package.get_pkgconfig_variable('completionsdir',
-+                                                                         define_variable: [ 'prefix', dconf_prefix ])
-+  else
-+    completions_dir = join_paths(dconf_datadir, 'bash-completion', 'completions')
-+  endif
-+  enable_bash_completion = true
-+elif get_option('bash_completion_dir') == 'no' or get_option('bash_completion_dir') == ''
-+  enable_bash_completion = false
-+else
-+  enable_bash_completion = true
-+  completions_dir = get_option('bash_completion_dir')
- endif
- 
- configure_file(
-diff --git a/meson_options.txt b/meson_options.txt
-index a2794ce..3ac4ede 100644
---- a/meson_options.txt
-+++ b/meson_options.txt
-@@ -1,4 +1,4 @@
--option('bash_completion', type: 'boolean', value: true, description: 'install bash completion files')
-+option('bash_completion_dir', type: 'string', value: 'yes', description: 'directory to install Bash completion files (or "yes" for default directory, "no" to disable installation)')
- option('man', type: 'boolean', value: true, description: 'generate man pages')
- option('gtk_doc', type: 'boolean', value: false, description: 'use gtk-doc to build documentation')
- option('vapi', type: 'boolean', value: true, description: 'install dconf client vapi')
--- 
-2.17.0
-