diff options
| author |   Donnie Berkholz <spyderous@gentoo.org> | 2005-06-01 10:22:43 +0000 |
|---|---|---|
| committer | Donnie Berkholz <spyderous@gentoo.org> | 2005-06-01 10:22:43 +0000 |
| commit | b5b245822966968f9479b8ef4afaee2c74fe515a (patch) | |
| tree | 52d6fdbb21b74e199ace311b25b0dc6aac9dad75 /x11-base | |
| parent | Use '-lt' instead of '-le' for sse tests, so we don't do them on gcc-3.4.4. (diff) | |
| download | gentoo-2-b5b245822966968f9479b8ef4afaee2c74fe515a.tar.gz gentoo-2-b5b245822966968f9479b8ef4afaee2c74fe515a.tar.bz2 gentoo-2-b5b245822966968f9479b8ef4afaee2c74fe515a.zip | |
Remove a ton of commented-out migration code.
(Portage version: 2.0.51.22-r1)
Diffstat (limited to 'x11-base')
| -rw-r--r-- | x11-base/xorg-x11/ChangeLog | 6 | ||||
| -rw-r--r-- | x11-base/xorg-x11/xorg-x11-6.8.2-r2.ebuild | 53 | ||||
| -rw-r--r-- | x11-base/xorg-x11/xorg-x11-6.8.99.8.ebuild | 53 |
3 files changed, 7 insertions, 105 deletions
diff --git a/x11-base/xorg-x11/ChangeLog b/x11-base/xorg-x11/ChangeLog index fdbac6e509f5..3cdf04e3ce35 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.404 2005/06/01 10:16:50 spyderous Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-x11/ChangeLog,v 1.405 2005/06/01 10:22:43 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 a ton of commented-out migration code. 01 Jun 2005; Donnie Berkholz <spyderous@gentoo.org>; xorg-x11-6.8.2-r1.ebuild, xorg-x11-6.8.2-r2.ebuild, 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 d2ebb18a027e..70f87e326ede 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,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.2-r2.ebuild,v 1.21 2005/06/01 10:16:50 spyderous Exp $ +# $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 $ # Set TDFX_RISKY to "yes" to get 16-bit, 1024x768 or higher on low-memory # voodoo3 cards. @@ -1454,57 +1454,6 @@ migrate() { ;; esac -# # Move everything -# if [ "${MIGRATE_METHOD}" = "mv" ]; then -# 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 -# -# elif [ "${MIGRATE_METHOD}" = "rsync" ]; then -# 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} -# -# elif [ "${MIGRATE_METHOD}" = "tar" ]; then -# # 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} -# -# else -# die "MIGRATE_METHOD unspecified. Set it to mv, rsync or tar." -# fi - if [ -e "${ROOT}${1}" ]; then # Remove any floating .keep files so we can run rmdir find ${ROOT}${1} -name '\.keep' -exec rm -f {} \; 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 0a9c521c8e7d..6ec7d4c87058 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,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.99.8.ebuild,v 1.10 2005/06/01 10:16:50 spyderous Exp $ +# $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 $ # Set TDFX_RISKY to "yes" to get 16-bit, 1024x768 or higher on low-memory # voodoo3 cards. @@ -1465,57 +1465,6 @@ migrate() { ;; esac -# # Move everything -# if [ "${MIGRATE_METHOD}" = "mv" ]; then -# 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 -# -# elif [ "${MIGRATE_METHOD}" = "rsync" ]; then -# 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} -# -# elif [ "${MIGRATE_METHOD}" = "tar" ]; then -# # 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} -# -# else -# die "MIGRATE_METHOD unspecified. Set it to mv, rsync or tar." -# fi - if [ -e "${ROOT}${1}" ]; then # Remove any floating .keep files so we can run rmdir find ${ROOT}${1} -name '\.keep' -exec rm -f {} \; |