gentoo resync : 06.04.2022

5 files changed, 169 insertions, 5 deletions

diff --git a/dev-lua/luasocket/Manifest b/dev-lua/luasocket/Manifest
index 8687ed10e69d..c9a99cd3fce0 100644
--- a/dev-lua/luasocket/Manifest
+++ b/dev-lua/luasocket/Manifest
@@ -1,5 +1,8 @@
+AUX luasocket-3.0.0_makefile.patch 2322 BLAKE2B cf9d871de75145812ebdce00bf7839e8f1f019658410eb38bd724cf9ce919d021ff2362d072c611c85d280eca2c0c6e485f608eba3f61fd612ae6ff5bde6d917 SHA512 43b6951d2a834ff88088bc6bf16e0ee3b7c28e602b06f66e1476bd4cf840f0d43328fe3eaaa7e4f0360b406525d213d12d4b97984de37c3381f8c1e85fe518fd
 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.0.tar.gz 336231 BLAKE2B 71b87041a1edb2616ba269160382ac5cea6ba9b623281e8069e8adf97b6898d7836add7eff949010a1bc890bff8d2e4797a2ff5c619b45f8ee3adee5d6633843 SHA512 4f93d6c0b602333df50ee4f939cd0419243f6de333472ffebf99334e301143e8cdee3bc1655c29f81608622d6e7850a9bcf6929a6d4748210a70cdb8218a1ec6
 DIST luasocket-3.0_rc1_p20200328.tar.gz 335628 BLAKE2B 9e5d3e415337903b689705669b586c4481179a319b4e3428823c8f442d04f26db86bfeca66db7e58d157e31431c31e4f687403f7163b75f57d6f87cdb934717f SHA512 bdf7086a0504b0072b9cfd1266fc4ae89504053801722859a426f567fca00ed76f4c295c2a3a968e93f0036d9b792cf97561e9baa82c09ea23999cfd473227eb
