gentoo resync : 29.01.2021

3 files changed, 3 insertions, 74 deletions

diff --git a/dev-lua/lua-utf8/Manifest b/dev-lua/lua-utf8/Manifest
index 6376c8c13e27..624583a0bc78 100644
--- a/dev-lua/lua-utf8/Manifest
+++ b/dev-lua/lua-utf8/Manifest
@@ -1,4 +1,3 @@
 DIST lua-utf8-0.1.3.tar.gz 41830 BLAKE2B 72982c7ec8d8837e391fa6bfb689c1e9f4a7746d0cbc058556f06027b4af00c936036f87baf58f45e1169fd3ea7e6d8174629d5a7279205622cf0710971ca29c SHA512 d0abe73fecbfeba36083c135d77962d953ad9e431721a2557669c912a2703e31c46f84f2ee9ee4ac966a5bcc88d4daef930f8d2d8e72106fa61010509c183e29
-EBUILD lua-utf8-0.1.3-r100.ebuild 1483 BLAKE2B b6a26a8189ccd3827be307d6be311fad82860c47c168cf382174933ed479071f359b046080fe4870076d87b7aeab3ab14c908749cc608d0dd17dc721065df19a SHA512 3c5666cc402e5f6fe71de35209d0ada6bb81ae1bd23d1c1bb753cfb76728c64c00fb4b755faed5c26fd52dd67348f3bd0a715f46db8d41a37862229865648e4e
-EBUILD lua-utf8-0.1.3.ebuild 1348 BLAKE2B e67ac408b457fa7b8d3228f63e62ccfbda4addaae4df8a4f4ce73bf30dc7a06aaa2c5ddf7706ef1edd24ebc5de8ec55f2ba7adac1db80ae32ff19f1d27a84d2b SHA512 eeeb848f9a1d5ce2e4f553005cd6f45ceed6c60eb93538167e22c0777d73deb94cdf1087db0167873b9844e2f6ab1bcb70e110e2a99e2d0d1cfcb1a791994935
+EBUILD lua-utf8-0.1.3-r100.ebuild 1482 BLAKE2B bb0709fa672e87b89ff1f5f946f2da6d80ee16720ea9abae8d6925cac29aeda06e400a0844dfdb0ccb6e2c94a7505cc0141de946a8e982a3ddbccd49b81233aa SHA512 f775e8a27d98709383deefedb51d2a3d601d8c6b5ba099267a595a079d5fa04886326644f27d86eef99756292000c38fa723f8a1d8b90ff4eff59b67deca3df0
 MISC metadata.xml 750 BLAKE2B 95215f3aed5389197a071e67411702a07102387343c568c02b48ada5b2f3c0f01b99bb895bd4f11e2c558fc7d352da1afece2b46ea6d63edbfa322ccc7c651cd SHA512 cf8fd4d207d9827fb1a7349f89fa0faf0d1ad38989ebc29dabde5dcee73e718183655a1b8c9f0074f16ea7878bd1d4dbf7e53f65f5003946fddf901c9568d4cd
diff --git a/dev-lua/lua-utf8/lua-utf8-0.1.3-r100.ebuild b/dev-lua/lua-utf8/lua-utf8-0.1.3-r100.ebuild
index 48e0614d06d8..9b4ced69dc39 100644
--- a/dev-lua/lua-utf8/lua-utf8-0.1.3-r100.ebuild
+++ b/dev-lua/lua-utf8/lua-utf8-0.1.3-r100.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2020 Gentoo Authors
+# Copyright 2020-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -14,7 +14,7 @@ S="${WORKDIR}/${PN//-/}-${PV}"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 arm arm64 ppc ppc64 x86"
 IUSE="test"
 REQUIRED_USE="${LUA_REQUIRED_USE}"
 RESTRICT="!test? ( test )"
diff --git a/dev-lua/lua-utf8/lua-utf8-0.1.3.ebuild b/dev-lua/lua-utf8/lua-utf8-0.1.3.ebuild
deleted file mode 100644
index 71e19b9f460a..000000000000
--- a/dev-lua/lua-utf8/lua-utf8-0.1.3.ebuild
+++ /dev/null
@@ -1,70 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit toolchain-funcs
-
-DESCRIPTION="A UTF-8 support module for Lua and LuaJIT"
-HOMEPAGE="https://github.com/starwing/luautf8"
-SRC_URI="https://github.com/starwing/luautf8/archive/${PV}.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}/${PN//-/}-${PV}"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 ppc ppc64 x86"
-IUSE="luajit test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	luajit? ( dev-lang/luajit:2 )
-	!luajit? ( >=dev-lang/lua-5.1:0= )
-"
-DEPEND="${RDEPEND}"
-BDEPEND="virtual/pkgconfig"
-
-src_compile() {
-	local compiler=(
-		"$(tc-getCC)"
-		"${CFLAGS}"
-		"-fPIC"
-		"${LDFLAGS}"
-		"-I/usr/include"
-		"-c lutf8lib.c"
-		"-o lutf8lib.o"
-	)
-	einfo "${compiler[@]}"
-	${compiler[@]} || die
-
-	local linker=(
-		"$(tc-getCC)"
-		"-shared"
-		"${LDFLAGS}"
-		"-o lutf8lib.so"
-		"lutf8lib.o"
-	)
-	einfo "${linker[@]}"
-	${linker[@]} || die
-}
-
-src_test() {
-	local mytests=(
-		"test.lua"
-		"test_compat.lua"
-		"test_pm.lua"
-	)
-
-	for mytest in ${mytests[@]}; do
-		LUA_CPATH="${S}/lutf8lib.so" $(usex luajit 'luajit' 'lua') ${mytest} || die
-	done
-}
-
-src_install() {
-	exeinto "$($(tc-getPKG_CONFIG) --variable INSTALL_CMOD lua)"
-	newexe "lutf8lib.so" "lua-utf8.so"
-
-	insinto "$($(tc-getPKG_CONFIG) --variable INSTALL_LMOD lua)"
-	doins parseucd.lua
-
-	einstalldocs
-}