Remove all migration methods besides rsync.

Package-Manager: portage-2.0.51.22-r1

4 files changed, 27 insertions, 117 deletions

diff --git a/x11-base/xorg-x11/ChangeLog b/x11-base/xorg-x11/ChangeLog
index 3cdf04e3ce35..3ef16d960be3 100644
--- 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.405 2005/06/01 10:22:43 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-x11/ChangeLog,v 1.406 2005/06/01 10:25:57 spyderous Exp $
+
+  01 Jun 2005; Donnie Berkholz <spyderous@gentoo.org>;
+  xorg-x11-6.8.2-r2.ebuild, xorg-x11-6.8.99.8.ebuild:
+  Remove all migration methods besides rsync.
 
   01 Jun 2005; Donnie Berkholz <spyderous@gentoo.org>;
   xorg-x11-6.8.2-r2.ebuild, xorg-x11-6.8.99.8.ebuild:
diff --git a/x11-base/xorg-x11/Manifest b/x11-base/xorg-x11/Manifest
index ec7d07ed3fe8..2ffa23650098 100644
--- a/x11-base/xorg-x11/Manifest
+++ b/x11-base/xorg-x11/Manifest
@@ -1,7 +1,7 @@
 MD5 ac1137a20503dcb8f9ba2939a2a766f6 metadata.xml 230
-MD5 52ba3c63c3693c2f87368124b58eb72c xorg-x11-6.8.99.8.ebuild 59522
-MD5 0fa7621224fcccdf3a3d5259cccef0b2 xorg-x11-6.8.2-r2.ebuild 59092
-MD5 262082c0e58610c7b5b745b04d4aaf8c ChangeLog 95353
+MD5 58f19665ee6681a4104fac62b1b94174 xorg-x11-6.8.99.8.ebuild 58283
+MD5 edd18608ab6d4b59fc673b637e2d48a6 xorg-x11-6.8.2-r2.ebuild 57865
+MD5 1e8da3631bab400d3bec9ba81df86c9f ChangeLog 95509
 MD5 de11c43b024974fb63f6a71fd7941f15 xorg-x11-6.8.2-r1.ebuild 59343
 MD5 2af39a82a9fcc1f16256c60178a722bd xorg-x11-6.8.99.5.ebuild 60345
 MD5 72332f87c0620ede7d4a45a4e2bf237b files/digest-xorg-x11-6.8.99.5 514
diff --git a/x11-base/xorg-x11/xorg-x11-6.8.2-r2.ebuild b/x11-base/xorg-x11/xorg-x11-6.8.2-r2.ebuild
index 70f87e326ede..5db6d3c9fc72 100644
--- a/x11-base/xorg-x11/xorg-x11-6.8.2-r2.ebuild
+++ b/x11-base/xorg-x11/xorg-x11-6.8.2-r2.ebuild
@@ -1,14 +1,10 @@
 # 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.2-r2.ebuild,v 1.22 2005/06/01 10:22:43 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-x11/xorg-x11-6.8.2-r2.ebuild,v 1.23 2005/06/01 10:25:57 spyderous Exp $
 
 # Set TDFX_RISKY to "yes" to get 16-bit, 1024x768 or higher on low-memory
 # voodoo3 cards.
 
-# What to use for migration from /usr/X11R6 to /usr -- mv, rsync or tar.
-# By default it uses 'rsync'.
-#MIGRATE_METHOD="rsync"
-
 # Libraries which are now supplied in shared form that were not in the past
 # include:  libFS.so, libGLw.so, libI810XvMC.so, libXRes.so, libXfontcache.so,
 # libXinerama.so, libXss.so, libXvMC.so, libXxf86rush.so, libfontenc.so,
