[gentoo-commits] repo/gentoo:master commit in: app-editors/scite/

["Joonas Niilola" <juippis@gentoo.org>]

commit:     dbe0cbd3f6fd845bd57ab2e41d006f24f5be1e6f
Author:     Ervin Peters <coder <AT> ervnet <DOT> de>
AuthorDate: Tue Aug 11 13:29:56 2020 +0000
Commit:     Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Fri Aug 21 07:14:44 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dbe0cbd3

app-editors/scite: sed fixes

fixed makefile CXX var errors

Bug: https://bugs.gentoo.org/728426
CLOSES: https://bugs.gentoo.org/728426
Signed-off-by: Ervin Peters <coder <AT> ervnet.de>
Package-Manager: Portage-2.3.103, Repoman-2.3.23
Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>

 app-editors/scite/scite-4.2.1.ebuild | 8 +++++---
 app-editors/scite/scite-4.3.3.ebuild | 8 +++++---
 2 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/app-editors/scite/scite-4.2.1.ebuild b/app-editors/scite/scite-4.2.1.ebuild
index 6b9aa913c83..648761d8d38 100644
--- a/app-editors/scite/scite-4.2.1.ebuild
+++ b/app-editors/scite/scite-4.2.1.ebuild
@@ -47,18 +47,20 @@ pkg_pretend() {
 }
 
 src_prepare() {
+	tc-export AR CC CXX RANLIB
+
 	# remove hardcoded CC, Optimizations and clang unknown flags
 	sed -i "${WORKDIR}/scintilla/gtk/makefile" \
 	-e "s#^CC = gcc#CC = ${CC}#" \
 	-e "s#^CC = clang#CC = ${CC}#" \
-	-e "s#^CXX = clang++#CC = ${CXX}#" \
+	-e "s#^CXX = clang++#CXX = ${CXX}#" \
 	-e "s#-Os##" \
 	-e "s#-Wno-misleading-indentation##" \
 	|| die "error patching /scintilla/gtk/makefile"
 
 	sed -i "${S}/makefile" \
 	-e "s#^CC = clang#CC = ${CC}#" \
-	-e "s#^CXX = clang++#CC = ${CXX}#" \
+	-e "s#^CXX = clang++#CXX = ${CXX}#" \
 	-e "s#-rdynamic#-rdynamic ${LDFLAGS}#" \
 	-e "s#-Os##" \
 	|| die "error patching gtk/makefile"
@@ -72,7 +74,7 @@ src_prepare() {
 	#  add the ebuild suffix as shell type for working with ebuilds
 	sed -i "${WORKDIR}/scite/src/perl.properties" \
 	-e "s#\*.sh;\*.bsh;#\*.ebuild;\*.sh;\*.bsh;#" \
-	|| die "error patching /scite/src/perl.prperties"
+	|| die "error patching /scite/src/perl.properties"
 
 	# it seems that pwd here is ${S}, but user patches are relative to ${workdir}
 	# Bug #576162

diff --git a/app-editors/scite/scite-4.3.3.ebuild b/app-editors/scite/scite-4.3.3.ebuild
index 186e3d50d59..9878fd6a6b6 100644
--- a/app-editors/scite/scite-4.3.3.ebuild
+++ b/app-editors/scite/scite-4.3.3.ebuild
@@ -50,18 +50,20 @@ pkg_pretend() {
 }
 
 src_prepare() {
+	tc-export AR CC CXX RANLIB
+
 	# remove hardcoded CC, Optimizations and clang unknown flags
 	sed -i "${WORKDIR}/scintilla/gtk/makefile" \
 	-e "s#^CC = gcc#CC = ${CC}#" \
 	-e "s#^CC = clang#CC = ${CC}#" \
-	-e "s#^CXX = clang++#CC = ${CXX}#" \
+	-e "s#^CXX = clang++#CXX = ${CXX}#" \
 	-e "s#-Os##" \
 	-e "s#-Wno-misleading-indentation##" \
 	|| die "error patching /scintilla/gtk/makefile"
 
 	sed -i "${S}/makefile" \
 	-e "s#^CC = clang#CC = ${CC}#" \
-	-e "s#^CXX = clang++#CC = ${CXX}#" \
+	-e "s#^CXX = clang++#CXX = ${CXX}#" \
 	-e "s#-rdynamic#-rdynamic ${LDFLAGS}#" \
 	-e "s#-Os##" \
 	|| die "error patching gtk/makefile"
@@ -75,7 +77,7 @@ src_prepare() {
 	#  add the ebuild suffix as shell type for working with ebuilds
 	sed -i "${WORKDIR}/scite/src/perl.properties" \
 	-e "s#\*.sh;\*.bsh;#\*.ebuild;\*.sh;\*.bsh;#" \
-	|| die "error patching /scite/src/perl.prperties"
+	|| die "error patching /scite/src/perl.properties"
 
 	# it seems that pwd here is ${S}, but user patches are relative to ${workdir}
 	# Bug #576162