gentoo resync : 13.11.2021

5 files changed, 15 insertions, 3 deletions

diff --git a/dev-lua/Manifest.gz b/dev-lua/Manifest.gz
index 96b06e0d6f73..7cbecc834846 100644
--- a/dev-lua/Manifest.gz
+++ b/dev-lua/Manifest.gz
diff --git a/dev-lua/luadbi/Manifest b/dev-lua/luadbi/Manifest
index 0c9988c8e3ca..48342b0f801f 100644
--- a/dev-lua/luadbi/Manifest
+++ b/dev-lua/luadbi/Manifest
@@ -1,4 +1,4 @@
 AUX luadbi-0.7.2-mysql-8.patch 1920 BLAKE2B 5b8f65c9a6966df0bd18487e09effc073fb4ce9ed7913e1b9397ae722a2fe8cc04bcd8f5dce403fc5181fef8f95bdf71bffd00cb5b99932c6cf48e00daa49175 SHA512 436aa613eb420126f158103bc7c36cb3cc2a680c76d32e6239c2b310b7367bd5275c85640645d904ffee059b970095e8176df23dbca8b54aa13f436a619e2f6f
 DIST luadbi-0.7.2.tar.gz 36462 BLAKE2B 581c7353bfa36b3f6cabed2df78372f8810300bf4525bf8d370e61d469f9daa5a5c40c58916164a8d0a621a61e983e85c67b23ef03f51212be79f09ad8512047 SHA512 891f99cbc8f1b5327ef820641a1608abf41410f2f28584b975cc3cf65154b9bebf6f1b9ca7d1818b9c965738ad700dd17ae042dfd2a7146cf755871ebae535b9
-EBUILD luadbi-0.7.2-r102.ebuild 1841 BLAKE2B 67fa67fc8d788c2e72d86c20bee23361afcda237b098a39201773112ecf00e10fd06b296b9431617ed6cd839c1b36147b1696bcbcff7c41348f9b4faa9844bb9 SHA512 b5ff0c0801bc55cb42814f7a2abf519d7c2a5282c3d12589bce1dea581b093e5556a82918b8c56e7062b674c1e64c34cbe4ff9ad6bc6000be83504639259a2b4
+EBUILD luadbi-0.7.2-r103.ebuild 1969 BLAKE2B 5020fd3a1aa193b8214b81e8d6d3a8e2c93033ea12dbb709ec12446b12471eb79ea951e0e92d1a511a65b5a2b64ab4a49e51f673483798f8ed15d7a7c23485d4 SHA512 23c7eae1eab3e2871c2ef9b73b2648d1765794e32a3d5e3a656045c09a7ec27af14c2bfa84f338e1c247dbd7a3e85893906dbf6d321d13631254a18b8621897c
 MISC metadata.xml 329 BLAKE2B 63f2efc683cb8c68fc27953c6003708f965328cc4b445e5b62c1cffc85e79c9971ef4bfca6ae6b7a95179c3ad13e9374a2d0f1e06518403902a461d7598ade72 SHA512 c1f454ba961c109a06e0a06e85ad426dc6d6cc5697e6c2ceda3fe003242c1d50ef5c71fa0a84201d0a20b7d22bdf1ab597ff780b681a3a32e08c14457f7a2081
