gentoo resync : 05.12.2021

3 files changed, 2 insertions, 96 deletions

diff --git a/dev-lua/luasocket/Manifest b/dev-lua/luasocket/Manifest
index 3828eebe5ab2..8687ed10e69d 100644
--- a/dev-lua/luasocket/Manifest
+++ b/dev-lua/luasocket/Manifest
@@ -1,6 +1,5 @@
 AUX luasocket-3.0_rc1_p20200328_makefile.patch 2886 BLAKE2B df7b5a9c060cfa3516207c4b652c467c490fe3821ca21f709bb9fe1cafe8a41815874074857498fe073913820646c1fb627060d61267d57a2278b06b5ed731ce SHA512 3abb11d0f32e8f1a4cd95b8eec706b871600e1cbfd55288c26aa2975662000dd3393b865a7a293f5dc6b51bc703dba3844cfb4e83cdbbc753e4ea697f9b8901a
 AUX luasocket-3.0_rc1_p20200328_publish_API.patch 10781 BLAKE2B 783e223732aec39b4c7a7b6c49f051d6c3e9c8f1c8b1e91df68265598b9d1a5929f7dff21642d0ea4aba6a2d5ebda6cdf0eb2e567b6f996d260e8119da704952 SHA512 697d37344684bf6943ca360d1b25440e7b678b12e7cf0735c62985deb32862351ec63d8a6192dc732fd832dc16a9172e3ff13ccce52aeca4f4665bcf4555ef2c
 DIST luasocket-3.0_rc1_p20200328.tar.gz 335628 BLAKE2B 9e5d3e415337903b689705669b586c4481179a319b4e3428823c8f442d04f26db86bfeca66db7e58d157e31431c31e4f687403f7163b75f57d6f87cdb934717f SHA512 bdf7086a0504b0072b9cfd1266fc4ae89504053801722859a426f567fca00ed76f4c295c2a3a968e93f0036d9b792cf97561e9baa82c09ea23999cfd473227eb
-EBUILD luasocket-3.0_rc1_p20200328-r102.ebuild 1829 BLAKE2B a05a297f6fe9bdb8e4ec0a08b443c721626339fc22f9cca14b271aa30773ea5605018da75719c903260a0a8407ea10bc1e15bdb97211c6207545bdaa0d595b51 SHA512 dfe60d5b4ead58b3b5523da92b25cc2050e0624aa532d10fed58219ef900f45f3c11c4425534e20f9da00a7d8346bd2d740cf45b60d9f6c9e05a7446f5f959d5
-EBUILD luasocket-3.0_rc1_p20200328-r103.ebuild 1726 BLAKE2B 8a11b01eeade6275f5f92ddc54664d5ca8a3c7a654e83aa54efe5aa3cffced57d1c13d72210f645f190572bb5ae4273ecd65913926d8e0d905887652301f370c SHA512 cb646e6e62a6621caa91e7af970e737abb597cd7169af468ea1a988db69c7f2235349fceb0fda89f9ce32454fd572db931f5c9b94b007be49c3c2f231d24cb43
+EBUILD luasocket-3.0_rc1_p20200328-r103.ebuild 1719 BLAKE2B 18d04f607f605218e58163e96b6eaf0592039957173ea5724c8c763b5b8130838cfe4ed80da51ca9e7d1e2abfb7562cc5257a565e71398bf0311002880d5e074 SHA512 bb1c8925541bdaa0008c75e7f8c9b0d2d58148e944e308eecf82b27e659931aa0a6e2c0649a7093a0cef07e3fd75d83e1b0b8a2984e245a84b3223a82ff48cc2
 MISC metadata.xml 603 BLAKE2B 594c4454fadefcc94e1697d28300a12ccd373f365543fab2cdc3b9a90a6fd4d614b13705026a2a9956aaeab78e88ca10ef608e96c968b20825340503e5675537 SHA512 03612e81cc1d8e9279a16270d5eb391917798fca0148616e2e99aa2994f109d34ac657a89d0d3cfd853af372d7fdc14703f97c1cbc5ca7f8a63f07f0eee93259
