gentoo resync : 14.12.2020

4 files changed, 18 insertions, 13 deletions

diff --git a/dev-lua/luasystem/Manifest b/dev-lua/luasystem/Manifest
index a6c24510b3dd..86aec4cff939 100644
--- a/dev-lua/luasystem/Manifest
+++ b/dev-lua/luasystem/Manifest
@@ -2,7 +2,7 @@ AUX luasystem-0.2.0_p0-fix-makefile.patch 829 BLAKE2B 03d7eae8746d38837056b2d990
 AUX luasystem-0.2.1_p0-fix-makefile.patch 825 BLAKE2B 1732876603d8b5560bda1644de832d611e851bbe8c8edb7c1861c43b5496d47306a2f61d29087b83a0b8d87ecb2731572c2c3d149a19000c7173161bd0f326fd SHA512 980ee1089e4b2b45c54e0ac953bb441e5c31164417e64dbf3fd8f75010d50ddda84572fa0b8ed6101f1924a96a64de0ce31d4e24cf69f9f15d5c59b8f5ef8e3e
 DIST luasystem-0.2.0_p0.tar.gz 8058 BLAKE2B fd29eaec7fe2f49e933932a436be75678400fc55a275e412379e05ab5b9cfe2036dfc9e61f960caa29d3c4ab1d439f9ede7ff3cbe14a61287270cc3707660636 SHA512 b8c7ba30470cbf100cc3f14df31729778cfb0aabebe4d27ce42c19581a2585f878d86a29a2f73fd1bef4e5861e2a604d3c396a73f131fa99ae14a17cba52c336
 DIST luasystem-0.2.1_p0.tar.gz 8162 BLAKE2B ad8a6009823ad8202ff3884a3167d0779405c2a6be460b7ef2939622eb4d0fc8edbc6b04aba5dec9dd5e4e38f11ae0dcd582b9c348d5b516aa411858d55c6d71 SHA512 9dc323d4d1914cfa4f278a49ef22e58569d5cd7e369fa17fa6006cd47f9d90c6dfd4404067ea2436aa46a27cfbdf91e4aa26e20b89aeeefdf2aa7252c51fb32b
-EBUILD luasystem-0.2.0_p0.ebuild 1044 BLAKE2B 09dc31b189eec831c6d464eb802eb29b4846a45efe2c30e692e96c9f578ec71b480f82451e407b7fc36bca90065626090a209e75c761d07ef3f77df5d544d6cf SHA512 4c443043cb0b480975288d596d97af29c570e33f44ad7b634c7d86b5660f6e6d14556065ff15c4ed9990091d3a0d916ec3f4affeb32f763b6530258417a2b71f
-EBUILD luasystem-0.2.1_p0-r101.ebuild 1687 BLAKE2B 8a7fca76da37830a8dcd4986837beead2c91d98499e55221d3641e0f8f0be0b9b179c3587162cb8ff3a663c7a489ab858aa961f2424b1f0899dd1ef5bb4a5d9f SHA512 59a6ac5361e8c5c8232b499812a4cda72c54439cae0d050334d8aa5514b73112878dc8ad0210b0f9db8db926148b27b7bbab7cd6a61a2f9d3a17e664e44f3677
-EBUILD luasystem-0.2.1_p0.ebuild 1190 BLAKE2B 3b7990082b8f84302b3a13476600cb3065e9beaea604d4b5c780338b94c08412793d243b42a65207740ea4e82f331f22dbb3bd1eb3a8cca812146ef77f4363f4 SHA512 ef3d0a11177eb5fa2ce12ff74945ee4d7da5ee2e81aaadc5d6db9dc87764403d5f1d4fe26565a6fc231917091e022be0073a199c1cc18c9a62b1444240bb9ecb
+EBUILD luasystem-0.2.0_p0.ebuild 1045 BLAKE2B a79cd0fb2a4adac392a0a1d1669838e4cf21279cfaef42f2e2ffefa67117058096685988d622a35e0b8539e30978cda40a2ea6bdae720a4efeab771a24420f52 SHA512 4325ae337413822bf75705b987548eac51b22fcd8a11fd4e680d603c97b132f983bc0df9d22f9e397c0387f44502a43bb46fdad333fea22bb41149e39fc9d9d4
+EBUILD luasystem-0.2.1_p0-r102.ebuild 1522 BLAKE2B e4ec725c41c42528f8370e4b3a011fa6d5db4f6461dd06d5427ac9a9792566e688ed7e846c44e7ae889b9f13f77fb7d7145c44b880fd2608bd18d31eaaa34f52 SHA512 2f0fc6e801991809357edd2a67052962e653ba6c7b25589fd218501542acb28f8c56fc58f914cfb51c3399e541714787f912122c7ea00e44f5cf7e0d895d0a7a
+EBUILD luasystem-0.2.1_p0.ebuild 1190 BLAKE2B 310ef682388b1e8094064312fe6928cdf61b4328d2b4a65c95bd4345d0cba8c6dd756ec06d70870ea4fec7420aebbd2d5a56605f61e1c4e7b5d5adebade49341 SHA512 a0b661d31c520fd30eee72aafb90e46507ac9ad54f3d56d7857bd176647aea74328221e0a3d492e7487efcec2ad66caa7baf6dcb3a36a0e4866ef65f89969034
 MISC metadata.xml 591 BLAKE2B 9e8a3ce4bfe3031b55f3aa5193c124a8aa3da8907e6dfd97e60c59e4bb846a1aec0f1e2319f43178840a9b9e7517362d654a95c2f0871494482a70a20131e535 SHA512 23828de621a5ac7168e256b201af36343de97edbeb898d6d5e4f882bca88fe345914fc98f70d5e997d8b191dcf446f62250e4309cc2d3f84b9830b023088fa0e
