gentoo resync : 25.11.2020

9 files changed, 345 insertions, 30 deletions

diff --git a/dev-lua/luaexpat/Manifest b/dev-lua/luaexpat/Manifest
index 4a3f1d6707bc..c375026b5773 100644
--- a/dev-lua/luaexpat/Manifest
+++ b/dev-lua/luaexpat/Manifest
@@ -1,6 +1,10 @@
-AUX luaexpat-1.3.3_makefile.patch 410 BLAKE2B 45b0c24795c679fc69c5cbf9683aa2a47da5ef1f874acb0336df014ef319566a7149c51253f843e5113263212ea585b517095423c77f3bf0580f31acee140b09 SHA512 c34f4e68d3b72b2dc5f7f09ed2f3128ec37becfbc6fa0d72d35be3374f4fc92a4159fa279d6a101a3671c05a4a1f3e248756ba1a0505f900bbece3290376c577
+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-r1.ebuild 1330 BLAKE2B 590fc39478e83833ecd56830181a630e19da3bbfa785b724c27b41e0716f13f4200cc8198418485740b4e6a2aeedf45c3f7cfda14edcf8408f5662a227548999 SHA512 7aef89e153094caf0d3ed99ac2a226b9f00f6f252842dfdb6f4a5e3cf3b72b47f2d5de95770eb5cfe2558b9c9b1ee9fc5357d6b9071a1656c39775d6217905fd
-EBUILD luaexpat-1.3.3.ebuild 1171 BLAKE2B 762679f6a2a91e5a52d3b52c4fa9f3a9323b1766da347abe25e43d6f2bd8aad303383b438b148755f863f152b408237f5d606d0afce54cc921dd75fcdcd6dc7f SHA512 abcde4cfdf6ee944c9ce74775a8508faa81243c7eed92fa02a765245bf551eca3d7e3111b610f37f3d8e5e4d7841e99e1eed75cc66fcb9d4c5e0ab1969972eda
-MISC metadata.xml 480 BLAKE2B 2eaf94b50215f43616af6cca2a5102ea4c52ba629f54e6b32b1b9bc4a4edf601619902de285129cab26cf97dd5f847c2dad80d36d896b03a8b5e83d3cda9a4f3 SHA512 33052ffee5b4e34879461358cdd6fd553d093e03d53e13e61186ad45d5c8d1d9171c7c8d461a8d7ab40457458cdac1f7794b2c450423764a19306699a3fad0c3
+EBUILD luaexpat-1.3.0-r100.ebuild 1655 BLAKE2B 9f44f5f19c9caafe525688caa9bead4d5f2b4d171241b6198b5a84438d8876e6f52faf224a3866c044a83c89843f9d01fb3fae3ee49cd5df5c4bddff8221e3f6 SHA512 a618f92cd3cec78238166e252344493b40cacc009beb098f345772884750bc276ba565ec70ff038f7261d1d7020b21af6f0bdd484cafa6fd0ef1aae5f8a2c970
+EBUILD luaexpat-1.3.0-r2.ebuild 1174 BLAKE2B 43efb15693c8c75e115e8976d125a9fdf5c4b30250ac5dfdd9b4c1e5044a5545461203507077e4b8de9d2902808e130a5567e9b881cf22c2613327f16e387e6f SHA512 2b6e0ab5b3b71124b5441776e3be1531a14897ade4c956e68242bea53e21da375c010375471b942d1f1d6cf5e2f56c65ad1fa0bb408825bcae3644de6b8daf20
+EBUILD luaexpat-1.3.3-r100.ebuild 1783 BLAKE2B 3707e3ffffc44ce4c6c466513529f367964875d9d500ecb1394c203b2425f06b4601a18210ec47328c22c789e745b9f6f9e912e30bd3118c5c59ee235ce71c76 SHA512 f791c4ca6cc4416e3537dbe833eb3e7778a0050461f63627c1abb65a8afac46636bccdd15388ba275bb0a82a69e73793488f1d07b03fb3a7975d1e5b5d45fd41
+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/files/luaexpat-1.3.3_getcurrentbytecount.patch b/dev-lua/luaexpat/files/luaexpat-1.3.3_getcurrentbytecount.patch
new file mode 100644
index 000000000000..7366163d9d82
--- /dev/null
+++ b/dev-lua/luaexpat/files/luaexpat-1.3.3_getcurrentbytecount.patch
@@ -0,0 +1,33 @@
+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
index 95de7be60690..a780dddea838 100644
--- a/dev-lua/luaexpat/files/luaexpat-1.3.3_makefile.patch
+++ b/dev-lua/luaexpat/files/luaexpat-1.3.3_makefile.patch
@@ -1,5 +1,5 @@
 diff --git a/makefile b/makefile
