From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-963075-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 F052E139695
for <garchives@archives.gentoo.org>; Sun, 23 Jul 2017 07:46:26 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
by pigeon.gentoo.org (Postfix) with SMTP id 442751FC03C;
Sun, 23 Jul 2017 07:46:26 +0000 (UTC)
Received: from smtp.gentoo.org (dev.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4])
(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 21E8E1FC03C
for <gentoo-commits@lists.gentoo.org>; Sun, 23 Jul 2017 07:46:26 +0000 (UTC)
Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84])
(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 EDD9234181B
for <gentoo-commits@lists.gentoo.org>; Sun, 23 Jul 2017 07:46:24 +0000 (UTC)
Received: from localhost.localdomain (localhost [IPv6:::1])
by oystercatcher.gentoo.org (Postfix) with ESMTP id BAD2974B5
for <gentoo-commits@lists.gentoo.org>; Sun, 23 Jul 2017 07:46:23 +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: <1500795316.550be1b9278fdbd713c29e6dff6833dc2ab4fb18.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: 550be1b9278fdbd713c29e6dff6833dc2ab4fb18
X-VCS-Branch: master
Date: Sun, 23 Jul 2017 07:46:23 +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-Archives-Salt: 81b2ea49-2f94-4606-ae97-c199cdf663b1
X-Archives-Hash: 3ab35aeec757acad8b20224165d85cb2
commit: 550be1b9278fdbd713c29e6dff6833dc2ab4fb18
Author: Hans de Graaff <hans <AT> degraaff <DOT> org>
AuthorDate: Mon May 30 16:57:53 2016 +0000
Commit: Hans de Graaff <graaff <AT> gentoo <DOT> org>
CommitDate: Sun Jul 23 07:35:16 2017 +0000
URL: https://gitweb.gentoo.org/proj/ruby-scripts.git/commit/?id=550be1b9
Remove legacy libruby.so link
Our ebuilds for Ruby 1.8 and older versions installed an unversioned
link called libruby.so. This method was flawed because the shared
library is not ABI compatible and thus cannot be managed by switching a
shared link. Later versions of Ruby ebuilds no longer install this link,
but on old systems a dangling link may still be present. This can lead
to problems with the cmake recipes for Ruby, bug 582672.
This patch removes the link when removing symlinks as part of an eselect
change.
eselect-ruby/ruby.eselect | 8 ++++++++
1 file changed, 8 insertions(+)
diff --git a/eselect-ruby/ruby.eselect b/eselect-ruby/ruby.eselect
index efead1e..1a7f059 100644
--- a/eselect-ruby/ruby.eselect
+++ b/eselect-ruby/ruby.eselect
@@ -8,6 +8,7 @@ SVN_DATE="20161226"
VERSION="20161226"
bindir=/usr/bin
+libdir=/usr/lib
man1dir=/usr/share/man/man1
find_targets() {
@@ -43,6 +44,13 @@ check_target() {
remove_symlinks() {
rm -f ${EROOT}${bindir}/{ruby,gem,irb,erb,ri,rdoc,testrb} && \
rm -f ${EROOT}${man1dir}/{ruby,irb,erb,ri}.1*
+
+ # Remove unversioned legacy link set by ruby 1.8 and earlier
+ # see bug 582672
+ local link="${EROOT}${libdir}/libruby.so"
+ if [[ -e ${link} ]]; then
+ rm -f ${link}
+ fi
}
create_man_links() {