gentoo christmass resync : 25.12.2020

3 files changed, 20 insertions, 2 deletions

diff --git a/dev-lua/lua-openssl/Manifest b/dev-lua/lua-openssl/Manifest
index b4ef7a6e5fd0..c07258a805d4 100644
--- a/dev-lua/lua-openssl/Manifest
+++ b/dev-lua/lua-openssl/Manifest
@@ -1,6 +1,6 @@
 DIST lua-auxiliar-8d09895473b73e4fb72b7573615f69c36e1860a2.tar.gz 3690 BLAKE2B 8e31e8ad75bcc5840223068fdc9b634c2cbc42d713bba0792a0b04f8e018e36e3bab16a07aaa725d8b2bbd55c3a74271a21366c2cde1b4c6bd735c9438efedec SHA512 c461c23cd50ef43aa37ce2c819a9a485ead1011ecb5ff083a092e49ac79d5398aff1631f441cb8e59acd820024ed51e74420b74da751c0fccd2cfce94f039952
 DIST lua-compat-5.3-0.10.tar.gz 53695 BLAKE2B e570aedb23b8ed7ca38c4316ffab25b93a0f9f6f0fae79af563ca8a81dd6453ac273e1f9e70674c484a2dec68749e7d53a1c1736a72616c210b8e38a31b3f191 SHA512 f7f39085f4f6b16095f41e635b4c5477b3dab5e42b5b65a9d522941a3807ea521d4a27a77293a3c9d0ecea78a1f6c2a2497394b2d220f4d7d65e23510563d46d
 DIST lua-openssl-0.7.8_p0.tar.gz 397072 BLAKE2B 048ae34c195f6f0ff252f33d14a7151b629d5b9ba828c331459e58f23f0ee62e66f00b8fdbe5665eb7f247d4bb97986e158ea89107189aba4199fcb878f2d724 SHA512 a23b5010633aec70639903fe4d0473101e42c2690456ff2d730c45ef4710134058bc6b3e364c79d3cf3dd4c323a89bd98f07a17d23f226b0bb7e0bb1f2be32c5
-EBUILD lua-openssl-0.7.8_p0-r100.ebuild 2449 BLAKE2B b7469b721fbc35db1e2bc9bccfa4f92e4b6b6b3ba18af5821e1ff973d5b550538f90a381a79bc0b07345e691e497f9f33dfc67cea36df85577856f32e41fb9db SHA512 20d039165bc638f24ab7275a02cfbb64f887fdf25a05613094450e27cc122e3dffb2238766ffadd98e2d65d041cae20fff1ac5c4a1798f50c57330772e2fdd3a
-EBUILD lua-openssl-0.7.8_p0-r2.ebuild 2510 BLAKE2B baf5e8d6b7015c761ada5e63a4c219b7efdb6b09012b298edab2db61f9c855c72147a4863bb9ae43feab4718b837b780dd2c50dd59c32949fc0fa56e5bdb8241 SHA512 c8bf27ce0796c1ddfb59c78308713865913a49c4f87ca7776541112aea85a6973292959944de034eeec2e122b0f3e07435a5fd29cb6976be4db70ac76a13b185
+EBUILD lua-openssl-0.7.8_p0-r101.ebuild 2638 BLAKE2B 462c64e0d256afcf119406a7a64e9acf0dccf84b933469a683633d850cc685f08ae299bc46b42477a1714eb76129996262ca0229562192d892280784690f35bb SHA512 2d9153f2a0edac78c06a40e60212c1828547df2cd446a0befad8d3fcd44e751ae4173b963cf5ef7b1326c9764e513f8973c31f5f020271e53369723a47f56d0c
+EBUILD lua-openssl-0.7.8_p0-r3.ebuild 2699 BLAKE2B 6493cd72c0100cf0d398c830fdf267eea082c255e43b8ffcd857c052ace9862755c1b8545c1b1a8cfbb8f69573aa3789f363cd54711e7472458055b8ff70bf60 SHA512 83db54985fb38adfde94305bcfea5a7f3c717c150fb42b86316652f8de75268d0cb8c8ed7b38e03f76dc44575748c770327f4876da50686936be3abdbfaf96f8
 MISC metadata.xml 555 BLAKE2B 3f448f76d768881d14d1ec6514ee525aac2acffa168943bab1b72f9f86889b5ba434d53e774ef296ec76cfa689f86935e40ad752617cdf43b3b534c4a74350ff SHA512 235a3193b4ced9f5515bd89ed60f32e06d32dbfced30cc05f9c67dd46ab3521cd916da1a46e96457abf2f9e1fd11df1d4d2874775ffeea3ad156db8cef118202
