gentoo resync : 03.07.2021

4 files changed, 12 insertions, 87 deletions

diff --git a/x11-wm/marco/Manifest b/x11-wm/marco/Manifest
index bbf1abcd66c5..4ccfe820ee4c 100644
--- a/x11-wm/marco/Manifest
+++ b/x11-wm/marco/Manifest
@@ -1,6 +1,5 @@
-DIST marco-1.24.0.tar.xz 1827076 BLAKE2B e4bcf8584199cbe4f9f813c7512176dd9b84a39ed162cd051f1f174c428828d1d73d6ab64c19ca681f0aea966742e0474256935f2a7c0c490b77dda91147162c SHA512 b257994c097f174fe83f3f0f4d6b6991e8c0f402daffd99f8a9521d588b609c56953e73dd4d143be64f5c9a4caa8d890ff30a120e18a9d5b36c6f856a7190428
 DIST marco-1.24.1.tar.xz 1860008 BLAKE2B b147e6ce8aad9382b2e8d96eec2da0356cce91977f4387776359ffb1f26903d7f0b9d9a1d43a436d1a64033f545600e7f810a29e3ae6ecdfb0d73ef8073b782c SHA512 55607898b64f0da3a85dd8d7fd092d847c8f67cefa096a63dbe074c197157a3d661fcb3f2a495b4425340b583b600cda3d1c92ac08b7327904dbd4aab8e92c85
-EBUILD marco-1.24.0-r2.ebuild 1504 BLAKE2B 58da594bf9ce3e1930ccfd1f43b64cdddd5c74ce54d9fb4199aa5c99fa96961640c40bd1b67cabb306a5c72a4780d77d9eea078e488d8d133d7fef657a9ef98b SHA512 506253ae98268e699848c937f826b1072f13e41868a4057f30b6090f9ae2cea30ad319183a3ec2ff709a9bf5767d25a3f503eed281242b836e8c83095b5ae5b6
-EBUILD marco-1.24.1-r1.ebuild 1483 BLAKE2B e03106fde2cd93d6f26c25a58ed3984d38b4968cef4e4c52c076622586e16053575227b06cb78d00f71af25ca7cef06094b51fe5b239fe2a330f5f49570290fe SHA512 d5a15bdd165f326ad3782a2e77f5fcf3020b16c54aa1a9f6fe2fc029cf7ee38c9efd951e6a9f5e454827abf7c9824bc21cc94840d803ec7e5ebecb3655460eea
-EBUILD marco-1.24.1.ebuild 1506 BLAKE2B 23a2e5ed1605eb0457fe6ec558374aaea77775b9cc0aa9321209da72b4ac509ef896efed15b9665e7c50490b9f0b84f1f24a7e2f271a46e18f0282861f8e466d SHA512 aa40eae15416b859fc2c9c23b16c46b97763908325709743c14ef24596bae37a35e407f28ff7b876481df8586f8bc320c518a08df638ef734ff55916afd4dbfd
+DIST marco-1.24.2.tar.xz 1845356 BLAKE2B 9308e07fec5319f741f7d78007e68e916c407c515fc2076c0e26a760830d3c79edf39888f265f7edc1baf0c8dc29661fb6598be16352103455cc441bc2a1daf5 SHA512 2e699935fb72ddc34aa1f98f5771f252141245ad8fd0983aafe5ea55aeeb3f90b5d68a61c27704adf0b929565180367aae46486d45e789d7de101ec9a7bc9f96
+EBUILD marco-1.24.1-r1.ebuild 1481 BLAKE2B 51998a385ac740af4e5f8be0a1c11e003aa2616196f6feba41e46c237ed473d0c7e38d137eef9158cff77f9381a36ff06244fdbae55517797515e9bc40f4a2c5 SHA512 aa21ffea9dd30126fd29fca608c2bba4a6186b52769d84505d16ef5c414ebacbead9dcd19bd1d5a6e0f1dbc81d164c3e7f729a688a36c2e6d84a935a4546d371
+EBUILD marco-1.24.2.ebuild 1483 BLAKE2B 9ded09675ad592b0953122a1a317cd3a86ebf6b1aac3fff4b050be453a6109da8b7264b0a01e16e0511b4660851ebfb79f6e522d85ee822ac2862aadcd4a30b6 SHA512 d227cd02844441d3f1e2c0c6053957911023b876ac7ecc082815c333ba1e55bd90333d7cf0c230d9a60b66dd7f490d80b7109554cd64ba2886d1cc78d07eed64
 MISC metadata.xml 334 BLAKE2B 4a521e1c77d597f68a11cdaa695afcb40a5a2670a7fd643db0999362884a0bad7fb8106b7ba479a939930fbf0323c7f22186cf3fca5583210227a819631ead5d SHA512 f55f007780c371bc133eb3b8eed1bb4f930cab1e29c9ff0ab2dd99cd2e1458058dc86bf3fd70e9f4e9f1db259a7b8a5a247b04282ca08e88d767ee2f1878a451
