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-misc/xsnap/Manifest               |  2 +-
 x11-misc/xsnap/xsnap-1.5.15-r2.ebuild | 25 +++++++++++--------------
 2 files changed, 12 insertions(+), 15 deletions(-)

(limited to 'x11-misc/xsnap')

diff --git a/x11-misc/xsnap/Manifest b/x11-misc/xsnap/Manifest
index c94e638eae28..f9923e6c1016 100644
--- a/x11-misc/xsnap/Manifest
+++ b/x11-misc/xsnap/Manifest
@@ -1,4 +1,4 @@
 AUX xsnap-1.5.15-root_name.patch 228 BLAKE2B 5a05da8ed5f708811a1792162bbc2dc1ea01a3666391c861296fb05706d3d1a4998764d3cd98c2847cd36573f0841966d0c16bb6fb22531055ec01fcc3d49354 SHA512 965a26474cdbe809a26559ac431aa9acdbc20ff5469e58f8b95b9da0eb58e278040f233bdc42fd54aea6f556fa2a801f6f0ca610a2ed4caa100172cb9ead4ed1
 DIST xsnap-1.5.15.tar.bz2 46574 BLAKE2B 4d0f67adea6f456bd92031752a307293d736b9ce14aa35435359ed7bdb9d774827130e95f526f363bc7f0bb3c8e3e637c3e4abdf7f9c157f15f7559bae3eba99 SHA512 898914dd0bfec93b641815cc07522d4ea6168266a7f5efe75715cf68555e8959a72b40b0a02e75244348afc6aa77d267fbe7ee60670da5f33e6db2f6c4476dac
-EBUILD xsnap-1.5.15-r2.ebuild 1410 BLAKE2B 6b76cee5998400c708a740b84a9dbd0ce28f09aa56ab3dd7c1419d5c5512477e92fc4b1d6f53e7589d8bc1fbd2f0e2107f73824fba6561b59114ef900ff590fc SHA512 f2f6403a2a25c84e5147340a5e537505e3ede1b2dbd8497b99b97c765d7df399ba604ee9010e035d77da58b4212923acd75710cfb9130902457936e719948bef
+EBUILD xsnap-1.5.15-r2.ebuild 1392 BLAKE2B 606de45eef077fa066870abcb006b2fab9f3439120c3b75c052a086768193cb65fa1a4aa1a005c512f23becd335f961ce1c41f9cc99e4fb0afad62a98db7815a SHA512 d0c7690570623b54b467a816d4d7c5c3a13cf57e4d32d682d785aaac10d5b5a9b1a5e176c289f72409b14743ae0169bf51a5cd7d886986e24579963d42312b0d
 MISC metadata.xml 282 BLAKE2B f175ac89f79f8ebbe3bc806c0c4a8169e2a4b88708d85928db9a23dacecd92a2acb1c5d1f6a49a2f8375288aa4b2db910af8c325557540ba665c37a17e773721 SHA512 06c94ffb49c985c4344b170b902427ca9ce0c23b6d68330af227ab1771794f8e8b6d0ef75b5f69293c8ef0d3264c8799e1389ccdf8dfbe7c665c6477c07479e4
diff --git a/x11-misc/xsnap/xsnap-1.5.15-r2.ebuild b/x11-misc/xsnap/xsnap-1.5.15-r2.ebuild
index e28502a5b0ca..dd43dcab6432 100644
--- a/x11-misc/xsnap/xsnap-1.5.15-r2.ebuild
+++ b/x11-misc/xsnap/xsnap-1.5.15-r2.ebuild
@@ -24,12 +24,12 @@ RDEPEND="
 	${COMMON_DEPEND}
 	media-fonts/font-misc-misc
 "
-DEPEND="
-	${COMMON_DEPEND}
+DEPEND="${COMMON_DEPEND}"
+BDEPEND="
 	app-text/rman
 	dev-lang/perl
 	x11-base/xorg-proto
-	x11-misc/imake
+	>=x11-misc/imake-1.0.8-r1
 "
 DOCS=( AUTHORS Changelog README )
 PATCHES=( "${FILESDIR}"/${P}-root_name.patch )
@@ -46,21 +46,18 @@ src_prepare() {
 	sed -i \
 		-e '/^LOCALEDIR=/d' \
 		po/Makefile || die
+}
 
-	xmkmf || die
-
-	sed -i \
-		-e '/ CC = /d' \
-		-e '/ LD = /d' \
-		-e '/ CDEBUGFLAGS = /d' \
-		-e '/ CCOPTIONS = /d' \
-		-e 's|CPP = cpp|CPP = $(CC)|g' \
-		Makefile || die
+src_configure() {
+	CC="$(tc-getBUILD_CC)" LD="$(tc-getLD)" \
+		IMAKECPP="${IMAKECPP:-$(tc-getCPP)}" xmkmf || die
 }
 
 src_compile() {
-	tc-export CC
-	emake CCOPTIONS="${CFLAGS}" EXTRA_LDOPTIONS="${LDFLAGS}"
+	emake \
+		CC="$(tc-getCC)" \
+		CDEBUGFLAGS="${CFLAGS}" \
+		EXTRA_LDOPTIONS="${LDFLAGS}"
 }
 
 src_install() {
-- 
cgit v1.2.3