gentoo resync : 25.04.2020

4 files changed, 2 insertions, 156 deletions

diff --git a/app-editors/gedit/Manifest b/app-editors/gedit/Manifest
index 67b6d6f26fb6..6ef49f61835b 100644
--- a/app-editors/gedit/Manifest
+++ b/app-editors/gedit/Manifest
@@ -1,7 +1,4 @@
-AUX 3.32.2-fix-parallel-build.patch 5216 BLAKE2B ad6a307be458d828c19bb6981717479a7a9ff3d5405b0abd2b1235a06b78935932104f10b10993fb6672b0c749f525f3192aedadaafb90edecdc663e22dcaaea SHA512 7b408f750e055b68b019301dbd771b309068be6dd599b830679fae89ebf3f15acc95b798e30876664abfc14bfe535eaf8dc4ce6f3b2bd87230a1f2018a37af29
 AUX 3.32.2-make-spell-optional.patch 2044 BLAKE2B 617cfced32aa5f872bfb31fbef964faf391a3ce049b3fba7f431214e27c5adbbcb7669c32c356c786a49f1d87cf983413cdb844da5e269ed3d3bcc6d3e60d5f8 SHA512 a79f1b564cdac31d497bcb66bf6732529d1f88654dc82c7dadfbfc7f15a3e73ce7fa144bf8f86b2a44284b8b656f50bfde16ab5cc9ba31faf767a219372acf23
-DIST gedit-3.32.2.tar.xz 14789660 BLAKE2B 574a490e3beda9e8b4f8324409f3a1e3361b1fdd097c4bf8d05475be2a6bb66b230ab6d2047caa62c393458c29b6647c32293ce5c1428d030cb2345c19bf41c3 SHA512 a3ed4dea3d0f60fb2371d2b6bbf5f5db1f67c9a71d0d47836456e022903e86b8b127c88ece6a6d817b0c86ff82612c963a9e8ed60f9841af68474a1d129c886d
 DIST gedit-3.34.1.tar.xz 14797588 BLAKE2B 8dfaac4660575d67e3f8396dfed675a737fc69bc2b34866ee467a3464a338240133cab8d067db7b87fdc129f06a2450b91f4e0f70a73912d4a274cca980196d6 SHA512 22968c678a2f7ecf062f490d5eedc97aaa53b15932db801ea83eb336f01f41e7a6037a85508a40164f38dee406f8db097b7ef6f1481ab44ea82668766d24966d
