gentoo Easter resync : 12.04.2020

6 files changed, 189 insertions, 6 deletions

diff --git a/mate-extra/mate-utils/Manifest b/mate-extra/mate-utils/Manifest
index 7dde938f858e..2afcf02f2983 100644
--- a/mate-extra/mate-utils/Manifest
+++ b/mate-extra/mate-utils/Manifest
@@ -1,6 +1,11 @@
 AUX mate-utils-1.22.1-make-inkscape-optional.patch 8395 BLAKE2B 139854ae3e3c94aa561deef18d81ca18bc25cdcb6d4f1b27633cd2f120caf453dbc03b1c93acc54ba92120112687d30e8f5cef5d3b3e7821f8189083333500ab SHA512 7d8f3b8b0b9ee34d8c891dc996eb67907ce48964c3235eecaff32a74ad744a9cb7b2b12b347ce0102ab7eff34c1a85094b22adfbc8f7ea759ba83bbcab86f72a
+AUX mate-utils-1.22.2-gcc-10-fno-common.patch 1022 BLAKE2B 772c831ae0c4ed0c640d2d4302c08335b83b4e1bb0d88cb7e0bb84ac7709edc3bc28c7f81d59531b502610e6676e8cba37e10c7de1572e4530c27b58f40a4f37 SHA512 9c4252dc5fd68b0fff87c19ae46c02da634ea238537ab2fb3be7614726e289607ac85d551f5ad5f22e162cc7bfbb2ea1fc6be5523ccf44b5912e56ffea31e997
 DIST mate-utils-1.22.0.tar.xz 7300112 BLAKE2B 8a613b6dcb99e652ad6b44bd64ad9b2f9c809713b5fb904059b64234b51e2a06b2290dcf14d7dde82e8011be2ca395fe74d87bcae5b903b196d55bb50e8fdf07 SHA512 248c6e4108900768a4e8b272d20ac9b2d70e8bf77375f4669a099f4d8386c2e8affeafb772d209f00906f96f20d7ee347167ef4837186f44d8aaad85ef855f70
 DIST mate-utils-1.22.1.tar.xz 7284496 BLAKE2B 83e7e39a0daadae595ab2cc90ad250f61a294afc896df28bf17259cec619af4b0c9d1927c07b03a0cdd7449174af258227678299823169e2cb4d9c4d3ec98c92 SHA512 0f70f088de80440ff6954c899eab75c2bf22d332293c1ec61bf8391396ed31a2ab126279dc4d9dab6f4932225120309bc52e122bcd5a8dc17abccfd6e480390d
