From 75f6da39a2a76c5a40e5d97d22bc1fae8d67ad86 Mon Sep 17 00:00:00 2001 From: Donnie Berkholz Date: Mon, 22 Nov 2004 19:25:10 +0000 Subject: [PATCH] Fix problem where one could end up with '/usr/lib/fonts' font paths in xorg.conf.example by adding a new sed match. This happens because we changed from /usr/X11R6/libdir to /usr/libdir. --- x11-base/xorg-x11/ChangeLog | 8 +++++++- x11-base/xorg-x11/Manifest | 14 +++++++------- x11-base/xorg-x11/xorg-x11-6.8.0-r4.ebuild | 5 +++-- 3 files changed, 17 insertions(+), 10 deletions(-) diff --git a/x11-base/xorg-x11/ChangeLog b/x11-base/xorg-x11/ChangeLog index 820bdd806533..a5f5a96b0f60 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-2004 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-x11/ChangeLog,v 1.223 2004/11/22 16:18:18 tgall Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-x11/ChangeLog,v 1.224 2004/11/22 19:25:10 spyderous Exp $ + + 22 Nov 2004; Donnie Berkholz ; + xorg-x11-6.8.0-r4.ebuild: + Fix problem where one could end up with '/usr/lib/fonts' font paths in + xorg.conf.example by adding a new sed match. This happens because we changed + from /usr/X11R6/libdir to /usr/libdir. 22 Nov 2004; Tom Gall ; xorg-x11-6.7.0-r3.ebuild: diff --git a/x11-base/xorg-x11/Manifest b/x11-base/xorg-x11/Manifest index 68a9f732f9e1..7bbbe4dc3ef8 100644 --- a/x11-base/xorg-x11/Manifest +++ b/x11-base/xorg-x11/Manifest @@ -1,15 +1,15 @@ -MD5 8ee32bf623a41f5c2c4ec7774f1fdeb5 ChangeLog 50740 MD5 ac1137a20503dcb8f9ba2939a2a766f6 metadata.xml 230 -MD5 71c0c4d6c6042712ace52ffa727857e8 xorg-x11-6.8.0-r3.ebuild 39789 MD5 9215e5f10589329a5056f366aa6820e8 xorg-x11-6.7.0-r2.ebuild 38086 +MD5 6ebaf0954dc02b95d2102bec0cd6bc43 xorg-x11-6.8.0-r1.ebuild 41340 +MD5 037f1af8436d5700c19996505476a212 ChangeLog 51021 MD5 cb102f4f4368c4b252805362396cde47 xorg-x11-6.8.0-r2.ebuild 50246 MD5 7b174b6dffb28170212c74ce88f1d044 xorg-x11-6.7.0-r3.ebuild 38100 -MD5 6ebaf0954dc02b95d2102bec0cd6bc43 xorg-x11-6.8.0-r1.ebuild 41340 -MD5 d6eadbb1911c94348dfae1eb53e85b27 xorg-x11-6.8.0-r4.ebuild 52057 -MD5 d9a6c2ccdb525a489e8850cce8728dc3 files/digest-xorg-x11-6.8.0-r2 908 +MD5 71c0c4d6c6042712ace52ffa727857e8 xorg-x11-6.8.0-r3.ebuild 39789 +MD5 c554c6160d011392c9393c3366bac08a xorg-x11-6.8.0-r4.ebuild 52119 MD5 a3314fbdc270d7d84ea14fd477b8d048 files/digest-xorg-x11-6.7.0-r2 904 +MD5 70facbdb85b7ef2bc9b9b702442eda7e files/digest-xorg-x11-6.8.0-r1 908 +MD5 d9a6c2ccdb525a489e8850cce8728dc3 files/digest-xorg-x11-6.8.0-r2 908 +MD5 f14e22fa0891e99c1000c0d61d7e8a0c files/xpm-secfix-thomas.diff 55674 MD5 a3314fbdc270d7d84ea14fd477b8d048 files/digest-xorg-x11-6.7.0-r3 904 MD5 70facbdb85b7ef2bc9b9b702442eda7e files/digest-xorg-x11-6.8.0-r3 908 MD5 a6850644ded20651b79ce5028eba6747 files/digest-xorg-x11-6.8.0-r4 908 -MD5 f14e22fa0891e99c1000c0d61d7e8a0c files/xpm-secfix-thomas.diff 55674 -MD5 70facbdb85b7ef2bc9b9b702442eda7e files/digest-xorg-x11-6.8.0-r1 908 diff --git a/x11-base/xorg-x11/xorg-x11-6.8.0-r4.ebuild b/x11-base/xorg-x11/xorg-x11-6.8.0-r4.ebuild index bff814afcf76..7067f7f60783 100644 --- a/x11-base/xorg-x11/xorg-x11-6.8.0-r4.ebuild +++ b/x11-base/xorg-x11/xorg-x11-6.8.0-r4.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/xorg-x11/xorg-x11-6.8.0-r4.ebuild,v 1.13 2004/11/22 02:12:26 spyderous Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-x11/xorg-x11-6.8.0-r4.ebuild,v 1.14 2004/11/22 19:25:10 spyderous Exp $ # Set TDFX_RISKY to "yes" to get 16-bit, 1024x768 or higher on low-memory # voodoo3 cards. @@ -1280,7 +1280,8 @@ setup_xprint_init() { setup_config_files() { # Fix default config files after installing fonts to /usr/share/fonts - sed -i "s:/usr/X11R6/$(get_libdir)/X11/fonts:/usr/share/fonts:g" \ + sed -i -e "s:/usr/X11R6/$(get_libdir)/X11/fonts:/usr/share/fonts:g" \ + -e "s:/usr/$(get_libdir)/X11/fonts:/usr/share/fonts:g" \ ${D}/etc/X11/xorg.conf.example if use font-server; then sed -i "s:/usr/X11R6/$(get_libdir)/X11/fonts:/usr/share/fonts:g" \ -- 2.26.2