gentoo auto-resync : 16:10:2022 - 19:53:15

5 files changed, 46 insertions, 33 deletions

diff --git a/x11-wm/Manifest.gz b/x11-wm/Manifest.gz
index ac8202f7e1ae..4167cb536a4c 100644
--- a/x11-wm/Manifest.gz
+++ b/x11-wm/Manifest.gz
diff --git a/x11-wm/vtwm/Manifest b/x11-wm/vtwm/Manifest
index 69184cfcc466..28ae19e9b6f4 100644
--- a/x11-wm/vtwm/Manifest
+++ b/x11-wm/vtwm/Manifest
@@ -1,5 +1,6 @@
 AUX vtwm-5.4.7-NO_SOUND_SUPPORT.patch 835 BLAKE2B e1b3dca9ee345f6d76c39de7eba9321f36a75236b14133f7bf4e0019a939020b6daca7e22320e25a15779ed6ca97b679d0331946a05ef05e843a6e074dc48a39 SHA512 74ed936d5fd2a6276a7be921551f7e55c5e62e8cff9c8aa0176b27497965295a8ffbc09b83a7002465eb0c59645e29168955a002cf215eb0c0cb7936731b0340
+AUX vtwm-5.4.7-clang16.patch 146 BLAKE2B 7bcf83ccdacf82b7d56b669026f445ea99dfac7bf3992db5f845876cc739d651d0c50221c3318d28a5bf4bd8d60b178e04441eb0378e78bc399be439427dd0d5 SHA512 c7b9a2a60759c1c903faaa550f11cf632a7d5a9a42e4f21f96a7bc86dd7f84f1666abd3f37b7b7e1c85be60b56e81ebedbf0e263bc7cce7fb79fa800cdf2dde1
 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 1610 BLAKE2B 39799d7e58c7cc5b7c8e4847bf61de441a55d44c64d676915c54db303c8297ee2e2ee8e1280f20f8e6eb45f15b732038b8034c771f6a388a2cbcd89f2871ddb7 SHA512 950afc76e161ee3681b15388631ad9feb70146a0da48b4f093c0707b761eb9a05cdd419c51a210aa8cf4e65931be5a3a3fb2977ee2d55523053013497f71885c
-MISC metadata.xml 637 BLAKE2B 77bdc41a8524eb0dd4503a526ae95b6f111236eca23328106cd4fa786c65dae5876202739d21b0ba38eb800489345418e6eee27dd7d4f9293810895a50571293 SHA512 e782d5905d05cd27ff01c78b3e35c6004045d7163777b584f279596fab2654cea6304682907021845caa8e0db66a2a521d2fdd7e02fcf66b07913bcaf3095c21
+EBUILD vtwm-5.4.7-r3.ebuild 1741 BLAKE2B dfbb0fbeb4018028dd8176dc099d627aa55d4af0a71ed164ee4a009e8d0e4f18c690b36781b550f6affb11133d51e4f309ec4fbef2241356f8011679f5547e25 SHA512 8d6596dcbbd9548d3242cfbacbe775c6235d619d0ccedce6d15c7d0e7cc2a281da7b641810646d711abb7f1fefd3499b6b4816ad8d334e45df194474e31eb6c4
+MISC metadata.xml 550 BLAKE2B fb9ddab6de90168bf092080e73d25db8ae5c67490d52c493a7e18b77eca1a49b6efbfcefb0f6b179e844d3e3f05ddecf38eb3107c921fb32e819b67b251349a8 SHA512 01f5172d8464d7c4f21166688682b4b8bcaf40d66e0179ee8b9d1636afeb6e87fb606fe91fa061269d9f4a3d25c80e5d9d5016776871b4c5bd2f2d768753aece
diff --git a/x11-wm/vtwm/files/vtwm-5.4.7-clang16.patch b/x11-wm/vtwm/files/vtwm-5.4.7-clang16.patch
new file mode 100644
index 000000000000..b74908a61f68
--- /dev/null
+++ b/x11-wm/vtwm/files/vtwm-5.4.7-clang16.patch
@@ -0,0 +1,7 @@
+https://bugs.gentoo.org/874468
+--- a/gram.y
++++ b/gram.y
+@@ -86,2 +86,3 @@
+ static void yyerror();
++static int yylex();
+ static name_list **list;
diff --git a/x11-wm/vtwm/metadata.xml b/x11-wm/vtwm/metadata.xml
index ef50f3b43a75..c216f9e0537a 100644
--- a/x11-wm/vtwm/metadata.xml
+++ b/x11-wm/vtwm/metadata.xml
@@ -8,7 +8,4 @@
   and whatever windows might be visible within it, are simple
   point-and-click operations within a scaled representation of the
   workspace.</longdescription>