-EBUILD gedit-3.32.2-r1.ebuild 2351 BLAKE2B c6707e3c092e18b5ed1b7169d2e0532f74567a8328fda40aa410d37c5d6651c9a95d0cd288da521e0635232169f369e6ddc08fa597678c20af601cbf48a00e65 SHA512 546a55c48633bfd7146d4e557c42435e8b81f6d427a1ccdc20f0f9766a07bf2cd17bff489fe0475b06795d16d239841de8a52959d9c5fd36e7b72223580a7b98
-EBUILD gedit-3.34.1.ebuild 2261 BLAKE2B bd90e10893143cbeaf98ae784cb74daf72c5691a8ad810dbe8cfdd75bafba9e184656e77b1784562d5257a67c13cfd969dfcc448a7242799ac304ee96df7f614 SHA512 db0e66515990b45831f07e77a472e82351b8aef07344b4a56095ea487154cbfb3f5df95e71e750a805e3b3468c9a8a41673c004c3ffc268f9fe9e3c4651f745d
+EBUILD gedit-3.34.1.ebuild 2259 BLAKE2B 9d4db7c46cdafbdbc5e1da53062659df961febf00e8e7c625a38f28d2da054ea4ffabafed1f6df3175a8b3b2531a55736f25910df137f09eef43dac84ffc3b5d SHA512 b3c4127b204c99a8c350662c5dfa09ad2498d890723051458a5633a92aeec349c53a9665ee92b0f67f8d1d9eb168b5e6ca0f6a2158b152b2d1aed600cf3151a3
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/app-editors/gedit/files/3.32.2-fix-parallel-build.patch b/app-editors/gedit/files/3.32.2-fix-parallel-build.patch
deleted file mode 100644
index b3a52a0cdc9c..000000000000
--- a/app-editors/gedit/files/3.32.2-fix-parallel-build.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-From 79ff20c4123fb674b467f78b542f048f07516652 Mon Sep 17 00:00:00 2001
-From: Will Thompson <wjt@endlessm.com>
-Date: Wed, 17 Apr 2019 06:29:27 +0100
-Subject: [PATCH] filebrowser: fix build order for enum-types.h
-
-On Endless's package build server, building gedit on x86_64 failed as
-follows:
-
-    [  194s] [97/147] /usr/bin/meson --internal exe /usr/src/packages/BUILD/obj-x86_64-linux-gnu/meson-private/meson_exe_gedit-tool-merge.pl_cd41154a78cf16ac2c5a9a58261cb6418b36427a.dat
-    [  195s] [98/147] /usr/bin/msgfmt --desktop --keyword=Name --keyword=Description --template=../plugins/externaltools/externaltools.plugin.desktop.in -d /usr/src/packages/BUILD/po --output=plugins/externaltools/externaltools.plugin
-    [  195s] [99/147] /usr/bin/meson --internal exe /usr/src/packages/BUILD/obj-x86_64-linux-gnu/meson-private/meson_exe_glib-mkenums_ea0cb1ece8d7fa2e9a3e7c5a57f45df212823d0f.dat
-    [  195s] [100/147] cc -Iplugins/filebrowser/5f8d977@@filebrowser@sha -Iplugins/filebrowser -I../plugins/filebrowser -I. -I../ -Isubprojects/libgd -I../subprojects/libgd -Iplugins/filebrowser/resources -Igedit -I/usr/include/glib-2.0 -I/usr/lib/x86_64-linux-gnu/glib-2.0/include -I/usr/include/libmount -I/usr/include/blkid -I/usr/include/uuid -I/usr/include/at-spi2-atk/2.0 -I/usr/include/at-spi-2.0 -I/usr/include/dbus-1.0 -I/usr/lib/x86_64-linux-gnu/dbus-1.0/include -I/usr/include/gtk-3.0 -I/usr/include/gio-unix-2.0 -I/usr/include/libdrm -I/usr/include/harfbuzz -I/usr/include/pango-1.0 -I/usr/include/fribidi -I/usr/include/atk-1.0 -I/usr/include/cairo -I/usr/include/pixman-1 -I/usr/include/freetype2 -I/usr/include/libpng16 -I/usr/include/gdk-pixbuf-2.0 -I/usr/include/gtksourceview-4 -I/usr/include/libxml2 -I/usr/include/libpeas-1.0 -I/usr/include/gobject-introspection-1.0 -fdiagnostics-color=always -pipe -D_FILE_OFFSET_BITS=64 -g -O2 -fdebug-prefix-map=/usr/src/packages/BUILD=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -fPIC -pthread -DLIBGD_TAGGED_ENTRY=1 -DHAVE_CONFIG_H  -MD -MQ 'plugins/filebrowser/5f8d977@@filebrowser@sha/gedit-file-browser-plugin.c.o' -MF 'plugins/filebrowser/5f8d977@@filebrowser@sha/gedit-file-browser-plugin.c.o.d' -o 'plugins/filebrowser/5f8d977@@filebrowser@sha/gedit-file-browser-plugin.c.o' -c ../plugins/filebrowser/gedit-file-browser-plugin.c
-    [  195s] FAILED: plugins/filebrowser/5f8d977@@filebrowser@sha/gedit-file-browser-plugin.c.o
-    [  195s] cc -Iplugins/filebrowser/5f8d977@@filebrowser@sha -Iplugins/filebrowser -I../plugins/filebrowser -I. -I../ -Isubprojects/libgd -I../subprojects/libgd -Iplugins/filebrowser/resources -Igedit -I/usr/include/glib-2.0 -I/usr/lib/x86_64-linux-gnu/glib-2.0/include -I/usr/include/libmount -I/usr/include/blkid -I/usr/include/uuid -I/usr/include/at-spi2-atk/2.0 -I/usr/include/at-spi-2.0 -I/usr/include/dbus-1.0 -I/usr/lib/x86_64-linux-gnu/dbus-1.0/include -I/usr/include/gtk-3.0 -I/usr/include/gio-unix-2.0 -I/usr/include/libdrm -I/usr/include/harfbuzz -I/usr/include/pango-1.0 -I/usr/include/fribidi -I/usr/include/atk-1.0 -I/usr/include/cairo -I/usr/include/pixman-1 -I/usr/include/freetype2 -I/usr/include/libpng16 -I/usr/include/gdk-pixbuf-2.0 -I/usr/include/gtksourceview-4 -I/usr/include/libxml2 -I/usr/include/libpeas-1.0 -I/usr/include/gobject-introspection-1.0 -fdiagnostics-color=always -pipe -D_FILE_OFFSET_BITS=64 -g -O2 -fdebug-prefix-map=/usr/src/packages/BUILD=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -fPIC -pthread -DLIBGD_TAGGED_ENTRY=1 -DHAVE_CONFIG_H  -MD -MQ 'plugins/filebrowser/5f8d977@@filebrowser@sha/gedit-file-browser-plugin.c.o' -MF 'plugins/filebrowser/5f8d977@@filebrowser@sha/gedit-file-browser-plugin.c.o.d' -o 'plugins/filebrowser/5f8d977@@filebrowser@sha/gedit-file-browser-plugin.c.o' -c ../plugins/filebrowser/gedit-file-browser-plugin.c
-    [  195s] ../plugins/filebrowser/gedit-file-browser-plugin.c:35:10: fatal error: gedit-file-browser-enum-types.h: No such file or directory
-    [  195s]  #include "gedit-file-browser-enum-types.h"
-    [  195s]           ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-    [  195s] compilation terminated.
-
-I couldn't reproduce this locally, perhaps because I have the wrong number
-of cores. However, exploring the build graph with:
-
-    ninja -t browse plugins/filebrowser/5f8d977@@filebrowser@sha/libfilebrowser.so.symbols
-
-showed that there was no dependency between
-gedit-file-browser-plugin.c.o and gedit-file-browser-enum-types.h.
-Adding the generated gedit-file-browser-enum-types.h to the sources for
-this shared_library() causes an (order-only) dependency to be added,
-ensuring that gedit-file-browser-enum-types.h is generated before
-gedit-file-browser-plugin.c is compiled.
----
- plugins/filebrowser/meson.build | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/plugins/filebrowser/meson.build b/plugins/filebrowser/meson.build
-index 708f7f1d4..94a4ab0a6 100644
---- a/plugins/filebrowser/meson.build
-+++ b/plugins/filebrowser/meson.build
-@@ -59,6 +59,7 @@ libfilebrowser_enums_c = custom_target('libfilebrowser_enums_c',
- 
- libfilebrowser_sources += [
-   libfilebrowser_enums_c,
-+  libfilebrowser_type_enums.get(1),
- ]
- 
- subdir('resources')
--- 
-2.20.1
-
diff --git a/app-editors/gedit/gedit-3.32.2-r1.ebuild b/app-editors/gedit/gedit-3.32.2-r1.ebuild
deleted file mode 100644
index 1a70aeb7e31a..000000000000
--- a/app-editors/gedit/gedit-3.32.2-r1.ebuild
+++ /dev/null
@@ -1,102 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{6,7,8} )
-VALA_MIN_API_VERSION="0.26"
-VALA_USE_DEPEND="vapigen"
-
-inherit gnome.org gnome2-utils meson python-single-r1 vala xdg
-
-DESCRIPTION="A text editor for the GNOME desktop"
-HOMEPAGE="https://wiki.gnome.org/Apps/Gedit"
-
-LICENSE="GPL-2+ CC-BY-SA-3.0"
-SLOT="0"
-
-IUSE="+introspection +python gtk-doc spell vala"
-REQUIRED_USE="python? ( introspection ${PYTHON_REQUIRED_USE} ) spell? ( python )"
-
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
-
-# X libs are not needed for OSX (aqua)
-DEPEND="
-	>=dev-libs/glib-2.44:2
-	>=x11-libs/gtk+-3.22.0:3[introspection?]
-	>=x11-libs/gtksourceview-4.0.2:4[introspection?]
-	>=dev-libs/libpeas-1.14.1[gtk]
-	>=dev-libs/libxml2-2.5.0:2
-	>=net-libs/libsoup-2.60:2.4
-	x11-libs/libX11
-
-	spell? ( >=app-text/gspell-0.2.5:0= )
-	introspection? ( >=dev-libs/gobject-introspection-1.54:= )
-	python? (
-		${PYTHON_DEPS}
-		$(python_gen_cond_dep '
-			dev-python/pycairo[${PYTHON_MULTI_USEDEP}]
-			>=dev-python/pygobject-3:3[cairo,${PYTHON_MULTI_USEDEP}]
-			dev-libs/libpeas[python,${PYTHON_SINGLE_USEDEP}]
-		')
-	)
-"
-RDEPEND="${DEPEND}
-	x11-themes/adwaita-icon-theme
-	gnome-base/gsettings-desktop-schemas
-	gnome-base/gvfs
-"
-BDEPEND="
-	${vala_depend}
-	app-text/docbook-xml-dtd:4.1.2
-	dev-util/glib-utils
-	gtk-doc? ( >=dev-util/gtk-doc-1 )
-	dev-util/itstool
-	>=sys-devel/gettext-0.18
-	virtual/pkgconfig
-"
-PATCHES=(
-	"${FILESDIR}"/${PV}-make-spell-optional.patch
-	"${FILESDIR}"/${PV}-fix-parallel-build.patch # parallel build failure fix, included in 3.34
-)
-
-pkg_setup() {
-	use python && python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	use vala && vala_src_prepare
-	xdg_src_prepare
-}
-
-src_configure() {
-	local emesonargs=(
-		$(meson_use introspection)
-		$(meson_use vala vapi)
-		$(meson_use python plugins)
-		$(meson_use gtk-doc documentation)
-		-Denable-gvfs-metadata=yes
-		$(meson_use spell)
-	)
-	meson_src_configure
-}
-
-# Only appdata and desktop file validation in v3.32.2
-src_test() { :; }
-
-src_install() {
-	meson_src_install
-	if use python; then
-		python_optimize
-		python_optimize "${ED}/usr/$(get_libdir)/gedit/plugins/"
-	fi
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-	gnome2_schemas_update
-}
-
-pkg_postrm() {
-	xdg_pkg_postrm
-	gnome2_schemas_update
-}
diff --git a/app-editors/gedit/gedit-3.34.1.ebuild b/app-editors/gedit/gedit-3.34.1.ebuild
index bfc2b463f7dc..751718b3cf62 100644
--- a/app-editors/gedit/gedit-3.34.1.ebuild
+++ b/app-editors/gedit/gedit-3.34.1.ebuild
@@ -17,7 +17,7 @@ SLOT="0"
 IUSE="+introspection +python gtk-doc spell vala"
 REQUIRED_USE="python? ( introspection ${PYTHON_REQUIRED_USE} ) spell? ( python )"
 
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
 
 # X libs are not needed for OSX (aqua)
 DEPEND="