Use /etc/X11/X{modmap,resources} instead of /usr/lib/X11/xinit/... Fixes bug

#89624.  Reference: bug #25273 comment 8.
(Portage version: 2.0.51.22-r2)

5 files changed, 14 insertions, 7 deletions

diff --git a/x11-apps/xinit/ChangeLog b/x11-apps/xinit/ChangeLog
index c2980a9ca985..7c833b831610 100644
--- a/x11-apps/xinit/ChangeLog
+++ b/x11-apps/xinit/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for x11-apps/xinit
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-apps/xinit/ChangeLog,v 1.15 2005/09/07 23:22:47 joshuabaergen Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/xinit/ChangeLog,v 1.16 2005/09/08 23:19:55 joshuabaergen Exp $
+
+*xinit-0.99.1_pre20050905-r3 (08 Sep 2005)
+
+  08 Sep 2005; Joshua Baergen <joshuabaergen@gentoo.org> files/xinitrc,
+  -xinit-0.99.1_pre20050905-r2.ebuild, +xinit-0.99.1_pre20050905-r3.ebuild:
+  Use /etc/X11/X{modmap,resources} instead of /usr/lib/X11/xinit/...  Fixes bug
+  #89624.  Reference: bug #25273 comment 8.
 
 *xinit-0.99.1_pre20050905-r2 (07 Sep 2005)
 
diff --git a/x11-apps/xinit/Manifest b/x11-apps/xinit/Manifest
index c96928cfd8a7..f7f9154d3aba 100644
--- a/x11-apps/xinit/Manifest
+++ b/x11-apps/xinit/Manifest
@@ -1,13 +1,13 @@
-MD5 85f633e4a7b69f4091a4c2578158911e ChangeLog 2612
+MD5 682105d181e0342d91f8cad3e51a8a79 ChangeLog 2929
 MD5 09a425df6f174ca8cca3cd74057060cf xinit-0.99.0-r2.ebuild 936
-MD5 70dd251f70995b5f1bd7ae6873e82ab2 xinit-0.99.1_pre20050905-r2.ebuild 1251
+MD5 95c5b123e74b012751b281c2d63e8df6 xinit-0.99.1_pre20050905-r3.ebuild 1247
 MD5 a0ce0f1c8a5771a1194f5895211a3f66 files/Xsession 2187
 MD5 2b07bc84cc3afab6b4de90b9e9c597c3 files/chooser.sh 1566
 MD5 a2cf0fce1909bbe52e7485c8143baf66 files/digest-xinit-0.99.0-r2 64
 MD5 965333ca03efda8a7302620a63c429f6 files/startDM.sh 922
 MD5 2d8c9c76bd932f311ad86f490680d349 files/xdm.start 3418
-MD5 0d6bf670fd73b96de81daaca7aa1c460 files/xinitrc 910
+MD5 49f1bd860cfa5fc4adb6023d8a1bb4f8 files/xinitrc 900
 MD5 708a3daf8950bbfe3aa231efb7533cb0 files/xserver.pamd 125
-MD5 b6ebfe34cdd7df554f78ac7973192429 files/digest-xinit-0.99.1_pre20050905-r2 76
+MD5 b6ebfe34cdd7df554f78ac7973192429 files/digest-xinit-0.99.1_pre20050905-r3 76
 MD5 c6b1ec1d810ca971703b0cc7291d3e7c files/gentoo-startx-customization.patch 3931
 MD5 8d14d094be7182b9870a0727a5d8e87b files/nolisten-tcp-and-black-background.patch 381
diff --git a/x11-apps/xinit/files/digest-xinit-0.99.1_pre20050905-r2 b/x11-apps/xinit/files/digest-xinit-0.99.1_pre20050905-r3
index 0cff338e9903..0cff338e9903 100644
--- a/x11-apps/xinit/files/digest-xinit-0.99.1_pre20050905-r2
+++ b/x11-apps/xinit/files/digest-xinit-0.99.1_pre20050905-r3
diff --git a/x11-apps/xinit/files/xinitrc b/x11-apps/xinit/files/xinitrc
index 30d2e82b7339..f2ba1d79626b 100644
--- a/x11-apps/xinit/files/xinitrc
+++ b/x11-apps/xinit/files/xinitrc
@@ -3,7 +3,7 @@
 
 userresources=$HOME/.Xresources
 usermodmap=$HOME/.Xmodmap
-xinitdir=/usr/lib/X11/xinit
+xinitdir=/etc/X11
 sysresources=$xinitdir/Xresources
 sysmodmap=$xinitdir/Xmodmap
 
diff --git a/x11-apps/xinit/xinit-0.99.1_pre20050905-r2.ebuild b/x11-apps/xinit/xinit-0.99.1_pre20050905-r3.ebuild
index 6cb339487463..c35de5f892fc 100644
--- a/x11-apps/xinit/xinit-0.99.1_pre20050905-r2.ebuild
+++ b/x11-apps/xinit/xinit-0.99.1_pre20050905-r3.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-apps/xinit/xinit-0.99.1_pre20050905-r2.ebuild,v 1.1 2005/09/07 23:22:47 joshuabaergen Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/xinit/xinit-0.99.1_pre20050905-r3.ebuild,v 1.1 2005/09/08 23:19:55 joshuabaergen Exp $
 
 inherit versionator