gentoo resync : 14.12.2020

4 files changed, 127 insertions, 22 deletions

diff --git a/www-client/luakit/Manifest b/www-client/luakit/Manifest
index b184b966430c..fa8a386a539a 100644
--- a/www-client/luakit/Manifest
+++ b/www-client/luakit/Manifest
@@ -1,6 +1,7 @@
 AUX luakit-2.2.1-make.patch 1349 BLAKE2B 9f13f93b00908d15fdad63fa4fcaff607512237f6d0a065fff54cf3726bb6274b0e3b163a82d2cf11f01f18990bc0a80dc5d2cc11a16d2a8b834db9ab7f35ff1 SHA512 d7a9250ea33748514f942f38198bedf2bcaf19756c9d75014e6bbb781695443e3b0e280b621db785b0f907bbd80e3971a53d8131e0ab52a136aa72c90db64d1f
 AUX luakit-2.2.1-pkg-config.patch 779 BLAKE2B 6ab9e9d8af10f8d8dde8f01a77481f16aaf285718e4fe520d026b6054b175a72b5bd880793a3379dc3cc500bb3889e2f429fdaabdd5d47f261ddfc5b40e5e29e SHA512 f51ba29b41841cb1dc1b5cf4917182b86c9aa1e71ddc8b834314e70700ac805660f87f49c3a5ce3a8b093d1ee49305c008f72a37fbefc0edcbd9ad77ce8f5f95
 DIST luakit-2.2.1.tar.gz 488845 BLAKE2B 2bed592f7d56fc4b5bad4fee3563805954c6211222e25344d01430ef9f2921c240e9cb3c735564fae66d0739d50da41a90309c7dba3ba9f4631d880b9a47e4b1 SHA512 9a055c1541f31027805d3da2604d98c0193a9c2874099fc3ab3ef08c645a8e91b8504d1162e86cbd29a5e5e0a3c54b3154299708f864d135d8640bcc3866674b
-EBUILD luakit-2.2.1.ebuild 1630 BLAKE2B 73071d403c2feb97802203dffd15ae9c5997b7b5032a48291f76090e90107ea9dbb44f1289e46af214f3b494f6cf4c7f57f4bea483fffc28155132166151d120 SHA512 ee87b2487742f5a50e4a0df20ee840b8ba71c7734d1f91affda285686caf4fc264fe71588f7088293e126caf3d1326b86c4b630041b4ae3a21f35cb27891285c
-EBUILD luakit-9999.ebuild 1586 BLAKE2B 25845834617ac142d7caef22cd31cf4af803e8a0e96a5a6d87a257ca81be7340ec54e644e775d044cdb94b5df74d0be17a98063737ab83334c6b4b16550ce525 SHA512 e58c31f0952a9c95684fa20a0ff20ea063f68d8337baa3413b57b9e9507b281dc9053801072fb9825882e137d08160197a349574d583926a281a5a34d5a63fc8
+EBUILD luakit-2.2.1-r100.ebuild 1808 BLAKE2B b64746204bd249fc2a35c532965b7909ee11acaf709ceccbef3804fa6c0bbf420b7b9c8590e1a00b0ba6a499455d50537746ea25978db48141d7075eee1a8bc8 SHA512 d57e14f33c89c833e2a99d4c34f1dbac141a08b67791dd99c6887ae4fe3d285b217c2b8272404f71859a2f3442c7246d560f29f3945a19c4966d8e5810846038
+EBUILD luakit-2.2.1.ebuild 1711 BLAKE2B eb1c46ee3e45568e21e88ac3bbe98bf05a9adc15945569dc7384c7f475411dbd2a4f22073a3e1a56ae53a43abd133d488fa0034aaad9f2262695e75c76a80092 SHA512 c20851c61dc01dd68e41a85158abd035f47d7daaa458464aedccb5035927e4f41e03f42029da9d9570b700b50bda27ca72b67c1f42bfa18e70807ba6402aed33
+EBUILD luakit-9999.ebuild 1764 BLAKE2B 75e0e59243d4b1b9170272814323717b31bcd5b3805fc9c4c34d0cd487df0db7e5127471748196c99f82c91a8257aaa7aaed8c3bcd78223dd546926fe1c3cbc1 SHA512 8b9eab98e5883afd7cbe50c52f6773c34449b3f6b4970bc00ce738a3a0a22457f19f9a014640e3c4d27992dc46ef8b6eb54347e7a08b80ec5fa6b5265d04fd87
 MISC metadata.xml 170 BLAKE2B eb526dd38c08c5ca150626a4bd6f4e58daeaffd25edcde9782dc8b584d0e302e0e795b9c8ccfa5f96da40ece9cbac094c3867fecf9758a2e530155c1db2dd715 SHA512 ed1f2cc86749299c1a5b0b5d82e82c86816c2f89d41b162b14cfecd7af82fb2ec2ae6a38190002587f5cfc13030b7598b1e49eb438e97bc38e8f4a71ce1e4e08
