summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTomas Chvatal <scarabeus@gentoo.org>2009-10-29 22:02:24 +0000
committerTomas Chvatal <scarabeus@gentoo.org>2009-10-29 22:02:24 +0000
commita4b0f2a7f8bbe302bd18d3d23956b5578820443e (patch)
treee39978bdf345df2d6dcddb784088b0c10089824b /x11-base/xorg-server
parentNew version for GNOME 2.28. (diff)
downloadhistorical-a4b0f2a7f8bbe302bd18d3d23956b5578820443e.tar.gz
historical-a4b0f2a7f8bbe302bd18d3d23956b5578820443e.tar.bz2
historical-a4b0f2a7f8bbe302bd18d3d23956b5578820443e.zip
Drop down the added blockers since they does not work how i expected.
Package-Manager: portage-2.2_rc46/cvs/Linux i686 RepoMan-Options: --force
Diffstat (limited to 'x11-base/xorg-server')
-rw-r--r--x11-base/xorg-server/ChangeLog6
-rw-r--r--x11-base/xorg-server/Manifest10
-rw-r--r--x11-base/xorg-server/xorg-server-1.6.5.ebuild27
3 files changed, 12 insertions, 31 deletions
diff --git a/x11-base/xorg-server/ChangeLog b/x11-base/xorg-server/ChangeLog
index 1e90dcd52ab9..b926a1abfed9 100644
--- a/x11-base/xorg-server/ChangeLog
+++ b/x11-base/xorg-server/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for x11-base/xorg-server
# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/ChangeLog,v 1.460 2009/10/29 10:50:10 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/ChangeLog,v 1.461 2009/10/29 22:02:24 scarabeus Exp $
+
+ 29 Oct 2009; Tomáš Chvátal <scarabeus@gentoo.org>
+ xorg-server-1.6.5.ebuild:
+ Drop down the added blockers since they does not work how i expected.
29 Oct 2009; Rémi Cardona <remi@gentoo.org> xorg-server-1.7.1.ebuild:
sync with the overlay, update dmx deps (fixes bug #290866)
diff --git a/x11-base/xorg-server/Manifest b/x11-base/xorg-server/Manifest
index f7945ce5b527..2196ea871845 100644
--- a/x11-base/xorg-server/Manifest
+++ b/x11-base/xorg-server/Manifest
@@ -15,14 +15,14 @@ EBUILD xorg-server-1.5.3-r6.ebuild 15760 RMD160 82e5a893c835ef0b3b9cad8e20cd2f38
EBUILD xorg-server-1.5.3-r7.ebuild 15862 RMD160 90ff9fcc140d8578531418669607bdb042af144b SHA1 44d104f7b8f415eb50505ff83c292a087ef34caf SHA256 7762b1b300f0648c479d1e265e9431052a081d641d32ab3541e9e8b44d2498d8
EBUILD xorg-server-1.6.3.901-r2.ebuild 7085 RMD160 dfbe7f6ae95bf99fc3d610f23d1dbdbec3c95f66 SHA1 9c7a5bda2ecd578145d96863e155e264da028370 SHA256 298b6c1c78e39f902cb08a671ff66cd4479fc11147095e4f7c14e4926685f4e5
EBUILD xorg-server-1.6.4.ebuild 6908 RMD160 8ae1016f592701b383c37416a55c0eaeaec9a42d SHA1 8e0dc15c81c5cde1a9b980fbba291f96c4906113 SHA256 4b9f18c849e0f9641864668ec362369fa28e4c3f00ba2f16d8b3d1925d3d40c6
-EBUILD xorg-server-1.6.5.ebuild 7613 RMD160 a277eae18ac3bca4412d710776aaf9bc452eabdc SHA1 cb35e6077dc47988b8c88e53dccca4d5a72b375c SHA256 87fce2e662773ab9635f9f5232785eec5c2285263a037d584e613b25ed608497
+EBUILD xorg-server-1.6.5.ebuild 6870 RMD160 6caca72750504aa7439fdf56f652e13cef55da7f SHA1 be34e22e5ccf628989a66fdcd991a37c5679493c SHA256 a9fc8338a7571fe6043db1fd2f311c5b54abf6816b1a57e9b5c3fafa56f4f514
EBUILD xorg-server-1.7.1.ebuild 6862 RMD160 7713fdf22c224a75c53c7ceadcd735b56317cb84 SHA1 71df1278e7864d4c07e967d4de96f3b0b7647629 SHA256 ae37fb9bbec38d3a5cad764a5b00aae5a211295d959c84e32dfbdc10d74d690f
-MISC ChangeLog 106170 RMD160 0829689d518855fbf6b97d3f9f72f4fe5227ab27 SHA1 ccbf2a9a96e4d0eabb78f8a7f6e7e0ac637444bc SHA256 a4413db4f02ee0b5ca1c8c1bcbdb08c5754df010993bcb62887bbb0a7ce1555a
+MISC ChangeLog 106326 RMD160 1f519d2f5cbafe3cbe55940d6c40a4ad6da67eca SHA1 e3819855e54148b99396f7da789a9b28bbdd6623 SHA256 51f4dd442a2b9fa9bb2b3298b628944d5553d258e78ca91231b33a60a8c9d7c5
MISC metadata.xml 439 RMD160 c96c2c91bc0374b9ec854aec534988afa77cd42c SHA1 631c118285d63e25d63c21487ecac7a05a8304f0 SHA256 cc8d98da43263c08185727cdc0848c5182d54145d5f9caa908294b7d4ef4ed7b
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.13 (GNU/Linux)
-iEYEARECAAYFAkrpc3UACgkQHB6c3gNBRYc47ACghCsiVa3jXxdG3Aow/lhSqfhz
-OIwAn2J410PWMkOkFl7F1FgaHzmR6sOi
-=h+4W
+iEYEARECAAYFAkrqEQQACgkQHB6c3gNBRYeTYwCeMBFg6+NDrJFRXN3ocYhdac1L
+URcAn2prAesynTe/f0B68y5vvwLQiPil
+=2JfO
-----END PGP SIGNATURE-----
diff --git a/x11-base/xorg-server/xorg-server-1.6.5.ebuild b/x11-base/xorg-server/xorg-server-1.6.5.ebuild
index 4cf4b1cbfe17..fb869f08f407 100644
--- a/x11-base/xorg-server/xorg-server-1.6.5.ebuild
+++ b/x11-base/xorg-server/xorg-server-1.6.5.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2009 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.6.5.ebuild,v 1.2 2009/10/29 10:50:10 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/xorg-server-1.6.5.ebuild,v 1.3 2009/10/29 22:02:24 scarabeus Exp $
EAPI="2"
@@ -20,30 +20,7 @@ KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-
IUSE_SERVERS="dmx kdrive xorg"
IUSE="${IUSE_SERVERS} tslib hal ipv6 minimal nptl sdl"
-RDEP_XORG_BLOCKERS="!>=x11-apps/xinput-1.5.0
- !>=x11-base/xorg-drivers-1.7
- !>=x11-base/xorg-server-1.7.1
- !>=x11-libs/libX11-1.3.2
- !>=x11-libs/libXScrnSaver-1.2.0
- !>=x11-libs/libXext-1.1.1
- !>=x11-libs/libXi-1.3
- !>=x11-libs/libXinerama-1.1
- !>=x11-libs/libXtst-1.1.0
- !>=x11-libs/libXxf86dga-1.1.1
- !>=x11-libs/libXxf86vm-1.1.0
- !>=x11-proto/bigreqsproto-1.1.0
- !>=x11-proto/fixesproto-4.1.1
- !>=x11-proto/inputproto-2.0
- !>=x11-proto/recordproto-1.14
- !>=x11-proto/scrnsaverproto-1.2.0
- !>=x11-proto/xcmiscproto-1.2.0
- !>=x11-proto/xextproto-7.1.1
- !>=x11-proto/xf86bigfontproto-1.2.0
- !>=x11-proto/xf86dgaproto-2.1
- !>=x11-proto/xf86driproto-2.1.0
- !>=x11-proto/xf86vidmodeproto-2.3
- !>=x11-proto/xineramaproto-1.2"
-RDEPEND="${RDEP_XORG_BLOCKERS}
+RDEPEND="
hal? ( sys-apps/hal )
tslib? ( >=x11-libs/tslib-1.0 x11-proto/xcalibrateproto )
dev-libs/openssl