gentoo resync : 28.04.2019

3 files changed, 8 insertions, 76 deletions

diff --git a/mate-extra/mate-utils/Manifest b/mate-extra/mate-utils/Manifest
index 9a1874a92a22..4a0cd046b4e6 100644
--- a/mate-extra/mate-utils/Manifest
+++ b/mate-extra/mate-utils/Manifest
@@ -1,5 +1,3 @@
-DIST mate-utils-1.18.3.tar.xz 6449580 BLAKE2B e8a892d0f924b37da82a8eb233c24b41609831d84fc706ac0082c05cfc0564ca150e6cbd350af8be48acf1e314253e4afe8123bcf4af189a344b3c51e6ccf7d2 SHA512 c9d80e037d32784b3d376aebe23abc6709e14d1df6f293f43c1fc7978f7903ac8b0fc159cebebb3d8dc471df210469b5dcc5dfebdc906ade30a2c7e8f7ca764a
 DIST mate-utils-1.22.0.tar.xz 7300112 BLAKE2B 8a613b6dcb99e652ad6b44bd64ad9b2f9c809713b5fb904059b64234b51e2a06b2290dcf14d7dde82e8011be2ca395fe74d87bcae5b903b196d55bb50e8fdf07 SHA512 248c6e4108900768a4e8b272d20ac9b2d70e8bf77375f4669a099f4d8386c2e8affeafb772d209f00906f96f20d7ee347167ef4837186f44d8aaad85ef855f70
-EBUILD mate-utils-1.18.3.ebuild 1304 BLAKE2B 6b0593b985fa61b397dfb19647f5a4bbea3bb9c601ee702e7fa5ebf08f6a287d5a45e7ae34adba4a2c66d77f9adab1608b93cbb1cb5f7d9bac05f470843582e9 SHA512 c00b6223c110f628bb0563742ae0671c4d3a563d25f234e108b1ed23d4a07c1c8d562b7d418b3a2e9f84c29cff90d1914c343250f222aebd45e1a775e4e72450
-EBUILD mate-utils-1.22.0.ebuild 1279 BLAKE2B 8bf12c54095edbd84e41b68451c61dbb6ee42afd15390ad131f04391ac19f4fedcbf99d0b0c52be53207fd2fb0e08ca2e26ba83fe208c99b909db9eb3260e8d3 SHA512 77399ef0e05d2481263497f73c9e5dcd870872ee45e602348c0e4f17b80bb501456c4377e919d01a7ce1215beb1d3c5aa19461ed76a95158482425b62c985f16
+EBUILD mate-utils-1.22.0.ebuild 1254 BLAKE2B 89cb686511996bb973510b175da72c6948048ae6a998d0670fe8c2a6db167eafd3c472ec0359c9be3bec3390d66fa7a2172bb095f02955bf7c8b7249b452e3a0 SHA512 b1922162b32eab1d4f62766a960368f2ce38e9d158fe7683a743745ffbc6e0068b26bb1ef4cb8026f2b3c3dca81bf035da4dda63c5add86552ff79cf4d8a557b
 MISC metadata.xml 417 BLAKE2B af181dbce0a3bd1d40160da5b7b1be3a4ba345b3d31dc8d4988a146af5318bf473ad2962e9fd63fa2bfa74e61daddb5e84dd977891dee5b3b483189321bf7b1f SHA512 4c4eeb71f1cbd778f48f19da5185d9a75444a87a7abbe5d055e032f38b9891e996af84a383d7bc67ad11113da09ad034a159ec425b106340c696fad479fecee4
diff --git a/mate-extra/mate-utils/mate-utils-1.18.3.ebuild b/mate-extra/mate-utils/mate-utils-1.18.3.ebuild
deleted file mode 100644
index b870194cc0bd..000000000000
--- a/mate-extra/mate-utils/mate-utils-1.18.3.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# 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="GPL-2"
-SLOT="0"
-
-IUSE="X applet debug ipv6 test"
-
-COMMON_DEPEND="
-	dev-libs/atk:0
-	>=dev-libs/glib-2.36:2
-	>=gnome-base/libgtop-2.12:2=
-	>=media-libs/libcanberra-0.4:0[gtk3]
-	sys-libs/zlib:0
-	x11-libs/cairo:0
-	x11-libs/gdk-pixbuf:2
-	>=x11-libs/gtk+-3.14:3
-	x11-libs/libICE:0
-	x11-libs/libSM:0
-	x11-libs/libX11:0
-	x11-libs/libXext:0
-	x11-libs/pango:0
-	applet? ( >=mate-base/mate-panel-1.17.0 )"
-
-RDEPEND="${COMMON_DEPEND}"
-
-DEPEND="${COMMON_DEPEND}
-	app-text/rarian:0
-	>=app-text/scrollkeeper-dtd-1:1.0
-	app-text/yelp-tools:0
-	dev-util/gtk-doc
-	dev-util/gtk-doc-am
-	>=dev-util/intltool-0.50.1:*
-	sys-devel/gettext:*
-	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-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.22.0.ebuild b/mate-extra/mate-utils/mate-utils-1.22.0.ebuild
index cbba18e16de9..c252fd672cdb 100644
--- a/mate-extra/mate-utils/mate-utils-1.22.0.ebuild
+++ b/mate-extra/mate-utils/mate-utils-1.22.0.ebuild
@@ -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"
@@ -17,7 +17,7 @@ SLOT="0"
 
 IUSE="X applet debug ipv6 test"
 
-COMMON_DEPEND="
+RDEPEND="
 	dev-libs/atk
 	>=dev-libs/glib-2.50:2
 	>=gnome-base/libgtop-2.12:2=
@@ -33,18 +33,17 @@ COMMON_DEPEND="
 	x11-libs/pango
 	applet? ( >=mate-base/mate-panel-1.17.0 )"
 
-RDEPEND="${COMMON_DEPEND}"
-
-DEPEND="${COMMON_DEPEND}
+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
-	x11-base/xorg-proto
-	sys-devel/gettext:*
-	virtual/pkgconfig:*"
+	sys-devel/gettext
+	virtual/pkgconfig
+	x11-base/xorg-proto"
 
 src_prepare() {
 	# Make apps visible in all DEs.