diff --git a/dev-lua/luadbi/luadbi-0.7.2-r102.ebuild b/dev-lua/luadbi/luadbi-0.7.2-r103.ebuild
index a10d25b72e03..c158bd4ebfd0 100644
--- a/dev-lua/luadbi/luadbi-0.7.2-r102.ebuild
+++ b/dev-lua/luadbi/luadbi-0.7.2-r103.ebuild
@@ -45,9 +45,13 @@ src_prepare() {
 
 	# Respect users CFLAGS
 	sed -e 's/-g //' -e 's/-O2 //g' -i Makefile || die
+
+	lua_copy_sources
 }
 
 lua_src_compile() {
+	pushd "${BUILD_DIR}" || die
+
 	tc-export AR CC
 
 	local myemakeargs=(
@@ -57,6 +61,8 @@ lua_src_compile() {
 	use mysql && emake ${myemakeargs} MYSQL_INC="-I$(mariadb_config --libs)" mysql
 	use postgres && emake ${myemakeargs} PSQL_INC="-I$(pg_config --libdir)" psql
 	use sqlite emake ${myemakeargs} SQLITE3_INC="-I/usr/include" sqlite
+
+	popd
 }
 
 src_compile() {
@@ -64,7 +70,9 @@ src_compile() {
 }
 
 lua_src_test() {
+	pushd "${BUILD_DIR}" || die
 	cd "${S}"/tests && ${ELUA} run_tests.lua || die
+	popd
 }
 
 src_test() {
@@ -72,6 +80,8 @@ src_test() {
 }
 
 lua_src_install() {
+	pushd "${BUILD_DIR}" || die
+
 	local myemakeargs=(
 		DESTDIR="${ED}"
 		LUA_CDIR="$(lua_get_cmod_dir)"
@@ -82,6 +92,8 @@ lua_src_install() {
 	use mysql && emake ${myemakeargs[@]} install_mysql
 	use postgres && emake ${myemakeargs[@]} install_psql
 	use sqlite && emake ${myemakeargs[@]} install_sqlite3
+
+	popd
 }
 
 src_install() {
diff --git a/dev-lua/mpack/Manifest b/dev-lua/mpack/Manifest
index 155b81e074a4..ed7e67986fb6 100644
--- a/dev-lua/mpack/Manifest
+++ b/dev-lua/mpack/Manifest
@@ -1,5 +1,5 @@
 DIST mpack-1.0.8.tar.gz 15616 BLAKE2B 06593296d1d36459127bf35eaeb37c894a0c0c6ccff0969cd0a82bee1920a715801db26f0ba0bc54a56399d07efc262666ee4ce79878288a5c0221fd27febea1 SHA512 6d21cc6bbdee583a1d808742991459e4b1796f347b2f4eaa747b576f5bb1ca989123339120e43246bac859c20e6f46ac57116ce9f135157256fecbd8cf817f75
 DIST mpack-1.0.9.tar.gz 16087 BLAKE2B 062f0deaa9ea359486933b5736591ea3ee78886e31259b721d88ef44762403185b881d076ca35fe6e8c16ab756d36698fec1ca893ab3667635e388456a8ad417 SHA512 c663a6cb29c1ae3f88baf25d36b076c35b35b96a16f9df472f8063009dc70886071cc27bf9224aceb86afb5c590ac072fd484435f40ecc4961eabfb5df08f395
 EBUILD mpack-1.0.8-r100.ebuild 2300 BLAKE2B f00cb2c108e6bea4f5f69550442947189d50ff15904e07444badd9ce59698638fd357473aa16c962dce4e1e1a3bcef6aa25bd97936160ff570f1f11820b8c2be SHA512 31505f52bdb79d8165d0c622ca9d7b111d4ca72a91cca87626a06dedd27d5b89ab70c4a73b3186808074ede6dc6672f0cbde8f785a43d436b24573ab63e14de2
-EBUILD mpack-1.0.9.ebuild 2295 BLAKE2B 497b611896fd5110c5c6b423357544920c536f57fb37d19378c30fbfaca2ee0fca937f64480630145809c545d4a4267457665ce2f46a866519d2f2a8f3cd2889 SHA512 c845b69773c2600f76515b46fcf64856621ede5d0b88b25dcca5f3cfcfa0a1902891491dc865861bb248fa86ce510fe2ffb2c8c3d3c1e7d6d36608124243ed93
+EBUILD mpack-1.0.9.ebuild 2300 BLAKE2B f00cb2c108e6bea4f5f69550442947189d50ff15904e07444badd9ce59698638fd357473aa16c962dce4e1e1a3bcef6aa25bd97936160ff570f1f11820b8c2be SHA512 31505f52bdb79d8165d0c622ca9d7b111d4ca72a91cca87626a06dedd27d5b89ab70c4a73b3186808074ede6dc6672f0cbde8f785a43d436b24573ab63e14de2
 MISC metadata.xml 337 BLAKE2B 552e6b193055ff86ce3bc29ec14b7ba72bf99ba5458c8588af1d53b6d393759118103d95f9b3e3f4c8582b19f7daccf0a5b619a8b171f5c74e2a8ad4f0648875 SHA512 6cc2098e7e31232ff9b6aa2cecfe7f9cde61d1ee36efb190d87330a5b6088a9d43f999d3cbce632925c01e35806c09022170230934f526febe1bd24c384b3ce1
diff --git a/dev-lua/mpack/mpack-1.0.9.ebuild b/dev-lua/mpack/mpack-1.0.9.ebuild
index e31c8d100fa4..b403ed3deab8 100644
--- a/dev-lua/mpack/mpack-1.0.9.ebuild
+++ b/dev-lua/mpack/mpack-1.0.9.ebuild
@@ -16,7 +16,7 @@ S="${WORKDIR}/${MY_PN}-${PV}"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x64-macos"
+KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc x86 ~x64-macos"
 IUSE="test"
 REQUIRED_USE="${LUA_REQUIRED_USE}"
 RESTRICT="!test? ( test )"