fixing version on xinit blocker (D'oh)

Package-Manager: portage-2.2_rc67/cvs/Linux x86_64

diff --git a/x11-base/xorg-server/ChangeLog b/x11-base/xorg-server/ChangeLog
index 53e649c87ac33106c72a9702eb72a6603e906623..5b1c64f05775229fa86dbd5536a438d5b72333e4 100644 (file)
--- a/x11-base/xorg-server/ChangeLog
+++ b/x11-base/xorg-server/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for x11-base/xorg-server
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/ChangeLog,v 1.502 2010/04/13 21:39:17 polynomial-c Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/ChangeLog,v 1.503 2010/04/13 21:56:38 polynomial-c Exp $
+
+  13 Apr 2010; Lars Wendler <polynomial-c@gentoo.org>
+  xorg-server-1.8.0.ebuild:
+  fixing version on xinit blocker (D'oh)
 
   13 Apr 2010; Lars Wendler <polynomial-c@gentoo.org>
   xorg-server-1.8.0.ebuild:

diff --git a/x11-base/xorg-server/Manifest b/x11-base/xorg-server/Manifest
index 8be8dac4adf7d65f1c02c8344ac78ce1b3db5bd7..abfc636bc28cc51fc99a26d144def637575e3cf3 100644 (file)
--- a/x11-base/xorg-server/Manifest
+++ b/x11-base/xorg-server/Manifest
@@ -18,6 +18,6 @@ DIST xorg-server-1.8.0.tar.bz2 5097035 RMD160 4dedc88bcbbbe545b0e795d541edb3c665
 EBUILD xorg-server-1.5.3-r6.ebuild 15607 RMD160 13afb38910b3e04ff352c363aea529f984066de9 SHA1 55d4538178c2d4a1d3775ac605b03a852e9813db SHA256 230f98c9cdcebd42f94f1364a1a0ae317de9772968bcd97229e1be2e08f1d4af
 EBUILD xorg-server-1.6.5-r1.ebuild 6842 RMD160 7dc826b80d62c7bad6bc36dbcd9d5134ac8def0e SHA1 fca33f2816607703c3ed2612be1238f9cd6f28da SHA256 71441f59df32e25dad5deae4838e312e62a87497e0e4362cd297e27f33b96584
 EBUILD xorg-server-1.7.6.ebuild 7316 RMD160 365ff9876f752f5b72eae8b8b1015e9cb248b209 SHA1 1fd284118c3cd59ad0939789f8c3e7a16088ec0b SHA256 23977e1ee2dd9554605883b4b5b2cab6ec8a30fa244377c6492d7d26da657fec
-EBUILD xorg-server-1.8.0.ebuild 8160 RMD160 407d4973e05b7e67f5c0d41db8d606eb801fcb6f SHA1 e5cb8e0c63cbbd441aed3b1eb9968fdbaa69c6b9 SHA256 d48dcbc622dd5aaf8b06bdef78d69fb19d320490ab2a28c569788c201ecbc92a
-MISC ChangeLog 112983 RMD160 30993b22b194f3be496ae8ccf50d540b9a5ac418 SHA1 b3abbd24e8245b0a7fecd2491cf0827b0f7ff521 SHA256 92e9c5960166c44da7647247b7a84e313a3f464650b24fb09c1f5fa038de59a9
+EBUILD xorg-server-1.8.0.ebuild 8163 RMD160 256d04fae9d5a1f395479558d8ef53c0c5558299 SHA1 26c6e8befd90bf1f8a059914b03f00a0bad172f3 SHA256 a6b7a567f020a1feb343fdde0b9833c2e06b9d4079aa442bde9f0ac9c3f74530
+MISC ChangeLog 113107 RMD160 2398a86ae42f50f90155ec632b69c4817e502915 SHA1 a8ee3587532f9076a65572281ef4ec9fffd790c2 SHA256 a2ddbe82006df18f0935b8a345c2adffec267ae54afbd11ceb3facb93ec36ef7
 MISC metadata.xml 499 RMD160 13985f2e8ee45fa43d4689f4c09ae4d3c8fe7e59 SHA1 b84c2d3e23c3eae539fa1c37aa0e0345083bedea SHA256 f2f68c9cdaf48810cc035fb5b3bb3467569be2aabbe5eb74405b75427d5193ba

diff --git a/x11-base/xorg-server/xorg-server-1.8.0.ebuild b/x11-base/xorg-server/xorg-server-1.8.0.ebuild
index e5e892cec380e905c1f4eb6e4956738e7d3f0c5c..f64bea4083eb727073a1b9f9d044d650e747183c 100644 (file)
--- a/x11-base/xorg-server/xorg-server-1.8.0.ebuild
+++ b/x11-base/xorg-server/xorg-server-1.8.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 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.8.0.ebuild,v 1.5 2010/04/13 21:39:17 polynomial-c Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/xorg-server-1.8.0.ebuild,v 1.6 2010/04/13 21:56:38 polynomial-c Exp $
 
 EAPI=3
 XORG_EAUTORECONF="yes"
@@ -56,7 +56,7 @@ RDEPEND=">=app-admin/eselect-opengl-1.0.8
 
 DEPEND="${RDEPEND}
        !!net-dialup/dtrace
-       !<x11-apps/xinit-1.2.1
+       !<x11-apps/xinit-1.2.1-r1
        sys-devel/flex
        >=x11-proto/bigreqsproto-1.1.0
        >=x11-proto/compositeproto-0.4