gentoo resync : 29.06.2020

2 files changed, 154 insertions, 1 deletions

diff --git a/xfce-base/exo/Manifest b/xfce-base/exo/Manifest
index ae82657cefda..2f4b0189be73 100644
--- a/xfce-base/exo/Manifest
+++ b/xfce-base/exo/Manifest
@@ -1,4 +1,4 @@
-AUX exo-4.15.1-parallel-make.patch 1743 BLAKE2B 046512817d76698e2929b3a0f625eed486f07e3a46e161d9bcf7bfe0afa3d0f8cc083b955753281eba1c66d3b8c48cb39e3885173a2bb167b4190e48f53c04cd SHA512 1099b23a92904ca4a8df68c5d3f97fb877db9a50fe9bed4fe8951ac2ff7c7db4ea4326afea265e7c41796e01f3ec2b5ff4ec964dffac633cd1f42012e409f17f
+AUX exo-4.15.1-parallel-make.patch 7738 BLAKE2B 26aa0f1208bd8cd606990d9430d948a7333a9d2bc419f1e40d5fb1ddfac52efbb860e18e16f2c805af86f170849540311206336298bd113b8d21c661a81ff7cd SHA512 085828b15cba8aec7445b1a3c9e09552f03ed8467e0ce58e2a619cc799753984cff3da61946ad840cb5ad05e178f40ecee4f4bc86ca1ea31b3019bce6840f390
 DIST exo-0.12.11.tar.bz2 1333227 BLAKE2B 4e95809c58b6db26ecdf524663c06df9cd70007726091e381a1f0dd58be52efee85ad9721c421c0df6438073bb9de97d56cd039f520e2f7c0f5722a1839ba167 SHA512 ecbf20feddf86178d34a5c70212f0c2310ab1d6ce25291846d6d1d3045270ae3e68102065d7b3d8840137406f826f9bc37fed92a16c1268c3d14f2833a97d533
 DIST exo-4.15.1.tar.bz2 1049760 BLAKE2B 365a51a6be44b36290d1bbe7100bc4e9a164436b2111997c969bdcc2f46306c0532fa41bedc231c5640992910e44acc8d072f5c070fc8d56f02b561002985224 SHA512 46b60bfde133969a25e72a5a80644454b06543888e554e8473145486d1b1952c4e508f2303045f183c49b053969189f50316ce7d18a0be2c404daa691e26d276
 EBUILD exo-0.12.11.ebuild 1036 BLAKE2B 12fc8c5a693166a7672750259cf9b3061b24c104ad3aeaf234ce5fc3d189ca552502eefaf08b24836f1b4f8f356f181469c805929fa0fefdde652cf1c38218b2 SHA512 5e6486e6cabb66870995aa41337730f7dcc6f5dff787b2fb7eba254d11fa69ba1309fbfc7926fec4aba8f287c55f8d777210eb1fe523ceed42c9e1282184b733
diff --git a/xfce-base/exo/files/exo-4.15.1-parallel-make.patch b/xfce-base/exo/files/exo-4.15.1-parallel-make.patch
index f18159442fea..34bc669655c1 100644
--- a/xfce-base/exo/files/exo-4.15.1-parallel-make.patch
+++ b/xfce-base/exo/files/exo-4.15.1-parallel-make.patch
@@ -64,3 +64,156 @@ index fc8845d4..358ae9cb 100644
 -- 
 2.26.2
 
