gentoo resync : 04.05.2021

5 files changed, 60 insertions, 2 deletions

diff --git a/x11-wm/Manifest.gz b/x11-wm/Manifest.gz
index a98b734514cf..54ceb7ec3fdc 100644
--- a/x11-wm/Manifest.gz
+++ b/x11-wm/Manifest.gz
diff --git a/x11-wm/blackbox/Manifest b/x11-wm/blackbox/Manifest
index 8c12d60c7240..61fb71f886ee 100644
--- a/x11-wm/blackbox/Manifest
+++ b/x11-wm/blackbox/Manifest
@@ -1,5 +1,5 @@
 AUX blackbox.desktop 128 BLAKE2B 3acb8eec34024ad4b5625d76f16206e40cceb11db194a084ba90b160e54824f95f228999128efe76c7c11509e89e85a2e2fa49f0f00f43777a7f65c0afe2ec01 SHA512 340bf82fdfe40fabe698b0fe9ce371395ab82a0570323663a2d1c3f26a36a2b1628dd91fe691a58d22b599f4cde060a005accc7294b9758cc4220d92f226d28d
 DIST blackbox-0.76.tar.gz 394032 BLAKE2B ffefd24277c581ca59216f53c10d5ffacd7231b33c7fd8bfd799a1f93f0b4953ab91f6c8e7061f91ca80036a8a2b8d7b118383e97b8ab58b8f4cd039155760a1 SHA512 bc97ae699820f8291399ce6f2a87ef4486fabcaeda2dc33fbeb31fc6405c01d722a52c85d8dc65ef44bb031e3dda63c326b76aa1bfca3e544bfcab0fac9d1afa
-EBUILD blackbox-0.76-r1.ebuild 1315 BLAKE2B fcd0aafe7b2bbd3059e2cdfb91ac43cd119d5a4f19ba227e984a3542230fa98656ab004be2d5f3fcd95a1c276f91b8ed22c4579f01119a83048b439ee5de4f68 SHA512 997329b4af80e62f83d91cd2a9efedd8c63f8fd149dbb8e472cad53484356fe6e051c35856623625de3458054e5dda1846fc637378ceb0520286c3ea6f7c698f
+EBUILD blackbox-0.76-r1.ebuild 1312 BLAKE2B 27fc763f73ed1dc41e2bac1a48e6b15a9b859103d9480df6205ff943b65ba256545d2d15659672514b548e8e00c800880fd312409cbc9751901d96034aef9705 SHA512 328d29540297b34653a785bb0baabf2f5530c20612c4bd8300faa72922abe4036bb8ce38be111540d036f701fe6c69a6be972433077af9de745b2f20fea9ac64
 EBUILD blackbox-0.76.ebuild 1163 BLAKE2B bdd113e78a785fd76f4aa1e98e0a4903053f010901cba52d53b262902842c54851178bd16fb7928abd87962e65565e47d9af493c8216d29144fbaf6e0537259f SHA512 e7b56ba2fed6111fb004f4b87cd5f9db97081a92f6487bde567b43660376157e5d497984ff35dd59e6eb16dc06ea0ec447c5c8bafaacbac5627a54c546ef656b
 MISC metadata.xml 572 BLAKE2B 3b4a1463dc3c3d78c92f1b983b66f3b7eebde350932374e9cdee846566f53c7a4bbdfb97006c8fd4bad8e945b0b4f70893853b8ae3d634c3ad3b9d6bd00e7860 SHA512 e4862cf23928cd2fe0db5b6d70caee609139cc48e1e5d2f5551142165c9c839c8c34ad3e8dbf2fb2e027ce4eef759a6d985063a3e7cc0332a72708262f1c8213
diff --git a/x11-wm/blackbox/blackbox-0.76-r1.ebuild b/x11-wm/blackbox/blackbox-0.76-r1.ebuild
index f758db45f9e9..5b6f70604a2d 100644
--- a/x11-wm/blackbox/blackbox-0.76-r1.ebuild
+++ b/x11-wm/blackbox/blackbox-0.76-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/bbidulock/blackboxwm/archive/${PV}.tar.gz -> ${P}.ta
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ppc ppc64 ~sparc x86"
 IUSE="debug nls static-libs truetype"
 
 RDEPEND="x11-libs/libXft
