gentoo resync : 25.11.2020

5 files changed, 182 insertions, 69 deletions

diff --git a/dev-lua/luasocket/Manifest b/dev-lua/luasocket/Manifest
index 0ca2f25f2929..964e87c6bdff 100644
--- a/dev-lua/luasocket/Manifest
+++ b/dev-lua/luasocket/Manifest
@@ -1,5 +1,7 @@
 AUX proxy-fix.patch 1026 BLAKE2B 6dde53833c9b35e059a4c1e7052cb494b4e1ceb2dc496a2d090e80fc2a1bfd1a30d014bb4c9f04425665cc00faa29fd434077a13e54cb73af0699363602e3aab SHA512 8b1b440936eceea4352876b24099bd9250c28c78a104f3722a65690a756f831f025257d940f1d9189e8ac023ab4b226b16c901214de59306bac96353a5adfe12
 DIST luasocket-3.0_rc1.tar.gz 328598 BLAKE2B 9cc382d909cfa018edec237ac901220cccb0cf0e3a775b9cd8083487ace42a94dfd280f9423097f677f37ee9f85afcfff844250cd49c0f813b7c50c3adc532c5 SHA512 f6efce259aaacaa11472911471f8a13b118fe009b8953a82c6aa18b9ec829cd1293180904e56935cb130d36d267e3f27c91db2d78e03f7488f3e100571ed0540
-EBUILD luasocket-3.0_rc1-r4.ebuild 1200 BLAKE2B 195a0adc1922c68d5ec34b9e918a5f95e7fda0144c2f6b67970523885e3c77375ee184421804de32b41930a7b5f7c5f70e22030362423e4f4dbcc27591239e98 SHA512 ddec5f0f99583101aa5a3524e783d3aec40522c8ab5552ff0b762e0908c19d47eaec8e7a84bee96053ab98a9b9d7d17926ff93bbb7632841545354e58fdce980
+DIST luasocket-3.0_rc1_p20200328.tar.gz 335628 BLAKE2B 9e5d3e415337903b689705669b586c4481179a319b4e3428823c8f442d04f26db86bfeca66db7e58d157e31431c31e4f687403f7163b75f57d6f87cdb934717f SHA512 bdf7086a0504b0072b9cfd1266fc4ae89504053801722859a426f567fca00ed76f4c295c2a3a968e93f0036d9b792cf97561e9baa82c09ea23999cfd473227eb
 EBUILD luasocket-3.0_rc1-r5.ebuild 1269 BLAKE2B 2d68f6772b9b9b64f6e4a7019fe0fbb0d1b06853b22dbf6b25df7e1009fc9cadf71d011ce25192533b2327e9c9a0e696922da36e37e979ebcb684c385fc38be3 SHA512 e26279b51433c160b3eeed4891684ef339c711986ffd6bce5f0b89b714bcdaac792b033cf6a28558be8c5660dd12258e513a7025465a34be53e07e4130bbae39