-  <use>
-    <flag name="rplay">Enable rplay support, needed for sound.</flag>
-  </use>
 </pkgmetadata>
diff --git a/x11-wm/vtwm/vtwm-5.4.7-r2.ebuild b/x11-wm/vtwm/vtwm-5.4.7-r3.ebuild
index 4f976b42e894..ab75aafbdf7d 100644
--- a/x11-wm/vtwm/vtwm-5.4.7-r2.ebuild
+++ b/x11-wm/vtwm/vtwm-5.4.7-r3.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
-inherit toolchain-funcs
+inherit flag-o-matic toolchain-funcs
 
 DESCRIPTION="TWM descendant that implements a Virtual Desktop"
 HOMEPAGE="http://www.vtwm.org/"
@@ -12,15 +12,18 @@ SRC_URI="http://www.vtwm.org/downloads/${P}.tar.gz"
 LICENSE="MIT"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ppc sparc x86"
-IUSE="rplay"
 
-RDEPEND="x11-libs/libX11
-	x11-libs/libXmu
-	x11-libs/libXt
+COMMON_DEPEND="
+	x11-libs/libX11
 	x11-libs/libXext
+	x11-libs/libXmu
 	x11-libs/libXpm
-	rplay? ( media-sound/rplay )"
-DEPEND="${RDEPEND}
+	x11-libs/libXt"
+RDEPEND="
+	${COMMON_DEPEND}
+	x11-apps/xsetroot"
+DEPEND="
+	${COMMON_DEPEND}
 	x11-base/xorg-proto"
 BDEPEND="
 	app-text/rman
@@ -29,24 +32,27 @@ BDEPEND="
 	sys-devel/gcc
 	>=x11-misc/imake-1.0.8-r1"
 
+PATCHES=(
+	"${FILESDIR}"/${P}-do-not-rm.patch
+	"${FILESDIR}"/${P}-NO_SOUND_SUPPORT.patch
+	"${FILESDIR}"/${P}-clang16.patch
+)
+
 src_prepare() {
-	eapply "${FILESDIR}"/${P}-do-not-rm.patch
-	sed -i Imakefile \
-		-e 's:-L/usr/local/lib::g' \
-		-e 's:-I/usr/local/include::g' \
-		|| die "sed Imakefile"
-	if ! use rplay ; then
-		sed -i Imakefile \
-			-e 's:^XCOMM\ \(.*NO_SOUND\):\1:' \
-			-e 's:^\(SOUNDLIB.*\):XCOMM\ \1:' \
-			-e 's:sound\..::g' \
-			|| die "sed Imakefile"
-		eapply "${FILESDIR}"/${P}-NO_SOUND_SUPPORT.patch
-	fi
 	default
+
+	# disable sound support, relies on last-rited media-sound/rplay
+	sed -e 's:^XCOMM\ \(.*NO_SOUND\):\1:' \
+		-e 's:^\(SOUNDLIB.*\):XCOMM\ \1:' \
+		-e 's:sound\..::g' \
+		-e 's:-I/usr/local/include::g' \
+		-e 's:-L/usr/local/lib::g' \
+		-i Imakefile || die
 }
 
 src_configure() {
+	append-cflags -std=gnu89 # old codebase, incompatible with c2x
+
 	CC="$(tc-getBUILD_CC)" LD="$(tc-getLD)" \
 		IMAKECPP="${IMAKECPP:-${CHOST}-gcc -E}" xmkmf -a || die "xmkmf failed"
 }
@@ -59,15 +65,17 @@ src_compile() {
 }
 
 src_install() {
-	emake BINDIR=/usr/bin \
-		LIBDIR=/etc/X11 \
-		MANPATH=/usr/share/man \
+	emake BINDIR="${EPREFIX}"/usr/bin \
+		LIBDIR="${EPREFIX}"/etc/X11 \
+		MANPATH="${EPREFIX}"/usr/share/man \
 		DESTDIR="${D}" install
 
-	echo "#!/bin/sh" > vtwm
-	echo "xsetroot -cursor_name left_ptr &" >> vtwm
-	echo "/usr/bin/vtwm" >> vtwm
 	exeinto /etc/X11/Sessions
-	doexe vtwm
+	newexe - vtwm <<-EOF
+		#!/usr/bin/env sh
+		xsetroot -cursor_name left_ptr &
+		"${EPREFIX}/usr/bin/vtwm"
+	EOF
+
 	dodoc doc/{4.7.*,CHANGELOG,BUGS,DEVELOPERS,HISTORY,SOUND,WISHLIST}
 }