commit: acac3c3891c67956dabf7f8302493aafc48a08d7 Author: Jeroen Roovers <jer <AT> gentoo <DOT> org> AuthorDate: Thu Sep 24 13:45:39 2020 +0000 Commit: Jeroen Roovers <jer <AT> gentoo <DOT> org> CommitDate: Thu Sep 24 13:49:16 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=acac3c38
www-client/luakit: Export LUA_BIN_NAME and LUA_PKG_NAME Package-Manager: Portage-3.0.8, Repoman-3.0.1 Bug: https://bugs.gentoo.org/744505 Signed-off-by: Jeroen Roovers <jer <AT> gentoo.org> www-client/luakit/luakit-2.2.1.ebuild | 10 ++++------ www-client/luakit/luakit-9999.ebuild | 10 ++++------ 2 files changed, 8 insertions(+), 12 deletions(-) diff --git a/www-client/luakit/luakit-2.2.1.ebuild b/www-client/luakit/luakit-2.2.1.ebuild index a6eb394117a..efeb361d7b9 100644 --- a/www-client/luakit/luakit-2.2.1.ebuild +++ b/www-client/luakit/luakit-2.2.1.ebuild @@ -47,13 +47,13 @@ PATCHES=( ) src_configure() { + export LUA_BIN_NAME=$(usex luajit luajit lua) + export LUA_PKG_NAME=$(usex luajit luajit lua) tc-export CC PKG_CONFIG } src_compile() { emake \ - LUA_PKG_NAME=$(usex luajit luajit lua) \ - LUA_BIN_NAME=$(usex luajit luajit lua) \ PREFIX="${EPREFIX}/usr" \ ${PN} @@ -66,16 +66,14 @@ src_test() { mv tests/async/${failing_test}.lua{,.disabled} || die done - emake \ - LUA_BIN_NAME=$(usex luajit luajit lua) \ - run-tests + emake run-tests } src_install() { emake \ DESTDIR="${D}" \ - PREFIX="${EPREFIX}/usr" \ DOCDIR="${EPREFIX}/usr/share/doc/${PF}" \ + PREFIX="${EPREFIX}/usr" \ XDGPREFIX="${EPREFIX}/etc/xdg" \ install diff --git a/www-client/luakit/luakit-9999.ebuild b/www-client/luakit/luakit-9999.ebuild index a1c4b6f80bf..e249169925e 100644 --- a/www-client/luakit/luakit-9999.ebuild +++ b/www-client/luakit/luakit-9999.ebuild @@ -46,13 +46,13 @@ PATCHES=( ) src_configure() { + export LUA_BIN_NAME=$(usex luajit luajit lua) + export LUA_PKG_NAME=$(usex luajit luajit lua) tc-export CC PKG_CONFIG } src_compile() { emake \ - LUA_PKG_NAME=$(usex luajit luajit lua) \ - LUA_BIN_NAME=$(usex luajit luajit lua) \ PREFIX="${EPREFIX}/usr" \ ${PN} @@ -65,16 +65,14 @@ src_test() { mv tests/async/${failing_test}.lua{,.disabled} || die done - emake \ - LUA_BIN_NAME=$(usex luajit luajit lua) \ - run-tests + emake run-tests } src_install() { emake \ DESTDIR="${D}" \ - PREFIX="${EPREFIX}/usr" \ DOCDIR="${EPREFIX}/usr/share/doc/${PF}" \ + PREFIX="${EPREFIX}/usr" \ XDGPREFIX="${EPREFIX}/etc/xdg" \ install
