summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid Seifert <soap@gentoo.org>2019-12-11 13:32:00 +0100
committerDavid Seifert <soap@gentoo.org>2019-12-11 13:32:00 +0100
commit398a42634f34afa1979d88ae1d8b38194e911c2d (patch)
treed6a45bdf7b35b71c192602a46e8d98d12a88cb02 /www-client
parentdev-ros/geometric_shapes: Remove old (diff)
downloadgentoo-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 'www-client')
-rw-r--r--www-client/firefox-bin/firefox-bin-52.9.0.ebuild6
-rw-r--r--www-client/firefox-bin/firefox-bin-68.2.0.ebuild4
-rw-r--r--www-client/firefox-bin/firefox-bin-68.3.0.ebuild4
-rw-r--r--www-client/firefox-bin/firefox-bin-70.0.1.ebuild4
-rw-r--r--www-client/firefox-bin/firefox-bin-71.0.ebuild4
-rw-r--r--www-client/seamonkey-bin/seamonkey-bin-2.48.ebuild2
-rw-r--r--www-client/seamonkey-bin/seamonkey-bin-2.49.1_rc2.ebuild2
7 files changed, 13 insertions, 13 deletions
diff --git a/www-client/firefox-bin/firefox-bin-52.9.0.ebuild b/www-client/firefox-bin/firefox-bin-52.9.0.ebuild
index adf129801cf4..00388e116ed2 100644
--- a/www-client/firefox-bin/firefox-bin-52.9.0.ebuild
+++ b/www-client/firefox-bin/firefox-bin-52.9.0.ebuild
@@ -97,11 +97,11 @@ src_install() {
# Install icons and .desktop for menu entry
for size in ${sizes}; do
insinto "/usr/share/icons/hicolor/${size}x${size}/apps"
- newins "${icon_path}/default${size}.png" "${icon}.png" || die
+ newins "${icon_path}/default${size}.png" "${icon}.png"
done
# The 128x128 icon has a different name
insinto /usr/share/icons/hicolor/128x128/apps
- newins "${icon_path}/../../../icons/mozicon128.png" "${icon}.png" || die
+ newins "${icon_path}/../../../icons/mozicon128.png" "${icon}.png"
# Install a 48x48 icon into /usr/share/pixmaps for legacy DEs
newicon "${S}"/browser/chrome/icons/default/default48.png ${PN}.png
domenu "${FILESDIR}"/${PN}.desktop
@@ -149,7 +149,7 @@ src_install() {
# revdep-rebuild entry
insinto /etc/revdep-rebuild
echo "SEARCH_DIRS_MASK=${MOZILLA_FIVE_HOME}" >> ${T}/10${PN}
- doins "${T}"/10${PN} || die
+ doins "${T}"/10${PN}
# Plugins dir
share_plugins_dir
diff --git a/www-client/firefox-bin/firefox-bin-68.2.0.ebuild b/www-client/firefox-bin/firefox-bin-68.2.0.ebuild
index 8e6dfcb8afc4..95df090a820d 100644
--- a/www-client/firefox-bin/firefox-bin-68.2.0.ebuild
+++ b/www-client/firefox-bin/firefox-bin-68.2.0.ebuild
@@ -97,7 +97,7 @@ src_install() {
# Install icons and .desktop for menu entry
for size in ${sizes}; do
insinto "/usr/share/icons/hicolor/${size}x${size}/apps"
- newins "${icon_path}/default${size}.png" "${icon}.png" || die
+ newins "${icon_path}/default${size}.png" "${icon}.png"
done
# Install a 48x48 icon into /usr/share/pixmaps for legacy DEs
newicon "${S}"/browser/chrome/icons/default/default48.png ${PN}.png
@@ -144,7 +144,7 @@ src_install() {
# revdep-rebuild entry
insinto /etc/revdep-rebuild
echo "SEARCH_DIRS_MASK=${MOZILLA_FIVE_HOME}" >> ${T}/10${PN}
- doins "${T}"/10${PN} || die
+ doins "${T}"/10${PN}
# Plugins dir, still used for flash
share_plugins_dir
diff --git a/www-client/firefox-bin/firefox-bin-68.3.0.ebuild b/www-client/firefox-bin/firefox-bin-68.3.0.ebuild
index 8e6dfcb8afc4..95df090a820d 100644
--- a/www-client/firefox-bin/firefox-bin-68.3.0.ebuild
+++ b/www-client/firefox-bin/firefox-bin-68.3.0.ebuild
@@ -97,7 +97,7 @@ src_install() {
# Install icons and .desktop for menu entry
for size in ${sizes}; do
insinto "/usr/share/icons/hicolor/${size}x${size}/apps"
- newins "${icon_path}/default${size}.png" "${icon}.png" || die
+ newins "${icon_path}/default${size}.png" "${icon}.png"
done
# Install a 48x48 icon into /usr/share/pixmaps for legacy DEs
newicon "${S}"/browser/chrome/icons/default/default48.png ${PN}.png
@@ -144,7 +144,7 @@ src_install() {
# revdep-rebuild entry
insinto /etc/revdep-rebuild
echo "SEARCH_DIRS_MASK=${MOZILLA_FIVE_HOME}" >> ${T}/10${PN}
- doins "${T}"/10${PN} || die
+ doins "${T}"/10${PN}
# Plugins dir, still used for flash
share_plugins_dir
diff --git a/www-client/firefox-bin/firefox-bin-70.0.1.ebuild b/www-client/firefox-bin/firefox-bin-70.0.1.ebuild
index 033f5e0c3851..f94c5700c784 100644
--- a/www-client/firefox-bin/firefox-bin-70.0.1.ebuild
+++ b/www-client/firefox-bin/firefox-bin-70.0.1.ebuild
@@ -97,7 +97,7 @@ src_install() {
# Install icons and .desktop for menu entry
for size in ${sizes}; do
insinto "/usr/share/icons/hicolor/${size}x${size}/apps"
- newins "${icon_path}/default${size}.png" "${icon}.png" || die
+ newins "${icon_path}/default${size}.png" "${icon}.png"
done
# Install a 48x48 icon into /usr/share/pixmaps for legacy DEs
newicon "${S}"/browser/chrome/icons/default/default48.png ${PN}.png
@@ -144,7 +144,7 @@ src_install() {
# revdep-rebuild entry
insinto /etc/revdep-rebuild
echo "SEARCH_DIRS_MASK=${MOZILLA_FIVE_HOME}" >> ${T}/10${PN}
- doins "${T}"/10${PN} || die
+ doins "${T}"/10${PN}
# Plugins dir, still used for flash
share_plugins_dir
diff --git a/www-client/firefox-bin/firefox-bin-71.0.ebuild b/www-client/firefox-bin/firefox-bin-71.0.ebuild
index 033f5e0c3851..f94c5700c784 100644
--- a/www-client/firefox-bin/firefox-bin-71.0.ebuild
+++ b/www-client/firefox-bin/firefox-bin-71.0.ebuild
@@ -97,7 +97,7 @@ src_install() {
# Install icons and .desktop for menu entry
for size in ${sizes}; do
insinto "/usr/share/icons/hicolor/${size}x${size}/apps"
- newins "${icon_path}/default${size}.png" "${icon}.png" || die
+ newins "${icon_path}/default${size}.png" "${icon}.png"
done
# Install a 48x48 icon into /usr/share/pixmaps for legacy DEs
newicon "${S}"/browser/chrome/icons/default/default48.png ${PN}.png
@@ -144,7 +144,7 @@ src_install() {
# revdep-rebuild entry
insinto /etc/revdep-rebuild
echo "SEARCH_DIRS_MASK=${MOZILLA_FIVE_HOME}" >> ${T}/10${PN}
- doins "${T}"/10${PN} || die
+ doins "${T}"/10${PN}
# Plugins dir, still used for flash
share_plugins_dir
diff --git a/www-client/seamonkey-bin/seamonkey-bin-2.48.ebuild b/www-client/seamonkey-bin/seamonkey-bin-2.48.ebuild
index 67375ce49a58..db57777a86e9 100644
--- a/www-client/seamonkey-bin/seamonkey-bin-2.48.ebuild
+++ b/www-client/seamonkey-bin/seamonkey-bin-2.48.ebuild
@@ -116,7 +116,7 @@ EOF
# revdep-rebuild entry
insinto /etc/revdep-rebuild
- doins "${FILESDIR}"/10${PN} || die
+ doins "${FILESDIR}"/10${PN}
# Handle plugins dir through nsplugins.eclass
share_plugins_dir
diff --git a/www-client/seamonkey-bin/seamonkey-bin-2.49.1_rc2.ebuild b/www-client/seamonkey-bin/seamonkey-bin-2.49.1_rc2.ebuild
index 9e4bf152292e..e7ac95700738 100644
--- a/www-client/seamonkey-bin/seamonkey-bin-2.49.1_rc2.ebuild
+++ b/www-client/seamonkey-bin/seamonkey-bin-2.49.1_rc2.ebuild
@@ -126,7 +126,7 @@ EOF
# revdep-rebuild entry
insinto /etc/revdep-rebuild
- doins "${FILESDIR}"/10${PN} || die
+ doins "${FILESDIR}"/10${PN}
# Handle plugins dir through nsplugins.eclass
share_plugins_dir