-EBUILD mate-utils-1.22.0.ebuild 1281 BLAKE2B 6464c91a19011aa475d0cccc7260f2ff631b527ae48c51430d7b193906eb15a9adbbf95a952943ed511b0681340e58f35a21737875f2744b462aeda17b619dc2 SHA512 45010ceb9051115810be8102fc6f6d118b27220668c5e53dd39c581fdf8feb2b401ff29edb14f16ffa10ea6f0e7c0453527be5433442ac21ce2c23714206bd1e
-EBUILD mate-utils-1.22.1-r1.ebuild 1372 BLAKE2B f5a6cb0b9efbf253e54fe3af02f0b8d1bf0244d58cb9a0ccdd9d8d86dd53f63d8a1b66688561630a3c1e6c27c41b28faf487a451f766251ce466b6b3e77b8cf1 SHA512 92b3f30436221bc8883725433749ba1280a9089ca04d6ae97d4a101d719378b9c3a6eab5be40adde58f20bb432149e349bfc3e3e70f572fb532cb4b04aece785
+DIST mate-utils-1.22.2.tar.xz 7306448 BLAKE2B 0fb28f85e39ac58c1e78e6f5f4c6d01e72a2b8c32197739b93ec3f17617b4676fdfe251b81e3b5b01c44f69136d9bfc8d12d64fff832d5a9f1c30591b2facebb SHA512 bf33019ebd1dc4ff6010ba0824981334b7065a62dfc7a73170487df5f165ad20831a900ef4e4e0641ca130aa618f82aa27606f0a48c2cb9907ea7ef118f02a60
+DIST mate-utils-1.24.0.tar.xz 7930068 BLAKE2B 0e2c82afbc2d8a90b8c31d56d9bfbb3a477b1e9cd67108e52c96f4087d09336ed9e6980551e39b43797743b9ef86cc2beabfa84fd7a5820e38122e0d0a7c968d SHA512 d8945c85936a55d22f3ed94c9858ba84cadf552a63cdd2d9eec9120111ad71526ac88772f8e4b7a6a460b691574534e52706fba35a0395b1d894b27eece9e92c
+EBUILD mate-utils-1.22.0.ebuild 1306 BLAKE2B f19e55915234d9aee662a2200db160fae980e11db87d0f0e583036c08d51973cb01133a83214606d0ee236e9b07583a6ab792db2f31424bf924893d7514f913c SHA512 a5bf9bd7266506356521cea66be6d0b3ea22a6221f94190af0522f7fc1fed261785583a466d7f60789258f73eadc7b29ec2efa9cebf67ee81afab1b2bad49c9c
+EBUILD mate-utils-1.22.1-r1.ebuild 1397 BLAKE2B d1fa2e028a80a282bc24a6ee737c11cdd6bda68ac7ed1b4173beb6d81bb1364b41e6d0d42ee0302a40ef8364ea40c1c97784a14c0598dc12da7f9d615d3e7ab8 SHA512 f642f6d9dde2917e988741958c2de7f7b6d88627dfe180b7be963ce4f582c231ebe2a9006b1df825d1dc32ec8a6c1c5e133dbc989640ce4c283ef628970bbc8c
+EBUILD mate-utils-1.22.2-r1.ebuild 1365 BLAKE2B 522cdf2c0b26c404e425b7074ad76ca33a6fc7424a08512f9767309a4d9701ff5823aee88707430caef7e53fa9d09cf2f815fae7da5e9cb626c2bf3c9e7880d9 SHA512 b5b37c5afb0bd14bca0e49587a808d819bfb91844b325a4662e298cfebf6f25c18434870b086506339811722e0907bd6fca361a0fe76930ee244ddd79e0dc320
+EBUILD mate-utils-1.24.0.ebuild 1427 BLAKE2B f95fb1d0fd7fc14cc034d3da299fa20faa02616e31ee5240666e5f8c8499da4371ff6721a80c7afb13b64c8ce0ec4db75b900aa0e709ec98c1252961e92cfcbc SHA512 ba54d08e0fbfd512c1a84862d2b5484d601c0a03328e4a2d01e469960b66f090c47cfdb694311de7f375c6a3711e73b38b9dfa0a2ab1ab049797b37ef13f7f9a
 MISC metadata.xml 417 BLAKE2B af181dbce0a3bd1d40160da5b7b1be3a4ba345b3d31dc8d4988a146af5318bf473ad2962e9fd63fa2bfa74e61daddb5e84dd977891dee5b3b483189321bf7b1f SHA512 4c4eeb71f1cbd778f48f19da5185d9a75444a87a7abbe5d055e032f38b9891e996af84a383d7bc67ad11113da09ad034a159ec425b106340c696fad479fecee4
