From 40aaaa64e86ba6710bbeb31c4615a6ce80e75e11 Mon Sep 17 00:00:00 2001
From: V3n3RiX <venerix@redcorelinux.org>
Date: Wed, 28 Apr 2021 20:21:43 +0100
Subject: gentoo resync : 28.04.2021

---
 x11-wm/vtwm/Manifest             |  2 +-
 x11-wm/vtwm/vtwm-5.4.7-r2.ebuild | 15 ++++++++-------
 2 files changed, 9 insertions(+), 8 deletions(-)

(limited to 'x11-wm/vtwm')

diff --git a/x11-wm/vtwm/Manifest b/x11-wm/vtwm/Manifest
index 8ec90267077b..e04973ba81b4 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 1496 BLAKE2B 087062768d2a22620ea5c6d88833c5cc260ddb1e360f9c5c2db79308a6b408e46de1398455d97b7befaf325ea9e17860fc09d487cebceb17641837a562e5f378 SHA512 214b2cdbd0ee51a5319f3abb49f3f58198b22f2a17da600ac7ffc0aa300459d6c4d7c9aca82b98a6362c276007fb71b00580371fafeef81649962f519ceff781
+EBUILD vtwm-5.4.7-r2.ebuild 1592 BLAKE2B 8277c1f1bfc019ceac15d2597236031849cac9ff5497848f7338ff4b1a6e0f4157bf33e0f1fd929763665dd2a54ccb4b3fb71eeb7c461ff93f1f262c7085bd1a SHA512 bf0c6d473c98e67082acf5dc9ae9bb7bcde715943c3254c479894eb61000ad04e02b21d4d3119f67b008772b6e95a709533e0943ace3cb000c5ed081fb25f8ab
 MISC metadata.xml 636 BLAKE2B c49eb363f70a7d86906e229d5b9275ad5192068b61f3d4aa46a0c6711e4e3b46e27099ce1bb53e57b9476cda6bbf67fac55cb7eb6c70b37aa35bf08081f7a397 SHA512 5b71984f85b57680ea4d9432ee9aac7c4ed9d0df7082425fb650099338dad971985a56f8278ebb6c2eebe45d58272753682ffdbb9dfebeb54d6fd5d9539b77a4
diff --git a/x11-wm/vtwm/vtwm-5.4.7-r2.ebuild b/x11-wm/vtwm/vtwm-5.4.7-r2.ebuild
index e2c87e29d8c8..67ac8de4a833 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-2019 Gentoo Authors
+# Copyright 1999-2021 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}"
+BDEPEND="
 	app-text/rman
 	sys-devel/bison
 	sys-devel/flex
 	x11-base/xorg-proto
-	x11-misc/imake"
+	>=x11-misc/imake-1.0.8-r1"
 
 src_prepare() {
 	eapply "${FILESDIR}"/${P}-do-not-rm.patch
@@ -45,14 +46,14 @@ src_prepare() {
 }
 
 src_configure() {
-	xmkmf || die "xmkmf failed"
-	emake depend
+	CC="$(tc-getBUILD_CC)" LD="$(tc-getLD)" \
+		IMAKECPP="${IMAKECPP:-$(tc-getCPP)}" xmkmf -a || die "xmkmf failed"
 }
 
 src_compile() {
 	emake \
-		CC=$(tc-getCC) \
-		CCOPTIONS="${CFLAGS}" \
+		CC="$(tc-getCC)" \
+		CDEBUGFLAGS="${CFLAGS}" \
 		EXTRA_LDOPTIONS="${LDFLAGS}"
 }
 
-- 
cgit v1.2.3