From 4cbcc855382a06088e2f016f62cafdbcb7e40665 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sun, 20 Mar 2022 00:40:44 +0000 Subject: gentoo resync : 20.03.2022 --- net-misc/turbovnc/Manifest | 4 +- net-misc/turbovnc/turbovnc-2.2.6.ebuild | 102 -------------------------- net-misc/turbovnc/turbovnc-2.2.7-r2.ebuild | 112 +++++++++++++++++++++++++++++ net-misc/turbovnc/turbovnc-2.2.7.ebuild | 103 -------------------------- 4 files changed, 113 insertions(+), 208 deletions(-) delete mode 100644 net-misc/turbovnc/turbovnc-2.2.6.ebuild create mode 100644 net-misc/turbovnc/turbovnc-2.2.7-r2.ebuild delete mode 100644 net-misc/turbovnc/turbovnc-2.2.7.ebuild (limited to 'net-misc/turbovnc') diff --git a/net-misc/turbovnc/Manifest b/net-misc/turbovnc/Manifest index 8adc32578e06..aca7b05f0f49 100644 --- a/net-misc/turbovnc/Manifest +++ b/net-misc/turbovnc/Manifest @@ -1,5 +1,3 @@ -DIST turbovnc-2.2.6.tar.gz 9022414 BLAKE2B 5baf1d5a9ea488ae1148feb107920d1e2cd2d29af58b6486ac8b7381f07def05d5fbf3a8b231221ef05a8365dd431f0640de0c4fc507475b0c801a53472870c4 SHA512 74fabb7006135853b662e8b6fcfc9b0cf55aa516477106de40587b4513a708c1458ab73f7a51f5f70c4abdc09f1ce13aafdcd56cd039655870a7614169d98af7 DIST turbovnc-2.2.7.tar.gz 8789325 BLAKE2B 257a9c9b3793b40668bf2f3bd9839b3003364f9130699caa52beaec24b75cb054830ee1b1aa67a22eb6173afc9af99c51e45fa3fa52e050c78e5226466ce99ce SHA512 932faa645a71b825e467bdcdb4b872e961ad688c959beb0adbdd35d77969d856bb5c82b893afe8f6b0aa8be18cac3fa9192ce05074295c92a83f1a2344468788 -EBUILD turbovnc-2.2.6.ebuild 2196 BLAKE2B 281b187822a2f5631891f86caa7c137110cc8747aebae4ef16f925afc19531dc9e877e7503f236b33022ea24744dbb34a0a8f61c1839917d6c8fce9b7feff4f0 SHA512 398a0b53b23d3ea0e136f7cd0ee79c509c58b4502e2e687f045c67b740871aac6c27e418b720efd767986c89c9afe68dd4bcc98b70960172112c0cb0381e1fef -EBUILD turbovnc-2.2.7.ebuild 2193 BLAKE2B 39274502936ed7ac2f3337eaa5e942497ed354750d640ee9f6b270ee3a402b2c65e9dd7a3d5ac1cd9b381ed5f4dc78e6757f3a13a33c09df3c215bd0556dbb6d SHA512 eb0d89a65bb65f3940bc11a3c0ccf66c2a56d2c3ef9386922e56ba46ab70c8217fc2531fab90f746ad4c519af19a02597e57a29adbfd0d764ebf36597c616ff3 +EBUILD turbovnc-2.2.7-r2.ebuild 2521 BLAKE2B 20eef8401e0309d888febf26f36129df9d056309849eeffdaadf3f060de60ac5f1ec7b372229a74976bf3c8c882e817d4dfc93476ea5e9c256611c06e0970d32 SHA512 1380c77cf9471add17046b57a1b6a72b141a8ba88eba07b9f81cb69ca71c397626dbd7d92ba73400ea262a7b620b9e49da7d4f364887c0810231b8e79739293f MISC metadata.xml 784 BLAKE2B 55a8bba421a15da5ed9401949b8e056b9c376030875bac0b28dece1a71f50c07010949bf82792129db82df98068061959a80c31093c8e91afb94cbdee0b2f020 SHA512 1e15fc8d88a46e7027eec5cdb8f8f7d6973f2ff1ea586ba6cf2d46a6d09050c6ba0ba94eaa9f59a8624a9885b8b25ec7a2977f1f4d71c02517bd8f681c05bec9 diff --git a/net-misc/turbovnc/turbovnc-2.2.6.ebuild b/net-misc/turbovnc/turbovnc-2.2.6.ebuild deleted file mode 100644 index a8390bb0b57c..000000000000 --- a/net-misc/turbovnc/turbovnc-2.2.6.ebuild +++ /dev/null @@ -1,102 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit desktop cmake java-pkg-opt-2 - -DESCRIPTION="A fast replacement for TigerVNC" -HOMEPAGE="https://www.turbovnc.org/" -SRC_URI="https://sourceforge.net/projects/turbovnc/files/${PV}/${P}.tar.gz/download -> ${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64" -IUSE="+ssl gnutls" - -DEPEND=" - app-arch/bzip2 - media-libs/freetype - >=media-libs/libjpeg-turbo-2.0.0[java?] - sys-libs/zlib - virtual/jdk:1.8 - virtual/opengl - x11-libs/libfontenc - x11-libs/libX11 - x11-libs/libXau - x11-libs/libXdmcp - x11-libs/libXext - x11-libs/libXfont2 - x11-libs/libxkbfile - x11-libs/pixman - ssl? ( - !gnutls? ( dev-libs/openssl:= ) - gnutls? ( net-libs/gnutls:= ) - ) - !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=( - -DTVNC_SYSTEMX11=ON - -DTVNC_SYSTEMLIBS=ON - -DTVNC_BUILDJAVA=$(usex java) - -DTVNC_BUILDNATIVE=ON - -DXKB_BIN_DIRECTORY=/usr/bin - -DXKB_DFLT_RULES=base - ) - - if use ssl ; then - # We prefer OpenSSL, so default to that if SSL is enabled - if use gnutls ; then - mycmakeargs+=( -DTVNC_USETLS="GnuTLS" ) - else - # Link properly against OpenSSL to ensure - # we catch e.g. ABI change - # (i.e. don't dlopen it) - mycmakeargs+=( - -DTVNC_USETLS="OpenSSL" - -DTVNC_DLOPENSSL=OFF - ) - fi - else - mycmakeargs+=( -DTVNC_USETLS=OFF ) - fi - - 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 - make_desktop_entry vncviewer "TurboVNC Viewer" /usr/share/icons/hicolor/48x48/apps/${PN}.png - fi - - # Don't install incompatible init script - rm -rf "${ED}"/etc/init.d/ || die - rm -rf "${ED}"/etc/sysconfig/ || die - - find "${ED}/usr/share/man/man1/" -name Xserver.1\* -print0 | xargs -0 rm || die - einstalldocs -} diff --git a/net-misc/turbovnc/turbovnc-2.2.7-r2.ebuild b/net-misc/turbovnc/turbovnc-2.2.7-r2.ebuild new file mode 100644 index 000000000000..5b1a5561d896 --- /dev/null +++ b/net-misc/turbovnc/turbovnc-2.2.7-r2.ebuild @@ -0,0 +1,112 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit cmake desktop java-pkg-opt-2 + +DESCRIPTION="A fast replacement for TigerVNC" +HOMEPAGE="https://www.turbovnc.org/" +SRC_URI="https://sourceforge.net/projects/turbovnc/files/${PV}/${P}.tar.gz/download -> ${P}.tar.gz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64" +IUSE="gnutls +ssl" + +DEPEND=" + app-arch/bzip2 + media-libs/freetype + >=media-libs/libjpeg-turbo-2.0.0:=[java?] + sys-libs/pam + sys-libs/zlib + virtual/opengl + x11-libs/libfontenc + x11-libs/libX11 + x11-libs/libXau + x11-libs/libXdmcp + x11-libs/libXext + 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:= ) + ) + !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=( + -DTVNC_SYSTEMX11=ON + -DTVNC_SYSTEMLIBS=ON + -DTVNC_BUILDJAVA=$(usex java) + -DTVNC_BUILDNATIVE=$(usex java) + -DXKB_BIN_DIRECTORY=/usr/bin + -DXKB_DFLT_RULES=base + ) + + if use ssl ; then + # We prefer OpenSSL, so default to that if SSL is enabled + if use gnutls ; then + mycmakeargs+=( -DTVNC_USETLS=GnuTLS ) + else + # Link properly against OpenSSL to ensure + # we catch e.g. ABI change + # (i.e. don't dlopen it) + mycmakeargs+=( + -DTVNC_USETLS=OpenSSL + -DTVNC_DLOPENSSL=OFF + ) + fi + else + mycmakeargs+=( -DTVNC_USETLS=OFF ) + fi + + 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 + 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 + rm -rf "${ED}"/etc/init.d/ || die + rm -rf "${ED}"/etc/sysconfig/ || die + + find "${ED}"/usr/share/man/man1/ -name Xserver.1\* -delete || die + + einstalldocs +} diff --git a/net-misc/turbovnc/turbovnc-2.2.7.ebuild b/net-misc/turbovnc/turbovnc-2.2.7.ebuild deleted file mode 100644 index c7db05f8cba5..000000000000 --- a/net-misc/turbovnc/turbovnc-2.2.7.ebuild +++ /dev/null @@ -1,103 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit desktop cmake java-pkg-opt-2 - -DESCRIPTION="A fast replacement for TigerVNC" -HOMEPAGE="https://www.turbovnc.org/" -SRC_URI="https://sourceforge.net/projects/turbovnc/files/${PV}/${P}.tar.gz/download -> ${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64" -IUSE="gnutls +ssl" - -DEPEND=" - app-arch/bzip2 - media-libs/freetype - >=media-libs/libjpeg-turbo-2.0.0[java?] - sys-libs/zlib - virtual/jdk:1.8 - virtual/opengl - x11-libs/libfontenc - x11-libs/libX11 - x11-libs/libXau - x11-libs/libXdmcp - x11-libs/libXext - x11-libs/libXfont2 - x11-libs/libxkbfile - x11-libs/pixman - ssl? ( - !gnutls? ( dev-libs/openssl:= ) - gnutls? ( net-libs/gnutls:= ) - ) - !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=( - -DTVNC_SYSTEMX11=ON - -DTVNC_SYSTEMLIBS=ON - -DTVNC_BUILDJAVA=$(usex java) - -DTVNC_BUILDNATIVE=ON - -DXKB_BIN_DIRECTORY=/usr/bin - -DXKB_DFLT_RULES=base - ) - - if use ssl ; then - # We prefer OpenSSL, so default to that if SSL is enabled - if use gnutls ; then - mycmakeargs+=( -DTVNC_USETLS=GnuTLS ) - else - # Link properly against OpenSSL to ensure - # we catch e.g. ABI change - # (i.e. don't dlopen it) - mycmakeargs+=( - -DTVNC_USETLS=OpenSSL - -DTVNC_DLOPENSSL=OFF - ) - fi - else - mycmakeargs+=( -DTVNC_USETLS=OFF ) - fi - - 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 - make_desktop_entry vncviewer "TurboVNC Viewer" /usr/share/icons/hicolor/48x48/apps/${PN}.png - fi - - # Don't install incompatible init script - rm -rf "${ED}"/etc/init.d/ || die - rm -rf "${ED}"/etc/sysconfig/ || die - - find "${ED}"/usr/share/man/man1/ -name Xserver.1\* -print0 | xargs -0 rm || die - - einstalldocs -} -- cgit v1.2.3