+diff --git a/exo/Makefile.in b/exo/Makefile.in
+index 56abe35..ee1be62 100644
+--- a/exo/Makefile.in
++++ b/exo/Makefile.in
+@@ -98,7 +98,7 @@ am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
+ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+ 	$(ACLOCAL_M4)
+ DIST_COMMON = $(srcdir)/Makefile.am $(libexo_2_include_HEADERS) \
+-	$(libexoinclude_HEADERS) $(am__DIST_COMMON)
++	$(am__DIST_COMMON)
+ mkinstalldirs = $(install_sh) -d
+ CONFIG_HEADER = $(top_builddir)/config.h
+ CONFIG_CLEAN_FILES = exo-2.pc exo-config.h
+@@ -131,8 +131,7 @@ am__uninstall_files_from_dir = { \
+          $(am__cd) "$$dir" && rm -f $$files; }; \
+   }
+ am__installdirs = "$(DESTDIR)$(libdir)" "$(DESTDIR)$(pkgconfigdir)" \
+-	"$(DESTDIR)$(libexo_2_includedir)" \
+-	"$(DESTDIR)$(libexoincludedir)"
++	"$(DESTDIR)$(libexo_2_includedir)"
+ LTLIBRARIES = $(lib_LTLIBRARIES)
+ am__DEPENDENCIES_1 =
+ libexo_2_la_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
+@@ -224,7 +223,7 @@ am__can_run_installinfo = \
+     *) (install-info --version) >/dev/null 2>&1;; \
+   esac
+ DATA = $(pkgconfig_DATA)
+-HEADERS = $(libexo_2_include_HEADERS) $(libexoinclude_HEADERS)
++HEADERS = $(libexo_2_include_HEADERS)
+ am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
+ # Read a list of newline-separated strings from the standard input,
+ # and print each of them once, without duplicates.  Input order is
+@@ -657,24 +656,14 @@ libexo_headers = \
+ 	exo-tree-view.h							\
+ 	exo-utils.h
+ 
+-libexo_built_public_sources = \
+-	exo-enum-types.h
+-
+-libexo_built_sources = \
+-	$(libexo_built_public_sources)					\
++libexo_2_built_sources = \
++	exo-enum-types.h \
+ 	exo-alias.h							\
+ 	exo-aliasdef.c							\
+ 	exo-enum-types.c						\
+ 	exo-marshal.c							\
+ 	exo-marshal.h
+ 
+-libexoincludedir = $(includedir)/exo-2/exo
+-libexoinclude_HEADERS = \
+-	$(libexo_built_public_sources)					\
+-	$(libexo_headers)						\
+-	exo.h								\
+-	exo-config.h
+-
+ libexo_2_includedir = $(includedir)/exo-2/exo
+ lib_LTLIBRARIES = libexo-2.la
+ libexo_2_include_HEADERS = \
+@@ -756,10 +745,10 @@ pkgconfig_DATA = exo-2.pc
+ @MAINTAINER_MODE_TRUE@DISTCLEANFILES = \
+ @MAINTAINER_MODE_TRUE@	stamp-exo-enum-types.h						\
+ @MAINTAINER_MODE_TRUE@	stamp-exo-marshal.h						\
+-@MAINTAINER_MODE_TRUE@	$(libexo_built_sources)
++@MAINTAINER_MODE_TRUE@	$(libexo_2_built_sources)
+ 
+ @MAINTAINER_MODE_TRUE@BUILT_SOURCES = \
+-@MAINTAINER_MODE_TRUE@	$(libexo_built_sources)
++@MAINTAINER_MODE_TRUE@	$(libexo_2_built_sources)
+ 
+ EXTRA_DIST = \
+ 	abicheck.sh							\
+@@ -1091,27 +1080,6 @@ uninstall-libexo_2_includeHEADERS:
+ 	@list='$(libexo_2_include_HEADERS)'; test -n "$(libexo_2_includedir)" || list=; \
+ 	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
+ 	dir='$(DESTDIR)$(libexo_2_includedir)'; $(am__uninstall_files_from_dir)
+-install-libexoincludeHEADERS: $(libexoinclude_HEADERS)
+-	@$(NORMAL_INSTALL)
+-	@list='$(libexoinclude_HEADERS)'; test -n "$(libexoincludedir)" || list=; \
+-	if test -n "$$list"; then \
+-	  echo " $(MKDIR_P) '$(DESTDIR)$(libexoincludedir)'"; \
+-	  $(MKDIR_P) "$(DESTDIR)$(libexoincludedir)" || exit 1; \
+-	fi; \
+-	for p in $$list; do \
+-	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+-	  echo "$$d$$p"; \
+-	done | $(am__base_list) | \
+-	while read files; do \
+-	  echo " $(INSTALL_HEADER) $$files '$(DESTDIR)$(libexoincludedir)'"; \
+-	  $(INSTALL_HEADER) $$files "$(DESTDIR)$(libexoincludedir)" || exit $$?; \
+-	done
+-
+-uninstall-libexoincludeHEADERS:
+-	@$(NORMAL_UNINSTALL)
+-	@list='$(libexoinclude_HEADERS)'; test -n "$(libexoincludedir)" || list=; \
+-	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
+-	dir='$(DESTDIR)$(libexoincludedir)'; $(am__uninstall_files_from_dir)
+ 
+ ID: $(am__tagged_files)
+ 	$(am__define_uniq_tagged_files); mkid -fID $$unique
+@@ -1370,7 +1338,7 @@ check: $(BUILT_SOURCES)
+ 	$(MAKE) $(AM_MAKEFLAGS) check-am
+ all-am: Makefile $(LTLIBRARIES) $(DATA) $(HEADERS)
+ installdirs:
+-	for dir in "$(DESTDIR)$(libdir)" "$(DESTDIR)$(pkgconfigdir)" "$(DESTDIR)$(libexo_2_includedir)" "$(DESTDIR)$(libexoincludedir)"; do \
++	for dir in "$(DESTDIR)$(libdir)" "$(DESTDIR)$(pkgconfigdir)" "$(DESTDIR)$(libexo_2_includedir)"; do \
+ 	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
+ 	done
+ install: $(BUILT_SOURCES)
+@@ -1452,8 +1420,7 @@ info: info-am
+ 
+ info-am:
+ 
+-install-data-am: install-libexo_2_includeHEADERS \
+-	install-libexoincludeHEADERS install-pkgconfigDATA
++install-data-am: install-libexo_2_includeHEADERS install-pkgconfigDATA
+ 
+ install-dvi: install-dvi-am
+ 
+@@ -1519,8 +1486,7 @@ ps: ps-am
+ ps-am:
+ 
+ uninstall-am: uninstall-libLTLIBRARIES \
+-	uninstall-libexo_2_includeHEADERS \
+-	uninstall-libexoincludeHEADERS uninstall-pkgconfigDATA
++	uninstall-libexo_2_includeHEADERS uninstall-pkgconfigDATA
+ 
+ .MAKE: all check check-am install install-am install-strip
+ 
+@@ -1533,15 +1499,14 @@ uninstall-am: uninstall-libLTLIBRARIES \
+ 	install-dvi-am install-exec install-exec-am install-html \
+ 	install-html-am install-info install-info-am \
+ 	install-libLTLIBRARIES install-libexo_2_includeHEADERS \
+-	install-libexoincludeHEADERS install-man install-pdf \
+-	install-pdf-am install-pkgconfigDATA install-ps install-ps-am \
+-	install-strip installcheck installcheck-am installdirs \
+-	maintainer-clean maintainer-clean-generic mostlyclean \
+-	mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
+-	pdf pdf-am ps ps-am recheck tags tags-am uninstall \
+-	uninstall-am uninstall-libLTLIBRARIES \
+-	uninstall-libexo_2_includeHEADERS \
+-	uninstall-libexoincludeHEADERS uninstall-pkgconfigDATA
++	install-man install-pdf install-pdf-am install-pkgconfigDATA \
++	install-ps install-ps-am install-strip installcheck \
++	installcheck-am installdirs maintainer-clean \
++	maintainer-clean-generic mostlyclean mostlyclean-compile \
++	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
++	recheck tags tags-am uninstall uninstall-am \
++	uninstall-libLTLIBRARIES uninstall-libexo_2_includeHEADERS \
++	uninstall-pkgconfigDATA
+ 
+ .PRECIOUS: Makefile
+