From 4aec9255c99411cb07138353f1bdda61fe0b501d Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Mon, 5 Sep 2022 16:24:39 +0100 Subject: gentoo auto-resync : 05:09:2022 - 16:24:39 --- net-misc/turbovnc/Manifest | 4 +- net-misc/turbovnc/turbovnc-3.0.1.ebuild | 103 ++++++++++++++++++++++++++++++++ net-misc/turbovnc/turbovnc-3.0.ebuild | 102 ------------------------------- 3 files changed, 105 insertions(+), 104 deletions(-) create mode 100644 net-misc/turbovnc/turbovnc-3.0.1.ebuild delete mode 100644 net-misc/turbovnc/turbovnc-3.0.ebuild (limited to 'net-misc/turbovnc') diff --git a/net-misc/turbovnc/Manifest b/net-misc/turbovnc/Manifest index 1441d0afdcd9..87d6136ec46c 100644 --- a/net-misc/turbovnc/Manifest +++ b/net-misc/turbovnc/Manifest @@ -1,7 +1,7 @@ AUX turbovnc-2.2.7-fix-musl-compilation.patch 1535 BLAKE2B d0a95f7bffef46da41bb1faf3de3b3c3651890e3653ccb2d961e11921bb25c6910f9d4a049e9b6d867d214e1e0310de22ec3c423424acbebe7be2437d2ffb2ab SHA512 94ba2b53e02e9b2e32f70f2cfb4dd0cfb733726bb31383462113681c95afff4823dc82302641773947ab5e71fe6547a9f233b25146d9cd292f08da66faf8f786 AUX turbovnc-3.0-fix-musl-compilation.patch 936 BLAKE2B d0785023ecf0ffa4f1c1d4f09ad8669d04780bf7c7159da06caf4ee8b58c2b46268d55c6148de95b9bfc8d4c695e2571338aa90c65ee848e1cf5886ffb909309 SHA512 dbf30af408a921a73e3100e5f05639beea2466c02cb8b3b2c8c498e904ba33bc84f92541f1e7d03ac6ae8301afcdfa537101ea9efe3c52245e2470903b13a517 DIST turbovnc-2.2.7.tar.gz 8789325 BLAKE2B 257a9c9b3793b40668bf2f3bd9839b3003364f9130699caa52beaec24b75cb054830ee1b1aa67a22eb6173afc9af99c51e45fa3fa52e050c78e5226466ce99ce SHA512 932faa645a71b825e467bdcdb4b872e961ad688c959beb0adbdd35d77969d856bb5c82b893afe8f6b0aa8be18cac3fa9192ce05074295c92a83f1a2344468788 -DIST turbovnc-3.0.tar.gz 8665757 BLAKE2B 98600dc1f4fd91b30c8c48f2e465aa4cb9c53190c08611374ed6e1ef59be585f1694a1c6827939dec9cf259bd0e9a8fbdea9194653f5a3c66eb97cca1e12b09b SHA512 baa5f62fa1d76a09dc16262d853598b9d9ba8a12f3804c27df6af4983700b4dc1ad7f981ea02e2dc4d36c29b0cd7a1d7a7a8c98b7ae971cbc688ca30fd5c19ec +DIST turbovnc-3.0.1.tar.gz 8685384 BLAKE2B 388657bac29ccd570b0a5e03ca49cb5b868907390743241599f84d900707ffc685d021702167e7f615004eafd545120de3dbd4c61e0e206ce2d4227ff54ea86a SHA512 1d205db7fa23730e32752b0bc449a4cd2920ce7d065184bc84e49041dcd8db0e057fd7923635b74b09ab7957568d34f70dc1dd96b77b0905e80b4a5f1d8f28db EBUILD turbovnc-2.2.7-r2.ebuild 2696 BLAKE2B a03f3d8f43871bdaedf3010b914e05580827a45579bca9c400a7bb533514956c920cde88fd67b9e0211a9df1b0c28f149791021e5854e0a913c5cdd7413cec59 SHA512 7b04acfbcb3e34c12c11baa36d11ed5de8a05a42bac8fc3068a1fde118999d0850fad349b7db92b6de3e44759f83bfc7e31e57c699b5460018979c8964ab86bb -EBUILD turbovnc-3.0.ebuild 2059 BLAKE2B 524fb9f0d232ad10f834d929b55769f6c7f474ab7027b63f61588894bdadc9efe71c80709d761168df8e58b686e1b501655ebf4b3784fd4890fb32ac7cfcd52b SHA512 69517cdf41a87d09b2401565929313f0904496f80ff37085f9914e4ba80507dc98d5c6db78797a064aead0ef93bedf14b9d0d672404329fdac3f2951a4ac1237 +EBUILD turbovnc-3.0.1.ebuild 2093 BLAKE2B b4e7b67b6457e57827d57c42da4d5c71611f2adec7f570cb7cdb2ae83a2c59e3ea3eb22b8fd5a5a626e1ca3abf142e8bf77fcfee1293b29ac1c7903c3e53ea70 SHA512 ba1205bd0ff2406faa59e208d7750ed5d1cf96432e6993718b4f26ac58dd76b0596e34c1d33e60366e4f66c52c4f3e7375cf07acd64001d71c5b14a1125bd482 MISC metadata.xml 784 BLAKE2B 55a8bba421a15da5ed9401949b8e056b9c376030875bac0b28dece1a71f50c07010949bf82792129db82df98068061959a80c31093c8e91afb94cbdee0b2f020 SHA512 1e15fc8d88a46e7027eec5cdb8f8f7d6973f2ff1ea586ba6cf2d46a6d09050c6ba0ba94eaa9f59a8624a9885b8b25ec7a2977f1f4d71c02517bd8f681c05bec9 diff --git a/net-misc/turbovnc/turbovnc-3.0.1.ebuild b/net-misc/turbovnc/turbovnc-3.0.1.ebuild new file mode 100644 index 000000000000..c8982a2ba230 --- /dev/null +++ b/net-misc/turbovnc/turbovnc-3.0.1.ebuild @@ -0,0 +1,103 @@ +# 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="+ssl" + +COMMON_DEPEND=" + app-arch/bzip2 + media-libs/freetype + >=media-libs/libjpeg-turbo-2.0.0:=[java?] + sys-libs/pam + sys-libs/zlib + virtual/opengl + x11-apps/xauth + x11-libs/libfontenc + x11-libs/libX11 + x11-libs/libXau + x11-libs/libXdmcp + x11-libs/libXext + x11-libs/libXfont2 + x11-libs/libxkbfile + x11-libs/pixman + x11-misc/xkeyboard-config + java? ( + >=virtual/jdk-1.8:* + x11-libs/libXi + !net-misc/tigervnc + ) + ssl? ( dev-libs/openssl:= ) + !net-misc/tigervnc[server] +" +RDEPEND=" + ${COMMON_DEPEND} + x11-apps/xkbcomp +" +DEPEND=" + ${COMMON_DEPEND} + x11-libs/xtrans +" + +PATCHES=( "${FILESDIR}"/"${PN}"-3.0-fix-musl-compilation.patch ) + +src_prepare() { + use java && java-pkg-opt-2_src_prepare + cmake_src_prepare +} + +src_configure() { + local mycmakeargs=( + -DTVNC_SYSTEMX11=ON + -DTVNC_SYSTEMLIBS=ON + -DTVNC_BUILDVIEWER=$(usex java) + -DTVNC_BUILDHELPER=$(usex java) + -DXKB_BIN_DIRECTORY=/usr/bin + -DXKB_DFLT_RULES=base + ) + + if use ssl ; then + # 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 + ) + else + mycmakeargs+=( -DTVNC_USETLS=OFF ) + fi + + if use java ; then + export JAVACFLAGS="$(java-pkg_javac-args)" + export JNI_CFLAGS="$(java-pkg_get-jni-cflags)" + 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\* -delete || die + + einstalldocs +} diff --git a/net-misc/turbovnc/turbovnc-3.0.ebuild b/net-misc/turbovnc/turbovnc-3.0.ebuild deleted file mode 100644 index 26c0c3cbe94e..000000000000 --- a/net-misc/turbovnc/turbovnc-3.0.ebuild +++ /dev/null @@ -1,102 +0,0 @@ -# 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="+ssl" - -COMMON_DEPEND=" - app-arch/bzip2 - media-libs/freetype - >=media-libs/libjpeg-turbo-2.0.0:=[java?] - sys-libs/pam - sys-libs/zlib - virtual/opengl - x11-apps/xauth - x11-libs/libfontenc - x11-libs/libX11 - x11-libs/libXau - x11-libs/libXdmcp - x11-libs/libXext - x11-libs/libXfont2 - x11-libs/libxkbfile - x11-libs/pixman - x11-misc/xkeyboard-config - java? ( - >=virtual/jdk-1.8:* - x11-libs/libXi - ) - ssl? ( dev-libs/openssl:= ) - !net-misc/tigervnc -" -RDEPEND=" - ${COMMON_DEPEND} - x11-apps/xkbcomp -" -DEPEND=" - ${COMMON_DEPEND} - x11-libs/xtrans -" - -PATCHES=( "${FILESDIR}"/"${P}"-fix-musl-compilation.patch ) - -src_prepare() { - use java && java-pkg-opt-2_src_prepare - cmake_src_prepare -} - -src_configure() { - local mycmakeargs=( - -DTVNC_SYSTEMX11=ON - -DTVNC_SYSTEMLIBS=ON - -DTVNC_BUILDVIEWER=$(usex java) - -DTVNC_BUILDHELPER=$(usex java) - -DXKB_BIN_DIRECTORY=/usr/bin - -DXKB_DFLT_RULES=base - ) - - if use ssl ; then - # 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 - ) - else - mycmakeargs+=( -DTVNC_USETLS=OFF ) - fi - - if use java ; then - export JAVACFLAGS="$(java-pkg_javac-args)" - export JNI_CFLAGS="$(java-pkg_get-jni-cflags)" - 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\* -delete || die - - einstalldocs -} -- cgit v1.2.3