[gentoo-commits] proj/ruby-scripts:master commit in: eselect-ruby/

[Hans de Graaff]

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