From deba8115d2c2af26df42966b91ef04ff4dd79cde Mon Sep 17 00:00:00 2001
From: V3n3RiX <venerix@redcorelinux.org>
Date: Thu, 14 May 2020 11:09:11 +0100
Subject: gentoo resync : 14.05.2020

---
 app-editors/e3/Manifest                      |  3 ++-
 app-editors/e3/e3-2.8.2.ebuild               | 12 ++++------
 app-editors/e3/files/e3-2.8.2-makefile.patch | 36 ++++++++++++++++++++++++++++
 3 files changed, 43 insertions(+), 8 deletions(-)
 create mode 100644 app-editors/e3/files/e3-2.8.2-makefile.patch

(limited to 'app-editors/e3')

diff --git a/app-editors/e3/Manifest b/app-editors/e3/Manifest
index b724938d61be..0947f916f1cc 100644
--- a/app-editors/e3/Manifest
+++ b/app-editors/e3/Manifest
@@ -1,3 +1,4 @@
+AUX e3-2.8.2-makefile.patch 936 BLAKE2B cd06fbaa470d50fbd971b8925d6813ae5040f3826ada652d891e0d5bd3850a0c8136c13b461426115abbefe2c4e5a87d8443ef6471209833972c2ac9f3516dcf SHA512 77fbe6345d0d9285d3e46458c34b09b08e112db1851626ada6aa31aec3a3115a15d3a4a62c78689b228cbbf06a9e4252b85594785a9310461fe5b19c2aeb8112
 DIST e3-2.82.tgz 115504 BLAKE2B 09edea9063657373cf6d7d9d8290dddf17b8fb516538d89b83462176127b8b43832bd81f326eec5504116f05ab780023832b8b5d41d72e3ab8e726d89e364a36 SHA512 07c7e40d26879871b60d7e89839805d779383dbaabe42a6a3a7047fa8a4c501c4cd0cdc828a9d29d4ac1c5b949bda07946d8e71e1320c6c303ffce88a3038547
-EBUILD e3-2.8.2.ebuild 830 BLAKE2B ccded20d0b24cf7a236a849bd8c3ebe350aba15038ea49bb499af0a7a4d9b29978b29d82e05963251ba45267ab2a471ec0a027e6c2e3fd5b6e124163b306b96b SHA512 f97dc85dcd00233d110ee2de507019e77dff40023b82e1413e7403625ffc976165c952e4026311ae647021bb0170e115374f8af81b41ceb0e5b065f82309867c
+EBUILD e3-2.8.2.ebuild 842 BLAKE2B 22e0ce8013a0ca6ce4666485677927d616016179a4cdcdf901dd82ee400a6380c301ce2c1e599f24cba945801c2c1fddc66407e60f88434ba8cc17667896402f SHA512 99cd2915430b264acf41f38bb21f65c9007d83c2568c2a4f74fa404993b4a7920834deaf1dad01896cb777bf9d9177b7b7e439b8b602803167c94c0bca474019
 MISC metadata.xml 918 BLAKE2B a0bd5163da7fe48664cc720d60b08c11af32234b0b265a8e2cca6d980a3af3b29ad223fdd5a81886ea3b528875fadd0520650a463894040b2f48ad00eabdf8c6 SHA512 9e8d5b6557a492d39c79c06507ea3ee670729e315cee2456e595d53f88178801b629595ac8903ac70878a63e85b46e934c761d70fef328fdfddc78e0c7416f4d
diff --git a/app-editors/e3/e3-2.8.2.ebuild b/app-editors/e3/e3-2.8.2.ebuild
index 4d675fa1428c..41f1d83154db 100644
--- a/app-editors/e3/e3-2.8.2.ebuild
+++ b/app-editors/e3/e3-2.8.2.ebuild
@@ -1,8 +1,10 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
+inherit toolchain-funcs
+
 MY_P="${PN}-$(ver_rs 2 '')"
 DESCRIPTION="Very tiny editor in ASM with emacs, pico, wordstar, and vi keybindings"
 HOMEPAGE="https://sites.google.com/site/e3editor/"
@@ -16,14 +18,10 @@ RESTRICT="strip"
 BDEPEND=">=dev-lang/nasm-2.09.04"
 
 S="${WORKDIR}/${MY_P}"
-
-src_prepare() {
-	sed -i 's/-D$(EXMODE)//' Makefile || die
-	eapply_user
-}
+PATCHES=("${FILESDIR}"/${P}-makefile.patch)
 
 src_compile() {
-	emake -- $(usex amd64 64 32)
+	emake -- $(usex amd64 64 32) LD="$(tc-getLD)"
 }
 
 src_install() {
diff --git a/app-editors/e3/files/e3-2.8.2-makefile.patch b/app-editors/e3/files/e3-2.8.2-makefile.patch
new file mode 100644
index 000000000000..5a22ff67e09d
--- /dev/null
+++ b/app-editors/e3/files/e3-2.8.2-makefile.patch
@@ -0,0 +1,36 @@
+--- e3-2.82-orig/Makefile
++++ e3-2.82/Makefile
+@@ -17,6 +17,8 @@
+ NASM_OR_YASM=nasm
+ #NASM_OR_YASM=yasm
+ 
++LD=ld
++
+ EXMODE=SED
+ 
+ #----------------------do not edit below line-------------------------------
+@@ -41,12 +43,12 @@
+ 
+ 32:	$(ASOURCES) Makefile
+ ifeq	($(OS),LINUX)
+-	nasm -O2 -f bin -l e3.lst -o e3 e3.asm -DCRIPLED_ELF=1 -D$(OS) -D$(EXMODE) 
++	nasm -O2 -f bin -l e3.lst -o e3 e3.asm -DCRIPLED_ELF=1 -D$(OS)
+ 	chmod +x e3
+ else
+ 	echo $(ASVER)
+-	nasm -O2 $(AFLAGS) -o e3.o e3.asm -l e3.lst -D$(OS) -D$(EXMODE)
+-	ld -s -o e3 e3.o
++	nasm -O2 $(AFLAGS) -o e3.o e3.asm -l e3.lst -D$(OS)
++	$(LD) -s -o e3 e3.o
+ 	strip --remove-section .comment e3
+ endif
+ 	ln -sf e3 e3ws
+@@ -60,7 +62,7 @@
+ 64:	$(ASOURCES) Makefile
+ 	cat e3.asm | sed -f e3_32to64.sed  >e3.tmp
+ 	$(ASSEMBLER64)
+-	ld -b elf64-x86-64 --oformat elf64-x86-64 -o e3 e3.o
++	$(LD) -b elf64-x86-64 --oformat elf64-x86-64 -o e3 e3.o
+ ifneq	($(DEBUG),true)
+ 	strip e3
+ endif
-- 
cgit v1.2.3