gentoo resync : 16.09.2020

3 files changed, 32 insertions, 5 deletions

diff --git a/dev-libs/stfl/Manifest b/dev-libs/stfl/Manifest
index 47d6bde54338..112ae61cdccf 100644
--- a/dev-libs/stfl/Manifest
+++ b/dev-libs/stfl/Manifest
@@ -1,7 +1,8 @@
 AUX stfl-0.21-python.patch 1936 BLAKE2B fc0a8f02eaa30b900652304e34f383a6587769f4ac803f2ba9420197ef492430a88a6a6ec4863163cd948c9fd8c027b50a944796ea1c342f19ad9049c46dd1f9 SHA512 33da38bee278999ec3bcc770886183c3d7ac60ab3458568a7848bc83035104290423aee54a2a2da065b9a5da639af6fa242de9f23df0ff7fccbd024099af8472
+AUX stfl-0.22-pc-libdir.patch 866 BLAKE2B bdbc18572fd5104ee04af672b9d493bb3271a8af7b383f5fb9042e8c44dbeaa760ed9c2c8f71192b891eeabae487ee096451ccdb8ae82a936e85331145c9bef6 SHA512 9ec288c174bb30060085c94f6703edb698f2e3806d872153cc58873ea838a84f9edbc07c6e5f8de4a6fd18f77ff1c1e4b1599ad598f3d0a4bba5b2c5bac73ad3
 AUX stfl-0.22-ruby-sharedlib.patch 735 BLAKE2B 6b2b9e835f57f62ff1e1ff871103bc0b1106329916fc1be75eb22e550c9ff8abd007bbc201c66e15ce16a4697c0bbe0850b56ff41f666dd7006028432b1f77e5 SHA512 73a1b7aa7147100ab2f06264303c0a30463deb8bd0ce9e4111737393d07c4fb06174c5022c1dae8c7fd2688d1b544a4ab8c8ee5495f46e2bbc33ce89a7e46de7
 AUX stfl-0.22-soname-symlink.patch 444 BLAKE2B 9aa44343a18a8d7fb2f75a60ae94c30ef92b6f02190cefbefedacd9f8d5c877ac71b83c41b008bfd46a4d5ffe04f91f03f898e27ef098162d0b43f274ccff298 SHA512 e85c6f96edd8cd08d3408f976fff5f9fbcdc9892109233e78d932eb07502b00d3a0b52393542de8af5b2d26808b3574736f78b7ef9c7bdd0abffa3901fc55dab
 DIST stfl-0.24.tar.gz 45585 BLAKE2B a601f373f19baa3a11fb823852ada19ab824828935240280c74ff442a1e5c4abdf0abe56e445869e43785df3940a8c7269bc16457436abbe5e2853f907071059 SHA512 95df4574b1bc32d795751156dc5b93afbca3ba241607a3a55210c89dda61b9a26ad574bb5f729a0158c9052235dbf63d6c58b38e7f1061d14ab7062af6150fa0
 EBUILD stfl-0.24-r2.ebuild 3107 BLAKE2B 90afa189006aa5d0d2ff0ef68ef756fbdc17306e17084f1abbb60b80f5a6cb6a623ee598ecde37ef80094e9e2fd9499417199209dfb01442831bc5cba104517b SHA512 cfdcd3d32d292cf15b9349fb0c2f8352e952b8bcbd6270cfda137c7995a7825866e9100060337b3bcf50892828af48c7f6d069f94e5176a72c2fb83e81f35a71
-EBUILD stfl-0.24.ebuild 2995 BLAKE2B 0f57b85f5677b818ddeff285cebc84a636b887c1d57fb587ce537cb66269500bf82916d5bdd1de02c138a23733b72e8f106daf4e2de1faeae484dcb29c61d6d9 SHA512 e213afd5c42bd6c321c82489acd6546ba2afca4e9f67ed34a8d64472bd7d1f5c8a9977d73f8f08cd5ea37f931f205f50b68246b7e0ddb6baadeda9e67ae22a0f
+EBUILD stfl-0.24-r3.ebuild 3152 BLAKE2B 0c8182aa3696f3a716c40b3407d13293713fbdd8291a7944e39cbea6ef18ed0969a90bc9bfff02499ce3e7f055b28bf2f294d705852d35e5b5e49e5d4f4bd31c SHA512 fa5d9f91716a5b2d3df73c61364b05a2ed63f1d38d958686ab9df4b8e728a86131474a156a417280049a07bc5ff693e8fece30809b989966b9ea086f848362c5
 MISC metadata.xml 883 BLAKE2B 57005ad40d9e2a363fd5487e77c77917c85b45c9b0ade87de3cdef7aa59af6ba674cd586b736bd46b0763d1bb60f2b14b0470551bf422df030b4ee285dd8e14b SHA512 e0aaa92e248cd4670280040affa1afca918e41c5db47b77edde1f438e20d4ef3a440ab79c8d1c610e7445fc5f99feca02a7fa055cf201cc50e7b581b0c897b0d
