Need to apply last change in lib as well as libdir.

Package-Manager: portage-2.0.51-r14

5 files changed, 25 insertions, 11 deletions

diff --git a/x11-base/xorg-x11/ChangeLog b/x11-base/xorg-x11/ChangeLog
index aeaa6fcebda7..33247b2ff697 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-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-x11/ChangeLog,v 1.291 2005/01/21 19:46:19 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-x11/ChangeLog,v 1.292 2005/01/21 19:54:00 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:
+  Need to apply last change in lib as well as libdir.
 
   21 Jan 2005; Donnie Berkholz <spyderous@gentoo.org>;
   xorg-x11-6.8.0-r4.ebuild, xorg-x11-6.8.1.901-r1.ebuild,
diff --git a/x11-base/xorg-x11/Manifest b/x11-base/xorg-x11/Manifest
index 68f2c16569fd..6d4d58ea2c58 100644
--- a/x11-base/xorg-x11/Manifest
+++ b/x11-base/xorg-x11/Manifest
@@ -1,10 +1,10 @@
 MD5 ac1137a20503dcb8f9ba2939a2a766f6 metadata.xml 230
-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 085908a4a27edf2ec69fb1a34ffe931a ChangeLog 70123
+MD5 2c82f765cc96df7956d6202123af62a8 xorg-x11-6.8.1.901-r1.ebuild 52668
+MD5 0121ea587ac539af01c4adf030ca5c3c xorg-x11-6.8.0-r4.ebuild 52473
 MD5 a8051c491706514a17657504c7d5ba69 xorg-x11-6.7.0-r3.ebuild 38098
 MD5 e33b194fdfcdaa928956aa1e5e937b72 xorg-x11-6.8.0-r3.ebuild 40114
-MD5 efdde26e71945c48ca34c9590cedbff7 xorg-x11-6.8.1.902.ebuild 52437
+MD5 14576ef12374154411f8b81da6cf9b82 xorg-x11-6.8.1.902.ebuild 52479
 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 6487f45ab0ff..e45a3252b0f6 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.57 2005/01/21 19:46:19 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-x11/xorg-x11-6.8.0-r4.ebuild,v 1.58 2005/01/21 19:54:00 spyderous Exp $
 
 # Set TDFX_RISKY to "yes" to get 16-bit, 1024x768 or higher on low-memory
 # voodoo3 cards.
@@ -1357,7 +1357,10 @@ migrate_usr_x11r6_lib() {
 		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
+			mv -f \
+				${ROOT}usr/X11R6/lib/* \
+				${ROOT}usr/X11R6/lib/.* \
+				${ROOT}usr/lib
 			# Remove any floating .keep files so we can run rmdir
 			find ${ROOT}usr/X11R6/lib -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 db93d27a5dbd..31f02f9ea19e 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.10 2005/01/21 19:46:19 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-x11/xorg-x11-6.8.1.901-r1.ebuild,v 1.11 2005/01/21 19:54:00 spyderous Exp $
 
 # Set TDFX_RISKY to "yes" to get 16-bit, 1024x768 or higher on low-memory
 # voodoo3 cards.
@@ -1356,7 +1356,10 @@ migrate_usr_x11r6_lib() {
 		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
+			mv -f \
+				${ROOT}usr/X11R6/lib/* \
+				${ROOT}usr/X11R6/lib/.* \
+				${ROOT}usr/lib
 			# Remove any floating .keep files so we can run rmdir
 			find ${ROOT}usr/X11R6/lib -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 88f4c7120b5d..4adff898c4c1 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.15 2005/01/21 19:46:19 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-x11/xorg-x11-6.8.1.902.ebuild,v 1.16 2005/01/21 19:54:00 spyderous Exp $
 
 # Set TDFX_RISKY to "yes" to get 16-bit, 1024x768 or higher on low-memory
 # voodoo3 cards.
@@ -1356,7 +1356,10 @@ migrate_usr_x11r6_lib() {
 		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
+			mv -f \
+				${ROOT}usr/X11R6/lib/* \
+				${ROOT}usr/X11R6/lib/.* \
+				${ROOT}usr/lib
 			# Remove any floating .keep files so we can run rmdir
 			find ${ROOT}usr/X11R6/lib -name '\.keep' -exec rm -f {} \;
 			# Get rid of the directory