diff options
| author |   Donnie Berkholz <dberkholz@gentoo.org> | 2005-04-20 05:51:38 +0000 |
|---|---|---|
| committer | Donnie Berkholz <dberkholz@gentoo.org> | 2005-04-20 05:51:38 +0000 |
| commit | 0f28e0b537c194b8e3cadf0725147ca76e477dc9 (patch) | |
| tree | 4e1fc5f82cdbb971095d2c96e310b471ef57834f /x11-base | |
| parent | (#89743) Remove /usr/share/fonts/fonts symlink if it exists. Circular symlink... (diff) | |
| download | historical-0f28e0b537c194b8e3cadf0725147ca76e477dc9.tar.gz historical-0f28e0b537c194b8e3cadf0725147ca76e477dc9.tar.bz2 historical-0f28e0b537c194b8e3cadf0725147ca76e477dc9.zip | |
Better fix for the last issue.
Package-Manager: portage-2.0.51.19
Diffstat (limited to 'x11-base')
| -rw-r--r-- | x11-base/xorg-x11/ChangeLog | 6 | ||||
| -rw-r--r-- | x11-base/xorg-x11/Manifest | 6 | ||||
| -rw-r--r-- | x11-base/xorg-x11/xorg-x11-6.8.2-r2.ebuild | 6 | ||||
| -rw-r--r-- | x11-base/xorg-x11/xorg-x11-6.8.99.3.ebuild | 6 |
4 files changed, 14 insertions, 10 deletions
diff --git a/x11-base/xorg-x11/ChangeLog b/x11-base/xorg-x11/ChangeLog index 925db996a995..6f5fb95647c1 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-2005 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-x11/ChangeLog,v 1.369 2005/04/20 05:47:47 spyderous Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-x11/ChangeLog,v 1.370 2005/04/20 05:51:38 spyderous Exp $ + + 20 Apr 2005; Donnie Berkholz <spyderous@gentoo.org>; + xorg-x11-6.8.2-r2.ebuild, xorg-x11-6.8.99.3.ebuild: + Better fix for the last issue. 20 Apr 2005; Donnie Berkholz <spyderous@gentoo.org>; xorg-x11-6.8.2-r2.ebuild, xorg-x11-6.8.99.3.ebuild: diff --git a/x11-base/xorg-x11/Manifest b/x11-base/xorg-x11/Manifest index 54e8da0a5c91..329777942e32 100644 --- a/x11-base/xorg-x11/Manifest +++ b/x11-base/xorg-x11/Manifest @@ -1,7 +1,7 @@ MD5 ac1137a20503dcb8f9ba2939a2a766f6 metadata.xml 230 -MD5 2257e8c8f0522e8d6e68d1d43f164dc8 xorg-x11-6.8.99.3.ebuild 60064 -MD5 9eaf942d493a669e2d2c92ee68b2a259 xorg-x11-6.8.2-r2.ebuild 59938 -MD5 2f17433d1dc7b311173763f015615e61 ChangeLog 88132 +MD5 9152a49bc997fe816a377799daabe3b9 xorg-x11-6.8.99.3.ebuild 60068 +MD5 0d49a7869ebd5844da16a30f10298806 xorg-x11-6.8.2-r2.ebuild 59942 +MD5 c41109e5650d83a5a72b9e7650c86dae ChangeLog 88275 MD5 8839b181e475194b0a5fb497be2704a3 xorg-x11-6.8.0-r5.ebuild 52271 MD5 10e4498a23028c1e859020d8210989c4 xorg-x11-6.8.2-r1.ebuild 59279 MD5 a98e64cce8a02182077d2a3705073df3 files/digest-xorg-x11-6.8.99.3 514 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 8c52d4dfa0fd..6aeb472b14b5 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.4 2005/04/20 05:47:47 spyderous Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-x11/xorg-x11-6.8.2-r2.ebuild,v 1.5 2005/04/20 05:51:38 spyderous Exp $ # Set TDFX_RISKY to "yes" to get 16-bit, 1024x768 or higher on low-memory # voodoo3 cards. @@ -255,8 +255,8 @@ pkg_preinst() { && rm ${ROOT}usr/include/GL/GL [ -L ${ROOT}usr/include/X11/X11 ] \ && rm ${ROOT}usr/include/X11/X11 - [ -L ${ROOT}usr/share/fonts/fonts ] \ - && rm ${ROOT}usr/share/fonts/fonts + [ -d ${ROOT}usr/share/fonts/fonts ] \ + && rm -rf ${ROOT}usr/share/fonts/fonts # No need to do this, if it's already been done # Also, it'll overwrite a ton of stuff because it won't realize /usr/X11R6 diff --git a/x11-base/xorg-x11/xorg-x11-6.8.99.3.ebuild b/x11-base/xorg-x11/xorg-x11-6.8.99.3.ebuild index 77edc8f037f2..e38644e3b63b 100644 --- a/x11-base/xorg-x11/xorg-x11-6.8.99.3.ebuild +++ b/x11-base/xorg-x11/xorg-x11-6.8.99.3.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.99.3.ebuild,v 1.2 2005/04/20 05:47:47 spyderous Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-x11/xorg-x11-6.8.99.3.ebuild,v 1.3 2005/04/20 05:51:38 spyderous Exp $ # Set TDFX_RISKY to "yes" to get 16-bit, 1024x768 or higher on low-memory # voodoo3 cards. @@ -256,8 +256,8 @@ pkg_preinst() { && rm ${ROOT}usr/include/GL/GL [ -L ${ROOT}usr/include/X11/X11 ] \ && rm ${ROOT}usr/include/X11/X11 - [ -L ${ROOT}usr/share/fonts/fonts ] \ - && rm ${ROOT}usr/share/fonts/fonts + [ -d ${ROOT}usr/share/fonts/fonts ] \ + && rm -rf ${ROOT}usr/share/fonts/fonts # No need to do this, if it's already been done # Also, it'll overwrite a ton of stuff because it won't realize /usr/X11R6 |