gentoo auto-resync : 30:09:2022 - 15:24:40

9 files changed, 28 insertions, 109 deletions

diff --git a/x11-wm/Manifest.gz b/x11-wm/Manifest.gz
index 027055b07ea3..6be1f777c3e7 100644
--- a/x11-wm/Manifest.gz
+++ b/x11-wm/Manifest.gz
diff --git a/x11-wm/jwm/Manifest b/x11-wm/jwm/Manifest
index 05dad91f3e14..4bc84a973c31 100644
--- a/x11-wm/jwm/Manifest
+++ b/x11-wm/jwm/Manifest
@@ -1,6 +1,4 @@
 AUX jwm.desktop 166 BLAKE2B 5c6adbd815e6f4f4261c8c0a8d642b749cc47703aa7ec5a79ac86a0c9aba0adf2e0865cd0b2f115146867909e880067e5157905452f08275ebd6a168088d0413 SHA512 42135a9b282467edec1a61de0180a97b7a0f5bbbb8fe4a5d88dd418dcb5edf32c1c15efee3d8cf96eadf7468dd4d44c679690ec2ff2a89381bb0e0dc9664a43b
-DIST jwm-2.3.7.tar.xz 350332 BLAKE2B 479d853ae9b1dd2d1a39c9e823f39cd7671b477f6e9878bc6652072bce1ce364f8c392663dc1187a4a4970918c0f68cd506654f6dfe6c91cc5f1f2f275a2021b SHA512 dab0241518e52aa2e3e1ef3f67b6965ceb683bdb0224de7d3a653d76440606d70e86e35047eda40ea53a80aa227408be77739ad7c53d51f53026e3d113ab7efc
 DIST jwm-2.4.2.tar.xz 316000 BLAKE2B 7a0a1c5f60cb3554c999ce3d00d94af4d58ac4bdfcbaaa13a7b675273b4c5d0058c7c85bec950fa91d33a46a89f0b83faf2ab2cda0430a741884e2fdfd8116a7 SHA512 2669c3e2ab2d9a5539d02559108a2bc601bb2209de03dc15057a65c14b5e1268cc58009f4102c4d90302c0705ada5578997a3644c736a46a7e8cf13766cc92fe
-EBUILD jwm-2.3.7.ebuild 1817 BLAKE2B afebe64049c60725c05a91f9a8c0113aaf1472914bd95553ce8ca0e330b9fc6f4dae9ea35617fae47c293b7911500a0f65337ad80fd02140b344b6af5397d39e SHA512 68a7c5e782bcd2e57235485ed57955fd5fddf97bb60dd74a1b15b4241d9e3ec2e7c07ac2d85381b80c90b562ad97d6ff6f133ab58fb77c8a2f6ad01f18d33a7c
 EBUILD jwm-2.4.2.ebuild 1883 BLAKE2B 92a596c5521817c7604a15dd68087526c75f8108cf6cb7e722e50570438eeeb4d671696450cd9b53f27044a0cf738295c54d7dab64b30aa743179960e4123694 SHA512 16110df3fe8a3208fcee4197bde8dab2133224229b2841224b8ac74759e24952fc1d8bd4f48a86aaa09720a0bd09cf54d4d0cace8ae3e82260cc4182d026fe0e
 MISC metadata.xml 1088 BLAKE2B 18d33c12e3a7fad7648b9bb7934657064dce1f495c47ca1a148bc707ad17f740916d4338c0ada79004fe2b29cd0dff289cfc825bfc0725d9ef648da746b3762c SHA512 dc8ce5c40502d8fcd678f104042e4e5a85cce926fca4ab6cbca8dab30d0d66fdbc061a3cc1a1d1426fb7267e4d680505240bc6c01f6a1c8eb528f4d85ec5c057
