gentoo resync : 15.06.2021

3 files changed, 0 insertions, 77 deletions

diff --git a/dev-util/devhelp/Manifest b/dev-util/devhelp/Manifest
index 17afcee18db0..30779383acca 100644
--- a/dev-util/devhelp/Manifest
+++ b/dev-util/devhelp/Manifest
@@ -1,5 +1,3 @@
-AUX 3.30.1-optional-gedit.patch 1259 BLAKE2B ccca312359fcf0105a3ae934e0b51582f597eb84b34ceb82967d5939c735537b261148202f6fb277ad102a1337794b2416dd158d7432a4d13159721c2bdf3abb SHA512 e7a0a659711063d0ac37814bed3c8e43cb1d7bddd313fa87b7cba2a1d2eaae45ad6fb430f247c190f0f4f15813135c572779f44dfad8bf223aead214f4e8566d
-AUX 3.30.1-optional-introspection.patch 1266 BLAKE2B 95bc2dece601e561c95d420e3bb564b318c7498ac67e30ae9f40909bd781445c4c8c2e1e1dbee2932c530d24f19357c49a7ba59caeffb767aec66b1feef6605e SHA512 959319c7e36f1dbe1dbfa858f53a91b6f6f1c4e469a7a3b237bd8ec96a7636fb719084f5bf9c0146b253eaf7f9512db4a077ec1e40065a827597131515d889e6
 AUX 40.0-optional-introspection.patch 1163 BLAKE2B ce50a6bbb920610be1daa723383e1fd464aed84f3d01911e1f85b50adf1f44680518a15e896b351271a3c3ac5500c2fbe148392fe90191f0ed37162faacded88 SHA512 6f874452379b76ee0ef1b402a7bd706e3543cf10b9033e5c5c0d1e153ce8d845e75056d10b1f451fc4ffe2073a7157ab492416d9c76eed44e38d00d919ddbd57
 DIST devhelp-40.0.tar.xz 318076 BLAKE2B 05345f422e0ec906855c139306020165277daefea2c85229092be57c98f96459c33ab0fdf847a7135fa1b329c76edea71f7da0342c6673a828efe26298d26bdf SHA512 b8dd5fbb12558845f7f5794dad56ef0ffc1dbd60d5a6a28029dc8acea241e8deb1b68cd0abe9d620a512931a1c5f6db12fc594cd4597758c8d4904fb64e6ade7
 EBUILD devhelp-40.0.ebuild 1787 BLAKE2B 623ca0412768d8c04bc8637bf95e5b4e6d708fedf1f3b7d58ae4dcbf6e0c1b05065ef86be30405df3655648c0db9078815dc9a39611f330b64dfabd6beab23bf SHA512 af0d7acdb175458102553ab2006c505d36d5bb11657b3bec012eb36c55e45534958dedb775792fa0b954bf0cdab2f469e9aa024c57d157d18dc2e3c1e28c1340
diff --git a/dev-util/devhelp/files/3.30.1-optional-gedit.patch b/dev-util/devhelp/files/3.30.1-optional-gedit.patch
deleted file mode 100644
index 09e4405a50e0..000000000000
--- a/dev-util/devhelp/files/3.30.1-optional-gedit.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-From 5bb00c3748741d585d544c96933a25bd399736ed Mon Sep 17 00:00:00 2001
-From: Mart Raudsepp <leio@gentoo.org>
-Date: Fri, 22 Mar 2019 19:47:49 +0200
-Subject: [PATCH 2/2] build: Add optionality for gedit plugin installation
-
----
- meson.build       | 4 +++-
- meson_options.txt | 1 +
- 2 files changed, 4 insertions(+), 1 deletion(-)
-
-diff --git a/meson.build b/meson.build
-index a0def09c..2d1d3e0a 100644
---- a/meson.build
-+++ b/meson.build
-@@ -155,7 +155,9 @@ add_global_arguments(supported_warning_cflags, language : 'c')
- ##### end CFLAGS
- 
- subdir('data')
--subdir('plugins/gedit-plugin')
-+if get_option('gedit_plugin')
-+  subdir('plugins/gedit-plugin')
-+endif
- subdir('po')
- subdir('help')
- subdir('devhelp')
-diff --git a/meson_options.txt b/meson_options.txt
-index 2eaa7ff9..8fdb5a89 100644
---- a/meson_options.txt
-+++ b/meson_options.txt
-@@ -1,3 +1,4 @@
- option('flatpak_build', type : 'boolean', value : false, description : 'Flatpak build mode')
-+option('gedit_plugin', type : 'boolean', value : true, description : 'Install the gedit plugin')
- option('gtk_doc', type : 'boolean', value : false, description : 'Build the API reference')
- option('introspection', type : 'boolean', value : true, description : 'Build GObject Introspection data')
--- 
-2.17.0
-
diff --git a/dev-util/devhelp/files/3.30.1-optional-introspection.patch b/dev-util/devhelp/files/3.30.1-optional-introspection.patch
deleted file mode 100644
index b5afa8a2b874..000000000000
--- a/dev-util/devhelp/files/3.30.1-optional-introspection.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-From 3434481e901a0ffbcba9817e4c0641ca8c19275a Mon Sep 17 00:00:00 2001
-From: Mart Raudsepp <leio@gentoo.org>
-Date: Fri, 22 Mar 2019 19:44:40 +0200
-Subject: [PATCH 1/2] build: Add optionality for introspection build
-
----
- devhelp/meson.build | 2 ++
- meson_options.txt   | 1 +
- 2 files changed, 3 insertions(+)
-
-diff --git a/devhelp/meson.build b/devhelp/meson.build
-index ea217895..f88fcb07 100644
---- a/devhelp/meson.build
-+++ b/devhelp/meson.build
-@@ -123,6 +123,7 @@ PKG_CONFIG.generate(
-         requires : LIBDEVHELP_DEPS_STR
- )
- 
-+if get_option('introspection')
- GNOME.generate_gir(
-         libdevhelp,
-         export_packages : 'libdevhelp-@0@'.format(LIBDEVHELP_API_VERSION_FULL),
-@@ -139,3 +140,4 @@ GNOME.generate_gir(
-         include_directories : ROOT_INCLUDE_DIR,
-         install : true
- )
-+endif
-diff --git a/meson_options.txt b/meson_options.txt
-index a10fc603..2eaa7ff9 100644
---- a/meson_options.txt
-+++ b/meson_options.txt
-@@ -1,2 +1,3 @@
- option('flatpak_build', type : 'boolean', value : false, description : 'Flatpak build mode')
- option('gtk_doc', type : 'boolean', value : false, description : 'Build the API reference')
-+option('introspection', type : 'boolean', value : true, description : 'Build GObject Introspection data')
--- 
-2.17.0
-