gentoo resync : 13.06.2020

4 files changed, 0 insertions, 146 deletions

diff --git a/mail-client/evolution/Manifest b/mail-client/evolution/Manifest
index 22935eef2a93..dd59909e3ab6 100644
--- a/mail-client/evolution/Manifest
+++ b/mail-client/evolution/Manifest
@@ -1,6 +1,3 @@
-AUX 3.32.4-gtk-doc-fix1.patch 4057 BLAKE2B 7ca0773467fa13e540e18b18f7c5ee883c1d163fb0b1a814408f23a6aee24a644672d999912ec44065e331a1b2f1327f0607dbbc3ca99ae6a925b8dc90f2527d SHA512 230d6ab323ce1599f16f95b7297bbad4e46507398ffae72d785ed095d213026cd98ab9e485fbd8f5a59246352d08fe54213cca4131739e79b72081e1e2c5cdaa
-AUX 3.32.4-gtk-doc-fix2.patch 1051 BLAKE2B c93cda6a5e60dd89beae2ee2d710ef1392c3c99265fe59a4b99dd873875aa93933fac513d4ed2717665a53d747578d94f475b58bb7f61351f637515d9e86249b SHA512 c77607534d7b262044658ccaf88a6281c294561ec9e84a78c6dc79385bd14fb7beda33a175fadb8804be3eadf3ddb3e72055728b6e978f68a5e6ce05643379bd
-AUX 3.32.5-webkitgtk-2.26-compat.patch 894 BLAKE2B a6aef35795eb50d30becc3436d8427deed92ef367c9021ea9094a058d2e186fd43b9505e2844771af005c0ef924fa3d0fa6e3f6e021353adf7c6233c1aa16305 SHA512 2b6eae26e85e5c7aaf2410395d50f86473e1d866cce68a81e8cf1dbb70fe80d4f8b4c19acf2be8bca51e53c4972abb8cd4e0d449e5da92d80b50248551dc0016
 AUX 3.34.4-CVE-2020-11879.patch 4256 BLAKE2B efe57b53f04908ed5ff83da42a759428b68cef0ceeeee158cdc9792e4af9f31654621742db3ae5a15f30ba68409cfbe775d09d7893cc9dbac0328b5c092f3695 SHA512 7484974c557eb084055b80f45f03d0d7f40084bdaf53cd90dd1f62efea250801eb99f6a35befd9e19c3c44e0b2d1ddc0db299d3063ca2045b7421bfcbba27c76
 DIST evolution-3.34.4.tar.xz 11964640 BLAKE2B 48b58208064633236be32f44ff49f8718e110d1ab1aa311b3652affb3b5793b9f6775519191a9480efef731c9f14ff269d65dacbd8d411b30be64daaf953c4b5 SHA512 54ff4b191237b291e3e008ca8691624ac0af35bae096c20615ac5a51be033c97ea28be6629362a3676bee9285afab666c4624cfcca536bf5255ecd38dcf3ac58
 DIST evolution-3.36.2.tar.xz 12027568 BLAKE2B 3bf2eca4a26e16b34567b4a976ccaa0d3138e3a7ba1a0c9652c3e642dd7e332e4a9994b9e5ae6ce3ed137eb85ac396c83b3bb84fdd99129fe4537a391ad268ff SHA512 2dccf69d32c4381f40ccdf84b621b8241c22bdb992cb77a87ce2e62e3598c436e7d0f8b72ce4fe504399c04a38266b0b0c2abf04000267a16c242d2dec7b9e9c
