gentoo resync : 03.07.2021

4 files changed, 3 insertions, 152 deletions

diff --git a/mate-extra/mate-utils/Manifest b/mate-extra/mate-utils/Manifest
index b9037a010fed..af3d3812ae4d 100644
--- a/mate-extra/mate-utils/Manifest
+++ b/mate-extra/mate-utils/Manifest
@@ -1,5 +1,3 @@
 DIST mate-utils-1.24.0.tar.xz 7930068 BLAKE2B 0e2c82afbc2d8a90b8c31d56d9bfbb3a477b1e9cd67108e52c96f4087d09336ed9e6980551e39b43797743b9ef86cc2beabfa84fd7a5820e38122e0d0a7c968d SHA512 d8945c85936a55d22f3ed94c9858ba84cadf552a63cdd2d9eec9120111ad71526ac88772f8e4b7a6a460b691574534e52706fba35a0395b1d894b27eece9e92c
-EBUILD mate-utils-1.24.0-r1.ebuild 1446 BLAKE2B a8e3f2c898596884e2fd5cddb519747e0e7d69efddb98c41ae9943e64f6e37096e4d9afecfef222ad060c875f50bd044c81c24ef8bda1e04ed2d40994d6d95fe SHA512 4aa7e34aa7eb2471166279e5062fc63bd37e26cccd407b7f08901c259851d841d176cbf28727f3c7df35b5e5709c2d380b3f7d5671ead8596150cfb940c3eb26
-EBUILD mate-utils-1.24.0-r2.ebuild 1472 BLAKE2B 24536bfddb8365c55c0a06940580dbc750a1a166d0d0882ddcf23eda6fc815d0e6930b12a623924281b59b26b4d6227764cb6d653db8901c3de5337a84204ed5 SHA512 c92aedd66b91e61a0faf0e6f536f7ec72a83146b9e248bf4ac8acd6582869adbbcd40b017ecc409eb3d6e7366c342af43dd858150aee9ba3d5c24413045707c4
-EBUILD mate-utils-1.24.0-r3.ebuild 1449 BLAKE2B 3b7e579e51c38c965d7d065d56b80b5acd88fa14846ac1fd03e2dc7c903e3b8ea4e6b2280f4b0fa949372b2d2a6065213f1af37e96ed9a25cb3251f91ec4e2a8 SHA512 8ecc2c36655fb2b7e2bec374a01d535a5eaabc292eec2bc625816d79062ea45b366d2dcfdb4cdb8f566a3fcb845adbff4fd9c54ef7f9fea7a7c8e6d3284c3263
+EBUILD mate-utils-1.24.0-r3.ebuild 1447 BLAKE2B b75a916ed25cd9538914028414d5026a84c8b3e9990d9a452c4ca80b2a717534a63bb9410c9a1542d591f5ea4b6df8fac1f2b28eea5d924bb3b6de83877c906f SHA512 5ba53c89c5d2ee4603a7834c215e7231e6e00066b62a69e12470ae8c5dac02f5f23c64f4de0ea804fa2ccd18263cd7bdd1525cd24113553d5661c0f8c365391f
 MISC metadata.xml 417 BLAKE2B af181dbce0a3bd1d40160da5b7b1be3a4ba345b3d31dc8d4988a146af5318bf473ad2962e9fd63fa2bfa74e61daddb5e84dd977891dee5b3b483189321bf7b1f SHA512 4c4eeb71f1cbd778f48f19da5185d9a75444a87a7abbe5d055e032f38b9891e996af84a383d7bc67ad11113da09ad034a159ec425b106340c696fad479fecee4
diff --git a/mate-extra/mate-utils/mate-utils-1.24.0-r1.ebuild b/mate-extra/mate-utils/mate-utils-1.24.0-r1.ebuild
deleted file mode 100644
index 28df90e36ad4..000000000000
--- a/mate-extra/mate-utils/mate-utils-1.24.0-r1.ebuild
+++ /dev/null
@@ -1,73 +0,0 @@
-# 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 \
-		--disable-static \
-		--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)
-}
diff --git a/mate-extra/mate-utils/mate-utils-1.24.0-r2.ebuild b/mate-extra/mate-utils/mate-utils-1.24.0-r2.ebuild
deleted file mode 100644
index bb4e5c54a2b4..000000000000
--- a/mate-extra/mate-utils/mate-utils-1.24.0-r2.ebuild
+++ /dev/null
@@ -1,74 +0,0 @@
-# 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}
-	mate-base/mate-desktop
-	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 \
-		--disable-static \
-		--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)
-}
diff --git a/mate-extra/mate-utils/mate-utils-1.24.0-r3.ebuild b/mate-extra/mate-utils/mate-utils-1.24.0-r3.ebuild
index 4ad6eec71a55..c9c3477d6b10 100644
--- a/mate-extra/mate-utils/mate-utils-1.24.0-r3.ebuild
+++ b/mate-extra/mate-utils/mate-utils-1.24.0-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -8,7 +8,7 @@ MATE_LA_PUNT="yes"
 inherit mate
 
 if [[ ${PV} != 9999 ]]; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+	KEYWORDS="amd64 ~arm ~arm64 x86"
 fi
 
 DESCRIPTION="Utilities for the MATE desktop"