| 1 |
commit: e4752a480e4c944886310cb1defe0aee0312cead |
| 2 |
Author: Benda Xu <heroxbd <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sun Dec 26 09:52:13 2021 +0000 |
| 4 |
Commit: Hans de Graaff <graaff <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sat Mar 26 14:30:26 2022 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e4752a48 |
| 7 |
|
| 8 |
dev-ruby/rdoc: remove the hprefixify command on shebangs. |
| 9 |
|
| 10 |
If two ruby targets are specified, the scripts get `/usr/bin/env ruby` |
| 11 |
shebangs. "env ruby" is then replaced in the ebuilds to be |
| 12 |
"ruby${ver}" (ruby27 or ruby30). They needs to be prefixified. |
| 13 |
|
| 14 |
Contrastingly, when there is one ruby target, the shebang is the |
| 15 |
correct EPREFIX/usr/bin/ruby${ver}. No prefixify should be applied. |
| 16 |
|
| 17 |
To unify the two cases, the shebangs for the two-ruby-target case are |
| 18 |
changed to be `EPREFIX/usr/bin/env ruby`. |
| 19 |
|
| 20 |
Reference: https://github.com/gentoo/gentoo/pull/21046 |
| 21 |
Package-Manager: Portage-3.0.28, Repoman-3.0.3 |
| 22 |
Signed-off-by: Benda Xu <heroxbd <AT> gentoo.org> |
| 23 |
Signed-off-by: Hans de Graaff <graaff <AT> gentoo.org> |
| 24 |
|
| 25 |
dev-ruby/rdoc/rdoc-6.3.2.ebuild | 3 +-- |
| 26 |
dev-ruby/rdoc/rdoc-6.3.3-r1.ebuild | 3 +-- |
| 27 |
dev-ruby/rdoc/rdoc-6.3.3.ebuild | 3 +-- |
| 28 |
eclass/ruby-fakegem.eclass | 2 +- |
| 29 |
4 files changed, 4 insertions(+), 7 deletions(-) |
| 30 |
|
| 31 |
diff --git a/dev-ruby/rdoc/rdoc-6.3.2.ebuild b/dev-ruby/rdoc/rdoc-6.3.2.ebuild |
| 32 |
index 44aab8aec7e4..be4d9995ff2f 100644 |
| 33 |
--- a/dev-ruby/rdoc/rdoc-6.3.2.ebuild |
| 34 |
+++ b/dev-ruby/rdoc/rdoc-6.3.2.ebuild |
| 35 |
@@ -13,7 +13,7 @@ RUBY_FAKEGEM_BINDIR="exe" |
| 36 |
|
| 37 |
RUBY_FAKEGEM_GEMSPEC="rdoc.gemspec" |
| 38 |
|
| 39 |
-inherit prefix ruby-fakegem |
| 40 |
+inherit ruby-fakegem |
| 41 |
|
| 42 |
DESCRIPTION="An extended version of the RDoc library from Ruby 1.8" |
| 43 |
HOMEPAGE="https://github.com/ruby/rdoc/" |
| 44 |
@@ -82,7 +82,6 @@ all_ruby_install() { |
| 45 |
ruby_fakegem_binwrapper $bin /usr/bin/${bin}${version} |
| 46 |
sed -i -e "1s/env ruby/ruby${version}/" \ |
| 47 |
"${ED}/usr/bin/${bin}${version}" || die |
| 48 |
- use prefix && hprefixify "${ED}/usr/bin/${bin}${version}" |
| 49 |
fi |
| 50 |
done |
| 51 |
done |
| 52 |
|
| 53 |
diff --git a/dev-ruby/rdoc/rdoc-6.3.3-r1.ebuild b/dev-ruby/rdoc/rdoc-6.3.3-r1.ebuild |
| 54 |
index c77b59a31571..feff109f3ce8 100644 |
| 55 |
--- a/dev-ruby/rdoc/rdoc-6.3.3-r1.ebuild |
| 56 |
+++ b/dev-ruby/rdoc/rdoc-6.3.3-r1.ebuild |
| 57 |
@@ -13,7 +13,7 @@ RUBY_FAKEGEM_BINDIR="exe" |
| 58 |
|
| 59 |
RUBY_FAKEGEM_GEMSPEC="rdoc.gemspec" |
| 60 |
|
| 61 |
-inherit prefix ruby-fakegem |
| 62 |
+inherit ruby-fakegem |
| 63 |
|
| 64 |
DESCRIPTION="An extended version of the RDoc library from Ruby 1.8" |
| 65 |
HOMEPAGE="https://github.com/ruby/rdoc/" |
| 66 |
@@ -82,7 +82,6 @@ all_ruby_install() { |
| 67 |
ruby_fakegem_binwrapper $bin /usr/bin/${bin}${version} |
| 68 |
sed -i -e "1s/env ruby/ruby${version}/" \ |
| 69 |
"${ED}/usr/bin/${bin}${version}" || die |
| 70 |
- use prefix && hprefixify "${ED}/usr/bin/${bin}${version}" |
| 71 |
fi |
| 72 |
done |
| 73 |
done |
| 74 |
|
| 75 |
diff --git a/dev-ruby/rdoc/rdoc-6.3.3.ebuild b/dev-ruby/rdoc/rdoc-6.3.3.ebuild |
| 76 |
index c0a2e2d90b56..507317f9b0a0 100644 |
| 77 |
--- a/dev-ruby/rdoc/rdoc-6.3.3.ebuild |
| 78 |
+++ b/dev-ruby/rdoc/rdoc-6.3.3.ebuild |
| 79 |
@@ -13,7 +13,7 @@ RUBY_FAKEGEM_BINDIR="exe" |
| 80 |
|
| 81 |
RUBY_FAKEGEM_GEMSPEC="rdoc.gemspec" |
| 82 |
|
| 83 |
-inherit prefix ruby-fakegem |
| 84 |
+inherit ruby-fakegem |
| 85 |
|
| 86 |
DESCRIPTION="An extended version of the RDoc library from Ruby 1.8" |
| 87 |
HOMEPAGE="https://github.com/ruby/rdoc/" |
| 88 |
@@ -82,7 +82,6 @@ all_ruby_install() { |
| 89 |
ruby_fakegem_binwrapper $bin /usr/bin/${bin}${version} |
| 90 |
sed -i -e "1s/env ruby/ruby${version}/" \ |
| 91 |
"${ED}/usr/bin/${bin}${version}" || die |
| 92 |
- use prefix && hprefixify "${ED}/usr/bin/${bin}${version}" |
| 93 |
fi |
| 94 |
done |
| 95 |
done |
| 96 |
|
| 97 |
diff --git a/eclass/ruby-fakegem.eclass b/eclass/ruby-fakegem.eclass |
| 98 |
index 89bb97947b48..690709f20752 100644 |
| 99 |
--- a/eclass/ruby-fakegem.eclass |
| 100 |
+++ b/eclass/ruby-fakegem.eclass |
| 101 |
@@ -396,7 +396,7 @@ ruby_fakegem_binwrapper() { |
| 102 |
# if another implementation already arrived, then make |
| 103 |
# it generic and break out of the loop. This ensures |
| 104 |
# that we do at most two iterations. |
| 105 |
- rubycmd="/usr/bin/env ruby" |
| 106 |
+ rubycmd="${EPREFIX}/usr/bin/env ruby" |
| 107 |
break |
| 108 |
fi |
| 109 |
done |
Archives