*/*: [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>

45 files changed, 68 insertions, 69 deletions

diff --git a/dev-java/avalon-framework/avalon-framework-4.2.0-r2.ebuild b/dev-java/avalon-framework/avalon-framework-4.2.0-r2.ebuild
index ba8118af4f5f..7d691bd713eb 100644
--- a/dev-java/avalon-framework/avalon-framework-4.2.0-r2.ebuild
+++ b/dev-java/avalon-framework/avalon-framework-4.2.0-r2.ebuild
@@ -34,7 +34,7 @@ java_prepare() {
 src_install() {
 	java-pkg_dojar "${S}"/dist/avalon-framework.jar
 
-	dodoc NOTICE.TXT || die
+	dodoc NOTICE.TXT
 	use doc && java-pkg_dojavadoc target/docs
 	use source && java-pkg_dosrc impl/src/java/*
 }
diff --git a/dev-java/backport-util-concurrent/backport-util-concurrent-3.1-r1.ebuild b/dev-java/backport-util-concurrent/backport-util-concurrent-3.1-r1.ebuild
index 0c7e2df0256c..6748f4a38eb7 100644
--- a/dev-java/backport-util-concurrent/backport-util-concurrent-3.1-r1.ebuild
+++ b/dev-java/backport-util-concurrent/backport-util-concurrent-3.1-r1.ebuild
@@ -47,7 +47,7 @@ EANT_TEST_TARGET="test"
 
 src_install() {
 	java-pkg_dojar ${PN}.jar
-	dohtml README.html || die
+	dohtml README.html
 
 	use doc && java-pkg_dojavadoc doc/api
 	use source && java-pkg_dosrc src/*
diff --git a/dev-java/browserlauncher2/browserlauncher2-1.3-r1.ebuild b/dev-java/browserlauncher2/browserlauncher2-1.3-r1.ebuild
index 315f0a029bed..8d5e98ca31ee 100644
--- a/dev-java/browserlauncher2/browserlauncher2-1.3-r1.ebuild
+++ b/dev-java/browserlauncher2/browserlauncher2-1.3-r1.ebuild
@@ -40,7 +40,7 @@ src_install() {
 	java-pkg_dolauncher BrowserLauncherTestApp-${SLOT} \
 		--main "edu.stanford.ejalbert.testing.BrowserLauncherTestApp"
 
-	dodoc README* || die
+	dodoc README*
 	use doc && java-pkg_dojavadoc api
 	use source && java-pkg_dosrc source
 }
diff --git a/dev-java/bsf/bsf-2.4.0-r2.ebuild b/dev-java/bsf/bsf-2.4.0-r2.ebuild
index ba7669ffd2c1..66799c831bf6 100644
--- a/dev-java/bsf/bsf-2.4.0-r2.ebuild
+++ b/dev-java/bsf/bsf-2.4.0-r2.ebuild
@@ -90,7 +90,7 @@ src_install() {
 
 	java-pkg_dolauncher ${PN} --main org.apache.bsf.Main
 
-	dodoc CHANGES.txt NOTICE.txt README.txt RELEASE-NOTE.txt TODO.txt || die
+	dodoc CHANGES.txt NOTICE.txt README.txt RELEASE-NOTE.txt TODO.txt
 
 	use doc && java-pkg_dojavadoc build/javadocs
 	use examples && java-pkg_doexamples samples
diff --git a/dev-java/colt/colt-1.2.0-r3.ebuild b/dev-java/colt/colt-1.2.0-r3.ebuild
index 118e1c232f82..ce5c2ef0fea4 100644
--- a/dev-java/colt/colt-1.2.0-r3.ebuild
+++ b/dev-java/colt/colt-1.2.0-r3.ebuild
@@ -39,7 +39,7 @@ java_prepare() {
 src_install() {
 	java-pkg_dojar "lib/${PN}.jar"
 
-	dohtml README.html || die
+	dohtml README.html
 	use doc && java-pkg_dojavadoc doc/api
 	use source && java-pkg_dosrc src/*
 }
diff --git a/dev-java/commons-beanutils/commons-beanutils-1.9.2.ebuild b/dev-java/commons-beanutils/commons-beanutils-1.9.2.ebuild
index e5b223986bbe..9391c5af9925 100644
--- a/dev-java/commons-beanutils/commons-beanutils-1.9.2.ebuild
+++ b/dev-java/commons-beanutils/commons-beanutils-1.9.2.ebuild
@@ -58,7 +58,7 @@ src_test() {
 src_install() {
 	java-pkg_newjar dist/${P}.jar
 
-	dodoc RELEASE-NOTES.txt || die
+	dodoc RELEASE-NOTES.txt
 
 	use doc && java-pkg_dojavadoc dist/docs/api
 	use source && java-pkg_dosrc src/main/java/org
diff --git a/dev-java/commons-collections/commons-collections-3.2.1-r1.ebuild b/dev-java/commons-collections/commons-collections-3.2.1-r1.ebuild
index 42ecb53bbf0a..9d19658925d7 100644
--- a/dev-java/commons-collections/commons-collections-3.2.1-r1.ebuild
+++ b/dev-java/commons-collections/commons-collections-3.2.1-r1.ebuild
@@ -63,7 +63,7 @@ src_install() {
 		java-pkg_newjar build/${PN}-testframework-${PV}.jar \
 			${PN}-testframework.jar
 
-	dodoc README.txt || die
+	dodoc README.txt
 	java-pkg_dohtml *.html || die
 	if use doc; then
 		java-pkg_dojavadoc build/docs/apidocs
diff --git a/dev-java/commons-configuration/commons-configuration-1.6-r2.ebuild b/dev-java/commons-configuration/commons-configuration-1.6-r2.ebuild
index 811493b46bd9..b8d6af15b0dc 100644
--- a/dev-java/commons-configuration/commons-configuration-1.6-r2.ebuild
+++ b/dev-java/commons-configuration/commons-configuration-1.6-r2.ebuild
@@ -61,7 +61,7 @@ RESTRICT="test"
 
 src_install() {
 	java-pkg_newjar target/${P}.jar
-	dodoc RELEASE-NOTES.txt || die
+	dodoc RELEASE-NOTES.txt
 	use doc && java-pkg_dohtml -r dist/docs/api
 	use source && java-pkg_dosrc src/java/*
 }
diff --git a/dev-java/commons-digester/commons-digester-1.8.1-r2.ebuild b/dev-java/commons-digester/commons-digester-1.8.1-r2.ebuild
index ef48eccd8418..e6cb1b16c607 100644
--- a/dev-java/commons-digester/commons-digester-1.8.1-r2.ebuild
+++ b/dev-java/commons-digester/commons-digester-1.8.1-r2.ebuild
@@ -49,7 +49,7 @@ src_test() {
 src_install() {
 	java-pkg_dojar "dist/${PN}.jar"
 
-	dodoc RELEASE-NOTES.txt || die
+	dodoc RELEASE-NOTES.txt
 
 	use doc && java-pkg_dojavadoc dist/docs/api
 	use source && java-pkg_dosrc src/java/org
diff --git a/dev-java/commons-email/commons-email-1.4.ebuild b/dev-java/commons-email/commons-email-1.4.ebuild
index ebcea82ec21e..d07ecdea6210 100644
--- a/dev-java/commons-email/commons-email-1.4.ebuild
+++ b/dev-java/commons-email/commons-email-1.4.ebuild
@@ -47,7 +47,7 @@ src_test() {
 
 src_install() {
 	java-pkg_newjar "target/${P}.jar" "${PN}.jar"
-	dodoc {NOTICE,README,RELEASE-NOTES}.txt || die
+	dodoc {NOTICE,README,RELEASE-NOTES}.txt
 	use doc && java-pkg_dojavadoc target/site/apidocs
 	use source && java-pkg_dosrc src/main/java
 }
diff --git a/dev-java/commons-jelly/commons-jelly-1.0-r8.ebuild b/dev-java/commons-jelly/commons-jelly-1.0-r8.ebuild
index 00885443116b..6cdda5bfc129 100644
--- a/dev-java/commons-jelly/commons-jelly-1.0-r8.ebuild
+++ b/dev-java/commons-jelly/commons-jelly-1.0-r8.ebuild
@@ -57,7 +57,7 @@ src_test() {
 
 src_install() {
 	java-pkg_newjar target/${P}.jar ${PN}.jar
-	dodoc NOTICE.txt README.txt RELEASE-NOTES.txt || die
+	dodoc NOTICE.txt README.txt RELEASE-NOTES.txt
 	use doc && java-pkg_dojavadoc dist/docs/api
 	use source && java-pkg_dosrc src/java/*
 }
diff --git a/dev-java/commons-jexl/commons-jexl-1.1-r1.ebuild b/dev-java/commons-jexl/commons-jexl-1.1-r1.ebuild
index 236a5c1dcd70..25ef0baa46ac 100644
--- a/dev-java/commons-jexl/commons-jexl-1.1-r1.ebuild
+++ b/dev-java/commons-jexl/commons-jexl-1.1-r1.ebuild
@@ -42,7 +42,7 @@ src_test() {
 
 src_install() {
 	java-pkg_newjar target/${P}*.jar
-	dodoc RELEASE-NOTES.txt || die
+	dodoc RELEASE-NOTES.txt
 	use doc && java-pkg_dojavadoc dist/docs/api
 	use source && java-pkg_dosrc "${S}"/src/java/*
 }
diff --git a/dev-java/commons-lang/commons-lang-2.0-r3.ebuild b/dev-java/commons-lang/commons-lang-2.0-r3.ebuild
index be7a4b9bb238..6fe664f4a31a 100644
--- a/dev-java/commons-lang/commons-lang-2.0-r3.ebuild
+++ b/dev-java/commons-lang/commons-lang-2.0-r3.ebuild
@@ -26,7 +26,7 @@ java_prepare() {
 src_install() {
 	java-pkg_newjar dist/${P}.jar ${PN}.jar
 
-	dodoc RELEASE-NOTES.txt || die
+	dodoc RELEASE-NOTES.txt
 	java-pkg_dohtml DEVELOPERS-GUIDE.html PROPOSAL.html STATUS.html
 	use doc && java-pkg_dojavadoc dist/docs/api
 	use source && java-pkg_dosrc src/java/*
diff --git a/dev-java/commons-lang/commons-lang-2.6-r1.ebuild b/dev-java/commons-lang/commons-lang-2.6-r1.ebuild
index b108cd7918ee..0d01911f7fb3 100644
--- a/dev-java/commons-lang/commons-lang-2.6-r1.ebuild
+++ b/dev-java/commons-lang/commons-lang-2.6-r1.ebuild
@@ -28,8 +28,8 @@ JAVA_ANT_ENCODING="ISO-8859-1"
 
 src_install() {
 	java-pkg_newjar "target/${P}.jar" "${PN}.jar"
-	dodoc RELEASE-NOTES.txt NOTICE.txt || die
-	dohtml *.html || die
+	dodoc RELEASE-NOTES.txt NOTICE.txt
+	dohtml *.html
 	use doc && java-pkg_dojavadoc target/apidocs
 	use source && java-pkg_dosrc src/main/java/*
 }
diff --git a/dev-java/commons-logging/commons-logging-1.2-r1.ebuild b/dev-java/commons-logging/commons-logging-1.2-r1.ebuild
index d31cbb5b606b..8e2a3a80f9c3 100644
--- a/dev-java/commons-logging/commons-logging-1.2-r1.ebuild
+++ b/dev-java/commons-logging/commons-logging-1.2-r1.ebuild
@@ -57,8 +57,8 @@ src_install() {
 	java-pkg_newjar target/${PN}-api-${PV}.jar ${PN}-api.jar
 	java-pkg_newjar target/${PN}-adapters-${PV}.jar ${PN}-adapters.jar
 
-	dodoc RELEASE-NOTES.txt || die
-	dohtml PROPOSAL.html || die
+	dodoc RELEASE-NOTES.txt
+	dohtml PROPOSAL.html
 	use doc && java-pkg_dojavadoc target/docs/
 	use source && java-pkg_dosrc src/main/java/org
 }
diff --git a/dev-java/cortado/cortado-0.6.0-r1.ebuild b/dev-java/cortado/cortado-0.6.0-r1.ebuild
index 350b3b47d896..fe8148871378 100644
--- a/dev-java/cortado/cortado-0.6.0-r1.ebuild
+++ b/dev-java/cortado/cortado-0.6.0-r1.ebuild
@@ -26,6 +26,5 @@ src_prepare() {
 
 src_install() {
 	java-pkg_newjar "output/dist/applet/${PN}-ovt-stripped-${PV}.jar"
-	dodoc ChangeLog HACKING NEWS README RELEASE TODO \
-		|| die "dodoc failed"
+	dodoc ChangeLog HACKING NEWS README RELEASE TODO
 }
diff --git a/dev-java/dnsjava/dnsjava-2.1.6.ebuild b/dev-java/dnsjava/dnsjava-2.1.6.ebuild
index b40db04e30e0..c45f80d04cab 100644
--- a/dev-java/dnsjava/dnsjava-2.1.6.ebuild
+++ b/dev-java/dnsjava/dnsjava-2.1.6.ebuild
@@ -39,7 +39,7 @@ java_prepare() {
 src_install() {
 	java-pkg_newjar "${P}.jar"
 
-	dodoc README USAGE || die
+	dodoc README USAGE
 	use doc && java-pkg_dojavadoc doc
 	use source && java-pkg_dosrc org/
 }
diff --git a/dev-java/dnsjava/dnsjava-2.1.7.ebuild b/dev-java/dnsjava/dnsjava-2.1.7.ebuild
index b2e98f812f19..a7d0260b9eba 100644
--- a/dev-java/dnsjava/dnsjava-2.1.7.ebuild
+++ b/dev-java/dnsjava/dnsjava-2.1.7.ebuild
@@ -39,7 +39,7 @@ java_prepare() {
 src_install() {
 	java-pkg_newjar "${P}.jar"
 
-	dodoc README USAGE || die
+	dodoc README USAGE
 	use doc && java-pkg_dojavadoc doc
 	use source && java-pkg_dosrc org/
 }
diff --git a/dev-java/fec/fec-1.0.4-r2.ebuild b/dev-java/fec/fec-1.0.4-r2.ebuild
index e1b2f635b328..b925d176c372 100644
--- a/dev-java/fec/fec-1.0.4-r2.ebuild
+++ b/dev-java/fec/fec-1.0.4-r2.ebuild
@@ -57,7 +57,7 @@ src_compile() {
 
 	cd "${S}"/src/csrc || die
 	append-flags -fPIC
-	emake CC=$(tc-getCC) CFLAGS="${CFLAGS} $(java-pkg_get-jni-cflags)" || die
+	emake CC=$(tc-getCC) CFLAGS="${CFLAGS} $(java-pkg_get-jni-cflags)"
 	einfo "Sucessfully compiled C files!"
 }
 
@@ -65,5 +65,5 @@ src_install() {
 	java-pkg_newjar "lib/onion-${PN}.jar" "${PN}.jar"
 	use doc && java-pkg_dojavadoc javadoc
 	use source && java-pkg_dosrc src/com
-	dolib.so src/csrc/libfec{8,16}.so || die
+	dolib.so src/csrc/libfec{8,16}.so
 }
diff --git a/dev-java/fscript/fscript-1.17-r1.ebuild b/dev-java/fscript/fscript-1.17-r1.ebuild
index ec3c1c39692d..9d5ac52bc08a 100644
--- a/dev-java/fscript/fscript-1.17-r1.ebuild
+++ b/dev-java/fscript/fscript-1.17-r1.ebuild
@@ -32,7 +32,7 @@ src_test() {
 src_install() {
 	java-pkg_dojar *.jar
 
-	dodoc CREDITS README VERSION || die
+	dodoc CREDITS README VERSION
 	# docs/* contains not only javadoc:
 	use doc && java-pkg_dohtml -r docs/*
 	use examples && java-pkg_doexamples examples/
diff --git a/dev-java/helpgui/helpgui-1.1-r2.ebuild b/dev-java/helpgui/helpgui-1.1-r2.ebuild
index 114379b2a443..e9d32f2214ae 100644
--- a/dev-java/helpgui/helpgui-1.1-r2.ebuild
+++ b/dev-java/helpgui/helpgui-1.1-r2.ebuild
@@ -26,7 +26,7 @@ EANT_DOC_TARGET="javadocs"
 src_install() {
 	java-pkg_newjar build/${P}.jar ${PN}.jar
 
-	dodoc README || die
+	dodoc README
 	use doc && java-pkg_dojavadoc build/docs/api
 	use source && java-pkg_dosrc src/*
 }
diff --git a/dev-java/jacl/jacl-1.4.1-r1.ebuild b/dev-java/jacl/jacl-1.4.1-r1.ebuild
index 2a090c5d697a..1b1b4647978a 100644
--- a/dev-java/jacl/jacl-1.4.1-r1.ebuild
+++ b/dev-java/jacl/jacl-1.4.1-r1.ebuild
@@ -48,5 +48,5 @@ src_compile() {
 src_install() {
 	java-pkg-simple_src_install
 	java-pkg_dolauncher jaclsh --main tcl.lang.Shell
-	dodoc README ChangeLog known_issues.txt || die
+	dodoc README ChangeLog known_issues.txt
 }
diff --git a/dev-java/jamvm/jamvm-2.0.0-r1.ebuild b/dev-java/jamvm/jamvm-2.0.0-r1.ebuild
index b418c899262f..457e883de306 100644
--- a/dev-java/jamvm/jamvm-2.0.0-r1.ebuild
+++ b/dev-java/jamvm/jamvm-2.0.0-r1.ebuild
@@ -86,10 +86,10 @@ src_install() {
 	dosym /usr/bin/jamvm ${JDK_DIR}/bin/java
 	for files in ${CLASSPATH_DIR}/g*; do
 		if [ $files = "${CLASSPATH_DIR}/bin/gjdoc" ] ; then
-			dosym $files ${JDK_DIR}/bin/javadoc || die
+			dosym $files ${JDK_DIR}/bin/javadoc
 		else
 			dosym $files \
-				${JDK_DIR}/bin/$(echo $files|sed "s#$(dirname $files)/g##") || die
+				${JDK_DIR}/bin/$(echo $files|sed "s#$(dirname $files)/g##")
 		fi
 	done
 
diff --git a/dev-java/java-getopt/java-getopt-1.0.14.ebuild b/dev-java/java-getopt/java-getopt-1.0.14.ebuild
index a7baab751965..ed3d17cc0682 100644
--- a/dev-java/java-getopt/java-getopt-1.0.14.ebuild
+++ b/dev-java/java-getopt/java-getopt-1.0.14.ebuild
@@ -27,7 +27,7 @@ java_prepare() {
 
 src_install() {
 	java-pkg_dojar build/lib/gnu.getopt.jar
-	dodoc gnu/getopt/COPYING.LIB gnu/getopt/ChangeLog gnu/getopt/README || die
+	dodoc gnu/getopt/COPYING.LIB gnu/getopt/ChangeLog gnu/getopt/README
 	use doc && java-pkg_dojavadoc build/api
 	use source && java-pkg_dosrc gnu
 }
diff --git a/dev-java/java-service-wrapper/java-service-wrapper-3.5.25-r1.ebuild b/dev-java/java-service-wrapper/java-service-wrapper-3.5.25-r1.ebuild
index 661ff4893720..2261beb2f119 100644
--- a/dev-java/java-service-wrapper/java-service-wrapper-3.5.25-r1.ebuild
+++ b/dev-java/java-service-wrapper/java-service-wrapper-3.5.25-r1.ebuild
@@ -61,8 +61,8 @@ src_install() {
 	java-pkg_doso lib/libwrapper.so
 
 	dobin bin/wrapper
-	dodoc README*.txt || die
-	dodoc doc/revisions.txt || die
+	dodoc README*.txt
+	dodoc doc/revisions.txt
 
 	use doc && java-pkg_dojavadoc api
 	use source && java-pkg_dosrc src/java/*
diff --git a/dev-java/javassist/javassist-3.18.2.ebuild b/dev-java/javassist/javassist-3.18.2.ebuild
index 9233b253e3ef..d2f8df82b49d 100644
--- a/dev-java/javassist/javassist-3.18.2.ebuild
+++ b/dev-java/javassist/javassist-3.18.2.ebuild
@@ -32,7 +32,7 @@ java_prepare() {
 
 src_install() {
 	java-pkg_dojar ${PN}.jar
-	dohtml Readme.html || die
+	dohtml Readme.html
 	use doc && java-pkg_dojavadoc html
 	use source && java-pkg_dosrc src/main/javassist
 	use examples && java-pkg_doexamples sample/*
diff --git a/dev-java/jdepend/jdepend-2.9-r5.ebuild b/dev-java/jdepend/jdepend-2.9-r5.ebuild
index 0874404b4dec..efb4182bddad 100644
--- a/dev-java/jdepend/jdepend-2.9-r5.ebuild
+++ b/dev-java/jdepend/jdepend-2.9-r5.ebuild
@@ -26,8 +26,8 @@ java_prepare() {
 
 src_install() {
 	java-pkg_newjar dist/jdepend-2.9.jar
-	dodoc README || die
-	dohtml -r docs/* || die
+	dodoc README
+	dohtml -r docs/*
 	use doc && java-pkg_dojavadoc build/docs/api
 	use source && java-pkg_dosrc src/*
 }
diff --git a/dev-java/jdom/jdom-1.1.3.ebuild b/dev-java/jdom/jdom-1.1.3.ebuild
index 8fc3d32e45a6..7d7440c09783 100644
--- a/dev-java/jdom/jdom-1.1.3.ebuild
+++ b/dev-java/jdom/jdom-1.1.3.ebuild
@@ -42,7 +42,7 @@ EANT_BUILD_TARGET="package"
 
 src_install() {
 	java-pkg_dojar build/*.jar
-	dodoc CHANGES.txt COMMITTERS.txt README.txt TODO.txt || die
+	dodoc CHANGES.txt COMMITTERS.txt README.txt TODO.txt
 	use doc && java-pkg_dojavadoc build/apidocs
 	use examples && java-pkg_doexamples samples
 	use source && java-pkg_dosrc src/java/org
diff --git a/dev-java/jgoodies-looks/jgoodies-looks-2.3.1-r1.ebuild b/dev-java/jgoodies-looks/jgoodies-looks-2.3.1-r1.ebuild
index b852487d7d15..3a949d007d8b 100644
--- a/dev-java/jgoodies-looks/jgoodies-looks-2.3.1-r1.ebuild
+++ b/dev-java/jgoodies-looks/jgoodies-looks-2.3.1-r1.ebuild
@@ -52,8 +52,8 @@ java_prepare() {
 src_install() {
 	java-pkg_dojar build/looks.jar
 
-	dodoc RELEASE-NOTES.txt || die
-	dohtml README.html || die
+	dodoc RELEASE-NOTES.txt
+	dohtml README.html
 	use doc && java-pkg_dojavadoc build/docs/api
 	use source && java-pkg_dosrc src/core/com
 	use examples && java-pkg_doexamples src/demo
diff --git a/dev-java/jgrapht/jgrapht-0.8.3.ebuild b/dev-java/jgrapht/jgrapht-0.8.3.ebuild
index d35de3c1861e..1ea27d57362a 100644
--- a/dev-java/jgrapht/jgrapht-0.8.3.ebuild
+++ b/dev-java/jgrapht/jgrapht-0.8.3.ebuild
@@ -42,7 +42,7 @@ src_test() {
 src_install() {
 	java-pkg_newjar ${PN}*.jar || die
 
-	dohtml README.html || die
+	dohtml README.html
 	use doc && java-pkg_dojavadoc javadoc
 	use source && java-pkg_dosrc src/org
 }
diff --git a/dev-java/jsch/jsch-0.1.52.ebuild b/dev-java/jsch/jsch-0.1.52.ebuild
index 037e4ae36e32..29979e493654 100644
--- a/dev-java/jsch/jsch-0.1.52.ebuild
+++ b/dev-java/jsch/jsch-0.1.52.ebuild
@@ -43,7 +43,7 @@ src_install() {
 		"com.jcraft.jsch, com.jcraft.jsch.jce;x-internal:=true, \
 		com.jcraft.jsch.jcraft;x-internal:=true"
 
-	dodoc README ChangeLog || die
+	dodoc README ChangeLog
 	use doc && java-pkg_dojavadoc javadoc
 	use source && java-pkg_dosrc src/*
 	use examples && java-pkg_doexamples examples
diff --git a/dev-java/json/json-20150729.ebuild b/dev-java/json/json-20150729.ebuild
index 1a1e7bda2a30..a40b3e9d7189 100644
--- a/dev-java/json/json-20150729.ebuild
+++ b/dev-java/json/json-20150729.ebuild
@@ -29,5 +29,5 @@ java_prepare() {
 
 src_install() {
 	java-pkg-simple_src_install
-	dodoc README || die
+	dodoc README
 }
diff --git a/dev-java/junit-addons/junit-addons-1.4-r1.ebuild b/dev-java/junit-addons/junit-addons-1.4-r1.ebuild
index 3e5a375987af..5676030d18b9 100644
--- a/dev-java/junit-addons/junit-addons-1.4-r1.ebuild
+++ b/dev-java/junit-addons/junit-addons-1.4-r1.ebuild
@@ -58,7 +58,7 @@ src_compile() {
 
 src_install() {
 	java-pkg_newjar dist/${P}.jar
-	dodoc README WHATSNEW || die
+	dodoc README WHATSNEW
 	use doc && java-pkg_dojavadoc api
 	if use source; then
 		insinto "${JAVA_PKG_SOURCESPATH}"
diff --git a/dev-java/l2fprod-common/l2fprod-common-7.3-r2.ebuild b/dev-java/l2fprod-common/l2fprod-common-7.3-r2.ebuild
index 5e9f5c5ff03f..9e20e1fd5e83 100644
--- a/dev-java/l2fprod-common/l2fprod-common-7.3-r2.ebuild
+++ b/dev-java/l2fprod-common/l2fprod-common-7.3-r2.ebuild
@@ -42,5 +42,5 @@ src_compile() {
 src_install() {
 	java-pkg_dojar build/jars/*.jar
 
-	dodoc README.txt || die
+	dodoc README.txt
 }
diff --git a/dev-java/odfdom/odfdom-0.8.6-r1.ebuild b/dev-java/odfdom/odfdom-0.8.6-r1.ebuild
index d770b3a1f21f..647424a452f2 100644
--- a/dev-java/odfdom/odfdom-0.8.6-r1.ebuild
+++ b/dev-java/odfdom/odfdom-0.8.6-r1.ebuild
@@ -59,6 +59,6 @@ src_test() {
 src_install() {
 	java-pkg_dojar target/odfdom.jar
 
-	dodoc README.txt LICENSE.txt || die
+	dodoc README.txt LICENSE.txt
 	use doc && java-pkg_dojavadoc target/site/apidocs
 }
diff --git a/dev-java/oracle-javamail/oracle-javamail-1.5.2.ebuild b/dev-java/oracle-javamail/oracle-javamail-1.5.2.ebuild
index 7ff17890673c..14621389420c 100644
--- a/dev-java/oracle-javamail/oracle-javamail-1.5.2.ebuild
+++ b/dev-java/oracle-javamail/oracle-javamail-1.5.2.ebuild
@@ -36,8 +36,8 @@ EANT_EXTRA_ARGS="-Dspec.dir=doc/spec"
 src_install() {
 	java-pkg_dojar target/release/mail.jar
 
-	dodoc doc/release/{CHANGES,COMPAT,NOTES,NTLMNOTES,README,SSLNOTES}.txt || die
-	dohtml -r doc/release/{*.html,images} || die
+	dodoc doc/release/{CHANGES,COMPAT,NOTES,NTLMNOTES,README,SSLNOTES}.txt
+	dohtml -r doc/release/{*.html,images}
 
 	use doc && java-pkg_dojavadoc target/release/docs/javadocs
 	use source && java-pkg_dosrc mail/src/main/java
diff --git a/dev-java/oracle-javamail/oracle-javamail-1.5.5.ebuild b/dev-java/oracle-javamail/oracle-javamail-1.5.5.ebuild
index b50794d5b058..90e1f7aec221 100644
--- a/dev-java/oracle-javamail/oracle-javamail-1.5.5.ebuild
+++ b/dev-java/oracle-javamail/oracle-javamail-1.5.5.ebuild
@@ -36,8 +36,8 @@ EANT_EXTRA_ARGS="-Dspec.dir=doc/spec"
 src_install() {
 	java-pkg_dojar target/release/mail.jar
 
-	dodoc doc/release/{CHANGES,COMPAT,NOTES,NTLMNOTES,README,SSLNOTES}.txt || die
-	dohtml -r doc/release/{*.html,images} || die
+	dodoc doc/release/{CHANGES,COMPAT,NOTES,NTLMNOTES,README,SSLNOTES}.txt
+	dohtml -r doc/release/{*.html,images}
 
 	use doc && java-pkg_dojavadoc target/release/docs/javadocs
 	use source && java-pkg_dosrc mail/src/main/java
diff --git a/dev-java/oracle-javamail/oracle-javamail-1.5.6.ebuild b/dev-java/oracle-javamail/oracle-javamail-1.5.6.ebuild
index 3a3a33a02b82..143e962b47e0 100644
--- a/dev-java/oracle-javamail/oracle-javamail-1.5.6.ebuild
+++ b/dev-java/oracle-javamail/oracle-javamail-1.5.6.ebuild
@@ -36,8 +36,8 @@ EANT_EXTRA_ARGS="-Dspec.dir=doc/spec"
 src_install() {
 	java-pkg_dojar target/release/mail.jar
 
-	dodoc doc/release/{CHANGES,COMPAT,NOTES,NTLMNOTES,README,SSLNOTES}.txt || die
-	dohtml -r doc/release/{*.html,images} || die
+	dodoc doc/release/{CHANGES,COMPAT,NOTES,NTLMNOTES,README,SSLNOTES}.txt
+	dohtml -r doc/release/{*.html,images}
 
 	use doc && java-pkg_dojavadoc target/release/docs/javadocs
 	use source && java-pkg_dosrc mail/src/main/java
diff --git a/dev-java/prefuse/prefuse-20071021_beta.ebuild b/dev-java/prefuse/prefuse-20071021_beta.ebuild
index cbfe38609155..adf15daf1e24 100644
--- a/dev-java/prefuse/prefuse-20071021_beta.ebuild
+++ b/dev-java/prefuse/prefuse-20071021_beta.ebuild
@@ -41,7 +41,7 @@ src_compile() {
 src_install() {
 	java-pkg_dojar build/${PN}.jar
 
-	dodoc readme.txt || die
+	dodoc readme.txt
 	use doc && java-pkg_dojavadoc doc/api
 	use source && java-pkg_dosrc src/*
 	use examples && java-pkg_doexamples demos/*
diff --git a/dev-java/sbt-bin/sbt-bin-1.1.4.ebuild b/dev-java/sbt-bin/sbt-bin-1.1.4.ebuild
index 7d39ba4f4053..eb705fb853eb 100644
--- a/dev-java/sbt-bin/sbt-bin-1.1.4.ebuild
+++ b/dev-java/sbt-bin/sbt-bin-1.1.4.ebuild
@@ -39,11 +39,11 @@ src_install() {
 		bin/sbt-launch-lib.bash || die
 
 	insinto "${dest}/lib"
-	doins bin/* || die
+	doins bin/*
 
 	insinto "${dest}"
-	doins -r conf || die
+	doins -r conf
 
-	fperms 0755 "${dest}/lib/sbt" || die
-	dosym "${dest}/lib/sbt" /usr/bin/sbt || die
+	fperms 0755 "${dest}/lib/sbt"
+	dosym "${dest}/lib/sbt" /usr/bin/sbt
 }
diff --git a/dev-java/sbt-bin/sbt-bin-1.1.5.ebuild b/dev-java/sbt-bin/sbt-bin-1.1.5.ebuild
index 7d39ba4f4053..eb705fb853eb 100644
--- a/dev-java/sbt-bin/sbt-bin-1.1.5.ebuild
+++ b/dev-java/sbt-bin/sbt-bin-1.1.5.ebuild
@@ -39,11 +39,11 @@ src_install() {
 		bin/sbt-launch-lib.bash || die
 
 	insinto "${dest}/lib"
-	doins bin/* || die
+	doins bin/*
 
 	insinto "${dest}"
-	doins -r conf || die
+	doins -r conf
 
-	fperms 0755 "${dest}/lib/sbt" || die
-	dosym "${dest}/lib/sbt" /usr/bin/sbt || die
+	fperms 0755 "${dest}/lib/sbt"
+	dosym "${dest}/lib/sbt" /usr/bin/sbt
 }
diff --git a/dev-java/sbt-bin/sbt-bin-1.2.8.ebuild b/dev-java/sbt-bin/sbt-bin-1.2.8.ebuild
index fc9acfcd4e6a..c78f24f9901a 100644
--- a/dev-java/sbt-bin/sbt-bin-1.2.8.ebuild
+++ b/dev-java/sbt-bin/sbt-bin-1.2.8.ebuild
@@ -39,11 +39,11 @@ src_install() {
 		bin/sbt-launch-lib.bash || die
 
 	insinto "${dest}/lib"
-	doins bin/* || die
+	doins bin/*
 
 	insinto "${dest}"
-	doins -r conf || die
+	doins -r conf
 
-	fperms 0755 "${dest}/lib/sbt" || die
-	dosym "${dest}/lib/sbt" /usr/bin/sbt || die
+	fperms 0755 "${dest}/lib/sbt"
+	dosym "${dest}/lib/sbt" /usr/bin/sbt
 }
diff --git a/dev-java/sbt-bin/sbt-bin-1.3.2.ebuild b/dev-java/sbt-bin/sbt-bin-1.3.2.ebuild
index 398eb3234255..e799b9d9121c 100644
--- a/dev-java/sbt-bin/sbt-bin-1.3.2.ebuild
+++ b/dev-java/sbt-bin/sbt-bin-1.3.2.ebuild
@@ -39,11 +39,11 @@ src_install() {
 		bin/sbt || die
 
 	insinto "${dest}/lib"
-	doins bin/* || die
+	doins bin/*
 
 	insinto "${dest}"
-	doins -r conf || die
+	doins -r conf
 
-	fperms 0755 "${dest}/lib/sbt" || die
-	dosym "${dest}/lib/sbt" /usr/bin/sbt || die
+	fperms 0755 "${dest}/lib/sbt"
+	dosym "${dest}/lib/sbt" /usr/bin/sbt
 }
diff --git a/dev-java/swt/swt-3.7.2-r2.ebuild b/dev-java/swt/swt-3.7.2-r2.ebuild
index aa38b1de0654..8444b55d8ef2 100644
--- a/dev-java/swt/swt-3.7.2-r2.ebuild
+++ b/dev-java/swt/swt-3.7.2-r2.ebuild
@@ -165,5 +165,5 @@ src_install() {
 	java-pkg_sointo /usr/$(get_libdir)
 	java-pkg_doso *.so
 
-	dohtml about.html || die
+	dohtml about.html
 }
diff --git a/dev-java/tagsoup/tagsoup-1.2.1.ebuild b/dev-java/tagsoup/tagsoup-1.2.1.ebuild
index 003f63259bff..0377d35022df 100644
--- a/dev-java/tagsoup/tagsoup-1.2.1.ebuild
+++ b/dev-java/tagsoup/tagsoup-1.2.1.ebuild
@@ -34,8 +34,8 @@ src_install() {
 	java-pkg_newjar dist/lib/${PN}-1.2.jar ${PN}.jar
 	java-pkg_dolauncher
 
-	doman ${PN}.1 || die
-	dodoc CHANGES README TODO || die
+	doman ${PN}.1
+	dodoc CHANGES README TODO
 
 	use doc && java-pkg_dojavadoc docs/api
 	use source && java-pkg_dosrc src/{java,templates}/*