diff options
| author |   Stefan Schweizer <genstef@gentoo.org> | 2006-09-01 20:39:06 +0000 |
|---|---|---|
| committer | Stefan Schweizer <genstef@gentoo.org> | 2006-09-01 20:39:06 +0000 |
| commit | 3e829fb4862fe91a1d5ba97a98b7cc26a20417cf (patch) | |
| tree | 53d244e405044fbc5cce45cbeb1022c74265a734 /net-misc | |
| parent | move repos to DEPEND, thanks jakub (diff) | |
| download | gentoo-2-3e829fb4862fe91a1d5ba97a98b7cc26a20417cf.tar.gz gentoo-2-3e829fb4862fe91a1d5ba97a98b7cc26a20417cf.tar.bz2 gentoo-2-3e829fb4862fe91a1d5ba97a98b7cc26a20417cf.zip | |
Make ebuild die when \<x11-base/xorg-server-1.1 is used, bug 145756
(Portage version: 2.1.1_rc1-r2)
Diffstat (limited to 'net-misc')
| -rw-r--r-- | net-misc/vnc/ChangeLog | 5 | ||||
| -rw-r--r-- | net-misc/vnc/vnc-4.1.2.ebuild | 42 |
2 files changed, 27 insertions, 20 deletions
diff --git a/net-misc/vnc/ChangeLog b/net-misc/vnc/ChangeLog index 432efd5ceca6..136c782bd723 100644 --- a/net-misc/vnc/ChangeLog +++ b/net-misc/vnc/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for net-misc/vnc # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-misc/vnc/ChangeLog,v 1.52 2006/09/01 18:39:32 genstef Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-misc/vnc/ChangeLog,v 1.53 2006/09/01 20:39:06 genstef Exp $ + + 01 Sep 2006; Stefan Schweizer <genstef@gentoo.org> vnc-4.1.2.ebuild: + Make ebuild die when \<x11-base/xorg-server-1.1 is used, bug 145756 01 Sep 2006; Stefan Schweizer <genstef@gentoo.org> metadata.xml: New maintainer: Raúl 'armin76' Porcel diff --git a/net-misc/vnc/vnc-4.1.2.ebuild b/net-misc/vnc/vnc-4.1.2.ebuild index 60e54ce25b81..a5976e8fee8b 100644 --- a/net-misc/vnc/vnc-4.1.2.ebuild +++ b/net-misc/vnc/vnc-4.1.2.ebuild @@ -1,6 +1,6 @@ # 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.6 2006/09/01 20:26:42 genstef Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-misc/vnc/vnc-4.1.2.ebuild,v 1.7 2006/09/01 20:39:06 genstef Exp $ inherit eutils toolchain-funcs multilib autotools @@ -26,26 +26,25 @@ RDEPEND="sys-libs/zlib ) virtual/x11 ) - server? ( || ( ( x11-libs/libXi - x11-libs/libXfont - x11-libs/libXmu - x11-libs/libxkbfile - x11-libs/libXrender - x11-apps/xauth - x11-apps/xsetroot - media-fonts/font-adobe-100dpi - media-fonts/font-adobe-75dpi - media-fonts/font-alias - media-fonts/font-cursor-misc - media-fonts/font-misc-misc - ) - virtual/x11 - ) + server? ( + x11-libs/libXi + x11-libs/libXfont + x11-libs/libXmu + x11-libs/libxkbfile + x11-libs/libXrender + x11-apps/xauth + x11-apps/xsetroot + media-fonts/font-adobe-100dpi + media-fonts/font-adobe-75dpi + media-fonts/font-alias + media-fonts/font-cursor-misc + media-fonts/font-misc-misc + !amd64? ( >=x11-base/xorg-server-1.1 ) ) !net-misc/tightvnc" DEPEND="${RDEPEND} || ( ( x11-proto/xextproto - x11-proto/compositeproto + server? ( x11-proto/compositeproto x11-proto/damageproto x11-proto/fixesproto x11-proto/fontsproto @@ -58,16 +57,21 @@ DEPEND="${RDEPEND} x11-proto/xf86bigfontproto x11-proto/xf86dgaproto x11-proto/xf86miscproto - x11-proto/xf86vidmodeproto + x11-proto/xf86vidmodeproto ) ) virtual/x11 )" S="${WORKDIR}/${MY_P}" +pkg_setup() { + use server && has_version '<x11-base/xorg-server-1.1' \ + && die "you need at least version 1.1 of xorg-server, see bug 145756" +} + src_unpack() { unpack ${A} - + cd ${S} # patches from Fedora |