Patch for prefix support

Package-Manager: portage-2.1.8.3/cvs/Linux x86_64

4 files changed, 172 insertions, 2 deletions

diff --git a/app-admin/eselect-vi/ChangeLog b/app-admin/eselect-vi/ChangeLog
index 82c64403712a..67c16de22a9e 100644
--- a/app-admin/eselect-vi/ChangeLog
+++ b/app-admin/eselect-vi/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-admin/eselect-vi
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/eselect-vi/ChangeLog,v 1.35 2010/04/23 18:41:59 lack Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/eselect-vi/ChangeLog,v 1.36 2010/04/26 02:36:14 lack Exp $
+
+*eselect-vi-1.1.7-r1 (26 Apr 2010)
+
+  26 Apr 2010; Jim Ramsay <lack@gentoo.org> +eselect-vi-1.1.7-r1.ebuild,
+  +files/eselect-vi-1.1.7-prefix.patch:
+  Patch for prefix support
 
 *eselect-vi-1.1.7 (23 Apr 2010)
 
diff --git a/app-admin/eselect-vi/Manifest b/app-admin/eselect-vi/Manifest
index b3f7b5f21f98..3308d42aa8ff 100644
--- a/app-admin/eselect-vi/Manifest
+++ b/app-admin/eselect-vi/Manifest
@@ -1,3 +1,4 @@
+AUX eselect-vi-1.1.7-prefix.patch 4518 RMD160 9c586f429919d1100fef9ab12697b617b8283a3e SHA1 6b6bb50b7d804d4ae3b35291efbbe4ad23c3c3fc SHA256 657ffae82d901af71b3e08afa4a2338107c46a223fb7dca53ea65700b045ce9f
 DIST vi.eselect-1.1.4.bz2 1638 RMD160 622974905142cb15242afba091753388f250ea78 SHA1 9ca24565fa937e4074dc2c06f41f68ab2b272abd SHA256 5dfc3efd9a64c03c7350fee62d025d0d318ab8c4089677ccdeb2098e422de012
 DIST vi.eselect-1.1.5.bz2 1674 RMD160 84f0d87abebb0f29e16c79803d69d41a182a1a71 SHA1 46ed957653d8e5610accce5c3054560329f9ab1d SHA256 15c972d807227a127029b1542337c1321bcb3196b0bd25806fb9c7d64c1787d5
 DIST vi.eselect-1.1.6.bz2 1718 RMD160 305234b81592a4a9cec59b308e21fd45af5d41f8 SHA1 dda2b2d7ac38363662cf0ee91fa68511eb4945d8 SHA256 8b58206cb39c05d51a48c5d83c69746f9f3dc005fd4a469249ed5b2ff51a0625
@@ -5,6 +6,7 @@ DIST vi.eselect-1.1.7.bz2 1709 RMD160 0d60154e47054bc93e8ee006e2a60a2b15b149bc S
 EBUILD eselect-vi-1.1.4.ebuild 635 RMD160 ab3de07a8a3c421ffb27998e5b4bc14cfd91c8d9 SHA1 d7b22d986550532fc8221be24575435c6ef28fa4 SHA256 c16bc4904904202c251c70d7b866ac74546c20b6a178da9b943aeea2ad138184
 EBUILD eselect-vi-1.1.5.ebuild 637 RMD160 e72494c1f934223bd475e7045f533d6617c9ba58 SHA1 7197c4d172bc3576081a244e612c8cf623a0ff19 SHA256 38ff5adddb7f3af2f4b13b912c90d44c484cd5f07499953844a4f8754fcb3c30
 EBUILD eselect-vi-1.1.6.ebuild 649 RMD160 aad7124b58bc075b5014afbca272a3cdacf682c3 SHA1 8285e51873a929fac5c61e44daf3a42bacd5ffe1 SHA256 61931f37e467d84aefe2d46239be5f6238ac2ceb7862c5415b311ccbabefdea2
+EBUILD eselect-vi-1.1.7-r1.ebuild 731 RMD160 395c2630c84ffcf6abe3a2501e1413483f4e2adf SHA1 6117d26db7b775831c6aef642024afe9d015423c SHA256 a735421e48fb9bde1b090168df5b2231dea576951b5e09301e2c71c05e7743cc
 EBUILD eselect-vi-1.1.7.ebuild 646 RMD160 4fcd260d8ad718f68fbda1781de84053fd753c69 SHA1 41c03919bf4cc6fc3ef1c88bb39e65ba002b2eba SHA256 5b6f3f8411b426fe2ed3b358480f846bcaf8ec2edaf25e9d23084922a9f01f11
