[gentoo-commits] repo/gentoo:master commit in: net-misc/turbovnc/

[Sam James]

commit:     cd037a4aa37f7f53c9dbad535ba60db1c2a09c7f
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Mon Mar  1 15:07:51 2021 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Mon Mar  1 15:26:34 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cd037a4a

net-misc/turbovnc: make Java support optional, use system libraries

Signed-off-by: Sam James <sam <AT> gentoo.org>

 net-misc/turbovnc/turbovnc-2.2.6.ebuild | 40 +++++++++++++++++++++++++++------
 1 file changed, 33 insertions(+), 7 deletions(-)

diff --git a/net-misc/turbovnc/turbovnc-2.2.6.ebuild b/net-misc/turbovnc/turbovnc-2.2.6.ebuild
index f854799ddce..741bb109f45 100644
--- a/net-misc/turbovnc/turbovnc-2.2.6.ebuild
+++ b/net-misc/turbovnc/turbovnc-2.2.6.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit cmake
+inherit cmake java-pkg-opt-2
 
 DESCRIPTION="A fast replacement for TigerVNC"
 HOMEPAGE="https://www.turbovnc.org/"
@@ -13,24 +13,50 @@ LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64"
 
-DEPEND="virtual/jdk:1.8
+DEPEND="
 	>=media-libs/libjpeg-turbo-2.0.0[java]
-	!net-misc/tigervnc"
-RDEPEND="${DEPEND}
-	x11-apps/xkbcomp"
+	virtual/jdk:1.8
+	!net-misc/tigervnc
+"
+RDEPEND="
+	${DEPEND}
+	x11-apps/xkbcomp
+"
+
+src_prepare() {
+	use java && java-pkg-opt-2_src_prepare
+	cmake_src_prepare
+}
 
 src_configure() {
 	local mycmakeargs=(
-		-DTJPEG_JAR="${EPREFIX}/usr/share/java/turbojpeg.jar"
-		-DTJPEG_JNILIBRARY="${EPREFIX}/usr/$(get_libdir)/libturbojpeg.so"
+		-DTVNC_SYSTEMX11=ON
+		-DTVNC_SYSTEMLIBS=ON
+		-DTVNC_BUILDJAVA=$(usex java)
 		-DXKB_BIN_DIRECTORY=/usr/bin
 		-DXKB_DFLT_RULES=base
 	)
+
+	if use java ; then
+		export JAVACFLAGS="$(java-pkg_javac-args)"
+		export JNI_CFLAGS="$(java-pkg_get-jni-cflags)"
+
+		mycmakeargs+=(
+			-DTJPEG_JAR="${EPREFIX}/usr/share/java/turbojpeg.jar"
+			-DTJPEG_JNILIBRARY="${EPREFIX}/usr/$(get_libdir)/libturbojpeg.so"
+		)
+	fi
+
 	cmake_src_configure
 }
 
 src_install() {
 	cmake_src_install
+
+	if use java ; then
+		java-pkg_dojar "${BUILD_DIR}"/java/VncViewer.jar
+	fi
+
 	find "${ED}/usr/share/man/man1/" -name Xserver.1\* -print0 | xargs -0 rm || die
 	einstalldocs
 }