gentoo resync : 15.06.2021

4 files changed, 118 insertions, 6 deletions

diff --git a/www-client/luakit/Manifest b/www-client/luakit/Manifest
index 2ebbf8404970..977e6d0864e9 100644
--- a/www-client/luakit/Manifest
+++ b/www-client/luakit/Manifest
@@ -1,6 +1,8 @@
 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
+DIST luakit-2.3.tar.gz 497470 BLAKE2B 980eabba255a83a26acf565df170907805df5eb6ea7bfc978c5a180c27575d7ebadec7c97ba7af1a60cdc08654f4c4ca1967b25272dd4788a553815f91cc1502 SHA512 98a473bcafbd082093689fd58b8c9828e3d79b8ae367ea4d030bb2b1671bf4f61a4f07fe57b99e6c69c40e26ad8b96b88b67e48ce085187923a1a1d976bdcee3
 EBUILD luakit-2.2.1-r100.ebuild 1860 BLAKE2B bd07f3d1076dc881e857c0a692a6aaea7451291a9b4b58d4514efebb670f6d4df2d7651fbc9d7c345b25a8c0f8f6017415fdb8db14c215e4642cf76cd90a2da9 SHA512 83144c8943ca6a476d1992ac9651a2d850c8a05a9cc100683673d271f5238e9134d1a567516f56c6528b7c3682a95a894277c7503f343bd5fc8145011a4a8872
-EBUILD luakit-9999.ebuild 1816 BLAKE2B 602415bd61caedace0b9e29a659d704d3522725a4b114ceffa69bd89985d8ab50b49ca062f4b411af31f00b744ec5b0c96468f69424af6cdafab7d02aefc8876 SHA512 3627746e2e2e624a6e9b85e8132ee0af819c9ad7da6d4e4f63b5bf796b38775d1d593c6f42390cc5dbca9b1e15383325d9add9e7903a0df623270589d2e069c1
-MISC metadata.xml 170 BLAKE2B eb526dd38c08c5ca150626a4bd6f4e58daeaffd25edcde9782dc8b584d0e302e0e795b9c8ccfa5f96da40ece9cbac094c3867fecf9758a2e530155c1db2dd715 SHA512 ed1f2cc86749299c1a5b0b5d82e82c86816c2f89d41b162b14cfecd7af82fb2ec2ae6a38190002587f5cfc13030b7598b1e49eb438e97bc38e8f4a71ce1e4e08
+EBUILD luakit-2.3.ebuild 1817 BLAKE2B 54512ea88e235848818064be3fb8214b42dbcae1a16f85bc64c4aca907c12fcea0e35836c05f27deeedd400170aea5be2fe008c273ede3956e6bc660638443fb SHA512 561034356fc6104e905466df3d1f57008a858044dd79848f89a6f426adb7ed32eecc366e870dbaa28849c53efac5b392ace2181ae597100f7e71c2d941c93b45
+EBUILD luakit-9999.ebuild 1817 BLAKE2B 54512ea88e235848818064be3fb8214b42dbcae1a16f85bc64c4aca907c12fcea0e35836c05f27deeedd400170aea5be2fe008c273ede3956e6bc660638443fb SHA512 561034356fc6104e905466df3d1f57008a858044dd79848f89a6f426adb7ed32eecc366e870dbaa28849c53efac5b392ace2181ae597100f7e71c2d941c93b45
+MISC metadata.xml 871 BLAKE2B 2d59ed03db36b8be588985a249a7d67269407643844d2077c5f718700a6a952287d1c8df7ffa07878c6309e6bf0750dbac1cfec152f6b3f84ea360f2f3d1aa2b SHA512 dd803fecc7fd65582ec8d5817b7e95133a4052b131f99b47c38256162b53604e9221b187a2e259a4d19b5e1971a48432d4dec7ac79f3b3a6ceb391ef13edcda6
diff --git a/www-client/luakit/luakit-2.3.ebuild b/www-client/luakit/luakit-2.3.ebuild
new file mode 100644
index 000000000000..4898eed6a661
--- /dev/null
+++ b/www-client/luakit/luakit-2.3.ebuild
@@ -0,0 +1,92 @@
+# Copyright 1999-2021 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
+)
+
+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" \
+		USE_LUAJIT=$(usex lua_single_target_luajit 1 0) \
+		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-9999.ebuild b/www-client/luakit/luakit-9999.ebuild
index c9e270416ac3..4898eed6a661 100644
--- a/www-client/luakit/luakit-9999.ebuild
+++ b/www-client/luakit/luakit-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -18,7 +18,7 @@ else
 	KEYWORDS="~amd64"
 fi
 
-LICENSE="GPL-3"
+LICENSE="GPL-3+"
 SLOT="0"
 IUSE="doc test"
 
diff --git a/www-client/luakit/metadata.xml b/www-client/luakit/metadata.xml
index 91b52104f179..3e615d255d88 100644
--- a/www-client/luakit/metadata.xml
+++ b/www-client/luakit/metadata.xml
@@ -1,5 +1,23 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <!-- maintainer-needed -->
-  </pkgmetadata>
+	<maintainer type="person" proxied="yes">
+		<name>Oz Tiram</name>
+		<email>oz.tiram@gmail.com</email>
+	</maintainer>
+	<maintainer type="project" proxied="proxy">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
+	<longdescription lang="en">
+		Luakit is a highly configurable browser framework based on the WebKit
+		web content engine and the GTK+ toolkit. It is very fast, extensible
+		with Lua, and licensed under the GNU GPLv3 license.
+		It is primarily targeted at power users, developers and anyone who wants
+		to have fine-grained control over their web browser's behaviour and
+		interface.
+	</longdescription>
+	<upstream>
+		<remote-id type="github">luakit/luakit</remote-id>
+	</upstream>
+</pkgmetadata>