diff --git a/x11-wm/jwm/jwm-2.3.7.ebuild b/x11-wm/jwm/jwm-2.3.7.ebuild
deleted file mode 100644
index de3b5aa2c7f5..000000000000
--- a/x11-wm/jwm/jwm-2.3.7.ebuild
+++ /dev/null
@@ -1,78 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit wrapper
-
-DESCRIPTION="Very fast and lightweight still powerful window manager for X"
-HOMEPAGE="http://joewing.net/projects/jwm/"
-SRC_URI="http://joewing.net/projects/${PN}/releases/${P}.tar.xz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ~hppa ~ppc x86"
-IUSE="bidi cairo debug iconv jpeg nls png truetype xinerama xpm"
-
-RDEPEND="dev-libs/expat
-	x11-libs/libXau
-	x11-libs/libXdmcp
-	x11-libs/libXext
-	x11-libs/libXmu
-	x11-libs/libXrender
-	bidi? ( dev-libs/fribidi )
-	cairo? (
-		x11-libs/cairo
-		gnome-base/librsvg
-	)
-	iconv? ( virtual/libiconv )
-	jpeg? ( virtual/jpeg:0= )
-	nls? ( sys-devel/gettext
-		virtual/libintl )
-	png? ( media-libs/libpng:0= )
-	truetype? ( x11-libs/libXft )
-	xinerama? ( x11-libs/libXinerama )
-	xpm? ( x11-libs/libXpm )"
-DEPEND="${RDEPEND}
-	x11-base/xorg-proto"
-
-src_configure() {
-	econf \
-		$(use_enable bidi fribidi) \
-		$(use_enable cairo) \
-		$(use_enable debug) \
-		$(use_enable jpeg) \
-		$(use_enable nls) \
-		$(use_enable png) \
-		$(use_enable cairo rsvg) \
-		$(use_enable truetype xft) \
-		$(use_enable xinerama) \
-		$(use_enable xpm) \
-		$(use_with iconv libiconv-prefix /usr) \
-		$(use_with nls libintl-prefix /usr) \
-		--enable-shape \
-		--enable-xrender \
-		--disable-rpath
-}
-
-src_install() {
-	dodir /etc
-	dodir /usr/bin
-	dodir /usr/share/man
-
-	default
-
-	make_wrapper "${PN}" "/usr/bin/${PN}" "" "" "/etc/X11/Sessions"
-
-	insinto "/usr/share/xsessions"
-	doins "${FILESDIR}"/jwm.desktop
-
-	dodoc README.md example.jwmrc ChangeLog
-}
-
-pkg_postinst() {
-	einfo "JWM can be configured system-wide with ${EROOT}/etc/system.jwmrc"
-	einfo "or per-user by creating a configuration file in ~/.jwmrc"
-	einfo
-	einfo "An example file can be found in ${EROOT}/usr/share/doc/${PF}/"
-}
diff --git a/x11-wm/larswm/Manifest b/x11-wm/larswm/Manifest
index f4d38009bd4e..6280038fd000 100644
--- a/x11-wm/larswm/Manifest
+++ b/x11-wm/larswm/Manifest
@@ -1,4 +1,4 @@
 AUX larswm.desktop 125 BLAKE2B 15556dde41d8bbec4649e946a0cc8113fda06d667bb0c85691964af2513e32a36da0e0ce5bf979c212f295e4305b3fae202f62f883c459b297516facc66547db SHA512 033ca80e83d928eca524c0a5473f2776f363ff301442a7a7c3f34bb99bc61af8a524f6bf39ee1d6282ce5f732bd1fd7b0b242ad4909063496c4c6965becd7b43
 DIST larswm-7.5.3.tar.gz 84505 BLAKE2B 4548f8d757b8dc86f8bf545bc45b09f8b934792fea2a9a49d905669b767b453d007b29923fc0d7c9b4bd744f8c77e72652388bb66f51658846699d6b517f40d5 SHA512 7c99aadcc419f695b55bf0ea2f9833757c06f6ba0f00ae58e1db6e38df70bf944bac44834418bb52188d844722a7ac3c49388280c649ede073a74c21572cf3d4
