gentoo resync : 14.05.2020

4 files changed, 3 insertions, 152 deletions

diff --git a/x11-wm/marco/Manifest b/x11-wm/marco/Manifest
index 478b8ab41192..677d0aa768bc 100644
--- a/x11-wm/marco/Manifest
+++ b/x11-wm/marco/Manifest
@@ -1,9 +1,6 @@
-DIST marco-1.22.1.tar.xz 1357864 BLAKE2B 241e71795acfdcbf90070ef0d14f0cc55894a5cddbf48bd8741cf9580cfcaa035890b23a2182738875ce4d89d099a80d59aa7b1937e4a34a18a5a969830e7db9 SHA512 18093f4d419fbc90f957a04ec3e36a153b3c51a6bcdc1ac5884adcc0292f157bc5e4af51e171451a4b54b5bccffdee2e8a07ed13dafb6106773abfb06b6a8a4f
 DIST marco-1.22.4.tar.xz 1368868 BLAKE2B 45a1bdfa13419f690e4a1604a18f1ef4f57b95cc64c628a8d1c4b8d5a92409eb8ecb946b60c9b9711151858a4668247f2ee031a95464463f3005952edd95265c SHA512 46867396b66453c63624e54c382845b898b10768db0560100f021e57ec80189785093be38eeaf19c50a9e4728de2b6e605267a8f1d5a5596aaa75958c0e3a6b0
 DIST marco-1.24.0.tar.xz 1827076 BLAKE2B e4bcf8584199cbe4f9f813c7512176dd9b84a39ed162cd051f1f174c428828d1d73d6ab64c19ca681f0aea966742e0474256935f2a7c0c490b77dda91147162c SHA512 b257994c097f174fe83f3f0f4d6b6991e8c0f402daffd99f8a9521d588b609c56953e73dd4d143be64f5c9a4caa8d890ff30a120e18a9d5b36c6f856a7190428
-EBUILD marco-1.22.1-r2.ebuild 1478 BLAKE2B b0e7be73aee1d0a4cb23aecbc4aa3389c495f5a01159bc70b1805986fdd976539e5892cb6826b0e41f9d6dcfa105e719ac5844c54782460970f91c61acda1f9b SHA512 41c1b18086fdce186a0caf28ea85849682492a39e69acc6eb5cd3b825dd1ba2ce494ebaa15156743809ab2fee8df529aa0bcccb4961d699e9461c78f6e4bb3e0
-EBUILD marco-1.22.4-r1.ebuild 1480 BLAKE2B e6cedb9687d8c8d102f644bc03f9f14a4497cf54da113cf555e73505fc2fb195f8d8b728801a6680a8be0595104971513cccbd91a28a2a8aa1487505cf60c733 SHA512 c4758e8f6c5c3657cf2e1a29bbc3396cc6e2d7227a476d70967c5ff7d9b8c5d3b525e60108012e463e0aeff35bd85d083d662169f3f8a781056899c5f3743999
-EBUILD marco-1.22.4.ebuild 1478 BLAKE2B 91e512c87fb2df54950faf531d537272457ae4538f0590e32eee49466820ae88278de23046ecfa06d2ad54da9dffaaa01062e237a030d42cf57bf6a3f6b4c261 SHA512 8fd77016b4741cd0a48399d2840290f09cf8dcbe1cdd0288eeef468ab3eafaf2d1a179b0e017e37fe66b1dbf5d4579e6f6e52e505e28fe22c1c382b6d6c4fd62
+EBUILD marco-1.22.4-r2.ebuild 1475 BLAKE2B 77a83a4e4e7d32f02a7d7de5d15e7ef5ff23a4386d30c8873bfdc3dbe4a562d470a0dae4724fad3cbffbb46d00d956d43bcd74ff6bdb5183bb75e647de7098b2 SHA512 6a8c138b654cb33f1389587dd60239847ba0d952e017a74407fbe2eecfcf6553770d249c7a2b036d3bb087dd24f55517db714c0359e39083dbea9239d81861f7
 EBUILD marco-1.24.0-r1.ebuild 1485 BLAKE2B dc08a2e61ce2eb12c552341552d97fe73063e696d13a3257de25554448e7c040bf1cb30f48b5c2cc2647df6a38816cae17653071b2aa50908c9d37390da8cccc SHA512 82d828b42511b687d67c5910ac9635fe0b61b690a187181363392a9e97f4a8e9f7199ef30615b4baf96350dcba2303c220965624eba7a4df6041912418f1ad6e
 EBUILD marco-1.24.0.ebuild 1483 BLAKE2B 892fc383553d75e6a572b8c3ed10256fb553909131758a6cebd3cb1e851c8a2ede9c9dcacc95a25ef61d8195354b263709718cd5871cf396be91fc97707f15dc SHA512 fe1bd773fd110d273800716894b391558a049e07c8cc0132a3892f69bac3593b44f378ad9c7a78f66502d37229a0e4863db1bcad94687f3900f3c6e2a63d012f
 MISC metadata.xml 334 BLAKE2B 4a521e1c77d597f68a11cdaa695afcb40a5a2670a7fd643db0999362884a0bad7fb8106b7ba479a939930fbf0323c7f22186cf3fca5583210227a819631ead5d SHA512 f55f007780c371bc133eb3b8eed1bb4f930cab1e29c9ff0ab2dd99cd2e1458058dc86bf3fd70e9f4e9f1db259a7b8a5a247b04282ca08e88d767ee2f1878a451