-MISC metadata.xml 477 BLAKE2B 52f02912583a3e2ab7d848bbfa824053e739efd616e07f73ffa49e8224f2b96da7007ee3d6e4fcbc613d9fbf92749d36f9db6f06cf2602f5df7fd6b9336fb310 SHA512 ea7c6680247c77e364316be205f5845357d940c6efd38e8f9ce2575afd02012a544cd859903f25255893653c1ab9afd3403fb67a5e9dc5469fc7bbf4b94d7677
+EBUILD luasocket-3.0_rc1_p20200328-r100.ebuild 1948 BLAKE2B 520cca570a1bc4a66d6bfbf4668a035857265d983a13159b630445333df23d5959098752288a509fd27e2352a00c66af2c1bf129c9835eb79ac7a6eb9cdb3163 SHA512 b9631e0d568994989ef221f5bade7d3c67346638a3827787f53fe5f4052aa6d74843b08b9d0accae75a3b574d7d4d6c203697454bad48edc5a74461ea595d314
+EBUILD luasocket-3.0_rc1_p20200328.ebuild 1824 BLAKE2B acd961363bba7bd85d0437f2b81712863becfefef7cb76172b9ae88a189065ee5a5ae5035a35923df1a9de96ab2df04fa624ef8fefae3a952d27ae13f1e86309 SHA512 afc8bf466ffcd25e15899e043a7fa5fd9cad9d3025abb8931c14471b53a12b8262d3f714ed3b611f4216c131d5cf2cff9ba0790642bb2cd8199d42d729f13b98
+MISC metadata.xml 572 BLAKE2B 22a011f8d4e4f921389561208866b4740ac3d16bd8868958ec3aa06cded706d3444b9cb24fa79f2ecedd1d315ce6f2e6b95853eada6abe404cc49225ed291ef0 SHA512 6a4010f7f130b00f9819677e701496b056fbd9ee382881f2efe61877dcefae594cc8dbeab688ed99822e9335e0b484d4774a0209f47aa8527f6f95a134382b0c
diff --git a/dev-lua/luasocket/luasocket-3.0_rc1-r4.ebuild b/dev-lua/luasocket/luasocket-3.0_rc1-r4.ebuild
deleted file mode 100644
index edede5c979ef..000000000000
--- a/dev-lua/luasocket/luasocket-3.0_rc1-r4.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit multilib multilib-minimal flag-o-matic 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/v${PV/_/-}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 arm ~arm64 hppa ~mips ppc ppc64 sparc x86"
-IUSE="debug"
-
-RDEPEND=">=dev-lang/lua-5.1.5-r2:0[${MULTILIB_USEDEP}]"
-DEPEND="${RDEPEND}"
-BDEPEND="virtual/pkgconfig"
-
-S=${WORKDIR}/${PN}-${PV/_/-}
-
-RESTRICT="test"
-
-PATCHES=(
-	"${FILESDIR}"/proxy-fix.patch
-)
-
-src_prepare() {
-	default
-	multilib_copy_sources
-}
-
-multilib_src_compile() {
-	emake \
-		CC="$(tc-getCC) ${CFLAGS}" \
-		LD="$(tc-getCC) ${LDFLAGS}"\
-		$(usex debug DEBUG="DEBUG" "")
-}
-
-multilib_src_install() {
-	local luav=$($(tc-getPKG_CONFIG) --variable V lua)
-	emake \
-		DESTDIR="${D}" \
-		LUAPREFIX_linux=/usr \
-		LUAV=${luav} \
-		CDIR_linux=$(get_libdir)/lua/${luav} \
-		install-unix
-}
-
-multilib_src_install_all() {
-	dodoc NEW README
-	docinto html
-	dodoc -r doc/.
-}
diff --git a/dev-lua/luasocket/luasocket-3.0_rc1_p20200328-r100.ebuild b/dev-lua/luasocket/luasocket-3.0_rc1_p20200328-r100.ebuild
new file mode 100644
index 000000000000..479cb3ff4eef
--- /dev/null
+++ b/dev-lua/luasocket/luasocket-3.0_rc1_p20200328-r100.ebuild
@@ -0,0 +1,90 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+EGIT_COMMIT="5b18e475f38fcf28429b1cc4b17baee3b9793a62"
+LUA_COMPAT=( lua5-{1..3} )
+LUA_REQ_USE="${MULTILIB_USEDEP}"
+
+inherit flag-o-matic lua multilib multilib-minimal 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}/${PN}-${EGIT_COMMIT}"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~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
+
+	multilib_copy_sources
+}
+
+lua_multilib_src_compile() {
+	# Clean project, to compile it for every lua slot
+	emake clean
+
+	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
+}
+
+multilib_src_compile() {
+	lua_foreach_impl lua_multilib_src_compile
+}
+
+lua_multilib_src_install() {
+	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
+}
+
+multilib_src_install() {
+	lua_foreach_impl lua_multilib_src_install
+}
+
+multilib_src_install_all() {
+	einstalldocs
+}
diff --git a/dev-lua/luasocket/luasocket-3.0_rc1_p20200328.ebuild b/dev-lua/luasocket/luasocket-3.0_rc1_p20200328.ebuild
new file mode 100644
index 000000000000..4591859cc608
--- /dev/null
+++ b/dev-lua/luasocket/luasocket-3.0_rc1_p20200328.ebuild
@@ -0,0 +1,73 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+EGIT_COMMIT="5b18e475f38fcf28429b1cc4b17baee3b9793a62"
+LUA_REQ_USE="${MULTILIB_USEDEP}"
+
+inherit flag-o-matic multilib multilib-minimal 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}/${PN}-${EGIT_COMMIT}"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~sparc ~x86"
+RESTRICT="test"
+
+RDEPEND=">=dev-lang/lua-5.1.5-r2:0[${MULTILIB_USEDEP}]"
+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
+
+	multilib_copy_sources
+}
+
+multilib_src_compile() {
+	local myemakeargs=(
+		"CC=$(tc-getCC)"
+		"LD=$(tc-getCC)"
+		"LDFLAGS_linux=-O -fpic -shared -o"
+		"LUAINC_linux=$($(tc-getPKG_CONFIG) --variable INSTALL_INC lua)/lua$($(tc-getPKG_CONFIG) --variable V lua)"
+		"LUAV=$($(tc-getPKG_CONFIG) --variable V lua)"
+		"MYCFLAGS=${CFLAGS}"
+		"MYLDFLAGS=${LDFLAGS}"
+	)
+
+	emake "${myemakeargs[@]}" all
+}
+
+multilib_src_install() {
+	local myemakeargs=(
+		"CDIR=$($(tc-getPKG_CONFIG) --variable INSTALL_CMOD lua)"
+		"DESTDIR=${ED}"
+		"LDIR=$($(tc-getPKG_CONFIG) --variable INSTALL_LMOD lua)"
+		"LUAPREFIX_linux="
+	)
+
+	emake "${myemakeargs[@]}" install
+	emake "${myemakeargs[@]}" install-unix
+
+	insinto "$($(tc-getPKG_CONFIG) --variable INSTALL_INC lua)/$($(tc-getPKG_CONFIG) --variable V lua)"/luasocket
+	doins src/*.h
+}
+
+multilib_src_install_all() {
+	einstalldocs
+}
diff --git a/dev-lua/luasocket/metadata.xml b/dev-lua/luasocket/metadata.xml
index 2af4fc2a4ace..a173d5088869 100644
--- a/dev-lua/luasocket/metadata.xml
+++ b/dev-lua/luasocket/metadata.xml
@@ -1,15 +1,19 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person">
-    <email>azamat.hackimov@gmail.com</email>
-    <name>Azamat H. Hackimov</name>
-  </maintainer>
-  <maintainer type="project">
-    <email>proxy-maint@gentoo.org</email>
-    <name>Proxy Maintainers</name>
-  </maintainer>
-  <upstream>
-    <remote-id type="github">diegonehab/luasocket</remote-id>
-  </upstream>
+	<maintainer type="person">
+		<email>azamat.hackimov@gmail.com</email>
+		<name>Azamat H. Hackimov</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
+	<maintainer type="person">
+		<email>conikost@gentoo.org</email>
+		<name>Conrad Kostecki</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">diegonehab/luasocket</remote-id>
+	</upstream>
 </pkgmetadata>