diff --git a/dev-lua/luasystem/luasystem-0.2.0_p0.ebuild b/dev-lua/luasystem/luasystem-0.2.0_p0.ebuild
index 3ae2a0e67ed4..6446cfc61d64 100644
--- a/dev-lua/luasystem/luasystem-0.2.0_p0.ebuild
+++ b/dev-lua/luasystem/luasystem-0.2.0_p0.ebuild
@@ -19,7 +19,7 @@ SLOT="0"
 KEYWORDS="amd64 arm ppc ppc64 x86"
 IUSE=""
 
-COMMON_DEPEND=">=dev-lang/lua-5.1:="
+COMMON_DEPEND=">=dev-lang/lua-5.1:0="
 DEPEND="${COMMON_DEPEND}
 	virtual/pkgconfig"
 RDEPEND="${COMMON_DEPEND}"
diff --git a/dev-lua/luasystem/luasystem-0.2.1_p0-r101.ebuild b/dev-lua/luasystem/luasystem-0.2.1_p0-r102.ebuild
index cbc542df1f37..2411804a12d5 100644
--- a/dev-lua/luasystem/luasystem-0.2.1_p0-r101.ebuild
+++ b/dev-lua/luasystem/luasystem-0.2.1_p0-r102.ebuild
@@ -24,13 +24,19 @@ DEPEND="${RDEPEND}"
 BDEPEND="
 	virtual/pkgconfig
 	test? (
-		>=dev-lua/busted-2.0.0-r100[${LUA_USEDEP}]
+		dev-lua/busted[${LUA_USEDEP}]
 		${RDEPEND}
 	)
 "
 
 PATCHES=( "${FILESDIR}"/${P}-fix-makefile.patch )
 
+src_prepare() {
+	default
+
+	lua_copy_sources
+}
+
 lua_src_test() {
 	busted --lua=${ELUA} || die
 }
@@ -40,8 +46,7 @@ src_test() {
 }
 
 lua_src_compile() {
-	# Clean project, to compile it for every lua slot
-	emake clean
+	pushd "${BUILD_DIR}" || die
 
 	local myemakeargs=(
 		"CC=$(tc-getCC)"
@@ -53,8 +58,7 @@ lua_src_compile() {
 
 	emake "${myemakeargs[@]}" linux
 
-	# Copy module to match the choosen LUA implementation
-	cp "src/core.so" "src/core-${ELUA}.so" || die
+	popd
 }
 
 src_compile() {
@@ -62,8 +66,7 @@ src_compile() {
 }
 
 lua_src_install () {
-	# Use correct module for the choosen LUA implementation
-	cp "src/core-${ELUA}.so" "src/core.so" || die
+	pushd "${BUILD_DIR}" || die
 
 	local emakeargs=(
 		"INSTALL_TOP_CDIR=${ED}/$(lua_get_cmod_dir)"
@@ -75,6 +78,8 @@ lua_src_install () {
 
 	insinto $(lua_get_lmod_dir)/system
 	doins system/init.lua
+
+	popd
 }
 
 src_install() {
diff --git a/dev-lua/luasystem/luasystem-0.2.1_p0.ebuild b/dev-lua/luasystem/luasystem-0.2.1_p0.ebuild
index bcbec5c1f81b..5b23c11d98c5 100644
--- a/dev-lua/luasystem/luasystem-0.2.1_p0.ebuild
+++ b/dev-lua/luasystem/luasystem-0.2.1_p0.ebuild
@@ -16,7 +16,7 @@ SRC_URI="https://github.com/LuaDist2/luasystem/archive/${MY_PV}.tar.gz ->
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 arm arm64 ppc ~ppc64 x86"
+KEYWORDS="~amd64 arm arm64 ppc ppc64 x86"
 IUSE="luajit test"
 
 RESTRICT="!test? ( test )"
@@ -28,7 +28,7 @@ BDEPEND="
 		dev-lua/busted
 	)"
 RDEPEND="
-	!luajit? ( >=dev-lang/lua-5.1:= )
+	!luajit? ( >=dev-lang/lua-5.1:0= )
 	luajit? ( dev-lang/luajit:2 )"
 DEPEND="${RDEPEND}"