-index 1a5a145..df09239 100644
+index 1a5a145..50912f0 100644
 --- a/makefile
 +++ b/makefile
 @@ -45,7 +45,7 @@ OBJS= src/lxplib.o
@@ -11,3 +11,11 @@ index 1a5a145..df09239 100644
  
  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
new file mode 100644
index 000000000000..c0bc8c1a7b41
--- /dev/null
+++ b/dev-lua/luaexpat/files/luaexpat-1.3.3_restore_functionality.patch
@@ -0,0 +1,109 @@
+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-r100.ebuild b/dev-lua/luaexpat/luaexpat-1.3.0-r100.ebuild
new file mode 100644
index 000000000000..28ce6e137095
--- /dev/null
+++ b/dev-lua/luaexpat/luaexpat-1.3.0-r100.ebuild
@@ -0,0 +1,78 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+LUA_COMPAT=( lua5-{1..3} )
+LUA_REQ_USE="${MULTILIB_USEDEP}"
+
+inherit lua multilib-minimal toolchain-funcs
+
+DESCRIPTION="LuaExpat is a SAX XML parser based on the Expat library"
+HOMEPAGE="https://matthewwild.co.uk/projects/luaexpat/"
+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"
+REQUIRED_USE="${LUA_REQUIRED_USE}"
+
+RDEPEND="
+	dev-libs/expat[${MULTILIB_USEDEP}]
+	${LUA_DEPS}
+"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+HTML_DOCS=( "doc/us/." )
+
+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
+
+	multilib_copy_sources
+}
+
+lua_multilib_src_compile() {
+	# Clean project, to compile it for every lua slot
+	emake clean
+
+	local myemakeargs=(
+		"CC=$(tc-getCC)"
+		"LUA_INC=$(lua_get_CFLAGS)"
+	)
+
+	emake "${myemakeargs[@]}"
+
+	# Copy module to match the choosen LUA implementation
+	cp "src/lxp.so" "src/lxp-${ELUA}.so" || die
+}
+
+multilib_src_compile() {
+	lua_foreach_impl lua_multilib_src_compile
+}
+
+lua_multilib_src_install() {
+	# Use correct module for the choosen LUA implementation
+	cp "src/lxp-${ELUA}.so" "src/lxp.so" || 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
+}
+
+multilib_src_install() {
+	lua_foreach_impl lua_multilib_src_install
+}
+
+multilib_src_install_all() {
+	einstalldocs
+}
diff --git a/dev-lua/luaexpat/luaexpat-1.3.0-r1.ebuild b/dev-lua/luaexpat/luaexpat-1.3.0-r2.ebuild
index 2cbb8f239da6..37600917577e 100644
--- a/dev-lua/luaexpat/luaexpat-1.3.0-r1.ebuild
+++ b/dev-lua/luaexpat/luaexpat-1.3.0-r2.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
-inherit multilib toolchain-funcs flag-o-matic eutils multilib-minimal
+inherit multilib-minimal toolchain-funcs
 
 DESCRIPTION="LuaExpat is a SAX XML parser based on the Expat library"
 HOMEPAGE="http://www.keplerproject.org/luaexpat/"
@@ -11,18 +11,17 @@ 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"
-IUSE=""
+KEYWORDS="amd64 arm arm64 ~hppa ~mips ppc ppc64 sparc x86"
 
