(#78074) DO NOT use '-d' in test because it's true on symlinks to dirs too.

Package-Manager: portage-2.0.51-r12

diff --git a/x11-base/xorg-x11/ChangeLog b/x11-base/xorg-x11/ChangeLog
index b00da390778838039bb7dd11bdae8ccd55612f3c..ac3bdc9edf6143f8b0bf852bd84f2a4fd94eb395 100644 (file)
--- 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.271 2005/01/15 18:37:32 corsair Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-x11/ChangeLog,v 1.272 2005/01/16 05:20:17 spyderous Exp $
+
+  15 Jan 2005; Donnie Berkholz <spyderous@gentoo.org>;
+  xorg-x11-6.8.1.901-r1.ebuild, xorg-x11-6.8.1.902.ebuild:
+  (#78074) DO NOT use '-d' in test because it's true on symlinks to dirs too.
 
   15 Jan 2005; Markus Rothe <corsair@gentoo.org> xorg-x11-6.8.1.902.ebuild:
   Added ~ppc64 to KEYWORDS

diff --git a/x11-base/xorg-x11/Manifest b/x11-base/xorg-x11/Manifest
index a136794111e90752e2f8e8bc89ce707f62f756ac..8e6c93c120752667d3d39b62c377cff282511f47 100644 (file)
--- a/x11-base/xorg-x11/Manifest
+++ b/x11-base/xorg-x11/Manifest
@@ -1,19 +1,19 @@
-MD5 0a100b0223ed4dfdd14a34f513427e03 ChangeLog 65928
 MD5 ac1137a20503dcb8f9ba2939a2a766f6 metadata.xml 230
 MD5 6c24c8a3aa69cebf79e8633555073c36 xorg-x11-6.7.0-r2.ebuild 38088
 MD5 d548e768ef760adbe7776ac667dbda13 xorg-x11-6.8.0-r1.ebuild 41337
+MD5 d422f9a69c4b09fa9e3cc2bfaf8a4c5f ChangeLog 66123
+MD5 9785ea782f5701f3eacca79e986a0e90 xorg-x11-6.8.0-r4.ebuild 51063
 MD5 29b2a67c2b664ace155cc6dc7a4e0201 xorg-x11-6.7.0-r3.ebuild 38112
 MD5 b5246b2b24218270b216447c2b3875a0 xorg-x11-6.8.0-r3.ebuild 40076
-MD5 9785ea782f5701f3eacca79e986a0e90 xorg-x11-6.8.0-r4.ebuild 51063
 MD5 d0e53da57200ac6fabea15cfb566899f xorg-x11-6.8.1.901.ebuild 51071
-MD5 9a6a427626dec6dca1d516bd480d90e4 xorg-x11-6.8.1.901-r1.ebuild 52259
-MD5 fa0a7a673b8842faf535a3c851d4f2a1 xorg-x11-6.8.1.902.ebuild 52232
+MD5 c72c5ecb890d53668d41fa8a29d61f76 xorg-x11-6.8.1.901-r1.ebuild 52336
+MD5 fa78cf786b1d7333180c9ff1f1a99839 xorg-x11-6.8.1.902.ebuild 52308
 MD5 a3314fbdc270d7d84ea14fd477b8d048 files/digest-xorg-x11-6.7.0-r2 904
 MD5 70facbdb85b7ef2bc9b9b702442eda7e files/digest-xorg-x11-6.8.0-r1 908
+MD5 f14e22fa0891e99c1000c0d61d7e8a0c files/xpm-secfix-thomas.diff 55674
 MD5 a3314fbdc270d7d84ea14fd477b8d048 files/digest-xorg-x11-6.7.0-r3 904
 MD5 70facbdb85b7ef2bc9b9b702442eda7e files/digest-xorg-x11-6.8.0-r3 908
 MD5 e5419ff1c0cff3236fb5673ef2263bea files/digest-xorg-x11-6.8.0-r4 911
-MD5 f14e22fa0891e99c1000c0d61d7e8a0c files/xpm-secfix-thomas.diff 55674
 MD5 9a74da809b31adcfd00fd65af29ee55e files/digest-xorg-x11-6.8.1.901 517
 MD5 31a8fa39480a7053afd4ebd7493c09c4 files/digest-xorg-x11-6.8.1.901-r1 517
 MD5 7cd0dbe13d97bc07036c97eba87c3859 files/digest-xorg-x11-6.8.1.902 517

diff --git a/x11-base/xorg-x11/xorg-x11-6.8.1.901-r1.ebuild b/x11-base/xorg-x11/xorg-x11-6.8.1.901-r1.ebuild
index 7f799f88ad21a77161b410a53984b94c4185f157..f23e8c2401f34728d81e2617e6d85684634276f8 100644 (file)
--- a/x11-base/xorg-x11/xorg-x11-6.8.1.901-r1.ebuild
+++ b/x11-base/xorg-x11/xorg-x11-6.8.1.901-r1.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.901-r1.ebuild,v 1.3 2005/01/15 04:41:07 geoman Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-x11/xorg-x11-6.8.1.901-r1.ebuild,v 1.4 2005/01/16 05:20:18 spyderous Exp $
 
 # Set TDFX_RISKY to "yes" to get 16-bit, 1024x768 or higher on low-memory
 # voodoo3 cards.
@@ -1341,7 +1341,8 @@ migrate_usr_x11r6_lib() {
 
                # for amd64 at least, lib64 symlinked to lib in <=6.8.0-r4 (except -r2),
                # so the migration doesn't work properly with just the above.
-               if [ -d ${ROOT}usr/X11R6/lib ]; then
+               # (#78074) DO NOT use '-d' because it's true on symlinks to dirs too.
+               if [ ! -L ${ROOT}usr/X11R6/lib ]; then
                        einfo "    /usr/X11R6/lib is a directory, migrating..."
                        # Move everything
                        mv -f ${ROOT}usr/X11R6/lib/* ${ROOT}usr/lib

diff --git a/x11-base/xorg-x11/xorg-x11-6.8.1.902.ebuild b/x11-base/xorg-x11/xorg-x11-6.8.1.902.ebuild
index dfee57776e6127c6005387427291bd0668f2c92c..895f4c810c7f1404181f39b19db5771435dee43a 100644 (file)
--- a/x11-base/xorg-x11/xorg-x11-6.8.1.902.ebuild
+++ b/x11-base/xorg-x11/xorg-x11-6.8.1.902.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.902.ebuild,v 1.4 2005/01/15 18:37:32 corsair Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-x11/xorg-x11-6.8.1.902.ebuild,v 1.5 2005/01/16 05:20:18 spyderous Exp $
 
 # Set TDFX_RISKY to "yes" to get 16-bit, 1024x768 or higher on low-memory
 # voodoo3 cards.
@@ -1341,7 +1341,8 @@ migrate_usr_x11r6_lib() {
 
                # for amd64 at least, lib64 symlinked to lib in <=6.8.0-r4 (except -r2),
                # so the migration doesn't work properly with just the above.
-               if [ -d ${ROOT}usr/X11R6/lib ]; then
+               # (#78074) DO NOT use '-d' because it's true on symlinks to dirs too.
+               if [ ! -L ${ROOT}usr/X11R6/lib ]; then
                        einfo "    /usr/X11R6/lib is a directory, migrating..."
                        # Move everything
                        mv -f ${ROOT}usr/X11R6/lib/* ${ROOT}usr/lib