-MISC ChangeLog 4541 RMD160 10629a98b59efd787eb326b66001231bffe42358 SHA1 db7e62af002e5037de5917e7cb0c5c27675d2979 SHA256 fef21fd9d18412bde52164d400c41cfca946d4fb12106ab24ff44f18b3beb578
+MISC ChangeLog 4718 RMD160 3e06ba5ffe9375c926c7b17d689f2f1e2668456d SHA1 1238cdb9bddd9fd84e33eb6a4826389a79a7c55b SHA256 584716e5eb155115dae13282f3695fef8fe4e0c44fb773f1c81c34cb852572e1
 MISC metadata.xml 158 RMD160 c473986398a10870248cf48fd2e79cacb4442e06 SHA1 9907ceb491d9c0af01a10ff553d0c2f957861948 SHA256 a50f7e086b8e90ea2505c615c8a321faf36f785ad9d1d2b67f5f04876230027b
diff --git a/app-admin/eselect-vi/eselect-vi-1.1.7-r1.ebuild b/app-admin/eselect-vi/eselect-vi-1.1.7-r1.ebuild
new file mode 100644
index 000000000000..ada9e68b2fd2
--- /dev/null
+++ b/app-admin/eselect-vi/eselect-vi-1.1.7-r1.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-admin/eselect-vi/eselect-vi-1.1.7-r1.ebuild,v 1.1 2010/04/26 02:36:14 lack Exp $
+
+EAPI="3"
+inherit eutils
+
+DESCRIPTION="Manages the /usr/bin/vi symlink"
+HOMEPAGE="http://www.gentoo.org/"
+SRC_URI="mirror://gentoo/vi.eselect-${PV}.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~sparc-fbsd ~x86 ~x86-fbsd"
+IUSE=""
+
+RDEPEND=">=app-admin/eselect-1.0.6"
+
+src_prepare() {
+	epatch "${FILESDIR}/${P}-prefix.patch"
+}
+
+src_install() {
+	insinto /usr/share/eselect/modules
+	newins "${WORKDIR}/vi.eselect-${PV}" vi.eselect || die
+}
diff --git a/app-admin/eselect-vi/files/eselect-vi-1.1.7-prefix.patch b/app-admin/eselect-vi/files/eselect-vi-1.1.7-prefix.patch
new file mode 100644
index 000000000000..447e1fa56385
--- /dev/null
+++ b/app-admin/eselect-vi/files/eselect-vi-1.1.7-prefix.patch
@@ -0,0 +1,136 @@
+--- vi.eselect-1.1.7.orig	2010-04-24 16:16:14.000000000 +0200
++++ vi.eselect-1.1.7	2010-04-24 16:20:02.000000000 +0200
+@@ -12,13 +12,13 @@
+ find_targets() {
+ 	local f
+ 	for f in \
+-			"${ROOT}"/usr/bin/vim \
+-			"${ROOT}"/usr/bin/nvi \
+-			"${ROOT}"/usr/bin/elvis \
+-			"${ROOT}"/usr/bin/vile \
+-			"${ROOT}"/usr/bin/gvim \
+-			"${ROOT}"/usr/bin/xvile \
+-			"${ROOT}"/bin/busybox \
++			"${EROOT}"/usr/bin/vim \
++			"${EROOT}"/usr/bin/nvi \
++			"${EROOT}"/usr/bin/elvis \
++			"${EROOT}"/usr/bin/vile \
++			"${EROOT}"/usr/bin/gvim \
++			"${EROOT}"/usr/bin/xvile \
++			"${EROOT}"/bin/busybox \
+ 		; do
+ 		if [[ -f "${f}" ]] ; then
+ 			echo $(basename "${f}" )
+@@ -28,8 +28,8 @@
+ 
+ # try to remove the vi, ex, view and man vi symlinks
+ remove_symlinks() {
+-	rm -f "${ROOT}"/usr/bin/{vi,ex,view} &>/dev/null && \
+-	rm -f "${ROOT}"/usr/share/man/man1/{vi,ex,view}.1{,.gz,.bz2,.lzma} &>/dev/null
++	rm -f "${EROOT}"/usr/bin/{vi,ex,view} &>/dev/null && \
++	rm -f "${EROOT}"/usr/share/man/man1/{vi,ex,view}.1{,.gz,.bz2,.lzma} &>/dev/null
+ }
+ 
+ # set a man page symlink
+@@ -37,7 +37,7 @@
+ 	local target="${1}" link_name="${2}" x extension
+ 
+ 	for x in ".1" ".1.bz2" ".1.gz" ".1.lzma" ; do
+-		if [[ -e /usr/share/man/man1/${target}${x} ]] ; then
++		if [[ -e ${EROOT}/usr/share/man/man1/${target}${x} ]] ; then
+ 			extension="${x}"
+ 			break
+ 		fi
+@@ -49,7 +49,7 @@
+ 	fi
+ 
+ 	ln -s "${target}${extension}" \
+-		"${ROOT}/usr/share/man/man1/${link_name}${extension}"
++		"${EROOT}/usr/share/man/man1/${link_name}${extension}"
+ }
+ 
+ # set the vi, ex, view, and man vi symlinks
+@@ -62,9 +62,9 @@
+ 
+ 	local dir
+ 	if [[ ${target} == "busybox" ]]; then
+-		dir="${ROOT}/bin"
++		dir="${EROOT}/bin"
+ 	else
+-		dir="${ROOT}/usr/bin"
++		dir="${EROOT}/usr/bin"
+ 	fi
+ 
+ 	if [[ -f "${dir}/${target}" ]] ; then
+@@ -76,12 +76,12 @@
+ 		set_man_symlink "${target}" "view"
+ 
+ 		# it's not okay if these fail
+-		target=$(relative_name "${dir}/${target}" "${ROOT}/usr/bin")
+-		ln -s "${target}" "${ROOT}/usr/bin/vi" \
++		target=$(relative_name "${dir}/${target}" "${EROOT}/usr/bin")
++		ln -s "${target}" "${EROOT}/usr/bin/vi" \
+ 			|| die "Couldn't set ${target} /usr/bin/vi symlink"
+-		ln -s "${target}" "${ROOT}/usr/bin/ex" \
++		ln -s "${target}" "${EROOT}/usr/bin/ex" \
+ 			|| die "Couldn't set ${target} /usr/bin/ex symlink"
+-		ln -s "${target}" "${ROOT}/usr/bin/view" \
++		ln -s "${target}" "${EROOT}/usr/bin/view" \
+ 			|| die "Couldn't set ${target} /usr/bin/view symlink"
+ 	else
+ 		die -q  "Target \"${1}\" doesn't appear to be valid!"
+@@ -98,9 +98,9 @@
+ 	[[ -z "${@}" ]] || die -q "Too many parameters"
+ 
+ 	write_list_start "Current vi implementation:"
+-	if [[ -L "${ROOT}/usr/bin/vi" ]] ; then
+-		write_kv_list_entry "$(basename $(canonicalise ${ROOT}/usr/bin/vi ) )" ""
+-	elif [[ -e "${ROOT}/usr/bin/vi" ]] ; then
++	if [[ -L "${EROOT}/usr/bin/vi" ]] ; then
++		write_kv_list_entry "$(basename $(canonicalise ${EROOT}/usr/bin/vi ) )" ""
++	elif [[ -e "${EROOT}/usr/bin/vi" ]] ; then
+ 		write_kv_list_entry "(not a symlink)" ""
+ 	else
+ 		write_kv_list_entry "(unset)" ""
+@@ -120,7 +120,7 @@
+ 	targets=( $(find_targets ) )
+ 	for (( i = 0; i < ${#targets[@]}; i++ )); do
+ 		[[ ${targets[i]} = \
+-			$(basename "$(canonicalise "${ROOT}/usr/bin/vi")") ]] \
++			$(basename "$(canonicalise "${EROOT}/usr/bin/vi")") ]] \
+ 			&& targets[i]=$(highlight_marker "${targets[i]}")
+ 	done
+ 	write_list_start "Available vi implementations:"
+@@ -148,15 +148,15 @@
+ 	elif [[ -n "${2}" ]] ; then
+ 		die -q "Too many parameters"
+ 
+-	elif [[ -L "${ROOT}/usr/bin/vi" ]] ; then
++	elif [[ -L "${EROOT}/usr/bin/vi" ]] ; then
+ 		if ! remove_symlinks ; then
+ 			die -q "Can't remove existing provider"
+ 		elif ! set_symlinks "${1}" ; then
+ 			die -q "Can't set new provider"
+ 		fi
+ 
+-	elif [[ -e "${ROOT}/usr/bin/vi" ]] ; then
+-		die -q "Sorry, ${ROOT}/usr/bin/vi confuses me"
++	elif [[ -e "${EROOT}/usr/bin/vi" ]] ; then
++		die -q "Sorry, ${EROOT}/usr/bin/vi confuses me"
+ 
+ 	else
+ 		set_symlinks "${1}" || die -q "Can't set a new provider"
+@@ -177,11 +177,11 @@
+ 	[[ -z "${1}" ]] || ( [[ -z "${2}" ]] && [[ "${1}" == "--if-unset" ]] ) || \
+ 		die -q "Usage error"
+ 
+-	if [[ -L "${ROOT}/usr/bin/vi" ]] ; then
++	if [[ -L "${EROOT}/usr/bin/vi" ]] ; then
+ 		[[ ${1} == "--if-unset" ]] && return
+ 		remove_symlinks || die -q "Can't remove existing link"
+ 	fi
+-	if [[ -e "${ROOT}/usr/bin/vi" ]] ; then
++	if [[ -e "${EROOT}/usr/bin/vi" ]] ; then
+ 		die -q "Can't set a new provider"
+ 	elif ! [[ -z $(find_targets ) ]] ; then
+ 		set_symlinks 1 || die -q "Can't set a new provider"