diff options
| author |   Donnie Berkholz <dberkholz@gentoo.org> | 2005-02-02 06:19:17 +0000 |
|---|---|---|
| committer | Donnie Berkholz <dberkholz@gentoo.org> | 2005-02-02 06:19:17 +0000 |
| commit | 8052efaab781933bc7a6bbbd2a6158331261e3f3 (patch) | |
| tree | 81cb52b8b1742ef19a8eb53660a7bf99531f1929 /x11-base | |
| parent | Forced imlib2 and themes (diff) | |
| download | historical-8052efaab781933bc7a6bbbd2a6158331261e3f3.tar.gz historical-8052efaab781933bc7a6bbbd2a6158331261e3f3.tar.bz2 historical-8052efaab781933bc7a6bbbd2a6158331261e3f3.zip | |
Check whether $G_FONTDIR is a directory in remove_font_dirs(), not just whether it exists. fonts.cache-1 can apparently exist in /usr/share/fonts/ sometimes. Reported by Roman Gaufman <hackeron@gmail.com>.
Package-Manager: portage-2.0.51-r15
Diffstat (limited to 'x11-base')
| -rw-r--r-- | x11-base/xorg-x11/ChangeLog | 8 | ||||
| -rw-r--r-- | x11-base/xorg-x11/Manifest | 4 | ||||
| -rw-r--r-- | x11-base/xorg-x11/xorg-x11-6.8.1.903.ebuild | 4 |
3 files changed, 11 insertions, 5 deletions
diff --git a/x11-base/xorg-x11/ChangeLog b/x11-base/xorg-x11/ChangeLog index ad2b11a1e33b..37c51dda2355 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.308 2005/02/01 22:04:38 spyderous Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-x11/ChangeLog,v 1.309 2005/02/02 06:19:17 spyderous Exp $ + + 01 Feb 2005; Donnie Berkholz <spyderous@gentoo.org>; + xorg-x11-6.8.1.903.ebuild: + Check whether $G_FONTDIR is a directory in remove_font_dirs(), not just + whether it exists. fonts.cache-1 can apparently exist in /usr/share/fonts/ + sometimes. Reported by Roman Gaufman <hackeron@gmail.com>. *xorg-x11-6.8.1.903 (01 Feb 2005) diff --git a/x11-base/xorg-x11/Manifest b/x11-base/xorg-x11/Manifest index d61dfe3d28c6..d0d6782a89fc 100644 --- a/x11-base/xorg-x11/Manifest +++ b/x11-base/xorg-x11/Manifest @@ -1,4 +1,4 @@ -MD5 6632c64865bb63909ab7e39ffaf4a30c ChangeLog 73307 +MD5 9a9b2ed6fd3dca70f4c303e4ee7f7387 ChangeLog 73604 MD5 ac1137a20503dcb8f9ba2939a2a766f6 metadata.xml 230 MD5 2b9b70a8a132d04ffa84b047fc2736bb xorg-x11-6.7.0-r3.ebuild 38110 MD5 e33b194fdfcdaa928956aa1e5e937b72 xorg-x11-6.8.0-r3.ebuild 40114 @@ -6,7 +6,7 @@ MD5 c0f8e417ca09b7e0a6cb0df5345c9ade xorg-x11-6.8.0-r4.ebuild 52258 MD5 964bf2fe7bbddb6eab73140faa911397 xorg-x11-6.8.1.901-r1.ebuild 52453 MD5 44835fc4c8bb9d475d312cfb96671654 xorg-x11-6.8.1.902-r1.ebuild 50722 MD5 ce42c938819216d0ca122f33b4d2b8ab xorg-x11-6.8.1.902.ebuild 50073 -MD5 ce4cf260de4d6e71bb86198b4c0ed994 xorg-x11-6.8.1.903.ebuild 57530 +MD5 4c6f295db769c1599dad0731b74e9335 xorg-x11-6.8.1.903.ebuild 57530 MD5 a3314fbdc270d7d84ea14fd477b8d048 files/digest-xorg-x11-6.7.0-r3 904 MD5 70facbdb85b7ef2bc9b9b702442eda7e files/digest-xorg-x11-6.8.0-r3 908 MD5 fa94b81b33045020143c8d9ded15a3ac files/digest-xorg-x11-6.8.0-r4 911 diff --git a/x11-base/xorg-x11/xorg-x11-6.8.1.903.ebuild b/x11-base/xorg-x11/xorg-x11-6.8.1.903.ebuild index 093e17e4f590..5682b0302c95 100644 --- a/x11-base/xorg-x11/xorg-x11-6.8.1.903.ebuild +++ b/x11-base/xorg-x11/xorg-x11-6.8.1.903.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.1.903.ebuild,v 1.1 2005/02/01 22:04:38 spyderous Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-x11/xorg-x11-6.8.1.903.ebuild,v 1.2 2005/02/02 06:19:17 spyderous Exp $ # Set TDFX_RISKY to "yes" to get 16-bit, 1024x768 or higher on low-memory # voodoo3 cards. @@ -1658,7 +1658,7 @@ remove_font_dirs() { rm -rfv ${G_FONTDIR} else ewarn "${G_FONTDIR} not a symlink, moving to /usr/share/fonts" - if [ -e ${G_FONTDIR} ]; then + if [ -d ${G_FONTDIR} ]; then if [ ! -e /usr/share/fonts/${G_FONTDIR##*/} ]; then einfo "Moving ${G_FONTDIR} to /usr/share/fonts/" mv ${G_FONTDIR} /usr/share/fonts/ |