diff options
| author |   Donnie Berkholz <spyderous@gentoo.org> | 2005-07-22 21:00:39 +0000 |
|---|---|---|
| committer | Donnie Berkholz <spyderous@gentoo.org> | 2005-07-22 21:00:39 +0000 |
| commit | 79cc60b94522f73fa341edeaa8a795545da38c40 (patch) | |
| tree | ac48d75e7d5debf235d26eadb9244f343fb56791 /x11-base | |
| parent | Added to ~ppc (diff) | |
| download | gentoo-2-79cc60b94522f73fa341edeaa8a795545da38c40.tar.gz gentoo-2-79cc60b94522f73fa341edeaa8a795545da38c40.tar.bz2 gentoo-2-79cc60b94522f73fa341edeaa8a795545da38c40.zip | |
Fileset 0.7. (#99534) Check the right return value on ttmkfdir in the ebuild and in the xfs init script. Otherwise, mkfontscale overwrites the fonts.alias files and breaks encodings including CP1251. Thanks to Alexander Glyzov <isee@inbox.ru>.
(Portage version: 2.0.51.22-r2)
Diffstat (limited to 'x11-base')
| -rw-r--r-- | x11-base/xorg-x11/ChangeLog | 9 | ||||
| -rw-r--r-- | x11-base/xorg-x11/files/digest-xorg-x11-6.8.2-r2 | 2 | ||||
| -rw-r--r-- | x11-base/xorg-x11/xorg-x11-6.8.2-r2.ebuild | 6 |
3 files changed, 12 insertions, 5 deletions
diff --git a/x11-base/xorg-x11/ChangeLog b/x11-base/xorg-x11/ChangeLog index 9f9389732cc4..3a1f862e5fd9 100644 --- a/x11-base/xorg-x11/ChangeLog +++ b/x11-base/xorg-x11/ChangeLog @@ -1,6 +1,13 @@ # 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.439 2005/07/21 19:41:16 spyderous Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-x11/ChangeLog,v 1.440 2005/07/22 21:00:39 spyderous Exp $ + + 22 Jul 2005; Donnie Berkholz <spyderous@gentoo.org>; + xorg-x11-6.8.2-r2.ebuild: + Fileset 0.7. (#99534) Check the right return value on ttmkfdir in the ebuild + and in the xfs init script. Otherwise, mkfontscale overwrites the + fonts.alias files and breaks encodings including CP1251. Thanks to Alexander + Glyzov <isee@inbox.ru>. 21 Jul 2005; Donnie Berkholz <spyderous@gentoo.org>; -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 ed814a789232..15c7f10c253c 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 33536d0f67e13489ef5cb3f3dfec695e xorg-x11-6.8.2-files-0.6.tar.bz2 9916 +MD5 d9ecf0455e5416181a6eb469fc3e854c xorg-x11-6.8.2-files-0.7.tar.bz2 9917 MD5 b4c4e4cefb8fabd110460bce23e70d02 xorg-x11-6.8.2-patches-0.1.9.tar.bz2 164893 MD5 8131cd7ea1e4566e6e05c438a93fcfe1 X11R6.8.2-src.tar.bz2 44371402 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 c3ada098345a..2236ad86bbf2 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.48 2005/07/18 23:45:26 spyderous Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-x11/xorg-x11-6.8.2-r2.ebuild,v 1.49 2005/07/22 21:00:39 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.6" +FILES_VER="0.7" PATCH_VER="0.1.9" XCUR_VER="0.3.1" XFSFT_ENC_VER="0.1" @@ -1707,7 +1707,7 @@ font_setup() { # We didn't use ttmkfdir at all local ttmkfdir_return=2 fi - if [ ${ttmkfdir_return} -ne 1 ]; then + if [ ${ttmkfdir_return} -ne 0 ]; then LD_LIBRARY_PATH="${LD_LIBRARY_PATH}:${ROOT}/usr/$(get_libdir)" \ ${ROOT}/usr/bin/mkfontscale \ -a /usr/share/fonts/encodings/encodings.dir \ |