diff --git a/x11-wm/metacity/Manifest b/x11-wm/metacity/Manifest
index 421d4dd788d2..d76ec91f6720 100644
--- a/x11-wm/metacity/Manifest
+++ b/x11-wm/metacity/Manifest
@@ -1,3 +1,5 @@
 DIST metacity-3.36.1.tar.xz 2063452 BLAKE2B 2dd7b1c63e0b5f87ce4518d7d42d472223717012a46dd826dfda3c88f7e647809e6bf2449a28bd38573342fd5fec94e2233db958658ea4320b22c5451390e451 SHA512 98e73036cca238b713a112194b2cd7a866bcf7d08ef29fb590054b69a1bd807699317a51f9b851f9c474ae2557e27dc9fc4a52d7c436d93ad4a02babef68feeb
+DIST metacity-3.40.0.tar.xz 1970260 BLAKE2B 4ccd38b0ceaeef7145d28b1f4e579aebe75e1506af8097e97e5422f39e04ae9d1e259f17cc08dc68fe71d4eb082311c736dbcfafb4a3a775f6ddcce5ce77b859 SHA512 f9eeb0b08bb302c5fb0d174a4df97b253255741d507e94200820d3ebe9e89f179c9096b8e56798836fc84cbe1ac76b27fee6762f3d41373280c4726bc7cba2ff
 EBUILD metacity-3.36.1.ebuild 1230 BLAKE2B 5ed0a66a03c26b6dec890a10cefe295d703df73b2af5fa996d192d3f91d30f454a359886a71b329cc95f980541231ede4eb724d63dd3f828bc07f4316c9cf852 SHA512 55217e43229292e884d88d4abc6f88b7626ef41904127e0b39f77da84d44d73970f53bac28d803eff48ede7b5fa07cd8c2a06476b9aab021037e5932b4fedcf8
+EBUILD metacity-3.40.0.ebuild 1282 BLAKE2B 026027e84110b1aa9cb6364a8975299b2bed61b6d99e50d37641289e431375421ed0b748f5725cc572b0b2724113cf76d4952cb87e9b674d7b06e6a7f23ec225 SHA512 6121dd8fee4d2c2a5466e22bc08751d431cd65e91d953ce3be4b0d90471ca8ab0e251da57889ede4e8b2e7bb2ad82875d9aefefee6d97596e6e35b7c4ee558ba
 MISC metadata.xml 477 BLAKE2B 592b2957c7bff2b55505a056a2eef8d8cec25eecb400b5046bfbbd84eadfc6baa1f1475fd772a568538360c6867f0b5c0934d85bc5c6fd6ad362d80bad31ea33 SHA512 e475ae41ee3fa97f037acca5634bcb8ded17e783183459aeb83b3566df36fe7d09832991e9252f59e900982bcd0c80e8987bccc2c3e042080405d5448af9423a
diff --git a/x11-wm/metacity/metacity-3.40.0.ebuild b/x11-wm/metacity/metacity-3.40.0.ebuild
new file mode 100644
index 000000000000..590fac68d685
--- /dev/null
+++ b/x11-wm/metacity/metacity-3.40.0.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit gnome2
+
+DESCRIPTION="GNOME Flashback window manager"
+HOMEPAGE="https://gitlab.gnome.org/GNOME/metacity/"
+
+LICENSE="GPL-2+"
+SLOT="0"
+IUSE="+libcanberra vulkan xinerama"
+KEYWORDS="~amd64"
+
+# TODO: libgtop could be optional, but no knob
+RDEPEND="
+	>=dev-libs/glib-2.67.3:2
+	>=x11-libs/gtk+-3.22.0:3[X]
+	>=x11-libs/pango-1.2.0
+	>=x11-libs/libXcomposite-0.3
+	>=gnome-base/gsettings-desktop-schemas-3.3.0
+	x11-libs/libXfixes
+	x11-libs/libXrender
+	x11-libs/libXdamage
+	x11-libs/libXres
+	x11-libs/libXpresent
+	libcanberra? ( media-libs/libcanberra[gtk3] )
+	>=x11-libs/startup-notification-0.7
+	x11-libs/libXcursor
+	gnome-base/libgtop:2=
+	x11-libs/libX11
+	xinerama? ( x11-libs/libXinerama )
+	x11-libs/libXrandr
+	x11-libs/libXext
+	x11-libs/libICE
+	x11-libs/libSM
+	gnome-extra/zenity
+	vulkan? ( media-libs/vulkan-loader )
+"
+DEPEND="${RDEPEND}
+	x11-base/xorg-proto
+"
+BDEPEND="
+	vulkan? ( dev-util/vulkan-headers )
+	dev-util/glib-utils
+	>=sys-devel/gettext-0.19.6
+	virtual/pkgconfig
+" # autoconf-archive for eautoreconf
+
+src_configure() {
+	gnome2_src_configure \
+		--disable-static \
+		$(use_enable libcanberra canberra) \
+		$(use_enable xinerama) \
+		$(use_enable vulkan)
+}