diff options
author | Donnie Berkholz <dberkholz@gentoo.org> | 2005-02-05 00:43:25 +0000 |
---|---|---|
committer | Donnie Berkholz <dberkholz@gentoo.org> | 2005-02-05 00:43:25 +0000 |
commit | 3a9519d0fdd6d5dab445d5c0291f8faee4a60304 (patch) | |
tree | 148b898d4386ca3a98f279b3ba2df22c25eb271a /x11-base | |
parent | removing USE_DESTDIR since it seems to cause sandbox issues in bug 80543 (diff) | |
download | historical-3a9519d0fdd6d5dab445d5c0291f8faee4a60304.tar.gz historical-3a9519d0fdd6d5dab445d5c0291f8faee4a60304.tar.bz2 historical-3a9519d0fdd6d5dab445d5c0291f8faee4a60304.zip |
pkg_preinst(): Add checks for more symlinks: /usr/bin/X11, /usr/include/GL/GL and /usr/include/X11/X11. Reported by Ferris McCormick <fmccor@gentoo.org>.
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.904.ebuild | 9 |
3 files changed, 17 insertions, 4 deletions
diff --git a/x11-base/xorg-x11/ChangeLog b/x11-base/xorg-x11/ChangeLog index 0f034c272310..a378826d9ae8 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.319 2005/02/05 00:36:36 spyderous Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-x11/ChangeLog,v 1.320 2005/02/05 00:43:25 spyderous Exp $ + + 04 Feb 2005; Donnie Berkholz <spyderous@gentoo.org>; + xorg-x11-6.8.1.904.ebuild: + pkg_preinst(): Add checks for more symlinks: /usr/bin/X11, + /usr/include/GL/GL and /usr/include/X11/X11. Reported by Ferris McCormick + <fmccor@gentoo.org>. 04 Feb 2005; Donnie Berkholz <spyderous@gentoo.org>; xorg-x11-6.8.1.904.ebuild: diff --git a/x11-base/xorg-x11/Manifest b/x11-base/xorg-x11/Manifest index 7346869e3952..23974bcfe31c 100644 --- a/x11-base/xorg-x11/Manifest +++ b/x11-base/xorg-x11/Manifest @@ -5,9 +5,9 @@ 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 73181e21407f890da741c9f40cd7528f ChangeLog 76010 +MD5 2e08db1f99a14c2a2a79759f405ee7cc ChangeLog 76255 MD5 f0a1630bdfcd21822fe30cd226f06514 xorg-x11-6.8.1.903.ebuild 57859 -MD5 55c3d829e2c56b0c433f34193304f451 xorg-x11-6.8.1.904.ebuild 57884 +MD5 c9033610b5743b22157ac858674704bf xorg-x11-6.8.1.904.ebuild 58131 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.904.ebuild b/x11-base/xorg-x11/xorg-x11-6.8.1.904.ebuild index 5b650735d531..ce8ed0d0ef88 100644 --- a/x11-base/xorg-x11/xorg-x11-6.8.1.904.ebuild +++ b/x11-base/xorg-x11/xorg-x11-6.8.1.904.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.904.ebuild,v 1.7 2005/02/05 00:36:36 spyderous Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-x11/xorg-x11-6.8.1.904.ebuild,v 1.8 2005/02/05 00:43:25 spyderous Exp $ # Set TDFX_RISKY to "yes" to get 16-bit, 1024x768 or higher on low-memory # voodoo3 cards. @@ -249,6 +249,13 @@ pkg_preinst() { && rm ${ROOT}usr/include/X11 [ -L ${ROOT}usr/include/GL ] \ && rm ${ROOT}usr/include/GL + [ -L ${ROOT}usr/bin/X11 ] \ + && rm ${ROOT}usr/bin/X11 + # Get rid of some apparent artifacts of migration + [ -L ${ROOT}usr/include/GL/GL ] \ + && rm ${ROOT}usr/include/GL/GL + [ -L ${ROOT}usr/include/X11/X11 ] \ + && rm ${ROOT}usr/include/X11/X11 # 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 |