| 1 |
scarabeus 09/10/29 10:50:11 |
| 2 |
|
| 3 |
Modified: ChangeLog xorg-server-1.6.5.ebuild |
| 4 |
Log: |
| 5 |
Add proper blockers for xorg-7.5 stuff we dont want with xorg-server-1.6. Per bug #290739. |
| 6 |
(Portage version: 2.2_rc46/cvs/Linux i686, RepoMan options: --force) |
| 7 |
|
| 8 |
Revision Changes Path |
| 9 |
1.460 x11-base/xorg-server/ChangeLog |
| 10 |
|
| 11 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-base/xorg-server/ChangeLog?rev=1.460&view=markup |
| 12 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-base/xorg-server/ChangeLog?rev=1.460&content-type=text/plain |
| 13 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-base/xorg-server/ChangeLog?r1=1.459&r2=1.460 |
| 14 |
|
| 15 |
Index: ChangeLog |
| 16 |
=================================================================== |
| 17 |
RCS file: /var/cvsroot/gentoo-x86/x11-base/xorg-server/ChangeLog,v |
| 18 |
retrieving revision 1.459 |
| 19 |
retrieving revision 1.460 |
| 20 |
diff -u -r1.459 -r1.460 |
| 21 |
--- ChangeLog 29 Oct 2009 10:45:04 -0000 1.459 |
| 22 |
+++ ChangeLog 29 Oct 2009 10:50:10 -0000 1.460 |
| 23 |
@@ -1,10 +1,15 @@ |
| 24 |
# ChangeLog for x11-base/xorg-server |
| 25 |
# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 |
| 26 |
-# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/ChangeLog,v 1.459 2009/10/29 10:45:04 remi Exp $ |
| 27 |
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/ChangeLog,v 1.460 2009/10/29 10:50:10 scarabeus Exp $ |
| 28 |
|
| 29 |
29 Oct 2009; Rémi Cardona <remi@g.o> xorg-server-1.7.1.ebuild: |
| 30 |
sync with the overlay, update dmx deps (fixes bug #290866) |
| 31 |
|
| 32 |
+ 29 Oct 2009; Tomáš Chvátal <scarabeus@g.o> |
| 33 |
+ xorg-server-1.6.5.ebuild: |
| 34 |
+ Add proper blockers for xorg-7.5 stuff we dont want with xorg-server-1.6. |
| 35 |
+ Per bug #290739. |
| 36 |
+ |
| 37 |
26 Oct 2009; Jeroen Roovers <jer@g.o> |
| 38 |
xorg-server-1.6.3.901-r2.ebuild: |
| 39 |
Stable for HPPA (bug #282290). |
| 40 |
|
| 41 |
|
| 42 |
|
| 43 |
1.2 x11-base/xorg-server/xorg-server-1.6.5.ebuild |
| 44 |
|
| 45 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-base/xorg-server/xorg-server-1.6.5.ebuild?rev=1.2&view=markup |
| 46 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-base/xorg-server/xorg-server-1.6.5.ebuild?rev=1.2&content-type=text/plain |
| 47 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-base/xorg-server/xorg-server-1.6.5.ebuild?r1=1.1&r2=1.2 |
| 48 |
|
| 49 |
Index: xorg-server-1.6.5.ebuild |
| 50 |
=================================================================== |
| 51 |
RCS file: /var/cvsroot/gentoo-x86/x11-base/xorg-server/xorg-server-1.6.5.ebuild,v |
| 52 |
retrieving revision 1.1 |
| 53 |
retrieving revision 1.2 |
| 54 |
diff -u -r1.1 -r1.2 |
| 55 |
--- xorg-server-1.6.5.ebuild 12 Oct 2009 08:19:07 -0000 1.1 |
| 56 |
+++ xorg-server-1.6.5.ebuild 29 Oct 2009 10:50:10 -0000 1.2 |
| 57 |
@@ -1,6 +1,6 @@ |
| 58 |
# Copyright 1999-2009 Gentoo Foundation |
| 59 |
# Distributed under the terms of the GNU General Public License v2 |
| 60 |
-# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/xorg-server-1.6.5.ebuild,v 1.1 2009/10/12 08:19:07 remi Exp $ |
| 61 |
+# $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 $ |
| 62 |
|
| 63 |
EAPI="2" |
| 64 |
|
| 65 |
@@ -19,7 +19,32 @@ |
| 66 |
|
| 67 |
IUSE_SERVERS="dmx kdrive xorg" |
| 68 |
IUSE="${IUSE_SERVERS} tslib hal ipv6 minimal nptl sdl" |
| 69 |
-RDEPEND="hal? ( sys-apps/hal ) |
| 70 |
+ |
| 71 |
+RDEP_XORG_BLOCKERS="!>=x11-apps/xinput-1.5.0 |
| 72 |
+ !>=x11-base/xorg-drivers-1.7 |
| 73 |
+ !>=x11-base/xorg-server-1.7.1 |
| 74 |
+ !>=x11-libs/libX11-1.3.2 |
| 75 |
+ !>=x11-libs/libXScrnSaver-1.2.0 |
| 76 |
+ !>=x11-libs/libXext-1.1.1 |
| 77 |
+ !>=x11-libs/libXi-1.3 |
| 78 |
+ !>=x11-libs/libXinerama-1.1 |
| 79 |
+ !>=x11-libs/libXtst-1.1.0 |
| 80 |
+ !>=x11-libs/libXxf86dga-1.1.1 |
| 81 |
+ !>=x11-libs/libXxf86vm-1.1.0 |
| 82 |
+ !>=x11-proto/bigreqsproto-1.1.0 |
| 83 |
+ !>=x11-proto/fixesproto-4.1.1 |
| 84 |
+ !>=x11-proto/inputproto-2.0 |
| 85 |
+ !>=x11-proto/recordproto-1.14 |
| 86 |
+ !>=x11-proto/scrnsaverproto-1.2.0 |
| 87 |
+ !>=x11-proto/xcmiscproto-1.2.0 |
| 88 |
+ !>=x11-proto/xextproto-7.1.1 |
| 89 |
+ !>=x11-proto/xf86bigfontproto-1.2.0 |
| 90 |
+ !>=x11-proto/xf86dgaproto-2.1 |
| 91 |
+ !>=x11-proto/xf86driproto-2.1.0 |
| 92 |
+ !>=x11-proto/xf86vidmodeproto-2.3 |
| 93 |
+ !>=x11-proto/xineramaproto-1.2" |
| 94 |
+RDEPEND="${RDEP_XORG_BLOCKERS} |
| 95 |
+ hal? ( sys-apps/hal ) |
| 96 |
tslib? ( >=x11-libs/tslib-1.0 x11-proto/xcalibrateproto ) |
| 97 |
dev-libs/openssl |
| 98 |
>=x11-libs/libXfont-1.4.0 |
Archives