commit: e09ec5e6e65c36e8b2e9049be294f48138dab09e Author: Marek Szuba <marecki <AT> gentoo <DOT> org> AuthorDate: Sun Nov 29 17:07:30 2020 +0000 Commit: Marek Szuba <marecki <AT> gentoo <DOT> org> CommitDate: Sun Nov 29 17:08:56 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e09ec5e6
www-client/luakit: migrate to lua-single.eclass Both the release and the live ebuild. Closes: https://bugs.gentoo.org/752909 Signed-off-by: Marek Szuba <marecki <AT> gentoo.org> profiles/package.mask | 1 + ...luakit-9999.ebuild => luakit-2.2.1-r100.ebuild} | 46 +++++++++++++--------- www-client/luakit/luakit-9999.ebuild | 45 ++++++++++++--------- 3 files changed, 56 insertions(+), 36 deletions(-) diff --git a/profiles/package.mask b/profiles/package.mask index 4633518e7f1..ef6ae87f557 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-9999.ebuild b/www-client/luakit/luakit-2.2.1-r100.ebuild similarity index 67% copy from www-client/luakit/luakit-9999.ebuild copy to www-client/luakit/luakit-2.2.1-r100.ebuild index e249169925e..4c0f4d8faf9 100644 --- a/www-client/luakit/luakit-9999.ebuild +++ b/www-client/luakit/luakit-2.2.1-r100.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,49 @@ 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 + "${FILESDIR}"/${PN}-2.2.1-pkg-config.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 +73,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" \ diff --git a/www-client/luakit/luakit-9999.ebuild b/www-client/luakit/luakit-9999.ebuild index e249169925e..874b328f3b3 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" \
