gentoo resync : 12.05.2022

4 files changed, 2 insertions, 153 deletions

diff --git a/dev-lua/luaexpat/Manifest b/dev-lua/luaexpat/Manifest
index 00e0af709b0b..126fcc47d41b 100644
--- a/dev-lua/luaexpat/Manifest
+++ b/dev-lua/luaexpat/Manifest
@@ -1,7 +1,3 @@
-DIST luaexpat-1.3.0.tar.gz 29567 BLAKE2B 176cb107e6047b15338ff45751af82389920e4210d40bd0b4400e549130a4983c843f7a64bb7b2fba37e36eb592e850d06efe196f8e837e79e50c8d135dbe763 SHA512 91884653310e2dc89ade6d1653875ac8607640a21853d3ccb1fd0f833812e41981fad5c40101732ec249104d2c50c9a332208d1e44423b8428065a223c60b4ae
-DIST luaexpat-1.4.0.tar.gz 51890 BLAKE2B 6e2cda190e7b2ebe2bda64398a447155df3ccdb83f1b4ff78aead981c38cf6705f896ba31ac0d557ec55f750919b6b2b07205c533339d7aa8e0f88ee6b0991fd SHA512 ba1a98267757ec5f2464b8d5e903f69102ca991c4034939d02d871d014463a8e29815d1294edc7fa3a1c4b679c5e42fdc1a19b2a1c1654ed1f382f779a213375
 DIST luaexpat-1.4.1.tar.gz 52159 BLAKE2B dd870d2d2db8bc1e399a306eff91138752f346f50ec1283a611c3ef42591e5176beab59aa96b87c772ba0320d98fc8a5907048e539cde6c14757e9a026aacc81 SHA512 fbc03287a237c13f395574ddf08a931ded0f457728b01bdc0a0533d212a0c908d74230be3c9e7f85a54ac244043cd853be3bf13d284185ad3e3ce6818d157635
-EBUILD luaexpat-1.3.0-r1.ebuild 1347 BLAKE2B 647d033a4ae2963495c0b76207ed283a251c1ddd9f45b2358b9217c9782ac229637a464cbcbd02bed57e171035078312e130eeef900ec48ced1460a26047a04a SHA512 17c200d4663c50ebfc51cb6aff441ccc82df162d45f041d900a5547a4e9b9794dae2ca421c62ea2aa062b932b858a6160efbaa34326be070c5105fc7feae86c5
-EBUILD luaexpat-1.4.0.ebuild 1257 BLAKE2B 3566ca5fc1e101daa7dcf146e52cdaa3a23b10d95126e4ce57ece79e8037afaae682f84f04509f63294a5adc838ec28ce86f8c970b26d68e5cb5a9a9c8c7c700 SHA512 20a12db581401cd4d8650a703ce220c6edf756cdc478ae20061b84e2a45be447660d0c840f1412c0b3ab86c67123c8b2ecfdbbd79cbfa0e6a514ea00236c6f5a
-EBUILD luaexpat-1.4.1.ebuild 1257 BLAKE2B 3566ca5fc1e101daa7dcf146e52cdaa3a23b10d95126e4ce57ece79e8037afaae682f84f04509f63294a5adc838ec28ce86f8c970b26d68e5cb5a9a9c8c7c700 SHA512 20a12db581401cd4d8650a703ce220c6edf756cdc478ae20061b84e2a45be447660d0c840f1412c0b3ab86c67123c8b2ecfdbbd79cbfa0e6a514ea00236c6f5a
+EBUILD luaexpat-1.4.1.ebuild 1250 BLAKE2B 87a9e484ee1419e443200bd424823797c5274f9b828bdf03fce94958bf90c9c5d70bb2aa95f5ac43986ab683c2fccc2bcebb33cd7f6520a3eecbc76ae45e7f5f SHA512 2df41c44ea53cd1bce8eebf7dcd5e9a5196afeb3ce8def512724b75979a42d1e9a26cece19e032dd3192879c76232f3a1791e90eec00b6a1449e5bcef2d00388
 MISC metadata.xml 667 BLAKE2B 5efd48f296044b9a01c80274ca8fa4ccee0d03a2e6758020d98e123438c13074ec95de3635bbe9abe0838db6f7c65aed8b351b90d1f670ffc331cbf29299d2d7 SHA512 72f967617a90fe28048ab9c128d86daaf360c13333ed8a27eb5628d4f9c39b91f15213b1459631f3eb147429917bb1500047116b4a8c6a7c91f4002b1670bf31
diff --git a/dev-lua/luaexpat/luaexpat-1.3.0-r1.ebuild b/dev-lua/luaexpat/luaexpat-1.3.0-r1.ebuild
deleted file mode 100644
index 186869f91be1..000000000000
--- a/dev-lua/luaexpat/luaexpat-1.3.0-r1.ebuild
+++ /dev/null
@@ -1,74 +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 )
-
-inherit lua toolchain-funcs
-
-DESCRIPTION="LuaExpat is a SAX XML parser based on the Expat library"
-HOMEPAGE="https://matthewwild.co.uk/projects/luaexpat/ https://code.matthewwild.co.uk/lua-expat"
-SRC_URI="https://matthewwild.co.uk/projects/${PN}/${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=( "doc/us/." )
-
-src_prepare() {
-	default
-
-	# Respect users CFLAGS
-	# Remove '-ansi' to compile with newer lua versions
-	sed -e 's/-O2//g' -e 's/-ansi//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/luaexpat/luaexpat-1.4.0.ebuild b/dev-lua/luaexpat/luaexpat-1.4.0.ebuild
deleted file mode 100644
index b0c2791bf0e6..000000000000
--- a/dev-lua/luaexpat/luaexpat-1.4.0.ebuild
+++ /dev/null
@@ -1,73 +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 )
-
-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/luaexpat/luaexpat-1.4.1.ebuild b/dev-lua/luaexpat/luaexpat-1.4.1.ebuild
index b0c2791bf0e6..653582b9bb6d 100644
--- a/dev-lua/luaexpat/luaexpat-1.4.1.ebuild
+++ b/dev-lua/luaexpat/luaexpat-1.4.1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/lunarmodules/${PN}/archive/refs/tags/${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"
 REQUIRED_USE="${LUA_REQUIRED_USE}"
 
 RDEPEND="