commit: f0ecfd31e7add9fe2158f3d6ca21fa9f9485216d Author: Haelwenn (lanodan) Monnier <contact <AT> hacktivis <DOT> me> AuthorDate: Sun Dec 3 01:47:15 2023 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Mon Dec 4 08:36:27 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f0ecfd31
app-editors/vis: move lpeg from optfeature to RDEPEND Also explicitly disables lpeg-static, which isn't supported in Gentoo as it would require both USE=static-libs in lpeg and addition of pkg-config files. Closes: https://bugs.gentoo.org/821721 Signed-off-by: Haelwenn (lanodan) Monnier <contact <AT> hacktivis.me> Closes: https://github.com/gentoo/gentoo/pull/34104 Signed-off-by: Sam James <sam <AT> gentoo.org> app-editors/vis/{vis-9999.ebuild => vis-0.8-r1.ebuild} | 12 ++++++++---- app-editors/vis/vis-9999.ebuild | 12 ++++++++---- 2 files changed, 16 insertions(+), 8 deletions(-) diff --git a/app-editors/vis/vis-9999.ebuild b/app-editors/vis/vis-0.8-r1.ebuild similarity index 93% copy from app-editors/vis/vis-9999.ebuild copy to app-editors/vis/vis-0.8-r1.ebuild index 34f57c01387b..09bd443398c8 100644 --- a/app-editors/vis/vis-9999.ebuild +++ b/app-editors/vis/vis-0.8-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -6,7 +6,7 @@ EAPI=8 MY_PTV=0.5 LUA_COMPAT=( lua5-2 lua5-3 lua5-4 ) -inherit lua-single optfeature +inherit lua-single if [ "${PV}" == "9999" ]; then inherit git-r3 @@ -32,7 +32,11 @@ DEPEND="dev-libs/libtermkey lua? ( ${LUA_DEPS} ) tre? ( dev-libs/tre )" RDEPEND="${DEPEND} - app-eselect/eselect-vi" + app-eselect/eselect-vi + lua? ( + $(lua_gen_cond_dep 'dev-lua/lpeg[${LUA_USEDEP}]') + ) +" # lpeg: https://github.com/martanne/vis-test/issues/28 BDEPEND="test? ( $(lua_gen_cond_dep 'dev-lua/lpeg[${LUA_USEDEP}]') @@ -71,6 +75,7 @@ src_configure() { ./configure \ --prefix="${EPREFIX}"/usr \ --docdir="${EPREFIX}"/usr/share/doc/${PF} \ + --disable-lpeg-static \ $(use_enable lua) \ $(use_enable ncurses curses) \ $(use_enable selinux) \ @@ -88,5 +93,4 @@ pkg_postrm() { pkg_postinst() { update_symlinks - optfeature "syntax highlighting support" dev-lua/lpeg } diff --git a/app-editors/vis/vis-9999.ebuild b/app-editors/vis/vis-9999.ebuild index 34f57c01387b..09bd443398c8 100644 --- a/app-editors/vis/vis-9999.ebuild +++ b/app-editors/vis/vis-9999.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -6,7 +6,7 @@ EAPI=8 MY_PTV=0.5 LUA_COMPAT=( lua5-2 lua5-3 lua5-4 ) -inherit lua-single optfeature +inherit lua-single if [ "${PV}" == "9999" ]; then inherit git-r3 @@ -32,7 +32,11 @@ DEPEND="dev-libs/libtermkey lua? ( ${LUA_DEPS} ) tre? ( dev-libs/tre )" RDEPEND="${DEPEND} - app-eselect/eselect-vi" + app-eselect/eselect-vi + lua? ( + $(lua_gen_cond_dep 'dev-lua/lpeg[${LUA_USEDEP}]') + ) +" # lpeg: https://github.com/martanne/vis-test/issues/28 BDEPEND="test? ( $(lua_gen_cond_dep 'dev-lua/lpeg[${LUA_USEDEP}]') @@ -71,6 +75,7 @@ src_configure() { ./configure \ --prefix="${EPREFIX}"/usr \ --docdir="${EPREFIX}"/usr/share/doc/${PF} \ + --disable-lpeg-static \ $(use_enable lua) \ $(use_enable ncurses curses) \ $(use_enable selinux) \ @@ -88,5 +93,4 @@ pkg_postrm() { pkg_postinst() { update_symlinks - optfeature "syntax highlighting support" dev-lua/lpeg }
