[PATCH 18/94] sys-kernel/hurd: make libxkbcommon support optional
Sam James <[email protected]>
| Newsgroups | gmane.linux.gentoo.devel |
|---|---|
| Message-ID | <3d14e2a5e4c130046826e1259e0b72af1841297f.1774994292.git.sam@gentoo.org> |
It's only for keymaps in the console. Still automagic though. Signed-off-by: Sam James <[email protected]> --- sys-kernel/hurd/hurd-0.9_p20251029.ebuild | 5 +++-- sys-kernel/hurd/hurd-9999.ebuild | 5 +++-- sys-kernel/hurd/metadata.xml | 4 ++++ 3 files changed, 10 insertions(+), 4 deletions(-) diff --git a/sys-kernel/hurd/hurd-0.9_p20251029.ebuild b/sys-kernel/hurd/hurd-0.9_p20251029.ebuild index c96b9623543ce..dd314f61f1691 100644 --- a/sys-kernel/hurd/hurd-0.9_p20251029.ebuild +++ b/sys-kernel/hurd/hurd-0.9_p20251029.ebuild @@ -31,7 +31,7 @@ SLOT="0" if is_crosspkg ; then IUSE="headers-only" else - IUSE="headers-only ncurses" + IUSE="headers-only ncurses xkb" fi [[ ${PV} != 9999 ]] && KEYWORDS="~amd64 ~x86" @@ -40,6 +40,7 @@ if is_crosspkg ; then !headers-only? ( cross-${CTARGET}/mig ) " else + # TODO: fix xkb automagic DEPEND=" app-arch/bzip2:=[static-libs] dev-libs/libdaemon:= @@ -47,10 +48,10 @@ else dev-util/mig sys-apps/util-linux[static-libs] x11-libs/libpciaccess[static-libs] - x11-libs/libxkbcommon virtual/libcrypt:=[static-libs] virtual/zlib:=[static-libs] ncurses? ( sys-libs/ncurses:= ) + xkb? ( x11-libs/libxkbcommon ) " RDEPEND="${DEPEND}" BDEPEND="virtual/pkgconfig" diff --git a/sys-kernel/hurd/hurd-9999.ebuild b/sys-kernel/hurd/hurd-9999.ebuild index c96b9623543ce..dd314f61f1691 100644 --- a/sys-kernel/hurd/hurd-9999.ebuild +++ b/sys-kernel/hurd/hurd-9999.ebuild @@ -31,7 +31,7 @@ SLOT="0" if is_crosspkg ; then IUSE="headers-only" else - IUSE="headers-only ncurses" + IUSE="headers-only ncurses xkb" fi [[ ${PV} != 9999 ]] && KEYWORDS="~amd64 ~x86" @@ -40,6 +40,7 @@ if is_crosspkg ; then !headers-only? ( cross-${CTARGET}/mig ) " else + # TODO: fix xkb automagic DEPEND=" app-arch/bzip2:=[static-libs] dev-libs/libdaemon:= @@ -47,10 +48,10 @@ else dev-util/mig sys-apps/util-linux[static-libs] x11-libs/libpciaccess[static-libs] - x11-libs/libxkbcommon virtual/libcrypt:=[static-libs] virtual/zlib:=[static-libs] ncurses? ( sys-libs/ncurses:= ) + xkb? ( x11-libs/libxkbcommon ) " RDEPEND="${DEPEND}" BDEPEND="virtual/pkgconfig" diff --git a/sys-kernel/hurd/metadata.xml b/sys-kernel/hurd/metadata.xml index 9aeb4320a5811..4894b3f3b2afb 100644 --- a/sys-kernel/hurd/metadata.xml +++ b/sys-kernel/hurd/metadata.xml @@ -10,5 +10,9 @@ Build console-curses client for non-basic capabilities, unlike the builtin one. </flag> + <flag name="xkb"> + Depend on <pkg>x11-libs/libxkbcommon</pkg> for keymap support in + the console. + </flag> </use> </pkgmetadata> -- 2.53.0