gentoo auto-resync : 17:03:2023 - 06:26:48

4 files changed, 12 insertions, 205 deletions

diff --git a/www-client/luakit/Manifest b/www-client/luakit/Manifest
index 0e24be24e796..2177b83e29e9 100644
--- a/www-client/luakit/Manifest
+++ b/www-client/luakit/Manifest
@@ -1,9 +1,6 @@
 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
 AUX luakit-9999-make.patch 1349 BLAKE2B cda6b6e11515535e4fad3c3dd8cb589fc1a03acbcd3f7b8b738a022bf7b59672de4adf85726baf2bae31da50f5ec79e4824de41944cf6c3fc8fc24ef440a8fc2 SHA512 b15ec51344e6e6a59c92a6cab74ad274de7fe7e87926957a472e0f88c123ffef59b2b7a1300688b5e0e53ac16d6e77e953c2bed2bbbd0482fa1d5b1ce32fee58
-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-2.3.ebuild 1824 BLAKE2B 929ce04b85900b9d84b4f9ab18d06dc4941c08259def86b843f4c8c4cb6307358e3019c870f1f250e9283625db0525cfa12be4f9c8579000f1b4bfdb26745728 SHA512 4bae518f1b41e55ee46330073da66ba644f9c1cf17c39a847e61b220e2e3c9342e7e02fb9614db72907a4cbfddd62700bf49db7a4f429e5da1ce75fd0b8f0c60
-EBUILD luakit-9999.ebuild 1816 BLAKE2B c082967efdb0006a81a3adaf895cc9157cba5a68b7445953cf584614f63ea617143b4ab21a2b3747161e309ce2ee944420dd8ffa6b79da0b5be38950faf92876 SHA512 ac3059f16dc27d44575644f2089173e7e1d2b4bda7737872aaf19a4277732c59df9ad874d08833d2c8d6dc92e34b1f00441a658cc8db7e67d8ba833907b4748f
+DIST luakit-2.3.3.tar.gz 507343 BLAKE2B 4b9c3b3e4d5ff50f1c7409cf8f77ca7c81032f13051c3cca2aef4f794ee159fd12c5bfe0706e74414056899ef64330e888fe141256e52bc6d89eb572cca975e0 SHA512 ae5088541118c693db4a90f7e727d1f4094b56d4ea4cd51d2019351ff6b44672a1d7b9f80b351a37767556564b68633d815649ceaa4d8bd3b966a20a155ba2b2
+EBUILD luakit-2.3.3.ebuild 1714 BLAKE2B ef82e54b1849313abc972934fd0082e248aa7824a4673783b1d9111b1d160e1b8d306683afa7fd3f0e062f0eb54b345238776424871e391d560621c966ce43de SHA512 a2928cfe1ccae2dba5a9799756f11ec011d85ec509c4a95be5a7ef9e02bb65acd1deef77507229c52b008301820789e56c614b21f1593e49805cdbdac993b074
 MISC metadata.xml 872 BLAKE2B 21d416f72fdd369d9e7151601d0e70022530e20282ad794d449a4da5974fd09d7e2c15f0b2e6d3590ac42f9504b73e93209a6e8b9f436494629b48d799323d83 SHA512 86fa89d5e2729a43097343951652139d64c65c310e62e3f36f0e89b864e3d228222a31338d5f4eb10f27656496f94d4083b329bc4acfde2f2bd7e99e6d959bbb
diff --git a/www-client/luakit/luakit-2.2.1-r100.ebuild b/www-client/luakit/luakit-2.2.1-r100.ebuild
deleted file mode 100644
index b1ab4c1af055..000000000000
--- a/www-client/luakit/luakit-2.2.1-r100.ebuild
+++ /dev/null
@@ -1,93 +0,0 @@
-# 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" \
-		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-2.3.3.ebuild
index 81da040c1b33..4c994069bf52 100644
--- a/www-client/luakit/luakit-9999.ebuild
+++ b/www-client/luakit/luakit-2.3.3.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 LUA_COMPAT=( lua5-1 luajit )
 
@@ -10,13 +10,8 @@ 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
+SRC_URI="https://github.com/luakit/luakit/archive/${PV}.tar.gz -> ${P}.tar.gz"
+KEYWORDS="~amd64 ~arm64"
 
 LICENSE="GPL-3+"
 SLOT="0"
@@ -28,7 +23,7 @@ RESTRICT="!test? ( test )"
 RDEPEND="
 	dev-db/sqlite:3
 	dev-libs/glib:2
-	net-libs/webkit-gtk:4=
+	net-libs/webkit-gtk:4.1=
 	x11-libs/gtk+:3
 	${LUA_DEPS}
 	$(lua_gen_cond_dep '
@@ -38,7 +33,11 @@ RDEPEND="
 DEPEND="${RDEPEND}"
 BDEPEND="
 	virtual/pkgconfig
-	doc? ( app-doc/doxygen )
+	doc? (
+		dev-lua/luafilesystem
+		app-doc/doxygen
+		media-gfx/graphviz
+	)
 	test? (
 		$(lua_gen_cond_dep '
 			dev-lua/luassert[${LUA_USEDEP}]
@@ -47,10 +46,6 @@ BDEPEND="
 		x11-base/xorg-server[xvfb]
 	)
 "
-PATCHES=(
-	"${FILESDIR}"/${PN}-9999-make.patch
-)
-
 src_configure() {
 	export LUA_BIN_NAME=${ELUA}
 	export LUA_PKG_NAME=${ELUA}
diff --git a/www-client/luakit/luakit-2.3.ebuild b/www-client/luakit/luakit-2.3.ebuild
deleted file mode 100644
index 0956e99f0f2e..000000000000
--- a/www-client/luakit/luakit-2.3.ebuild
+++ /dev/null
@@ -1,92 +0,0 @@
-# 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 ~arm64"
-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
-}