summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDonnie Berkholz <dberkholz@gentoo.org>2008-10-14 18:06:24 +0000
committerDonnie Berkholz <dberkholz@gentoo.org>2008-10-14 18:06:24 +0000
commit2c9c6fc4e1b434124b5b4a8f03198e394b6e25c9 (patch)
tree8f7860968aa9681d54dd05231a5889c05b628d83 /x11-base/xorg-x11
parentClean up old ebuilds. (diff)
downloadgentoo-2-2c9c6fc4e1b434124b5b4a8f03198e394b6e25c9.tar.gz
gentoo-2-2c9c6fc4e1b434124b5b4a8f03198e394b6e25c9.tar.bz2
gentoo-2-2c9c6fc4e1b434124b5b4a8f03198e394b6e25c9.zip
Pull in latest xorg-server (1.5.2) and xtrans (1.2.2). xorg-docs didn't get a 1.5 release so just pull in 1.4.
(Portage version: 2.2_rc12/cvs/Linux 2.6.27-rc9 x86_64)
Diffstat (limited to 'x11-base/xorg-x11')
-rw-r--r--x11-base/xorg-x11/ChangeLog6
-rw-r--r--x11-base/xorg-x11/xorg-x11-7.4.ebuild9
2 files changed, 9 insertions, 6 deletions
diff --git a/x11-base/xorg-x11/ChangeLog b/x11-base/xorg-x11/ChangeLog
index ad2b203f23b0..ed93f4c915a3 100644
--- a/x11-base/xorg-x11/ChangeLog
+++ b/x11-base/xorg-x11/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for x11-base/xorg-x11
# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-x11/ChangeLog,v 1.600 2008/10/04 16:20:18 corsair Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-x11/ChangeLog,v 1.601 2008/10/14 18:06:23 dberkholz Exp $
+
+ 14 Oct 2008; Donnie Berkholz <dberkholz@gentoo.org>; xorg-x11-7.4.ebuild:
+ Pull in latest xorg-server (1.5.2) and xtrans (1.2.2). xorg-docs didn't
+ get a 1.5 release so just pull in 1.4.
04 Oct 2008; Markus Rothe <corsair@gentoo.org> xorg-x11-7.4.ebuild:
Added ~ppc
diff --git a/x11-base/xorg-x11/xorg-x11-7.4.ebuild b/x11-base/xorg-x11/xorg-x11-7.4.ebuild
index 507271501479..41f359072e7d 100644
--- a/x11-base/xorg-x11/xorg-x11-7.4.ebuild
+++ b/x11-base/xorg-x11/xorg-x11-7.4.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2008 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-x11/xorg-x11-7.4.ebuild,v 1.6 2008/10/04 16:20:18 corsair Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-x11/xorg-x11-7.4.ebuild,v 1.7 2008/10/14 18:06:24 dberkholz Exp $
inherit eutils
@@ -16,7 +16,7 @@ RDEPEND="!<=x11-base/xorg-x11-6.9"
# Server
RDEPEND="${RDEPEND}
- >=x11-base/xorg-server-1.5.0"
+ >=x11-base/xorg-server-1.5.2"
# Applications
RDEPEND="${RDEPEND}
@@ -98,7 +98,7 @@ RDEPEND="${RDEPEND}
>=x11-libs/libfontenc-1.0.4
>=x11-libs/libpciaccess-0.10.3
>=x11-libs/libxkbfile-1.0.5
- >=x11-libs/xtrans-1.2.1
+ >=x11-libs/xtrans-1.2.2
"
# Protocol headers
@@ -192,9 +192,8 @@ RDEPEND="${RDEPEND}
# Documentation
RDEPEND="${RDEPEND}
>=app-doc/xorg-sgml-doctools-1.2
+ >=app-doc/xorg-docs-1.4
"
-# Not released yet
-# >=app-doc/xorg-docs-1.5.0
DEPEND="${RDEPEND}"