gentoo resync : 29.01.2021

4 files changed, 3 insertions, 100 deletions

diff --git a/dev-lua/luaexpat/Manifest b/dev-lua/luaexpat/Manifest
index db5ec3093f9f..61cb7a6e1981 100644
--- a/dev-lua/luaexpat/Manifest
+++ b/dev-lua/luaexpat/Manifest
@@ -3,8 +3,6 @@ AUX luaexpat-1.3.3_makefile.patch 621 BLAKE2B 8c04a2324668ab13e2279df8754c64d5ff
 AUX luaexpat-1.3.3_restore_functionality.patch 3944 BLAKE2B d6e502f44039110cfc8eabc3a83405b0c72522ec43628af16f72d21d0976d617e7280818259258c15cb8582f917e5fdadd81bc2ce35c052a951fec0ccd200e5c SHA512 f6e56fc84550af781c40d8bd004c3f840021a730cccd988f5547b83e2ccc89072ebd09f49631442b25fac8a81a4d7e7f5d4163d7f62dedc876356dee94d96b41
 DIST luaexpat-1.3.0.tar.gz 29567 BLAKE2B 176cb107e6047b15338ff45751af82389920e4210d40bd0b4400e549130a4983c843f7a64bb7b2fba37e36eb592e850d06efe196f8e837e79e50c8d135dbe763 SHA512 91884653310e2dc89ade6d1653875ac8607640a21853d3ccb1fd0f833812e41981fad5c40101732ec249104d2c50c9a332208d1e44423b8428065a223c60b4ae
 DIST luaexpat-1.3.3.tar.gz 32099 BLAKE2B 7fdec97932db4f7d582f651b9a7215f2ef0f6e23022d4013f37e62a0ba3e257e44211266ee4cbbc84d190bf9828e0e028ab3eecf9fc6e619ae3175fd5fe23ddb SHA512 aa3f730c64cae3791fc1125302178ec2398d2380e8ec0e65ca4b29f532f181f149baaf555bf687e502b28726d3fd0baafd4f73cf26f04f625d18bbaddb043d63
-EBUILD luaexpat-1.3.0-r102.ebuild 1307 BLAKE2B b6d868b911198feb7e43feb4ef33076315755c776f64953967efc0b8ef56405ba4acdbfa121d2a572a9ef00f1329182d7438378a2e720a7908b3a275d5314c45 SHA512 4b0ebeb8fe24b4644e3fab77972be0a51aaa4ecfb3b7bdc72d8b11ee7d268677bac2b42d219964a242c232ecad6cb6ae834588cf7f3afa6be7a7a8a6984e4b69
-EBUILD luaexpat-1.3.0-r2.ebuild 1174 BLAKE2B 43efb15693c8c75e115e8976d125a9fdf5c4b30250ac5dfdd9b4c1e5044a5545461203507077e4b8de9d2902808e130a5567e9b881cf22c2613327f16e387e6f SHA512 2b6e0ab5b3b71124b5441776e3be1531a14897ade4c956e68242bea53e21da375c010375471b942d1f1d6cf5e2f56c65ad1fa0bb408825bcae3644de6b8daf20
+EBUILD luaexpat-1.3.0-r102.ebuild 1300 BLAKE2B 6b1cbe312b3f721730da4560691a19da06d508da6b1bcd2bb2f0430e6cec8e38827221c4b8bc1e0e6b68c0755b9f3f564597160501e46480ce239d1fb60364ff SHA512 9d330f301ff36ab144add129c9f4106e84231b1e5f38b328e7e4d2cf827e4d5c7c4de9060ab22d3c69ba2d19421d788a4a1e356e0a7efa1ec88c6fa32388025f
 EBUILD luaexpat-1.3.3-r102.ebuild 1421 BLAKE2B 0738c3281a1c145b0d5f86e22721075767579a95ec47083db1d5e20d54cb9c391b482c4db403b5f0da10fac5e455e55437b3fc98889626e8e83b2e82478e8b29 SHA512 059396e7178f0d0ec9caedd1950d0995c3ccebdadf016c72afc034cd3dc2556d3fa1122c54827b49786a55c68a2aa5e8bf62826c4505cada30316db4028b164e
-EBUILD luaexpat-1.3.3-r2.ebuild 1265 BLAKE2B 3ddd7ae3f5a75fac07bbb465dc1477c59f6ac950b3cd3d2ef1171444122788d59b4e0e2d865590b52e4e6ecbcbbd0be67285b4137de3a41e3039344c1a6d764f SHA512 681d5ee8233e60ae96d84f6315c9886080dd211bd55c8e3ceb89b679221c0d3bc8871bf96ee8b91c24fa12feecca6f213e6e0f91de94b9b102e4308130ee208c
 MISC metadata.xml 575 BLAKE2B d4d3ac883ccfd199e985d1d78be584a14b0233550e41142bdfeda2243d514476daeef6b47d2ccba16525eccc58df0ec58215b810b995d0b83df53c6de58a2895 SHA512 5d1e6633bab522940d2461d230f3eff660d3c0088063ec82c7506aeca071a553d63893851968c20f4073bb2fb554e63deb2da54b405a4c75923e77f4286fe578
