gentoo resync : 25.03.2022

5 files changed, 0 insertions, 204 deletions

diff --git a/app-editors/gedit/Manifest b/app-editors/gedit/Manifest
index d2c8ed12465e..7504b5766466 100644
--- a/app-editors/gedit/Manifest
+++ b/app-editors/gedit/Manifest
@@ -1,7 +1,3 @@
-AUX 3.38-make-gspell-optional.patch 1896 BLAKE2B 51c05e9a45aeb7586ba37cc0a3c01baebedf4cf1bbd7971b89e4b14c55941fdeb824405f6ab6c9035b9b9d6fcac7ab8cf80270bd7d52f880b3f628140f74b0e4 SHA512 857955914028623ccb3f41b91e3a1d895901e7810764085fdd7daa40f455582dbf999cffede29519ba8097f09bbb02999a969bbff406d2822fcb4fd2feb82275
-AUX 3.38-make-python-optional.patch 2255 BLAKE2B 25b50cfab045ab54c3d9e0ba5043ec6b839cffc31df3ebfd43dd438880c45d2d6eac0bea583209960d946591d3348070ec99e0b0056a5807a47eb84ddfec6363 SHA512 ad39c6f6ce36b19760bf726aedca158866158a4f2bb2479f752eab0eb2af7e4e425797bb20e301dbfdd58ac83bd824335499f99a6b4091c0835091848cc5de50
-AUX 40.1-fix-meson-0.61.patch 904 BLAKE2B acd66d002974c2030408fa32176e327205b8901e1c41ecb409d0fd6d95dd4e9f8ae79093a5a2f782c595189add73abe76e0049632b6e92a51c99a3df5ce164ac SHA512 fab0dc53cbdaa579dc583ce90760fa1fde5a4ab91d35346646c10ff3d1563168bec59f8cda70119d160cec964dba437910c7cc02a63c15a6472760de303f8c49
-AUX restore-overlay-scrollbars.patch 968 BLAKE2B b73f3fe61ba10c377b491fd00ccac333b772c415c49bbca472d60a87852473e4c73d5de327d83dc1756f188458564f5529555c69843b79274db83209faa4611e SHA512 37a6e3be8e62ede716ac3666f4ad5f2f12e2a49c5d4d15db91b2b3aaa27217b04e50bc80ed128da1b9f64d56a240c0d916d5b8335f1fec4db296f038951cca1e
 DIST gedit-41.0.tar.xz 6889320 BLAKE2B c4d2b923eab18cd27ffc0ff99882953e952c0956135fa7f6401ef01dd5cd0e1cf9a5a86c5751db9206fd88200c70434710881cd5b934a3620f14130a5066f18f SHA512 97c51ef24e53d6bd4b29350a8749eacbfcfb90b7c66c9f6d462101c53966282452f6a02043628e157e8179cf6260f103b41c61d7ba2a31da08b0687f8031974e
 EBUILD gedit-41.0.ebuild 1885 BLAKE2B b0595f782edd0b276965eb4c42d3a73562e12bdbb83775b174f6e26f8befa22238a1e020dc0da55ce5f8fe09f18adda5c42e15d70098a541f82e3af8c105fbc1 SHA512 431b90921835a15040037a89cc9b95d9c9b393bb471fcbf36155e5ef3fd5a51fd18bc28abba269b8e57c54b0ff77797ea2a13af70b5277736909e404b8343daa
 MISC metadata.xml 250 BLAKE2B 8f7f0fe023d43e380e7861e897e6afcb5de4baefb42ea9c65a57dfc0d204c6f787a99295141832e732ebb08be218da56ba77e2dd9639e4e3aabf718ce4db1d0c SHA512 2684e772dd6d83e4b49f08f2ba22d8a0a753e7b46863489eff1b5d1f2f147ad80ffd93245ca405ac4c747249bc1b754454ec9865fe16da70f9b257051e105fd8
