gentoo resync : 25.08.2020

7 files changed, 78 insertions, 79 deletions

diff --git a/dev-lua/luaexpat/Manifest b/dev-lua/luaexpat/Manifest
index 8fafdd2742db..4a3f1d6707bc 100644
--- a/dev-lua/luaexpat/Manifest
+++ b/dev-lua/luaexpat/Manifest
@@ -1,6 +1,6 @@
-AUX 1.2.0-destdir-ldflags.patch 982 BLAKE2B 5f6a6c6a8b57bc97e82f1912097701817f2c07c884e049cb535703652f11b4ae0f3c4c0924636d03bd6cdb64c276dd9cdc9a2af9593596ee39b89ad85683e0fd SHA512 59a222a343ebd04ef146dec4902bad12a0ad2920e680ff11acf31c08e075cd19a79b3430f823f72235e2a7d470afc3787ac92ad522263dae9340679b8fa239c0
-DIST luaexpat-1.2.0.tar.gz 28621 BLAKE2B d47a8c909d10afc103a48a8b4812a9afb15343a31e5106bfc9fa32c5cae2f0db7e1caeb65fd680852f1563dae682c328604f84aea3b7028d0472f08ad790823c SHA512 4f28e36fabcade14f9ae524b8aea19757ceaca9d4ad50c367fe8f58c14c3850efe252df780641159eeb01e96aaba38a9c9c6fe51d21f54a6c4ce33f80c87033f
+AUX luaexpat-1.3.3_makefile.patch 410 BLAKE2B 45b0c24795c679fc69c5cbf9683aa2a47da5ef1f874acb0336df014ef319566a7149c51253f843e5113263212ea585b517095423c77f3bf0580f31acee140b09 SHA512 c34f4e68d3b72b2dc5f7f09ed2f3128ec37becfbc6fa0d72d35be3374f4fc92a4159fa279d6a101a3671c05a4a1f3e248756ba1a0505f900bbece3290376c577
 DIST luaexpat-1.3.0.tar.gz 29567 BLAKE2B 176cb107e6047b15338ff45751af82389920e4210d40bd0b4400e549130a4983c843f7a64bb7b2fba37e36eb592e850d06efe196f8e837e79e50c8d135dbe763 SHA512 91884653310e2dc89ade6d1653875ac8607640a21853d3ccb1fd0f833812e41981fad5c40101732ec249104d2c50c9a332208d1e44423b8428065a223c60b4ae
