gentoo resync : 13.06.2020

9 files changed, 219 insertions, 4 deletions

diff --git a/xfce-base/Manifest.gz b/xfce-base/Manifest.gz
index 5d500f6a26ed..a988d085e87f 100644
--- a/xfce-base/Manifest.gz
+++ b/xfce-base/Manifest.gz
diff --git a/xfce-base/exo/Manifest b/xfce-base/exo/Manifest
index 3489ff00f645..ae82657cefda 100644
--- a/xfce-base/exo/Manifest
+++ b/xfce-base/exo/Manifest
@@ -1,5 +1,6 @@
+AUX exo-4.15.1-parallel-make.patch 1743 BLAKE2B 046512817d76698e2929b3a0f625eed486f07e3a46e161d9bcf7bfe0afa3d0f8cc083b955753281eba1c66d3b8c48cb39e3885173a2bb167b4190e48f53c04cd SHA512 1099b23a92904ca4a8df68c5d3f97fb877db9a50fe9bed4fe8951ac2ff7c7db4ea4326afea265e7c41796e01f3ec2b5ff4ec964dffac633cd1f42012e409f17f
 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
-EBUILD exo-4.15.1.ebuild 913 BLAKE2B 57b45cdb446893b1ad585cc913ce9a83d2f4b42b43d25453a55bef69b26fe39543dbb977dee559055689daa48d66ae8f3aeb57089e05c7b6d1e30496bc3be43f SHA512 0c3bb0944a147e3ffb906e8b696af17e83f15222ee3fb71289cad565591d00d9c2899598491093220a714cb92c39b6fbedf64b3d33eed4fb201086603eccf91d
+EBUILD exo-4.15.1.ebuild 972 BLAKE2B babdb727d906288d66f8b0f9cfd77f2a4cbebf578360e8c892c469d011f7ef587159a3282df9114d8b250dea09c6ea02d84375b86e7f3a05b4b31224f38d1d9d SHA512 4962d6d382b26ca8fe10477a4c34daec7d206f3ac1aeb2ba80e3b87fdbce9193f5b53057ee9710deaa51924bb0d772c49d32c092f550fc20eb4f31dd94c202fe
 MISC metadata.xml 334 BLAKE2B 0d61ecd7415a1a60ea5f53fdc29fae2ebf9c286822bd7ee5c10629fae5da0102687c3b07fdd5f81b123aa79e5d04905da705177402c491aad574dccc4e6d18ce SHA512 158e0c248e2d8f235fdb105f2342d0a3c4ca3f15b8938a73bfbc1da823d573a178857433e68a7b36cccc7449ba29cfb3fd4c3856b02c231bd5736d9f5932b6d7
diff --git a/xfce-base/exo/exo-4.15.1.ebuild b/xfce-base/exo/exo-4.15.1.ebuild
index 5089b190c4c8..1f9eb2e523e7 100644
--- a/xfce-base/exo/exo-4.15.1.ebuild
+++ b/xfce-base/exo/exo-4.15.1.ebuild
@@ -25,6 +25,10 @@ DEPEND="${RDEPEND}
 	sys-devel/gettext
 	virtual/pkgconfig"
 
