gentoo resync : 25.11.2020

5 files changed, 76 insertions, 52 deletions

diff --git a/dev-lua/luaevent/Manifest b/dev-lua/luaevent/Manifest
index 9ab21b42da42..d5ae4e2fbc09 100644
--- a/dev-lua/luaevent/Manifest
+++ b/dev-lua/luaevent/Manifest
@@ -1,5 +1,4 @@
-DIST luaevent-0.4.4.tar.gz 22249 BLAKE2B f4375e02a4a0e2a4517e559b6625188bc0b577f5dc2ce843ba2d9b8811f2953a3255ebf7ee28313731ecc5c7c4877ef78c119a4633361eea2f915426b6a92a2e SHA512 2f2d669e645c3186d5060f2a5358fed4756087e173bd94431cf74b158fc25ff8de4640f1a832704d1431a7b10797385a449ae79ce049e98edc414260cd4c85ea
 DIST luaevent-0.4.6.tar.gz 22599 BLAKE2B 2f70ef105ce43d6b48e69bcc896e20a64ca49e124ad979f5191606d10bb61de1664782016b55cc9f2bc32a704d8f0b4d664eebd8176905f72f9a4e3d1e8b0fdd SHA512 21e222d5bba75fd2e623a8abf20fc3cd38505bf7d3fe94d8781ed626556c398a8501775eb423f0567918cc75f2d846026d4aa559ac5129eca8261f0c73427913