-EBUILD luasocket-3.0_rc1_p20200328-r103.ebuild 1719 BLAKE2B 18d04f607f605218e58163e96b6eaf0592039957173ea5724c8c763b5b8130838cfe4ed80da51ca9e7d1e2abfb7562cc5257a565e71398bf0311002880d5e074 SHA512 bb1c8925541bdaa0008c75e7f8c9b0d2d58148e944e308eecf82b27e659931aa0a6e2c0649a7093a0cef07e3fd75d83e1b0b8a2984e245a84b3223a82ff48cc2
-MISC metadata.xml 603 BLAKE2B 594c4454fadefcc94e1697d28300a12ccd373f365543fab2cdc3b9a90a6fd4d614b13705026a2a9956aaeab78e88ca10ef608e96c968b20825340503e5675537 SHA512 03612e81cc1d8e9279a16270d5eb391917798fca0148616e2e99aa2994f109d34ac657a89d0d3cfd853af372d7fdc14703f97c1cbc5ca7f8a63f07f0eee93259
+EBUILD luasocket-3.0.0.ebuild 1669 BLAKE2B f8ed71c04a819fe6dd400b10eefba00d84251def83563dddc98885257568669e870fdb02431afcd0c89878d4f2bf16c245a31c8508a9168f092689c0a5145c9d SHA512 8afec405096da58e1e74b90105c4e9f887cdb4f90f5b317ea77802419448e737022faa96a390ac3604861332f52d1e085200acb7017687d7c0503a55224e489f
+EBUILD luasocket-3.0_rc1_p20200328-r103.ebuild 1723 BLAKE2B bb2ee9c0268399453f03ebfdeabb1f58a6f9d572b9c960fc03df049de3a149af71e399c70e28739983d2ecccc732e65e00d920e43ea0e2acfc673a106c0331b8 SHA512 14d6239f9eea43a746372b6668a28ca04489aedad9cd5727a160a5263caa1664bbf530c38885391aaba0d89607e8d4241261f66a17f84cc5354da411048be656
+MISC metadata.xml 605 BLAKE2B 2358c705cc7a8345cd8975154db2074b70682ae723ad265ed350a49e3958959ea8402405b6a0827d9d7debfcd7bf2d7814211d282492ffea21017dced0b7d5dd SHA512 25b09ed61b7256d5db22ca630ae9067f90491142ff5c3810ab41dadd537cbfc41b08cf6bce55b8c03910b221fefcda72a34afc996184d238af0323a8ac9a5474
diff --git a/dev-lua/luasocket/files/luasocket-3.0.0_makefile.patch b/dev-lua/luasocket/files/luasocket-3.0.0_makefile.patch
new file mode 100644
index 000000000000..8f6c9de42697
--- /dev/null
+++ b/dev-lua/luasocket/files/luasocket-3.0.0_makefile.patch
@@ -0,0 +1,73 @@
+--- a/src/makefile
++++ b/src/makefile
+@@ -162,7 +162,7 @@
+ O_macosx=o
+ CC_macosx=gcc
+ DEF_macosx= -DLUASOCKET_$(DEBUG) -DUNIX_HAS_SUN_LEN
+-CFLAGS_macosx=$(LUAINC:%=-I%) $(DEF) -Wall -O2 -fno-common
++CFLAGS_macosx=$(LUAINC:%=-I%) $(DEF) -Wall -fno-common
+ LDFLAGS_macosx= -bundle -undefined dynamic_lookup -o
+ LD_macosx=gcc
+ SOCKET_macosx=usocket.o
+@@ -174,8 +174,7 @@
+ O_linux=o
+ CC_linux=gcc
+ DEF_linux=-DLUASOCKET_$(DEBUG)
+-CFLAGS_linux=$(LUAINC:%=-I%) $(DEF) -Wall -Wshadow -Wextra \
+-	-Wimplicit -O2 -ggdb3 -fpic
++CFLAGS_linux=$(LUAINC:%=-I%) $(DEF) -Wall -Wshadow -Wextra -Wimplicit -fpic
+ LDFLAGS_linux=-O -shared -fpic -o
+ LD_linux=gcc
+ SOCKET_linux=usocket.o
+@@ -187,8 +186,7 @@
+ O_freebsd=o
+ CC_freebsd=gcc
+ DEF_freebsd=-DLUASOCKET_$(DEBUG) -DUNIX_HAS_SUN_LEN
+-CFLAGS_freebsd=$(LUAINC:%=-I%) $(DEF) -Wall -Wshadow -Wextra \
+-	-Wimplicit -O2 -ggdb3 -fpic
++CFLAGS_freebsd=$(LUAINC:%=-I%) $(DEF) -Wall -Wshadow -Wextra -Wimplicit -fpic
+ LDFLAGS_freebsd=-O -shared -fpic -o
+ LD_freebsd=gcc
+ SOCKET_freebsd=usocket.o
+@@ -200,8 +198,7 @@
+ O_solaris=o
+ CC_solaris=gcc
+ DEF_solaris=-DLUASOCKET_$(DEBUG)
+-CFLAGS_solaris=$(LUAINC:%=-I%) $(DEF) -Wall -Wshadow -Wextra \
+-	-Wimplicit -O2 -ggdb3 -fpic
++CFLAGS_freebsd=$(LUAINC:%=-I%) $(DEF) -Wall -Wshadow -Wextra -Wimplicit -fpic
+ LDFLAGS_solaris=-lnsl -lsocket -lresolv -O -shared -fpic -o
+ LD_solaris=gcc
+ SOCKET_solaris=usocket.o
+@@ -214,7 +211,7 @@
+ CC_mingw=gcc
+ DEF_mingw= -DLUASOCKET_$(DEBUG) \
+ 	-DWINVER=0x0501
+-CFLAGS_mingw=$(LUAINC:%=-I%) $(DEF) -Wall -O2 -fno-common
++CFLAGS_mingw=$(LUAINC:%=-I%) $(DEF) -Wall -fno-common
+ LDFLAGS_mingw= $(LUALIB) -shared -Wl,-s -lws2_32 -o
+ LD_mingw=gcc
+ SOCKET_mingw=wsocket.o
+@@ -396,18 +393,18 @@
+ all: $(SOCKET_SO) $(MIME_SO)
+ 
+ $(SOCKET_SO): $(SOCKET_OBJS)
+-	$(LD) $(SOCKET_OBJS) $(LDFLAGS)$@
++	$(LD) $(SOCKET_OBJS) -Wl,-soname,socket/core.so $(LDFLAGS)$@
+ 
+ $(MIME_SO): $(MIME_OBJS)
+-	$(LD) $(MIME_OBJS) $(LDFLAGS)$@
++	$(LD) $(MIME_OBJS) -Wl,-soname,mime/core.so $(LDFLAGS)$@
+ 
+ all-unix: all $(UNIX_SO) $(SERIAL_SO)
+ 
+ $(UNIX_SO): $(UNIX_OBJS)
+-	$(LD) $(UNIX_OBJS) $(LDFLAGS)$@
++	$(LD) $(UNIX_OBJS) -Wl,-soname,socket/unix.so $(LDFLAGS)$@
+ 
+ $(SERIAL_SO): $(SERIAL_OBJS)
+-	$(LD) $(SERIAL_OBJS) $(LDFLAGS)$@
++	$(LD) $(SERIAL_OBJS) -Wl,-soname,socket/serial.so $(LDFLAGS)$@
+ 
+ install:
+ 	$(INSTALL_DIR) $(INSTALL_TOP_LDIR)
diff --git a/dev-lua/luasocket/luasocket-3.0.0.ebuild b/dev-lua/luasocket/luasocket-3.0.0.ebuild
new file mode 100644
index 000000000000..9c989a186eaf
--- /dev/null
+++ b/dev-lua/luasocket/luasocket-3.0.0.ebuild
@@ -0,0 +1,88 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+LUA_COMPAT=( lua5-{1..4} luajit )
+MY_P="${PN}-${EGIT_COMMIT}"
+
+inherit lua toolchain-funcs
+
+DESCRIPTION="Networking support for the Lua language"
+HOMEPAGE="
+	http://www.tecgraf.puc-rio.br/~diego/professional/luasocket/
+	https://github.com/lunarmodules/luasocket
+"
+SRC_URI="https://github.com/lunarmodules/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
+
+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="docs/."
+
+PATCHES=(
+	"${FILESDIR}/${PN}-3.0_rc1_p20200328_publish_API.patch"
+	"${FILESDIR}/${PN}-3.0.0_makefile.patch"
+)
+
+src_prepare() {
+	default
+	lua_copy_sources
+}
+
+lua_src_compile() {
+	pushd "${BUILD_DIR}" || die
+
+	local myemakeargs=(
+		"CC=$(tc-getCC)"
+		"LD=$(tc-getCC)"
+		"LUAINC_linux=$(lua_get_include_dir)"
+		"LUAV=${ELUA}"
+		"MIME_V=1.0.3-${ELUA}"
+		"MYCFLAGS=${CFLAGS}"
+		"MYLDFLAGS=${LDFLAGS}"
+		"SOCKET_V=3.0.0-${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.0-${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 58fe8d5c2285..283cd08f0c64 100644
--- a/dev-lua/luasocket/luasocket-3.0_rc1_p20200328-r103.ebuild
+++ b/dev-lua/luasocket/luasocket-3.0_rc1_p20200328-r103.ebuild
@@ -12,9 +12,9 @@ inherit 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
+	https://github.com/lunarmodules/luasocket
 "
-SRC_URI="https://github.com/diegonehab/${PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
+SRC_URI="https://github.com/lunarmodules/${PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
 S="${WORKDIR}/${MY_P}"
 
 LICENSE="MIT"
diff --git a/dev-lua/luasocket/metadata.xml b/dev-lua/luasocket/metadata.xml
index d810c98fd551..aadd3b74b2a5 100644
--- a/dev-lua/luasocket/metadata.xml
+++ b/dev-lua/luasocket/metadata.xml
@@ -14,6 +14,6 @@
 		<name>Conrad Kostecki</name>
 	</maintainer>
 	<upstream>
-		<remote-id type="github">diegonehab/luasocket</remote-id>
+		<remote-id type="github">lunarmodules/luasocket</remote-id>
 	</upstream>
 </pkgmetadata>