diff --git a/dev-libs/stfl/files/stfl-0.22-pc-libdir.patch b/dev-libs/stfl/files/stfl-0.22-pc-libdir.patch
new file mode 100644
index 000000000000..82a9529c9573
--- /dev/null
+++ b/dev-libs/stfl/files/stfl-0.22-pc-libdir.patch
@@ -0,0 +1,24 @@
+diff -ru stfl-0.24.orig/Makefile stfl-0.24/Makefile
+--- stfl-0.24.orig/Makefile	2015-02-12 14:14:33.000000000 +0100
++++ stfl-0.24/Makefile	2020-09-07 14:08:04.125833347 +0200
+@@ -67,7 +67,7 @@
+ 	ln -fs libstfl.so.$(VERSION) $(DESTDIR)$(prefix)/$(libdir)/libstfl.so
+ 
+ stfl.pc: stfl.pc.in
+-	sed 's,@VERSION@,$(VERSION),g' < $< | sed 's,@PREFIX@,$(prefix),g' > $@
++	sed 's,@VERSION@,$(VERSION),g' < $< | sed 's,@PREFIX@,$(prefix),g' | sed 's,@LIBDIR@,${libdir},g' > $@
+ 
+ ifeq ($(FOUND_SPL),1)
+ include spl/Makefile.snippet
+diff -ru stfl-0.24.orig/stfl.pc.in stfl-0.24/stfl.pc.in
+--- stfl-0.24.orig/stfl.pc.in	2009-03-30 20:33:37.000000000 +0200
++++ stfl-0.24/stfl.pc.in	2020-09-07 14:08:07.784854088 +0200
+@@ -2,7 +2,7 @@
+ 
+ prefix=@PREFIX@
+ exec_prefix=${prefix}
+-libdir=${exec_prefix}/lib
++libdir=${exec_prefix}/@LIBDIR@
+ includedir=${prefix}/include
+ 
+ Name: STFL
diff --git a/dev-libs/stfl/stfl-0.24.ebuild b/dev-libs/stfl/stfl-0.24-r3.ebuild
index 063edf019c58..f05ef3b01cb9 100644
--- a/dev-libs/stfl/stfl-0.24.ebuild
+++ b/dev-libs/stfl/stfl-0.24-r3.ebuild
@@ -12,7 +12,7 @@ SRC_URI="http://www.clifford.at/${PN}/${P}.tar.gz"
 
 LICENSE="LGPL-3"
 SLOT="0"
-KEYWORDS="amd64 ppc ~ppc64 x86"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86"
 IUSE="examples perl python ruby static-libs"
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 
@@ -33,23 +33,25 @@ PATCHES=(
 	"${FILESDIR}/${PN}-0.21-python.patch"
 	"${FILESDIR}/${PN}-0.22-soname-symlink.patch"
 	"${FILESDIR}/${PN}-0.22-ruby-sharedlib.patch"
+	"${FILESDIR}/${PN}-0.22-pc-libdir.patch"
 )
 
 src_prepare() {
+	default_src_prepare
 	sed -i \
 		-e 's/-Os -ggdb//' \
 		-e 's/^\(all:.*\) example/\1/' \
 		-e 's/$(CC) -shared/$(CC) $(LDFLAGS) -shared/' \
 		-e 's/ -o $@ $(LDLIBS) $^/ $^ $(LDLIBS) -o $@/' \
 		-e 's/-lncursesw/-lncursesw -pthread/' \
+		-e 's/\<ar\>/$(AR)/' \
+		-e 's/\<ranlib\>/$(RANLIB)/' \
 		Makefile || die "sed failed"
 
 	if ! use static-libs ; then
 		sed -i -e "/install .* libstfl.a/d" Makefile || die
 	fi
 
-	eapply_user
-
 	if use perl ; then
 		echo "FOUND_PERL5=1" >> Makefile.cfg
 	else
@@ -68,7 +70,7 @@ src_prepare() {
 src_configure() { :; }
 
 src_compile() {
-	emake CC="$(tc-getCC)"
+	emake CC="$(tc-getCC)" AR="$(tc-getAR)" RANLIB="$(tc-getRANLIB)"
 
 	if use python ; then
 		local BUILD_DIR="${S}/python"