-RDEPEND=">=dev-lang/lua-5.1.5-r2[deprecated,${MULTILIB_USEDEP}]
+RDEPEND=">=dev-lang/lua-5.1.5-r2:0[${MULTILIB_USEDEP}]
 	>=dev-libs/expat-2.1.0-r3[${MULTILIB_USEDEP}]"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
 
 src_prepare() {
+	default
+	sed -i -e 's:-g::' -e 's:-O2::' Makefile || die "sed failed"
 	multilib_copy_sources
-
-	append-flags -fPIC
 }
 
 multilib_src_compile() {
@@ -30,9 +29,6 @@ multilib_src_compile() {
 		CFLAGS="${CFLAGS}" \
 		LDFLAGS="${LDFLAGS}" \
 		CC="$(tc-getCC)" \
-		LD="$(tc-getCC) -shared" \
-		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)"
 }
 
@@ -46,6 +42,5 @@ multilib_src_install() {
 }
 
 multilib_src_install_all() {
-	dodoc README
-	dohtml -r doc/*
+	dodoc -r README doc/*
 }
diff --git a/dev-lua/luaexpat/luaexpat-1.3.3-r100.ebuild b/dev-lua/luaexpat/luaexpat-1.3.3-r100.ebuild
new file mode 100644
index 000000000000..7674c7cd76ab
--- /dev/null
+++ b/dev-lua/luaexpat/luaexpat-1.3.3-r100.ebuild
@@ -0,0 +1,82 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+LUA_COMPAT=( lua5-{1..3} )
+LUA_REQ_USE="${MULTILIB_USEDEP}"
+
+inherit lua multilib-minimal 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[${MULTILIB_USEDEP}]
+	${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
+
+	multilib_copy_sources
+}
+
+lua_multilib_src_compile() {
+	# Clean project, to compile it for every lua slot
+	emake clean
+
+	local myemakeargs=(
+		"CC=$(tc-getCC)"
+		"LUA_INC=$(lua_get_include_dir)"
+	)
+
+	emake "${myemakeargs[@]}"
+
+	# Copy module to match the choosen LUA implementation
+	cp "src/lxp.so.${PV}" "src/lxp-${ELUA}.so.${PV}" || die
+}
+
+multilib_src_compile() {
+	lua_foreach_impl lua_multilib_src_compile
+}
+
+lua_multilib_src_install() {
+	# Use correct module for the choosen LUA implementation
+	cp "src/lxp-${ELUA}.so.${PV}" "src/lxp.so.${PV}" || 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
+}
+
+multilib_src_install() {
+	lua_foreach_impl lua_multilib_src_install
+}
+
+multilib_src_install_all() {
+	einstalldocs
+}
diff --git a/dev-lua/luaexpat/luaexpat-1.3.3.ebuild b/dev-lua/luaexpat/luaexpat-1.3.3-r2.ebuild
index 9c6db1a5eef6..5b99b5d96bac 100644
--- a/dev-lua/luaexpat/luaexpat-1.3.3.ebuild
+++ b/dev-lua/luaexpat/luaexpat-1.3.3-r2.ebuild
@@ -20,6 +20,8 @@ BDEPEND="virtual/pkgconfig"
 
 PATCHES=(
 	"${FILESDIR}/${P}_makefile.patch"
+	"${FILESDIR}/${P}_getcurrentbytecount.patch"
+	"${FILESDIR}/${P}_restore_functionality.patch"
 )
 
 src_prepare() {
diff --git a/dev-lua/luaexpat/metadata.xml b/dev-lua/luaexpat/metadata.xml
index 33b51fda50f9..7b5da0bdee8c 100644
--- a/dev-lua/luaexpat/metadata.xml
+++ b/dev-lua/luaexpat/metadata.xml
@@ -1,15 +1,19 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person">
-    <email>azamat.hackimov@gmail.com</email>
-    <name>Azamat H. Hackimov</name>
-  </maintainer>
-  <maintainer type="project">
-    <email>proxy-maint@gentoo.org</email>
-    <name>Proxy Maintainers</name>
-  </maintainer>
-  <upstream>
-    <remote-id type="github">tomasguisasola/luaexpat</remote-id>
-  </upstream>
+	<maintainer type="person">
+		<email>azamat.hackimov@gmail.com</email>
+		<name>Azamat H. Hackimov</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
+	<maintainer type="person">
+		<email>conikost@gentoo.org</email>
+		<name>Conrad Kostecki</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">tomasguisasola/luaexpat</remote-id>
+	</upstream>
 </pkgmetadata>