diff options
| author |   Benda Xu <heroxbd@gentoo.org> | 2017-10-01 20:45:14 +0900 |
|---|---|---|
| committer | Benda Xu <heroxbd@gentoo.org> | 2017-10-01 20:58:39 +0900 |
| commit | e51a85838183c48ca15f54e79860131e1c764e74 (patch) | |
| tree | 0d3daf1ed45c0ef26a1fc968bfe6fa6d00773383 /dev-lang | |
| parent | net-print/cups-filters: stabilise 1.16.4 for amd64/x86 (diff) | |
| download | gentoo-e51a85838183c48ca15f54e79860131e1c764e74.tar.gz gentoo-e51a85838183c48ca15f54e79860131e1c764e74.tar.bz2 gentoo-e51a85838183c48ca15f54e79860131e1c764e74.zip | |
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
Diffstat (limited to 'dev-lang')
| -rw-r--r-- | dev-lang/ruby/ruby-2.4.2.ebuild | 14 |
1 files 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 157a4e057d96..40680044bd28 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 |