summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--x11-base/xorg-server/ChangeLog6
-rw-r--r--x11-base/xorg-server/files/digest-xorg-server-0.99.1-r22
-rw-r--r--x11-base/xorg-server/xorg-server-0.99.1-r2.ebuild6
3 files changed, 9 insertions, 5 deletions
diff --git a/x11-base/xorg-server/ChangeLog b/x11-base/xorg-server/ChangeLog
index 881de399dd67..06d1bab6e373 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-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/ChangeLog,v 1.14 2005/08/12 17:12:12 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/ChangeLog,v 1.15 2005/08/12 18:41:05 spyderous Exp $
+
+ 12 Aug 2005; Donnie Berkholz <spyderous@gentoo.org>;
+ xorg-server-0.99.1-r2.ebuild:
+ Fix the patch that mysteriously broke.
12 Aug 2005; Donnie Berkholz <spyderous@gentoo.org>;
+files/check-for-glproto.patch, +files/fix-xf86misc-typo.patch,
diff --git a/x11-base/xorg-server/files/digest-xorg-server-0.99.1-r2 b/x11-base/xorg-server/files/digest-xorg-server-0.99.1-r2
index 3ca5643950ac..2b2f4f2f5a24 100644
--- a/x11-base/xorg-server/files/digest-xorg-server-0.99.1-r2
+++ b/x11-base/xorg-server/files/digest-xorg-server-0.99.1-r2
@@ -1,3 +1,3 @@
MD5 ae556a5fa66cb9871cd9eb93bcc908ad xorg-server-0.99.1.tar.bz2 3602415
MD5 9e05f987ec79f6374457bea343b063c2 Mesa-6.3.1.1.tar.gz 6379711
-MD5 1f874cf8925651a6b984b467b03e4c94 xorg-server-0.99.1-update-to-CVS-HEAD-20050811.patch.gz 406495
+MD5 0e0f7c327a15e6b939770fec6a852848 xorg-server-0.99.1-update-to-CVS-HEAD-20050811-1.patch.gz 406372
diff --git a/x11-base/xorg-server/xorg-server-0.99.1-r2.ebuild b/x11-base/xorg-server/xorg-server-0.99.1-r2.ebuild
index f6f2675d49bd..5795916d3669 100644
--- a/x11-base/xorg-server/xorg-server-0.99.1-r2.ebuild
+++ b/x11-base/xorg-server/xorg-server-0.99.1-r2.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2005 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/xorg-server-0.99.1-r2.ebuild,v 1.3 2005/08/12 17:12:12 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/xorg-server-0.99.1-r2.ebuild,v 1.4 2005/08/12 18:41:05 spyderous Exp $
# Must be before x-modular eclass is inherited
# Hack to make sure autoreconf gets run
@@ -14,13 +14,13 @@ MESA_PN="Mesa"
MESA_PV="6.3.1.1"
MESA_P="${MESA_PN}-${MESA_PV}"
-PATCHES="${FILESDIR}/xorg-server-0.99.1-update-to-CVS-HEAD-20050811.patch
+PATCHES="${WORKDIR}/xorg-server-0.99.1-update-to-CVS-HEAD-20050811-1.patch
${FILESDIR}/check-for-glproto.patch
${FILESDIR}/fix-xf86misc-typo.patch"
SRC_URI="${SRC_URI}
glx? ( http://xorg.freedesktop.org/extras/${MESA_P}.tar.gz )
- http://dev.gentoo.org/~spyderous/xorg-x11/xorg-server-0.99.1-update-to-CVS-HEAD-20050811.patch.gz"
+ http://dev.gentoo.org/~spyderous/xorg-x11/xorg-server-0.99.1-update-to-CVS-HEAD-20050811-1.patch.gz"
DESCRIPTION="X.Org X servers"
KEYWORDS="~sparc ~x86"
IUSE="glx dri xinerama ipv6 minimal"