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

Package-Manager: portage-2.3.0

diff --git a/dev-lang/ruby/ruby-2.0.0_p648.ebuild b/dev-lang/ruby/ruby-2.0.0_p648.ebuild
index a495f1b5fc21a5a5abb6007da3a6f10e219be72f..1bd67a9dc6b196a0c7e1ac38c67bbb4358238621 100644 (file)
--- 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 6f971552c5ed4b4bb6965c4c0e451ca35dbe567e..62c11edac36e82c6cf78795f346d6bd6369e8a2b 100644 (file)
--- 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 928d82bf8685ca245107e3193c91753a330e5e4b..120844c4e503ba169ef02858102794e906034156 100644 (file)
--- 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 306fb86b2d17917a7feb191b304504ce116c6366..8e68f7cbd96e58a12d9260d0c8aacd7cb6283b1a 100644 (file)
--- 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"