| 1 |
ulm 15/03/31 16:58:01 |
| 2 |
|
| 3 |
Added: eselect-vi-1.1.7-prefix.patch |
| 4 |
Log: |
| 5 |
Move package from app-admin to app-eselect category. |
| 6 |
|
| 7 |
(Portage version: 2.2.18/cvs/Linux x86_64, RepoMan options: --force, signed Manifest commit with key 9433907D693FB5B8!) |
| 8 |
|
| 9 |
Revision Changes Path |
| 10 |
1.1 app-eselect/eselect-vi/files/eselect-vi-1.1.7-prefix.patch |
| 11 |
|
| 12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-eselect/eselect-vi/files/eselect-vi-1.1.7-prefix.patch?rev=1.1&view=markup |
| 13 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-eselect/eselect-vi/files/eselect-vi-1.1.7-prefix.patch?rev=1.1&content-type=text/plain |
| 14 |
|
| 15 |
Index: eselect-vi-1.1.7-prefix.patch |
| 16 |
=================================================================== |
| 17 |
--- vi.eselect-1.1.7.orig 2010-04-24 16:16:14.000000000 +0200 |
| 18 |
+++ vi.eselect-1.1.7 2010-04-24 16:20:02.000000000 +0200 |
| 19 |
@@ -12,13 +12,13 @@ |
| 20 |
find_targets() { |
| 21 |
local f |
| 22 |
for f in \ |
| 23 |
- "${ROOT}"/usr/bin/vim \ |
| 24 |
- "${ROOT}"/usr/bin/nvi \ |
| 25 |
- "${ROOT}"/usr/bin/elvis \ |
| 26 |
- "${ROOT}"/usr/bin/vile \ |
| 27 |
- "${ROOT}"/usr/bin/gvim \ |
| 28 |
- "${ROOT}"/usr/bin/xvile \ |
| 29 |
- "${ROOT}"/bin/busybox \ |
| 30 |
+ "${EROOT}"/usr/bin/vim \ |
| 31 |
+ "${EROOT}"/usr/bin/nvi \ |
| 32 |
+ "${EROOT}"/usr/bin/elvis \ |
| 33 |
+ "${EROOT}"/usr/bin/vile \ |
| 34 |
+ "${EROOT}"/usr/bin/gvim \ |
| 35 |
+ "${EROOT}"/usr/bin/xvile \ |
| 36 |
+ "${EROOT}"/bin/busybox \ |
| 37 |
; do |
| 38 |
if [[ -f "${f}" ]] ; then |
| 39 |
echo $(basename "${f}" ) |
| 40 |
@@ -28,8 +28,8 @@ |
| 41 |
|
| 42 |
# try to remove the vi, ex, view and man vi symlinks |
| 43 |
remove_symlinks() { |
| 44 |
- rm -f "${ROOT}"/usr/bin/{vi,ex,view} &>/dev/null && \ |
| 45 |
- rm -f "${ROOT}"/usr/share/man/man1/{vi,ex,view}.1{,.gz,.bz2,.lzma} &>/dev/null |
| 46 |
+ rm -f "${EROOT}"/usr/bin/{vi,ex,view} &>/dev/null && \ |
| 47 |
+ rm -f "${EROOT}"/usr/share/man/man1/{vi,ex,view}.1{,.gz,.bz2,.lzma} &>/dev/null |
| 48 |
} |
| 49 |
|
| 50 |
# set a man page symlink |
| 51 |
@@ -37,7 +37,7 @@ |
| 52 |
local target="${1}" link_name="${2}" x extension |
| 53 |
|
| 54 |
for x in ".1" ".1.bz2" ".1.gz" ".1.lzma" ; do |
| 55 |
- if [[ -e /usr/share/man/man1/${target}${x} ]] ; then |
| 56 |
+ if [[ -e ${EROOT}/usr/share/man/man1/${target}${x} ]] ; then |
| 57 |
extension="${x}" |
| 58 |
break |
| 59 |
fi |
| 60 |
@@ -49,7 +49,7 @@ |
| 61 |
fi |
| 62 |
|
| 63 |
ln -s "${target}${extension}" \ |
| 64 |
- "${ROOT}/usr/share/man/man1/${link_name}${extension}" |
| 65 |
+ "${EROOT}/usr/share/man/man1/${link_name}${extension}" |
| 66 |
} |
| 67 |
|
| 68 |
# set the vi, ex, view, and man vi symlinks |
| 69 |
@@ -62,9 +62,9 @@ |
| 70 |
|
| 71 |
local dir |
| 72 |
if [[ ${target} == "busybox" ]]; then |
| 73 |
- dir="${ROOT}/bin" |
| 74 |
+ dir="${EROOT}/bin" |
| 75 |
else |
| 76 |
- dir="${ROOT}/usr/bin" |
| 77 |
+ dir="${EROOT}/usr/bin" |
| 78 |
fi |
| 79 |
|
| 80 |
if [[ -f "${dir}/${target}" ]] ; then |
| 81 |
@@ -76,12 +76,12 @@ |
| 82 |
set_man_symlink "${target}" "view" |
| 83 |
|
| 84 |
# it's not okay if these fail |
| 85 |
- target=$(relative_name "${dir}/${target}" "${ROOT}/usr/bin") |
| 86 |
- ln -s "${target}" "${ROOT}/usr/bin/vi" \ |
| 87 |
+ target=$(relative_name "${dir}/${target}" "${EROOT}/usr/bin") |
| 88 |
+ ln -s "${target}" "${EROOT}/usr/bin/vi" \ |
| 89 |
|| die "Couldn't set ${target} /usr/bin/vi symlink" |
| 90 |
- ln -s "${target}" "${ROOT}/usr/bin/ex" \ |
| 91 |
+ ln -s "${target}" "${EROOT}/usr/bin/ex" \ |
| 92 |
|| die "Couldn't set ${target} /usr/bin/ex symlink" |
| 93 |
- ln -s "${target}" "${ROOT}/usr/bin/view" \ |
| 94 |
+ ln -s "${target}" "${EROOT}/usr/bin/view" \ |
| 95 |
|| die "Couldn't set ${target} /usr/bin/view symlink" |
| 96 |
else |
| 97 |
die -q "Target \"${1}\" doesn't appear to be valid!" |
| 98 |
@@ -98,9 +98,9 @@ |
| 99 |
[[ -z "${@}" ]] || die -q "Too many parameters" |
| 100 |
|
| 101 |
write_list_start "Current vi implementation:" |
| 102 |
- if [[ -L "${ROOT}/usr/bin/vi" ]] ; then |
| 103 |
- write_kv_list_entry "$(basename $(canonicalise ${ROOT}/usr/bin/vi ) )" "" |
| 104 |
- elif [[ -e "${ROOT}/usr/bin/vi" ]] ; then |
| 105 |
+ if [[ -L "${EROOT}/usr/bin/vi" ]] ; then |
| 106 |
+ write_kv_list_entry "$(basename $(canonicalise ${EROOT}/usr/bin/vi ) )" "" |
| 107 |
+ elif [[ -e "${EROOT}/usr/bin/vi" ]] ; then |
| 108 |
write_kv_list_entry "(not a symlink)" "" |
| 109 |
else |
| 110 |
write_kv_list_entry "(unset)" "" |
| 111 |
@@ -120,7 +120,7 @@ |
| 112 |
targets=( $(find_targets ) ) |
| 113 |
for (( i = 0; i < ${#targets[@]}; i++ )); do |
| 114 |
[[ ${targets[i]} = \ |
| 115 |
- $(basename "$(canonicalise "${ROOT}/usr/bin/vi")") ]] \ |
| 116 |
+ $(basename "$(canonicalise "${EROOT}/usr/bin/vi")") ]] \ |
| 117 |
&& targets[i]=$(highlight_marker "${targets[i]}") |
| 118 |
done |
| 119 |
write_list_start "Available vi implementations:" |
| 120 |
@@ -148,15 +148,15 @@ |
| 121 |
elif [[ -n "${2}" ]] ; then |
| 122 |
die -q "Too many parameters" |
| 123 |
|
| 124 |
- elif [[ -L "${ROOT}/usr/bin/vi" ]] ; then |
| 125 |
+ elif [[ -L "${EROOT}/usr/bin/vi" ]] ; then |
| 126 |
if ! remove_symlinks ; then |
| 127 |
die -q "Can't remove existing provider" |
| 128 |
elif ! set_symlinks "${1}" ; then |
| 129 |
die -q "Can't set new provider" |
| 130 |
fi |
| 131 |
|
| 132 |
- elif [[ -e "${ROOT}/usr/bin/vi" ]] ; then |
| 133 |
- die -q "Sorry, ${ROOT}/usr/bin/vi confuses me" |
| 134 |
+ elif [[ -e "${EROOT}/usr/bin/vi" ]] ; then |
| 135 |
+ die -q "Sorry, ${EROOT}/usr/bin/vi confuses me" |
| 136 |
|
| 137 |
else |
| 138 |
set_symlinks "${1}" || die -q "Can't set a new provider" |
| 139 |
@@ -177,11 +177,11 @@ |
| 140 |
[[ -z "${1}" ]] || ( [[ -z "${2}" ]] && [[ "${1}" == "--if-unset" ]] ) || \ |
| 141 |
die -q "Usage error" |
| 142 |
|
| 143 |
- if [[ -L "${ROOT}/usr/bin/vi" ]] ; then |
| 144 |
+ if [[ -L "${EROOT}/usr/bin/vi" ]] ; then |
| 145 |
[[ ${1} == "--if-unset" ]] && return |
| 146 |
remove_symlinks || die -q "Can't remove existing link" |
| 147 |
fi |
| 148 |
- if [[ -e "${ROOT}/usr/bin/vi" ]] ; then |
| 149 |
+ if [[ -e "${EROOT}/usr/bin/vi" ]] ; then |
| 150 |
die -q "Can't set a new provider" |
| 151 |
elif ! [[ -z $(find_targets ) ]] ; then |
| 152 |
set_symlinks 1 || die -q "Can't set a new provider" |
Archives