Fileset 0.5 for 6.8.2-r2, fileset 0.2 for 6.8.99.13. (#80225) Remove Gentoo-specific code from Xsetup_0 and start installing upstream version instead.

(Portage version: 2.0.51.22-r1)

5 files changed, 15 insertions, 9 deletions

diff --git a/x11-base/xorg-x11/ChangeLog b/x11-base/xorg-x11/ChangeLog
index 9a5436847318..786cdf6a3aa7 100644
--- a/x11-base/xorg-x11/ChangeLog
+++ b/x11-base/xorg-x11/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for x11-base/xorg-x11
 # Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-x11/ChangeLog,v 1.414 2005/06/28 06:03:39 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-x11/ChangeLog,v 1.415 2005/06/29 01:11:01 spyderous Exp $
+
+  29 Jun 2005; Donnie Berkholz <spyderous@gentoo.org>;
+  xorg-x11-6.8.2-r2.ebuild, xorg-x11-6.8.99.13.ebuild:
+  Fileset 0.5 for 6.8.2-r2, fileset 0.2 for 6.8.99.13. (#80225) Remove
+  Gentoo-specific code from Xsetup_0 and start installing upstream version
+  instead.
 
   28 Jun 2005; Donnie Berkholz <spyderous@gentoo.org>;
   xorg-x11-6.8.2-r2.ebuild, xorg-x11-6.8.99.13.ebuild:
diff --git a/x11-base/xorg-x11/files/digest-xorg-x11-6.8.2-r2 b/x11-base/xorg-x11/files/digest-xorg-x11-6.8.2-r2
index bce81f149e51..3d6b97da7ca3 100644
--- a/x11-base/xorg-x11/files/digest-xorg-x11-6.8.2-r2
+++ b/x11-base/xorg-x11/files/digest-xorg-x11-6.8.2-r2
@@ -2,6 +2,6 @@ MD5 4d7d5fdc4ed56c144ef998302581478c eurofonts-X11.tar.bz2 8811
 MD5 01a21c248e5ac4ba02cbbea994fc774a xfsft-encodings-0.1.tar.bz2 11892
 MD5 d0fab996daf97adf095e2dad0bd9012e gentoo-cursors-tad-0.3.1.tar.bz2 1196991
 MD5 3d4ee581df78c9dacc6e97aa07a1af72 gemini-koi8-u.tar.bz2 439173
-MD5 380b3a8dd4e602aa0893d6c0c9e1ce0d xorg-x11-6.8.2-files-0.4.tar.bz2 10103
+MD5 a06a57347e84a0e6e77b94a2a5d28427 xorg-x11-6.8.2-files-0.5.tar.bz2 9742
 MD5 56ffc5bec1cd3b7fdadcb16c122fb7dd xorg-x11-6.8.2-patches-0.1.6.tar.bz2 162832
 MD5 8131cd7ea1e4566e6e05c438a93fcfe1 X11R6.8.2-src.tar.bz2 44371402
diff --git a/x11-base/xorg-x11/files/digest-xorg-x11-6.8.99.13 b/x11-base/xorg-x11/files/digest-xorg-x11-6.8.99.13
index 30c883b6d3a3..995e42acac68 100644
--- a/x11-base/xorg-x11/files/digest-xorg-x11-6.8.99.13
+++ b/x11-base/xorg-x11/files/digest-xorg-x11-6.8.99.13
@@ -2,6 +2,6 @@ MD5 4d7d5fdc4ed56c144ef998302581478c eurofonts-X11.tar.bz2 8811
 MD5 01a21c248e5ac4ba02cbbea994fc774a xfsft-encodings-0.1.tar.bz2 11892
 MD5 d0fab996daf97adf095e2dad0bd9012e gentoo-cursors-tad-0.3.1.tar.bz2 1196991
 MD5 3d4ee581df78c9dacc6e97aa07a1af72 gemini-koi8-u.tar.bz2 439173
-MD5 bbb645b2570915516f871295dd3deaee xorg-x11-6.8.99.13-files-0.1.tar.bz2 10097
+MD5 69204953eae88c6733a5f42881baf49b xorg-x11-6.8.99.13-files-0.2.tar.bz2 9757
 MD5 0dead2c6a3e1afdde88075f0894305d7 xorg-x11-6.8.99.13-patches-0.1.1.tar.bz2 118991
 MD5 14781aa072a633678bc65a7a55e58f74 xorg-x11-6.8.99.13.tar.bz2 45016561
diff --git a/x11-base/xorg-x11/xorg-x11-6.8.2-r2.ebuild b/x11-base/xorg-x11/xorg-x11-6.8.2-r2.ebuild
index d23e677b5273..1320e8db28d8 100644
--- a/x11-base/xorg-x11/xorg-x11-6.8.2-r2.ebuild
+++ b/x11-base/xorg-x11/xorg-x11-6.8.2-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-x11/xorg-x11-6.8.2-r2.ebuild,v 1.30 2005/06/28 06:03:39 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-x11/xorg-x11-6.8.2-r2.ebuild,v 1.31 2005/06/29 01:11:01 spyderous Exp $
 
 # Set TDFX_RISKY to "yes" to get 16-bit, 1024x768 or higher on low-memory
 # voodoo3 cards.
@@ -37,7 +37,7 @@ IUSE="3dfx 3dnow bitmap-fonts cjk debug dlloader dmx doc font-server
 	truetype-fonts type1-fonts uclibc xprint xv"
 # IUSE_INPUT_DEVICES="synaptics wacom"
 
-FILES_VER="0.4"
+FILES_VER="0.5"
 PATCH_VER="0.1.6"
 XCUR_VER="0.3.1"
 XFSFT_ENC_VER="0.1"
@@ -1196,7 +1196,7 @@ etc_files_install() {
 	doins ${FILES_DIR}/xinitrc
 	if ! use minimal; then
 		exeinto /etc/X11/xdm
-		doexe ${FILES_DIR}/Xsession ${FILES_DIR}/Xsetup_0
+		doexe ${FILES_DIR}/Xsession
 		exeinto /etc/init.d
 		newexe ${FILES_DIR}/xdm.start xdm
 	fi
diff --git a/x11-base/xorg-x11/xorg-x11-6.8.99.13.ebuild b/x11-base/xorg-x11/xorg-x11-6.8.99.13.ebuild
index 0881709cbc41..4e3c910b3f73 100644
--- a/x11-base/xorg-x11/xorg-x11-6.8.99.13.ebuild
+++ b/x11-base/xorg-x11/xorg-x11-6.8.99.13.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-x11/xorg-x11-6.8.99.13.ebuild,v 1.4 2005/06/28 06:03:39 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-x11/xorg-x11-6.8.99.13.ebuild,v 1.5 2005/06/29 01:11:01 spyderous Exp $
 
 # Set TDFX_RISKY to "yes" to get 16-bit, 1024x768 or higher on low-memory
 # voodoo3 cards.
@@ -37,7 +37,7 @@ IUSE="3dfx 3dnow bitmap-fonts cjk debug dlloader dmx doc font-server
 	truetype-fonts type1-fonts uclibc xprint xv"
 # IUSE_INPUT_DEVICES="synaptics wacom"
 
-FILES_VER="0.1"
+FILES_VER="0.2"
 PATCH_VER="0.1.1"
 XCUR_VER="0.3.1"
 XFSFT_ENC_VER="0.1"
@@ -1207,7 +1207,7 @@ etc_files_install() {
 	doins ${FILES_DIR}/xinitrc
 	if ! use minimal; then
 		exeinto /etc/X11/xdm
-		doexe ${FILES_DIR}/Xsession ${FILES_DIR}/Xsetup_0
+		doexe ${FILES_DIR}/Xsession
 		exeinto /etc/init.d
 		newexe ${FILES_DIR}/xdm.start xdm
 	fi