commit: d86af57ab913cf65666db83a27462f28f8a38335 Author: Manuel Rüger <mrueg <AT> gentoo <DOT> org> AuthorDate: Sun Apr 16 01:51:05 2017 +0000 Commit: Manuel Rüger <mrueg <AT> gentoo <DOT> org> CommitDate: Sun Apr 16 01:52:08 2017 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d86af57a
app-eselect/eselect-vi: Remove old Package-Manager: Portage-2.3.5, Repoman-2.3.2 app-eselect/eselect-vi/Manifest | 2 - app-eselect/eselect-vi/eselect-vi-1.1.7-r1.ebuild | 25 ---- app-eselect/eselect-vi/eselect-vi-1.1.8.ebuild | 20 --- .../eselect-vi/files/eselect-vi-1.1.7-prefix.patch | 136 --------------------- 4 files changed, 183 deletions(-) diff --git a/app-eselect/eselect-vi/Manifest b/app-eselect/eselect-vi/Manifest index d6d90676a79..ad3d8a4e2c4 100644 --- a/app-eselect/eselect-vi/Manifest +++ b/app-eselect/eselect-vi/Manifest @@ -1,3 +1 @@ -DIST eselect-vi-1.1.8.tar.xz 6236 SHA256 c3b1f4233bec7b40568b6a9e7d74024d04440b00bc2490991d8737aa97c9ae58 SHA512 a54c4ce4f71d1368cf390b9c9326fe682839e375622d2ac4eeede6e38ebdb204b6a0e2d1776712f25c419e2043c86879a798c65155124ae951fbf6b5b1887fd2 WHIRLPOOL 15c377c9d0e14de7418c230c19814b6ee19aadf19c563b4eb675e47157807ef4423a5ac13fcd7cbea80c24f65ac637e27cfac72c323dc0f9d133c67883596642 DIST eselect-vi-1.1.9.tar.xz 6236 SHA256 e11592f4f48d16071f6248794e2f9116f716c78c1ba66b9181aa670ab9f71400 SHA512 618c83d1e93a6c137b1c787c9bf9df19b68b7ef6679ba6179f13582f67e494d365da778b4646aff4af7196399468204c249e59e104a69851bb411fff1b3d038f WHIRLPOOL c898788019a4e79ab1dee38cc3d8d3878c25651bba7e83fae1e97a05abd7222b5d514d985f3ed9ff5861af72c2255521b0db66c6d6c8f8e97beb0597344eca82 -DIST vi.eselect-1.1.7.bz2 1709 SHA256 e3eecf0a2ca97d1a3f66b36d7cd431fad428493ba9b43a446a6772aaa7e34072 SHA512 72f8310cf9d3decdadaae95b515318285b4d3105ff57e72e15cd2724bedaa1684943ce21c42420e23412b0dbb53f042f15cc27e6e5ee7537b457583d71271ef1 WHIRLPOOL d726d45fa7cef77180914a791017f6d865e08e035fb1a7cd3098a83c454d5ba654a173001bf3584330b69382c545b633fab7aef4853cfc62284d166b945adb36 diff --git a/app-eselect/eselect-vi/eselect-vi-1.1.7-r1.ebuild b/app-eselect/eselect-vi/eselect-vi-1.1.7-r1.ebuild deleted file mode 100644 index a7b54ce1ff0..00000000000 --- a/app-eselect/eselect-vi/eselect-vi-1.1.7-r1.ebuild +++ /dev/null @@ -1,25 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI="3" -inherit eutils - -DESCRIPTION="Manages the /usr/bin/vi symlink" -HOMEPAGE="https://www.gentoo.org/"; -SRC_URI="mirror://gentoo/vi.eselect-${PV}.bz2" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" -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-eselect/eselect-vi/eselect-vi-1.1.8.ebuild b/app-eselect/eselect-vi/eselect-vi-1.1.8.ebuild deleted file mode 100644 index fc56b3e376a..00000000000 --- a/app-eselect/eselect-vi/eselect-vi-1.1.8.ebuild +++ /dev/null @@ -1,20 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -DESCRIPTION="Manages the /usr/bin/vi symlink" -HOMEPAGE="https://www.gentoo.org/"; -SRC_URI="https://dev.gentoo.org/~yngwin/distfiles/${P}.tar.xz"; - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" -IUSE="" - -RDEPEND=">=app-admin/eselect-1.0.6" - -src_install() { - insinto /usr/share/eselect/modules - doins vi.eselect || die -} diff --git a/app-eselect/eselect-vi/files/eselect-vi-1.1.7-prefix.patch b/app-eselect/eselect-vi/files/eselect-vi-1.1.7-prefix.patch deleted file mode 100644 index 447e1fa5638..00000000000 --- a/app-eselect/eselect-vi/files/eselect-vi-1.1.7-prefix.patch +++ /dev/null @@ -1,136 +0,0 @@ ---- 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"