-EBUILD larswm-7.5.3-r2.ebuild 1155 BLAKE2B f03453338d0ec127e23546f0197bfc19bd569c8193e486ec5532ac4cd4a1e60f666fe38ea583895e934ddee3903a992d7e047bf884db8e89abfc099f6ae27eba SHA512 364edef63bffb19b49b989f1894219871c9773baea8e4f727b125948eee5f95ea72bf79422b637b04884ab93743dd4971e5a753134af4fb244c6449cbb1dd107
+EBUILD larswm-7.5.3-r2.ebuild 1171 BLAKE2B d9b740c05822ab26d5253f8318396fb1f13b7fa96f718c1b1617e19da34a455528bfbdd7791cf639b2b4423a7f86d64b04aac2c559718aa8cfcf4d50b1446abe SHA512 bd04f18ec5d8cc4d2e08bce97b3071407d646a4c086362ce96d76d19e5a6f849bb8a687994f80ed7f4219b70fe592d87cb21f67ba805adac2cd5be0798c50cd9
 MISC metadata.xml 606 BLAKE2B d2ee6bf061129ac167a6bfafed12fec2485dd9ad887166ce5848e8ecda6bbcd2029208cdda5406a4469db05d77aa3687f6ad2c57f26eb00be953be338d6c9d50 SHA512 ee859b28323dd81c5a6d8b9c86b03aeb312aeb7f71ee3381e3c3c0a19152ee11a9f00e8a63fedd2b99f5814f43ef915e915cddd39880f588f30d762459d02aac
diff --git a/x11-wm/larswm/larswm-7.5.3-r2.ebuild b/x11-wm/larswm/larswm-7.5.3-r2.ebuild
index 6506e3b2921d..8adcdfe73021 100644
--- a/x11-wm/larswm/larswm-7.5.3-r2.ebuild
+++ b/x11-wm/larswm/larswm-7.5.3-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -17,16 +17,16 @@ RDEPEND="x11-libs/libX11
 	x11-libs/libXmu
 	x11-libs/libXt
 	x11-libs/libXext"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	x11-base/xorg-proto
-	>=x11-misc/imake-1.0.8-r1
+DEPEND="${RDEPEND}
+	x11-base/xorg-proto"
+BDEPEND="app-text/rman
+	sys-devel/gcc
 	x11-misc/gccmakedep
