gentoo resync : 14.12.2020

5 files changed, 157 insertions, 26 deletions

diff --git a/dev-lua/lualdap/Manifest b/dev-lua/lualdap/Manifest
index 4313ab8e63fd..70b16ed6468e 100644
--- a/dev-lua/lualdap/Manifest
+++ b/dev-lua/lualdap/Manifest
@@ -1,3 +1,4 @@
-DIST lualdap-1.2.0.tar.xz 12380 BLAKE2B 42bf8633a5ccd60f6082b8729b9ba77c8f5486a7bab6cf727fc011856fec244de9f0fa96dd53c23a3fb5932a1670bbb621739c965618671c2c856c41e3faffbb SHA512 02cd3089dc6ca1f60957fa4733dae3cbfb2e13c25b068ddeb51b059701278eb86e359d56a6ef1df28cf514193311323255b36ff036bafda9fcbae0676d90a238
-EBUILD lualdap-1.2.0.ebuild 480 BLAKE2B d7f2260aa801536ec51588632cb09200d7e1c36569224e6670f2fc2d23f673e31fc3243e1446f2459039072fd2c191e3651a73fe0eadb4f449127137ce5afc30 SHA512 0f4f9b83bf358463ed1d9c6484487bd70467ad72d2bacc25dfbb22a9d6a69732673c0d0856c05228561c74b894223cda9459f9eda67826a726f6d6fe3a0e14c4
-MISC metadata.xml 356 BLAKE2B 0f578759801098220f27f47d45f12ffaf8b354c28323ac8fecbc38a52fd69464458eade8a95884093fd68e3c4dccc1e7a26c12c9a8a36a374cd8b7d63647988f SHA512 7d3ae5848accbb89d176bad4960ef96272151ff2b6ae02c1f32608216a19b461a9bcfd8c27a7ea755ef531969404e1e8865b4d9e81c8d292e2e482419d9140d5
+DIST lualdap-1.2.5.tar.gz 85920 BLAKE2B 14015fe258fa391e08fc9b6bdb7a71dae10fbd84636cc3d84c446d67f9d0ea925c0086343a29ce21b81f77c87da37040560c631cdf3df7c8d3c255e5913fd985 SHA512 4fbd7bcea2e55a3b165a7316e4f6c45aee22506915c4cc204d1b5006adbf95611ebf4558c1ef1511f90d7142571cff37ea24952072dc7ecb13bbbe06aef32e72
+EBUILD lualdap-1.2.5-r100.ebuild 1445 BLAKE2B 83928ee3e5d1f7fb97ac5687c8d01a4c22eb8422d9de089492dc8b217a009e6610d8c1104f90d98f1718e75bcdcc3b4e8d9ae52c90652710606051c0c8c93994 SHA512 3b4b758d7a9b1bb436b2bdb59de6f8f7804217b14edefe9575ad77610cf729e8ef0b07f2cb5ac7987a88b00e2dea35eae90dc8b2ea5445c463a98d524e13d148
+EBUILD lualdap-1.2.5.ebuild 1292 BLAKE2B 6a7d2f6dbdcab3305591b316ed8bf5d52bdbd6c46dee9b543cb49c04c53b4c32b504553ee0e60e31166d8f1a38036891bd9f336cfa84a2955992a9a0d3de3e2f SHA512 d6d0cb3ae13eb7b562b515805b3bcc5bdf1fdc17b50aadd000bd8fbb2d6cf4363d72d242ddf944cd05d93620e3e5dcbea5a5d0c8499767e4c4865efc4d8cb5a8
+MISC metadata.xml 547 BLAKE2B eac91a6aa0723c8442142daad10af992c7142bafbe29f9ec748418b49eac2dc4bbd034ae4994026238eb8f7339f9d86e7c823f3c33a54a4fbde13e8f2fe8ddff SHA512 d893b983ca2b1bba4de32a90f9b0df79fdb30ee937d978ae506b2c07c7ae6d9d0d8c4e9ecbf09f6e2b4d54e95bef8482035b63672a41119e30d74244674c3f10
diff --git a/dev-lua/lualdap/lualdap-1.2.0.ebuild b/dev-lua/lualdap/lualdap-1.2.0.ebuild
deleted file mode 100644
index 38007f295ddf..000000000000
--- a/dev-lua/lualdap/lualdap-1.2.0.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils toolchain-funcs
-
-MY_PN="LuaLDAP"
-
-DESCRIPTION="Simple interface from Lua to OpenLDAP"
-HOMEPAGE="https://git.zx2c4.com/lualdap/about/"
-SRC_URI="https://git.zx2c4.com/${PN}/snapshot/${P}.tar.xz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-IUSE=""
-
-RDEPEND="dev-lang/lua:* net-nds/openldap"
-DEPEND="${RDEPEND}
-	net-nds/openldap
-	virtual/pkgconfig"
diff --git a/dev-lua/lualdap/lualdap-1.2.5-r100.ebuild b/dev-lua/lualdap/lualdap-1.2.5-r100.ebuild
new file mode 100644
index 000000000000..af582b86b150
--- /dev/null
+++ b/dev-lua/lualdap/lualdap-1.2.5-r100.ebuild
@@ -0,0 +1,88 @@
+# 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="A lua binding for the OpenLDAP client libraries"
+HOMEPAGE="https://github.com/lualdap/lualdap"
+SRC_URI="https://github.com/lualdap/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+REQUIRED_USE="${LUA_REQUIRED_USE}"
+RESTRICT="test"
+
+RDEPEND="
+	net-nds/openldap
+	${LUA_DEPS}
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	virtual/pkgconfig
+	test? ( ${RDEPEND} )
+"
+
+HTML_DOCS=( "doc/us/." )
+
+src_prepare() {
+	default
+
+	lua_copy_sources
+}
+
+lua_src_compile() {
+	pushd "${BUILD_DIR}" || die
+
+	local myemakeargs=(
+		"CC=$(tc-getCC)"
+		"LBER_LIBDIR=/usr/$(get_libdir)"
+		"LDAP_LIBDIR=/usr/$(get_libdir)"
+		"LUA_INCDIR=$(lua_get_include_dir)"
+	)
+
+	emake "${myemakeargs[@]}"
+
+	popd
+}
+
+src_compile() {
+	lua_foreach_impl lua_src_compile
+}
+
+lua_src_test() {
+	pushd "${BUILD_DIR}" || die
+	LUA_CPATH="./src/?.so" ${ELUA} tests/test.lua
+	popd
+}
+
+src_install() {
+	lua_foreach_impl lua_src_test
+}
+
+lua_src_install() {
+	pushd "${BUILD_DIR}" || die
+
+	# Workaround, as 'make install' does not create this directory
+	dodir "$(lua_get_cmod_dir)"
+
+	local myemakeargs=(
+		"DESTDIR=${ED}"
+		"INST_LIBDIR=$(lua_get_cmod_dir)"
+	)
+
+	emake "${myemakeargs[@]}" install
+
+	popd
+}
+
+src_install() {
+	lua_foreach_impl lua_src_install
+
+	einstalldocs
+}
diff --git a/dev-lua/lualdap/lualdap-1.2.5.ebuild b/dev-lua/lualdap/lualdap-1.2.5.ebuild
new file mode 100644
index 000000000000..9d530b5b471e
--- /dev/null
+++ b/dev-lua/lualdap/lualdap-1.2.5.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit toolchain-funcs
+
+DESCRIPTION="A lua binding for the OpenLDAP client libraries"
+HOMEPAGE="https://github.com/lualdap/lualdap"
+SRC_URI="https://github.com/lualdap/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="luajit test"
+RESTRICT="test"
+
+RDEPEND="
+	luajit? ( dev-lang/luajit:2 )
+	!luajit? ( dev-lang/lua:0 )
+	net-nds/openldap
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	virtual/pkgconfig
+	test? ( ${RDEPEND} )
+"
+
+HTML_DOCS=( "doc/us/." )
+
+src_compile() {
+	local myemakeargs=(
+		"CC=$(tc-getCC)"
+		"LBER_LIBDIR=/usr/$(get_libdir)"
+		"LDAP_LIBDIR=/usr/$(get_libdir)"
+		"LUA_INCDIR=$($(tc-getPKG_CONFIG) --variable includedir $(usex luajit 'luajit' 'lua'))"
+	)
+
+	emake "${myemakeargs[@]}"
+}
+
+src_test() {
+	LUA_CPATH="${S}/src/?.so" $(usex luajit 'luajit' 'lua') tests/test.lua
+}
+
+src_install() {
+	# Workaround, as 'make install' does not create this directory
+	dodir "$($(tc-getPKG_CONFIG) --variable INSTALL_CMOD $(usex luajit 'luajit' 'lua'))"
+
+	local myemakeargs=(
+		"DESTDIR=${ED}"
+		"INST_LIBDIR=$($(tc-getPKG_CONFIG) --variable INSTALL_CMOD $(usex luajit 'luajit' 'lua'))"
+	)
+
+	emake "${myemakeargs[@]}" install
+
+	einstalldocs
+}
diff --git a/dev-lua/lualdap/metadata.xml b/dev-lua/lualdap/metadata.xml
index 485a025884ba..aa61238027f4 100644
--- a/dev-lua/lualdap/metadata.xml
+++ b/dev-lua/lualdap/metadata.xml
@@ -9,4 +9,11 @@
 		<email>zx2c4@gentoo.org</email>
 		<name>Jason A. Donenfeld</name>
 	</maintainer>
+	<maintainer type="person">
+		<email>conikost@gentoo.org</email>
+		<name>Conrad Kostecki</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">lualdap/lualdap</remote-id>
+	</upstream>
 </pkgmetadata>