Make ebuild die when \<x11-base/xorg-server-1.1 is used, bug 145756

Package-Manager: portage-2.1.1_rc1-r2

3 files changed, 35 insertions, 28 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/Manifest b/net-misc/vnc/Manifest
index e7b3d1b59b5d..20850a199eea 100644
--- a/net-misc/vnc/Manifest
+++ b/net-misc/vnc/Manifest
@@ -65,14 +65,14 @@ EBUILD vnc-4.0-r1.ebuild 3033 RMD160 4460a3b0355206751d4835e61682c987c8413c2d SH
 MD5 7659aa4bd1d3fbeafb3c414995936a41 vnc-4.0-r1.ebuild 3033
 RMD160 4460a3b0355206751d4835e61682c987c8413c2d vnc-4.0-r1.ebuild 3033
 SHA256 50cb37be0d6788a63e8a0fb2e3ab27ab244047528360ebe2c600059c58907186 vnc-4.0-r1.ebuild 3033
-EBUILD vnc-4.1.2.ebuild 4602 RMD160 8a8ef5f50b66a709fd8f20f3a808f8a590950a6a SHA1 5d00be3353bd4aa09c28c5f9a1f16c556217da92 SHA256 b62b55b018214da29b9bd919a1c6c33f60dfc4bf7f7522fc217cba6af60a989a
-MD5 0d3fdfdeeecd9d58d8560593b66f7406 vnc-4.1.2.ebuild 4602
-RMD160 8a8ef5f50b66a709fd8f20f3a808f8a590950a6a vnc-4.1.2.ebuild 4602
-SHA256 b62b55b018214da29b9bd919a1c6c33f60dfc4bf7f7522fc217cba6af60a989a vnc-4.1.2.ebuild 4602
-MISC ChangeLog 8692 RMD160 1cf78b12154efbf28e023c2fd537b182522ad535 SHA1 331919c306343514d32580dd818b7d9ceb414511 SHA256 918973b636ddcfe34bb994b6e1fdb263a95f87e86e80d96e41d6f1c689bff38e
-MD5 d8e760dd16434568813cdcda13ce3dd1 ChangeLog 8692
-RMD160 1cf78b12154efbf28e023c2fd537b182522ad535 ChangeLog 8692
-SHA256 918973b636ddcfe34bb994b6e1fdb263a95f87e86e80d96e41d6f1c689bff38e ChangeLog 8692
+EBUILD vnc-4.1.2.ebuild 4759 RMD160 b6fbdf25e81d41d81008cfed8c60f10cd4d0482f SHA1 b3b2af633f9a28a42fdef9aba7cff89b100a1624 SHA256 603835bcf69657c333979c467b465dce7d806c76241c652b6cb30881ccfa26a0
+MD5 68dfeced37791a196b4cd059471c4d77 vnc-4.1.2.ebuild 4759
+RMD160 b6fbdf25e81d41d81008cfed8c60f10cd4d0482f vnc-4.1.2.ebuild 4759
+SHA256 603835bcf69657c333979c467b465dce7d806c76241c652b6cb30881ccfa26a0 vnc-4.1.2.ebuild 4759
+MISC ChangeLog 8834 RMD160 36021627d76fd83c8da72f36eed6a9fd5456d2d7 SHA1 2adee954db64ea9ca8139dfaf11b271cf7f3b9fa SHA256 19d0ea50288e39e0c8655a79d73dbccefa397ad94a05ba075cae25206a3d9fdb
+MD5 a4addf951e7088587bc27204409142f7 ChangeLog 8834
+RMD160 36021627d76fd83c8da72f36eed6a9fd5456d2d7 ChangeLog 8834
+SHA256 19d0ea50288e39e0c8655a79d73dbccefa397ad94a05ba075cae25206a3d9fdb ChangeLog 8834
 MISC metadata.xml 260 RMD160 b35ce05c59a27b25bb9da9b924fbc831763b03bc SHA1 b3b4000e0e1dbd0b080cca12f786f0ef74c2e10c SHA256 756af86344d6dca0063ba25898a0afd5ddbbfe689cb2339b16d0d8d3e5c694a5
 MD5 1083a3f4403360e5286be4e1105e9ce1 metadata.xml 260
 RMD160 b35ce05c59a27b25bb9da9b924fbc831763b03bc metadata.xml 260
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