From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-1371167-garchives=archives.gentoo.org@lists.gentoo.org>
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 3F4A515808B
for <garchives@archives.gentoo.org>; Sun, 27 Feb 2022 00:19:50 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
by pigeon.gentoo.org (Postfix) with SMTP id 6721BE092F;
Sun, 27 Feb 2022 00:19:48 +0000 (UTC)
Received: from smtp.gentoo.org (mail.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4])
(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 4C115E092F
for <gentoo-commits@lists.gentoo.org>; Sun, 27 Feb 2022 00:19:48 +0000 (UTC)
Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84])
(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
key-exchange X25519 server-signature RSA-PSS (4096 bits))
(No client certificate requested)
by smtp.gentoo.org (Postfix) with ESMTPS id 31ED7342FCF
for <gentoo-commits@lists.gentoo.org>; Sun, 27 Feb 2022 00:19:47 +0000 (UTC)
Received: from localhost.localdomain (localhost [IPv6:::1])
by oystercatcher.gentoo.org (Postfix) with ESMTP id D0D0C26D
for <gentoo-commits@lists.gentoo.org>; Sun, 27 Feb 2022 00:19:45 +0000 (UTC)
From: "Sam James" <sam@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Content-Transfer-Encoding: 8bit
Content-type: text/plain; charset=UTF-8
Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" <sam@gentoo.org>
Message-ID: <1645921164.ead3e37592f29f619d9bc33ae447fa71d15345ef.sam@gentoo>
Subject: [gentoo-commits] repo/gentoo:master commit in: net-misc/turbovnc/
X-VCS-Repository: repo/gentoo
X-VCS-Files: net-misc/turbovnc/turbovnc-2.2.7-r1.ebuild net-misc/turbovnc/turbovnc-2.2.7-r2.ebuild
X-VCS-Directories: net-misc/turbovnc/
X-VCS-Committer: sam
X-VCS-Committer-Name: Sam James
X-VCS-Revision: ead3e37592f29f619d9bc33ae447fa71d15345ef
X-VCS-Branch: master
Date: Sun, 27 Feb 2022 00:19:45 +0000 (UTC)
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply
X-Archives-Salt: 02043987-e711-4231-a777-2420cc9dbbc1
X-Archives-Hash: c38db73df6c47505c971d7394550f3ad
commit: ead3e37592f29f619d9bc33ae447fa71d15345ef
Author: Viorel Munteanu <ceamac.paragon <AT> gmail <DOT> com>
AuthorDate: Sat Feb 26 09:10:12 2022 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sun Feb 27 00:19:24 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ead3e375
net-misc/turbovnc: do not build vncviewer if !java
Closes: https://bugs.gentoo.org/833509
Signed-off-by: Viorel Munteanu <ceamac.paragon <AT> gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/24355
Signed-off-by: Sam James <sam <AT> gentoo.org>
...bovnc-2.2.7-r1.ebuild => turbovnc-2.2.7-r2.ebuild} | 19 ++++++++++++-------
1 file changed, 12 insertions(+), 7 deletions(-)
diff --git a/net-misc/turbovnc/turbovnc-2.2.7-r1.ebuild b/net-misc/turbovnc/turbovnc-2.2.7-r2.ebuild
similarity index 84%
rename from net-misc/turbovnc/turbovnc-2.2.7-r1.ebuild
rename to net-misc/turbovnc/turbovnc-2.2.7-r2.ebuild
index b57e81831f74..5b1a5561d896 100644
--- a/net-misc/turbovnc/turbovnc-2.2.7-r1.ebuild
+++ b/net-misc/turbovnc/turbovnc-2.2.7-r2.ebuild
@@ -1,7 +1,7 @@
# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=8
inherit cmake desktop java-pkg-opt-2
@@ -18,8 +18,8 @@ DEPEND="
app-arch/bzip2
media-libs/freetype
>=media-libs/libjpeg-turbo-2.0.0:=[java?]
+ sys-libs/pam
sys-libs/zlib
- >=virtual/jdk-1.8:*
virtual/opengl
x11-libs/libfontenc
x11-libs/libX11
@@ -29,6 +29,10 @@ DEPEND="
x11-libs/libXfont2
x11-libs/libxkbfile
x11-libs/pixman
+ java? (
+ >=virtual/jdk-1.8:*
+ x11-libs/libXi
+ )
ssl? (
!gnutls? ( dev-libs/openssl:= )
gnutls? ( net-libs/gnutls:= )
@@ -40,10 +44,6 @@ RDEPEND="
x11-apps/xkbcomp
"
-# net-misc/turbovnc does not build this file, it merely copies it
-# from media-libs/libjpeg-turbo
-QA_PREBUILT="usr/share/turbovnc/classes/libturbojpeg.so"
-
src_prepare() {
use java && java-pkg-opt-2_src_prepare
cmake_src_prepare
@@ -54,7 +54,7 @@ src_configure() {
-DTVNC_SYSTEMX11=ON
-DTVNC_SYSTEMLIBS=ON
-DTVNC_BUILDJAVA=$(usex java)
- -DTVNC_BUILDNATIVE=ON
+ -DTVNC_BUILDNATIVE=$(usex java)
-DXKB_BIN_DIRECTORY=/usr/bin
-DXKB_DFLT_RULES=base
)
@@ -95,6 +95,11 @@ src_install() {
if use java ; then
java-pkg_dojar "${BUILD_DIR}"/java/VncViewer.jar
make_desktop_entry vncviewer "TurboVNC Viewer" /usr/share/icons/hicolor/48x48/apps/${PN}.png
+
+ # turbovnc does not build this file, it merely copies it from media-libs/libjpeg-turbo
+ # so let's replace it by a symlink
+ rm "${ED}/"usr/share/turbovnc/classes/libturbojpeg.so || die
+ dosym -r "/usr/$(get_libdir)/libturbojpeg.so" /usr/share/turbovnc/classes/libturbojpeg.so
fi
# Don't install incompatible init script