Remove CVS tags from patch as they don't do anything but break installs.

Fixes bug #112476.
Package-Manager: portage-2.0.53_rc7

diff --git a/x11-base/xorg-server/ChangeLog b/x11-base/xorg-server/ChangeLog
index 951e93831cf38039c28f1f8ef5ab585aee3358c5..3c1f2797fe7b8483a8dcc5a93123612a5fc79ab4 100644 (file)
--- a/x11-base/xorg-server/ChangeLog
+++ b/x11-base/xorg-server/ChangeLog
@@ -1,6 +1,12 @@
 # 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.68 2005/11/14 01:05:34 joshuabaergen Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/ChangeLog,v 1.69 2005/11/14 16:37:02 joshuabaergen Exp $
+
+  14 Nov 2005; Joshua Baergen <joshuabaergen@gentoo.org>
+  +files/fix-xkb-compile-path-2.patch, -files/fix-xkb-compile-path.patch,
+  xorg-server-0.99.3-r1.ebuild:
+  Remove CVS tags from patch as they don't do anything but break installs.
+  Fixes bug #112476.
 
 *xorg-server-0.99.3-r1 (14 Nov 2005)
 

diff --git a/x11-base/xorg-server/Manifest b/x11-base/xorg-server/Manifest
index 5e641ea4b0a505453abdb23b0e7ce5d1632dd155..5189e5bf5bbffc734ec92042b0c951b5cf2b6f12 100644 (file)
--- a/x11-base/xorg-server/Manifest
+++ b/x11-base/xorg-server/Manifest
@@ -1,9 +1,9 @@
-MD5 dc0de1cb898c6f705174faf003dd64e4 ChangeLog 13671
+MD5 c3501e991bbc8f09e3a903e8f08510ad ChangeLog 13931
 MD5 a4667dca1eda69c90ff9dede2d1c4e00 files/digest-xorg-server-0.99.2-r2 137
 MD5 c2222f9d7528b5e753eca9c857b47bad files/digest-xorg-server-0.99.3 137
 MD5 c2222f9d7528b5e753eca9c857b47bad files/digest-xorg-server-0.99.3-r1 137
-MD5 edd703dc7be704bfdd20574e2636ab1b files/fix-xkb-compile-path.patch 1117
+MD5 a659ef5f3be42a4e35146f7026f65864 files/fix-xkb-compile-path-2.patch 710
 MD5 a37bab73e2f24b213932c30997d3d360 metadata.xml 156
 MD5 a01a1416152f751b32b2ac812defee06 xorg-server-0.99.2-r2.ebuild 4014
-MD5 f94bcd19e2c97055c8efcb8a139e9347 xorg-server-0.99.3-r1.ebuild 4067
+MD5 d30b118df9322a5d3546c74bed10fa97 xorg-server-0.99.3-r1.ebuild 4069
 MD5 c2c289a801304b85e5e623df89362c92 xorg-server-0.99.3.ebuild 4068

diff --git a/x11-base/xorg-server/files/fix-xkb-compile-path.patch b/x11-base/xorg-server/files/fix-xkb-compile-path-2.patch
similarity index 63%
rename from x11-base/xorg-server/files/fix-xkb-compile-path.patch
rename to x11-base/xorg-server/files/fix-xkb-compile-path-2.patch
index 5d027efca9f4d567a265aae3cfee67403392e0bd..649bb00814b809d7aa51e79feba77b1be38083e3 100644 (file)
--- a/x11-base/xorg-server/files/fix-xkb-compile-path.patch
+++ b/x11-base/xorg-server/files/fix-xkb-compile-path-2.patch
@@ -1,17 +1,8 @@
 ===================================================================
 RCS file: /cvs/xorg/xserver/xorg/configure.ac,v
-rcsdiff: /cvs/xorg/xserver/xorg/configure.ac,v: warning: Unknown phrases like `commitid ...;' are present.
-retrieving revision 1.124
-retrieving revision 1.125
 diff -u -r1.124 -r1.125
 --- configure.ac       2005/11/10 04:59:21     1.124
 +++ configure.ac       2005/11/14 00:01:34     1.125
-@@ -1,4 +1,4 @@
--dnl $Id: fix-xkb-compile-path.patch,v 1.1 2005/11/14 01:05:34 joshuabaergen Exp $
-+dnl $Id: fix-xkb-compile-path.patch,v 1.1 2005/11/14 01:05:34 joshuabaergen Exp $
- dnl
- dnl Copyright © 2003-2005 Keith Packard, Daniel Stone
- dnl
 @@ -353,7 +353,7 @@
                                [ XKBPATH="${datadir}/X11/xkb" ])
  AC_ARG_WITH(xkb-output,       AS_HELP_STRING([--with-xkb-output=PATH], [Path to XKB output dir (default: ${datadir}/X11/xkb/compiled)]),

diff --git a/x11-base/xorg-server/xorg-server-0.99.3-r1.ebuild b/x11-base/xorg-server/xorg-server-0.99.3-r1.ebuild
index db70cfb1a52064cf764ac0060674f5f459b7b0b4..28fec119aa4186c7c15ccda34d4813ab88341e7c 100644 (file)
--- a/x11-base/xorg-server/xorg-server-0.99.3-r1.ebuild
+++ b/x11-base/xorg-server/xorg-server-0.99.3-r1.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.3-r1.ebuild,v 1.1 2005/11/14 01:05:34 joshuabaergen Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/xorg-server-0.99.3-r1.ebuild,v 1.2 2005/11/14 16:37:02 joshuabaergen Exp $
 
 # Must be before x-modular eclass is inherited
 # Hack to make sure autoreconf gets run
@@ -15,7 +15,7 @@ MESA_PV="6.4"
 MESA_P="${MESA_PN}-${MESA_PV}"
 MESA_SRC_P="${MESA_PN}Lib-${MESA_PV}"
 
-PATCHES="${FILESDIR}/fix-xkb-compile-path.patch"
+PATCHES="${FILESDIR}/fix-xkb-compile-path-2.patch"
 
 SRC_URI="${SRC_URI}
        mirror://sourceforge/mesa3d/${MESA_SRC_P}.tar.bz2"