gentoo resync : 28.04.2019

3 files changed, 2 insertions, 74 deletions

diff --git a/x11-wm/marco/Manifest b/x11-wm/marco/Manifest
index 161a813b26a3..2b16cedcd6fe 100644
--- a/x11-wm/marco/Manifest
+++ b/x11-wm/marco/Manifest
@@ -1,5 +1,3 @@
-DIST marco-1.18.2.tar.xz 1255492 BLAKE2B 034ad26789f894d7fa829e48ed39d11925e304dd8f6c3c74b14972a332b63782d1a8c4cb5b81b20f4d8bc12a74d053bf587ed72e3c1dca8b4fddd567dd6551ef SHA512 f18cd8d46c2ad6e6d86e6e110fb588ea8c6c301c6ffc1ee72ce80984125be5cbdeb20bf4a7fe8d1d1a60b93c7cb32de8dbd00532462c5637b747068f96e79129
 DIST marco-1.22.0.tar.xz 1406400 BLAKE2B 4c3ebf92111e2d211f80e3cf65e9eab661a8157e51021b5178f621113d739efda45eb15af4e87479587b530c773a7f7bd4c3bf85ffb053da9bf0ee3529073dd7 SHA512 0935ca1532fde882e21ebbc67b41afe80e15e8519b413b9b8bde351196be347a8dcac2e092da818ec0bc700216e38211f192a891eafec8ac7d9bf63d3a42328d
-EBUILD marco-1.18.2.ebuild 1415 BLAKE2B 66a7ff62f82a0c175317f6ad8c45a9673af56f1189a73a65ab1d9300edad4cee9913d0c3393686d2c67300f47a5c6f5d869e81040a9c216f1ac03cde8f3b2c7e SHA512 8e55470bb754512e57a949b07702381969005bd7ddeb0a5a26c654a88cb748466e04f8c2a9a37a38fce7fdc7b5697c047c4f5346b1020b4e94c6a709a553a3dd
-EBUILD marco-1.22.0.ebuild 1407 BLAKE2B 90cfc05d7e6acc2dfdbf15f719c91e9aa0a5166bb9a1215a4ac3f08ad76568036c6ec0f0f618bdde174953d545971735f81bccd518d2ce18ec573f696a5aa452 SHA512 cded5ce667a2eae6b7a51d3463272716d2a06de7aaed9a162c41b6e2f966712f2af9651270ba50dd070884158ee08a2452b7c9daad8d18c91d432c3dde837a50
+EBUILD marco-1.22.0.ebuild 1405 BLAKE2B 32af147cdcf6b7d6d4b9cb687624f15f73255e5922e371386ff51df96e544c50bf96e396dcb0be565a3dcbc8b0426c7d01ce1b54da2fa204647f1b8c9adf5042 SHA512 f475ee831c03fa06a6c0717b065ff62e98dfacce4bbff364ce585cbd886ce04567dcf9f90598c9012f15caa198f85bc35717a7f10cd4b25c2b1796ac4b25c183
 MISC metadata.xml 334 BLAKE2B 4a521e1c77d597f68a11cdaa695afcb40a5a2670a7fd643db0999362884a0bad7fb8106b7ba479a939930fbf0323c7f22186cf3fca5583210227a819631ead5d SHA512 f55f007780c371bc133eb3b8eed1bb4f930cab1e29c9ff0ab2dd99cd2e1458058dc86bf3fd70e9f4e9f1db259a7b8a5a247b04282ca08e88d767ee2f1878a451
diff --git a/x11-wm/marco/marco-1.18.2.ebuild b/x11-wm/marco/marco-1.18.2.ebuild
deleted file mode 100644
index a4abca44a716..000000000000
--- a/x11-wm/marco/marco-1.18.2.ebuild
+++ /dev/null
@@ -1,70 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# 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="GPL-2"
-SLOT="0"
-
-IUSE="startup-notification test xinerama"
-
-COMMON_DEPEND="
-	dev-libs/atk:0
-	>=dev-libs/glib-2.32.10:2
-	>=gnome-base/libgtop-2:2=
-	media-libs/libcanberra:0[gtk3]
-	x11-libs/cairo:0
-	>=x11-libs/pango-1.2:0[X]
-	x11-libs/gdk-pixbuf:2
-	>=x11-libs/gtk+-3.0:3
-	x11-libs/libICE:0
-	x11-libs/libSM:0
-	x11-libs/libX11:0
-	>=x11-libs/libXcomposite-0.3:0
-	x11-libs/libXcursor:0
-	x11-libs/libXdamage:0
-	x11-libs/libXext:0
-	x11-libs/libXfixes:0
-	x11-libs/libXrandr:0
-	x11-libs/libXrender:0
-	>=x11-libs/startup-notification-0.7:0
-	virtual/libintl:0
-	xinerama? ( x11-libs/libXinerama:0 )
-	!!x11-wm/mate-window-manager"
-
-RDEPEND="${COMMON_DEPEND}
-	gnome-extra/zenity:0
-	>=mate-base/mate-desktop-1.17.0"
-
-DEPEND="${COMMON_DEPEND}
-	app-text/yelp-tools:0
-	>=dev-util/intltool-0.34.90:*
-	sys-devel/gettext:*
-	virtual/pkgconfig:*
-	x11-base/xorg-proto
-	test? ( app-text/docbook-xml-dtd:4.5 )"
-
-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.0.ebuild b/x11-wm/marco/marco-1.22.0.ebuild
index 32d7d2c46302..72fb645f0b0c 100644
--- a/x11-wm/marco/marco-1.22.0.ebuild
+++ b/x11-wm/marco/marco-1.22.0.ebuild
@@ -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"