@@ -144,7 +140,6 @@ pkg_setup() {
 	FILES_DIR="${WORKDIR}/files"
 	PATCHDIR="${WORKDIR}/patch"
 	EXCLUDED="${PATCHDIR}/excluded"
-	${MIGRATE_METHOD:+einfo Migration method is ${MIGRATE_METHOD}.}
 
 	# Set up CFLAG-related things
 	cflag_setup
@@ -1386,10 +1381,7 @@ fix_opengl_symlinks() {
 #
 # Takes two arguments -- starting location and ending location
 migrate() {
-	MIGRATE_METHOD="${MIGRATE_METHOD:-rsync}"
-
 	einfo "Migrating from ${1} to ${2}..."
-	einfo "Migration method is ${MIGRATE_METHOD}."
 
 	# Strip trailing slash
 	if [ -z "${1##*/}" ]; then
@@ -1401,18 +1393,6 @@ migrate() {
 		if [ ! -L ${ROOT}${1} ]; then
 			einfo "  ${1} isn't a symlink, migrating..."
 			# Move everything
-			case "${MIGRATE_METHOD}" in
-				mv)
-					mv -f \
-						${ROOT}${1}/* \
-						${ROOT}${1}/.* \
-						${ROOT}${2} > ${T}/migrate-${1//\//-}.log 2>&1
-
-					check_migrate_return
-					# Don't do remove_migrated_files here because this isn't a
-					# copy
-					;;
-				rsync)
 					rsync \
 						--archive \
 						--update \
@@ -1426,33 +1406,6 @@ migrate() {
 
 					check_migrate_return
 					remove_migrated_files ${1}
-					;;
-				tar)
-					# Clearly we can't redirect stdout for the first half,
-					# because that's where the tar file is being sent.
-					tar \
-						-C ${ROOT}${1} \
-						--create \
-						--verbose \
-						. 2> ${T}/migrate-${1//\//-}.log \
-						|
-					tar \
-						-C ${ROOT}${2} \
-						--extract \
-						--verbose \
-						--preserve-permissions \
-						--atime-preserve \
-						--same-owner >> ${T}/migrate-${1//\//-}.log 2>&1
-						# Doesn't work properly
-						# --keep-newer-files
-
-					check_migrate_return
-					remove_migrated_files ${1}
-					;;
-				*)
-					die "MIGRATE_METHOD unspecified. Set it to mv, rsync or tar."
-					;;
-			esac
 
 			if [ -e "${ROOT}${1}" ]; then
 				# Remove any floating .keep files so we can run rmdir
@@ -1474,9 +1427,9 @@ migrate() {
 check_migrate_return() {
 	MIGRATE_RETURN="$?"
 	if [ "${MIGRATE_RETURN}" -eq "0" ]; then
-		einfo "${MIGRATE_METHOD} successful!"
+		einfo "rsync successful!"
 	else
-		die "${MIGRATE_METHOD} failed. Exit code: ${MIGRATE_RETURN}."
+		die "rsync failed. Exit code: ${MIGRATE_RETURN}."
 	fi
 
 	# Migration fubars lib symlinks -- eradicator
diff --git a/x11-base/xorg-x11/xorg-x11-6.8.99.8.ebuild b/x11-base/xorg-x11/xorg-x11-6.8.99.8.ebuild
index 6ec7d4c87058..f8413047093e 100644
--- a/x11-base/xorg-x11/xorg-x11-6.8.99.8.ebuild
+++ b/x11-base/xorg-x11/xorg-x11-6.8.99.8.ebuild
@@ -1,14 +1,10 @@
 # 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.99.8.ebuild,v 1.11 2005/06/01 10:22:43 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-x11/xorg-x11-6.8.99.8.ebuild,v 1.12 2005/06/01 10:25:57 spyderous Exp $
 
 # Set TDFX_RISKY to "yes" to get 16-bit, 1024x768 or higher on low-memory
 # voodoo3 cards.
 
-# What to use for migration from /usr/X11R6 to /usr -- mv, rsync or tar.
-# By default it uses 'rsync'.
-#MIGRATE_METHOD="rsync"
-
 # Libraries which are now supplied in shared form that were not in the past
 # include:  libFS.so, libGLw.so, libI810XvMC.so, libXRes.so, libXfontcache.so,
 # libXinerama.so, libXss.so, libXvMC.so, libXxf86rush.so, libfontenc.so,
@@ -145,7 +141,6 @@ pkg_setup() {
 	FILES_DIR="${WORKDIR}/files"
 	PATCHDIR="${WORKDIR}/patch"
 	EXCLUDED="${PATCHDIR}/excluded"
-	${MIGRATE_METHOD:+einfo Migration method is ${MIGRATE_METHOD}.}
 
 	# Set up CFLAG-related things
 	cflag_setup
@@ -1397,10 +1392,7 @@ fix_opengl_symlinks() {
 #
 # Takes two arguments -- starting location and ending location
 migrate() {
-	MIGRATE_METHOD="${MIGRATE_METHOD:-rsync}"
-
 	einfo "Migrating from ${1} to ${2}..."
-	einfo "Migration method is ${MIGRATE_METHOD}."
 
 	# Strip trailing slash
 	if [ -z "${1##*/}" ]; then
@@ -1412,58 +1404,19 @@ migrate() {
 		if [ ! -L ${ROOT}${1} ]; then
 			einfo "  ${1} isn't a symlink, migrating..."
 			# Move everything
-			case "${MIGRATE_METHOD}" in
-				mv)
-					mv -f \
-						${ROOT}${1}/* \
-						${ROOT}${1}/.* \
-						${ROOT}${2} > ${T}/migrate-${1//\//-}.log 2>&1
-
-					check_migrate_return
-					# Don't do remove_migrated_files here because this isn't a
-					# copy
-					;;
-				rsync)
-					rsync \
-						--archive \
-						--update \
-						--links \
-						--hard-links \
-						--ignore-existing \
-						--stats \
-						--progress \
-						--verbose \
-						${ROOT}${1}/ ${ROOT}${2} > ${T}/migrate-${1//\//-}.log 2>&1
-
-					check_migrate_return
-					remove_migrated_files ${1}
-					;;
-				tar)
-					# Clearly we can't redirect stdout for the first half,
-					# because that's where the tar file is being sent.
-					tar \
-						-C ${ROOT}${1} \
-						--create \
-						--verbose \
-						. 2> ${T}/migrate-${1//\//-}.log \
-						|
-					tar \
-						-C ${ROOT}${2} \
-						--extract \
-						--verbose \
-						--preserve-permissions \
-						--atime-preserve \
-						--same-owner >> ${T}/migrate-${1//\//-}.log 2>&1
-						# Doesn't work properly
-						# --keep-newer-files
-
-					check_migrate_return
-					remove_migrated_files ${1}
-					;;
-				*)
-					die "MIGRATE_METHOD unspecified. Set it to mv, rsync or tar."
-					;;
-			esac
+				rsync \
+					--archive \
+					--update \
+					--links \
+					--hard-links \
+					--ignore-existing \
+					--stats \
+					--progress \
+					--verbose \
+					${ROOT}${1}/ ${ROOT}${2} > ${T}/migrate-${1//\//-}.log 2>&1
+
+				check_migrate_return
+				remove_migrated_files ${1}
 
 			if [ -e "${ROOT}${1}" ]; then
 				# Remove any floating .keep files so we can run rmdir
@@ -1485,9 +1438,9 @@ migrate() {
 check_migrate_return() {
 	MIGRATE_RETURN="$?"
 	if [ "${MIGRATE_RETURN}" -eq "0" ]; then
-		einfo "${MIGRATE_METHOD} successful!"
+		einfo "rsync successful!"
 	else
-		die "${MIGRATE_METHOD} failed. Exit code: ${MIGRATE_RETURN}."
+		die "rsync failed. Exit code: ${MIGRATE_RETURN}."
 	fi
 
 	# Migration fubars lib symlinks -- eradicator