-	app-text/rman"
+	>=x11-misc/imake-1.0.8-r1"
 
 src_configure() {
 	CC="$(tc-getBUILD_CC)" LD="$(tc-getLD)" \
-		IMAKECPP="${IMAKECPP:-$(tc-getCPP)}" xmkmf -a || die
+		IMAKECPP="${IMAKECPP:-${CHOST}-gcc -E}" xmkmf -a || die
 }
 
 src_compile() {
diff --git a/x11-wm/lwm/Manifest b/x11-wm/lwm/Manifest
index 455c6ebe55a1..54d9620441c2 100644
--- a/x11-wm/lwm/Manifest
+++ b/x11-wm/lwm/Manifest
@@ -1,3 +1,3 @@
 DIST lwm-1.2.4.tar.gz 47519 BLAKE2B 209cc24e938978489ba33f940dfc2166880d9c150863f8e1982d5ad21f53a76e95fd71ca461e81a7fdb025c0a957ac2c4623e751de250beec1a2a74e570b9687 SHA512 bb4e394c43020b48dedf8c98702b68be7a580f9851d298ba2c6f0aacbd21719d8c772712e56cbbcc400e81a45ad7f4f29cb6e5f17d6dad76aef65029daf812c5
-EBUILD lwm-1.2.4.ebuild 946 BLAKE2B 5bc9942f84987d838d3c52d4588facf0289452bd9e84aef938d76018bfc958e34c7e412e979649624bb102251d3975afaeb726373e574305aacaa12a4e179408 SHA512 c2ed1a5e6502e86f25490b9441f2af8e37914fbc482a7ce35b8e99dbad4ac4046f2f5a2586a883c3ab5b739c5bb4ba3965e59aabb579e51c1d6f6e0daab54813
+EBUILD lwm-1.2.4.ebuild 943 BLAKE2B 742615eab6cacd29a506ab38e18bd5dbbb208339dbc359e855c11680e134707eb55e5b72c53a4fa346be3ac19fceee4643007cedd8dc8819b09c79a7a8febcb2 SHA512 ee866c97aa159a6c4599964644bcf19f5273f37fcc8ca395280ab3fddc07958fbb76d4be79f5782c350c9836c3eb347ac48c98aee41aa713d3f79a7667f95107
 MISC metadata.xml 356 BLAKE2B 8ff390aa88481a0ef88a0fc8879ab39cd75e5acdbc92246b45319b82ebde1f1260c8b2dd99fb45c6be108cc2e24324dd88e12f7fe15c377c839858aaed585e16 SHA512 29a6a9d77c91da6011950457c3b551ea76c37befac4f58aeb97d60596ab03951ac3113ac28faa285805bd7f15b47fbf3a0c05e9efa2bc69be3663cff2c4570a2
diff --git a/x11-wm/lwm/lwm-1.2.4.ebuild b/x11-wm/lwm/lwm-1.2.4.ebuild
index c42e35e0988d..e1d55b18003d 100644
--- a/x11-wm/lwm/lwm-1.2.4.ebuild
+++ b/x11-wm/lwm/lwm-1.2.4.ebuild
@@ -1,41 +1,39 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=8
 
 inherit toolchain-funcs
 
 DESCRIPTION="The ultimate lightweight window manager"
-SRC_URI="http://www.jfc.org.uk/files/lwm/${P}.tar.gz"
-HOMEPAGE="http://www.jfc.org.uk/software/lwm.html"
+HOMEPAGE="https://www.jfc.org.uk/software/lwm.html"
+SRC_URI="https://www.jfc.org.uk/files/lwm/${P}.tar.gz"
 
-KEYWORDS="amd64 ppc ~sparc x86"
-LICENSE="GPL-2"
+LICENSE="GPL-2+"
 SLOT="0"
+KEYWORDS="amd64 ppc ~sparc x86"
 
 RDEPEND="
 	x11-libs/libICE
 	x11-libs/libSM
 	x11-libs/libX11
-	x11-libs/libXext
-"
-
+	x11-libs/libXext"
 DEPEND="
 	${RDEPEND}
-	x11-base/xorg-proto
-	>=x11-misc/imake-1.0.8-r1
-"
-
-DOCS=( AUTHORS BUGS ChangeLog )
+	x11-base/xorg-proto"
+BDEPEND="
+	sys-devel/gcc
+	>=x11-misc/imake-1.0.8-r1"
 
 src_prepare() {
 	default
+
 	sed -i -e "s#(SMLIB)#& -lICE#g" Imakefile || die #370127
 }
 
 src_configure() {
 	CC="$(tc-getBUILD_CC)" LD="$(tc-getLD)" \
-		IMAKECPP="${IMAKECPP:-$(tc-getCPP)}" xmkmf || die
+		IMAKECPP="${IMAKECPP:-${CHOST}-gcc -E}" xmkmf || die
 }
 
 src_compile() {
diff --git a/x11-wm/vtwm/Manifest b/x11-wm/vtwm/Manifest
index 810a5a88e004..69184cfcc466 100644
--- a/x11-wm/vtwm/Manifest
+++ b/x11-wm/vtwm/Manifest
@@ -1,5 +1,5 @@
 AUX vtwm-5.4.7-NO_SOUND_SUPPORT.patch 835 BLAKE2B e1b3dca9ee345f6d76c39de7eba9321f36a75236b14133f7bf4e0019a939020b6daca7e22320e25a15779ed6ca97b679d0331946a05ef05e843a6e074dc48a39 SHA512 74ed936d5fd2a6276a7be921551f7e55c5e62e8cff9c8aa0176b27497965295a8ffbc09b83a7002465eb0c59645e29168955a002cf215eb0c0cb7936731b0340
 AUX vtwm-5.4.7-do-not-rm.patch 1039 BLAKE2B ae8b28056e353f2b36e61935c32ef58e74cf806905d37f4663aaa262c9ffbb6ed4ef1efe2fc56f2753002d6d154985be2734b7948206723c314ae4eaacd4bc3e SHA512 f10762468cbcdeffbae4d3d2135c094b054e687caaf991caff90dc85e33d27e69664b978e75deda2ba66b18c537c21670005f02ee8a4558ad83c08f401533d86
 DIST vtwm-5.4.7.tar.gz 1021160 BLAKE2B a669e21d2fad5a93036c866053fb73db25f3ab1e877256650d4cc295db3861bd6ff90517e00d7042b00621c05d1947b9747380eac72fec85cfc1d68c8a6b59bb SHA512 abd9a1b1d077232eef7f39521823446f2674d69a071333209a808ff651dfa83a7f6fa00dab06356897d9e7a88fd6616e5920af030e24541bd4703b3351628728
-EBUILD vtwm-5.4.7-r2.ebuild 1592 BLAKE2B 8277c1f1bfc019ceac15d2597236031849cac9ff5497848f7338ff4b1a6e0f4157bf33e0f1fd929763665dd2a54ccb4b3fb71eeb7c461ff93f1f262c7085bd1a SHA512 bf0c6d473c98e67082acf5dc9ae9bb7bcde715943c3254c479894eb61000ad04e02b21d4d3119f67b008772b6e95a709533e0943ace3cb000c5ed081fb25f8ab
+EBUILD vtwm-5.4.7-r2.ebuild 1610 BLAKE2B 39799d7e58c7cc5b7c8e4847bf61de441a55d44c64d676915c54db303c8297ee2e2ee8e1280f20f8e6eb45f15b732038b8034c771f6a388a2cbcd89f2871ddb7 SHA512 950afc76e161ee3681b15388631ad9feb70146a0da48b4f093c0707b761eb9a05cdd419c51a210aa8cf4e65931be5a3a3fb2977ee2d55523053013497f71885c
 MISC metadata.xml 637 BLAKE2B 77bdc41a8524eb0dd4503a526ae95b6f111236eca23328106cd4fa786c65dae5876202739d21b0ba38eb800489345418e6eee27dd7d4f9293810895a50571293 SHA512 e782d5905d05cd27ff01c78b3e35c6004045d7163777b584f279596fab2654cea6304682907021845caa8e0db66a2a521d2fdd7e02fcf66b07913bcaf3095c21
diff --git a/x11-wm/vtwm/vtwm-5.4.7-r2.ebuild b/x11-wm/vtwm/vtwm-5.4.7-r2.ebuild
index 67ac8de4a833..4f976b42e894 100644
--- a/x11-wm/vtwm/vtwm-5.4.7-r2.ebuild
+++ b/x11-wm/vtwm/vtwm-5.4.7-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -20,12 +20,13 @@ RDEPEND="x11-libs/libX11
 	x11-libs/libXext
 	x11-libs/libXpm
 	rplay? ( media-sound/rplay )"
-DEPEND="${RDEPEND}"
+DEPEND="${RDEPEND}
+	x11-base/xorg-proto"
 BDEPEND="
 	app-text/rman
 	sys-devel/bison
 	sys-devel/flex
-	x11-base/xorg-proto
+	sys-devel/gcc
 	>=x11-misc/imake-1.0.8-r1"
 
 src_prepare() {
@@ -47,7 +48,7 @@ src_prepare() {
 
 src_configure() {
 	CC="$(tc-getBUILD_CC)" LD="$(tc-getLD)" \
-		IMAKECPP="${IMAKECPP:-$(tc-getCPP)}" xmkmf -a || die "xmkmf failed"
+		IMAKECPP="${IMAKECPP:-${CHOST}-gcc -E}" xmkmf -a || die "xmkmf failed"
 }
 
 src_compile() {