gentoo resync : 08.07.2021

10 files changed, 18 insertions, 87 deletions

diff --git a/x11-wm/Manifest.gz b/x11-wm/Manifest.gz
index aadcf5c55fa6..d44ab47839a7 100644
--- a/x11-wm/Manifest.gz
+++ b/x11-wm/Manifest.gz
diff --git a/x11-wm/herbstluftwm/Manifest b/x11-wm/herbstluftwm/Manifest
index a6b58f7248df..030432b7d4fb 100644
--- a/x11-wm/herbstluftwm/Manifest
+++ b/x11-wm/herbstluftwm/Manifest
@@ -1,6 +1,4 @@
-DIST herbstluftwm-0.7.2.tar.gz 245506 BLAKE2B 72d0bb2a77e519161d193ac7b2b9f1f878ccb6cfe4914b6c75d060e2daa0bec4203ee4ebf203b9fa1dfb844d71d50aa7c03257c78aa22e906bf42519d1e592af SHA512 abb49bbc3de9a0ef619ce7063c1cea0d0d25ab2195c53dc0d33e061ad24060da4bbe9b99b9b9126028cdf68b462d4fcc8d1534431e4892d571ff897a68d2113c
 DIST herbstluftwm-0.9.3.tar.gz 497523 BLAKE2B 1936924f86201b6ad6ec33426d366912fd72e2a5e5a4964cafcb40d76624c2a1398c9330cde472343b436d16c9299aba495e1a224c6ea8bb173bbf76b7209cb3 SHA512 73e4193a2d79c452c08b4ac1c8fea1e93b88b07baa0c9006b74a76ed84de578d3234789e3666a9299ef3942695225c9a7f85eb3698a44edb1234f6042dbea47c
-EBUILD herbstluftwm-0.7.2-r1.ebuild 1534 BLAKE2B a88a23d3cdcaf5761198b31112ebeeac213f5e576e3d5e566121713875e1e9b8a78d9c7e63659da6144b6733905f0b2def82761dff36e29400b899670d3c2aec SHA512 8bf19a5fc434271eeafc58a168dd852a8962cd9c8c35ecd2779eb2f195d4fae3942ff7884c96c8177592d4374e4b3bcd63a5c33bee46e73ff5b08b5dd20f0e9f
-EBUILD herbstluftwm-0.9.3.ebuild 2804 BLAKE2B 3b0dfd324aacc7f358b6de74a575558843d1d78b26db8372c7c792204df22ca1b7d36b83d4c61800639027d1573489bb32624a73ec65f0cef86e607529af35ed SHA512 b012accaea69ca4bd340fc38d4317caab55a3468a4ee2bef34eb2d0b720258935352d1fc9f7df46158399f29bbcc23bd7fa4c0eaef1f513cae6b773402f495e3
+EBUILD herbstluftwm-0.9.3.ebuild 2802 BLAKE2B c2fffe4ff4474fad1493863b90af5e8cf165d58a5aee0a07542ee5dce0c0a3346b934d90745f19bf6c7dbd42eff3bbb2d6bd2e8f8b23d81acd42bd5e39224e8b SHA512 c616a044c4bfe582502475b47c012bbc102f82cfc1c0a35067b1065331dbd5a3b74f5dd564079549d2ee5228de6a59b475b4bb4cb30ca370d42a0914140693e3
 EBUILD herbstluftwm-9999.ebuild 2804 BLAKE2B 3b0dfd324aacc7f358b6de74a575558843d1d78b26db8372c7c792204df22ca1b7d36b83d4c61800639027d1573489bb32624a73ec65f0cef86e607529af35ed SHA512 b012accaea69ca4bd340fc38d4317caab55a3468a4ee2bef34eb2d0b720258935352d1fc9f7df46158399f29bbcc23bd7fa4c0eaef1f513cae6b773402f495e3
 MISC metadata.xml 448 BLAKE2B 454fa91d4bf0e1b7f3bf133e1de6cecd55588ac8c49d15c6624f0baf3fcc08663f52c972a8d7ebcb41107825f5bd70c2b8f7e67e10db674d0493d600a2f88de4 SHA512 22390ec4b20611620ea61bc0d93e7f9e67c154843bd3094592f4b69728eccbaaa5ea811872f5d63d55e0c7e0d0c65d7941eb2e57c74c85bfa63469fd4432531d
