From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 3EFA71396D9 for ; Thu, 26 Oct 2017 13:01:39 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 43F0A2BC012; Thu, 26 Oct 2017 13:01:37 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 151F02BC012 for ; Thu, 26 Oct 2017 13:01:37 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id D087733DDA5 for ; Thu, 26 Oct 2017 13:01:35 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 35CEF826 for ; Thu, 26 Oct 2017 13:01:34 +0000 (UTC) From: "Patrice Clement" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Patrice Clement" Message-ID: <1509022885.50686d6e0a840e65a2f040e43496148daed5bfb7.monsieurp@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: app-editors/gvim/ X-VCS-Repository: repo/gentoo X-VCS-Files: app-editors/gvim/gvim-8.0.1188.ebuild app-editors/gvim/gvim-9999.ebuild X-VCS-Directories: app-editors/gvim/ X-VCS-Committer: monsieurp X-VCS-Committer-Name: Patrice Clement X-VCS-Revision: 50686d6e0a840e65a2f040e43496148daed5bfb7 X-VCS-Branch: master Date: Thu, 26 Oct 2017 13:01:34 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: f6fe70b6-1d50-4144-8e13-5ce17f41b05b X-Archives-Hash: 09efa843f5ea892ee2a3d4a08009590a commit: 50686d6e0a840e65a2f040e43496148daed5bfb7 Author: Patrice Clement gentoo org> AuthorDate: Thu Oct 26 11:15:27 2017 +0000 Commit: Patrice Clement gentoo org> CommitDate: Thu Oct 26 13:01:25 2017 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=50686d6e app-editors/gvim: do away with symlinks and just call eselect vi update. This commit also update the 9999 ebuild. Bug: https://bugs.gentoo.org/635482 Package-Manager: Portage-2.3.8, Repoman-2.3.3 app-editors/gvim/gvim-8.0.1188.ebuild | 43 +++++++---------------------------- app-editors/gvim/gvim-9999.ebuild | 43 +++++++---------------------------- 2 files changed, 16 insertions(+), 70 deletions(-) diff --git a/app-editors/gvim/gvim-8.0.1188.ebuild b/app-editors/gvim/gvim-8.0.1188.ebuild index 779093320ac..b19e4d69230 100644 --- a/app-editors/gvim/gvim-8.0.1188.ebuild +++ b/app-editors/gvim/gvim-8.0.1188.ebuild @@ -302,39 +302,12 @@ src_test() { emake -j1 VIMPROG=../testvim -C src/testdir nongui } -# Make convenience symlinks, hopefully without stepping on toes. Some -# of these links are "owned" by the vim ebuild when it is installed, -# but they might be good for gvim as well (see bug 45828) -update_vim_symlinks() { - local f syms - syms="vimdiff rvim rview" +# Call eselect vi update with --if-unset +# to respect user's choice (bug 187449) +eselect_vi_update() { einfo "Calling eselect vi update..." - # Call this with --if-unset to respect user's choice (bug 187449) eselect vi update --if-unset - - # Make or remove convenience symlink, vim -> gvim - if [[ -f "${EROOT}"/usr/bin/gvim ]]; then - ln -s gvim "${EROOT}"/usr/bin/vim 2>/dev/null || die - elif [[ -L "${EROOT}"/usr/bin/vim && ! -f "${EROOT}"/usr/bin/vim ]]; then - rm "${EROOT}"/usr/bin/vim || die - fi - - # Make or remove convenience symlinks to vim - if [[ -f "${EROOT}"/usr/bin/vim ]]; then - for f in ${syms}; do - ln -s vim "${EROOT}"/usr/bin/${f} 2>/dev/null || die - done - else - for f in ${syms}; do - if [[ -L "${EROOT}"/usr/bin/${f} && ! -f "${EROOT}"/usr/bin/${f} ]]; then - rm -v "${EROOT}"/usr/bin/${f} || die - fi - done - fi - - # This will still break if you merge then remove the vi package, - # but there's only so much you can do, eh? Unfortunately we don't - # have triggers like are done in rpm-land. + eend $? } src_install() { @@ -379,8 +352,8 @@ pkg_postinst() { # Update icon cache gnome2_icon_cache_update - # Make convenience symlinks - update_vim_symlinks + # Call eselect vi update + eselect_vi_update } pkg_postrm() { @@ -393,6 +366,6 @@ pkg_postrm() { # Update icon cache gnome2_icon_cache_update - # Make convenience symlinks - update_vim_symlinks + # Call eselect vi update + eselect_vi_update } diff --git a/app-editors/gvim/gvim-9999.ebuild b/app-editors/gvim/gvim-9999.ebuild index 779093320ac..b19e4d69230 100644 --- a/app-editors/gvim/gvim-9999.ebuild +++ b/app-editors/gvim/gvim-9999.ebuild @@ -302,39 +302,12 @@ src_test() { emake -j1 VIMPROG=../testvim -C src/testdir nongui } -# Make convenience symlinks, hopefully without stepping on toes. Some -# of these links are "owned" by the vim ebuild when it is installed, -# but they might be good for gvim as well (see bug 45828) -update_vim_symlinks() { - local f syms - syms="vimdiff rvim rview" +# Call eselect vi update with --if-unset +# to respect user's choice (bug 187449) +eselect_vi_update() { einfo "Calling eselect vi update..." - # Call this with --if-unset to respect user's choice (bug 187449) eselect vi update --if-unset - - # Make or remove convenience symlink, vim -> gvim - if [[ -f "${EROOT}"/usr/bin/gvim ]]; then - ln -s gvim "${EROOT}"/usr/bin/vim 2>/dev/null || die - elif [[ -L "${EROOT}"/usr/bin/vim && ! -f "${EROOT}"/usr/bin/vim ]]; then - rm "${EROOT}"/usr/bin/vim || die - fi - - # Make or remove convenience symlinks to vim - if [[ -f "${EROOT}"/usr/bin/vim ]]; then - for f in ${syms}; do - ln -s vim "${EROOT}"/usr/bin/${f} 2>/dev/null || die - done - else - for f in ${syms}; do - if [[ -L "${EROOT}"/usr/bin/${f} && ! -f "${EROOT}"/usr/bin/${f} ]]; then - rm -v "${EROOT}"/usr/bin/${f} || die - fi - done - fi - - # This will still break if you merge then remove the vi package, - # but there's only so much you can do, eh? Unfortunately we don't - # have triggers like are done in rpm-land. + eend $? } src_install() { @@ -379,8 +352,8 @@ pkg_postinst() { # Update icon cache gnome2_icon_cache_update - # Make convenience symlinks - update_vim_symlinks + # Call eselect vi update + eselect_vi_update } pkg_postrm() { @@ -393,6 +366,6 @@ pkg_postrm() { # Update icon cache gnome2_icon_cache_update - # Make convenience symlinks - update_vim_symlinks + # Call eselect vi update + eselect_vi_update }