diff --git a/x11-wm/marco/marco-1.24.0-r2.ebuild b/x11-wm/marco/marco-1.24.0-r2.ebuild
deleted file mode 100644
index 3a7cf634c890..000000000000
--- a/x11-wm/marco/marco-1.24.0-r2.ebuild
+++ /dev/null
@@ -1,75 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-MATE2_LA_PUNT="yes"
-
-inherit mate
-
-if [[ ${PV} != 9999 ]]; then
-	KEYWORDS="amd64 ~arm ~arm64 x86"
-fi
-
-DESCRIPTION="MATE default window manager"
-LICENSE="FDL-1.2+ GPL-2+ LGPL-2+ MIT"
-SLOT="0/2"
-
-IUSE="startup-notification test xinerama"
-RESTRICT="!test? ( test )"
-
-COMMON_DEPEND="
-	dev-libs/atk
-	>=dev-libs/glib-2.58:2
-	>=gnome-base/libgtop-2:2=
-	media-libs/libcanberra[gtk3]
-	x11-libs/cairo
-	>=x11-libs/pango-1.2[X]
-	x11-libs/gdk-pixbuf:2
-	>=x11-libs/gtk+-3.22:3
-	x11-libs/libICE
-	x11-libs/libSM
-	x11-libs/libX11
-	>=x11-libs/libXcomposite-0.3
-	x11-libs/libXcursor
-	x11-libs/libXdamage
-	x11-libs/libXext
-	x11-libs/libXfixes
-	x11-libs/libXpresent
-	x11-libs/libXrandr
-	x11-libs/libXrender
-	>=x11-libs/startup-notification-0.7
-	xinerama? ( x11-libs/libXinerama )
-	!!x11-wm/mate-window-manager"
-
-RDEPEND="${COMMON_DEPEND}
-	gnome-extra/zenity
-	>=mate-base/mate-desktop-1.20.0
-	virtual/libintl
-"
-
-DEPEND="${COMMON_DEPEND}
-	app-text/yelp-tools
-	>=sys-devel/gettext-0.19.8:*
-	>=sys-devel/libtool-2.0.0
-	virtual/pkgconfig:*
-	x11-base/xorg-proto
-	test? ( app-text/docbook-xml-dtd:4.5 )
-	xinerama? ( x11-base/xorg-proto )"
-
-src_configure() {
-	mate_src_configure \
-		--disable-static \
-		--enable-compositor \
-		--enable-render \
-		--enable-shape \
-		--enable-sm \
-		--enable-xsync \
-		$(use_enable startup-notification) \
-		$(use_enable xinerama)
-}
-
-src_install() {
-	mate_src_install
-	dodoc doc/*.txt
-}
diff --git a/x11-wm/marco/marco-1.24.1-r1.ebuild b/x11-wm/marco/marco-1.24.1-r1.ebuild
index cd92c1853eea..2664b2b46315 100644
--- a/x11-wm/marco/marco-1.24.1-r1.ebuild
+++ b/x11-wm/marco/marco-1.24.1-r1.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 @@ MATE2_LA_PUNT="yes"
 inherit mate
 
 if [[ ${PV} != 9999 ]]; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+	KEYWORDS="amd64 ~arm ~arm64 x86"
 fi
 
 DESCRIPTION="MATE default window manager"
diff --git a/x11-wm/marco/marco-1.24.1.ebuild b/x11-wm/marco/marco-1.24.2.ebuild
index 02b3042b4bbc..e36ea8196cc3 100644
--- a/x11-wm/marco/marco-1.24.1.ebuild
+++ b/x11-wm/marco/marco-1.24.2.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
@@ -40,7 +40,8 @@ COMMON_DEPEND="
 	x11-libs/libXrender
 	>=x11-libs/startup-notification-0.7
 	xinerama? ( x11-libs/libXinerama )
-	!!x11-wm/mate-window-manager"
+	!!x11-wm/mate-window-manager
+"
 
 RDEPEND="${COMMON_DEPEND}
 	gnome-extra/zenity
@@ -50,16 +51,16 @@ RDEPEND="${COMMON_DEPEND}
 
 DEPEND="${COMMON_DEPEND}
 	app-text/yelp-tools
-	>=sys-devel/gettext-0.19.8:*
+	>=sys-devel/gettext-0.19.8
 	>=sys-devel/libtool-2.0.0
-	virtual/pkgconfig:*
+	virtual/pkgconfig
 	x11-base/xorg-proto
 	test? ( app-text/docbook-xml-dtd:4.5 )
-	xinerama? ( x11-base/xorg-proto )"
+	xinerama? ( x11-base/xorg-proto )
+"
 
 src_configure() {
 	mate_src_configure \
-		--disable-static \
 		--enable-compositor \
 		--enable-render \
 		--enable-shape \