-EBUILD luaexpat-1.2.0-r1.ebuild 1230 BLAKE2B 582a8fde2a508f4f21ef4d9936b8e55a9c2a2b68ae83003ec85501aac612d45c3046709a17ba7ba1292da428f932872f3980a304ba0555d1a52c1e7c5d27f2e3 SHA512 01f140836ef5b2f3a7c98cbd2bd2e48e3d86e7bc7535e7d5f8491c03f462e134fa6f0d64d5f309f61f5189bb60a3b9728f89843c2d15b7889ad82f25cf384380
-EBUILD luaexpat-1.3.0-r1.ebuild 1327 BLAKE2B 8a37db17a5c86b9ee84bc9925ac57ff332b03633ae82e3fa2870ed2d0f9207f4b7acff370b592ac7a1102953d9df06d19d925e6a55184f59d6b1768da03ca6c3 SHA512 582ee48e54d47326d9aa1f428aa3c23bcf374f96a50d0e47670f9d4693d3ea3989c1e7a2a2ecbcec352123758c9026e2d58518b204587561064d5de6b6101aba
-MISC metadata.xml 168 BLAKE2B 5f277cc66dbafa7e7985433f84b0f9a656a176a9b901862e2a8353ca2d4526797dded9696e835b9696c7f72324e94959cfb5a22de49a7e3e61604153886037ab SHA512 00eec08786156434460f5ed77b647579546cf1a86341a4f2c9c9c84326468c2c21dc5101c4277103b19266bb6f788823f4ddf3b9d044da26326d79bf2ac9a274
+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
diff --git a/dev-lua/luaexpat/files/1.2.0-destdir-ldflags.patch b/dev-lua/luaexpat/files/1.2.0-destdir-ldflags.patch
deleted file mode 100644
index 754fe27c8419..000000000000
--- a/dev-lua/luaexpat/files/1.2.0-destdir-ldflags.patch
+++ /dev/null
@@ -1,27 +0,0 @@
---- makefile.bak	2012-03-01 13:44:47.000000000 +0100
-+++ makefile	2012-03-01 13:45:50.000000000 +0100
-@@ -12,17 +12,17 @@
- lib: src/$(LIBNAME)
- 
- src/$(LIBNAME) : $(OBJS)
--	export MACOSX_DEPLOYMENT_TARGET="10.3"; $(CC) -o src/$(LIBNAME) $(LIB_OPTION) $(OBJS) -lexpat
-+	export MACOSX_DEPLOYMENT_TARGET="10.3"; $(CC) -o src/$(LIBNAME) $(LIB_OPTION) $(LDFLAGS) $(OBJS) -lexpat
- 
- $(COMPAT_DIR)/compat-5.1.o: $(COMPAT_DIR)/compat-5.1.c
--	$(CC) -c $(CFLAGS) -o $@ $(COMPAT_DIR)/compat-5.1.c
-+	$(CC) -c $(CFLAGS) $(LDFLAGS) -o $@ $(COMPAT_DIR)/compat-5.1.c
- 
- install:
--	mkdir -p $(LUA_LIBDIR)
--	cp src/$(LIBNAME) $(LUA_LIBDIR)
--	cd $(LUA_LIBDIR); ln -f -s $(LIBNAME) $T.so
--	mkdir -p $(LUA_DIR)/$T
--	cp src/$T/lom.lua $(LUA_DIR)/$T
-+	mkdir -p $(DESTDIR)$(LUA_LIBDIR)
-+	cp src/$(LIBNAME) $(DESTDIR)$(LUA_LIBDIR)
-+	cd $(DESTDIR)$(LUA_LIBDIR); ln -f -s $(LIBNAME) $T.so
-+	mkdir -p $(DESTDIR)$(LUA_DIR)/$T
-+	cp src/$T/lom.lua $(DESTDIR)$(LUA_DIR)/$T
- 
- clean:
- 	rm -f src/$(LIBNAME) $(OBJS)
diff --git a/dev-lua/luaexpat/files/luaexpat-1.3.3_makefile.patch b/dev-lua/luaexpat/files/luaexpat-1.3.3_makefile.patch
new file mode 100644
index 000000000000..95de7be60690
--- /dev/null
+++ b/dev-lua/luaexpat/files/luaexpat-1.3.3_makefile.patch
@@ -0,0 +1,13 @@
+diff --git a/makefile b/makefile
+index 1a5a145..df09239 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)
diff --git a/dev-lua/luaexpat/luaexpat-1.2.0-r1.ebuild b/dev-lua/luaexpat/luaexpat-1.2.0-r1.ebuild
deleted file mode 100644
index 79fc45c14b42..000000000000
--- a/dev-lua/luaexpat/luaexpat-1.2.0-r1.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit multilib toolchain-funcs flag-o-matic eutils
-
-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 ~hppa ~mips x86"
-IUSE=""
-
-RDEPEND=">=dev-lang/lua-5.1[deprecated]
-	dev-libs/expat"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-src_prepare() {
-	sed -i -e "s#^LUA_LIBDIR=.*#LUA_LIBDIR=$(pkg-config --variable INSTALL_CMOD lua)#" "${S}/config"
-	sed -i -e "s#^LUA_DIR=.*#LUA_DIR=$(pkg-config --variable INSTALL_LMOD lua)#" "${S}/config"
-	sed -i -e "s#^LUA_INC=.*#LUA_INC=$(pkg-config --variable INSTALL_INC lua)#" "${S}/config"
-	sed -i -e "s#^EXPAT_INC=.*#EXPAT_INC=/usr/include#" "${S}/config"
-	sed -i -e "s#^LUA_VERSION_NUM=.*#LUA_VERSION_NUM=501#" "${S}/config"
-	epatch "${FILESDIR}/${PV}-destdir-ldflags.patch"
-}
-
-src_compile() {
-	append-flags -fPIC
-	emake \
-		CFLAGS="${CFLAGS}" \
-		LDFLAGS="${LDFLAGS}" \
-		CC="$(tc-getCC)" \
-		LD="$(tc-getCC) -shared"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-	dodoc README
-	dohtml -r doc/*
-}
diff --git a/dev-lua/luaexpat/luaexpat-1.3.0-r1.ebuild b/dev-lua/luaexpat/luaexpat-1.3.0-r1.ebuild
index 098294058563..2cbb8f239da6 100644
--- a/dev-lua/luaexpat/luaexpat-1.3.0-r1.ebuild
+++ b/dev-lua/luaexpat/luaexpat-1.3.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -11,7 +11,7 @@ SRC_URI="http://matthewwild.co.uk/projects/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 arm ~arm64 hppa ppc ppc64 sparc x86"
+KEYWORDS="amd64 arm ~arm64 hppa ~mips ppc ppc64 sparc x86"
 IUSE=""
 
 RDEPEND=">=dev-lang/lua-5.1.5-r2[deprecated,${MULTILIB_USEDEP}]
diff --git a/dev-lua/luaexpat/luaexpat-1.3.3.ebuild b/dev-lua/luaexpat/luaexpat-1.3.3.ebuild
new file mode 100644
index 000000000000..9c6db1a5eef6
--- /dev/null
+++ b/dev-lua/luaexpat/luaexpat-1.3.3.ebuild
@@ -0,0 +1,47 @@
+# 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"
+)
+
+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/*
+}
diff --git a/dev-lua/luaexpat/metadata.xml b/dev-lua/luaexpat/metadata.xml
index 1b2becffa26c..33b51fda50f9 100644
--- a/dev-lua/luaexpat/metadata.xml
+++ b/dev-lua/luaexpat/metadata.xml
@@ -1,5 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <!-- maintainer-needed -->
+  <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>
 </pkgmetadata>