diff options
| author |   Hans de Graaff <hans@degraaff.org> | 2019-01-21 19:20:04 +0100 |
|---|---|---|
| committer | Hans de Graaff <hans@degraaff.org> | 2019-01-21 19:31:24 +0100 |
| commit | d6f5cc047dde8884047d68e7fd2a9f25060b5bf1 (patch) | |
| tree | e2ded47b902716b1c05e886cfd4bd6237b80253b | |
| parent | Add ruby26 to the stats scripts (diff) | |
| download | ruby-scripts-d6f5cc047dde8884047d68e7fd2a9f25060b5bf1.tar.gz ruby-scripts-d6f5cc047dde8884047d68e7fd2a9f25060b5bf1.tar.bz2 ruby-scripts-d6f5cc047dde8884047d68e7fd2a9f25060b5bf1.zip | |
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@degraaff.org>
| -rw-r--r-- | eselect-ruby/ruby.eselect | 10 |
1 files 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 |