diff --git a/mate-extra/mate-utils/files/mate-utils-1.22.2-gcc-10-fno-common.patch b/mate-extra/mate-utils/files/mate-utils-1.22.2-gcc-10-fno-common.patch
new file mode 100644
index 000000000000..052c1a27bbe1
--- /dev/null
+++ b/mate-extra/mate-utils/files/mate-utils-1.22.2-gcc-10-fno-common.patch
@@ -0,0 +1,37 @@
+From d2d4902a68b8eabf4dc26a8ba49019e5ea6040c6 Mon Sep 17 00:00:00 2001
+From: rbuj <robert.buj@gmail.com>
+Date: Wed, 29 Jan 2020 16:22:09 +0100
+Subject: [PATCH] Fix build using gcc 10 -fno-common flag
+
+Closes #258
+---
+ baobab/src/baobab.c | 2 ++
+ baobab/src/baobab.h | 2 +-
+ 2 files changed, 3 insertions(+), 1 deletion(-)
+
+diff --git a/baobab/src/baobab.c b/baobab/src/baobab.c
+index 07af1a1d..d4edde1f 100644
+--- a/baobab/src/baobab.c
++++ b/baobab/src/baobab.c
+@@ -42,6 +42,8 @@
+ static void push_iter_in_stack (GtkTreeIter *);
+ static GtkTreeIter pop_iter_from_stack (void);
+ 
++BaobabApplication baobab;
++
+ static gint currentdepth = 0;
+ static GtkTreeIter currentiter;
+ static GtkTreeIter firstiter;
+diff --git a/baobab/src/baobab.h b/baobab/src/baobab.h
+index b8d01817..76b22d6a 100644
+--- a/baobab/src/baobab.h
++++ b/baobab/src/baobab.h
+@@ -99,7 +99,7 @@ struct _BaobabApplication {
+ };
+ 
+ /* Application singleton */
+-BaobabApplication baobab;
++extern BaobabApplication baobab;
+ 
+ struct chan_data {
+ 	guint64 size;
diff --git a/mate-extra/mate-utils/mate-utils-1.22.0.ebuild b/mate-extra/mate-utils/mate-utils-1.22.0.ebuild
index a2cc4f1b501f..1d7235cde03e 100644
--- a/mate-extra/mate-utils/mate-utils-1.22.0.ebuild
+++ b/mate-extra/mate-utils/mate-utils-1.22.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -12,7 +12,7 @@ if [[ ${PV} != 9999 ]]; then
 fi
 
 DESCRIPTION="Utilities for the MATE desktop"
-LICENSE="GPL-2"
+LICENSE="FDL-1.1+ GPL-2+ GPL-3+ LGPL-2+"
 SLOT="0"
 
 IUSE="X applet debug ipv6 test"
diff --git a/mate-extra/mate-utils/mate-utils-1.22.1-r1.ebuild b/mate-extra/mate-utils/mate-utils-1.22.1-r1.ebuild
index 55038d726a0a..eda93518f5ea 100644
--- a/mate-extra/mate-utils/mate-utils-1.22.1-r1.ebuild
+++ b/mate-extra/mate-utils/mate-utils-1.22.1-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -12,7 +12,7 @@ if [[ ${PV} != 9999 ]]; then
 fi
 
 DESCRIPTION="Utilities for the MATE desktop"
-LICENSE="GPL-2"
+LICENSE="FDL-1.1+ GPL-2+ GPL-3+ LGPL-2+"
 SLOT="0"
 
 IUSE="X applet debug ipv6 test"
diff --git a/mate-extra/mate-utils/mate-utils-1.22.2-r1.ebuild b/mate-extra/mate-utils/mate-utils-1.22.2-r1.ebuild
new file mode 100644
index 000000000000..63022e807b7b
--- /dev/null
+++ b/mate-extra/mate-utils/mate-utils-1.22.2-r1.ebuild
@@ -0,0 +1,69 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+MATE_LA_PUNT="yes"
+
+inherit mate
+
+if [[ ${PV} != 9999 ]]; then
+	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+fi
+
+DESCRIPTION="Utilities for the MATE desktop"
+LICENSE="FDL-1.1+ GPL-2+ GPL-3+ LGPL-2+"
+SLOT="0"
+
+IUSE="X applet debug ipv6 test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	dev-libs/atk
+	>=dev-libs/glib-2.50:2
+	>=gnome-base/libgtop-2.12:2=
+	>=media-libs/libcanberra-0.4[gtk3]
+	sys-libs/zlib
+	x11-libs/cairo
+	x11-libs/gdk-pixbuf:2
+	>=x11-libs/gtk+-3.22:3
+	x11-libs/libICE
+	x11-libs/libSM
+	x11-libs/libX11
+	x11-libs/libXext
+	x11-libs/pango
+	applet? ( >=mate-base/mate-panel-1.17.0 )"
+
+DEPEND="${RDEPEND}
+	app-text/rarian
+	>=app-text/scrollkeeper-dtd-1:1.0
+	app-text/yelp-tools
+	dev-util/glib-utils
+	dev-util/gtk-doc
+	dev-util/gtk-doc-am
+	>=dev-util/intltool-0.50.1
+	sys-devel/gettext
+	virtual/pkgconfig
+	x11-base/xorg-proto"
+
+PATCHES=(
+	"${FILESDIR}/${P}-gcc-10-fno-common.patch"
+)
+
+src_prepare() {
+	# Make apps visible in all DEs.
+	LC_ALL=C find . -iname '*.desktop.in*' -exec \
+		sed -e '/OnlyShowIn/d' -i {} + || die
+
+	mate_src_prepare
+}
+
+src_configure() {
+	mate_src_configure \
+		--disable-maintainer-flags \
+		--enable-zlib \
+		--enable-debug=$(usex debug yes minimum) \
+		$(use_with X x) \
+		$(use_enable applet gdict-applet) \
+		$(use_enable ipv6)
+}
diff --git a/mate-extra/mate-utils/mate-utils-1.24.0.ebuild b/mate-extra/mate-utils/mate-utils-1.24.0.ebuild
new file mode 100644
index 000000000000..c6f28252c16d
--- /dev/null
+++ b/mate-extra/mate-utils/mate-utils-1.24.0.ebuild
@@ -0,0 +1,72 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+MATE_LA_PUNT="yes"
+
+inherit mate
+
+if [[ ${PV} != 9999 ]]; then
+	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+fi
+
+DESCRIPTION="Utilities for the MATE desktop"
+LICENSE="FDL-1.1+ GPL-2+ GPL-3+ LGPL-2+"
+SLOT="0"
+
+IUSE="X applet debug ipv6 test udisks"
+RESTRICT="!test? ( test )"
+
+COMMON_DEPEND="
+	dev-libs/atk
+	>=dev-libs/glib-2.50:2
+	>=gnome-base/libgtop-2.12:2=
+	>=media-libs/libcanberra-0.4[gtk3]
+	sys-libs/zlib
+	x11-libs/cairo
+	x11-libs/gdk-pixbuf:2
+	>=x11-libs/gtk+-3.22:3
+	x11-libs/libICE
+	x11-libs/libSM
+	x11-libs/libX11
+	x11-libs/libXext
+	x11-libs/pango
+	applet? ( >=mate-base/mate-panel-1.17.0 )
+	udisks? ( >=sys-fs/udisks-1.90.0:2 )
+"
+
+RDEPEND="${COMMON_DEPEND}
+	virtual/libintl
+"
+
+DEPEND="${COMMON_DEPEND}
+	app-text/rarian
+	>=app-text/scrollkeeper-dtd-1:1.0
+	app-text/yelp-tools
+	dev-libs/libxml2
+	dev-util/glib-utils
+	dev-util/gtk-doc
+	dev-util/gtk-doc-am
+	>=sys-devel/gettext-0.19.8:*
+	virtual/pkgconfig
+	x11-base/xorg-proto
+"
+
+src_prepare() {
+	# Make apps visible in all DEs.
+	LC_ALL=C find . -iname '*.desktop.in*' -exec \
+		sed -e '/OnlyShowIn/d' -i {} + || die
+
+	mate_src_prepare
+}
+
+src_configure() {
+	mate_src_configure \
+		--enable-zlib \
+		--enable-debug=$(usex debug yes minimum) \
+		$(use_with X x) \
+		$(use_enable applet gdict-applet) \
+		$(use_enable ipv6) \
+		$(use_enable udisks disk_image_mounter)
+}