gentoo auto-resync : 30:08:2022 - 10:48:18

6 files changed, 77 insertions, 97 deletions

diff --git a/dev-lua/Manifest.gz b/dev-lua/Manifest.gz
index d9ebb571319c..8601418d05c6 100644
--- a/dev-lua/Manifest.gz
+++ b/dev-lua/Manifest.gz
diff --git a/dev-lua/luaexpat/Manifest b/dev-lua/luaexpat/Manifest
index 126fcc47d41b..28b7198deae9 100644
--- a/dev-lua/luaexpat/Manifest
+++ b/dev-lua/luaexpat/Manifest
@@ -1,3 +1,5 @@
 DIST luaexpat-1.4.1.tar.gz 52159 BLAKE2B dd870d2d2db8bc1e399a306eff91138752f346f50ec1283a611c3ef42591e5176beab59aa96b87c772ba0320d98fc8a5907048e539cde6c14757e9a026aacc81 SHA512 fbc03287a237c13f395574ddf08a931ded0f457728b01bdc0a0533d212a0c908d74230be3c9e7f85a54ac244043cd853be3bf13d284185ad3e3ce6818d157635
+DIST luaexpat-1.5.0.tar.gz 53520 BLAKE2B 1793f842771e730022abf512731eece538b6edefd10786295842f467af3cbfbdc94e65ea035b1ce9bc849a1ee4f0ca445bd0b66816a6d18bb786d19ced6b3586 SHA512 0ac151148101d62f1358f5f310be57de5379891ceda76f0eb821a8b56d0d9c781feaf1db601d982339cd4837f9504b1f9b8b14ebf3a7245925473f6824bbc8b3
 EBUILD luaexpat-1.4.1.ebuild 1250 BLAKE2B 87a9e484ee1419e443200bd424823797c5274f9b828bdf03fce94958bf90c9c5d70bb2aa95f5ac43986ab683c2fccc2bcebb33cd7f6520a3eecbc76ae45e7f5f SHA512 2df41c44ea53cd1bce8eebf7dcd5e9a5196afeb3ce8def512724b75979a42d1e9a26cece19e032dd3192879c76232f3a1791e90eec00b6a1449e5bcef2d00388
+EBUILD luaexpat-1.5.0.ebuild 1257 BLAKE2B 3566ca5fc1e101daa7dcf146e52cdaa3a23b10d95126e4ce57ece79e8037afaae682f84f04509f63294a5adc838ec28ce86f8c970b26d68e5cb5a9a9c8c7c700 SHA512 20a12db581401cd4d8650a703ce220c6edf756cdc478ae20061b84e2a45be447660d0c840f1412c0b3ab86c67123c8b2ecfdbbd79cbfa0e6a514ea00236c6f5a
 MISC metadata.xml 667 BLAKE2B 5efd48f296044b9a01c80274ca8fa4ccee0d03a2e6758020d98e123438c13074ec95de3635bbe9abe0838db6f7c65aed8b351b90d1f670ffc331cbf29299d2d7 SHA512 72f967617a90fe28048ab9c128d86daaf360c13333ed8a27eb5628d4f9c39b91f15213b1459631f3eb147429917bb1500047116b4a8c6a7c91f4002b1670bf31
diff --git a/dev-lua/luaexpat/luaexpat-1.5.0.ebuild b/dev-lua/luaexpat/luaexpat-1.5.0.ebuild
new file mode 100644
index 000000000000..b0c2791bf0e6
--- /dev/null
+++ b/dev-lua/luaexpat/luaexpat-1.5.0.ebuild
@@ -0,0 +1,73 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+LUA_COMPAT=( lua5-{1..4} luajit )
+
+inherit lua toolchain-funcs
+
+DESCRIPTION="A SAX XML parser based on the Expat library"
+HOMEPAGE="https://github.com/lunarmodules/luaexpat"
+SRC_URI="https://github.com/lunarmodules/${PN}/archive/refs/tags/${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}"
+
+RDEPEND="
+	dev-libs/expat
+	${LUA_DEPS}
+"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+HTML_DOCS=( "docs/." )
+
+src_prepare() {
+	default
+
+	# Respect users CFLAGS
+	sed -e 's/-O2//g' -i Makefile || die
+
+	lua_copy_sources
+}
+
+lua_src_compile() {
+	pushd "${BUILD_DIR}" || die
+
+	local myemakeargs=(
+		"CC=$(tc-getCC)"
+		"LUA_INC=$(lua_get_CFLAGS)"
+	)
+
+	emake "${myemakeargs[@]}"
+
+	popd
+}
+
+src_compile() {
+	lua_foreach_impl lua_src_compile
+}
+
+lua_src_install() {
+	pushd "${BUILD_DIR}" || die
+
+	local myemakeargs=(
+		"DESTDIR=${ED}"
+		"LUA_CDIR=$(lua_get_cmod_dir)"
+		"LUA_INC=$(lua_get_include_dir)"
+		"LUA_LDIR=$(lua_get_lmod_dir)"
+	)
+
+	emake "${myemakeargs[@]}" install
+
+	popd
+}
+
+src_install() {
+	lua_foreach_impl lua_src_install
+
+	einstalldocs
+}
diff --git a/dev-lua/luasocket/Manifest b/dev-lua/luasocket/Manifest
index a16e9fefea52..f17a1df09c9d 100644
--- a/dev-lua/luasocket/Manifest
+++ b/dev-lua/luasocket/Manifest
@@ -1,7 +1,5 @@
 AUX luasocket-3.0.0_makefile.patch 2322 BLAKE2B cf9d871de75145812ebdce00bf7839e8f1f019658410eb38bd724cf9ce919d021ff2362d072c611c85d280eca2c0c6e485f608eba3f61fd612ae6ff5bde6d917 SHA512 43b6951d2a834ff88088bc6bf16e0ee3b7c28e602b06f66e1476bd4cf840f0d43328fe3eaaa7e4f0360b406525d213d12d4b97984de37c3381f8c1e85fe518fd
 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.1.0.tar.gz 336542 BLAKE2B 64d3ab7028050a93a93db444a4d1757f579f111e79c2f84629d0eb9558fc594918614a48cd1cb522d573b84bb4096537fb7950834adeacfffb3e060721402f71 SHA512 1e9e98484740ec6538fe3d2b0dab74d31f052956ecf9ee3b60e229f2d0b13fcc6d4aaf74cd2a3e2ee330333dabb316fe6a43c60baaea26f0cc01069b6aa4519b