diff --git a/www-client/luakit/luakit-2.2.1-r100.ebuild b/www-client/luakit/luakit-2.2.1-r100.ebuild
new file mode 100644
index 000000000000..4c0f4d8faf9d
--- /dev/null
+++ b/www-client/luakit/luakit-2.2.1-r100.ebuild
@@ -0,0 +1,92 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+LUA_COMPAT=( lua5-1 luajit )
+
+inherit lua-single toolchain-funcs xdg
+
+DESCRIPTION="A fast, extensible, and customizable web browser"
+HOMEPAGE="https://luakit.github.io/luakit"
+
+if [[ ${PV} == 9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/luakit/luakit.git"
+else
+	SRC_URI="https://github.com/luakit/luakit/archive/${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64"
+fi
+
+LICENSE="GPL-3"
+SLOT="0"
+IUSE="doc test"
+
+REQUIRED_USE="${LUA_REQUIRED_USE}"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	dev-db/sqlite:3
+	dev-libs/glib:2
+	net-libs/webkit-gtk:4=
+	x11-libs/gtk+:3
+	${LUA_DEPS}
+	$(lua_gen_cond_dep '
+		dev-lua/luafilesystem[${LUA_USEDEP}]
+	')
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	virtual/pkgconfig
+	doc? ( app-doc/doxygen )
+	test? (
+		$(lua_gen_cond_dep '
+			dev-lua/luassert[${LUA_USEDEP}]
+			dev-lua/luacheck[${LUA_USEDEP}]
+		')
+		x11-base/xorg-server[xvfb]
+	)
+"
+PATCHES=(
+	"${FILESDIR}"/${PN}-2.2.1-make.patch
+	"${FILESDIR}"/${PN}-2.2.1-pkg-config.patch
+)
+
+src_configure() {
+	export LUA_BIN_NAME=${ELUA}
+	export LUA_PKG_NAME=${ELUA}
+	tc-export CC PKG_CONFIG
+}
+
+src_compile() {
+	emake \
+		PREFIX="${EPREFIX}/usr" \
+		USE_LUAJIT=$(usex lua_single_target_luajit 1 0) \
+		${PN} ${PN}.so
+
+	use doc && emake doc
+}
+
+src_test() {
+	local failing_test
+	for failing_test in test_clib_luakit test_image_css; do
+		mv tests/async/${failing_test}.lua{,.disabled} || die
+	done
+
+	emake \
+		USE_LUAJIT=$(usex lua_single_target_luajit 1 0) \
+		run-tests
+}
+
+src_install() {
+	emake \
+		DESTDIR="${ED}" \
+		DOCDIR="${EPREFIX}/usr/share/doc/${PF}" \
+		PREFIX="${EPREFIX}/usr" \
+		XDGPREFIX="${EPREFIX}/etc/xdg" \
+		install
+
+	rm "${ED}/usr/share/doc/${PF}/COPYING.GPLv3" || die
+
+	use doc && dodoc -r doc/html
+}
diff --git a/www-client/luakit/luakit-2.2.1.ebuild b/www-client/luakit/luakit-2.2.1.ebuild
index efeb361d7b9d..6821a2d84cd7 100644
--- a/www-client/luakit/luakit-2.2.1.ebuild
+++ b/www-client/luakit/luakit-2.2.1.ebuild
@@ -55,7 +55,8 @@ src_configure() {
 src_compile() {
 	emake \
 		PREFIX="${EPREFIX}/usr" \
-		${PN}
+		USE_LUAJIT=$(usex luajit 1 0) \
+		${PN} ${PN}.so
 
 	use doc && emake doc
 }
@@ -66,7 +67,9 @@ src_test() {
 		mv tests/async/${failing_test}.lua{,.disabled} || die
 	done
 
-	emake run-tests
+	emake \
+		USE_LUAJIT=$(usex luajit 1 0) \
+		run-tests
 }
 
 src_install() {
diff --git a/www-client/luakit/luakit-9999.ebuild b/www-client/luakit/luakit-9999.ebuild
index e249169925ec..874b328f3b3f 100644
--- a/www-client/luakit/luakit-9999.ebuild
+++ b/www-client/luakit/luakit-9999.ebuild
@@ -2,7 +2,10 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-inherit toolchain-funcs xdg
+
+LUA_COMPAT=( lua5-1 luajit )
+
+inherit lua-single toolchain-funcs xdg
 
 DESCRIPTION="A fast, extensible, and customizable web browser"
 HOMEPAGE="https://luakit.github.io/luakit"
@@ -17,44 +20,48 @@ fi
 
 LICENSE="GPL-3"
 SLOT="0"
-IUSE="doc luajit test"
+IUSE="doc test"
+
+REQUIRED_USE="${LUA_REQUIRED_USE}"
 RESTRICT="!test? ( test )"
 
 RDEPEND="
 	dev-db/sqlite:3
 	dev-libs/glib:2
-	dev-lua/luafilesystem[luajit=]
 	net-libs/webkit-gtk:4=
 	x11-libs/gtk+:3
-	luajit? ( dev-lang/luajit:2 )
-	!luajit? ( dev-lang/lua:0 )
-"
-DEPEND="
-	${RDEPEND}
-	test? (
-		dev-lua/luassert[luajit=]
-		dev-lua/luacheck[luajit=]
-		x11-base/xorg-server[xvfb]
-	)
+	${LUA_DEPS}
+	$(lua_gen_cond_dep '
+		dev-lua/luafilesystem[${LUA_USEDEP}]
+	')
 "
+DEPEND="${RDEPEND}"
 BDEPEND="
 	virtual/pkgconfig
 	doc? ( app-doc/doxygen )
+	test? (
+		$(lua_gen_cond_dep '
+			dev-lua/luassert[${LUA_USEDEP}]
+			dev-lua/luacheck[${LUA_USEDEP}]
+		')
+		x11-base/xorg-server[xvfb]
+	)
 "
 PATCHES=(
 	"${FILESDIR}"/${PN}-2.2.1-make.patch
 )
 
 src_configure() {
-	export LUA_BIN_NAME=$(usex luajit luajit lua)
-	export LUA_PKG_NAME=$(usex luajit luajit lua)
+	export LUA_BIN_NAME=${ELUA}
+	export LUA_PKG_NAME=${ELUA}
 	tc-export CC PKG_CONFIG
 }
 
 src_compile() {
 	emake \
 		PREFIX="${EPREFIX}/usr" \
-		${PN}
+		USE_LUAJIT=$(usex lua_single_target_luajit 1 0) \
+		${PN} ${PN}.so
 
 	use doc && emake doc
 }
@@ -65,12 +72,14 @@ src_test() {
 		mv tests/async/${failing_test}.lua{,.disabled} || die
 	done
 
-	emake run-tests
+	emake \
+		USE_LUAJIT=$(usex lua_single_target_luajit 1 0) \
+		run-tests
 }
 
 src_install() {
 	emake \
-		DESTDIR="${D}" \
+		DESTDIR="${ED}" \
 		DOCDIR="${EPREFIX}/usr/share/doc/${PF}" \
 		PREFIX="${EPREFIX}/usr" \
 		XDGPREFIX="${EPREFIX}/etc/xdg" \