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 BDFAF1396D0 for ; Sun, 1 Oct 2017 11:58:55 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 0BB9EE0BE7; Sun, 1 Oct 2017 11:58:55 +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 D8A9EE0BE7 for ; Sun, 1 Oct 2017 11:58:54 +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 1FE6B341878 for ; Sun, 1 Oct 2017 11:58:53 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id AA82C8F66 for ; Sun, 1 Oct 2017 11:58:51 +0000 (UTC) From: "Benda XU" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Benda XU" Message-ID: <1506859119.e51a85838183c48ca15f54e79860131e1c764e74.heroxbd@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-lang/ruby/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-lang/ruby/ruby-2.4.2.ebuild X-VCS-Directories: dev-lang/ruby/ X-VCS-Committer: heroxbd X-VCS-Committer-Name: Benda XU X-VCS-Revision: e51a85838183c48ca15f54e79860131e1c764e74 X-VCS-Branch: master Date: Sun, 1 Oct 2017 11:58:51 +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: 238aba78-eb2c-42d4-87d9-376744db594b X-Archives-Hash: a4070868cdbda8337c384dc4a82052ca commit: e51a85838183c48ca15f54e79860131e1c764e74 Author: Benda Xu gentoo org> AuthorDate: Sun Oct 1 11:45:14 2017 +0000 Commit: Benda XU gentoo org> CommitDate: Sun Oct 1 11:58:39 2017 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e51a8583 dev-lang/ruby: support Prefix so as not to collide with rubygem. Credit: Martin Mokrejš Closes: https://bugs.gentoo.org/599378 Closes: https://bugs.gentoo.org/587524 Package-Manager: Portage-2.3.3, Repoman-2.3.1 dev-lang/ruby/ruby-2.4.2.ebuild | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/dev-lang/ruby/ruby-2.4.2.ebuild b/dev-lang/ruby/ruby-2.4.2.ebuild index 157a4e057d9..40680044bd2 100644 --- a/dev-lang/ruby/ruby-2.4.2.ebuild +++ b/dev-lang/ruby/ruby-2.4.2.ebuild @@ -193,8 +193,8 @@ src_install() { local MINIRUBY=$(echo -e 'include Makefile\ngetminiruby:\n\t@echo $(MINIRUBY)'|make -f - getminiruby) - LD_LIBRARY_PATH="${S}:${D}/usr/$(get_libdir)${LD_LIBRARY_PATH+:}${LD_LIBRARY_PATH}" - RUBYLIB="${S}:${D}/usr/$(get_libdir)/ruby/${RUBYVERSION}" + LD_LIBRARY_PATH="${S}:${ED}/usr/$(get_libdir)${LD_LIBRARY_PATH+:}${LD_LIBRARY_PATH}" + RUBYLIB="${S}:${ED}/usr/$(get_libdir)/ruby/${RUBYVERSION}" for d in $(find "${S}/ext" -type d) ; do RUBYLIB="${RUBYLIB}:$d" done @@ -203,10 +203,10 @@ src_install() { emake V=1 DESTDIR="${D}" install || die "make install failed" # Remove installed rubygems and rdoc copy - rm -rf "${D}/usr/$(get_libdir)/ruby/${RUBYVERSION}/rubygems" || die "rm rubygems failed" - rm -rf "${D}/usr/bin/"gem"${MY_SUFFIX}" || die "rm rdoc bins failed" - rm -rf "${D}/usr/$(get_libdir)/ruby/${RUBYVERSION}"/rdoc* || die "rm rdoc failed" - rm -rf "${D}/usr/bin/"{ri,rdoc}"${MY_SUFFIX}" || die "rm rdoc bins failed" + rm -rf "${ED}/usr/$(get_libdir)/ruby/${RUBYVERSION}/rubygems" || die "rm rubygems failed" + rm -rf "${ED}/usr/bin/"gem"${MY_SUFFIX}" || die "rm rdoc bins failed" + rm -rf "${ED}/usr/$(get_libdir)/ruby/${RUBYVERSION}"/rdoc* || die "rm rdoc failed" + rm -rf "${ED}/usr/bin/"{ri,rdoc}"${MY_SUFFIX}" || die "rm rdoc bins failed" if use doc; then make DESTDIR="${D}" install-doc || die "make install-doc failed" @@ -228,7 +228,7 @@ src_install() { } pkg_postinst() { - if [[ ! -n $(readlink "${ROOT}"usr/bin/ruby) ]] ; then + if [[ ! -n $(readlink "${EROOT}"usr/bin/ruby) ]] ; then eselect ruby set ruby${MY_SUFFIX} fi