diff options
| author |   David Seifert <soap@gentoo.org> | 2019-12-11 13:32:00 +0100 |
|---|---|---|
| committer | David Seifert <soap@gentoo.org> | 2019-12-11 13:32:00 +0100 |
| commit | 398a42634f34afa1979d88ae1d8b38194e911c2d (patch) | |
| tree | d6a45bdf7b35b71c192602a46e8d98d12a88cb02 /dev-ruby | |
| parent | dev-ros/geometric_shapes: Remove old (diff) | |
| download | gentoo-398a42634f34afa1979d88ae1d8b38194e911c2d.tar.gz gentoo-398a42634f34afa1979d88ae1d8b38194e911c2d.tar.bz2 gentoo-398a42634f34afa1979d88ae1d8b38194e911c2d.zip | |
*/*: [QA] Remove redundant `|| die` guards
* Since all ebuilds in the tree are EAPI>=4,
`|| die` on builtin commands is redundant
and dead code.
Closes: https://github.com/gentoo/gentoo/pull/13940
Reviewed-by: Ulrich Müller <ulm@gentoo.org>
Reviewed-by: Michał Górny <mgorny@gentoo.org>
Reviewed-by: Andreas K. Hüttel <dilfridge@gentoo.org>
Signed-off-by: David Seifert <soap@gentoo.org>
Diffstat (limited to 'dev-ruby')
28 files changed, 45 insertions, 45 deletions
diff --git a/dev-ruby/async_sinatra/async_sinatra-1.3.0.ebuild b/dev-ruby/async_sinatra/async_sinatra-1.3.0.ebuild index 56b8161d7dc7..ba6570972e51 100644 --- a/dev-ruby/async_sinatra/async_sinatra-1.3.0.ebuild +++ b/dev-ruby/async_sinatra/async_sinatra-1.3.0.ebuild @@ -37,5 +37,5 @@ all_ruby_install() { all_fakegem_install insinto /usr/share/doc/${PF}/ - doins -r examples || die "Failed to install examples" + doins -r examples } diff --git a/dev-ruby/bunny/bunny-2.13.0.ebuild b/dev-ruby/bunny/bunny-2.13.0.ebuild index cb1953ab548d..b1165915fd6f 100644 --- a/dev-ruby/bunny/bunny-2.13.0.ebuild +++ b/dev-ruby/bunny/bunny-2.13.0.ebuild @@ -29,5 +29,5 @@ all_ruby_install() { all_fakegem_install insinto /usr/share/doc/${PF} - doins -r examples || die + doins -r examples } diff --git a/dev-ruby/bunny/bunny-2.14.2.ebuild b/dev-ruby/bunny/bunny-2.14.2.ebuild index 8db85a3d2959..02c1afa1569d 100644 --- a/dev-ruby/bunny/bunny-2.14.2.ebuild +++ b/dev-ruby/bunny/bunny-2.14.2.ebuild @@ -29,5 +29,5 @@ all_ruby_install() { all_fakegem_install insinto /usr/share/doc/${PF} - doins -r examples || die + doins -r examples } diff --git a/dev-ruby/bunny/bunny-2.14.3.ebuild b/dev-ruby/bunny/bunny-2.14.3.ebuild index fca93e2a5458..4d211e6e2ce0 100644 --- a/dev-ruby/bunny/bunny-2.14.3.ebuild +++ b/dev-ruby/bunny/bunny-2.14.3.ebuild @@ -29,5 +29,5 @@ all_ruby_install() { all_fakegem_install insinto /usr/share/doc/${PF} - doins -r examples || die + doins -r examples } diff --git a/dev-ruby/em-websocket/em-websocket-0.5.1.ebuild b/dev-ruby/em-websocket/em-websocket-0.5.1.ebuild index 9ac1f08bd34b..ebd3b4c2439b 100644 --- a/dev-ruby/em-websocket/em-websocket-0.5.1.ebuild +++ b/dev-ruby/em-websocket/em-websocket-0.5.1.ebuild @@ -44,5 +44,5 @@ all_ruby_install() { all_fakegem_install insinto /usr/share/doc/${PF}/ - doins -r examples || die "Failed to install examples" + doins -r examples } diff --git a/dev-ruby/eventmachine/eventmachine-1.2.7.ebuild b/dev-ruby/eventmachine/eventmachine-1.2.7.ebuild index ee3b825cbf56..eef8004a177e 100644 --- a/dev-ruby/eventmachine/eventmachine-1.2.7.ebuild +++ b/dev-ruby/eventmachine/eventmachine-1.2.7.ebuild @@ -74,7 +74,7 @@ each_ruby_compile() { for extdir in ext ext/fastfilereader; do pushd $extdir # both extensions use C++, so use the CXXFLAGS not the CFLAGS - emake V=1 CFLAGS="${CXXFLAGS} -fPIC" archflag="${LDFLAGS}" || die "emake failed for ${extdir}" + emake V=1 CFLAGS="${CXXFLAGS} -fPIC" archflag="${LDFLAGS}" popd cp $extdir/*.so lib/ || die "Unable to copy extensions for ${extdir}" done @@ -88,5 +88,5 @@ all_ruby_install() { all_fakegem_install insinto /usr/share/doc/${PF}/ - doins -r examples || die "Failed to install examples" + doins -r examples } diff --git a/dev-ruby/gpgme/gpgme-2.0.18.ebuild b/dev-ruby/gpgme/gpgme-2.0.18.ebuild index eac41b41c93b..5b41333119b0 100644 --- a/dev-ruby/gpgme/gpgme-2.0.18.ebuild +++ b/dev-ruby/gpgme/gpgme-2.0.18.ebuild @@ -47,7 +47,7 @@ each_ruby_configure() { } each_ruby_compile() { - emake V=1 -C ext archflag="${LDFLAGS}" || die "emake failed" + emake V=1 -C ext archflag="${LDFLAGS}" cp -f "${S}/ext/gpgme_n.so" "${S}/lib" || die } diff --git a/dev-ruby/gpgme/gpgme-2.0.19.ebuild b/dev-ruby/gpgme/gpgme-2.0.19.ebuild index c4d892dcece1..23e7afd5d79b 100644 --- a/dev-ruby/gpgme/gpgme-2.0.19.ebuild +++ b/dev-ruby/gpgme/gpgme-2.0.19.ebuild @@ -44,7 +44,7 @@ each_ruby_configure() { } each_ruby_compile() { - emake V=1 -C ext archflag="${LDFLAGS}" || die "emake failed" + emake V=1 -C ext archflag="${LDFLAGS}" cp -f "${S}/ext/gpgme_n.so" "${S}/lib" || die } diff --git a/dev-ruby/hpricot/hpricot-0.8.6-r5.ebuild b/dev-ruby/hpricot/hpricot-0.8.6-r5.ebuild index 40d8ab477f20..448a9b744402 100644 --- a/dev-ruby/hpricot/hpricot-0.8.6-r5.ebuild +++ b/dev-ruby/hpricot/hpricot-0.8.6-r5.ebuild @@ -56,6 +56,6 @@ each_ruby_compile() { local modname=$(get_modname) ${RUBY} -S rake ragel || die - emake V=1 -Cext/hpricot_scan CFLAGS="${CFLAGS} -fPIC" archflag="${LDFLAGS}" || die "make hpricot_scan failed" + emake V=1 -Cext/hpricot_scan CFLAGS="${CFLAGS} -fPIC" archflag="${LDFLAGS}" cp ext/hpricot_scan/hpricot_scan${modname} lib/ || die } diff --git a/dev-ruby/locale/locale-2.1.2-r1.ebuild b/dev-ruby/locale/locale-2.1.2-r1.ebuild index 33e4fc22c1fb..0eb31f77f02a 100644 --- a/dev-ruby/locale/locale-2.1.2-r1.ebuild +++ b/dev-ruby/locale/locale-2.1.2-r1.ebuild @@ -46,5 +46,5 @@ all_ruby_install() { all_fakegem_install insinto /usr/share/doc/${PF} - doins -r samples || die + doins -r samples } diff --git a/dev-ruby/mechanize/mechanize-2.7.6.ebuild b/dev-ruby/mechanize/mechanize-2.7.6.ebuild index 7147dcc33b8b..e13cfc7e14c7 100644 --- a/dev-ruby/mechanize/mechanize-2.7.6.ebuild +++ b/dev-ruby/mechanize/mechanize-2.7.6.ebuild @@ -34,5 +34,5 @@ all_ruby_install() { all_fakegem_install docinto examples - dodoc examples/* || die + dodoc examples/* } diff --git a/dev-ruby/nokogiri/nokogiri-1.10.4.ebuild b/dev-ruby/nokogiri/nokogiri-1.10.4.ebuild index 5a925bfc56de..47633abb936c 100644 --- a/dev-ruby/nokogiri/nokogiri-1.10.4.ebuild +++ b/dev-ruby/nokogiri/nokogiri-1.10.4.ebuild @@ -76,7 +76,7 @@ each_ruby_compile() { emake -Cext/${PN} \ V=1 \ CFLAGS="${CFLAGS} -fPIC" \ - archflag="${LDFLAGS}" || die "make extension failed" + archflag="${LDFLAGS}" cp -l ext/${PN}/${PN}$(get_modname) lib/${PN}/ || die } diff --git a/dev-ruby/pdf-reader/pdf-reader-1.4.1-r2.ebuild b/dev-ruby/pdf-reader/pdf-reader-1.4.1-r2.ebuild index 52cba668f8a4..c08c992db30c 100644 --- a/dev-ruby/pdf-reader/pdf-reader-1.4.1-r2.ebuild +++ b/dev-ruby/pdf-reader/pdf-reader-1.4.1-r2.ebuild @@ -45,5 +45,5 @@ all_ruby_install() { all_fakegem_install docinto examples - dodoc examples/* || die + dodoc examples/* } diff --git a/dev-ruby/pdf-reader/pdf-reader-2.2.0.ebuild b/dev-ruby/pdf-reader/pdf-reader-2.2.0.ebuild index b66eff2497cc..90de5f68f2c9 100644 --- a/dev-ruby/pdf-reader/pdf-reader-2.2.0.ebuild +++ b/dev-ruby/pdf-reader/pdf-reader-2.2.0.ebuild @@ -45,5 +45,5 @@ all_ruby_install() { all_fakegem_install docinto examples - dodoc examples/* || die + dodoc examples/* } diff --git a/dev-ruby/pdf-reader/pdf-reader-2.2.1.ebuild b/dev-ruby/pdf-reader/pdf-reader-2.2.1.ebuild index 0c7ee56b3dad..11c2509b1e60 100644 --- a/dev-ruby/pdf-reader/pdf-reader-2.2.1.ebuild +++ b/dev-ruby/pdf-reader/pdf-reader-2.2.1.ebuild @@ -44,5 +44,5 @@ all_ruby_install() { all_fakegem_install docinto examples - dodoc examples/* || die + dodoc examples/* } diff --git a/dev-ruby/pdf-reader/pdf-reader-2.3.0.ebuild b/dev-ruby/pdf-reader/pdf-reader-2.3.0.ebuild index 0c7ee56b3dad..11c2509b1e60 100644 --- a/dev-ruby/pdf-reader/pdf-reader-2.3.0.ebuild +++ b/dev-ruby/pdf-reader/pdf-reader-2.3.0.ebuild @@ -44,5 +44,5 @@ all_ruby_install() { all_fakegem_install docinto examples - dodoc examples/* || die + dodoc examples/* } diff --git a/dev-ruby/pdf-reader/pdf-reader-2.4.0.ebuild b/dev-ruby/pdf-reader/pdf-reader-2.4.0.ebuild index 0c7ee56b3dad..11c2509b1e60 100644 --- a/dev-ruby/pdf-reader/pdf-reader-2.4.0.ebuild +++ b/dev-ruby/pdf-reader/pdf-reader-2.4.0.ebuild @@ -44,5 +44,5 @@ all_ruby_install() { all_fakegem_install docinto examples - dodoc examples/* || die + dodoc examples/* } diff --git a/dev-ruby/rdiscount/rdiscount-2.2.0.1.ebuild b/dev-ruby/rdiscount/rdiscount-2.2.0.1.ebuild index 316e1addce23..a10151cda68b 100644 --- a/dev-ruby/rdiscount/rdiscount-2.2.0.1.ebuild +++ b/dev-ruby/rdiscount/rdiscount-2.2.0.1.ebuild @@ -36,7 +36,7 @@ each_ruby_configure() { } each_ruby_compile() { - emake V=1 -Cext || die + emake V=1 -Cext cp ext/*$(get_modname) lib/ || die } diff --git a/dev-ruby/rexical/rexical-1.0.7.ebuild b/dev-ruby/rexical/rexical-1.0.7.ebuild index 214bec704398..298d99d28af3 100644 --- a/dev-ruby/rexical/rexical-1.0.7.ebuild +++ b/dev-ruby/rexical/rexical-1.0.7.ebuild @@ -36,5 +36,5 @@ all_ruby_install() { all_fakegem_install docinto examples - dodoc sample/* || die + dodoc sample/* } diff --git a/dev-ruby/ruby-oci8/ruby-oci8-2.2.5.1.ebuild b/dev-ruby/ruby-oci8/ruby-oci8-2.2.5.1.ebuild index a459c32c20db..92543abfde96 100644 --- a/dev-ruby/ruby-oci8/ruby-oci8-2.2.5.1.ebuild +++ b/dev-ruby/ruby-oci8/ruby-oci8-2.2.5.1.ebuild @@ -29,12 +29,12 @@ each_ruby_configure() { each_ruby_compile() { # compile the native libraries - emake -C ${EXT_DIR} V=1 || die "could not compile native library" + emake -C ${EXT_DIR} V=1 } each_ruby_install() { # install the native libraries - emake -C ${EXT_DIR} install DESTDIR="${D}" || die "could not install native library" + emake -C ${EXT_DIR} install DESTDIR="${D}" # install the gem files each_fakegem_install } diff --git a/dev-ruby/ruby-oci8/ruby-oci8-2.2.7.ebuild b/dev-ruby/ruby-oci8/ruby-oci8-2.2.7.ebuild index 12dff4947bbc..4e29e5166b57 100644 --- a/dev-ruby/ruby-oci8/ruby-oci8-2.2.7.ebuild +++ b/dev-ruby/ruby-oci8/ruby-oci8-2.2.7.ebuild @@ -29,12 +29,12 @@ each_ruby_configure() { each_ruby_compile() { # compile the native libraries - emake -C ${EXT_DIR} V=1 || die "could not compile native library" + emake -C ${EXT_DIR} V=1 } each_ruby_install() { # install the native libraries - emake -C ${EXT_DIR} install DESTDIR="${D}" || die "could not install native library" + emake -C ${EXT_DIR} install DESTDIR="${D}" # install the gem files each_fakegem_install } diff --git a/dev-ruby/ruby-odbc/ruby-odbc-0.99999.ebuild b/dev-ruby/ruby-odbc/ruby-odbc-0.99999.ebuild index 578746063872..b37c60a050c3 100644 --- a/dev-ruby/ruby-odbc/ruby-odbc-0.99999.ebuild +++ b/dev-ruby/ruby-odbc/ruby-odbc-0.99999.ebuild @@ -44,7 +44,7 @@ each_ruby_configure() { each_ruby_compile() { for dir in ext ext/utf8; do - emake V=1 -C${dir} || die "emake (${dir}) failed" + emake V=1 -C${dir} done } @@ -57,5 +57,5 @@ each_ruby_install() { all_ruby_install() { all_fakegem_install - dohtml doc/*.html || die + dohtml doc/*.html } diff --git a/dev-ruby/ruby-prof/ruby-prof-0.18.0.ebuild b/dev-ruby/ruby-prof/ruby-prof-0.18.0.ebuild index 0bda0ee97519..d29eeb957fdb 100644 --- a/dev-ruby/ruby-prof/ruby-prof-0.18.0.ebuild +++ b/dev-ruby/ruby-prof/ruby-prof-0.18.0.ebuild @@ -47,7 +47,7 @@ each_ruby_configure() { } each_ruby_compile() { - emake V=1 -Cext/ruby_prof || die "build failed" + emake V=1 -Cext/ruby_prof cp ext/ruby_prof/*$(get_modname) lib/ || die "copy of extension failed" } diff --git a/dev-ruby/ruby-sdl/ruby-sdl-2.1.2-r2.ebuild b/dev-ruby/ruby-sdl/ruby-sdl-2.1.2-r2.ebuild index e4f16096308e..3d5c0d62da0b 100644 --- a/dev-ruby/ruby-sdl/ruby-sdl-2.1.2-r2.ebuild +++ b/dev-ruby/ruby-sdl/ruby-sdl-2.1.2-r2.ebuild @@ -33,11 +33,11 @@ each_ruby_configure() { } each_ruby_compile() { - emake V=1 || die "emake failed" + emake V=1 } each_ruby_install() { - emake V=1 DESTDIR="${D}" install || die "einstall failed" + emake V=1 DESTDIR="${D}" install } all_ruby_install() { diff --git a/dev-ruby/rubygems/rubygems-2.7.10.ebuild b/dev-ruby/rubygems/rubygems-2.7.10.ebuild index de9c6132e8c9..d207ee81a257 100644 --- a/dev-ruby/rubygems/rubygems-2.7.10.ebuild +++ b/dev-ruby/rubygems/rubygems-2.7.10.ebuild @@ -93,17 +93,17 @@ each_ruby_install() { local sld=$(ruby_rbconfig_value 'sitelibdir') insinto "${sld#${EPREFIX}}" # bug #320813 - newins "${FILESDIR}/auto_gem.rb.ruby19" auto_gem.rb || die + newins "${FILESDIR}/auto_gem.rb.ruby19" auto_gem.rb - newbin bin/gem $(basename ${RUBY} | sed -e 's:ruby:gem:') || die + newbin bin/gem $(basename ${RUBY} | sed -e 's:ruby:gem:' || die) } all_ruby_install() { dodoc History.txt README.md if use server; then - newinitd "${FILESDIR}/init.d-gem_server2" gem_server || die "newinitd failed" - newconfd "${FILESDIR}/conf.d-gem_server" gem_server || die "newconfd failed" + newinitd "${FILESDIR}/init.d-gem_server2" gem_server + newconfd "${FILESDIR}/conf.d-gem_server" gem_server fi } diff --git a/dev-ruby/rubygems/rubygems-3.0.3.ebuild b/dev-ruby/rubygems/rubygems-3.0.3.ebuild index 8c174090901c..ad752396332e 100644 --- a/dev-ruby/rubygems/rubygems-3.0.3.ebuild +++ b/dev-ruby/rubygems/rubygems-3.0.3.ebuild @@ -95,17 +95,17 @@ each_ruby_install() { local sld=$(ruby_rbconfig_value 'sitelibdir') insinto "${sld#${EPREFIX}}" # bug #320813 - newins "${FILESDIR}/auto_gem.rb.ruby19" auto_gem.rb || die + newins "${FILESDIR}/auto_gem.rb.ruby19" auto_gem.rb - newbin bin/gem $(basename ${RUBY} | sed -e 's:ruby:gem:') || die + newbin bin/gem $(basename ${RUBY} | sed -e 's:ruby:gem:') } all_ruby_install() { dodoc History.txt README.md if use server; then - newinitd "${FILESDIR}/init.d-gem_server2" gem_server || die "newinitd failed" - newconfd "${FILESDIR}/conf.d-gem_server" gem_server || die "newconfd failed" + newinitd "${FILESDIR}/init.d-gem_server2" gem_server + newconfd "${FILESDIR}/conf.d-gem_server" gem_server fi } diff --git a/dev-ruby/rubygems/rubygems-3.0.4-r1.ebuild b/dev-ruby/rubygems/rubygems-3.0.4-r1.ebuild index 3ff3fc6f6b3c..26cc98a87d52 100644 --- a/dev-ruby/rubygems/rubygems-3.0.4-r1.ebuild +++ b/dev-ruby/rubygems/rubygems-3.0.4-r1.ebuild @@ -67,17 +67,17 @@ each_ruby_install() { local sld=$(ruby_rbconfig_value 'sitelibdir') insinto "${sld#${EPREFIX}}" # bug #320813 - newins "${FILESDIR}/auto_gem.rb.ruby19" auto_gem.rb || die + newins "${FILESDIR}/auto_gem.rb.ruby19" auto_gem.rb - newbin bin/gem $(basename ${RUBY} | sed -e 's:ruby:gem:') || die + newbin bin/gem $(basename ${RUBY} | sed -e 's:ruby:gem:') } all_ruby_install() { dodoc History.txt README.md if use server; then - newinitd "${FILESDIR}/init.d-gem_server2" gem_server || die "newinitd failed" - newconfd "${FILESDIR}/conf.d-gem_server" gem_server || die "newconfd failed" + newinitd "${FILESDIR}/init.d-gem_server2" gem_server + newconfd "${FILESDIR}/conf.d-gem_server" gem_server fi } diff --git a/dev-ruby/rubygems/rubygems-3.0.6.ebuild b/dev-ruby/rubygems/rubygems-3.0.6.ebuild index dda6954daea6..e4bbbd3eb423 100644 --- a/dev-ruby/rubygems/rubygems-3.0.6.ebuild +++ b/dev-ruby/rubygems/rubygems-3.0.6.ebuild @@ -67,17 +67,17 @@ each_ruby_install() { local sld=$(ruby_rbconfig_value 'sitelibdir') insinto "${sld#${EPREFIX}}" # bug #320813 - newins "${FILESDIR}/auto_gem.rb.ruby19" auto_gem.rb || die + newins "${FILESDIR}/auto_gem.rb.ruby19" auto_gem.rb - newbin bin/gem $(basename ${RUBY} | sed -e 's:ruby:gem:') || die + newbin bin/gem $(basename ${RUBY} | sed -e 's:ruby:gem:') } all_ruby_install() { dodoc History.txt README.md if use server; then - newinitd "${FILESDIR}/init.d-gem_server2" gem_server || die "newinitd failed" - newconfd "${FILESDIR}/conf.d-gem_server" gem_server || die "newconfd failed" + newinitd "${FILESDIR}/init.d-gem_server2" gem_server + newconfd "${FILESDIR}/conf.d-gem_server" gem_server fi } |