PATCH_VER 2.1.25.7. No changes from .6, just fixing a corruption issue -- somehow an old, broken version of .6 got mirrored.

4 files changed, 24 insertions, 20 deletions

diff --git a/x11-base/xfree/ChangeLog b/x11-base/xfree/ChangeLog
index 36c47b367a8f..baa9cf252aed 100644
--- a/x11-base/xfree/ChangeLog
+++ b/x11-base/xfree/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for x11-base/xfree
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-base/xfree/ChangeLog,v 1.352 2004/07/17 00:09:36 tseng Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xfree/ChangeLog,v 1.353 2004/07/20 05:52:43 spyderous Exp $
+
+  20 Jul 2004; Donnie Berkholz <spyderous@gentoo.org>; xfree-4.3.0-r6.ebuild:
+  PATCH_VER 2.1.25.7. No changes from .6, just fixing a corruption issue --
+  somehow an old, broken version of .6 got mirrored.
 
   16 Jul 2004; Brandon Hale <tseng@gentoo.org> xfree-4.3.0-r6.ebuild:
   Revert to patchver 2.1.25.5 for now, see bug #57316. The digest is incorrect
diff --git a/x11-base/xfree/Manifest b/x11-base/xfree/Manifest
index 1e2f8de38692..071b938b259a 100644
--- a/x11-base/xfree/Manifest
+++ b/x11-base/xfree/Manifest
@@ -1,26 +1,26 @@
 MD5 e6ee387a2de6b2fea8e5a3573c48b667 metadata.xml 228
-MD5 b6f4249dc2f7054ffa4f783b0b7403f7 xfree-4.3.0-r5.ebuild 35306
-MD5 867d6a7d2082b31af94d22802e52bf1b ChangeLog 76574
-MD5 35ec74b39f637e787d63f7eb1180ffb3 xfree-4.3.0-r6.ebuild 35398
+MD5 e47e482e385effba842d2e2b2a0e7fc0 ChangeLog 76786
+MD5 45cc7480eb70bea0cbb181aafa4ba89b xfree-4.3.0-r6.ebuild 35402
 MD5 1af1513e6f04b1a43dd64b436991d211 xfree-4.3.0-r7.ebuild 39905
-MD5 8ef125d85e46c8618cd318e611d8f33c files/digest-xfree-4.3.0-r6 2002
-MD5 7fd6e890f5d2a756eb18123975ad7f49 files/digest-xfree-4.3.0-r5 2002
+MD5 b6f4249dc2f7054ffa4f783b0b7403f7 xfree-4.3.0-r5.ebuild 35306
 MD5 252c61d8b687ce1467ff95552c156c48 files/digest-xfree-4.3.0-r7 1528
-MD5 4485c7fa46907db803d219218f62a5df files/4.3.0/xinitrc 918
-MD5 1622d5777f1c7f058bd1f1b753636a18 files/4.3.0/xfs.conf.d 781
-MD5 c6dd3e9a9e557b9cba51ff77cb6108a4 files/4.3.0/Xsession 1521
-MD5 9cb44182ea92068b22973bcb0afda322 files/4.3.0/xserver.pamd 284
-MD5 d0cb338160e3be8790524af8071cc4df files/4.3.0/xdm.pamd 380
-MD5 e194f962a63f74c674887c9ade54a5ea files/4.3.0/site.def 3731
+MD5 51e5068e138c7820ebdab5441f6482a2 files/digest-xfree-4.3.0-r6 2002
+MD5 7fd6e890f5d2a756eb18123975ad7f49 files/digest-xfree-4.3.0-r5 2002
 MD5 2d22ba49943c630e4299f439d3a0d4cc files/4.3.0/XftConfig 7750
-MD5 ed0e218d82dbbb67fa4025e7b83974f1 files/4.3.0/xfs.start 6643
+MD5 c343ee3f0cbca24c7210773d483cfa15 files/4.3.0/10xfree 182
+MD5 c6dd3e9a9e557b9cba51ff77cb6108a4 files/4.3.0/Xsession 1521
 MD5 0e84cb8a3f7b821072b2a75482b83f97 files/4.3.0/Xsetup_0 880
+MD5 b2e6c7bec437a8c250fedccf9189f23b files/4.3.0/chooser.sh 1566
+MD5 e194f962a63f74c674887c9ade54a5ea files/4.3.0/site.def 3731
 MD5 e846eae6ddbcd3bd5e4c426c80a5f687 files/4.3.0/startDM.sh 889
