From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id B66B015800F for ; Sun, 15 Jan 2023 08:39:39 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id EDC6DE07E0; Sun, 15 Jan 2023 08:39:38 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id D08B4E07E0 for ; Sun, 15 Jan 2023 08:39:38 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id C1FD6340EE9 for ; Sun, 15 Jan 2023 08:39:37 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 01CD682C for ; Sun, 15 Jan 2023 08:39:36 +0000 (UTC) From: "Viorel Munteanu" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Viorel Munteanu" Message-ID: <1673771956.a05eb623a0e4247c256e9dd5a239090141fd7378.ceamac@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: net-misc/turbovnc/ X-VCS-Repository: repo/gentoo X-VCS-Files: net-misc/turbovnc/metadata.xml net-misc/turbovnc/turbovnc-3.0.2.ebuild X-VCS-Directories: net-misc/turbovnc/ X-VCS-Committer: ceamac X-VCS-Committer-Name: Viorel Munteanu X-VCS-Revision: a05eb623a0e4247c256e9dd5a239090141fd7378 X-VCS-Branch: master Date: Sun, 15 Jan 2023 08:39:36 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: a7773942-ee16-46d8-9a6c-550fc7606b8d X-Archives-Hash: dc5e330e0b54608cc2733e4208200d76 commit: a05eb623a0e4247c256e9dd5a239090141fd7378 Author: Viorel Munteanu gentoo org> AuthorDate: Sat Jan 14 18:55:21 2023 +0000 Commit: Viorel Munteanu gentoo org> CommitDate: Sun Jan 15 08:39:16 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a05eb623 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 gentoo.org> net-misc/turbovnc/metadata.xml | 2 +- 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. - Build the client (vncviewer) Build the server (vncserver, Xvnc) + Build the viewer (vncviewer) turbovnc 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