From 8f0cb17c74f10c28be6c270fa99ec2e57f01fe39 Mon Sep 17 00:00:00 2001 From: Ulrich Müller Date: Sat, 3 Oct 2020 18:53:37 +0200 Subject: net-misc/tigervnc: Remove vncserver binary when USE=-server. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The previous fix was incomplete, because vncserver is now installed in /usr/libexec instead of /usr/bin. Fixes: 7fe6b665628d0893edb8f6ee5dd9b287cb3f2929 Bug: https://bugs.gentoo.org/745987 Package-Manager: Portage-3.0.8, Repoman-3.0.1 Signed-off-by: Ulrich Müller --- net-misc/tigervnc/tigervnc-1.11.0-r1.ebuild | 180 --------------------------- net-misc/tigervnc/tigervnc-1.11.0-r2.ebuild | 181 ++++++++++++++++++++++++++++ 2 files changed, 181 insertions(+), 180 deletions(-) delete mode 100644 net-misc/tigervnc/tigervnc-1.11.0-r1.ebuild create mode 100644 net-misc/tigervnc/tigervnc-1.11.0-r2.ebuild (limited to 'net-misc/tigervnc') diff --git a/net-misc/tigervnc/tigervnc-1.11.0-r1.ebuild b/net-misc/tigervnc/tigervnc-1.11.0-r1.ebuild deleted file mode 100644 index 7e15237fd3f9..000000000000 --- a/net-misc/tigervnc/tigervnc-1.11.0-r1.ebuild +++ /dev/null @@ -1,180 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 -CMAKE_IN_SOURCE_BUILD=1 - -inherit autotools cmake flag-o-matic java-pkg-opt-2 systemd xdg - -XSERVER_VERSION="1.20.0" - -DESCRIPTION="Remote desktop viewer display system" -HOMEPAGE="http://www.tigervnc.org" -SRC_URI="https://github.com/TigerVNC/tigervnc/archive/v${PV}.tar.gz -> ${P}.tar.gz - server? ( ftp://ftp.freedesktop.org/pub/xorg/individual/xserver/xorg-server-${XSERVER_VERSION}.tar.bz2 )" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86" -IUSE="dri3 +drm gnutls java libressl nls +opengl pam server xinerama +xorgmodule" - -CDEPEND=" - virtual/jpeg:0 - sys-libs/zlib:= - >=x11-libs/fltk-1.3.1 - gnutls? ( net-libs/gnutls:= ) - nls? ( virtual/libiconv ) - pam? ( sys-libs/pam ) - x11-libs/libX11 - x11-libs/libXext - x11-libs/libXrender - x11-libs/pixman - server? ( - x11-libs/libXau - x11-libs/libXdamage - x11-libs/libXdmcp - x11-libs/libXfont2 - x11-libs/libXtst - >=x11-libs/pixman-0.27.2 - >=x11-apps/xauth-1.0.3 - x11-apps/xsetroot - >=x11-misc/xkeyboard-config-2.4.1-r3 - xorgmodule? ( =x11-base/xorg-server-${XSERVER_VERSION%.*}* ) - drm? ( x11-libs/libdrm ) - !libressl? ( dev-libs/openssl:0= ) - libressl? ( dev-libs/libressl:0= ) - ) - xinerama? ( x11-libs/libXinerama ) - " - -RDEPEND="${CDEPEND} - !net-misc/tightvnc - !net-misc/vnc - !net-misc/xf4vnc - java? ( >=virtual/jre-1.5:* )" - -DEPEND="${CDEPEND} - nls? ( sys-devel/gettext ) - java? ( >=virtual/jdk-1.5 ) - x11-base/xorg-proto - media-libs/fontconfig - x11-libs/libICE - x11-libs/libSM - x11-libs/libXcursor - x11-libs/libXfixes - x11-libs/libXft - x11-libs/libXi - server? ( - dev-libs/libbsd - x11-libs/libxkbfile - x11-libs/libxshmfence - virtual/pkgconfig - media-fonts/font-util - x11-misc/util-macros - >=x11-libs/xtrans-1.3.3 - opengl? ( >=media-libs/mesa-10.3.4-r1 ) - )" - -src_prepare() { - if use server; then - cp -r "${WORKDIR}"/xorg-server-${XSERVER_VERSION}/. unix/xserver || die - fi - - cmake_src_prepare - - if use server; then - cd unix/xserver || die - eapply "${FILESDIR}"/xserver120.patch - eapply "${FILESDIR}"/xserver120-drmfourcc-header.patch - sed -i -e 's/"gl >= .*"/"gl"/' configure.ac || die - eautoreconf - fi -} - -src_configure() { - if use arm || use hppa; then - append-flags "-fPIC" - fi - - local mycmakeargs=( - -DENABLE_GNUTLS=$(usex gnutls) - -DENABLE_NLS=$(usex nls) - -DENABLE_PAM=$(usex pam) - -DBUILD_JAVA=$(usex java) - ) - - cmake_src_configure - - if use server; then - cd unix/xserver || die - econf \ - $(use_enable opengl glx) \ - $(use_enable drm libdrm) \ - --disable-config-hal \ - --disable-config-udev \ - --disable-devel-docs \ - --disable-dmx \ - --disable-dri \ - $(use_enable dri3) \ - --disable-glamor \ - --disable-kdrive \ - --disable-libunwind \ - --disable-linux-acpi \ - --disable-record \ - --disable-selective-werror \ - --disable-static \ - --disable-unit-tests \ - --disable-xephyr \ - $(use_enable xinerama) \ - --disable-xnest \ - --disable-xorg \ - --disable-xvfb \ - --disable-xwin \ - --disable-xwayland \ - --enable-dri2 \ - --with-pic \ - --without-dtrace \ - --disable-present \ - --with-sha1=libcrypto - fi -} - -src_compile() { - cmake_src_compile - - if use server; then - # deps of the vnc module and the module itself - local d subdirs=( - fb xfixes Xext dbe $(usex opengl glx "") $(usev dri3) randr render - damageext miext Xi xkb composite dix mi os hw/vnc - ) - for d in "${subdirs[@]}"; do - emake -C unix/xserver/"${d}" - done - fi -} - -src_install() { - cmake_src_install - - if use server; then - emake -C unix/xserver/hw/vnc DESTDIR="${D}" install - if ! use xorgmodule; then - rm -rv "${ED%/}"/usr/$(get_libdir)/xorg || die - else - rm -v "${ED%/}"/usr/$(get_libdir)/xorg/modules/extensions/libvnc.la || die - fi - - newconfd "${FILESDIR}"/${PN}.confd ${PN} - newinitd "${FILESDIR}"/${PN}.initd ${PN} - - systemd_douserunit unix/vncserver/vncserver@.service - else - local f - cd "${ED}" || die - for f in x0vncserver vncconfig; do - rm usr/bin/$f || die - rm usr/share/man/man1/$f.1 || die - done - fi -} diff --git a/net-misc/tigervnc/tigervnc-1.11.0-r2.ebuild b/net-misc/tigervnc/tigervnc-1.11.0-r2.ebuild new file mode 100644 index 000000000000..23c4836bddc6 --- /dev/null +++ b/net-misc/tigervnc/tigervnc-1.11.0-r2.ebuild @@ -0,0 +1,181 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 +CMAKE_IN_SOURCE_BUILD=1 + +inherit autotools cmake flag-o-matic java-pkg-opt-2 systemd xdg + +XSERVER_VERSION="1.20.0" + +DESCRIPTION="Remote desktop viewer display system" +HOMEPAGE="http://www.tigervnc.org" +SRC_URI="https://github.com/TigerVNC/tigervnc/archive/v${PV}.tar.gz -> ${P}.tar.gz + server? ( ftp://ftp.freedesktop.org/pub/xorg/individual/xserver/xorg-server-${XSERVER_VERSION}.tar.bz2 )" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86" +IUSE="dri3 +drm gnutls java libressl nls +opengl pam server xinerama +xorgmodule" + +CDEPEND=" + virtual/jpeg:0 + sys-libs/zlib:= + >=x11-libs/fltk-1.3.1 + gnutls? ( net-libs/gnutls:= ) + nls? ( virtual/libiconv ) + pam? ( sys-libs/pam ) + x11-libs/libX11 + x11-libs/libXext + x11-libs/libXrender + x11-libs/pixman + server? ( + x11-libs/libXau + x11-libs/libXdamage + x11-libs/libXdmcp + x11-libs/libXfont2 + x11-libs/libXtst + >=x11-libs/pixman-0.27.2 + >=x11-apps/xauth-1.0.3 + x11-apps/xsetroot + >=x11-misc/xkeyboard-config-2.4.1-r3 + xorgmodule? ( =x11-base/xorg-server-${XSERVER_VERSION%.*}* ) + drm? ( x11-libs/libdrm ) + !libressl? ( dev-libs/openssl:0= ) + libressl? ( dev-libs/libressl:0= ) + ) + xinerama? ( x11-libs/libXinerama ) + " + +RDEPEND="${CDEPEND} + !net-misc/tightvnc + !net-misc/vnc + !net-misc/xf4vnc + java? ( >=virtual/jre-1.5:* )" + +DEPEND="${CDEPEND} + nls? ( sys-devel/gettext ) + java? ( >=virtual/jdk-1.5 ) + x11-base/xorg-proto + media-libs/fontconfig + x11-libs/libICE + x11-libs/libSM + x11-libs/libXcursor + x11-libs/libXfixes + x11-libs/libXft + x11-libs/libXi + server? ( + dev-libs/libbsd + x11-libs/libxkbfile + x11-libs/libxshmfence + virtual/pkgconfig + media-fonts/font-util + x11-misc/util-macros + >=x11-libs/xtrans-1.3.3 + opengl? ( >=media-libs/mesa-10.3.4-r1 ) + )" + +src_prepare() { + if use server; then + cp -r "${WORKDIR}"/xorg-server-${XSERVER_VERSION}/. unix/xserver || die + fi + + cmake_src_prepare + + if use server; then + cd unix/xserver || die + eapply "${FILESDIR}"/xserver120.patch + eapply "${FILESDIR}"/xserver120-drmfourcc-header.patch + sed -i -e 's/"gl >= .*"/"gl"/' configure.ac || die + eautoreconf + fi +} + +src_configure() { + if use arm || use hppa; then + append-flags "-fPIC" + fi + + local mycmakeargs=( + -DENABLE_GNUTLS=$(usex gnutls) + -DENABLE_NLS=$(usex nls) + -DENABLE_PAM=$(usex pam) + -DBUILD_JAVA=$(usex java) + ) + + cmake_src_configure + + if use server; then + cd unix/xserver || die + econf \ + $(use_enable opengl glx) \ + $(use_enable drm libdrm) \ + --disable-config-hal \ + --disable-config-udev \ + --disable-devel-docs \ + --disable-dmx \ + --disable-dri \ + $(use_enable dri3) \ + --disable-glamor \ + --disable-kdrive \ + --disable-libunwind \ + --disable-linux-acpi \ + --disable-record \ + --disable-selective-werror \ + --disable-static \ + --disable-unit-tests \ + --disable-xephyr \ + $(use_enable xinerama) \ + --disable-xnest \ + --disable-xorg \ + --disable-xvfb \ + --disable-xwin \ + --disable-xwayland \ + --enable-dri2 \ + --with-pic \ + --without-dtrace \ + --disable-present \ + --with-sha1=libcrypto + fi +} + +src_compile() { + cmake_src_compile + + if use server; then + # deps of the vnc module and the module itself + local d subdirs=( + fb xfixes Xext dbe $(usex opengl glx "") $(usev dri3) randr render + damageext miext Xi xkb composite dix mi os hw/vnc + ) + for d in "${subdirs[@]}"; do + emake -C unix/xserver/"${d}" + done + fi +} + +src_install() { + cmake_src_install + + if use server; then + emake -C unix/xserver/hw/vnc DESTDIR="${D}" install + if ! use xorgmodule; then + rm -rv "${ED}"/usr/$(get_libdir)/xorg || die + else + rm -v "${ED}"/usr/$(get_libdir)/xorg/modules/extensions/libvnc.la || die + fi + + newconfd "${FILESDIR}"/${PN}.confd ${PN} + newinitd "${FILESDIR}"/${PN}.initd ${PN} + + systemd_douserunit unix/vncserver/vncserver@.service + else + local f + for f in x0vncserver vncconfig; do + rm "${ED}"/usr/bin/${f} || die + rm "${ED}"/usr/share/man/man1/${f}.1 || die + done + rm -r "${ED}"/usr/{sbin,libexec} || die + rm -r "${ED}"/usr/share/man/man8 || die + fi +} -- cgit v1.2.3-65-gdbad