+MD5 d0cb338160e3be8790524af8071cc4df files/4.3.0/xdm.pamd 380
 MD5 e84c45b905dcd89a9f1462a88d15aa12 files/4.3.0/xdm.start 2827
+MD5 1622d5777f1c7f058bd1f1b753636a18 files/4.3.0/xfs.conf.d 781
 MD5 55ed160cbb7076b1292ea8e3772a2761 files/4.3.0/xfs.config 1331
-MD5 c343ee3f0cbca24c7210773d483cfa15 files/4.3.0/10xfree 182
-MD5 b2e6c7bec437a8c250fedccf9189f23b files/4.3.0/chooser.sh 1566
+MD5 ed0e218d82dbbb67fa4025e7b83974f1 files/4.3.0/xfs.start 6643
+MD5 4485c7fa46907db803d219218f62a5df files/4.3.0/xinitrc 918
+MD5 9cb44182ea92068b22973bcb0afda322 files/4.3.0/xserver.pamd 284
+MD5 a0ce0f1c8a5771a1194f5895211a3f66 files/4.3.0/Sessions/Xsession 2187
+MD5 ee55a387073cca1b14f1b285e1cf33a9 files/4.3.0/lib/libGL.la 777
 MD5 18e1ac4e97a57fdba470897aa2cb452e files/4.3.0/lib/libGLU.la 769
 MD5 b2c509837ddfbd12d8f1ed9b50254f01 files/4.3.0/lib/libOSMesa.la 788
-MD5 ee55a387073cca1b14f1b285e1cf33a9 files/4.3.0/lib/libGL.la 777
-MD5 a0ce0f1c8a5771a1194f5895211a3f66 files/4.3.0/Sessions/Xsession 2187
diff --git a/x11-base/xfree/files/digest-xfree-4.3.0-r6 b/x11-base/xfree/files/digest-xfree-4.3.0-r6
index b12b8c3699ca..b05ca91fdd3f 100644
--- a/x11-base/xfree/files/digest-xfree-4.3.0-r6
+++ b/x11-base/xfree/files/digest-xfree-4.3.0-r6
@@ -5,7 +5,7 @@ MD5 567903747018f2534965ab6cb3976b38 X430src-4.tgz 12906091
 MD5 4dbdbe9a85c8f7f98dd0ee015a3c7b4f X430src-5.tgz 4388018
 MD5 163d9864e1353a4a9f992cb3843c240f X430src-6.tgz 8074919
 MD5 e002e70f24098ca4f62fabd1c2809ed1 X430src-7.tgz 9317241
-MD5 6c3e4a3a2fb0ab6ceb2c763c20581c58 XFree86-4.3.0-patches-2.1.25.5.tar.bz2 552490
+MD5 d5cb5c7f388b483a6d746ff9fe0843b5 XFree86-4.3.0-patches-2.1.25.7.tar.bz2 554397
 MD5 e0c52f0e726e20db445e9708665a26d4 xfree86-dri-resume-v8.patch 15333
 MD5 222bffcae6c2be37ec5cd993037f4f45 xf86Wacom.c.gz 26156
 MD5 537bb3e2da7642bd979ebc1cafa8dce7 savage-1.1.27t.zip 76974
diff --git a/x11-base/xfree/xfree-4.3.0-r6.ebuild b/x11-base/xfree/xfree-4.3.0-r6.ebuild
index a233c34cfc2f..1305a1a0b1c4 100644
--- a/x11-base/xfree/xfree-4.3.0-r6.ebuild
+++ b/x11-base/xfree/xfree-4.3.0-r6.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-base/xfree/xfree-4.3.0-r6.ebuild,v 1.48 2004/07/17 00:09:36 tseng Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xfree/xfree-4.3.0-r6.ebuild,v 1.49 2004/07/20 05:52:43 spyderous Exp $
 
 inherit eutils flag-o-matic gcc xfree
 
@@ -50,7 +50,7 @@ fi
 # Are we using a snapshot ?
 USE_SNAPSHOT="no"
 
-PATCH_VER="2.1.25.5"
+PATCH_VER="2.1.25.7"
 FT2_VER="2.1.3"
 XCUR_VER="0.3.1"
 SISDRV_VER="311003-1"