-EBUILD luasocket-3.0.0-r1.ebuild 1843 BLAKE2B fccc27d0d193207d42093831a24237957702d27e442ed0a56dfa8d649a2c99448f648306dc981615cf237055f534c73dcbe9ddaf09519b2390cb25e898dfdad9 SHA512 5845a71bb98b1f9230934597e64e00ab9682681c494832bd56450a6ad33e41756524b5e6a37d4af5413fdee5337eec9da96fb5622888ee11cd88d6ae13835bea
-EBUILD luasocket-3.1.0.ebuild 1540 BLAKE2B de95dffd9abc2bf1527f2094d753f26f418cb0491ddc4a65d8bb6c92f71bb8ca7729016540fdcf6dd27a3785986e879a9e6217a33db61fc6790b34221f761d25 SHA512 c251a6930bc415882533cfcb54e144a28009dd6357d4ea684659d9779224ab3660a4e165f05f6550e1905b96c4c0bc51db2c2f718a82b220708dd9a6a61b1e41
+EBUILD luasocket-3.1.0.ebuild 1533 BLAKE2B f43e2b80715f0cd3d2b2dfbfa87023d29fdaaf947b003ca745cac689fd39b9cbaed8ed6591bdcc2fe54f487928b806e77751b8f6f72b5d2893359db0f750c2a2 SHA512 6d2cf7cbf9bcec4ca695dbfe19f2826e400a390f0ea79149461fba8f78e459efa44f7aca7418f756e89056def1d1ec8ba5a5fd19a41ea91c76094ef7770e008f
 MISC metadata.xml 605 BLAKE2B 2358c705cc7a8345cd8975154db2074b70682ae723ad265ed350a49e3958959ea8402405b6a0827d9d7debfcd7bf2d7814211d282492ffea21017dced0b7d5dd SHA512 25b09ed61b7256d5db22ca630ae9067f90491142ff5c3810ab41dadd537cbfc41b08cf6bce55b8c03910b221fefcda72a34afc996184d238af0323a8ac9a5474
diff --git a/dev-lua/luasocket/luasocket-3.0.0-r1.ebuild b/dev-lua/luasocket/luasocket-3.0.0-r1.ebuild
deleted file mode 100644
index f89c5c8c85b8..000000000000
--- a/dev-lua/luasocket/luasocket-3.0.0-r1.ebuild
+++ /dev/null
@@ -1,93 +0,0 @@
-# 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
-
-	# Set correct version, as upstream shows wrongly '-rc1'.
-	# This has been already changed by upstream, but no new release.
-        sed -e 's/-rc1/.0/g' -i src/luasocket.h || die
-
-	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.1.0.ebuild b/dev-lua/luasocket/luasocket-3.1.0.ebuild
index d46fffc97228..ba54f605290c 100644
--- a/dev-lua/luasocket/luasocket-3.1.0.ebuild
+++ b/dev-lua/luasocket/luasocket-3.1.0.ebuild
@@ -16,7 +16,7 @@ SRC_URI="https://github.com/lunarmodules/${PN}/archive/refs/tags/v${PV}.tar.gz -
 
 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"
 IUSE="doc"
 REQUIRED_USE="${LUA_REQUIRED_USE}"
 RESTRICT="test"