diff options
| author |   Donnie Berkholz <dberkholz@gentoo.org> | 2004-06-02 06:17:56 +0000 |
|---|---|---|
| committer | Donnie Berkholz <dberkholz@gentoo.org> | 2004-06-02 06:17:56 +0000 |
| commit | c389e362a99ae1aa6fb30081345e7dc5d9d4009b (patch) | |
| tree | e75fa9a9aeeeeed199ef158f9a56f121f3004855 /x11-base | |
| parent | clean older ebuild (diff) | |
| download | historical-c389e362a99ae1aa6fb30081345e7dc5d9d4009b.tar.gz historical-c389e362a99ae1aa6fb30081345e7dc5d9d4009b.tar.bz2 historical-c389e362a99ae1aa6fb30081345e7dc5d9d4009b.zip | |
Work around upgrade problem where people have Option "XkbRules" "xfree86" in their config file.
Diffstat (limited to 'x11-base')
| -rw-r--r-- | x11-base/xorg-x11/ChangeLog | 6 | ||||
| -rw-r--r-- | x11-base/xorg-x11/Manifest | 4 | ||||
| -rw-r--r-- | x11-base/xorg-x11/xorg-x11-6.7.0.ebuild | 11 |
3 files changed, 17 insertions, 4 deletions
diff --git a/x11-base/xorg-x11/ChangeLog b/x11-base/xorg-x11/ChangeLog index cf23703e24d0..fe4c76fd9b27 100644 --- a/x11-base/xorg-x11/ChangeLog +++ b/x11-base/xorg-x11/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for x11-base/xorg-x11 # Copyright 2000-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-x11/ChangeLog,v 1.42 2004/06/01 06:21:19 spyderous Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-x11/ChangeLog,v 1.43 2004/06/02 06:17:56 spyderous Exp $ + + 02 Jun 2004; Donnie Berkholz <spyderous@gentoo.org>; xorg-x11-6.7.0.ebuild: + Work around upgrade problem where people have Option "XkbRules" "xfree86" in + their config file. 01 Jun 2004; Donnie Berkholz <spyderous@gentoo.org>; xorg-x11-6.7.0.ebuild: Prevent -fomit-frame-pointer and k6 flags from being used together (#49310). diff --git a/x11-base/xorg-x11/Manifest b/x11-base/xorg-x11/Manifest index 480bb5f65549..a0e55b56e548 100644 --- a/x11-base/xorg-x11/Manifest +++ b/x11-base/xorg-x11/Manifest @@ -1,4 +1,4 @@ MD5 f33d86266389c80f7f24467eef8552e7 metadata.xml 232 -MD5 c68af8929b27b8d56c5cf17c2b85f69a ChangeLog 7132 -MD5 18e14cde0ab4325d3444002fa9857133 xorg-x11-6.7.0.ebuild 39923 +MD5 863233971f931666e034f4fbc54710fd ChangeLog 7311 +MD5 d207626bd9082458ef761b8ba3ea34c9 xorg-x11-6.7.0.ebuild 40280 MD5 086afe432124eabb3d1964e91a432a57 files/digest-xorg-x11-6.7.0 904 diff --git a/x11-base/xorg-x11/xorg-x11-6.7.0.ebuild b/x11-base/xorg-x11/xorg-x11-6.7.0.ebuild index 15f481398635..261bf98425bb 100644 --- a/x11-base/xorg-x11/xorg-x11-6.7.0.ebuild +++ b/x11-base/xorg-x11/xorg-x11-6.7.0.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2004 Gentoo Technologies, Inc. # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-x11/xorg-x11-6.7.0.ebuild,v 1.44 2004/06/01 18:44:07 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-x11/xorg-x11-6.7.0.ebuild,v 1.45 2004/06/02 06:17:56 spyderous Exp $ # This is a snapshot of the XORG-RELEASE-1 branch. @@ -1028,6 +1028,10 @@ EOF sed -i "s:/usr/X116/lib/X11/fonts:/usr/share/fonts:g" \ ${D}/etc/X11/fs/config + # Work around upgrade problem where people have + # Option "XkbRules" "xfree86" in their config file + sed -i "s:^.*Option.*"XkbRules".*$::g" ${D}/etc/X11/xorg.conf.example + # Fix any installed config files for installing fonts to /usr/share/fonts # This *needs* to be after all other installation so files aren't # overwritten. @@ -1048,7 +1052,12 @@ EOF mkdir -p ${T}${DIR} fi cp ${ROOT}${FILE} ${T}${DIR} + # New font paths sed -i "s,/usr/X11R6/lib/X11/fonts,/usr/share/fonts,g" ${T}${FILE} + # Work around upgrade problem where people have + # Option "XkbRules" "xfree86" in their config file + sed -i "s:^.*Option.*"XkbRules".*$::g" ${T}${FILE} + dodir ${DIR} insinto ${DIR} doins ${T}${FILE} |