diff --git a/x11-wm/marco/marco-1.22.4-r1.ebuild b/x11-wm/marco/marco-1.22.4-r1.ebuild
deleted file mode 100644
index f20058b183b5..000000000000
--- a/x11-wm/marco/marco-1.22.4-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
-
-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.50: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
-	virtual/libintl
-	xinerama? ( x11-libs/libXinerama )
-	!!x11-wm/mate-window-manager"
-
-RDEPEND="${COMMON_DEPEND}
-	gnome-extra/zenity
-	>=mate-base/mate-desktop-1.20.0"
-
-DEPEND="${COMMON_DEPEND}
-	app-text/yelp-tools
-	>=dev-util/intltool-0.34.90
-	sys-devel/gettext:*
-	virtual/pkgconfig:*
-	x11-base/xorg-proto
-	test? ( app-text/docbook-xml-dtd:4.5 )
-	xinerama? ( x11-base/xorg-proto )"
-
-src_configure() {
-	mate_src_configure \
-		--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.22.1-r2.ebuild b/x11-wm/marco/marco-1.22.4-r2.ebuild
index a55e5ffb66ba..6d548e2a562d 100644
--- a/x11-wm/marco/marco-1.22.1-r2.ebuild
+++ b/x11-wm/marco/marco-1.22.4-r2.ebuild
@@ -13,7 +13,7 @@ fi
 
 DESCRIPTION="MATE default window manager"
 LICENSE="FDL-1.2+ GPL-2+ LGPL-2+ MIT"
-SLOT="0/1"
+SLOT="0/2"
 
 IUSE="startup-notification test xinerama"
 RESTRICT="!test? ( test )"
@@ -69,5 +69,5 @@ src_configure() {
 
 src_install() {
 	mate_src_install
-	dodoc {,doc/}*.txt
+	dodoc doc/*.txt
 }
diff --git a/x11-wm/marco/marco-1.22.4.ebuild b/x11-wm/marco/marco-1.22.4.ebuild
deleted file mode 100644
index a693ad0e7c52..000000000000
--- a/x11-wm/marco/marco-1.22.4.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
-
-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"
-
-IUSE="startup-notification test xinerama"
-RESTRICT="!test? ( test )"
-
-COMMON_DEPEND="
-	dev-libs/atk
-	>=dev-libs/glib-2.50: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
-	virtual/libintl
-	xinerama? ( x11-libs/libXinerama )
-	!!x11-wm/mate-window-manager"
-
-RDEPEND="${COMMON_DEPEND}
-	gnome-extra/zenity
-	>=mate-base/mate-desktop-1.20.0"
-
-DEPEND="${COMMON_DEPEND}
-	app-text/yelp-tools
-	>=dev-util/intltool-0.34.90
-	sys-devel/gettext:*
-	virtual/pkgconfig:*
-	x11-base/xorg-proto
-	test? ( app-text/docbook-xml-dtd:4.5 )
-	xinerama? ( x11-base/xorg-proto )"
-
-src_configure() {
-	mate_src_configure \
-		--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
-}