diff options
Diffstat (limited to 'net-misc')
| -rw-r--r-- | net-misc/tigervnc/Manifest | 3 | ||||
| -rw-r--r-- | net-misc/tigervnc/tigervnc-9999.ebuild | 39 |
2 files changed, 24 insertions, 18 deletions
diff --git a/net-misc/tigervnc/Manifest b/net-misc/tigervnc/Manifest index 7eb59a7..b6513b4 100644 --- a/net-misc/tigervnc/Manifest +++ b/net-misc/tigervnc/Manifest @@ -1,2 +1 @@ -DIST tigervnc-1.4.2-patches-0.1.tar.bz2 7361 BLAKE2B 5e4aed97f3b1e88488f1f080b11afb515d70fcf5b9a20074436a97b3a54a89bd308bacec5584263a7cd72ef3f8b8863102cbd8ab3685cb3251764f5f23f4a037 SHA512 86235aba8e735e4afed21d2940cee8ea2f4f1bc951db79aaf481ae79ab81d4518add6be2619ce9371f77fd068c8dbf069754ecc0168e5afe9e8505d3d61cc573 -DIST xorg-server-1.20.0.tar.bz2 6096838 BLAKE2B 34ee6d6dbbde54d54e082a0791e85ad52d728e239a7d8fadb75ebcbdbaab8752b90ca6d075f096d971db7ec68ce4ecac5c70fcf536ce23c20b8dce8f32e2c046 SHA512 1489e8511c9da682ef0460182dfeeddd241c72d4ef4d206d9706f1e39572c09953df851fab18cefb65a1ee4c6710c6ba13c63c9c9fc0bc1b5f12c50780412cde +DIST xorg-server-1.20.1.tar.bz2 6103772 BLAKE2B ac71d603cef8efe814275b658d4a76e231eb0fda14dd6e7177509bf147feaf37657789d8fc83f8017435c84760d7be357f203a8346aac612a53083cf413f7d75 SHA512 ef2b93a61683c8ca8d1f14b771e70db65ba119a73db8a46e7cdbf2ac2243e3f4b2732068eb5aa5d7b76f460db995a3c04390870198a5210ec30df4360ad9f94b diff --git a/net-misc/tigervnc/tigervnc-9999.ebuild b/net-misc/tigervnc/tigervnc-9999.ebuild index 7d6b4b6..d3a226d 100644 --- a/net-misc/tigervnc/tigervnc-9999.ebuild +++ b/net-misc/tigervnc/tigervnc-9999.ebuild @@ -5,22 +5,22 @@ EAPI=6 CMAKE_IN_SOURCE_BUILD=1 -inherit autotools cmake-utils eutils flag-o-matic java-pkg-opt-2 systemd git-r3 unpacker +inherit autotools cmake-utils eutils flag-o-matic java-pkg-opt-2 systemd git-r3 unpacker xdg-utils gnome2-utils -XSERVER_VERSION="1.20.0" +XSERVER_VERSION="1.20.1" DESCRIPTION="Remote desktop viewer display system" HOMEPAGE="http://www.tigervnc.org" -SRC_URI="https://dev.gentoo.org/~armin76/dist/tigervnc-1.4.2-patches-0.1.tar.bz2 - server? ( ftp://ftp.freedesktop.org/pub/xorg/individual/xserver/xorg-server-${XSERVER_VERSION}.tar.bz2 )" +SRC_URI="server? ( ftp://ftp.freedesktop.org/pub/xorg/individual/xserver/xorg-server-${XSERVER_VERSION}.tar.bz2 )" EGIT_REPO_URI="https://github.com/TigerVNC/tigervnc/" LICENSE="GPL-2" SLOT="0" KEYWORDS="" -IUSE="+drm gnutls nls java +opengl pam server +xorgmodule xinerama dri3" +IUSE="dri3 +drm gnutls java libressl nls +opengl pam server xinerama +xorgmodule" -CDEPEND="virtual/jpeg:0 +CDEPEND=" + virtual/jpeg:0 sys-libs/zlib:= >=x11-libs/fltk-1.3.1 gnutls? ( net-libs/gnutls:= ) @@ -39,9 +39,10 @@ CDEPEND="virtual/jpeg:0 >=x11-apps/xauth-1.0.3 x11-apps/xsetroot >=x11-misc/xkeyboard-config-2.4.1-r3 - opengl? ( >=app-eselect/eselect-opengl-1.3.1-r1 ) 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 ) " @@ -53,13 +54,10 @@ RDEPEND="${CDEPEND} java? ( >=virtual/jre-1.5:* )" DEPEND="${CDEPEND} - amd64? ( dev-lang/nasm ) - x86? ( dev-lang/nasm ) nls? ( sys-devel/gettext ) java? ( >=virtual/jdk-1.5 ) x11-base/xorg-proto media-libs/fontconfig - x11-base/xorg-proto x11-libs/libICE x11-libs/libSM x11-libs/libXcursor @@ -78,7 +76,8 @@ DEPEND="${CDEPEND} )" PATCHES=( - "${WORKDIR}"/patches/055_xstartup.patch + "${FILESDIR}"/${P}-030_manpages.patch + "${FILESDIR}"/${P}-055_xstartup.patch ) src_unpack() { @@ -86,7 +85,6 @@ src_unpack() { unpacker } - src_prepare() { if use server ; then cp -r "${WORKDIR}"/xorg-server-${XSERVER_VERSION}/. unix/xserver || die @@ -97,10 +95,10 @@ src_prepare() { if use server ; then cd unix/xserver || die a=${XSERVER_VERSION%.*} - eapply ../xserver${a/./}.patch + eapply "${FILESDIR}"/xserver${a/./}.patch eautoreconf fi - cd "${WORKDIR}" && sed -i 's:\(drm_fourcc.h\):drm/\1:' $(grep drm_fourcc.h -rl .) || die + cd "${WORKDIR}" && sed -i 's:\(drm_fourcc.h\):libdrm/\1:' $(grep drm_fourcc.h -rl .) || die } src_configure() { @@ -136,7 +134,6 @@ src_configure() { --disable-selective-werror \ --disable-silent-rules \ --disable-static \ - --disable-tslib \ --disable-unit-tests \ --disable-xephyr \ $(use_enable xinerama) \ @@ -149,7 +146,7 @@ src_configure() { --with-pic \ --without-dtrace \ --disable-present \ - --disable-unit-tests + --with-sha1=libcrypto fi } @@ -192,3 +189,13 @@ src_install() { done fi } + +pkg_postinst() { + xdg_desktop_database_update + gnome2_icon_cache_update +} + +pkg_postrm() { + xdg_desktop_database_update + gnome2_icon_cache_update +} |