From: "Viorel Munteanu" <ceamac@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: net-misc/turbovnc/
Date: Fri, 30 Dec 2022 09:18:50 +0000 (UTC) [thread overview]
Message-ID: <1672391888.451b63134cb93070d625b9b279c23334f84ef3d5.ceamac@gentoo> (raw)
commit: 451b63134cb93070d625b9b279c23334f84ef3d5
Author: Viorel Munteanu <ceamac <AT> gentoo <DOT> org>
AuthorDate: Thu Dec 29 10:02:50 2022 +0000
Commit: Viorel Munteanu <ceamac <AT> gentoo <DOT> org>
CommitDate: Fri Dec 30 09:18:08 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=451b6313
net-misc/turbovnc: drop 2.2.7-r2
Closes: https://github.com/gentoo/gentoo/pull/28886
Signed-off-by: Viorel Munteanu <ceamac <AT> gentoo.org>
net-misc/turbovnc/Manifest | 1 -
net-misc/turbovnc/metadata.xml | 1 -
net-misc/turbovnc/turbovnc-2.2.7-r2.ebuild | 119 -----------------------------
3 files changed, 121 deletions(-)
diff --git a/net-misc/turbovnc/Manifest b/net-misc/turbovnc/Manifest
index 0f3313ea52fb..989e229b1c93 100644
--- a/net-misc/turbovnc/Manifest
+++ b/net-misc/turbovnc/Manifest
@@ -1,3 +1,2 @@
-DIST turbovnc-2.2.7.tar.gz 8789325 BLAKE2B 257a9c9b3793b40668bf2f3bd9839b3003364f9130699caa52beaec24b75cb054830ee1b1aa67a22eb6173afc9af99c51e45fa3fa52e050c78e5226466ce99ce SHA512 932faa645a71b825e467bdcdb4b872e961ad688c959beb0adbdd35d77969d856bb5c82b893afe8f6b0aa8be18cac3fa9192ce05074295c92a83f1a2344468788
DIST turbovnc-3.0.2.tar.gz 8691956 BLAKE2B 872dbdb0127d9935e8232757f0939cf95930bcd087d06dabe771bfe4ccf4703c05fd2d9c01f0baf073ba37f989c0f02b4e20d5ed08eb6f2a4a83c6f5bb0f9d36 SHA512 f04ab062dafe3210ab7722aa12a97d1f7956ddef7eed965e7df86810b7c9aa35d981d2397503d154bd0da0c71542e0e58be458fb5841f05fc9a0d80fdddf2d11
DIST turbovnc-3.0.2.tar.gz.sig 543 BLAKE2B 3eeaa647ab3cab092112e3aa14cb4dba204e3c8a164082f32f942fd730d465e9b1973c9c7af047fcbba35fbfa02bb312fb8072963876b6add51d1105ac8eccbc SHA512 d17c6900db2bc47d8bbe3cc4bf8d0d1f17447fe4db5346baabf105c5d37a5a13048d6888d48fc5bd8e7a7a81b473b59b66c4c0108a10fcac211365d603093c4c
diff --git a/net-misc/turbovnc/metadata.xml b/net-misc/turbovnc/metadata.xml
index 91034aafab24..97cad453f15c 100644
--- a/net-misc/turbovnc/metadata.xml
+++ b/net-misc/turbovnc/metadata.xml
@@ -14,7 +14,6 @@
By The VirtualGL Project.
</longdescription>
<use>
- <flag name="java">Build the client (vncviewer)</flag>
<flag name="client">Build the client (vncviewer)</flag>
<flag name="server">Build the server (vncserver, Xvnc)</flag>
</use>
diff --git a/net-misc/turbovnc/turbovnc-2.2.7-r2.ebuild b/net-misc/turbovnc/turbovnc-2.2.7-r2.ebuild
deleted file mode 100644
index 1764dc4c265b..000000000000
--- a/net-misc/turbovnc/turbovnc-2.2.7-r2.ebuild
+++ /dev/null
@@ -1,119 +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="gnutls +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-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="
- ${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_BUILDJAVA=$(usex java)
- -DTVNC_BUILDNATIVE=$(usex java)
- -DXKB_BIN_DIRECTORY=/usr/bin
- -DXKB_DFLT_RULES=base
- -DBUILDING_ON_MUSL=$(usex elibc_musl) # bug #836723
- )
-
- 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
-}
next reply other threads:[~2022-12-30 9:18 UTC|newest]
Thread overview: 40+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-12-30 9:18 Viorel Munteanu [this message]
-- strict thread matches above, loose matches on Subject: below --
2024-11-09 8:54 [gentoo-commits] repo/gentoo:master commit in: net-misc/turbovnc/ Viorel Munteanu
2024-08-09 7:14 Viorel Munteanu
2024-08-09 7:14 Viorel Munteanu
2024-01-28 7:38 Viorel Munteanu
2023-11-29 22:09 Viorel Munteanu
2023-11-19 7:41 Viorel Munteanu
2023-11-19 7:41 Viorel Munteanu
2023-08-18 16:48 Viorel Munteanu
2023-05-12 4:40 Viorel Munteanu
2023-05-12 4:40 Viorel Munteanu
2023-02-28 5:45 Viorel Munteanu
2023-01-15 8:39 Viorel Munteanu
2022-12-30 9:18 Viorel Munteanu
2022-12-30 9:18 Viorel Munteanu
2022-11-02 16:17 Viorel Munteanu
2022-10-29 21:32 Sam James
2022-09-05 12:37 Joonas Niilola
2022-09-05 12:37 Joonas Niilola
2022-04-18 7:27 Joonas Niilola
2022-02-27 0:19 Sam James
2022-02-20 5:51 Sam James
2022-02-18 1:12 Sam James
2022-02-18 1:12 Sam James
2021-12-22 5:24 Sam James
2021-03-01 16:42 Sam James
2021-03-01 16:42 Sam James
2021-03-01 16:42 Sam James
2021-03-01 16:08 Sam James
2021-03-01 16:08 Sam James
2021-03-01 16:08 Sam James
2021-03-01 15:54 Sam James
2021-03-01 15:54 Sam James
2021-03-01 15:43 Sam James
2021-03-01 15:42 Sam James
2021-03-01 15:28 Sam James
2021-03-01 15:26 Sam James
2021-03-01 15:26 Sam James
2021-03-01 15:26 Sam James
2021-03-01 15:26 Sam James
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1672391888.451b63134cb93070d625b9b279c23334f84ef3d5.ceamac@gentoo \
--to=ceamac@gentoo.org \
--cc=gentoo-commits@lists.gentoo.org \
--cc=gentoo-dev@lists.gentoo.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox