eradicator discovered that some really bothersome packages leave dotfiles in /usr/X11R6/lib, which breaks the migration because rmdir won't run.

Package-Manager: portage-2.0.51-r14

5 files changed, 26 insertions, 11 deletions

diff --git a/x11-base/xorg-x11/ChangeLog b/x11-base/xorg-x11/ChangeLog
index 9eeaed474249..aeaa6fcebda7 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.290 2005/01/21 17:31:49 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-x11/ChangeLog,v 1.291 2005/01/21 19:46:19 spyderous Exp $
+
+  21 Jan 2005; Donnie Berkholz <spyderous@gentoo.org>;
+  xorg-x11-6.8.0-r4.ebuild, xorg-x11-6.8.1.901-r1.ebuild,
+  xorg-x11-6.8.1.902.ebuild:
+  eradicator discovered that some really bothersome packages leave dotfiles in
+  /usr/X11R6/lib, which breaks the migration because rmdir won't run.
 
   21 Jan 2005; Donnie Berkholz <spyderous@gentoo.org>;
   xorg-x11-6.7.0-r3.ebuild, xorg-x11-6.8.0-r3.ebuild,
diff --git a/x11-base/xorg-x11/Manifest b/x11-base/xorg-x11/Manifest
index 1b652d1e5ba0..68f2c16569fd 100644
--- a/x11-base/xorg-x11/Manifest
+++ b/x11-base/xorg-x11/Manifest
@@ -1,10 +1,10 @@
 MD5 ac1137a20503dcb8f9ba2939a2a766f6 metadata.xml 230
-MD5 914468bb8bbf99e94262b565aab8b6d0 ChangeLog 69634
-MD5 e0479e43329cf036705904da1079fcb8 xorg-x11-6.8.1.901-r1.ebuild 52576
-MD5 363d53fb837d4acf401496818ad5d88b xorg-x11-6.8.0-r4.ebuild 52382
+MD5 78870f7e2c8fbfb19a4abb8c79a9960b ChangeLog 69926
+MD5 bf047adab38f96e6666c30907cecd66f xorg-x11-6.8.1.901-r1.ebuild 52626
+MD5 77cca66d8ae69ef17b663d2a975070ef xorg-x11-6.8.0-r4.ebuild 52431
 MD5 a8051c491706514a17657504c7d5ba69 xorg-x11-6.7.0-r3.ebuild 38098
 MD5 e33b194fdfcdaa928956aa1e5e937b72 xorg-x11-6.8.0-r3.ebuild 40114
-MD5 f94b6751560dcab9d94616f75edc932b xorg-x11-6.8.1.902.ebuild 52388
+MD5 efdde26e71945c48ca34c9590cedbff7 xorg-x11-6.8.1.902.ebuild 52437
 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
diff --git a/x11-base/xorg-x11/xorg-x11-6.8.0-r4.ebuild b/x11-base/xorg-x11/xorg-x11-6.8.0-r4.ebuild
index 903d78d061f4..6487f45ab0ff 100644
--- a/x11-base/xorg-x11/xorg-x11-6.8.0-r4.ebuild
+++ b/x11-base/xorg-x11/xorg-x11-6.8.0-r4.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.0-r4.ebuild,v 1.56 2005/01/21 17:31:49 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-x11/xorg-x11-6.8.0-r4.ebuild,v 1.57 2005/01/21 19:46:19 spyderous Exp $
 
 # Set TDFX_RISKY to "yes" to get 16-bit, 1024x768 or higher on low-memory
 # voodoo3 cards.
@@ -1337,7 +1337,10 @@ migrate_usr_x11r6_lib() {
 	if [ ! -L ${ROOT}usr/X11R6/$(get_libdir) ]; then
 		einfo "  /usr/X11R6/$(get_libdir) isn't a symlink, migrating..."
 		# Move everything
-		mv -f ${ROOT}usr/X11R6/$(get_libdir)/* ${ROOT}usr/$(get_libdir)
+		mv -f \
+			${ROOT}usr/X11R6/$(get_libdir)/* \
+			${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
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 0fcf616278e7..db93d27a5dbd 100644
--- 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.9 2005/01/21 17:31:49 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-x11/xorg-x11-6.8.1.901-r1.ebuild,v 1.10 2005/01/21 19:46:19 spyderous Exp $
 
 # Set TDFX_RISKY to "yes" to get 16-bit, 1024x768 or higher on low-memory
 # voodoo3 cards.
@@ -1336,7 +1336,10 @@ migrate_usr_x11r6_lib() {
 	if [ ! -L ${ROOT}usr/X11R6/$(get_libdir) ]; then
 		einfo "  /usr/X11R6/$(get_libdir) isn't a symlink, migrating..."
 		# Move everything
-		mv -f ${ROOT}usr/X11R6/$(get_libdir)/* ${ROOT}usr/$(get_libdir)
+		mv -f \
+			${ROOT}usr/X11R6/$(get_libdir)/* \
+			${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
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 e3102ba108c7..88f4c7120b5d 100644
--- 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.14 2005/01/21 17:31:49 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-x11/xorg-x11-6.8.1.902.ebuild,v 1.15 2005/01/21 19:46:19 spyderous Exp $
 
 # Set TDFX_RISKY to "yes" to get 16-bit, 1024x768 or higher on low-memory
 # voodoo3 cards.
@@ -1336,7 +1336,10 @@ migrate_usr_x11r6_lib() {
 	if [ ! -L ${ROOT}usr/X11R6/$(get_libdir) ]; then
 		einfo "  /usr/X11R6/$(get_libdir) isn't a symlink, migrating..."
 		# Move everything
-		mv -f ${ROOT}usr/X11R6/$(get_libdir)/* ${ROOT}usr/$(get_libdir)
+		mv -f \
+			${ROOT}usr/X11R6/$(get_libdir)/* \
+			${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