diff --git a/x11-wm/herbstluftwm/herbstluftwm-0.7.2-r1.ebuild b/x11-wm/herbstluftwm/herbstluftwm-0.7.2-r1.ebuild
deleted file mode 100644
index 74f4e1a1a6dc..000000000000
--- a/x11-wm/herbstluftwm/herbstluftwm-0.7.2-r1.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit toolchain-funcs bash-completion-r1
-
-if [[ ${PV} == 9999* ]] ; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/herbstluftwm/herbstluftwm"
-	BDEPEND="app-text/asciidoc"
-else
-	SRC_URI="https://herbstluftwm.org/tarballs/${P}.tar.gz"
-	KEYWORDS="amd64 x86"
-	BDEPEND=""
-fi
-
-DESCRIPTION="A manual tiling window manager for X"
-HOMEPAGE="https://herbstluftwm.org/"
-
-LICENSE="BSD-2"
-SLOT="0"
-IUSE="examples xinerama zsh-completion"
-
-DEPEND="
-	>=dev-libs/glib-2.24:2
-	x11-libs/libX11
-	x11-libs/libXext
-	xinerama? ( x11-libs/libXinerama )
-"
-RDEPEND="
-	${DEPEND}
-	app-shells/bash
-	zsh-completion? ( app-shells/zsh )
-"
-BDEPEND+="
-	virtual/pkgconfig
-"
-
-src_compile() {
-	tc-export CC CXX LD PKG_CONFIG
-
-	emake LDXX="$(tc-getCXX)" COLOR=0 VERBOSE= \
-		$(use xinerama || echo XINERAMAFLAGS= XINERAMALIBS= )
-}
-
-src_install() {
-	dobin herbstluftwm herbstclient
-	dodoc BUGS MIGRATION NEWS README.md
-
-	doman doc/{herbstluftwm,herbstclient}.1
-
-	exeinto /etc/xdg/herbstluftwm
-	doexe share/{autostart,panel.sh,restartpanels.sh}
-
-	insinto /usr/share/xsessions
-	doins share/herbstluftwm.desktop
-
-	newbashcomp share/herbstclient-completion herbstclient
-
-	if use zsh-completion ; then
-		insinto /usr/share/zsh/site-functions
-		doins share/_herbstclient
-	fi
-
-	if use examples ; then
-		exeinto /usr/share/doc/${PF}/examples
-		doexe scripts/*.sh
-		docinto examples
-		dodoc scripts/README
-		docompress -x /usr/share/doc/${PF}/examples
-	fi
-}
diff --git a/x11-wm/herbstluftwm/herbstluftwm-0.9.3.ebuild b/x11-wm/herbstluftwm/herbstluftwm-0.9.3.ebuild
index c167e7f353e2..65e8342992a3 100644
--- a/x11-wm/herbstluftwm/herbstluftwm-0.9.3.ebuild
+++ b/x11-wm/herbstluftwm/herbstluftwm-0.9.3.ebuild
@@ -16,7 +16,7 @@ if [[ "${PV}" == "9999" ]] || [[ -n "${EGIT_COMMIT_ID}" ]]; then
 	inherit git-r3
 else
 	SRC_URI="https://herbstluftwm.org/tarballs/${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="amd64 x86"
 fi
 
 LICENSE="BSD-2"
diff --git a/x11-wm/icewm/Manifest b/x11-wm/icewm/Manifest
index 7ca05c9b11aa..bd72d22f3171 100644
--- a/x11-wm/icewm/Manifest
+++ b/x11-wm/icewm/Manifest
@@ -1,8 +1,8 @@
 AUX icewm 33 BLAKE2B 5605658012ad8ed16bbd4cf0c4cb7cbe5204f73c20ef2c3d9fef1011a80b9e68863de64b45e4b043604b147c9d31f3f5d2617d067b694f5ec5329ad895472b0e SHA512 3fe619e59cc5d354242ccd85d3b1982dd7db6d0f6170f46f9d33975872f6d5a342a08d69db763162dc43681eedb96e9ba5075455bf54adf4fb86bf19887bf6e0
 DIST icewm-2.3.4.tar.lz 1708239 BLAKE2B d19a7864642795b93a8d30a63c6ba0dcac4ee9b9e3a2b9e314e115aea8200f688ed46f70268f16d09c8c7a02c4ac9653c3937d1b029bdc5b69ddd5d3fba658c9 SHA512 97d613c3dda84bc52d6b31772df5422aef84b6055b7240e90e5e1a5433d0250ad8fde7a01c4d5c3e714265fed4a3feefde3d6e6b4e1433896c16d2b4708edb1a
-DIST icewm-2.4.0.tar.lz 1718250 BLAKE2B 6ed4893d11ba7957c34585ec345d2ceaf23ceecf1d87e59c73cae0d730104a1f4850744d097cd4f00eb29cbfa413b9933d840cee55c36831f7acad571929b76f SHA512 2ac7509ce64a7d7772e12220f935f2511f8a9160bc9672421d81c49dcabc90d22559558811a11697f4e7c45a23a788b4d73032d2e1201c1dc502897ba6e9c965
 DIST icewm-2.5.0.tar.lz 1722504 BLAKE2B caf5d61559dd5bb25583bebeaca82e54049e2a97d8e5eeb93942908481f68614cfe55afd4041b5d60e58e732fef1694f67c5918a130bc55b252ebae67a51482a SHA512 1f59b4dbe90ca47031e5abf999cdb23a8e9ea956d5a76a0dde9b3489dec4530bf0ce72e10b337615d0bcadf04007b00a7db6f43082504bef65b109f9115d9f52
+DIST icewm-2.6.0.tar.lz 1722772 BLAKE2B 4d7055b77d88d0731517b668f525161a97b571f68cf0b2944e9b364653cb022f0b29d664ccc9539d1807005ab8954aa3ce31244911c2fafaa673ef5afeb447f1 SHA512 fe491c8c59aa530d48a20134857c787eccfeda5bd9529e063d865bd3c5f243ef41fbecba40aa06e7fa8037af89839958095debebc5d9b1acc9b5670bd0e12eb6
 EBUILD icewm-2.3.4.ebuild 2952 BLAKE2B b0d75ba7ec27295593caa2bb47d51c518b35a81e95a53210b424f7632d197bb2cb6116feeee53f56348409589a13c2c288f01ddd76a98549643d051da89bfdee SHA512 016db15eb35afcc81a5312690790d43de8d6f936f99de63fc1efe6974adaf0f8a074bfb6e53711af9a561490686786e2e5b860d7f4fc678058eba44347f8c440
-EBUILD icewm-2.4.0.ebuild 2956 BLAKE2B a29971bc37782d51dd81352475005d0860682ce1fa18ce04d9f69d67bdc1cefaf667a6179d58c63a6d39cb44f0971bd41ae54694896c37b0a3183a6a4fc360b4 SHA512 07b44baf1a7f48d9da2b8abdae82b3dda800662ce912f6f69cf1e7ea665407931aeb77b9f04e902b8862fc43790c4981bb1c57cd04c112cbed49991385a58174
 EBUILD icewm-2.5.0.ebuild 2956 BLAKE2B a29971bc37782d51dd81352475005d0860682ce1fa18ce04d9f69d67bdc1cefaf667a6179d58c63a6d39cb44f0971bd41ae54694896c37b0a3183a6a4fc360b4 SHA512 07b44baf1a7f48d9da2b8abdae82b3dda800662ce912f6f69cf1e7ea665407931aeb77b9f04e902b8862fc43790c4981bb1c57cd04c112cbed49991385a58174
+EBUILD icewm-2.6.0.ebuild 2956 BLAKE2B a29971bc37782d51dd81352475005d0860682ce1fa18ce04d9f69d67bdc1cefaf667a6179d58c63a6d39cb44f0971bd41ae54694896c37b0a3183a6a4fc360b4 SHA512 07b44baf1a7f48d9da2b8abdae82b3dda800662ce912f6f69cf1e7ea665407931aeb77b9f04e902b8862fc43790c4981bb1c57cd04c112cbed49991385a58174
 MISC metadata.xml 747 BLAKE2B a986dc65f9b603519ef92fecc63cadd2921d6569e8735956a55ce91673426082e367664cce23c2b80cec19e0d997da357ac8f9d3d78c738ad92f42f6f426c225 SHA512 f9b84c60b780b5999c8a295b64bdf1bdb734108984e48f1271257cb35602df024a347560526de52f43ede16f67031551f4ae3f37401d3320e4dbdfb913e557fe
diff --git a/x11-wm/icewm/icewm-2.4.0.ebuild b/x11-wm/icewm/icewm-2.6.0.ebuild
index 7b0d626e90a0..7b0d626e90a0 100644
--- a/x11-wm/icewm/icewm-2.4.0.ebuild
+++ b/x11-wm/icewm/icewm-2.6.0.ebuild
diff --git a/x11-wm/lumina/Manifest b/x11-wm/lumina/Manifest
index d7676ae5c206..00ab9759a089 100644
--- a/x11-wm/lumina/Manifest
+++ b/x11-wm/lumina/Manifest
@@ -1,6 +1,6 @@
 AUX 1.2.0-desktop-files.patch 1001 BLAKE2B eee93a9f1d3466dcdb4d9d411b9e5b5b5a882dba2d4ccadb8ad90d82b66ee3a2d02fb02dbdd6b156fb9768c6d8d8b772b075ffc2b12e630e204e55632e99f931 SHA512 419fdd6c26f05daa4dacee5d0f21a51ffc465d443ba47e374c431c722dab98b8686453c692b0d8e579c5a5f43b18d92c0f7345845901e1d86ad36c70e1546b4d
 AUX lumina-session 2011 BLAKE2B bec6e1161c89ef0ae5f6506d57b6deff09f907b2c16b0d3404eb61369f1c3fa6f19400557f18dc3081e19652badae541d9f84be8717851b5a583392caaef303f SHA512 79e06e1761b079c96984c84f225e23a545d012ad94148080c3659c85f75b322dd050fc4b1908f72de1cdd22bab6b62e0d1de4f8c77f29073e88488671b0836db
 DIST lumina-1.6.0.tar.gz 20662000 BLAKE2B c016f07fb86333e792d6a0a0ddaa9ea09f322d6de69d099abf9340d7db6cb9e23624b62882579ba6c13eec71fcf663f1688424fd940cd7e09e625f6fcc4b281f SHA512 e923961568ab9cc32206386066daef8cd1fd2db2d5c3e260e5c1da1dcda39a516576418f607cefbe5a1c47d8684591d0e595fb344e7d6aa2859fc3b326e73e30
-EBUILD lumina-1.6.0.ebuild 2396 BLAKE2B 015adabd82ff9b479e7e3f69519ab4f80f58f233df88b1f0462ee9956e8af5bc34e4197b0c18237390cbcf23a4c9950d91e277263d60069a3d115c4f30324e47 SHA512 7e7244aab8a0ab934523fb5714ec67a70e66fe62c4f3cb2abfe6345af6d6697f3b91fb89dfb81706045c956cb97e8c14c3941701f07979d0db5c87e7ab399db6
+EBUILD lumina-1.6.0.ebuild 2393 BLAKE2B 81ec58a7db69858efba8551c036f11190af573b21ae85c18c97ae6759ab35e169b63d5cc6d6c93146ba9af12823e70007a740eb2fe3d0c42fc2452d9cc94fd0e SHA512 fdd5aca5842e6b7cbe3e815c0ba65d869d8a5f934ad06421cc83b7e16b6f840c5668e14bd7c449db799d9d2a7e246e784f8de8979a0508e9122b399f9684a05f
 EBUILD lumina-9999.ebuild 1366 BLAKE2B 0da2fd0940f6ebdb0dcbe0424b81458f90b20fe66cfb3c65f3bc1164c45deb5293981eb30886bdcc40d56e1ffe0ffc79660c91c62531fb038c56b5fa584d45be SHA512 758c5ac50e8673155abf452dbe28ba54d5f59ff5f1b91f59dcb061d5ed1c979aab7c8101dab4b928e24ca79491c9bf5b8c27a83a7277ba9d10b7f016c8674d13
 MISC metadata.xml 1981 BLAKE2B d1419a627e507752b0656e97a9d9189c490de18fa8e8eb0173b67003dfc17ffeaf7d643d6fb077aa2c44d7ed82ebcd2836379d8c4cf19538e46a46376b80e570 SHA512 90256620e79e215798328a5afafe0a0f39c05843f58920ec3ff7aa46ff7b3721c01a660aa5d9a32eac65227cf0893e1a1273fc879e7c18747365d4ed66d0fbc5
diff --git a/x11-wm/lumina/lumina-1.6.0.ebuild b/x11-wm/lumina/lumina-1.6.0.ebuild
index 1c86507bdd95..21910c2a51d0 100644
--- a/x11-wm/lumina/lumina-1.6.0.ebuild
+++ b/x11-wm/lumina/lumina-1.6.0.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
 PLOCALES="af ar az bg bn bs ca cs cy da de el en_AU en_GB en_ZA es et eu fa fi fr fr_CA fur gl he hi hr hu id is it ja ka ko lt lv mk mn ms mt nb ne nl pa pl pt pt_BR ro ru sa sk sl sr sv sw ta tg th tr uk ur uz vi zh_CN zh_HK zh_TW zu"
-inherit qmake-utils l10n xdg-utils
+inherit plocale qmake-utils xdg-utils
 
 DESCRIPTION="Lumina desktop environment"
 HOMEPAGE="https://lumina-desktop.org/"
@@ -64,7 +64,7 @@ src_prepare() {
 		sed -e "/desktop-utils/d" -i src-qt5/src-qt5.pro || die
 	fi
 
-	l10n_find_plocales_changes "${S}/src-qt5/core/${PN}-desktop/i18n" "${PN}-desktop_" '.ts'
+	plocale_find_changes "${S}/src-qt5/core/${PN}-desktop/i18n" "${PN}-desktop_" '.ts'
 }
 
 src_configure() {
@@ -84,7 +84,7 @@ src_install() {
 		rm -f "${ED}"/usr/share/${PN}-desktop/i18n/l*_${1}.qm
 
 	}
-	l10n_for_each_disabled_locale_do remove_locale
+	plocale_for_each_disabled_locale remove_locale
 }
 
 pkg_postinst() {
diff --git a/x11-wm/mutter/Manifest b/x11-wm/mutter/Manifest
index 54a4a256316d..6e936613a899 100644
--- a/x11-wm/mutter/Manifest
+++ b/x11-wm/mutter/Manifest
@@ -10,5 +10,5 @@ EBUILD mutter-3.36.7-r1.ebuild 4749 BLAKE2B 69075255e249f22d91a87e440d986cfbd125
 EBUILD mutter-40.1-r2.ebuild 4700 BLAKE2B 0840633959f8e6e064a80a419c1bd5f160ca753b6f87294a07339c3402af285fe381cf5f7e4f235a84b5987382eda8303c2a9981e5c9a0685c2b6b71c9369d63 SHA512 db91adf7292964945e1149abc46b5d6d965e986d05a853865f21cb232eea2a62ecc6381f74dddfbbf718360c2832a950809e2da0652841373b2d0e7705b82983
 EBUILD mutter-40.1-r4.ebuild 4797 BLAKE2B 90eb1c17eb99023d2fce023d5202bdc798cb43f28ccb7aee708a7c0e6575687058510274858f015ea2c41c1cc0ae5f6dec2d3bef3022493295a7dfbf079030a8 SHA512 b1942ad4a4fdf14ce1e6e64f0df7fbb7b7d7d71b97be3b78ffc66f2bd4e7232a9ef99984fad2ecf912265f354a490d22875fcc813e835ddad23fa068b5152caf
 EBUILD mutter-40.2-r1.ebuild 4703 BLAKE2B 2f64ebb4b184934c359f840110fe653845faf325dd84c34b6c1f1ebc265113d5211bebb8f9e3236df76e3e7e8b37ed340efa9448f03265156de02681154b64f2 SHA512 cda41d5512f32843338c52d5ca82e19d4a7d11cd1e6761243ca6dfa0e038db03dd181d95f5dfeaf5668a5dfc643a32f036df775ee37b31f0167a3d1a1a36dadd
-EBUILD mutter-40.2.1.ebuild 4760 BLAKE2B 77a50e5539c2bbd7f34a66e87cb59dd996380430b822c7d25416be130c620658ea5045909b94bea08adb3164d36fa64dff12aad252e1bc3a8a2b288a9c388e35 SHA512 e0a0c671457103d5cb308cb19513833382075bcb48cd37a301bdbfacce6d0a6ba02f5dc26f6186017bced21145c7d04c762045e7ad5d48f0a592866e7ef63094
+EBUILD mutter-40.2.1.ebuild 4850 BLAKE2B 144dca2b78def91b819e33966680a8276ab821eea88c04ef295c7d5147df6cf41c4c4a22465606b6ab2a5caa48a12259cc42f7774ac76a1934c26d4d252aa836 SHA512 bfe0c51adfbb7786ecd95ccf9131c6f447eaf215f6a8946230254e301e48fe0ee8a5787694abb3ed331ace8616332ba878cb24445213d2f8c36843c17a61c84e
 MISC metadata.xml 605 BLAKE2B 5dc68fbf8b85c2bf75ea435abe116a9ed7072ec40a45bda28de9cb277a03e5c363487f1c3aa5c60cab5f710e06f15d966790684cac1573676af635e59b3cdfbd SHA512 440e7a33404e218da15c127614d843edcd42c469aced4609c2e7d7d8ec1281c9eceb64aebe406a75e9ba0a05b6be18bbb721257e140f6d334aff6143b1233fb8
diff --git a/x11-wm/mutter/mutter-40.2.1.ebuild b/x11-wm/mutter/mutter-40.2.1.ebuild
index 62bbdb155ee3..e981a487b659 100644
--- a/x11-wm/mutter/mutter-40.2.1.ebuild
+++ b/x11-wm/mutter/mutter-40.2.1.ebuild
@@ -82,7 +82,7 @@ DEPEND="${DEPEND}
 	x11-base/xorg-proto
 	sysprof? ( >=dev-util/sysprof-common-3.38.0 )
 "
-# wayland bdepend for wayland-scanner, xorg-server for cvt utility
+# wayland bdepend for wayland-scanner, and either libxcvt or xorg-server[xorg,-minimal] for the cvt binary
 BDEPEND="
 	dev-libs/wayland
 	dev-util/gdbus-codegen
@@ -90,8 +90,13 @@ BDEPEND="
 	>=sys-devel/gettext-0.19.8
 	virtual/pkgconfig
 	test? ( app-text/docbook-xml-dtd:4.5 )
-	wayland? ( >=sys-kernel/linux-headers-4.4
-		x11-base/xorg-server )
+	wayland? (
+		>=sys-kernel/linux-headers-4.4
+		|| (
+			x11-libs/libxcvt
+			x11-base/xorg-server[xorg,-minimal]
+		)
+	)
 "
 
 PATCHES=(