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.

Package-Manager: portage-2.1.3.8

3 files changed, 28 insertions, 23 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/Manifest b/x11-base/xorg-server/Manifest
index 0be6d0c74692..b14b62bad0a1 100644
--- a/x11-base/xorg-server/Manifest
+++ b/x11-base/xorg-server/Manifest
@@ -99,18 +99,18 @@ EBUILD xorg-server-1.3.0.0.ebuild 16691 RMD160 4ec79082172906fb3670b5248be1072b6
 MD5 5f7c606c236f626a581ef59b958958f9 xorg-server-1.3.0.0.ebuild 16691
 RMD160 4ec79082172906fb3670b5248be1072b659e5c85 xorg-server-1.3.0.0.ebuild 16691
 SHA256 f8919bad312e15161da442f2d98190f5370824d0ae995b46adcfc17e19bf2d62 xorg-server-1.3.0.0.ebuild 16691
-EBUILD xorg-server-1.4-r1.ebuild 17433 RMD160 e04f8452877a9cef941b1923602265a2d1cf92ee SHA1 54e1e8606ac880093ecd2f62f2ad1852f06cfb9d SHA256 d206a97b5787b41366101f8c267fd3d0d5d7f325678522c1b96847feb1ebbb6e
-MD5 f2baac7ec2a08048882061fd885ca91e xorg-server-1.4-r1.ebuild 17433
-RMD160 e04f8452877a9cef941b1923602265a2d1cf92ee xorg-server-1.4-r1.ebuild 17433
-SHA256 d206a97b5787b41366101f8c267fd3d0d5d7f325678522c1b96847feb1ebbb6e xorg-server-1.4-r1.ebuild 17433
+EBUILD xorg-server-1.4-r1.ebuild 17468 RMD160 182a7f4a271f2643bb6a60c9d9ac49a307066122 SHA1 360525ac81b0ecac975673a71fa341db26960893 SHA256 1f734602e17bd5ff30b50e9c458ae94ec68d1bc1a06971565a47bd70067c438c
+MD5 e229d9f53e9d7355421565e1ce3f8187 xorg-server-1.4-r1.ebuild 17468
+RMD160 182a7f4a271f2643bb6a60c9d9ac49a307066122 xorg-server-1.4-r1.ebuild 17468
+SHA256 1f734602e17bd5ff30b50e9c458ae94ec68d1bc1a06971565a47bd70067c438c xorg-server-1.4-r1.ebuild 17468
 EBUILD xorg-server-1.4.ebuild 17236 RMD160 0490aa8fb545c749cb8b7b1aafa03d1a29d22d0e SHA1 d53149ac0c815901512aebf9b557701214d3f1b4 SHA256 32a7e4ce96d4df877f455293c5a68cf46021ab949daecdd4047990427f4bff20
 MD5 1f0260468597720ba23688fa51fddf04 xorg-server-1.4.ebuild 17236
 RMD160 0490aa8fb545c749cb8b7b1aafa03d1a29d22d0e xorg-server-1.4.ebuild 17236
 SHA256 32a7e4ce96d4df877f455293c5a68cf46021ab949daecdd4047990427f4bff20 xorg-server-1.4.ebuild 17236
-MISC ChangeLog 57582 RMD160 003d0544afe616f18171e820bf1ef871e97506e0 SHA1 4c44d97704837c68b75a9464b1120751721f6747 SHA256 8180ca05f9936c0b93908bbbe181da7e4fc5227604863cf52dfc72750ea2284e
-MD5 a41fd79d65a11b612a4c7b57a70a55c9 ChangeLog 57582
-RMD160 003d0544afe616f18171e820bf1ef871e97506e0 ChangeLog 57582
-SHA256 8180ca05f9936c0b93908bbbe181da7e4fc5227604863cf52dfc72750ea2284e ChangeLog 57582
+MISC ChangeLog 57860 RMD160 90da07d15eefc6b921589dffea73748978889a19 SHA1 b9f4c3577a779790c2ac775052c21fa13780086a SHA256 2355582114196683fa783c350bb6f909ac4a4617b19a0699fa40db1c5623eb79
+MD5 e0573ebe81effef9807954bf24acde42 ChangeLog 57860
+RMD160 90da07d15eefc6b921589dffea73748978889a19 ChangeLog 57860
+SHA256 2355582114196683fa783c350bb6f909ac4a4617b19a0699fa40db1c5623eb79 ChangeLog 57860
 MISC metadata.xml 156 RMD160 c1274bdccf57603d580de0075ba07a35b7509560 SHA1 6f78f604e3d079d39189b40aaaa1ddb06182ad91 SHA256 5101ab0d4cc8c7125eea733c44e86962769bd77acaf53b69223b9cadcdd29055
 MD5 a37bab73e2f24b213932c30997d3d360 metadata.xml 156
 RMD160 c1274bdccf57603d580de0075ba07a35b7509560 metadata.xml 156
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 )"