diff options
| author |   Mike Frysinger <vapier@gentoo.org> | 2006-09-10 08:47:09 +0000 |
|---|---|---|
| committer | Mike Frysinger <vapier@gentoo.org> | 2006-09-10 08:47:09 +0000 |
| commit | 600e9a6512b8530da168562c37952f75081a45b4 (patch) | |
| tree | 9461aae6901767fb9dbeb9922e75dbb529921c77 /net-misc | |
| parent | Stable on x86, bug #147026. (diff) | |
| download | gentoo-2-600e9a6512b8530da168562c37952f75081a45b4.tar.gz gentoo-2-600e9a6512b8530da168562c37952f75081a45b4.tar.bz2 gentoo-2-600e9a6512b8530da168562c37952f75081a45b4.zip | |
use a proper patchset
(Portage version: 2.1.1)
Diffstat (limited to 'net-misc')
| -rw-r--r-- | net-misc/vnc/files/digest-vnc-4.1.2 | 6 | ||||
| -rw-r--r-- | net-misc/vnc/vnc-4.1.2.ebuild | 40 |
2 files changed, 11 insertions, 35 deletions
diff --git a/net-misc/vnc/files/digest-vnc-4.1.2 b/net-misc/vnc/files/digest-vnc-4.1.2 index 86e693975d16..f505d0ff733c 100644 --- a/net-misc/vnc/files/digest-vnc-4.1.2 +++ b/net-misc/vnc/files/digest-vnc-4.1.2 @@ -1,6 +1,6 @@ -MD5 11830ad3f636ce9e92cf7f1fc746ce48 vnc-4.1.2-patches.tar.bz2 13013 -RMD160 9955cb032dff33c2d711474fe6dafa5356f314c5 vnc-4.1.2-patches.tar.bz2 13013 -SHA256 ce2513d17d39125afdcb8257b3ce33a7e6615700e12d710e84b50f48acd5be64 vnc-4.1.2-patches.tar.bz2 13013 +MD5 1f6b9ac28f60cae7524f1552b5bd6323 vnc-4.1.2-patches-1.tar.bz2 13689 +RMD160 a2f6926c09d7dff5644e6b4b2849d830b7bb9f92 vnc-4.1.2-patches-1.tar.bz2 13689 +SHA256 072bdda38a146e3fc72805646b233c1477714059f79cdfb87e9eb487b9d054ff vnc-4.1.2-patches-1.tar.bz2 13689 MD5 cf9a6fe8f592286b5e0fdde686504ffb vnc-4_1_2-unixsrc.tar.gz 537713 RMD160 2a2d615825e6ac74aca5f0c29d025e576b725dc3 vnc-4_1_2-unixsrc.tar.gz 537713 SHA256 ed73cd1abf4c4044032929fa2dd023d851f5fe37f88009523d3b08b7d836d542 vnc-4_1_2-unixsrc.tar.gz 537713 diff --git a/net-misc/vnc/vnc-4.1.2.ebuild b/net-misc/vnc/vnc-4.1.2.ebuild index 17515928ef32..da11a0e96ec3 100644 --- a/net-misc/vnc/vnc-4.1.2.ebuild +++ b/net-misc/vnc/vnc-4.1.2.ebuild @@ -1,17 +1,18 @@ # Copyright 1999-2006 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-misc/vnc/vnc-4.1.2.ebuild,v 1.8 2006/09/10 08:22:26 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-misc/vnc/vnc-4.1.2.ebuild,v 1.9 2006/09/10 08:47:09 vapier Exp $ inherit eutils toolchain-funcs multilib autotools XSERVER_VERSION="1.1.1" +PATCH_VER=1 MY_P="vnc-4_1_2-unixsrc" DESCRIPTION="Remote desktop viewer display system" HOMEPAGE="http://www.realvnc.com/" SRC_URI="http://ltsp.mirrors.tds.net/pub/ltsp/tarballs/${MY_P}.tar.gz http://ftp.plusline.de/FreeBSD/distfiles/xc/${MY_P}.tar.gz - http://www.gentooexperimental.org/~genstef/dist/${P}-patches.tar.bz2 + mirror://gentoo/${P}-patches-${PATCH_VER}.tar.bz2 server? ( ftp://ftp.freedesktop.org/pub/xorg/individual/xserver/xorg-server-${XSERVER_VERSION}.tar.bz2 )" LICENSE="GPL-2" @@ -62,41 +63,16 @@ S=${WORKDIR}/${MY_P} src_unpack() { unpack ${A} - cd "${S}" - # patches from Fedora - epatch "${WORKDIR}"/${P}/vnc-viewer-reparent.patch - epatch "${WORKDIR}"/${P}/vnc-newfbsize.patch - if use server ; then mv "${WORKDIR}"/xorg-server-${XSERVER_VERSION} unix/ + else + rm -f "${WORKDIR}"/patch/*vnc-server* + fi + EPATCH_SUFFIX="patch" epatch "${WORKDIR}"/patch - # patches from Fedora - epatch "${WORKDIR}"/${P}/vnc-cookie.patch - epatch "${WORKDIR}"/${P}/vnc-gcc4.patch - epatch "${WORKDIR}"/${P}/vnc-use-fb.patch - epatch "${WORKDIR}"/${P}/vnc-xclients.patch - epatch "${WORKDIR}"/${P}/vnc-idle.patch - epatch "${WORKDIR}"/${P}/vnc-via.patch - epatch "${WORKDIR}"/${P}/vnc-build.patch - epatch "${WORKDIR}"/${P}/vnc-fPIC.patch - epatch "${WORKDIR}"/${P}/vnc-restart.patch - epatch "${WORKDIR}"/${P}/vnc-vncpasswd.patch - epatch "${WORKDIR}"/${P}/vnc-def.patch - epatch "${WORKDIR}"/${P}/vnc-modular-xorg.patch - epatch "${WORKDIR}"/${P}/vnc-nohttpd.patch - - cd unix/xorg-server-* - epatch "${WORKDIR}"/${P}/vnc-fontpath.patch - epatch "${WORKDIR}"/${P}/vnc-s390.patch - - cd ../../ - - epatch "${WORKDIR}"/${P}/vnc-64bit.patch - epatch "${WORKDIR}"/${P}/vnc-select.patch - epatch "${WORKDIR}"/${P}/vnc-opengl.patch - + if use server ; then cp -a "${S}"/unix/xc/programs/Xserver/vnc/Xvnc/xvnc.cc \ "${S}"/unix/xc/programs/Xserver/Xvnc.man \ "${S}"/unix/xc/programs/Xserver/vnc/*.{h,cc} \ |