gentoo resync : 03.03.2021

7 files changed, 6 insertions, 255 deletions

diff --git a/dev-lua/luaexpat/Manifest b/dev-lua/luaexpat/Manifest
index 61cb7a6e1981..667be89269e0 100644
--- a/dev-lua/luaexpat/Manifest
+++ b/dev-lua/luaexpat/Manifest
@@ -1,8 +1,3 @@
-AUX luaexpat-1.3.3_getcurrentbytecount.patch 945 BLAKE2B 311210432c90d2d67ba0f44f3d2f4c811b9603e22d1b3c60e7e5d9bdc4e4cd08f133585edb9f5fc97b5b6b8e14c06f81fa15cc4fd099b761effa5cee70cc7f06 SHA512 4664a52bb964e1556f7b47602728f0bec2a1f909b240c3e46775e8879cdf75e7bd764c83ba464aa12838678fe9fc08bb91c8ef41f6460623468c259a33a24e9b
-AUX luaexpat-1.3.3_makefile.patch 621 BLAKE2B 8c04a2324668ab13e2279df8754c64d5ff9a3645eb430b56889fb26410b49a5dd20878c5c95406629bfbf11de080ae0a7761e0d9bfbb0cf032b2f14fa36ea25d SHA512 9dc6026cd12a3aa7513d7eb52f228ac32e1d71b018f50555e19dbd301e466def1c2afef40feedf060332d979b3007855a908617c4061832fc9895bec006a0efc
-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 1300 BLAKE2B 6b1cbe312b3f721730da4560691a19da06d508da6b1bcd2bb2f0430e6cec8e38827221c4b8bc1e0e6b68c0755b9f3f564597160501e46480ce239d1fb60364ff SHA512 9d330f301ff36ab144add129c9f4106e84231b1e5f38b328e7e4d2cf827e4d5c7c4de9060ab22d3c69ba2d19421d788a4a1e356e0a7efa1ec88c6fa32388025f
-EBUILD luaexpat-1.3.3-r102.ebuild 1421 BLAKE2B 0738c3281a1c145b0d5f86e22721075767579a95ec47083db1d5e20d54cb9c391b482c4db403b5f0da10fac5e455e55437b3fc98889626e8e83b2e82478e8b29 SHA512 059396e7178f0d0ec9caedd1950d0995c3ccebdadf016c72afc034cd3dc2556d3fa1122c54827b49786a55c68a2aa5e8bf62826c4505cada30316db4028b164e
-MISC metadata.xml 575 BLAKE2B d4d3ac883ccfd199e985d1d78be584a14b0233550e41142bdfeda2243d514476daeef6b47d2ccba16525eccc58df0ec58215b810b995d0b83df53c6de58a2895 SHA512 5d1e6633bab522940d2461d230f3eff660d3c0088063ec82c7506aeca071a553d63893851968c20f4073bb2fb554e63deb2da54b405a4c75923e77f4286fe578
+EBUILD luaexpat-1.3.0-r103.ebuild 1341 BLAKE2B 5793951927701a018d90d9c51d3bf9616ca056fc3a88f74aac87855d574273a201ee60fb42c2986689acf1c397571b24c07992e6792efa77fc3e7e46f123741d SHA512 b38b87b276fc100137229f9a51138b1a1f6585b4b36d6fb631f9216383130a3cd51f3bbeb8ba6148fc0f48e11f2a1c396928664d1b6c4f6259917ba1d9ad95c1
+MISC metadata.xml 487 BLAKE2B 7b350d23246d49970c4fff153182eb051e4a956594f7a4015b0806388948c859f5e05aedc395f4b91bed8b57f63070d1580529adb4ce30e872f6a562ab2fd942 SHA512 321b206c9f4b23b53067126366b42e4c5372da45c17e3398c6808e741743f81bf42d4e39fa65332d8d9625782529baf878e2fb0e5bcba02cbdfdd854abf882fa
diff --git a/dev-lua/luaexpat/files/luaexpat-1.3.3_getcurrentbytecount.patch b/dev-lua/luaexpat/files/luaexpat-1.3.3_getcurrentbytecount.patch
deleted file mode 100644
index 7366163d9d82..000000000000
--- a/dev-lua/luaexpat/files/luaexpat-1.3.3_getcurrentbytecount.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-From 0926f2d705109b7d35b721344264b39c1169e0de Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Fran=C3=A7ois=20Perrad?= <francois.perrad@gadz.org>
-Date: Sat, 16 Feb 2019 16:08:25 +0100
-Subject: [PATCH] restore method getcurrentbytecount
-
-fix #3
----
- src/lxplib.c | 7 +++++++
- 1 file changed, 7 insertions(+)
-
-diff --git a/src/lxplib.c b/src/lxplib.c
-index 7726913..35bec3c 100644
---- a/src/lxplib.c
-+++ b/src/lxplib.c
-@@ -538,11 +538,18 @@ static int lxp_stop (lua_State *L) {
-   return 1;
- }
- 
-+static int lxp_getcurrentbytecount (lua_State* L) {
-+  lxp_userdata *xpu = checkparser(L, 1);
-+  lua_pushinteger(L, XML_GetCurrentByteCount(xpu->parser));
-+  return 1;
-+}
-+
- static const luaL_Reg lxp_meths[] = {
-   {"parse", lxp_parse},
-   {"close", lxp_close},
-   {"__gc", parser_gc},
-   {"pos", lxp_pos},
-+  {"getcurrentbytecount", lxp_getcurrentbytecount},
-   {"setencoding", lxp_setencoding},
-   {"getcallbacks", getcallbacks},
-   {"getbase", getbase},
diff --git a/dev-lua/luaexpat/files/luaexpat-1.3.3_makefile.patch b/dev-lua/luaexpat/files/luaexpat-1.3.3_makefile.patch
deleted file mode 100644
index a780dddea838..000000000000
--- a/dev-lua/luaexpat/files/luaexpat-1.3.3_makefile.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-diff --git a/makefile b/makefile
-index 1a5a145..50912f0 100644
---- a/makefile
-+++ b/makefile
-@@ -45,7 +45,7 @@ OBJS= src/lxplib.o
- lib: src/$(LIBNAME)
- 
- src/$(LIBNAME) : $(OBJS)
--	$(CC) $(CFLAGS) -o src/$(LIBNAME) $(LIB_OPTION) $(OBJS) -lexpat
-+	$(CC) $(LDFLAGS) $(CFLAGS) -fPIC -std=gnu99 -ansi -I$(LUA_INC) -I$(EXPAT_INC) -o src/$(LIBNAME) $(LIB_OPTION) $(OBJS) -lexpat
- 
- install:
- 	mkdir -p $(LUA_LIBDIR)
-@@ -53,6 +53,7 @@ install:
- 	cd $(LUA_LIBDIR); ln -f -s $(LIBNAME) $T.so
- 	mkdir -p $(LUA_DIR)/$T
- 	cp src/$T/lom.lua $(LUA_DIR)/$T
-+	cp src/$T/totable.lua $(LUA_DIR)/$T
- 
- clean:
- 	rm -f src/$(LIBNAME) $(OBJS)
diff --git a/dev-lua/luaexpat/files/luaexpat-1.3.3_restore_functionality.patch b/dev-lua/luaexpat/files/luaexpat-1.3.3_restore_functionality.patch
deleted file mode 100644
index c0bc8c1a7b41..000000000000
--- a/dev-lua/luaexpat/files/luaexpat-1.3.3_restore_functionality.patch
+++ /dev/null
@@ -1,109 +0,0 @@
-From 4ef48128bd9a725daca1d5a4aabe0c1665d78742 Mon Sep 17 00:00:00 2001
-From: Matthew Wild <mwild1@gmail.com>
-Date: Wed, 2 Apr 2014 21:02:29 +0100
-Subject: [PATCH] Make merging of CharacterData events optional, controlled by
- the 3rd parameter of lxp.new()
-
----
- src/lxplib.c | 12 ++++++++++--
- 1 file changed, 10 insertions(+), 2 deletions(-)
-
-diff --git a/src/lxplib.c b/src/lxplib.c
-index a7d6c42..794f6e3 100644
---- a/src/lxplib.c
-+++ b/src/lxplib.c
-@@ -57,6 +57,7 @@ struct lxp_userdata {
-   int tableref;  /* table with callbacks for this parser */
-   enum XPState state;
-   luaL_Buffer *b;  /* to concatenate sequences of cdata pieces */
-+  int bufferCharData; /* whether to buffer cdata pieces */
- };
- 
- typedef struct lxp_userdata lxp_userdata;
-@@ -171,8 +172,13 @@ static void f_CharData (void *ud, const char *s, int len) {
-   lxp_userdata *xpu = (lxp_userdata *)ud;
-   if (xpu->state == XPSok) {
-     if (getHandle(xpu, CharDataKey) == 0) return;  /* no handle */
--    xpu->state = XPSstring;
--    luaL_buffinit(xpu->L, xpu->b);
-+    if(xpu->bufferCharData != 0) {
-+      xpu->state = XPSstring;
-+      luaL_buffinit(xpu->L, xpu->b);
-+    } else {
-+      lua_pushlstring(xpu->L, s, len);
-+      docall(xpu, 1, 0);
-+    }
-   }
-   if (xpu->state == XPSstring)
-     luaL_addlstring(xpu->b, s, len);
-@@ -393,8 +399,10 @@ static void checkcallbacks (lua_State *L) {
- 
- static int lxp_make_parser (lua_State *L) {
-   XML_Parser p;
-+  int bufferCharData = (lua_type(L, 3) != LUA_TBOOLEAN) || (lua_toboolean(L, 3) != 0);
-   char sep = *luaL_optstring(L, 2, "");
-   lxp_userdata *xpu = createlxp(L);
-+  xpu->bufferCharData = bufferCharData;
-   p = xpu->parser = (sep == '\0') ? XML_ParserCreate(NULL) :
-                                     XML_ParserCreateNS(NULL, sep);
-   if (!p)
-From cbaf85740f6032cfc025c7bde3f9861d15825928 Mon Sep 17 00:00:00 2001
-From: Matthew Wild <mwild1@gmail.com>
-Date: Wed, 2 Apr 2014 20:56:58 +0100
-Subject: [PATCH] Add support for XmlDecl handlers
-
----
- src/lxplib.c | 14 +++++++++++++-
- src/lxplib.h |  1 +
- 2 files changed, 14 insertions(+), 1 deletion(-)
-
-diff --git a/src/lxplib.c b/src/lxplib.c
-index 35bec3c..a7d6c42 100644
---- a/src/lxplib.c
-+++ b/src/lxplib.c
-@@ -345,6 +345,16 @@ static void f_StartDoctypeDecl (void *ud, const XML_Char *doctypeName,
-   docall(xpu, 4, 0);
- }
- 
-+static void f_XmlDecl (void *ud, const XML_Char *version,
-+                                 const XML_Char *encoding,
-+                                 int standalone) {
-+  lxp_userdata *xpu = (lxp_userdata *)ud;
-+  if (getHandle(xpu, XmlDeclKey) == 0) return;  /* no handle */
-+  lua_pushstring(xpu->L, version);
-+  lua_pushstring(xpu->L, encoding);
-+  lua_pushboolean(xpu->L, standalone);
-+  docall(xpu, 3, 0);
-+}
- /* }====================================================== */
- 
- 
-@@ -365,7 +375,7 @@ static void checkcallbacks (lua_State *L) {
-     "Default", "DefaultExpand", "StartElement", "EndElement",
-     "ExternalEntityRef", "StartNamespaceDecl", "EndNamespaceDecl",
-     "NotationDecl", "NotStandalone", "ProcessingInstruction",
--    "UnparsedEntityDecl", "StartDoctypeDecl", NULL};
-+    "UnparsedEntityDecl", "StartDoctypeDecl", "XmlDecl", NULL};
-   if (hasfield(L, "_nonstrict")) return;
-   lua_pushnil(L);
-   while (lua_next(L, 1)) {
-@@ -420,6 +430,8 @@ static int lxp_make_parser (lua_State *L) {
-     XML_SetUnparsedEntityDeclHandler(p, f_UnparsedEntityDecl);
-   if (hasfield(L, StartDoctypeDeclKey))
-     XML_SetStartDoctypeDeclHandler(p, f_StartDoctypeDecl);
-+  if (hasfield(L, XmlDeclKey))
-+    XML_SetXmlDeclHandler(p, f_XmlDecl);
-   return 1;
- }
- 
-diff --git a/src/lxplib.h b/src/lxplib.h
-index 9c0be4f..4c7084c 100644
---- a/src/lxplib.h
-+++ b/src/lxplib.h
-@@ -20,5 +20,6 @@
- #define ProcessingInstructionKey	"ProcessingInstruction"
- #define UnparsedEntityDeclKey		"UnparsedEntityDecl"
- #define StartDoctypeDeclKey		"StartDoctypeDecl"
-+#define XmlDeclKey			"XmlDecl"
- 
- int luaopen_lxp (lua_State *L);
diff --git a/dev-lua/luaexpat/luaexpat-1.3.0-r102.ebuild b/dev-lua/luaexpat/luaexpat-1.3.0-r103.ebuild
index a3ddb21e5619..b73300da7b37 100644
--- a/dev-lua/luaexpat/luaexpat-1.3.0-r102.ebuild
+++ b/dev-lua/luaexpat/luaexpat-1.3.0-r103.ebuild
@@ -3,12 +3,12 @@
 
 EAPI=7
 
-LUA_COMPAT=( lua5-{1..3} luajit )
+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/"
+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"
@@ -29,8 +29,8 @@ src_prepare() {
 	default
 
 	# Respect users CFLAGS
-	# Add '-DLUA_32BITS' for fixing compilation with lua5.3
-	sed -e 's/-O2/-DLUA_32BITS/g' -i Makefile || die
+	# Remove '-ansi' to compile with newer lua versions
+	sed -e 's/-O2//g' -e 's/-ansi//g' -i Makefile || die
 
 	lua_copy_sources
 }
diff --git a/dev-lua/luaexpat/luaexpat-1.3.3-r102.ebuild b/dev-lua/luaexpat/luaexpat-1.3.3-r102.ebuild
deleted file mode 100644
index e1907b637e49..000000000000
--- a/dev-lua/luaexpat/luaexpat-1.3.3-r102.ebuild
+++ /dev/null
@@ -1,78 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-LUA_COMPAT=( lua5-{1..3} luajit )
-
-inherit lua toolchain-funcs
-
-DESCRIPTION="LuaExpat is a SAX XML parser based on the Expat library"
-HOMEPAGE="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"
-REQUIRED_USE="${LUA_REQUIRED_USE}"
-
-RDEPEND="
-	dev-libs/expat
-	${LUA_DEPS}
-"
-DEPEND="${RDEPEND}"
-BDEPEND="virtual/pkgconfig"
-
-HTML_DOCS=( "doc/us/." )
-
-PATCHES=(
-	"${FILESDIR}/${P}_makefile.patch"
-	"${FILESDIR}/${P}_getcurrentbytecount.patch"
-	"${FILESDIR}/${P}_restore_functionality.patch"
-)
-
-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) ${CFLAGS}"
-		"LUA_INC=$(lua_get_include_dir)"
-	)
-
-	emake "${myemakeargs[@]}"
-
-	popd
-}
-
-src_compile() {
-	lua_foreach_impl lua_src_compile
-}
-
-lua_src_install() {
-	pushd "${BUILD_DIR}" || die
-
-	local myemakeargs=(
-		"LUA_DIR=${ED}/$(lua_get_lmod_dir)"
-		"LUA_INC=${ED}/$(lua_get_include_dir)"
-		"LUA_LIBDIR=${ED}/$(lua_get_cmod_dir)"
-	)
-
-	emake "${myemakeargs[@]}" install
-
-	popd
-}
-
-src_install() {
-	lua_foreach_impl lua_src_install
-
-	einstalldocs
-}
diff --git a/dev-lua/luaexpat/metadata.xml b/dev-lua/luaexpat/metadata.xml
index 7b5da0bdee8c..fd1dd982c84f 100644
--- a/dev-lua/luaexpat/metadata.xml
+++ b/dev-lua/luaexpat/metadata.xml
@@ -13,7 +13,4 @@
 		<email>conikost@gentoo.org</email>
 		<name>Conrad Kostecki</name>
 	</maintainer>
-	<upstream>
-		<remote-id type="github">tomasguisasola/luaexpat</remote-id>
-	</upstream>
 </pkgmetadata>