Add minimal version dependencies for X.Org 7.3 release. Also remove blocker on old keyboard drivers, because the minimal 1.2 dependency when INPUT_DEVICES=keyboard should be good enough.

(Portage version: 2.1.3.8)

2 files changed, 20 insertions, 15 deletions

diff --git a/x11-base/xorg-server/ChangeLog b/x11-base/xorg-server/ChangeLog
index 2c8274af673f..3b520768f34f 100644
--- a/x11-base/xorg-server/ChangeLog
+++ b/x11-base/xorg-server/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for x11-base/xorg-server
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/ChangeLog,v 1.269 2007/09/10 07:04:55 dberkholz Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/ChangeLog,v 1.270 2007/09/10 09:46:52 dberkholz Exp $
+
+  10 Sep 2007; Donnie Berkholz <dberkholz@gentoo.org>;
+  xorg-server-1.4-r1.ebuild:
+  Add minimal version dependencies for X.Org 7.3 release. Also remove blocker
+  on old keyboard drivers, because the minimal 1.2 dependency when
+  INPUT_DEVICES=keyboard should be good enough.
 
 *xorg-server-1.4-r1 (10 Sep 2007)
 
diff --git a/x11-base/xorg-server/xorg-server-1.4-r1.ebuild b/x11-base/xorg-server/xorg-server-1.4-r1.ebuild
index ceef7eb50a5b..40ddaf2d971a 100644
--- a/x11-base/xorg-server/xorg-server-1.4-r1.ebuild
+++ b/x11-base/xorg-server/xorg-server-1.4-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/xorg-server-1.4-r1.ebuild,v 1.1 2007/09/10 07:04:55 dberkholz Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/xorg-server-1.4-r1.ebuild,v 1.2 2007/09/10 09:46:52 dberkholz Exp $
 
 # Must be before x-modular eclass is inherited
 #SNAPSHOT="yes"
@@ -109,16 +109,16 @@ IUSE="${IUSE_VIDEO_CARDS}
 	3dfx
 	dri hal ipv6 minimal nptl sdl xprint"
 RDEPEND="hal? ( sys-apps/hal )
-	>=x11-libs/libXfont-1.2.5
-	x11-libs/xtrans
+	>=x11-libs/libXfont-1.3.1
+	>=x11-libs/xtrans-1.0.4
 	x11-libs/libXau
 	x11-libs/libXext
-	x11-libs/libX11
+	>=x11-libs/libX11-1.1.3
 	x11-libs/libxkbfile
 	x11-libs/libXdmcp
 	x11-libs/libXmu
-	x11-libs/libXrender
-	x11-libs/libXi
+	>=x11-libs/libXrender-0.9.4
+	>=x11-libs/libXi-1.1.3
 	>=x11-libs/pixman-0.9.5
 	media-libs/freetype
 	>=media-libs/mesa-7.0.1
@@ -132,8 +132,8 @@ RDEPEND="hal? ( sys-apps/hal )
 	x11-apps/xauth
 	x11-apps/xinit
 	app-admin/eselect-opengl
-	x11-libs/libXaw
-	x11-libs/libXpm
+	>=x11-libs/libXaw-1.0.4
+	>=x11-libs/libXpm-3.5.7
 	x11-libs/libXxf86misc
 	x11-libs/libXxf86vm
 	dmx? ( x11-libs/libdmx
@@ -142,8 +142,7 @@ RDEPEND="hal? ( sys-apps/hal )
 		x11-libs/libXres )
 	>=x11-libs/libxkbui-1.0.2
 	x11-libs/liblbxutil
-	kdrive? ( sdl? ( media-libs/libsdl ) )
-	!<x11-drivers/xf86-input-keyboard-1.2"
+	kdrive? ( sdl? ( media-libs/libsdl ) )"
 	# Xres is dmx-dependent, xkbui is xorgcfg-dependent
 	# Xaw is dmx- and xorgcfg-dependent
 	# Xpm is dmx- and xorgcfg-dependent, pulls in Xt
@@ -156,12 +155,12 @@ DEPEND="${RDEPEND}
 	>=x11-proto/damageproto-1.1
 	x11-proto/xextproto
 	x11-proto/xproto
-	x11-proto/xf86dgaproto
+	>=x11-proto/xf86dgaproto-2.0.3
 	x11-proto/xf86miscproto
 	x11-proto/xf86rushproto
 	x11-proto/xf86vidmodeproto
 	x11-proto/xf86bigfontproto
-	>=x11-proto/compositeproto-0.3
+	>=x11-proto/compositeproto-0.4
 	x11-proto/recordproto
 	x11-proto/resourceproto
 	x11-proto/videoproto
@@ -171,7 +170,7 @@ DEPEND="${RDEPEND}
 	>=x11-proto/xineramaproto-1.1-r1
 	x11-proto/fontsproto
 	>=x11-proto/kbproto-1.0.3
-	x11-proto/inputproto
+	>=x11-proto/inputproto-1.4.2.1
 	x11-proto/bigreqsproto
 	x11-proto/xcmiscproto
 	>=x11-proto/glproto-1.4.8
@@ -179,7 +178,7 @@ DEPEND="${RDEPEND}
 	dri? ( x11-proto/xf86driproto
 		>=x11-libs/libdrm-2.3 )
 	xprint? ( x11-proto/printproto
-		x11-apps/mkfontdir
+		>=x11-apps/mkfontdir-1.0.3
 		x11-apps/mkfontscale
 		x11-apps/xplsprinters )"