diff --git a/dev-lua/lua-openssl/lua-openssl-0.7.8_p0-r100.ebuild b/dev-lua/lua-openssl/lua-openssl-0.7.8_p0-r101.ebuild
index f8e40f03140f..812eb60b0a60 100644
--- a/dev-lua/lua-openssl/lua-openssl-0.7.8_p0-r100.ebuild
+++ b/dev-lua/lua-openssl/lua-openssl-0.7.8_p0-r101.ebuild
@@ -46,6 +46,9 @@ DOCS=( "README.md" "samples/." )
 src_prepare() {
 	default
 
+	# Allow override of LUA* variables
+	sed -e '/LUA  /s/:=/?=/g' -e '/LUA_VERSION/s/:=/?=/g' -i Makefile || die
+
 	# Prepare needed dependencies (source code files only)
 	rm -r deps/{auxiliar,lua-compat} || die
 	mv "${WORKDIR}/${MY_PN_AUX}-${EGIT_COMMIT_AUX}" deps/auxiliar || die
@@ -60,6 +63,7 @@ lua_src_compile() {
 	local myemakeargs=(
 		"AR=$(tc-getAR)"
 		"CC=$(tc-getCC)"
+		"LUA="
 		"LUA_CFLAGS=${CFLAGS} $(lua_get_CFLAGS)"
 		"LUA_LIBS=${LDFLAGS}"
 		"LUA_VERSION=$(ver_cut 1-2 $(lua_get_version))"
@@ -80,6 +84,8 @@ lua_src_test() {
 
 	local myemakeargs=(
 		"LUA=${ELUA}"
+		"LUA_CFLAGS="
+		"LUA_LIBS="
 		"LUA_VERSION=$(ver_cut 1-2 $(lua_get_version))"
 		"TARGET_SYS=${CTARGET:-${CHOST}}"
 	)
@@ -97,7 +103,10 @@ lua_src_install() {
 	pushd "${BUILD_DIR}" || die
 
 	local myemakeargs=(
+		"LUA="
+		"LUA_CFLAGS="
 		"LUA_LIBDIR=${ED}/$(lua_get_cmod_dir)"
+		"LUA_LIBS="
 		"LUA_VERSION=$(ver_cut 1-2 $(lua_get_version))"
 		"TARGET_SYS=${CTARGET:-${CHOST}}"
 	)
diff --git a/dev-lua/lua-openssl/lua-openssl-0.7.8_p0-r2.ebuild b/dev-lua/lua-openssl/lua-openssl-0.7.8_p0-r3.ebuild
index c8c126b8cb44..88652952c1f3 100644
--- a/dev-lua/lua-openssl/lua-openssl-0.7.8_p0-r2.ebuild
+++ b/dev-lua/lua-openssl/lua-openssl-0.7.8_p0-r3.ebuild
@@ -45,6 +45,9 @@ DOCS=( "README.md" "samples/." )
 src_prepare() {
 	default
 
+	# Allow override of LUA* variables
+	sed -e '/LUA  /s/:=/?=/g' -e '/LUA_VERSION/s/:=/?=/g' -i Makefile || die
+
 	# Prepare needed dependencies (source code files only)
 	rm -r deps/{auxiliar,lua-compat} || die
 	mv "${WORKDIR}/${MY_PN_AUX}-${EGIT_COMMIT_AUX}" deps/auxiliar || die
@@ -55,6 +58,7 @@ src_compile() {
 	local myemakeargs=(
 		"AR=$(tc-getAR)"
 		"CC=$(tc-getCC)"
+		"LUA="
 		"LUA_CFLAGS=${CFLAGS} -I$($(tc-getPKG_CONFIG) --variable includedir $(usex luajit 'luajit' 'lua'))"
 		"LUA_LIBS=${LDFLAGS}"
 		"LUA_VERSION=$($(tc-getPKG_CONFIG) --variable $(usex luajit 'abiver' 'V') $(usex luajit 'luajit' 'lua'))"
@@ -67,6 +71,8 @@ src_compile() {
 src_test() {
 	local myemakeargs=(
 		"LUA=$(usex luajit 'luajit' 'lua')"
+		"LUA_CFLAGS="
+		"LUA_LIBS="
 		"LUA_VERSION=$($(tc-getPKG_CONFIG) --variable $(usex luajit 'abiver' 'V') $(usex luajit 'luajit' 'lua'))"
 		"TARGET_SYS=${CTARGET:-${CHOST}}"
 	)
@@ -76,7 +82,10 @@ src_test() {
 
 src_install() {
 	local myemakeargs=(
+		"LUA="
+		"LUA_CFLAGS="
 		"LUA_LIBDIR=${ED}/$($(tc-getPKG_CONFIG) --variable INSTALL_CMOD $(usex luajit 'luajit' 'lua'))"
+		"LUA_LIBS="
 		"LUA_VERSION=$($(tc-getPKG_CONFIG) --variable $(usex luajit 'abiver' 'V') $(usex luajit 'luajit' 'lua'))"
 		"TARGET_SYS=${CTARGET:-${CHOST}}"
 	)