diff --git a/app-editors/gedit/files/3.38-make-gspell-optional.patch b/app-editors/gedit/files/3.38-make-gspell-optional.patch
deleted file mode 100644
index f1197ebb5222..000000000000
--- a/app-editors/gedit/files/3.38-make-gspell-optional.patch
+++ /dev/null
@@ -1,59 +0,0 @@
-From 4f32833325a6c95ec451adf1a8d9691cceb14dd8 Mon Sep 17 00:00:00 2001
-From: Mart Raudsepp <leio@gentoo.org>
-Date: Sun, 16 Aug 2020 23:20:31 +0300
-Subject: [PATCH 1/2] build: Make gspell optional
-
----
- meson.build               | 3 ++-
- meson_options.txt         | 4 ++++
- plugins/spell/meson.build | 4 ++++
- 3 files changed, 10 insertions(+), 1 deletion(-)
-
-diff --git a/meson.build b/meson.build
-index acaad0dad..2c5dccb82 100644
---- a/meson.build
-+++ b/meson.build
-@@ -54,7 +54,7 @@ deps_basic_list = [
-   dependency('gobject-introspection-1.0'),
- ]
- 
--gspell_dep = dependency('gspell-1', version: '>= 1.0')
-+gspell_dep = dependency('gspell-1', version: '>= 1.0', required: get_option('spell'))
- python3 = python.find_installation('python3')
- 
- # Configurations
-@@ -94,3 +94,4 @@ summary('Prefix', get_option('prefix'))
- summary('API documentation', get_option('gtk_doc'))
- summary('User documentation', get_option('user_documentation'))
- summary('Require all tests', get_option('require_all_tests'))
-+summary('Spell checker plugin', get_option('spell').enabled().to_string())
-diff --git a/meson_options.txt b/meson_options.txt
-index 4e842d1ea..bb3923dd1 100644
---- a/meson_options.txt
-+++ b/meson_options.txt
-@@ -14,6 +14,10 @@ option(
-   description: 'Require that all tests can be run, even those that depend on third party programs'
- )
- 
-+option('spell',
-+       type: 'feature', value: 'enabled',
-+       description: 'Build spell checking plugin')
-+
- # This option exists for the developers, to speed up the install.
- option(
-   'user_documentation',
-diff --git a/plugins/spell/meson.build b/plugins/spell/meson.build
-index 8ce7634b7..cccb42fc1 100644
---- a/plugins/spell/meson.build
-+++ b/plugins/spell/meson.build
-@@ -1,3 +1,7 @@
-+if not gspell_dep.found()
-+  subdir_done()
-+endif
-+
- libspell_sources = files(
-   'gedit-spell-app-activatable.c',
-   'gedit-spell-plugin.c',
--- 
-2.26.2
-
diff --git a/app-editors/gedit/files/3.38-make-python-optional.patch b/app-editors/gedit/files/3.38-make-python-optional.patch
deleted file mode 100644
index 7dccb18191cd..000000000000
--- a/app-editors/gedit/files/3.38-make-python-optional.patch
+++ /dev/null
@@ -1,86 +0,0 @@
-From 9ed333a94ea15f74c420cbb2766909953aa6acb6 Mon Sep 17 00:00:00 2001
-From: Mart Raudsepp <leio@gentoo.org>
-Date: Sun, 16 Aug 2020 23:34:42 +0300
-Subject: [PATCH 2/2] build: Make python optional
-
----
- gedit/meson.build   | 2 ++
- meson.build         | 2 ++
- meson_options.txt   | 4 ++++
- plugins/meson.build | 9 ++++++---
- 4 files changed, 14 insertions(+), 3 deletions(-)
-
-diff --git a/gedit/meson.build b/gedit/meson.build
-index 9fc81468e..5e808a2d8 100644
---- a/gedit/meson.build
-+++ b/gedit/meson.build
-@@ -197,10 +197,12 @@ libgedit_gir = gnome.generate_gir(
-   install_dir_typelib: get_option('libdir') / 'gedit/girepository-1.0',
- )
- 
-+if get_option('python')
- python3.install_sources(
-   'Gedit.py',
-   subdir: 'gi/overrides',
- )
-+endif
- 
- # Vala API
- libgedit_vapi = gnome.generate_vapi(
-diff --git a/meson.build b/meson.build
-index 2c5dccb82..5e1e9340a 100644
---- a/meson.build
-+++ b/meson.build
-@@ -55,7 +55,9 @@ deps_basic_list = [
- ]
- 
- gspell_dep = dependency('gspell-1', version: '>= 1.0', required: get_option('spell'))
-+if get_option('python')
- python3 = python.find_installation('python3')
-+endif
- 
- # Configurations
- config_h = configuration_data()
-diff --git a/meson_options.txt b/meson_options.txt
-index bb3923dd1..962b82934 100644
---- a/meson_options.txt
-+++ b/meson_options.txt
-@@ -14,6 +14,10 @@ option(
-   description: 'Require that all tests can be run, even those that depend on third party programs'
- )
- 
-+option('python',
-+       type: 'boolean', value: true,
-+       description: 'Install GIR python overrides and python plugins')
-+
- option('spell',
-        type: 'feature', value: 'enabled',
-        description: 'Build spell checking plugin')
-diff --git a/plugins/meson.build b/plugins/meson.build
-index 50bc5d393..63bb7c094 100644
---- a/plugins/meson.build
-+++ b/plugins/meson.build
-@@ -18,14 +18,17 @@ msgfmt_plugin_cmd = [
- subdir('docinfo')
- subdir('filebrowser')
- subdir('modelines')
--subdir('pythonconsole')
- subdir('quickhighlight')
--subdir('quickopen')
--subdir('snippets')
- subdir('sort')
- subdir('spell')
- subdir('time')
- 
-+if get_option('python')
- if get_option('plugin_externaltools')
-   subdir('externaltools')
- endif
-+
-+  subdir('pythonconsole')
-+  subdir('quickopen')
-+  subdir('snippets')
-+endif
--- 
-2.26.2
-
diff --git a/app-editors/gedit/files/40.1-fix-meson-0.61.patch b/app-editors/gedit/files/40.1-fix-meson-0.61.patch
deleted file mode 100644
index cac046067cb2..000000000000
--- a/app-editors/gedit/files/40.1-fix-meson-0.61.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-https://gitlab.gnome.org/GNOME/gedit/-/merge_requests/124.patch
-https://bugs.gentoo.org/831925
-
-From c6c7c6580bc7f82a7d449b8ee33ae44f8b6f4a1f Mon Sep 17 00:00:00 2001
-From: rvalue <i@rvalue.moe>
-Date: Wed, 15 Dec 2021 07:02:09 +0000
-Subject: [PATCH] Remove incorrect args for i18n.merge_file
-
-The positional argument has been silently ignored for a time. And it causes failure
-with "ERROR: Function does not take positional arguments" since meson 0.60.0
---- a/data/meson.build
-+++ b/data/meson.build
-@@ -4,7 +4,6 @@ install_man('gedit.1')
- 
- appdata = 'org.gnome.gedit.appdata.xml'
- appdata_file = i18n.merge_file(
--  appdata,
-   input: appdata + '.in',
-   output: appdata,
-   po_dir: '../po/',
-@@ -23,7 +22,6 @@ endif
- 
- desktop_file = 'org.gnome.gedit.desktop'
- desktop_output_file = i18n.merge_file(
--  desktop_file,
-   type: 'desktop',
-   input: desktop_file + '.in',
-   output: desktop_file,
-GitLab
diff --git a/app-editors/gedit/files/restore-overlay-scrollbars.patch b/app-editors/gedit/files/restore-overlay-scrollbars.patch
deleted file mode 100644
index 55a353a796bf..000000000000
--- a/app-editors/gedit/files/restore-overlay-scrollbars.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From 189ee4514107e70a62d44766f8ca39d815d48581 Mon Sep 17 00:00:00 2001
-From: Michael Catanzaro <mcatanzaro@gnome.org>
-Date: Fri, 20 Mar 2020 11:32:59 -0500
-Subject: [PATCH] Revert "ViewFrame: disable overlay scrolling for the
- GtkScrolledWindow"
-
-This reverts commit 5e0909c19f267b4023131881fac89c58a2a17453.
----
- gedit/resources/ui/gedit-view-frame.ui | 1 -
- 1 file changed, 1 deletion(-)
-
-diff --git a/gedit/resources/ui/gedit-view-frame.ui b/gedit/resources/ui/gedit-view-frame.ui
-index ebf70b013..4c783c711 100644
---- a/gedit/resources/ui/gedit-view-frame.ui
-+++ b/gedit/resources/ui/gedit-view-frame.ui
-@@ -11,7 +11,6 @@
-         <property name="visible">True</property>
-         <property name="hexpand">True</property>
-         <property name="vexpand">True</property>
--        <property name="overlay_scrolling">False</property>
-         <child>
-           <object class="GeditView" id="view">
-             <property name="visible">True</property>
--- 
-2.25.1
-