+PATCHES=(
+	"${FILESDIR}"/exo-4.15.1-parallel-make.patch
+)
+
 src_install() {
 	default
 	find "${D}" -name '*.la' -delete || die
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
new file mode 100644
index 000000000000..f18159442fea
--- /dev/null
+++ b/xfce-base/exo/files/exo-4.15.1-parallel-make.patch
@@ -0,0 +1,66 @@
+From d3f3232eb53a052711029d2fafc36e23da971b35 Mon Sep 17 00:00:00 2001
+From: Romain Bouvier <skunnyk@alteroot.org>
+Date: Fri, 29 May 2020 11:11:41 +0200
+Subject: [PATCH] exo-29: Fix race condition in make install
+
+- Since the exo drop of gtk2, HEADERS are declared twice, which can lead
+  to race conditions when using parallel make "make -j4 install"
+- Simplify Makefile to only have one HEADERS section
+- This fix #29
+---
+ exo/Makefile.am | 24 ++++--------------------
+ 1 file changed, 4 insertions(+), 20 deletions(-)
+
+diff --git a/exo/Makefile.am b/exo/Makefile.am
+index fc8845d4..358ae9cb 100644
+--- a/exo/Makefile.am
++++ b/exo/Makefile.am
+@@ -23,30 +23,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
+-
+-
+-##
+-## GTK+ 3 support library
+-##
+-
+ libexo_2_includedir = $(includedir)/exo-2/exo
+ 
+ lib_LTLIBRARIES = libexo-2.la
+@@ -141,10 +125,10 @@ CLEANFILES =								\
+ DISTCLEANFILES =							\
+ 	stamp-exo-enum-types.h						\
+ 	stamp-exo-marshal.h						\
+-	$(libexo_built_sources)
++	$(libexo_2_built_sources)
+ 
+ BUILT_SOURCES =								\
+-	$(libexo_built_sources)
++	$(libexo_2_built_sources)
+ 
+ exo-alias.h: make-exo-alias.pl exo.symbols
+ 	$(AM_V_GEN) $(PERL) $(srcdir)/make-exo-alias.pl < $(srcdir)/exo.symbols > exo-alias.h
+-- 
+2.26.2
+
diff --git a/xfce-base/libxfce4ui/Manifest b/xfce-base/libxfce4ui/Manifest
index 71f47383a961..5957a58bc769 100644
--- a/xfce-base/libxfce4ui/Manifest
+++ b/xfce-base/libxfce4ui/Manifest
@@ -1,5 +1,7 @@
 DIST libxfce4ui-4.14.1.tar.bz2 756175 BLAKE2B d487cc0a04b6053ead6670eeb83cafe1c4098818d5ad6a94a81176720d78cfd65160156961cbb526baa1640ae66a5c6958f707b7078c412d81fcd24cc8cf4013 SHA512 f42f41da3a683a0c56c3b1e7ba420c4f50909d2613e681d053b09b50bc0eb7f750f44c892e94b0ee8b9207983a87c0cadbda1ad93d0df74ae351dc8812025407
 DIST libxfce4ui-4.15.2.tar.bz2 740189 BLAKE2B 77263318afe376a9b50f129c6969fcb540685bb151f78a94f0024e27871cd8fb895d3edc41483ff8f3b8c8c28d24142252155c6ca68b614375c1fc93f08fdb45 SHA512 1ac2dea2200f00846bc5b5f86d02292f345dc904a121df86a662ca1844b1bdd9eea6bf0cd88dda97ff84e30d990b065bd9597cb563dbb75f639e820d41f83dbc
+DIST libxfce4ui-4.15.3.tar.bz2 756530 BLAKE2B ca2a9d5aae80d22a97b2fe932248756c9f34f71a13342670cdc0ad1c5393eb62d4f5bed8b21a45a60c762a83ebf1458deb7ef629c4dd3c894468ecf16a821dcf SHA512 a0e5a60c54df811fa2815238f9fe506700f6df8a6baa8172a6f8c68f005b54ba94ee31aba87d635fb506700da9c77e25f8c57268018fc8cfa5577f29aab58a6b
 EBUILD libxfce4ui-4.14.1.ebuild 1704 BLAKE2B 83defd465a237ed31b648de09e2f657c3510d3dec1b52a217b4795be00e6206aa7b14f7b073c16cfe0def3155eb577e0a3b0985bc5a582ab6d0f9c264b47c408 SHA512 69d4fb24cc2a9b56e0fa2bc5d4d754cf8e02be58095a96fa0b459c84a8939b36adbd157c1debd42f116f77f484839d518d561d1218c4d1a0acb2c806c3c471cc
 EBUILD libxfce4ui-4.15.2.ebuild 1565 BLAKE2B ee74c6a252293de607b8a79cfe7688cd59a08a7f6eabfd41242096d2116be8d91137190335944a0f3a21b02bd3020e158b76f21b13e0f3c7f8625db3375d482f SHA512 1dbe43388a3b95bfd70bdd04e8d8b5f5e2fd1717d3ee9fb285456cb35b7a441eb05d7ca1b8d544377133efc2ed30ad3372da65c5f10b36f5976afeba90a241af
+EBUILD libxfce4ui-4.15.3.ebuild 1565 BLAKE2B ee74c6a252293de607b8a79cfe7688cd59a08a7f6eabfd41242096d2116be8d91137190335944a0f3a21b02bd3020e158b76f21b13e0f3c7f8625db3375d482f SHA512 1dbe43388a3b95bfd70bdd04e8d8b5f5e2fd1717d3ee9fb285456cb35b7a441eb05d7ca1b8d544377133efc2ed30ad3372da65c5f10b36f5976afeba90a241af
 MISC metadata.xml 515 BLAKE2B b0ddce75f198a496e2d7f1f658091c1301190aadef8f5a9a65b43e4f1a3c2a915e14329bd512984e13a2189eafb56bf00b571e9c4668fa5026eef01bb718d92c SHA512 ab5ebbf64571d8b5b7c1be3c329fa641ddb7ed5447066d5a207dce7487605bf2f86c13dce27788a17b2262efeec2845d42bf2aa9ca7dc16778b7288b77d29886
diff --git a/xfce-base/libxfce4ui/libxfce4ui-4.15.3.ebuild b/xfce-base/libxfce4ui/libxfce4ui-4.15.3.ebuild
new file mode 100644
index 000000000000..cddd13c8d5ef
--- /dev/null
+++ b/xfce-base/libxfce4ui/libxfce4ui-4.15.3.ebuild
@@ -0,0 +1,67 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit xdg-utils vala
+
+DESCRIPTION="Unified widget and session management libs for Xfce"
+HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage"
+SRC_URI="https://archive.xfce.org/src/xfce/${PN}/${PV%.*}/${P}.tar.bz2"
+
+LICENSE="LGPL-2+ GPL-2+"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-solaris"
+IUSE="debug glade introspection libgtop startup-notification vala"
+REQUIRED_USE="vala? ( introspection )"
+
+RDEPEND=">=dev-libs/glib-2.42:2
+	>=x11-libs/gtk+-3.22:3[introspection?]
+	x11-libs/libX11
+	x11-libs/libICE
+	x11-libs/libSM
+	>=xfce-base/libxfce4util-4.12:=[introspection?]
+	>=xfce-base/xfconf-4.12:=
+	glade? ( dev-util/glade:3.10 )
+	introspection? ( dev-libs/gobject-introspection:= )
+	libgtop? ( gnome-base/libgtop )
+	startup-notification? ( x11-libs/startup-notification )"
+DEPEND="${RDEPEND}"
+BDEPEND="dev-lang/perl
+	dev-util/intltool
+	sys-devel/gettext
+	virtual/pkgconfig
+	vala? ( $(vala_depend) )"
+
+src_prepare() {
+	# stupid vala.eclass...
+	default
+}
+
+src_configure() {
+	local myconf=(
+		$(use_enable introspection)
+		$(use_enable libgtop glibtop)
+		$(use_enable startup-notification)
+		$(use_enable vala)
+		$(use_enable glade gladeui2)
+		--with-vendor-info=Gentoo
+	)
+
+	use vala && vala_src_prepare
+	econf "${myconf[@]}"
+}
+
+src_install() {
+	default
+
+	find "${D}" -name '*.la' -delete || die
+}
+
+pkg_postinst() {
+	xdg_icon_cache_update
+}
+
+pkg_postrm() {
+	xdg_icon_cache_update
+}
diff --git a/xfce-base/xfce4-settings/Manifest b/xfce-base/xfce4-settings/Manifest
index a6b02ffe7de0..34c44f2c56f9 100644
--- a/xfce-base/xfce4-settings/Manifest
+++ b/xfce-base/xfce4-settings/Manifest
@@ -1,3 +1,4 @@
+AUX xfce4-settings-4.15.1-install-icons.patch 2160 BLAKE2B 35c3e66101d33e8213dd848194d9d5fa3cbb424b466f2538e5109329064b37d7130c4cc4b4cfd7f65ba023f68d9547d752903be5610925f543d0967a82ccb417 SHA512 e2a5120a65636cc30c381e2065f1322b94cab25bd42a6d79da321328c79cd801919c6e5de0cc11422a461d5f57c2b1a9a4cb9b225ceb4751b9fdd9dc6f816910
 DIST xfce4-settings-4.14.2.tar.bz2 1194714 BLAKE2B ffcc17ca5c39837d8d60c3b5916cf6643218316e6f7a67f3d88c949ff814e98e1a7f46ccd4c9c1280e1fdade91f7c244e80080031b9b05060afa5546720ea03e SHA512 5882e96504e2ad869504e7c8e6e62d1d04f61beef524ba85a3ed962ca689d6e72a4ed717173f9e2645c078c2c8757caed1f3395dd185a3b0b5dc8b27a1a3d2d1
 DIST xfce4-settings-4.14.3.tar.bz2 1201308 BLAKE2B daf20e5adda24f3c1ecc88506c1a1cd03b33b379bafc236ed3b99404b816803288041de7d507072a311c3966bb0e040986e358ea94d01636c56ea31c1b843c8d SHA512 fcc5bfa98d8903dc3ac51ec909e542485a44f6c11ddca815508c2ed913410a0becd54b2db6761ee48f5a20d6ca08377eeefbb54bd0cb7cde0a0c0d4b65802ab5
 DIST xfce4-settings-4.15.0.tar.bz2 1199360 BLAKE2B add423dee8b5de6386aa5008c082d6266e0d4ffaf656ab960bca12798d03aedf6dcf98aae2200f4e855aec9749eaf69e4220c8f7d5ce5968edff469546afe614 SHA512 ef0d253ee5f79d57b62dc467223d23050fd21b99891fa7a3c8329d97261ba918a0f4b62a345916558685cae59bfee5da58b1e66a8a7f1b2219eb6cec2094fcbf
@@ -5,5 +6,5 @@ DIST xfce4-settings-4.15.1.tar.bz2 1366752 BLAKE2B 1f236d39529b7a403691bbc82e577
 EBUILD xfce4-settings-4.14.2.ebuild 1563 BLAKE2B 45a73d4ada2598eda4a41b52c695ea07ee0cd3f8aaa6649bcb7fe1a0279832157f17d00ed7406b9ed24ff91b4dc7c0f2bf80a5eaffc31e77b87960e097686459 SHA512 f1984880e7249b27ea37de135af9032460ec93ada9fce55287cfafa1d81abe72e6ab55fe970d7a2edc3af8abc266398ef1d4854992fa918af0eec36ea5e12167
 EBUILD xfce4-settings-4.14.3.ebuild 1568 BLAKE2B 89e50683bef0f0158cf193523e936542a4079796919e9e24dc91cd4f29553fe175f4f01d4e62e22bc2c6c640357d9d55cafce4e1a2cca1dc182865ed1007c791 SHA512 eff37b47e3d9703217309461b656ae0108048b01f5dc6204f59b8ca5af61737cda3888d08d83fa4b0f80d44e27cf04bb786229cd06dc58a24f6b6960ff52602b
 EBUILD xfce4-settings-4.15.0.ebuild 1580 BLAKE2B d56cfba06ba8a1401766ff19c9ae6aa65bf9875c6c2364e517ab7e7255513d0a512b7eb6580a74ad11fa12b3bbac9baf9f7801f6ca3c4f3e2b2bfad151215434 SHA512 80b78019bbcc522e9ee29ba7142b20eb9c5bb1c31ec73853bf4e6cac846781c76a30ef13c363244919bd1d38430ea9696018a6d98077ef725b84178560fd1862
-EBUILD xfce4-settings-4.15.1.ebuild 1606 BLAKE2B 8c83534af91b530ff48ee032383b4cc122a23e2f5881e2d2512beb1fd4ba81de9f7b0382ecd58fec3acd9d401a620c047770d857161fa8afab3a001d4a6a53a0 SHA512 2cce9d1be7c01967511782bf1e02417d5ce846d47c8775ef4a6a800a2f24535ab3a6fd4f5d66c7d38fb506b77321052d5e2c4334a15e0dee9478517ac71f6770
+EBUILD xfce4-settings-4.15.1-r1.ebuild 1668 BLAKE2B 6b40caa5e907176a14b25e13a0ea853455a932d778a7cce87740790c28376c7e61c216b2628cedd1f089454721e7ad9f526db3c48b3000b38c166bcc010f7f8c SHA512 b96dd6e215eaac651d4e2557673f63a59499a933ec354645abe25dbccac4b43846b4e1b62c74d5a7d54e8ed7ed26b3d909ca97fb53a163209a5fe9d595b798ee
 MISC metadata.xml 479 BLAKE2B d15c203e15371edc17aabffe86e690c03c7e853e78c74e0de5753f977dbb9d080813706e3d3170dffb952591abc70f0aea6ac96ce9ca24ca7dbb627beeb8ea1f SHA512 56e89d92ba3fc3c53a86855721394993d8ac930549f19389728e0f8d60de6e92eb3475aeb0e09ca8f43412ba5e86c59482e7488dd5d0cd357968fabc6b3227b9
diff --git a/xfce-base/xfce4-settings/files/xfce4-settings-4.15.1-install-icons.patch b/xfce-base/xfce4-settings/files/xfce4-settings-4.15.1-install-icons.patch
new file mode 100644
index 000000000000..2d84b8e7637d
--- /dev/null
+++ b/xfce-base/xfce4-settings/files/xfce4-settings-4.15.1-install-icons.patch
@@ -0,0 +1,70 @@
+# Upstream issue: https://gitlab.xfce.org/xfce/xfce4-settings/-/issues/176
+# This issue has been fixed in upstream master, so this patch won't be need in the future.
+
+--- ./Makefile.am	2020-05-27 02:54:17.000000000 +0200
++++ ./Makefile.am	2020-05-30 23:53:57.647209221 +0200
+@@ -6,15 +6,11 @@
+ 	xfce4-settings-manager \
+ 	xfce4-settings-editor \
+ 	xfsettingsd \
+-	po
+-
+-if HAVE_COLORD
+-SUBDIRS += \
++	po \
+ 	icons
+ 
+ distuninstallcheck_listfiles = 						\
+ 	find . -type f -print | grep -v ./share/icons/hicolor/icon-theme.cache
+-endif
+ 
+ EXTRA_DIST = \
+ 	intltool-extract.in \
+--- ./Makefile.in	2020-05-27 03:07:44.000000000 +0200
++++ ./Makefile.in	2020-05-30 23:54:08.477620446 +0200
+@@ -87,10 +87,6 @@
+ POST_UNINSTALL = :
+ build_triplet = @build@
+ host_triplet = @host@
+-@HAVE_COLORD_TRUE@am__append_1 = \
+-@HAVE_COLORD_TRUE@	icons
+-
+-distuninstallcheck_listfiles = find . -type f -print
+ subdir = .
+ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+ am__aclocal_m4_deps = $(top_srcdir)/configure.ac
+@@ -160,8 +156,7 @@
+ ETAGS = etags
+ CTAGS = ctags
+ CSCOPE = cscope
+-DIST_SUBDIRS = common dialogs xfce4-settings-manager \
+-	xfce4-settings-editor xfsettingsd po icons
++DIST_SUBDIRS = $(SUBDIRS)
+ am__DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/config.h.in AUTHORS \
+ 	COPYING ChangeLog INSTALL NEWS README TODO compile \
+ 	config.guess config.sub install-sh ltmain.sh missing
+@@ -463,10 +457,17 @@
+ top_builddir = @top_builddir@
+ top_srcdir = @top_srcdir@
+ ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS}
+-SUBDIRS = common dialogs xfce4-settings-manager xfce4-settings-editor \
+-	xfsettingsd po $(am__append_1)
+-@HAVE_COLORD_TRUE@distuninstallcheck_listfiles = \
+-@HAVE_COLORD_TRUE@	find . -type f -print | grep -v ./share/icons/hicolor/icon-theme.cache
++SUBDIRS = \
++	common \
++	dialogs \
++	xfce4-settings-manager \
++	xfce4-settings-editor \
++	xfsettingsd \
++	po \
++	icons
++
++distuninstallcheck_listfiles = \
++	find . -type f -print | grep -v ./share/icons/hicolor/icon-theme.cache
+ 
+ EXTRA_DIST = \
+ 	intltool-extract.in \
+ dist-tarZ: distdir
+ 	@echo WARNING: "Support for distribution archives compressed with" \
+ 		       "legacy program 'compress' is deprecated." >&2
diff --git a/xfce-base/xfce4-settings/xfce4-settings-4.15.1.ebuild b/xfce-base/xfce4-settings/xfce4-settings-4.15.1-r1.ebuild
index c2973c92f819..396625415b5d 100644
--- a/xfce-base/xfce4-settings/xfce4-settings-4.15.1.ebuild
+++ b/xfce-base/xfce4-settings/xfce4-settings-4.15.1-r1.ebuild
@@ -14,9 +14,9 @@ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~a
 IUSE="colord input_devices_libinput libcanberra libnotify upower +xklavier"
 
 RDEPEND="
-	>=dev-libs/glib-2.24
+	>=dev-libs/glib-2.45.8
 	media-libs/fontconfig
-	x11-libs/gtk+:3
+	>=x11-libs/gtk+-3.20:3
 	x11-libs/libX11
 	>=x11-libs/libXcursor-1.1
 	>=x11-libs/libXi-1.3
@@ -40,6 +40,10 @@ DEPEND="${RDEPEND}
 	sys-devel/gettext
 	x11-base/xorg-proto"
 
+PATCHES=(
+	"${FILESDIR}"/${P}-install-icons.patch
+)
+
 src_configure() {
 	local myconf=(
 		$(use_enable upower upower-glib)