[gentoo-commits] repo/gentoo:master commit in: dev-lang/ruby/

[Hans de Graaff]

commit:     d855fee83d698a0535a4b8dfbbafa157969df1d9
Author:     Hans de Graaff <graaff <AT> gentoo <DOT> org>
AuthorDate: Sun Oct  2 06:58:06 2016 +0000
Commit:     Hans de Graaff <graaff <AT> gentoo <DOT> org>
CommitDate: Sun Oct  2 06:58:33 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d855fee8

dev-lang/ruby: Use rm -f consistently, addressing bug 594206

Package-Manager: portage-2.3.0

 dev-lang/ruby/ruby-2.0.0_p648.ebuild | 8 ++++----
 dev-lang/ruby/ruby-2.1.10.ebuild     | 8 ++++----
 dev-lang/ruby/ruby-2.1.9.ebuild      | 8 ++++----
 dev-lang/ruby/ruby-2.2.5.ebuild      | 8 ++++----
 4 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/dev-lang/ruby/ruby-2.0.0_p648.ebuild 
b/dev-lang/ruby/ruby-2.0.0_p648.ebuild
index a495f1b..1bd67a9 100644
--- a/dev-lang/ruby/ruby-2.0.0_p648.ebuild
+++ b/dev-lang/ruby/ruby-2.0.0_p648.ebuild
@@ -71,7 +71,7 @@ src_prepare() {
        # rubygems, but remove the bits that would cause a file collision.
        einfo "Unbundling gems..."
        cd "$S"
-       rm -r \
+       rm -rf \
                {bin,lib}/rake lib/rake.rb man/rake.1 \
                bin/gem || die "removal failed"
 
@@ -191,9 +191,9 @@ src_install() {
        emake V=1 DESTDIR="${D}" install || die "make install failed"
 
        # Remove installed rubygems copy
-       rm -r "${D}/usr/$(get_libdir)/ruby/${RUBYVERSION}/rubygems" || die "rm 
rubygems failed"
-       rm -r "${D}/usr/$(get_libdir)/ruby/${RUBYVERSION}"/rdoc* || die "rm 
rdoc failed"
-       rm -r "${D}/usr/bin/"{ri,rdoc}"${MY_SUFFIX}" || die "rm rdoc bins 
failed"
+       rm -rf "${D}/usr/$(get_libdir)/ruby/${RUBYVERSION}/rubygems" || die "rm 
rubygems 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"
 
        if use doc; then
                make DESTDIR="${D}" install-doc || die "make install-doc failed"

diff --git a/dev-lang/ruby/ruby-2.1.10.ebuild b/dev-lang/ruby/ruby-2.1.10.ebuild
index 6f97155..62c11ed 100644
--- a/dev-lang/ruby/ruby-2.1.10.ebuild
+++ b/dev-lang/ruby/ruby-2.1.10.ebuild
@@ -72,7 +72,7 @@ src_prepare() {
        # rubygems, but remove the bits that would cause a file collision.
        einfo "Unbundling gems..."
        cd "$S"
-       rm -r \
+       rm -rf \
                {bin,lib}/rake lib/rake.rb man/rake.1 \
                bin/gem || die "removal failed"
 
@@ -193,9 +193,9 @@ src_install() {
        emake V=1 DESTDIR="${D}" install || die "make install failed"
 
        # Remove installed rubygems copy
-       rm -r "${D}/usr/$(get_libdir)/ruby/${RUBYVERSION}/rubygems" || die "rm 
rubygems failed"
-       rm -r "${D}/usr/$(get_libdir)/ruby/${RUBYVERSION}"/rdoc* || die "rm 
rdoc failed"
-       rm -r "${D}/usr/bin/"{ri,rdoc}"${MY_SUFFIX}" || die "rm rdoc bins 
failed"
+       rm -rf "${D}/usr/$(get_libdir)/ruby/${RUBYVERSION}/rubygems" || die "rm 
rubygems 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"
 
        if use doc; then
                make DESTDIR="${D}" install-doc || die "make install-doc failed"

diff --git a/dev-lang/ruby/ruby-2.1.9.ebuild b/dev-lang/ruby/ruby-2.1.9.ebuild
index 928d82b..120844c 100644
--- a/dev-lang/ruby/ruby-2.1.9.ebuild
+++ b/dev-lang/ruby/ruby-2.1.9.ebuild
@@ -68,7 +68,7 @@ src_prepare() {
        # rubygems, but remove the bits that would cause a file collision.
        einfo "Unbundling gems..."
        cd "$S"
-       rm -r \
+       rm -rf \
                {bin,lib}/rake lib/rake.rb man/rake.1 \
                bin/gem || die "removal failed"
 
@@ -191,9 +191,9 @@ src_install() {
        emake V=1 DESTDIR="${D}" install || die "make install failed"
 
        # Remove installed rubygems copy
-       rm -r "${D}/usr/$(get_libdir)/ruby/${RUBYVERSION}/rubygems" || die "rm 
rubygems failed"
-       rm -r "${D}/usr/$(get_libdir)/ruby/${RUBYVERSION}"/rdoc* || die "rm 
rdoc failed"
-       rm -r "${D}/usr/bin/"{ri,rdoc}"${MY_SUFFIX}" || die "rm rdoc bins 
failed"
+       rm -rf "${D}/usr/$(get_libdir)/ruby/${RUBYVERSION}/rubygems" || die "rm 
rubygems 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"
 
        if use doc; then
                make DESTDIR="${D}" install-doc || die "make install-doc failed"

diff --git a/dev-lang/ruby/ruby-2.2.5.ebuild b/dev-lang/ruby/ruby-2.2.5.ebuild
index 306fb86..8e68f7c 100644
--- a/dev-lang/ruby/ruby-2.2.5.ebuild
+++ b/dev-lang/ruby/ruby-2.2.5.ebuild
@@ -81,7 +81,7 @@ src_prepare() {
        # rubygems, but remove the bits that would cause a file collision.
        einfo "Unbundling gems..."
        cd "$S"
-       rm -r \
+       rm -rf \
                {bin,lib}/rake lib/rake.rb man/rake.1 \
                bin/gem || die "removal failed"
        # Remove bundled gems that we will install via PDEPEND, bug
@@ -207,9 +207,9 @@ src_install() {
        emake V=1 DESTDIR="${D}" install || die "make install failed"
 
        # Remove installed rubygems copy
-       rm -r "${D}/usr/$(get_libdir)/ruby/${RUBYVERSION}/rubygems" || die "rm 
rubygems failed"
-       rm -r "${D}/usr/$(get_libdir)/ruby/${RUBYVERSION}"/rdoc* || die "rm 
rdoc failed"
-       rm -r "${D}/usr/bin/"{ri,rdoc}"${MY_SUFFIX}" || die "rm rdoc bins 
failed"
+       rm -rf "${D}/usr/$(get_libdir)/ruby/${RUBYVERSION}/rubygems" || die "rm 
rubygems 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"
 
        if use doc; then
                make DESTDIR="${D}" install-doc || die "make install-doc failed"