diff options
| author |   Viorel Munteanu <ceamac@gentoo.org> | 2023-01-14 20:55:21 +0200 |
|---|---|---|
| committer | Viorel Munteanu <ceamac@gentoo.org> | 2023-01-15 10:39:16 +0200 |
| commit | a05eb623a0e4247c256e9dd5a239090141fd7378 (patch) | |
| tree | 1bcd26311862b7da537bb052b29a4c1fef719a33 | |
| parent | net-misc/tigervnc: add 1.12.90 (diff) | |
| download | gentoo-a05eb623a0e4247c256e9dd5a239090141fd7378.tar.gz gentoo-a05eb623a0e4247c256e9dd5a239090141fd7378.tar.bz2 gentoo-a05eb623a0e4247c256e9dd5a239090141fd7378.zip | |
net-misc/turbovnc: rename USE client-> viewer
`viewer` makes more sense than `client`. It also matches the USE flag
in tigervnc.
Closes: https://bugs.gentoo.org/864809
Closes: https://github.com/gentoo/gentoo/pull/29105
Signed-off-by: Viorel Munteanu <ceamac@gentoo.org>
| -rw-r--r-- | net-misc/turbovnc/metadata.xml | 2 | ||||
| -rw-r--r-- | net-misc/turbovnc/turbovnc-3.0.2.ebuild | 32 |
2 files changed, 17 insertions, 17 deletions
diff --git a/net-misc/turbovnc/metadata.xml b/net-misc/turbovnc/metadata.xml index 97cad453f15c..5c1cfb86ec9a 100644 --- a/net-misc/turbovnc/metadata.xml +++ b/net-misc/turbovnc/metadata.xml @@ -14,8 +14,8 @@ By The VirtualGL Project. </longdescription> <use> - <flag name="client">Build the client (vncviewer)</flag> <flag name="server">Build the server (vncserver, Xvnc)</flag> + <flag name="viewer">Build the viewer (vncviewer)</flag> </use> <upstream> <remote-id type="sourceforge">turbovnc</remote-id> diff --git a/net-misc/turbovnc/turbovnc-3.0.2.ebuild b/net-misc/turbovnc/turbovnc-3.0.2.ebuild index 3471a1f73bd5..abebac6c9c50 100644 --- a/net-misc/turbovnc/turbovnc-3.0.2.ebuild +++ b/net-misc/turbovnc/turbovnc-3.0.2.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 -JAVA_PKG_OPT_USE=client +JAVA_PKG_OPT_USE=viewer inherit cmake desktop java-pkg-opt-2 verify-sig DESCRIPTION="A fast replacement for TigerVNC" @@ -16,19 +16,14 @@ SRC_URI=" LICENSE="GPL-2" SLOT="0" KEYWORDS="~amd64" -IUSE="+server +ssl" -REQUIRED_USE="|| ( client server )" +IUSE="+server +ssl +viewer" +REQUIRED_USE="|| ( server viewer )" COMMON_DEPEND=" x11-apps/xauth x11-libs/libX11 x11-libs/libXext x11-misc/xkeyboard-config - client? ( - media-libs/libjpeg-turbo:=[java] - x11-libs/libXi - !net-misc/tigervnc - ) server? ( media-libs/libjpeg-turbo:= sys-libs/pam @@ -41,12 +36,17 @@ COMMON_DEPEND=" ssl? ( dev-libs/openssl:= ) !net-misc/tigervnc[server] ) + viewer? ( + media-libs/libjpeg-turbo:=[java] + x11-libs/libXi + !net-misc/tigervnc[viewer(+)] + ) " RDEPEND=" ${COMMON_DEPEND} x11-apps/xkbcomp - client? ( >=virtual/jre-1.8:* ) + viewer? ( >=virtual/jre-1.8:* ) " # libbz2.so.1, libfontenc.so.1 and libfreetype.so.6 are used by libXfont2.so.2 @@ -54,7 +54,7 @@ RDEPEND=" DEPEND=" ${COMMON_DEPEND} x11-libs/xtrans - client? ( >=virtual/jdk-1.8:* ) + viewer? ( >=virtual/jdk-1.8:* ) server? ( app-arch/bzip2 media-libs/freetype @@ -77,14 +77,14 @@ pkg_pretend() { } src_prepare() { - use client && java-pkg-opt-2_src_prepare + use viewer && java-pkg-opt-2_src_prepare cmake_src_prepare } src_configure() { local mycmakeargs=( - -DTVNC_BUILDVIEWER=$(usex client) - -DTVNC_BUILDHELPER=$(usex client) + -DTVNC_BUILDVIEWER=$(usex viewer) + -DTVNC_BUILDHELPER=$(usex viewer) -DTVNC_BUILDSERVER=$(usex server) -DTVNC_BUILDWEBSERVER=$(usex server) ) @@ -109,7 +109,7 @@ src_configure() { fi fi - if use client ; then + if use viewer ; then export JAVACFLAGS="$(java-pkg_javac-args)" export JNI_CFLAGS="$(java-pkg_get-jni-cflags)" fi @@ -120,7 +120,7 @@ src_configure() { src_install() { cmake_src_install - if use client ; then + if use viewer ; then java-pkg_dojar "${BUILD_DIR}"/java/VncViewer.jar make_desktop_entry vncviewer "TurboVNC Viewer" /usr/share/icons/hicolor/48x48/apps/${PN}.png fi |