From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-1068088-garchives=archives.gentoo.org@lists.gentoo.org>
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 1CFC5138334
for <garchives@archives.gentoo.org>; Mon, 21 Jan 2019 18:36:31 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
by pigeon.gentoo.org (Postfix) with SMTP id 3E893E0B67;
Mon, 21 Jan 2019 18:36:30 +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 1BF9AE0B67
for <gentoo-commits@lists.gentoo.org>; Mon, 21 Jan 2019 18:36:29 +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 8D522335D35
for <gentoo-commits@lists.gentoo.org>; Mon, 21 Jan 2019 18:36:28 +0000 (UTC)
Received: from localhost.localdomain (localhost [IPv6:::1])
by oystercatcher.gentoo.org (Postfix) with ESMTP id E0D7444B
for <gentoo-commits@lists.gentoo.org>; Mon, 21 Jan 2019 18:36:26 +0000 (UTC)
From: "Hans de Graaff" <graaff@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Content-Transfer-Encoding: 8bit
Content-type: text/plain; charset=UTF-8
Reply-To: gentoo-dev@lists.gentoo.org, "Hans de Graaff" <graaff@gentoo.org>
Message-ID: <1548095484.d6f5cc047dde8884047d68e7fd2a9f25060b5bf1.graaff@gentoo>
Subject: [gentoo-commits] proj/ruby-scripts:master commit in: eselect-ruby/
X-VCS-Repository: proj/ruby-scripts
X-VCS-Files: eselect-ruby/ruby.eselect
X-VCS-Directories: eselect-ruby/
X-VCS-Committer: graaff
X-VCS-Committer-Name: Hans de Graaff
X-VCS-Revision: d6f5cc047dde8884047d68e7fd2a9f25060b5bf1
X-VCS-Branch: master
Date: Mon, 21 Jan 2019 18:36:26 +0000 (UTC)
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply
X-Archives-Salt: 03f0b5ae-9bfa-4f8e-898c-0c1af3b295c7
X-Archives-Hash: ed76dca974317895340d810d2c3a8b4b
commit: d6f5cc047dde8884047d68e7fd2a9f25060b5bf1
Author: Hans de Graaff <hans <AT> degraaff <DOT> org>
AuthorDate: Mon Jan 21 18:20:04 2019 +0000
Commit: Hans de Graaff <graaff <AT> gentoo <DOT> org>
CommitDate: Mon Jan 21 18:31:24 2019 +0000
URL: https://gitweb.gentoo.org/proj/ruby-scripts.git/commit/?id=d6f5cc04
Stop creating broken legacy testrb link
dev-lang/ruby no longer installs a testrb script, and
dev-ruby/test-unit installs testrb-2 which is not subject to the
eselect module. Stop installing a broken testrb link and remove it
when it still exists.
Bug: https://bugs.gentoo.org/644628
Signed-off-by: Hans de Graaff <hans <AT> degraaff.org>
eselect-ruby/ruby.eselect | 10 ++++++++--
1 file changed, 8 insertions(+), 2 deletions(-)
diff --git a/eselect-ruby/ruby.eselect b/eselect-ruby/ruby.eselect
index 0a01747..aa30fb0 100644
--- a/eselect-ruby/ruby.eselect
+++ b/eselect-ruby/ruby.eselect
@@ -41,9 +41,15 @@ check_target() {
}
remove_symlinks() {
- rm -f ${EROOT}${bindir}/{ruby,gem,irb,erb,ri,rdoc,testrb} && \
+ rm -f ${EROOT}${bindir}/{ruby,gem,irb,erb,ri,rdoc} && \
rm -f ${EROOT}${man1dir}/{ruby,irb,erb,ri}.1*
+ # Remove legacy testrb link if it still exists.
+ local testrb="${EROOT}${bindir}/testrb"
+ if [[ -L ${testrb} ]]; then
+ rm -f ${testrb}
+ fi
+
# Remove unversioned legacy link set by ruby 1.8 and earlier
# see bug 582672
local link="${EROOT}${libdir}/libruby.so"
@@ -72,7 +78,7 @@ create_symlinks() {
local path="${EROOT}${bindir}/"
# these have to work
- for f in "ruby" "irb" "erb" "ri" "testrb" "rdoc" ; do
+ for f in "ruby" "irb" "erb" "ri" "rdoc" ; do
ln -s "${f}${version}" "${path}${f}" || \
die -q "Could not set ${f} symlink"
done