| 1 |
commit: d855fee83d698a0535a4b8dfbbafa157969df1d9 |
| 2 |
Author: Hans de Graaff <graaff <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sun Oct 2 06:58:06 2016 +0000 |
| 4 |
Commit: Hans de Graaff <graaff <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sun Oct 2 06:58:33 2016 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d855fee8 |
| 7 |
|
| 8 |
dev-lang/ruby: Use rm -f consistently, addressing bug 594206 |
| 9 |
|
| 10 |
Package-Manager: portage-2.3.0 |
| 11 |
|
| 12 |
dev-lang/ruby/ruby-2.0.0_p648.ebuild | 8 ++++---- |
| 13 |
dev-lang/ruby/ruby-2.1.10.ebuild | 8 ++++---- |
| 14 |
dev-lang/ruby/ruby-2.1.9.ebuild | 8 ++++---- |
| 15 |
dev-lang/ruby/ruby-2.2.5.ebuild | 8 ++++---- |
| 16 |
4 files changed, 16 insertions(+), 16 deletions(-) |
| 17 |
|
| 18 |
diff --git a/dev-lang/ruby/ruby-2.0.0_p648.ebuild b/dev-lang/ruby/ruby-2.0.0_p648.ebuild |
| 19 |
index a495f1b..1bd67a9 100644 |
| 20 |
--- a/dev-lang/ruby/ruby-2.0.0_p648.ebuild |
| 21 |
+++ b/dev-lang/ruby/ruby-2.0.0_p648.ebuild |
| 22 |
@@ -71,7 +71,7 @@ src_prepare() { |
| 23 |
# rubygems, but remove the bits that would cause a file collision. |
| 24 |
einfo "Unbundling gems..." |
| 25 |
cd "$S" |
| 26 |
- rm -r \ |
| 27 |
+ rm -rf \ |
| 28 |
{bin,lib}/rake lib/rake.rb man/rake.1 \ |
| 29 |
bin/gem || die "removal failed" |
| 30 |
|
| 31 |
@@ -191,9 +191,9 @@ src_install() { |
| 32 |
emake V=1 DESTDIR="${D}" install || die "make install failed" |
| 33 |
|
| 34 |
# Remove installed rubygems copy |
| 35 |
- rm -r "${D}/usr/$(get_libdir)/ruby/${RUBYVERSION}/rubygems" || die "rm rubygems failed" |
| 36 |
- rm -r "${D}/usr/$(get_libdir)/ruby/${RUBYVERSION}"/rdoc* || die "rm rdoc failed" |
| 37 |
- rm -r "${D}/usr/bin/"{ri,rdoc}"${MY_SUFFIX}" || die "rm rdoc bins failed" |
| 38 |
+ rm -rf "${D}/usr/$(get_libdir)/ruby/${RUBYVERSION}/rubygems" || die "rm rubygems failed" |
| 39 |
+ rm -rf "${D}/usr/$(get_libdir)/ruby/${RUBYVERSION}"/rdoc* || die "rm rdoc failed" |
| 40 |
+ rm -rf "${D}/usr/bin/"{ri,rdoc}"${MY_SUFFIX}" || die "rm rdoc bins failed" |
| 41 |
|
| 42 |
if use doc; then |
| 43 |
make DESTDIR="${D}" install-doc || die "make install-doc failed" |
| 44 |
|
| 45 |
diff --git a/dev-lang/ruby/ruby-2.1.10.ebuild b/dev-lang/ruby/ruby-2.1.10.ebuild |
| 46 |
index 6f97155..62c11ed 100644 |
| 47 |
--- a/dev-lang/ruby/ruby-2.1.10.ebuild |
| 48 |
+++ b/dev-lang/ruby/ruby-2.1.10.ebuild |
| 49 |
@@ -72,7 +72,7 @@ src_prepare() { |
| 50 |
# rubygems, but remove the bits that would cause a file collision. |
| 51 |
einfo "Unbundling gems..." |
| 52 |
cd "$S" |
| 53 |
- rm -r \ |
| 54 |
+ rm -rf \ |
| 55 |
{bin,lib}/rake lib/rake.rb man/rake.1 \ |
| 56 |
bin/gem || die "removal failed" |
| 57 |
|
| 58 |
@@ -193,9 +193,9 @@ src_install() { |
| 59 |
emake V=1 DESTDIR="${D}" install || die "make install failed" |
| 60 |
|
| 61 |
# Remove installed rubygems copy |
| 62 |
- rm -r "${D}/usr/$(get_libdir)/ruby/${RUBYVERSION}/rubygems" || die "rm rubygems failed" |
| 63 |
- rm -r "${D}/usr/$(get_libdir)/ruby/${RUBYVERSION}"/rdoc* || die "rm rdoc failed" |
| 64 |
- rm -r "${D}/usr/bin/"{ri,rdoc}"${MY_SUFFIX}" || die "rm rdoc bins failed" |
| 65 |
+ rm -rf "${D}/usr/$(get_libdir)/ruby/${RUBYVERSION}/rubygems" || die "rm rubygems failed" |
| 66 |
+ rm -rf "${D}/usr/$(get_libdir)/ruby/${RUBYVERSION}"/rdoc* || die "rm rdoc failed" |
| 67 |
+ rm -rf "${D}/usr/bin/"{ri,rdoc}"${MY_SUFFIX}" || die "rm rdoc bins failed" |
| 68 |
|
| 69 |
if use doc; then |
| 70 |
make DESTDIR="${D}" install-doc || die "make install-doc failed" |
| 71 |
|
| 72 |
diff --git a/dev-lang/ruby/ruby-2.1.9.ebuild b/dev-lang/ruby/ruby-2.1.9.ebuild |
| 73 |
index 928d82b..120844c 100644 |
| 74 |
--- a/dev-lang/ruby/ruby-2.1.9.ebuild |
| 75 |
+++ b/dev-lang/ruby/ruby-2.1.9.ebuild |
| 76 |
@@ -68,7 +68,7 @@ src_prepare() { |
| 77 |
# rubygems, but remove the bits that would cause a file collision. |
| 78 |
einfo "Unbundling gems..." |
| 79 |
cd "$S" |
| 80 |
- rm -r \ |
| 81 |
+ rm -rf \ |
| 82 |
{bin,lib}/rake lib/rake.rb man/rake.1 \ |
| 83 |
bin/gem || die "removal failed" |
| 84 |
|
| 85 |
@@ -191,9 +191,9 @@ src_install() { |
| 86 |
emake V=1 DESTDIR="${D}" install || die "make install failed" |
| 87 |
|
| 88 |
# Remove installed rubygems copy |
| 89 |
- rm -r "${D}/usr/$(get_libdir)/ruby/${RUBYVERSION}/rubygems" || die "rm rubygems failed" |
| 90 |
- rm -r "${D}/usr/$(get_libdir)/ruby/${RUBYVERSION}"/rdoc* || die "rm rdoc failed" |
| 91 |
- rm -r "${D}/usr/bin/"{ri,rdoc}"${MY_SUFFIX}" || die "rm rdoc bins failed" |
| 92 |
+ rm -rf "${D}/usr/$(get_libdir)/ruby/${RUBYVERSION}/rubygems" || die "rm rubygems failed" |
| 93 |
+ rm -rf "${D}/usr/$(get_libdir)/ruby/${RUBYVERSION}"/rdoc* || die "rm rdoc failed" |
| 94 |
+ rm -rf "${D}/usr/bin/"{ri,rdoc}"${MY_SUFFIX}" || die "rm rdoc bins failed" |
| 95 |
|
| 96 |
if use doc; then |
| 97 |
make DESTDIR="${D}" install-doc || die "make install-doc failed" |
| 98 |
|
| 99 |
diff --git a/dev-lang/ruby/ruby-2.2.5.ebuild b/dev-lang/ruby/ruby-2.2.5.ebuild |
| 100 |
index 306fb86..8e68f7c 100644 |
| 101 |
--- a/dev-lang/ruby/ruby-2.2.5.ebuild |
| 102 |
+++ b/dev-lang/ruby/ruby-2.2.5.ebuild |
| 103 |
@@ -81,7 +81,7 @@ src_prepare() { |
| 104 |
# rubygems, but remove the bits that would cause a file collision. |
| 105 |
einfo "Unbundling gems..." |
| 106 |
cd "$S" |
| 107 |
- rm -r \ |
| 108 |
+ rm -rf \ |
| 109 |
{bin,lib}/rake lib/rake.rb man/rake.1 \ |
| 110 |
bin/gem || die "removal failed" |
| 111 |
# Remove bundled gems that we will install via PDEPEND, bug |
| 112 |
@@ -207,9 +207,9 @@ src_install() { |
| 113 |
emake V=1 DESTDIR="${D}" install || die "make install failed" |
| 114 |
|
| 115 |
# Remove installed rubygems copy |
| 116 |
- rm -r "${D}/usr/$(get_libdir)/ruby/${RUBYVERSION}/rubygems" || die "rm rubygems failed" |
| 117 |
- rm -r "${D}/usr/$(get_libdir)/ruby/${RUBYVERSION}"/rdoc* || die "rm rdoc failed" |
| 118 |
- rm -r "${D}/usr/bin/"{ri,rdoc}"${MY_SUFFIX}" || die "rm rdoc bins failed" |
| 119 |
+ rm -rf "${D}/usr/$(get_libdir)/ruby/${RUBYVERSION}/rubygems" || die "rm rubygems failed" |
| 120 |
+ rm -rf "${D}/usr/$(get_libdir)/ruby/${RUBYVERSION}"/rdoc* || die "rm rdoc failed" |
| 121 |
+ rm -rf "${D}/usr/bin/"{ri,rdoc}"${MY_SUFFIX}" || die "rm rdoc bins failed" |
| 122 |
|
| 123 |
if use doc; then |
| 124 |
make DESTDIR="${D}" install-doc || die "make install-doc failed" |
Archives