[gentoo-commits] repo/gentoo:master commit in: dev-ruby/rdoc/, eclass/

[gentoo-commits] repo/gentoo:master commit in: dev-ruby/rdoc/, eclass/

[Hans de Graaff]

commit:     e4752a480e4c944886310cb1defe0aee0312cead
Author:     Benda Xu <heroxbd <AT> gentoo <DOT> org>
AuthorDate: Sun Dec 26 09:52:13 2021 +0000
Commit:     Hans de Graaff <graaff <AT> gentoo <DOT> org>
CommitDate: Sat Mar 26 14:30:26 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e4752a48

dev-ruby/rdoc: remove the hprefixify command on shebangs.

If two ruby targets are specified, the scripts get `/usr/bin/env ruby`
shebangs.  "env ruby" is then replaced in the ebuilds to be
"ruby${ver}" (ruby27 or ruby30).  They needs to be prefixified.

Contrastingly, when there is one ruby target, the shebang is the
correct EPREFIX/usr/bin/ruby${ver}.  No prefixify should be applied.

To unify the two cases, the shebangs for the two-ruby-target case are
changed to be `EPREFIX/usr/bin/env ruby`.

Reference: https://github.com/gentoo/gentoo/pull/21046
Package-Manager: Portage-3.0.28, Repoman-3.0.3
Signed-off-by: Benda Xu <heroxbd <AT> gentoo.org>
Signed-off-by: Hans de Graaff <graaff <AT> gentoo.org>

 dev-ruby/rdoc/rdoc-6.3.2.ebuild    | 3 +--
 dev-ruby/rdoc/rdoc-6.3.3-r1.ebuild | 3 +--
 dev-ruby/rdoc/rdoc-6.3.3.ebuild    | 3 +--
 eclass/ruby-fakegem.eclass         | 2 +-
 4 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/dev-ruby/rdoc/rdoc-6.3.2.ebuild b/dev-ruby/rdoc/rdoc-6.3.2.ebuild
index 44aab8aec7e4..be4d9995ff2f 100644
--- a/dev-ruby/rdoc/rdoc-6.3.2.ebuild
+++ b/dev-ruby/rdoc/rdoc-6.3.2.ebuild
@@ -13,7 +13,7 @@ RUBY_FAKEGEM_BINDIR="exe"
 
 RUBY_FAKEGEM_GEMSPEC="rdoc.gemspec"
 
-inherit prefix ruby-fakegem
+inherit ruby-fakegem
 
 DESCRIPTION="An extended version of the RDoc library from Ruby 1.8"
 HOMEPAGE="https://github.com/ruby/rdoc/"
@@ -82,7 +82,6 @@ all_ruby_install() {
 				ruby_fakegem_binwrapper $bin /usr/bin/${bin}${version}
 				sed -i -e "1s/env ruby/ruby${version}/" \
 					"${ED}/usr/bin/${bin}${version}" || die
-				use prefix && hprefixify "${ED}/usr/bin/${bin}${version}"
 			fi
 		done
 	done

diff --git a/dev-ruby/rdoc/rdoc-6.3.3-r1.ebuild b/dev-ruby/rdoc/rdoc-6.3.3-r1.ebuild
index c77b59a31571..feff109f3ce8 100644
--- a/dev-ruby/rdoc/rdoc-6.3.3-r1.ebuild
+++ b/dev-ruby/rdoc/rdoc-6.3.3-r1.ebuild
@@ -13,7 +13,7 @@ RUBY_FAKEGEM_BINDIR="exe"
 
 RUBY_FAKEGEM_GEMSPEC="rdoc.gemspec"
 
-inherit prefix ruby-fakegem
+inherit ruby-fakegem
 
 DESCRIPTION="An extended version of the RDoc library from Ruby 1.8"
 HOMEPAGE="https://github.com/ruby/rdoc/"
@@ -82,7 +82,6 @@ all_ruby_install() {
 				ruby_fakegem_binwrapper $bin /usr/bin/${bin}${version}
 				sed -i -e "1s/env ruby/ruby${version}/" \
 					"${ED}/usr/bin/${bin}${version}" || die
-				use prefix && hprefixify "${ED}/usr/bin/${bin}${version}"
 			fi
 		done
 	done

diff --git a/dev-ruby/rdoc/rdoc-6.3.3.ebuild b/dev-ruby/rdoc/rdoc-6.3.3.ebuild
index c0a2e2d90b56..507317f9b0a0 100644
--- a/dev-ruby/rdoc/rdoc-6.3.3.ebuild
+++ b/dev-ruby/rdoc/rdoc-6.3.3.ebuild
@@ -13,7 +13,7 @@ RUBY_FAKEGEM_BINDIR="exe"
 
 RUBY_FAKEGEM_GEMSPEC="rdoc.gemspec"
 
-inherit prefix ruby-fakegem
+inherit ruby-fakegem
 
 DESCRIPTION="An extended version of the RDoc library from Ruby 1.8"
 HOMEPAGE="https://github.com/ruby/rdoc/"
@@ -82,7 +82,6 @@ all_ruby_install() {
 				ruby_fakegem_binwrapper $bin /usr/bin/${bin}${version}
 				sed -i -e "1s/env ruby/ruby${version}/" \
 					"${ED}/usr/bin/${bin}${version}" || die
-				use prefix && hprefixify "${ED}/usr/bin/${bin}${version}"
 			fi
 		done
 	done

diff --git a/eclass/ruby-fakegem.eclass b/eclass/ruby-fakegem.eclass
index 89bb97947b48..690709f20752 100644
--- a/eclass/ruby-fakegem.eclass
+++ b/eclass/ruby-fakegem.eclass
@@ -396,7 +396,7 @@ ruby_fakegem_binwrapper() {
 				# if another implementation already arrived, then make
 				# it generic and break out of the loop. This ensures
 				# that we do at most two iterations.
-				rubycmd="/usr/bin/env ruby"
+				rubycmd="${EPREFIX}/usr/bin/env ruby"
 				break
 			fi
 		done