Add some checking features to migrate_usr_x11r6_lib() so we don't redo things that were already done. Also, migrate xkb stuff properly.

3 files changed, 42 insertions, 12 deletions

diff --git a/x11-base/xorg-x11/ChangeLog b/x11-base/xorg-x11/ChangeLog
index 2887b0b8642f..b79f45ff41e9 100644
--- a/x11-base/xorg-x11/ChangeLog
+++ b/x11-base/xorg-x11/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for x11-base/xorg-x11
 # Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-x11/ChangeLog,v 1.190 2004/11/03 17:33:19 corsair Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-x11/ChangeLog,v 1.191 2004/11/03 18:16:19 spyderous Exp $
+
+  03 Nov 2004; Donnie Berkholz <spyderous@gentoo.org>;
+  xorg-x11-6.8.0-r2.ebuild:
+  Add some checking features to migrate_usr_x11r6_lib() so we don't redo
+  things that were already done. Also, migrate xkb stuff properly.
 
   03 Nov 2004; Markus Rothe <corsair@gentoo.org> xorg-x11-6.8.0-r1.ebuild:
   Marked ~ppc64; bug #67403
diff --git a/x11-base/xorg-x11/Manifest b/x11-base/xorg-x11/Manifest
index 34b16713a8f0..2cdf017f91b6 100644
--- a/x11-base/xorg-x11/Manifest
+++ b/x11-base/xorg-x11/Manifest
@@ -1,8 +1,8 @@
-MD5 ad68726df61f113a9235b6927ab6b65e ChangeLog 41785
 MD5 ac1137a20503dcb8f9ba2939a2a766f6 metadata.xml 230
 MD5 9215e5f10589329a5056f366aa6820e8 xorg-x11-6.7.0-r2.ebuild 38086
 MD5 a2e1b9169dec8e5eb20d49694b6bbcf0 xorg-x11-6.8.0-r1.ebuild 41338
-MD5 89ca6f7a431d853f4c76756fc41d1a75 xorg-x11-6.8.0-r2.ebuild 45695
+MD5 ccb8d54f24162027b4c6127b69a3984e ChangeLog 42011
+MD5 88cd12d07a841f57c11b718b98611bb0 xorg-x11-6.8.0-r2.ebuild 46935
 MD5 a3314fbdc270d7d84ea14fd477b8d048 files/digest-xorg-x11-6.7.0-r2 904
 MD5 70facbdb85b7ef2bc9b9b702442eda7e files/digest-xorg-x11-6.8.0-r1 908
 MD5 b7a56cbcde55a013564f056f87e59867 files/digest-xorg-x11-6.8.0-r2 908
diff --git a/x11-base/xorg-x11/xorg-x11-6.8.0-r2.ebuild b/x11-base/xorg-x11/xorg-x11-6.8.0-r2.ebuild
index 6a81ebbd4693..4e9732e5350d 100644
--- a/x11-base/xorg-x11/xorg-x11-6.8.0-r2.ebuild
+++ b/x11-base/xorg-x11/xorg-x11-6.8.0-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 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.0-r2.ebuild,v 1.44 2004/11/03 09:37:55 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-x11/xorg-x11-6.8.0-r2.ebuild,v 1.45 2004/11/03 18:16:19 spyderous Exp $
 
 # Set TDFX_RISKY to "yes" to get 16-bit, 1024x768 or higher on low-memory
 # voodoo3 cards.
@@ -1053,18 +1053,43 @@ migrate_usr_x11r6_lib() {
 	# _absolutely nothing_ in /usr/X11R6/lib so we can make such a symlink.
 	# Donnie Berkholz <spyderous@gentoo.org> 20 October 2004
 
+	einfo "Migrating from /usr/X11R6/lib to /usr/lib..."
 	# Get rid of "standard" symlink from <6.8.0-r2
 	# We can't overwrite symlink with directory w/ $(mv -f)
 	[ -L ${ROOT}usr/$(get_libdir)/X11 ] \
 		&& rm ${ROOT}usr/$(get_libdir)/X11
-	# Move everything
-	mv -f ${ROOT}usr/X11R6/$(get_libdir)/* ${ROOT}usr/$(get_libdir)
-	# Remove any floating .keep files so we can run rmdir
-	find ${ROOT}usr/X11R6/$(get_libdir) -name '\.keep' -exec rm -f {} \;
-	# Get rid of the directory
-	rmdir ${ROOT}usr/X11R6/$(get_libdir)
-	# Put a symlink in its place
-	ln -s ../$(get_libdir) ${ROOT}usr/X11R6/$(get_libdir)
+	# Move everything if it's not a symlink
+	[ ! -L ${ROOT}usr/X11R6/$(get_libdir) ] \
+		&& mv -f ${ROOT}usr/X11R6/$(get_libdir)/* ${ROOT}usr/$(get_libdir)
+	# Remove any floating .keep files so we can run rmdir if it's not a symlink
+	[ ! -L ${ROOT}usr/X11R6/$(get_libdir) ] \
+		&& find ${ROOT}usr/X11R6/$(get_libdir) -name '\.keep' -exec rm -f {} \;
+	# Get rid of the directory if it's not a symlink
+	[ ! -L ${ROOT}usr/X11R6/$(get_libdir) ] \
+		&& rmdir ${ROOT}usr/X11R6/$(get_libdir)
+	# Put a symlink in its place if there's not one there
+	[ ! -L ${ROOT}usr/X11R6/$(get_libdir) ] \
+		&& ln -s ../$(get_libdir) ${ROOT}usr/X11R6/$(get_libdir)
+
+	# We also need to create a symlink from /usr/X11R6/libdir/X11/xkb
+	# to /usr/lib/xkb, so libxklavier and xkb stuff is happy
+
+	einfo "Migrating from /usr/X11R6/$(get_libdir)/X11/xkb to /usr/$(get_libdir)/xkb..."
+	# Make the new dir if it doesn't already exist
+	[ ! -e ${ROOT}usr/$(get_libdir)/xkb ] \
+		&& mkdir ${ROOT}usr/$(get_libdir)/xkb
+	# Move anything in the old xkb dir if it's not a symlink
+	[ ! -L ${ROOT}usr/X11R6/$(get_libdir)/X11/xkb ] \
+		&& mv -f ${ROOT}usr/X11R6/$(get_libdir)/X11/xkb/* \
+		${ROOT}usr/$(get_libdir)/xkb
+	# Get rid of the directory if it's not a symlink
+	[ ! -L ${ROOT}usr/X11R6/$(get_libdir)/X11/xkb ] \
+		&& rmdir ${ROOT}usr/X11R6/$(get_libdir)/X11/xkb
+	# Add symlink to reflect xkb move from /usr/X11R6/libdir/X11/xkb
+	# to /usr/libdir/xkb
+	[ ! -L ${ROOT}usr/X11R6/$(get_libdir)/X11/xkb ] \
+		&& ln -s ../../../$(get_libdir)/xkb \
+		${ROOT}usr/X11R6/$(get_libdir)/X11/xkb
 }
 
 update_config_files() {