diff --git a/mail-client/evolution/files/3.32.4-gtk-doc-fix1.patch b/mail-client/evolution/files/3.32.4-gtk-doc-fix1.patch
deleted file mode 100644
index 54a5fc714def..000000000000
--- a/mail-client/evolution/files/3.32.4-gtk-doc-fix1.patch
+++ /dev/null
@@ -1,88 +0,0 @@
-From 925070132ca90787ccfe9a993c3eb7e0feb74fa7 Mon Sep 17 00:00:00 2001
-From: Ting-Wei Lan <lantw@src.gnome.org>
-Date: Mon, 22 Jul 2019 16:06:21 +0800
-Subject: [PATCH] M!28 - Include LDFLAGS in gtkdoc-scangobj command line
-
-When a library provides no way to find linker flags for linking with it,
-the build system usually depends on the user to necessary put -L flags
-in LDFLAGS environment variable in order to find it. However, GtkDoc
-module constructs the command line by itself, and it forgets to add
-LDFLAGS to the command line of gtkdoc-scangobj.
-
-It is especially important to include LDFLAGS on non-GNU systems. For
-example, FreeBSD libc doesn't include a gettext implementation. GLib
-requires gettext, and it pulls in an external gettext runtime for it.
-However, gettext-runtime doesn't include a .pc file, so LDFLAGS is
-required if gettext-runtime isn't installed in the same prefix as GLib.
-Failing to include LDFLAGS in --ldflags passed to gtkdoc-scangobj can
-result in a linking error because -lintl cannot be found.
-
-In evolution-data-server we are lucky most of the time because it
-depends on a lot of external libraries. These external libraries are
-likely to be installed in the same prefix as gettext-runtime, so not
-using LDFLAGS doesn't cause linking failure because required flags are
-already pulled in by other libraries. In fact, this problem was found
-when building libical, which uses a similar GtkDoc.cmake file.
-
-In addition to the change to include LDFLAGS, this commit also changes
-the following things:
-
- - Instead of constructing _scangobj_ldflags in reverse order, do it in
-   normal order. Appending is easier to understand than prepending, and
-   the linker also interprets -L and -l flags in normal order.
-
- - Move -L${LIB_INSTALL_DIR} to the bottom. This is what the comment
-   says, and it is expected to work because we no longer constructs
-   _scangobj_ldflags in reverse order.
-
-Closes https://gitlab.gnome.org/GNOME/evolution-data-server/merge_requests/28
----
- cmake/modules/GtkDoc.cmake | 11 ++++++++---
- 1 file changed, 8 insertions(+), 3 deletions(-)
-
-diff --git a/cmake/modules/GtkDoc.cmake b/cmake/modules/GtkDoc.cmake
-index cc6cc007a..0ba1a7a78 100644
---- a/cmake/modules/GtkDoc.cmake
-+++ b/cmake/modules/GtkDoc.cmake
-@@ -96,9 +96,8 @@ macro(add_gtkdoc _module _namespace _deprecated_guards _srcdirsvar _depsvar _ign
- 		list(APPEND _scangobj_deps ${opt})
- 	endforeach(opt)
- 
--	# Add them as the last, thus in-tree headers/libs have precedence
-+	# Add it as the last, thus in-tree headers have precedence
- 	list(APPEND _scangobj_cflags_list -I${INCLUDE_INSTALL_DIR})
--	list(APPEND _scangobj_ldflags -L${LIB_INSTALL_DIR})
- 
- 	if(_scangobj_deps)
- 		list(REMOVE_DUPLICATES _scangobj_deps)
-@@ -122,7 +121,7 @@ macro(add_gtkdoc _module _namespace _deprecated_guards _srcdirsvar _depsvar _ign
- 				if(NOT _output_name)
- 					set(_output_name ${opt})
- 				endif(NOT _output_name)
--				set(_scangobj_ldflags "-L$<TARGET_FILE_DIR:${opt}> -l${_output_name} ${_scangobj_ldflags}")
-+				set(_scangobj_ldflags "${_scangobj_ldflags} -L$<TARGET_FILE_DIR:${opt}> -l${_output_name}")
- 
- 				if(_target_type STREQUAL "SHARED_LIBRARY" OR (_target_type STREQUAL "MODULE_LIBRARY"))
- 					set(_scangobj_ld_lib_dirs "${_scangobj_ld_lib_dirs}:$<TARGET_FILE_DIR:${opt}>")
-@@ -133,12 +132,18 @@ macro(add_gtkdoc _module _namespace _deprecated_guards _srcdirsvar _depsvar _ign
- 		endif(TARGET ${opt})
- 	endforeach(opt)
- 
-+	# Add extra flags from LDFLAGS environment variable
-+	set(_scangobj_ldflags "${_scangobj_ldflags} ${CMAKE_SHARED_LINKER_FLAGS}")
-+
- 	foreach(opt IN LISTS _scangobj_deps)
- 		if(NOT TARGET ${opt})
- 			set(_scangobj_ldflags "${_scangobj_ldflags} ${opt}")
- 		endif(NOT TARGET ${opt})
- 	endforeach(opt)
- 
-+	# Add it as the last, thus in-tree libs have precedence
-+	set(_scangobj_ldflags "${_scangobj_ldflags} -L${LIB_INSTALL_DIR}")
-+
- 	set(_scangobj_prefix ${CMAKE_COMMAND} -E env LD_LIBRARY_PATH="${_scangobj_ld_lib_dirs}:${LIB_INSTALL_DIR}:$ENV{LD_LIBRARY_PATH}")
- 
- 	if(NOT (_scangobj_cflags STREQUAL ""))
--- 
-2.20.1
-
diff --git a/mail-client/evolution/files/3.32.4-gtk-doc-fix2.patch b/mail-client/evolution/files/3.32.4-gtk-doc-fix2.patch
deleted file mode 100644
index 56e66eae8938..000000000000
--- a/mail-client/evolution/files/3.32.4-gtk-doc-fix2.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From 78dc64008f1312a97eaa56b5c12f93a2bfa3b096 Mon Sep 17 00:00:00 2001
-From: Milan Crha <mcrha@redhat.com>
-Date: Mon, 5 Aug 2019 12:55:23 +0200
-Subject: [PATCH] Include also CFLAGS in gtkdoc-scangobj command line
-
-The LDFLAGS could imply certain compile options being used (like -fPIC),
-but these CFLAGS were not passed to gtkdoc-scangobj, thus the compilation
-could fail.
-
-Related to https://gitlab.gnome.org/GNOME/evolution-data-server/merge_requests/28
----
- cmake/modules/GtkDoc.cmake | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/cmake/modules/GtkDoc.cmake b/cmake/modules/GtkDoc.cmake
-index 0ba1a7a78..2dfc4d691 100644
---- a/cmake/modules/GtkDoc.cmake
-+++ b/cmake/modules/GtkDoc.cmake
-@@ -98,6 +98,7 @@ macro(add_gtkdoc _module _namespace _deprecated_guards _srcdirsvar _depsvar _ign
- 
- 	# Add it as the last, thus in-tree headers have precedence
- 	list(APPEND _scangobj_cflags_list -I${INCLUDE_INSTALL_DIR})
-+	list(APPEND _scangobj_cflags_list ${CMAKE_C_FLAGS})
- 
- 	if(_scangobj_deps)
- 		list(REMOVE_DUPLICATES _scangobj_deps)
--- 
-2.20.1
-
diff --git a/mail-client/evolution/files/3.32.5-webkitgtk-2.26-compat.patch b/mail-client/evolution/files/3.32.5-webkitgtk-2.26-compat.patch
deleted file mode 100644
index 192f4d0d3d8c..000000000000
--- a/mail-client/evolution/files/3.32.5-webkitgtk-2.26-compat.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From 66aeb5aeb4065f6a5482d10bacbe370de2e49b7f Mon Sep 17 00:00:00 2001
-From: Mart Raudsepp <leio@gentoo.org>
-Date: Sun, 29 Dec 2019 15:47:32 +0200
-Subject: [PATCH] Add env var workaround for WebKitGTK-2.26 compatibility
-
----
- src/shell/main.c | 3 +++
- 1 file changed, 3 insertions(+)
-
-diff --git a/src/shell/main.c b/src/shell/main.c
-index abc140d55f..cd671fd89a 100644
---- a/src/shell/main.c
-+++ b/src/shell/main.c
-@@ -607,6 +607,9 @@ main (gint argc,
- 		 * it already set, thus he/she can override the Evolution's default. */
- 		g_setenv ("WEBKIT_DISABLE_COMPOSITING_MODE", "1", FALSE);
- 
-+		/* Workaround issues with WebKitGTK 2.26 */
-+		g_setenv ("WEBKIT_USE_SINGLE_WEB_PROCESS", "1", FALSE);
-+
- 		/* FIXME WK2 - Look if we still need this it looks like it's not. */
- 		/* Workaround https://bugzilla.gnome.org/show_bug.cgi?id=683548 */
- 		g_type_ensure (WEBKIT_TYPE_WEB_VIEW);
--- 
-2.20.1
-