diff --git a/dev-lua/luaexpat/luaexpat-1.3.0-r102.ebuild b/dev-lua/luaexpat/luaexpat-1.3.0-r102.ebuild
index ce6096ca0c47..a3ddb21e5619 100644
--- a/dev-lua/luaexpat/luaexpat-1.3.0-r102.ebuild
+++ b/dev-lua/luaexpat/luaexpat-1.3.0-r102.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -13,7 +13,7 @@ SRC_URI="https://matthewwild.co.uk/projects/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="amd64 arm arm64 ~hppa ~mips ppc ppc64 sparc x86"
 REQUIRED_USE="${LUA_REQUIRED_USE}"
 
 RDEPEND="
diff --git a/dev-lua/luaexpat/luaexpat-1.3.0-r2.ebuild b/dev-lua/luaexpat/luaexpat-1.3.0-r2.ebuild
deleted file mode 100644
index 37600917577e..000000000000
--- a/dev-lua/luaexpat/luaexpat-1.3.0-r2.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit multilib-minimal toolchain-funcs
-
-DESCRIPTION="LuaExpat is a SAX XML parser based on the Expat library"
-HOMEPAGE="http://www.keplerproject.org/luaexpat/"
-SRC_URI="http://matthewwild.co.uk/projects/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 ~hppa ~mips ppc ppc64 sparc x86"
-
-RDEPEND=">=dev-lang/lua-5.1.5-r2:0[${MULTILIB_USEDEP}]
-	>=dev-libs/expat-2.1.0-r3[${MULTILIB_USEDEP}]"
-DEPEND="${RDEPEND}"
-BDEPEND="virtual/pkgconfig"
-
-src_prepare() {
-	default
-	sed -i -e 's:-g::' -e 's:-O2::' Makefile || die "sed failed"
-	multilib_copy_sources
-}
-
-multilib_src_compile() {
-	emake \
-		CFLAGS="${CFLAGS}" \
-		LDFLAGS="${LDFLAGS}" \
-		CC="$(tc-getCC)" \
-		LUA_INC="-I$($(tc-getPKG_CONFIG) --variable INSTALL_INC lua)"
-}
-
-multilib_src_install() {
-	emake \
-		DESTDIR="${D}" \
-		LUA_LDIR="$($(tc-getPKG_CONFIG) --variable INSTALL_LMOD lua)" \
-		LUA_CDIR="$($(tc-getPKG_CONFIG) --variable INSTALL_CMOD lua)" \
-		LUA_INC="-I$($(tc-getPKG_CONFIG) --variable INSTALL_INC lua)" \
-		install
-}
-
-multilib_src_install_all() {
-	dodoc -r README doc/*
-}
diff --git a/dev-lua/luaexpat/luaexpat-1.3.3-r2.ebuild b/dev-lua/luaexpat/luaexpat-1.3.3-r2.ebuild
deleted file mode 100644
index 5b99b5d96bac..000000000000
--- a/dev-lua/luaexpat/luaexpat-1.3.3-r2.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit multilib-minimal toolchain-funcs
-
-DESCRIPTION="LuaExpat is a SAX XML parser based on the Expat library"
-HOMEPAGE="https://matthewwild.co.uk/projects/luaexpat/ https://github.com/tomasguisasola/luaexpat"
-SRC_URI="https://github.com/tomasguisasola/luaexpat/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~sparc ~x86"
-
-RDEPEND=">=dev-lang/lua-5.1.5-r2:0[${MULTILIB_USEDEP}]
-	>=dev-libs/expat-2.1.0-r3[${MULTILIB_USEDEP}]"
-DEPEND="${RDEPEND}"
-BDEPEND="virtual/pkgconfig"
-
-PATCHES=(
-	"${FILESDIR}/${P}_makefile.patch"
-	"${FILESDIR}/${P}_getcurrentbytecount.patch"
-	"${FILESDIR}/${P}_restore_functionality.patch"
-)
-
-src_prepare() {
-	default
-	multilib_copy_sources
-}
-
-multilib_src_compile() {
-	emake \
-		CFLAGS="${CFLAGS}" \
-		LDFLAGS="${LDFLAGS}" \
-		CC="$(tc-getCC)" \
-		LUA_INC="$($(tc-getPKG_CONFIG) --variable INSTALL_INC lua)"
-}
-
-multilib_src_install() {
-	emake \
-		LUA_DIR="${D}/$($(tc-getPKG_CONFIG) --variable INSTALL_LMOD lua)" \
-		LUA_LIBDIR="${D}/$($(tc-getPKG_CONFIG) --variable INSTALL_CMOD lua)" \
-		install
-}
-
-multilib_src_install_all() {
-	dodoc -r README.md doc/*
-}