[gentoo-commits] repo/gentoo:master commit in: games-board/xscrabble/

[Sam James]

commit:     553481e83cc750fa0af9ff1a2f15ecfd9090491a
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Wed Apr  7 07:34:57 2021 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Wed Apr  7 08:10:33 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=553481e8

games-board/xscrabble: fix Prefix install, respect AR and RANLIB

Not yet figured out LD, though.

Bug: https://bugs.gentoo.org/779973
Signed-off-by: Sam James <sam <AT> gentoo.org>

 games-board/xscrabble/xscrabble-2.10-r3.ebuild | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/games-board/xscrabble/xscrabble-2.10-r3.ebuild 
b/games-board/xscrabble/xscrabble-2.10-r3.ebuild
index 26dd3487df3..fd0c07b9bb0 100644
--- a/games-board/xscrabble/xscrabble-2.10-r3.ebuild
+++ b/games-board/xscrabble/xscrabble-2.10-r3.ebuild
@@ -43,11 +43,15 @@ src_unpack() {
 
 src_prepare() {
        default
-       sed -i '/install/s/-s //' build || die "sed failed"
+
+       # Don't strip binaries
+       sed -i '/install/s/-s //' build || die
+       # Respect AR, RANLIB
+       sed -i 's/CC="${CC}"/& AR="${AR} clq" RANLIB="${RANLIB}"/' build || die
 }
 
 src_configure() {
-       tc-export CC
+       tc-export AR CC RANLIB
 }
 
 src_compile() {
@@ -55,7 +59,7 @@ src_compile() {
 }
 
 src_install() {
-       export DESTDIR="${D}" LIBDIR="$(get_libdir)"
+       export DESTDIR="${ED}" LIBDIR="$(get_libdir)"
 
        ./build install || die "install failed"
 
@@ -66,7 +70,7 @@ src_install() {
        ./build lang en || die "en failed"
 
        local f
-       for f in "${ED}/usr/${LIBDIR}"/X11/app-defaults/* ; do
+       for f in "${ED}/usr/$(get_libdir)"/X11/app-defaults/* ; do
                [[ -L ${f} ]] && continue
                sed -i \
                        -e "s:/usr/games/lib/scrabble/:/usr/share/${PN}/:" \