diff options
| author |   Donnie Berkholz <dberkholz@gentoo.org> | 2005-02-02 16:31:31 +0000 |
|---|---|---|
| committer | Donnie Berkholz <dberkholz@gentoo.org> | 2005-02-02 16:31:31 +0000 |
| commit | 057604deefe0abef63704e6acbc751c667b98afc (patch) | |
| tree | be625161fffd22e3e2001608490d78a07171be32 /x11-base | |
| parent | install only one copy of the docs, #79187 (diff) | |
| download | historical-057604deefe0abef63704e6acbc751c667b98afc.tar.gz historical-057604deefe0abef63704e6acbc751c667b98afc.tar.bz2 historical-057604deefe0abef63704e6acbc751c667b98afc.zip | |
Change die() to ewarn() if a directory exists in both font locations in remove_font_dirs(). The migration should catch that problem, so there's no need to die. Also append cyrillic to G_FONTDIRS if USE=nls, so its fonts.* files get cleaned. Reported by Andres Järv <andresjarv@gmail.com>.
Package-Manager: portage-2.0.51-r15
Diffstat (limited to 'x11-base')
| -rw-r--r-- | x11-base/xorg-x11/ChangeLog | 9 | ||||
| -rw-r--r-- | x11-base/xorg-x11/Manifest | 14 | ||||
| -rw-r--r-- | x11-base/xorg-x11/xorg-x11-6.8.1.903.ebuild | 7 |
3 files changed, 20 insertions, 10 deletions
diff --git a/x11-base/xorg-x11/ChangeLog b/x11-base/xorg-x11/ChangeLog index f649c9e5701a..9a72c6aa0462 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.310 2005/02/02 16:05:07 corsair Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-x11/ChangeLog,v 1.311 2005/02/02 16:31:31 spyderous Exp $ + + 02 Feb 2005; Donnie Berkholz <spyderous@gentoo.org>; + xorg-x11-6.8.1.903.ebuild: + Change die() to ewarn() if a directory exists in both font locations in + remove_font_dirs(). The migration should catch that problem, so there's no + need to die. Also append cyrillic to G_FONTDIRS if USE=nls, so its fonts.* + files get cleaned. Reported by Andres Järv <andresjarv@gmail.com>. 02 Feb 2005; Markus Rothe <corsair@gentoo.org> xorg-x11-6.8.1.903.ebuild: Added ~ppc64 to KEYWORDS diff --git a/x11-base/xorg-x11/Manifest b/x11-base/xorg-x11/Manifest index 34a980c8285e..5ef9a46b8eb3 100644 --- a/x11-base/xorg-x11/Manifest +++ b/x11-base/xorg-x11/Manifest @@ -1,17 +1,17 @@ -MD5 04d3e899668a45badf558f02580ff03f ChangeLog 73706 MD5 ac1137a20503dcb8f9ba2939a2a766f6 metadata.xml 230 -MD5 44835fc4c8bb9d475d312cfb96671654 xorg-x11-6.8.1.902-r1.ebuild 50722 -MD5 ce42c938819216d0ca122f33b4d2b8ab xorg-x11-6.8.1.902.ebuild 50073 MD5 2b9b70a8a132d04ffa84b047fc2736bb xorg-x11-6.7.0-r3.ebuild 38110 MD5 e33b194fdfcdaa928956aa1e5e937b72 xorg-x11-6.8.0-r3.ebuild 40114 MD5 c0f8e417ca09b7e0a6cb0df5345c9ade xorg-x11-6.8.0-r4.ebuild 52258 -MD5 7bb677cc9cb21258859a9dc0bf939e98 xorg-x11-6.8.1.903.ebuild 57535 MD5 964bf2fe7bbddb6eab73140faa911397 xorg-x11-6.8.1.901-r1.ebuild 52453 -MD5 b59b9e9b5fe5a900264d9e6766a4b3f9 files/digest-xorg-x11-6.8.1.902-r1 517 -MD5 24b596cf50b39b2198ce67257bef8717 files/digest-xorg-x11-6.8.1.903 517 +MD5 44835fc4c8bb9d475d312cfb96671654 xorg-x11-6.8.1.902-r1.ebuild 50722 +MD5 ce42c938819216d0ca122f33b4d2b8ab xorg-x11-6.8.1.902.ebuild 50073 +MD5 8a4d51ddfdb5f4239df22cc0f3a678e4 ChangeLog 74091 +MD5 ab835fe7973f131b2899ee3dfddec34d xorg-x11-6.8.1.903.ebuild 57599 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 -MD5 f14e22fa0891e99c1000c0d61d7e8a0c files/xpm-secfix-thomas.diff 55674 MD5 31a8fa39480a7053afd4ebd7493c09c4 files/digest-xorg-x11-6.8.1.901-r1 517 MD5 b59b9e9b5fe5a900264d9e6766a4b3f9 files/digest-xorg-x11-6.8.1.902 517 +MD5 b59b9e9b5fe5a900264d9e6766a4b3f9 files/digest-xorg-x11-6.8.1.902-r1 517 +MD5 f14e22fa0891e99c1000c0d61d7e8a0c files/xpm-secfix-thomas.diff 55674 +MD5 24b596cf50b39b2198ce67257bef8717 files/digest-xorg-x11-6.8.1.903 517 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 9f6813d22464..8a3964334575 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.3 2005/02/02 16:05:07 corsair Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-x11/xorg-x11-6.8.1.903.ebuild,v 1.4 2005/02/02 16:31:31 spyderous Exp $ # Set TDFX_RISKY to "yes" to get 16-bit, 1024x768 or higher on low-memory # voodoo3 cards. @@ -1631,6 +1631,9 @@ cleanup_fonts() { if use bitmap-fonts; then G_FONTDIRS="${G_FONTDIRS} 75dpi 100dpi" fi + if use nls; then + G_FONTDIRS="${G_FONTDIRS} cyrillic" + fi for G_FONTDIR in ${G_FONTDIRS}; do # clean out old fonts.* and encodings.dir files, as we @@ -1663,7 +1666,7 @@ remove_font_dirs() { einfo "Moving ${G_FONTDIR} to /usr/share/fonts/" mv ${G_FONTDIR} /usr/share/fonts/ else - die "/usr/share/fonts/${G_FONTDIR##*/} exists. Remove it and try again." + ewarn "/usr/share/fonts/${G_FONTDIR##*/} exists. Remove it and try again." fi else ewarn "${G_FONTDIR} does not exist." |