diff --git a/dev-lua/luasocket/luasocket-3.0_rc1_p20200328-r102.ebuild b/dev-lua/luasocket/luasocket-3.0_rc1_p20200328-r102.ebuild
deleted file mode 100644
index 5b124acb9064..000000000000
--- a/dev-lua/luasocket/luasocket-3.0_rc1_p20200328-r102.ebuild
+++ /dev/null
@@ -1,93 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-EGIT_COMMIT="5b18e475f38fcf28429b1cc4b17baee3b9793a62"
-LUA_COMPAT=( lua5-{1..4} luajit )
-MY_P="${PN}-${EGIT_COMMIT}"
-
-inherit flag-o-matic lua toolchain-funcs
-
-DESCRIPTION="Networking support library for the Lua language"
-HOMEPAGE="
-	http://www.tecgraf.puc-rio.br/~diego/professional/luasocket/
-	https://github.com/diegonehab/luasocket
-"
-SRC_URI="https://github.com/diegonehab/${PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}/${MY_P}"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86"
-REQUIRED_USE="${LUA_REQUIRED_USE}"
-RESTRICT="test"
-
-RDEPEND="${LUA_DEPS}"
-DEPEND="${RDEPEND}"
-BDEPEND="virtual/pkgconfig"
-
-HTML_DOCS="doc/."
-
-src_prepare() {
-	default
-
-	# Respect users CFLAGS
-	sed -e 's/-O2 -ggdb3//g' -i src/makefile || die
-
-	# Workaround for 32-bit systems
-	append-cflags -fno-stack-protector
-
-	lua_copy_sources
-}
-
-lua_src_compile() {
-	pushd "${BUILD_DIR}" || die
-
-	local myemakeargs=(
-		"CC=$(tc-getCC)"
-		"LD=$(tc-getCC)"
-		"LDFLAGS_linux=-O -fpic -shared -o"
-		"LUAINC_linux=$(lua_get_include_dir)"
-		"LUAV=${ELUA}"
-		"MIME_V=1.0.3-${ELUA}"
-		"MYCFLAGS=${CFLAGS}"
-		"MYLDFLAGS=${LDFLAGS}"
-		"SOCKET_V=3.0-rc1-${ELUA}"
-	)
-
-	emake "${myemakeargs[@]}" all
-
-	popd
-}
-
-src_compile() {
-	lua_foreach_impl lua_src_compile
-}
-
-lua_src_install() {
-	pushd "${BUILD_DIR}" || die
-
-	local myemakeargs=(
-		"CDIR=$(lua_get_cmod_dir)"
-		"DESTDIR=${ED}"
-		"LDIR=$(lua_get_lmod_dir)"
-		"LUAPREFIX_linux="
-		"MIME_V=1.0.3-${ELUA}"
-		"SOCKET_V=3.0-rc1-${ELUA}"
-	)
-
-	emake "${myemakeargs[@]}" install
-	emake "${myemakeargs[@]}" install-unix
-
-	insinto "$(lua_get_include_dir)"/luasocket
-	doins src/*.h
-
-	popd
-}
-
-src_install() {
-	lua_foreach_impl lua_src_install
-
-	einstalldocs
-}
diff --git a/dev-lua/luasocket/luasocket-3.0_rc1_p20200328-r103.ebuild b/dev-lua/luasocket/luasocket-3.0_rc1_p20200328-r103.ebuild
index 6011ad7d5976..58fe8d5c2285 100644
--- a/dev-lua/luasocket/luasocket-3.0_rc1_p20200328-r103.ebuild
+++ b/dev-lua/luasocket/luasocket-3.0_rc1_p20200328-r103.ebuild
@@ -19,7 +19,7 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86"
 REQUIRED_USE="${LUA_REQUIRED_USE}"
 RESTRICT="test"