diff options
| -rw-r--r-- | profiles/package.mask | 1 | ||||
| -rw-r--r-- | www-client/luakit/luakit-2.2.1-r100.ebuild | 92 | ||||
| -rw-r--r-- | www-client/luakit/luakit-9999.ebuild | 45 |
3 files changed, 120 insertions, 18 deletions
diff --git a/profiles/package.mask b/profiles/package.mask index 4633518e7f1a..ef6ae87f557a 100644 --- a/profiles/package.mask +++ b/profiles/package.mask @@ -562,6 +562,7 @@ dev-lua/luacrypto >=sci-visualization/fityk-1.3.1-r100 >=www-apache/mod_security-2.9.3-r100 >=www-client/elinks-0.13.5-r100 +>=www-client/luakit-2.2.1-r100 >=www-servers/lighttpd-1.4.55-r100 >=dev-lua/lpeg-1.0.2-r100 >=dev-lua/lgi-0.9.2-r100 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-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" \ |