-EBUILD luaevent-0.4.4.ebuild 1157 BLAKE2B 077a975277825bbc6400237af83a68c9777864bf9456e93da6e00b83b7889ebf0c3a1b841248f16b4377f3bda2483155415976700df96e98c2cb8fa1a2e9fd62 SHA512 339215026520ec8cfae8df034325e5d2cab704072a2c0dd9762ceedc4ca63e579bbb7949389f67c3cd0cf4e21c66c330e09e30ab6c3beb92ad29e8f4c6ac47b6
-EBUILD luaevent-0.4.6.ebuild 1172 BLAKE2B 7254dcd5d2dd1cdc0ae635424d565d9d62f4738720c9d7045b0830766dd48ff402be9cf4081ca84f5ed00c3a736fddaba2e7cba49da4a24cc8fb638e5355270d SHA512 fbce3c232909e12bcc0220e87ff58d89de2fd650b422de594ff2188265f4b94f4cb99c3c83ee9680ab0f8fe8d0ebf305216ada81c99ea94722fb53cf0afc30d3
-MISC metadata.xml 309 BLAKE2B d4292352166a4f69bad73e53a00cc500fdac6b05c4b8deecc774794b6fa7ba6a08398e3a26752d8ceda1a28d4003b5d9b62e457f3f35ef2d424dde4dde0faadd SHA512 29785300a4f0b5f4afdab52d0186698f47afb36b5b94943ad2034ba7a5b34020cd1b8d3e225d4255cc0b1ab380fb19c8f70bf23da3b31eedb88daf6d9e53e0d6
+EBUILD luaevent-0.4.6-r100.ebuild 1124 BLAKE2B 83ccd533dab8c8879348399e1b5cc96beedabe533c62372d762df569f0da6960bbdef183921bc3fb166f4fb4b0411948420ea661120691f9f013c01fe901c420 SHA512 1f7bb7ba0a56bf031500f745d2fb2b5e0f97e3240e9435368fcadd22670f8a826c31c73438aa7905bd8d57a47d5408b15a4dee0d029c786c3fe67ded2242488d
+EBUILD luaevent-0.4.6.ebuild 1167 BLAKE2B 3e5e1ea99cd1fc2a008c9a5c981e0a21d667b0bc29df7fe27c256382ca9952f1bf2bf721728f388a4b1a37add6557c8c49d016756108a339324129638524ae9b SHA512 5d97a433958bd4f49f1100a6b8200ccdac6b6fb240c4115cd63f304dfc910943734db01a0b8708f7b77a495c6ad36bd0218a387c8f091220bd910c81f4fd7d88
+MISC metadata.xml 412 BLAKE2B d38a312a6841ec1c241efdfd7582fc6059578291015bbf4a90fa669864d2e831099c24dd2bd46c73d946613a5440ad52d4cdf1bd87ca468e25bbb259e1495aa4 SHA512 63aafaff1b4115b3f1f530563e417dd6c6cfad2a62e8be3deaeb1b49a2154efc9756073636c2efa11d534c3019c33bdda0cf9c420f6d0713790f26206ccb2d19
diff --git a/dev-lua/luaevent/luaevent-0.4.4.ebuild b/dev-lua/luaevent/luaevent-0.4.4.ebuild
deleted file mode 100644
index fc40540709ab..000000000000
--- a/dev-lua/luaevent/luaevent-0.4.4.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-inherit toolchain-funcs
-
-DESCRIPTION="libevent bindings for Lua"
-HOMEPAGE="http://luaforge.net/projects/luaevent"
-SRC_URI="https://github.com/harningt/luaevent/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="amd64 ~arm x86"
-IUSE=""
-
-RDEPEND="dev-lang/lua:0
-	dev-libs/libevent:0="
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-src_prepare() {
-	sed -i "s:^CFLAGS =:CFLAGS +=:" "${S}/Makefile" \
-		|| die "sed failed"
-	sed -i "s:^LDFLAGS =:LDFLAGS +=:" "${S}/Makefile" \
-		|| die "sed failed"
-	sed -i "/^LDFLAGS/a CC = $(tc-getCC)" "${S}/Makefile" \
-		|| die "sed failed"
-	sed -i "s:^LUA_INC_DIR ?=.*:LUA_INC_DIR ?= $(pkg-config --variable INSTALL_INC lua):" "${S}/Makefile" \
-		|| die "sed failed"
-	sed -i "s:^INSTALL_DIR_LUA ?=.*:INSTALL_DIR_LUA ?= $(pkg-config --variable INSTALL_LMOD lua):" "${S}/Makefile" \
-		|| die "sed failed"
-	sed -i "s:^INSTALL_DIR_BIN ?=.*:INSTALL_DIR_BIN ?= $(pkg-config --variable INSTALL_CMOD lua):" "${S}/Makefile" \
-		|| die "sed failed"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-}
diff --git a/dev-lua/luaevent/luaevent-0.4.6-r100.ebuild b/dev-lua/luaevent/luaevent-0.4.6-r100.ebuild
new file mode 100644
index 000000000000..3ada51666ed5
--- /dev/null
+++ b/dev-lua/luaevent/luaevent-0.4.6-r100.ebuild
@@ -0,0 +1,61 @@
+# 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="Binding of libevent for Lua"
+HOMEPAGE="http://luaforge.net/projects/luaevent"
+SRC_URI="https://github.com/harningt/luaevent/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+REQUIRED_USE="${LUA_REQUIRED_USE}"
+
+RDEPEND="
+	${LUA_DEPS}
+	dev-libs/libevent:0=
+"
+DEPEND="${RDEPEND}"
+
+src_prepare() {
+	default
+
+	local mysedargs=(
+		-e "'s/CFLAGS =/CFLAGS +=/'"
+		-e "'s/LDFLAGS =/LDFLAGS +=/'"
+		-e "'s:-I\$(LUA_INC_DIR):\$(LUA_INC_DIR):'"
+		-i Makefile
+	)
+
+	eval sed ${mysedargs[@]} || die
+}
+
+lua_src_compile() {
+	tc-export CC
+
+	emake LUA_INC_DIR="$(lua_get_CFLAGS)"
+}
+
+src_compile() {
+	lua_foreach_impl lua_src_compile
+}
+
+lua_src_install() {
+	local myemakeargs=(
+		DESTDIR="${ED}"
+		INSTALL_DIR_BIN="$(lua_get_cmod_dir)"
+		INSTALL_DIR_LUA="$(lua_get_lmod_dir)"
+		LUA_INC_DIR="$(lua_get_CFLAGS)"
+	)
+
+	emake ${myemakeargs[@]} install
+}
+
+src_install() {
+	lua_foreach_impl lua_src_install
+}
diff --git a/dev-lua/luaevent/luaevent-0.4.6.ebuild b/dev-lua/luaevent/luaevent-0.4.6.ebuild
index e814d6b25c58..1e2debab47c3 100644
--- a/dev-lua/luaevent/luaevent-0.4.6.ebuild
+++ b/dev-lua/luaevent/luaevent-0.4.6.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
@@ -11,8 +11,7 @@ SRC_URI="https://github.com/harningt/luaevent/archive/v${PV}.tar.gz -> ${P}.tar.
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE=""
+KEYWORDS="amd64 arm arm64 x86"
 
 RDEPEND="dev-lang/lua:0
 	dev-libs/libevent:0="
diff --git a/dev-lua/luaevent/metadata.xml b/dev-lua/luaevent/metadata.xml
index 32ed283086a3..41cbd4dc71b8 100644
--- a/dev-lua/luaevent/metadata.xml
+++ b/dev-lua/luaevent/metadata.xml
@@ -1,10 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person">
-    <email>blueness@gentoo.org</email>
-  </maintainer>
-  <upstream>
-    <remote-id type="github">harningt/luaevent</remote-id>
-  </upstream>
+	<maintainer type="person">
+		<email>blueness@gentoo.org</email>
+	</maintainer>
+	<maintainer type="person">
+		<email>conikost@gentoo.org</email>
+		<name>Conrad Kostecki</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">harningt/luaevent</remote-id>
+	</upstream>
 </pkgmetadata>