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 | |
| 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>
710 files changed, 1463 insertions, 1545 deletions
diff --git a/app-accessibility/espeakup/espeakup-0.71-r1.ebuild b/app-accessibility/espeakup/espeakup-0.71-r1.ebuild index 6d8dbfdadf20..4b3682500954 100644 --- a/app-accessibility/espeakup/espeakup-0.71-r1.ebuild +++ b/app-accessibility/espeakup/espeakup-0.71-r1.ebuild @@ -36,11 +36,11 @@ pkg_setup() { } src_compile() { - emake || die "Compile failed." + emake } src_install() { - emake DESTDIR="${D}" install || die "Install failed." + emake DESTDIR="${D}" install dodoc ChangeLog README ToDo newconfd "${FILESDIR}"/espeakup.confd espeakup newinitd "${FILESDIR}"/espeakup.rc espeakup diff --git a/app-admin/chrpath/chrpath-0.13-r2.ebuild b/app-admin/chrpath/chrpath-0.13-r2.ebuild index d47a2afa4974..89d26b3b7e07 100644 --- a/app-admin/chrpath/chrpath-0.13-r2.ebuild +++ b/app-admin/chrpath/chrpath-0.13-r2.ebuild @@ -31,7 +31,7 @@ src_prepare() { } src_configure() { - econf $(use_enable static-libs static) || die + econf $(use_enable static-libs static) } src_install() { diff --git a/app-admin/equo/equo-302.ebuild b/app-admin/equo/equo-302.ebuild index 1c5924a18e98..cfe1a7c0ea3c 100644 --- a/app-admin/equo/equo-302.ebuild +++ b/app-admin/equo/equo-302.ebuild @@ -29,12 +29,12 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE}" src_compile() { cd "${S}"/client || die - emake || die "make failed" + emake } src_install() { cd "${S}"/client || die - emake DESTDIR="${D}" LIBDIR="usr/lib" install || die "make install failed" + emake DESTDIR="${D}" LIBDIR="usr/lib" install newbashcomp "${S}/misc/equo-completion.bash" equo python_optimize "${D}/usr/lib/entropy/client" diff --git a/app-admin/gam-server/gam-server-0.1.10-r2.ebuild b/app-admin/gam-server/gam-server-0.1.10-r2.ebuild index 9d66f04b72eb..ed2b39bb68d9 100644 --- a/app-admin/gam-server/gam-server-0.1.10-r2.ebuild +++ b/app-admin/gam-server/gam-server-0.1.10-r2.ebuild @@ -84,5 +84,5 @@ src_configure() { } src_install() { - emake DESTDIR="${D}" install || die + emake DESTDIR="${D}" install } diff --git a/app-admin/ide-smart/ide-smart-1.4-r2.ebuild b/app-admin/ide-smart/ide-smart-1.4-r2.ebuild index c4d034211730..b064d1e5e222 100644 --- a/app-admin/ide-smart/ide-smart-1.4-r2.ebuild +++ b/app-admin/ide-smart/ide-smart-1.4-r2.ebuild @@ -19,7 +19,7 @@ src_compile() { } src_install() { - dobin ide-smart || die + dobin ide-smart doman ide-smart.8 dodoc README } diff --git a/app-admin/matter/matter-302.ebuild b/app-admin/matter/matter-302.ebuild index 47f0521d6aab..23ff9aad401d 100644 --- a/app-admin/matter/matter-302.ebuild +++ b/app-admin/matter/matter-302.ebuild @@ -26,10 +26,10 @@ RDEPEND="entropy? ( ~sys-apps/entropy-${PV}[${PYTHON_USEDEP}] ) REQUIRED_USE="${PYTHON_REQUIRED_USE}" src_install() { - emake DESTDIR="${D}" install || die "make install failed" - emake DESTDIR="${D}" base-install || die "make base-install failed" + emake DESTDIR="${D}" install + emake DESTDIR="${D}" base-install if use entropy; then - emake DESTDIR="${D}" entropysrv-install || die "make base-install failed" + emake DESTDIR="${D}" entropysrv-install fi python_optimize "${D}/usr/lib/matter" diff --git a/app-admin/paxtest/paxtest-0.9.15-r1.ebuild b/app-admin/paxtest/paxtest-0.9.15-r1.ebuild index 4fe8a445c276..2919e526c917 100644 --- a/app-admin/paxtest/paxtest-0.9.15-r1.ebuild +++ b/app-admin/paxtest/paxtest-0.9.15-r1.ebuild @@ -33,12 +33,12 @@ src_prepare() { } src_compile() { - emake RUNDIR=/usr/$(get_libdir)/paxtest || die + emake RUNDIR=/usr/$(get_libdir)/paxtest } src_install() { - emake DESTDIR="${D}" BINDIR=/usr/bin RUNDIR=/usr/$(get_libdir)/paxtest install || die + emake DESTDIR="${D}" BINDIR=/usr/bin RUNDIR=/usr/$(get_libdir)/paxtest install - newman debian/manpage.1.ex paxtest.1 || die - dodoc ChangeLog README || die + newman debian/manpage.1.ex paxtest.1 + dodoc ChangeLog README } diff --git a/app-admin/webalizer/webalizer-2.23.08.ebuild b/app-admin/webalizer/webalizer-2.23.08.ebuild index 605bbadefb1f..dbe21c66ca5d 100644 --- a/app-admin/webalizer/webalizer-2.23.08.ebuild +++ b/app-admin/webalizer/webalizer-2.23.08.ebuild @@ -76,8 +76,7 @@ src_configure() { ${myconf} \ $(use_enable geoip) \ $(use_enable bzip2 bz2) \ - --with-geodb=${GEODB_DIR} \ - || die "econf failed" + --with-geodb=${GEODB_DIR} } src_install() { diff --git a/app-admin/xstow/xstow-1.0.1.ebuild b/app-admin/xstow/xstow-1.0.1.ebuild index de7357598a6c..8bc68e8c4517 100644 --- a/app-admin/xstow/xstow-1.0.1.ebuild +++ b/app-admin/xstow/xstow-1.0.1.ebuild @@ -34,7 +34,7 @@ src_install() { dodir /var/lib/xstow # install env.d file to add STOWDIR to PATH and LDPATH - doenvd "${FILESDIR}/99xstow" || die "doenvd failed" + doenvd "${FILESDIR}/99xstow" } pkg_postinst() { diff --git a/app-arch/duff/duff-0.5.2.ebuild b/app-arch/duff/duff-0.5.2.ebuild index ee113c8fa508..94522ba771dd 100644 --- a/app-arch/duff/duff-0.5.2.ebuild +++ b/app-arch/duff/duff-0.5.2.ebuild @@ -14,6 +14,6 @@ DEPEND="" RDEPEND="" src_install() { - emake DESTDIR="${D}" install || die "Failed emake install" + emake DESTDIR="${D}" install dodoc AUTHORS ChangeLog HACKING NEWS README* TODO } diff --git a/app-arch/lzma/lzma-9.20-r1.ebuild b/app-arch/lzma/lzma-9.20-r1.ebuild index 80cac224e6b3..3be4cdb989e9 100644 --- a/app-arch/lzma/lzma-9.20-r1.ebuild +++ b/app-arch/lzma/lzma-9.20-r1.ebuild @@ -25,7 +25,7 @@ src_compile() { } src_install() { - newbin CPP/7zip/Bundles/LzmaCon/lzma lzmacon || die + newbin CPP/7zip/Bundles/LzmaCon/lzma lzmacon dodoc lzma.txt history.txt use doc && dodoc 7zC.txt 7zFormat.txt Methods.txt } diff --git a/app-arch/mscompress/mscompress-0.3-r1.ebuild b/app-arch/mscompress/mscompress-0.3-r1.ebuild index 76d6e64551e5..23ab7db21192 100644 --- a/app-arch/mscompress/mscompress-0.3-r1.ebuild +++ b/app-arch/mscompress/mscompress-0.3-r1.ebuild @@ -27,7 +27,7 @@ src_configure() { } src_install() { - dobin mscompress msexpand || die + dobin mscompress msexpand doman mscompress.1 msexpand.1 dodoc README ChangeLog } diff --git a/app-arch/rar/rar-5.7.1_p20190427.ebuild b/app-arch/rar/rar-5.7.1_p20190427.ebuild index 4e7e71caf696..e7514ff5be78 100644 --- a/app-arch/rar/rar-5.7.1_p20190427.ebuild +++ b/app-arch/rar/rar-5.7.1_p20190427.ebuild @@ -92,18 +92,18 @@ src_compile() { :; } src_install() { exeinto /opt/rar - doexe rar unrar || die + doexe rar unrar dodir /opt/bin - dosym ../rar/rar /opt/bin/rar || die - dosym ../rar/unrar /opt/bin/unrar || die + dosym ../rar/rar /opt/bin/rar + dosym ../rar/unrar /opt/bin/unrar insinto /opt/rar if use all_sfx ; then - doins "${WORKDIR}"/sfx/*.{sfx,SFX} || die + doins "${WORKDIR}"/sfx/*.{sfx,SFX} else - doins default.sfx || die + doins default.sfx fi - doins rarfiles.lst || die + doins rarfiles.lst dodoc *.txt } diff --git a/app-arch/unp/unp-2.0_pre7_p1-r1.ebuild b/app-arch/unp/unp-2.0_pre7_p1-r1.ebuild index cfaff187f34c..cd6ef967dc03 100644 --- a/app-arch/unp/unp-2.0_pre7_p1-r1.ebuild +++ b/app-arch/unp/unp-2.0_pre7_p1-r1.ebuild @@ -36,9 +36,9 @@ src_compile() { } src_install() { - dobin unp || die "dobin failed" + dobin unp dosym unp /usr/bin/ucat - doman debian/unp.1 || die "doman failed" + doman debian/unp.1 dodoc debian/changelog debian/README.Debian dobashcomp bash_completion.d/unp diff --git a/app-arch/zpaq-extras/zpaq-extras-3.ebuild b/app-arch/zpaq-extras/zpaq-extras-3.ebuild index 7c98489f1949..b09605d9151f 100644 --- a/app-arch/zpaq-extras/zpaq-extras-3.ebuild +++ b/app-arch/zpaq-extras/zpaq-extras-3.ebuild @@ -54,13 +54,13 @@ src_configure() { src_compile() { tc-export CXX - emake ${progs} || die + emake ${progs} } src_install() { exeinto /usr/lib/zpaq - doexe ${progs} || die + doexe ${progs} insinto /usr/share/zpaq - doins *.cfg || die + doins *.cfg } diff --git a/app-backup/amanda/amanda-3.3.9.ebuild b/app-backup/amanda/amanda-3.3.9.ebuild index 968e236abaa5..b1bc94655eb9 100644 --- a/app-backup/amanda/amanda-3.3.9.ebuild +++ b/app-backup/amanda/amanda-3.3.9.ebuild @@ -302,7 +302,7 @@ src_install() { source ${TMPENVFILE} einfo "Doing stock install" - emake DESTDIR="${D}" install || die + emake DESTDIR="${D}" install # Build the envdir file # Don't forget this.. diff --git a/app-backup/amanda/amanda-3.4.1.ebuild b/app-backup/amanda/amanda-3.4.1.ebuild index aa6f63879983..98a1da3e02bc 100644 --- a/app-backup/amanda/amanda-3.4.1.ebuild +++ b/app-backup/amanda/amanda-3.4.1.ebuild @@ -309,7 +309,7 @@ src_install() { source ${TMPENVFILE} einfo "Doing stock install" - emake DESTDIR="${D}" install || die + emake DESTDIR="${D}" install # Build the envdir file # Don't forget this.. diff --git a/app-backup/amanda/amanda-3.4.2.ebuild b/app-backup/amanda/amanda-3.4.2.ebuild index aec64fedec3e..b96bbf4ea76d 100644 --- a/app-backup/amanda/amanda-3.4.2.ebuild +++ b/app-backup/amanda/amanda-3.4.2.ebuild @@ -306,7 +306,7 @@ src_install() { source ${TMPENVFILE} einfo "Doing stock install" - emake DESTDIR="${D}" install || die + emake DESTDIR="${D}" install # Build the envdir file # Don't forget this.. diff --git a/app-backup/amanda/amanda-3.4.3.ebuild b/app-backup/amanda/amanda-3.4.3.ebuild index aec64fedec3e..b96bbf4ea76d 100644 --- a/app-backup/amanda/amanda-3.4.3.ebuild +++ b/app-backup/amanda/amanda-3.4.3.ebuild @@ -306,7 +306,7 @@ src_install() { source ${TMPENVFILE} einfo "Doing stock install" - emake DESTDIR="${D}" install || die + emake DESTDIR="${D}" install # Build the envdir file # Don't forget this.. diff --git a/app-backup/amanda/amanda-3.4.4.ebuild b/app-backup/amanda/amanda-3.4.4.ebuild index aec64fedec3e..b96bbf4ea76d 100644 --- a/app-backup/amanda/amanda-3.4.4.ebuild +++ b/app-backup/amanda/amanda-3.4.4.ebuild @@ -306,7 +306,7 @@ src_install() { source ${TMPENVFILE} einfo "Doing stock install" - emake DESTDIR="${D}" install || die + emake DESTDIR="${D}" install # Build the envdir file # Don't forget this.. diff --git a/app-backup/amanda/amanda-3.4.5.ebuild b/app-backup/amanda/amanda-3.4.5.ebuild index aec64fedec3e..b96bbf4ea76d 100644 --- a/app-backup/amanda/amanda-3.4.5.ebuild +++ b/app-backup/amanda/amanda-3.4.5.ebuild @@ -306,7 +306,7 @@ src_install() { source ${TMPENVFILE} einfo "Doing stock install" - emake DESTDIR="${D}" install || die + emake DESTDIR="${D}" install # Build the envdir file # Don't forget this.. diff --git a/app-backup/flexbackup/flexbackup-1.2.1-r13.ebuild b/app-backup/flexbackup/flexbackup-1.2.1-r13.ebuild index 528b303d318b..32d3b9f6aaee 100644 --- a/app-backup/flexbackup/flexbackup-1.2.1-r13.ebuild +++ b/app-backup/flexbackup/flexbackup-1.2.1-r13.ebuild @@ -76,8 +76,7 @@ src_install() { dodir /etc /usr/bin /usr/share/man/man{1,5} emake install \ PREFIX="${D}"/usr \ - CONFFILE="${D}"/etc/flexbackup.conf \ - || die "emake install failed" + CONFFILE="${D}"/etc/flexbackup.conf einstalldocs } diff --git a/app-cdr/cdcover/cdcover-0.7.4-r1.ebuild b/app-cdr/cdcover/cdcover-0.7.4-r1.ebuild index c96bc8227041..e0a978a39c84 100644 --- a/app-cdr/cdcover/cdcover-0.7.4-r1.ebuild +++ b/app-cdr/cdcover/cdcover-0.7.4-r1.ebuild @@ -32,11 +32,11 @@ src_prepare() { } src_compile() { - emake prefix="${D}"/usr target=/usr || die + emake prefix="${D}"/usr target=/usr } src_install() { - emake prefix="${D}"/usr docdir="${D}"/usr/share/doc/${PF} install || die + emake prefix="${D}"/usr docdir="${D}"/usr/share/doc/${PF} install python_fix_shebang "${D}" diff --git a/app-cdr/isomaster/isomaster-1.3.13.ebuild b/app-cdr/isomaster/isomaster-1.3.13.ebuild index 09ec9cd68ee2..338a5fea68fc 100644 --- a/app-cdr/isomaster/isomaster-1.3.13.ebuild +++ b/app-cdr/isomaster/isomaster-1.3.13.ebuild @@ -48,7 +48,7 @@ src_compile() { _apply_linguas() { mv "${D}"/usr/share/locale{,_ALL} || die - dodir /usr/share/locale || die + dodir /usr/share/locale for lingua in ${LINGUAS}; do [[ -d "${D}"/usr/share/locale_ALL/${lingua} ]] || break mv "${D}"/usr/share/{locale_ALL/${lingua},locale/} || die diff --git a/app-cdr/isomaster/isomaster-1.3.14.ebuild b/app-cdr/isomaster/isomaster-1.3.14.ebuild index 324c31de4479..c30620f0aa1b 100644 --- a/app-cdr/isomaster/isomaster-1.3.14.ebuild +++ b/app-cdr/isomaster/isomaster-1.3.14.ebuild @@ -45,7 +45,7 @@ src_compile() { _apply_linguas() { mv "${D}"/usr/share/locale{,_ALL} || die - dodir /usr/share/locale || die + dodir /usr/share/locale for lingua in ${LINGUAS}; do [[ -d "${D}"/usr/share/locale_ALL/${lingua} ]] || break mv "${D}"/usr/share/{locale_ALL/${lingua},locale/} || die diff --git a/app-crypt/ophcrack/ophcrack-3.6.0.ebuild b/app-crypt/ophcrack/ophcrack-3.6.0.ebuild index 1e5b264f0c76..94d9250666bc 100644 --- a/app-crypt/ophcrack/ophcrack-3.6.0.ebuild +++ b/app-crypt/ophcrack/ophcrack-3.6.0.ebuild @@ -30,9 +30,9 @@ src_configure() { myconf="${myconf} $(use_enable debug) --disable-gui" - econf ${myconf} || die "Failed to compile" + econf ${myconf} } src_install() { - emake install DESTDIR="${D}" || die "Installation failed." + emake install DESTDIR="${D}" } diff --git a/app-crypt/ophcrack/ophcrack-3.7.0.ebuild b/app-crypt/ophcrack/ophcrack-3.7.0.ebuild index 0e985ea1117c..736f3bea8b86 100644 --- a/app-crypt/ophcrack/ophcrack-3.7.0.ebuild +++ b/app-crypt/ophcrack/ophcrack-3.7.0.ebuild @@ -28,9 +28,9 @@ src_configure() { myconf="${myconf} $(use_enable debug) --disable-gui" - econf ${myconf} || die "Failed to compile" + econf ${myconf} } src_install() { - emake install DESTDIR="${D}" || die "Installation failed." + emake install DESTDIR="${D}" } diff --git a/app-crypt/ophcrack/ophcrack-3.8.0.ebuild b/app-crypt/ophcrack/ophcrack-3.8.0.ebuild index 47dd63963818..98ebe5ffe25f 100644 --- a/app-crypt/ophcrack/ophcrack-3.8.0.ebuild +++ b/app-crypt/ophcrack/ophcrack-3.8.0.ebuild @@ -31,11 +31,11 @@ src_configure() { myconf="$(use_enable debug)" myconf="${myconf} $(use_enable qt5 gui)" - econf ${myconf} || die "Failed to compile" + econf ${myconf} } src_install() { - emake install DESTDIR="${D}" || die "Installation failed." + emake install DESTDIR="${D}" cd "${S}" newicon src/gui/pixmaps/os.xpm ophcrack.xpm diff --git a/app-crypt/rotix/rotix-0.83.ebuild b/app-crypt/rotix/rotix-0.83.ebuild index 927d06877da1..3e79123b9407 100644 --- a/app-crypt/rotix/rotix-0.83.ebuild +++ b/app-crypt/rotix/rotix-0.83.ebuild @@ -28,5 +28,5 @@ src_configure() { } src_install() { - emake DESTDIR="${D}" install || die + emake DESTDIR="${D}" install } diff --git a/app-dicts/gwaei/gwaei-3.6.2.ebuild b/app-dicts/gwaei/gwaei-3.6.2.ebuild index 5a1e41294f05..760d43ab9b63 100644 --- a/app-dicts/gwaei/gwaei-3.6.2.ebuild +++ b/app-dicts/gwaei/gwaei-3.6.2.ebuild @@ -49,7 +49,7 @@ src_configure() { } src_install() { - emake DESTDIR="${D}" install || die + emake DESTDIR="${D}" install find "${D}" -name '*.la' -delete dodoc AUTHORS README diff --git a/app-dicts/prime-dict/prime-dict-1.0.0-r3.ebuild b/app-dicts/prime-dict/prime-dict-1.0.0-r3.ebuild index 818212f88dd0..9dbfb5867625 100644 --- a/app-dicts/prime-dict/prime-dict-1.0.0-r3.ebuild +++ b/app-dicts/prime-dict/prime-dict-1.0.0-r3.ebuild @@ -16,7 +16,7 @@ KEYWORDS="alpha amd64 hppa ppc ppc64 ~sparc x86" IUSE="" each_ruby_configure() { - econf --with-rubydir="$(ruby_rbconfig_value 'sitelibdir')" || die + econf --with-rubydir="$(ruby_rbconfig_value 'sitelibdir')" } each_ruby_compile() { diff --git a/app-dicts/wordnet/wordnet-3.1.ebuild b/app-dicts/wordnet/wordnet-3.1.ebuild index b0f8adbbf560..4179efca8e6b 100644 --- a/app-dicts/wordnet/wordnet-3.1.ebuild +++ b/app-dicts/wordnet/wordnet-3.1.ebuild @@ -76,7 +76,7 @@ src_configure() { } src_compile(){ - emake -e || die "emake failed" + emake -e } src_install(){ diff --git a/app-doc/halibut/halibut-1.1.ebuild b/app-doc/halibut/halibut-1.1.ebuild index 9b4f6966032f..e5cc35e2aa70 100644 --- a/app-doc/halibut/halibut-1.1.ebuild +++ b/app-doc/halibut/halibut-1.1.ebuild @@ -20,15 +20,14 @@ src_compile() { LFLAGS="${LDFLAGS}" \ emake -j1 \ BUILDDIR="${S}/build" \ - VERSION="${PV}" \ - || die "make failed" + VERSION="${PV}" - emake -C doc || die "make in doc failed" + emake -C doc } src_install() { - dobin build/halibut || die - doman doc/halibut.1 || die + dobin build/halibut + doman doc/halibut.1 dodoc doc/halibut.txt dohtml doc/*.html } diff --git a/app-doc/halibut/halibut-1.2.ebuild b/app-doc/halibut/halibut-1.2.ebuild index 81ec54f31f0c..13c64206e3f6 100644 --- a/app-doc/halibut/halibut-1.2.ebuild +++ b/app-doc/halibut/halibut-1.2.ebuild @@ -21,8 +21,8 @@ src_compile() { LFLAGS="${LDFLAGS}" \ BUILDDIR="${S}/build" \ VERSION="${PV}" \ - emake || die "make failed" - emake -C doc || die "make in doc failed" + emake + emake -C doc } DOCS=( doc/halibut.txt ) diff --git a/app-editors/hexcurse/hexcurse-1.55.ebuild b/app-editors/hexcurse/hexcurse-1.55.ebuild index d1d3c8134882..c0d5399a72b6 100644 --- a/app-editors/hexcurse/hexcurse-1.55.ebuild +++ b/app-editors/hexcurse/hexcurse-1.55.ebuild @@ -26,6 +26,6 @@ src_prepare() { } src_install() { - emake install DESTDIR="${D}" || die "Install failed" + emake install DESTDIR="${D}" dodoc AUTHORS ChangeLog NEWS README } diff --git a/app-editors/ted/ted-2.23.ebuild b/app-editors/ted/ted-2.23.ebuild index 9d89f2ecb765..41d6280abf91 100644 --- a/app-editors/ted/ted-2.23.ebuild +++ b/app-editors/ted/ted-2.23.ebuild @@ -52,7 +52,7 @@ src_configure() { local dir for dir in appFrame appUtil bitmap docBuf ind Ted tedPackage; do cd "${S}"/${dir} - econf --cache-file=../config.cache || die "configure in ${dir} failed" + econf --cache-file=../config.cache done } diff --git a/app-editors/xemacs/xemacs-21.5.34-r4.ebuild b/app-editors/xemacs/xemacs-21.5.34-r4.ebuild index 487f5b97af04..8cf979775cf2 100644 --- a/app-editors/xemacs/xemacs-21.5.34-r4.ebuild +++ b/app-editors/xemacs/xemacs-21.5.34-r4.ebuild @@ -180,8 +180,7 @@ src_configure() { --with-newgc \ --with-system-malloc \ --enable-option-checking=no \ - --with-last-packages=/usr/lib/xemacs \ - || die "configuration failed" + --with-last-packages=/usr/lib/xemacs } src_compile() { @@ -194,7 +193,7 @@ src_install() { infodir="${D}"/usr/share/info \ libdir="${D}"/usr/$(get_libdir) \ datadir="${D}"/usr/share \ - install || die + install # Rename some applications installed in bin so that it is clear # which application installed them and so that conflicting diff --git a/app-emulation/docker-machine-kvm/docker-machine-kvm-0.10.0.ebuild b/app-emulation/docker-machine-kvm/docker-machine-kvm-0.10.0.ebuild index 509420dad7c1..20d5054f6d83 100644 --- a/app-emulation/docker-machine-kvm/docker-machine-kvm-0.10.0.ebuild +++ b/app-emulation/docker-machine-kvm/docker-machine-kvm-0.10.0.ebuild @@ -29,7 +29,7 @@ SRC_URI="https://${EGO_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz src_compile() { export GOPATH=${S} cd "${S}"/src/${EGO_PN}/cmd/${PN/kvm/driver-kvm} || die - emake build || die + emake build } src_install() { diff --git a/app-emulation/docker-machine/docker-machine-0.13.0.ebuild b/app-emulation/docker-machine/docker-machine-0.13.0.ebuild index 974d8a443e7f..1cfa0ea229cc 100644 --- a/app-emulation/docker-machine/docker-machine-0.13.0.ebuild +++ b/app-emulation/docker-machine/docker-machine-0.13.0.ebuild @@ -30,7 +30,7 @@ src_prepare() { } src_compile() { - CGO_LDFLAGS="$(usex hardened '-fno-PIC ' '')" GOPATH="${WORKDIR}/${P}" emake build || die + CGO_LDFLAGS="$(usex hardened '-fno-PIC ' '')" GOPATH="${WORKDIR}/${P}" emake build } src_install() { diff --git a/app-emulation/docker/docker-18.09.9.ebuild b/app-emulation/docker/docker-18.09.9.ebuild index 86284c9e3965..966a693d1a49 100644 --- a/app-emulation/docker/docker-18.09.9.ebuild +++ b/app-emulation/docker/docker-18.09.9.ebuild @@ -235,7 +235,7 @@ src_compile() { VERSION="$(cat ../../VERSION)" \ GITCOMMIT="${DOCKER_GITCOMMIT}" \ DISABLE_WARN_OUTSIDE_CONTAINER=1 \ - dynbinary || die + dynbinary # build man pages go build -o gen-manpages github.com/docker/cli/man || die diff --git a/app-emulation/docker/docker-19.03.4.ebuild b/app-emulation/docker/docker-19.03.4.ebuild index 8d52724b145c..af88214fce00 100644 --- a/app-emulation/docker/docker-19.03.4.ebuild +++ b/app-emulation/docker/docker-19.03.4.ebuild @@ -236,7 +236,7 @@ src_compile() { VERSION="$(cat ../../VERSION)" \ GITCOMMIT="${DOCKER_GITCOMMIT}" \ DISABLE_WARN_OUTSIDE_CONTAINER=1 \ - dynbinary || die + dynbinary # build man pages go build -o gen-manpages github.com/docker/cli/man || die diff --git a/app-emulation/docker/docker-19.03.5.ebuild b/app-emulation/docker/docker-19.03.5.ebuild index 16734cab2072..e6fb4da81b09 100644 --- a/app-emulation/docker/docker-19.03.5.ebuild +++ b/app-emulation/docker/docker-19.03.5.ebuild @@ -236,7 +236,7 @@ src_compile() { VERSION="$(cat ../../VERSION)" \ GITCOMMIT="${DOCKER_GITCOMMIT}" \ DISABLE_WARN_OUTSIDE_CONTAINER=1 \ - dynbinary || die + dynbinary # build man pages go build -o gen-manpages github.com/docker/cli/man || die diff --git a/app-emulation/ganeti-instance-image/ganeti-instance-image-0.6-r2.ebuild b/app-emulation/ganeti-instance-image/ganeti-instance-image-0.6-r2.ebuild index d60896758bb0..45a28c15d3cb 100644 --- a/app-emulation/ganeti-instance-image/ganeti-instance-image-0.6-r2.ebuild +++ b/app-emulation/ganeti-instance-image/ganeti-instance-image-0.6-r2.ebuild @@ -39,7 +39,7 @@ src_configure() { } src_install() { - emake DESTDIR="${D}" install || die "install failed" + emake DESTDIR="${D}" install rm -rf "${D}"/usr/share/doc/${PN} dodoc README.markdown NEWS ChangeLog diff --git a/app-emulation/ganeti-instance-image/ganeti-instance-image-0.6.ebuild b/app-emulation/ganeti-instance-image/ganeti-instance-image-0.6.ebuild index 760dd5928a14..e621e1ec228e 100644 --- a/app-emulation/ganeti-instance-image/ganeti-instance-image-0.6.ebuild +++ b/app-emulation/ganeti-instance-image/ganeti-instance-image-0.6.ebuild @@ -40,7 +40,7 @@ src_configure() { } src_install() { - emake DESTDIR="${D}" install || die "install failed" + emake DESTDIR="${D}" install rm -rf "${D}"/usr/share/doc/${PN} dodoc README.markdown NEWS ChangeLog diff --git a/app-emulation/ganeti/ganeti-2.15.2-r8.ebuild b/app-emulation/ganeti/ganeti-2.15.2-r8.ebuild index 886e0a9ebaec..6e00659d3fde 100644 --- a/app-emulation/ganeti/ganeti-2.15.2-r8.ebuild +++ b/app-emulation/ganeti/ganeti-2.15.2-r8.ebuild @@ -375,5 +375,5 @@ src_test () { PATH="${S}/scripts:${S}/src:${PATH}" \ TMPDIR="/tmp" \ GANETI_MASTER="$(hostname -f)" \ - emake check || die "emake check failed" + emake check } diff --git a/app-emulation/ganeti/ganeti-2.16.0_rc1.ebuild b/app-emulation/ganeti/ganeti-2.16.0_rc1.ebuild index 2a860fdfd716..bd24dd3fff74 100644 --- a/app-emulation/ganeti/ganeti-2.16.0_rc1.ebuild +++ b/app-emulation/ganeti/ganeti-2.16.0_rc1.ebuild @@ -346,5 +346,5 @@ src_test () { PATH="${S}/scripts:${S}/src:${PATH}" \ TMPDIR="/tmp" \ GANETI_MASTER="$(hostname -f)" \ - emake check || die "emake check failed" + emake check } diff --git a/app-emulation/ganeti/ganeti-2.17.0_beta1.ebuild b/app-emulation/ganeti/ganeti-2.17.0_beta1.ebuild index ef5c738ba9be..d4baca0d24bf 100644 --- a/app-emulation/ganeti/ganeti-2.17.0_beta1.ebuild +++ b/app-emulation/ganeti/ganeti-2.17.0_beta1.ebuild @@ -346,5 +346,5 @@ src_test () { PATH="${S}/scripts:${S}/src:${PATH}" \ TMPDIR="/tmp" \ GANETI_MASTER="$(hostname -f)" \ - emake check || die "emake check failed" + emake check } diff --git a/app-emulation/libvirt/libvirt-5.2.0-r2.ebuild b/app-emulation/libvirt/libvirt-5.2.0-r2.ebuild index d03db5f55c6b..90133363bafa 100644 --- a/app-emulation/libvirt/libvirt-5.2.0-r2.ebuild +++ b/app-emulation/libvirt/libvirt-5.2.0-r2.ebuild @@ -327,7 +327,7 @@ src_test() { tests/Makefile export VIR_TEST_DEBUG=1 - HOME="${T}" emake check || die "tests failed" + HOME="${T}" emake check } src_install() { @@ -352,13 +352,13 @@ src_install() { systemd_newtmpfilesd "${FILESDIR}"/libvirtd.tmpfiles.conf libvirtd.conf - newinitd "${S}/libvirtd.init" libvirtd || die - newinitd "${FILESDIR}/libvirt-guests.init-r3" libvirt-guests || die - newinitd "${FILESDIR}/virtlockd.init-r1" virtlockd || die - newinitd "${FILESDIR}/virtlogd.init-r1" virtlogd || die + newinitd "${S}/libvirtd.init" libvirtd + newinitd "${FILESDIR}/libvirt-guests.init-r3" libvirt-guests + newinitd "${FILESDIR}/virtlockd.init-r1" virtlockd + newinitd "${FILESDIR}/virtlogd.init-r1" virtlogd - newconfd "${FILESDIR}/libvirtd.confd-r5" libvirtd || die - newconfd "${FILESDIR}/libvirt-guests.confd" libvirt-guests || die + newconfd "${FILESDIR}/libvirtd.confd-r5" libvirtd + newconfd "${FILESDIR}/libvirt-guests.confd" libvirt-guests DOC_CONTENTS=$(<"${FILESDIR}/README.gentoo-r2") DISABLE_AUTOFORMATTING=true diff --git a/app-emulation/libvirt/libvirt-5.5.0-r1.ebuild b/app-emulation/libvirt/libvirt-5.5.0-r1.ebuild index 581677ab6175..5fd272b35627 100644 --- a/app-emulation/libvirt/libvirt-5.5.0-r1.ebuild +++ b/app-emulation/libvirt/libvirt-5.5.0-r1.ebuild @@ -322,7 +322,7 @@ src_test() { tests/Makefile export VIR_TEST_DEBUG=1 - HOME="${T}" emake check || die "tests failed" + HOME="${T}" emake check } src_install() { @@ -347,13 +347,13 @@ src_install() { systemd_newtmpfilesd "${FILESDIR}"/libvirtd.tmpfiles.conf libvirtd.conf - newinitd "${S}/libvirtd.init" libvirtd || die - newinitd "${FILESDIR}/libvirt-guests.init-r4" libvirt-guests || die - newinitd "${FILESDIR}/virtlockd.init-r1" virtlockd || die - newinitd "${FILESDIR}/virtlogd.init-r1" virtlogd || die + newinitd "${S}/libvirtd.init" libvirtd + newinitd "${FILESDIR}/libvirt-guests.init-r4" libvirt-guests + newinitd "${FILESDIR}/virtlockd.init-r1" virtlockd + newinitd "${FILESDIR}/virtlogd.init-r1" virtlogd - newconfd "${FILESDIR}/libvirtd.confd-r5" libvirtd || die - newconfd "${FILESDIR}/libvirt-guests.confd" libvirt-guests || die + newconfd "${FILESDIR}/libvirtd.confd-r5" libvirtd + newconfd "${FILESDIR}/libvirt-guests.confd" libvirt-guests DOC_CONTENTS=$(<"${FILESDIR}/README.gentoo-r2") DISABLE_AUTOFORMATTING=true diff --git a/app-emulation/libvirt/libvirt-5.6.0.ebuild b/app-emulation/libvirt/libvirt-5.6.0.ebuild index 07d39538452f..5fd58c94d1c2 100644 --- a/app-emulation/libvirt/libvirt-5.6.0.ebuild +++ b/app-emulation/libvirt/libvirt-5.6.0.ebuild @@ -322,7 +322,7 @@ src_test() { tests/Makefile export VIR_TEST_DEBUG=1 - HOME="${T}" emake check || die "tests failed" + HOME="${T}" emake check } src_install() { @@ -347,13 +347,13 @@ src_install() { systemd_newtmpfilesd "${FILESDIR}"/libvirtd.tmpfiles.conf libvirtd.conf - newinitd "${S}/libvirtd.init" libvirtd || die - newinitd "${FILESDIR}/libvirt-guests.init-r4" libvirt-guests || die - newinitd "${FILESDIR}/virtlockd.init-r1" virtlockd || die - newinitd "${FILESDIR}/virtlogd.init-r1" virtlogd || die + newinitd "${S}/libvirtd.init" libvirtd + newinitd "${FILESDIR}/libvirt-guests.init-r4" libvirt-guests + newinitd "${FILESDIR}/virtlockd.init-r1" virtlockd + newinitd "${FILESDIR}/virtlogd.init-r1" virtlogd - newconfd "${FILESDIR}/libvirtd.confd-r5" libvirtd || die - newconfd "${FILESDIR}/libvirt-guests.confd" libvirt-guests || die + newconfd "${FILESDIR}/libvirtd.confd-r5" libvirtd + newconfd "${FILESDIR}/libvirt-guests.confd" libvirt-guests DOC_CONTENTS=$(<"${FILESDIR}/README.gentoo-r2") DISABLE_AUTOFORMATTING=true diff --git a/app-emulation/libvirt/libvirt-5.8.0.ebuild b/app-emulation/libvirt/libvirt-5.8.0.ebuild index d878aa6e027e..5bec3ede6039 100644 --- a/app-emulation/libvirt/libvirt-5.8.0.ebuild +++ b/app-emulation/libvirt/libvirt-5.8.0.ebuild @@ -325,7 +325,7 @@ src_test() { tests/Makefile export VIR_TEST_DEBUG=1 - HOME="${T}" emake check || die "tests failed" + HOME="${T}" emake check } src_install() { @@ -351,13 +351,13 @@ src_install() { systemd_newtmpfilesd "${FILESDIR}"/libvirtd.tmpfiles.conf libvirtd.conf - newinitd "${S}/libvirtd.init" libvirtd || die - newinitd "${FILESDIR}/libvirt-guests.init-r4" libvirt-guests || die - newinitd "${FILESDIR}/virtlockd.init-r1" virtlockd || die - newinitd "${FILESDIR}/virtlogd.init-r1" virtlogd || die + newinitd "${S}/libvirtd.init" libvirtd + newinitd "${FILESDIR}/libvirt-guests.init-r4" libvirt-guests + newinitd "${FILESDIR}/virtlockd.init-r1" virtlockd + newinitd "${FILESDIR}/virtlogd.init-r1" virtlogd - newconfd "${FILESDIR}/libvirtd.confd-r5" libvirtd || die - newconfd "${FILESDIR}/libvirt-guests.confd" libvirt-guests || die + newconfd "${FILESDIR}/libvirtd.confd-r5" libvirtd + newconfd "${FILESDIR}/libvirt-guests.confd" libvirt-guests DOC_CONTENTS=$(<"${FILESDIR}/README.gentoo-r2") DISABLE_AUTOFORMATTING=true diff --git a/app-emulation/libvirt/libvirt-9999.ebuild b/app-emulation/libvirt/libvirt-9999.ebuild index 4191f89dc94a..4761c3ff2cfc 100644 --- a/app-emulation/libvirt/libvirt-9999.ebuild +++ b/app-emulation/libvirt/libvirt-9999.ebuild @@ -322,7 +322,7 @@ my_src_test() { tests/Makefile export VIR_TEST_DEBUG=1 - HOME="${T}" emake check || die "tests failed" + HOME="${T}" emake check } my_src_install() { @@ -347,13 +347,13 @@ my_src_install() { systemd_newtmpfilesd "${FILESDIR}"/libvirtd.tmpfiles.conf libvirtd.conf - newinitd "${S}/libvirtd.init" libvirtd || die - newinitd "${FILESDIR}/libvirt-guests.init-r4" libvirt-guests || die - newinitd "${FILESDIR}/virtlockd.init-r1" virtlockd || die - newinitd "${FILESDIR}/virtlogd.init-r1" virtlogd || die + newinitd "${S}/libvirtd.init" libvirtd + newinitd "${FILESDIR}/libvirt-guests.init-r4" libvirt-guests + newinitd "${FILESDIR}/virtlockd.init-r1" virtlockd + newinitd "${FILESDIR}/virtlogd.init-r1" virtlogd - newconfd "${FILESDIR}/libvirtd.confd-r5" libvirtd || die - newconfd "${FILESDIR}/libvirt-guests.confd" libvirt-guests || die + newconfd "${FILESDIR}/libvirtd.confd-r5" libvirtd + newconfd "${FILESDIR}/libvirt-guests.confd" libvirt-guests DOC_CONTENTS=$(<"${FILESDIR}/README.gentoo-r2") DISABLE_AUTOFORMATTING=true diff --git a/app-emulation/lxd/lxd-3.16-r1.ebuild b/app-emulation/lxd/lxd-3.16-r1.ebuild index 28b5695b2e9d..6f15ebbce927 100644 --- a/app-emulation/lxd/lxd-3.16-r1.ebuild +++ b/app-emulation/lxd/lxd-3.16-r1.ebuild @@ -191,7 +191,7 @@ src_install() { emake DESTDIR="${D}" install cd "${GOPATH}/deps/libco" || die "Can't cd to libco dir" - dolib.so libco.so || die "Can't install libco.so" + dolib.so libco.so cd "${GOPATH}/deps/dqlite" || die "Can't cd to dqlite dir" emake DESTDIR="${D}" install diff --git a/app-emulation/virtualbox-bin/virtualbox-bin-5.2.32.132073.ebuild b/app-emulation/virtualbox-bin/virtualbox-bin-5.2.32.132073.ebuild index de48142651ba..2ed1560fbf7a 100644 --- a/app-emulation/virtualbox-bin/virtualbox-bin-5.2.32.132073.ebuild +++ b/app-emulation/virtualbox-bin/virtualbox-bin-5.2.32.132073.ebuild @@ -194,7 +194,7 @@ src_install() { rm -rf VBoxSDL VirtualBox VBoxKeyboard.so fi - doins -r * || die + doins -r * # create symlinks for working around unsupported $ORIGIN/.. in VBoxC.so (setuid) dosym ../VBoxVMM.so /opt/VirtualBox/components/VBoxVMM.so diff --git a/app-emulation/virtualbox-bin/virtualbox-bin-5.2.34.133893.ebuild b/app-emulation/virtualbox-bin/virtualbox-bin-5.2.34.133893.ebuild index cb4e5663f7c1..ba106a9145dd 100644 --- a/app-emulation/virtualbox-bin/virtualbox-bin-5.2.34.133893.ebuild +++ b/app-emulation/virtualbox-bin/virtualbox-bin-5.2.34.133893.ebuild @@ -194,7 +194,7 @@ src_install() { rm -rf VBoxSDL VirtualBox VBoxKeyboard.so fi - doins -r * || die + doins -r * # create symlinks for working around unsupported $ORIGIN/.. in VBoxC.so (setuid) dosym ../VBoxVMM.so /opt/VirtualBox/components/VBoxVMM.so diff --git a/app-emulation/virtualbox-bin/virtualbox-bin-6.0.12.133076.ebuild b/app-emulation/virtualbox-bin/virtualbox-bin-6.0.12.133076.ebuild index ea3b735a7474..d236726f6ef9 100644 --- a/app-emulation/virtualbox-bin/virtualbox-bin-6.0.12.133076.ebuild +++ b/app-emulation/virtualbox-bin/virtualbox-bin-6.0.12.133076.ebuild @@ -194,7 +194,7 @@ src_install() { rm -rf VBoxSDL VirtualBox{,VM} VBoxKeyboard.so fi - doins -r * || die + doins -r * # create symlinks for working around unsupported $ORIGIN/.. in VBoxC.so (setuid) dosym ../VBoxVMM.so /opt/VirtualBox/components/VBoxVMM.so diff --git a/app-emulation/virtualbox-bin/virtualbox-bin-6.0.14.133895.ebuild b/app-emulation/virtualbox-bin/virtualbox-bin-6.0.14.133895.ebuild index ea3b735a7474..d236726f6ef9 100644 --- a/app-emulation/virtualbox-bin/virtualbox-bin-6.0.14.133895.ebuild +++ b/app-emulation/virtualbox-bin/virtualbox-bin-6.0.14.133895.ebuild @@ -194,7 +194,7 @@ src_install() { rm -rf VBoxSDL VirtualBox{,VM} VBoxKeyboard.so fi - doins -r * || die + doins -r * # create symlinks for working around unsupported $ORIGIN/.. in VBoxC.so (setuid) dosym ../VBoxVMM.so /opt/VirtualBox/components/VBoxVMM.so diff --git a/app-emulation/virtualbox-bin/virtualbox-bin-6.1.0.134891_rc1.ebuild b/app-emulation/virtualbox-bin/virtualbox-bin-6.1.0.134891_rc1.ebuild index bbdbcba3f7fc..d9a9191934c6 100644 --- a/app-emulation/virtualbox-bin/virtualbox-bin-6.1.0.134891_rc1.ebuild +++ b/app-emulation/virtualbox-bin/virtualbox-bin-6.1.0.134891_rc1.ebuild @@ -194,7 +194,7 @@ src_install() { rm -rf VBoxSDL VirtualBox{,VM} VBoxKeyboard.so fi - doins -r * || die + doins -r * # create symlinks for working around unsupported $ORIGIN/.. in VBoxC.so (setuid) dosym ../VBoxVMM.so /opt/VirtualBox/components/VBoxVMM.so diff --git a/app-eselect/eselect-chuck/eselect-chuck-1.0.2.ebuild b/app-eselect/eselect-chuck/eselect-chuck-1.0.2.ebuild index 113ad8515a9f..bdd29ed59d74 100644 --- a/app-eselect/eselect-chuck/eselect-chuck-1.0.2.ebuild +++ b/app-eselect/eselect-chuck/eselect-chuck-1.0.2.ebuild @@ -19,5 +19,5 @@ S=${WORKDIR} src_install() { insinto /usr/share/eselect/modules - newins "${WORKDIR}/chuck.eselect-${PVR}" chuck.eselect || die + newins "${WORKDIR}/chuck.eselect-${PVR}" chuck.eselect } diff --git a/app-eselect/eselect-rails/eselect-rails-0.23.ebuild b/app-eselect/eselect-rails/eselect-rails-0.23.ebuild index 1ff19cd35c48..41af20805d5b 100644 --- a/app-eselect/eselect-rails/eselect-rails-0.23.ebuild +++ b/app-eselect/eselect-rails/eselect-rails-0.23.ebuild @@ -25,5 +25,5 @@ src_prepare() { src_install() { insinto /usr/share/eselect/modules - doins *.eselect || die "doins failed" + doins *.eselect } diff --git a/app-eselect/eselect-rails/eselect-rails-0.24.ebuild b/app-eselect/eselect-rails/eselect-rails-0.24.ebuild index 73a070a3f0dc..0e2b3be13818 100644 --- a/app-eselect/eselect-rails/eselect-rails-0.24.ebuild +++ b/app-eselect/eselect-rails/eselect-rails-0.24.ebuild @@ -25,5 +25,5 @@ src_prepare() { src_install() { insinto /usr/share/eselect/modules - doins *.eselect || die "doins failed" + doins *.eselect } diff --git a/app-eselect/eselect-ruby/eselect-ruby-20170723.ebuild b/app-eselect/eselect-ruby/eselect-ruby-20170723.ebuild index ab6bbba2090a..7d41b32c041a 100644 --- a/app-eselect/eselect-ruby/eselect-ruby-20170723.ebuild +++ b/app-eselect/eselect-ruby/eselect-ruby-20170723.ebuild @@ -18,5 +18,5 @@ S=${WORKDIR} src_install() { insinto /usr/share/eselect/modules - newins "${WORKDIR}/ruby.eselect-${PVR}" ruby.eselect || die + newins "${WORKDIR}/ruby.eselect-${PVR}" ruby.eselect } diff --git a/app-eselect/eselect-ruby/eselect-ruby-20190121.ebuild b/app-eselect/eselect-ruby/eselect-ruby-20190121.ebuild index 982cd5f4312a..9019572adc62 100644 --- a/app-eselect/eselect-ruby/eselect-ruby-20190121.ebuild +++ b/app-eselect/eselect-ruby/eselect-ruby-20190121.ebuild @@ -18,5 +18,5 @@ S=${WORKDIR} src_install() { insinto /usr/share/eselect/modules - newins "${WORKDIR}/ruby.eselect-${PVR}" ruby.eselect || die + newins "${WORKDIR}/ruby.eselect-${PVR}" ruby.eselect } diff --git a/app-eselect/eselect-vdr/eselect-vdr-0.0.3.ebuild b/app-eselect/eselect-vdr/eselect-vdr-0.0.3.ebuild index 9cdc6760fea9..d56115f07f12 100644 --- a/app-eselect/eselect-vdr/eselect-vdr-0.0.3.ebuild +++ b/app-eselect/eselect-vdr/eselect-vdr-0.0.3.ebuild @@ -16,7 +16,7 @@ RDEPEND=">=app-admin/eselect-1.2.3" src_install() { insinto /usr/share/eselect/modules - doins vdr-plugin.eselect || die "Could not install eselect module" + doins vdr-plugin.eselect dosym eselect /usr/bin/vdr-plugin-config } diff --git a/app-eselect/eselect-vi/eselect-vi-1.1.9.ebuild b/app-eselect/eselect-vi/eselect-vi-1.1.9.ebuild index 26604440079e..81d71b59ac26 100644 --- a/app-eselect/eselect-vi/eselect-vi-1.1.9.ebuild +++ b/app-eselect/eselect-vi/eselect-vi-1.1.9.ebuild @@ -16,5 +16,5 @@ RDEPEND=">=app-admin/eselect-1.0.6" src_install() { insinto /usr/share/eselect/modules - doins vi.eselect || die + doins vi.eselect } diff --git a/app-i18n/scim-input-pad/scim-input-pad-0.1.3.1.ebuild b/app-i18n/scim-input-pad/scim-input-pad-0.1.3.1.ebuild index eca4971b084b..4f87c9cc0793 100644 --- a/app-i18n/scim-input-pad/scim-input-pad-0.1.3.1.ebuild +++ b/app-i18n/scim-input-pad/scim-input-pad-0.1.3.1.ebuild @@ -27,11 +27,11 @@ src_prepare() { } src_configure() { - econf $(use_enable nls) || die "Error: econf failed!" + econf $(use_enable nls) } src_install() { - emake DESTDIR="${D}" install || die "Error: install failed!" + emake DESTDIR="${D}" install dodoc ChangeLog README } diff --git a/app-i18n/scim-input-pad/scim-input-pad-0.1.3.ebuild b/app-i18n/scim-input-pad/scim-input-pad-0.1.3.ebuild index e04e0f9ae465..65ab96d29a17 100644 --- a/app-i18n/scim-input-pad/scim-input-pad-0.1.3.ebuild +++ b/app-i18n/scim-input-pad/scim-input-pad-0.1.3.ebuild @@ -27,11 +27,11 @@ src_prepare() { } src_configure() { - econf $(use_enable nls) || die "Error: econf failed!" + econf $(use_enable nls) } src_install() { - emake DESTDIR="${D}" install || die "Error: install failed!" + emake DESTDIR="${D}" install dodoc ChangeLog README } diff --git a/app-i18n/xcin/xcin-2.5.3_pre3-r3.ebuild b/app-i18n/xcin/xcin-2.5.3_pre3-r3.ebuild index e83ff62b4098..3950d850a1cb 100644 --- a/app-i18n/xcin/xcin-2.5.3_pre3-r3.ebuild +++ b/app-i18n/xcin/xcin-2.5.3_pre3-r3.ebuild @@ -52,14 +52,14 @@ src_configure() { } src_compile() { - emake -j1 || die "emake failed." + emake -j1 } src_install() { emake \ prefix="${ED}/usr" \ program_prefix="${D}" \ - install || die + install find "${ED}" -name "*.la" -type f -delete || die diff --git a/app-laptop/hdaps-gl/hdaps-gl-0.0.5.ebuild b/app-laptop/hdaps-gl/hdaps-gl-0.0.5.ebuild index 7bc369635dc7..a4c362d093ee 100644 --- a/app-laptop/hdaps-gl/hdaps-gl-0.0.5.ebuild +++ b/app-laptop/hdaps-gl/hdaps-gl-0.0.5.ebuild @@ -24,8 +24,7 @@ src_prepare() { src_compile() { emake CC="$(tc-getCC)" \ - CFLAGS="${CFLAGS} ${LDFLAGS}" \ - || die "emake failed" + CFLAGS="${CFLAGS} ${LDFLAGS}" } src_install() { diff --git a/app-laptop/pommed/pommed-1.39-r1.ebuild b/app-laptop/pommed/pommed-1.39-r1.ebuild index e915f399b70d..f1350763190b 100644 --- a/app-laptop/pommed/pommed-1.39-r1.ebuild +++ b/app-laptop/pommed/pommed-1.39-r1.ebuild @@ -47,7 +47,7 @@ src_prepare() { src_compile() { cd "${S}"/pommed - emake CC="$(tc-getCC)" OFLIB=1 || die "emake pommed failed" + emake CC="$(tc-getCC)" OFLIB=1 if use gtk; then cd "${S}"/gpomme @@ -57,11 +57,11 @@ src_compile() { POFILES="${POFILES} po/${LANG}.po" fi done - emake CC="$(tc-getCC)" POFILES="${POFILES}" || die "emake gpomme failed" + emake CC="$(tc-getCC)" POFILES="${POFILES}" fi if use X; then cd "${S}"/wmpomme - emake CC="$(tc-getCC)" || die "emake wmpomme failed" + emake CC="$(tc-getCC)" fi } diff --git a/app-metrics/vault_exporter/vault_exporter-0.1.2.ebuild b/app-metrics/vault_exporter/vault_exporter-0.1.2.ebuild index aa49732385e5..eb964ab3a6c2 100644 --- a/app-metrics/vault_exporter/vault_exporter-0.1.2.ebuild +++ b/app-metrics/vault_exporter/vault_exporter-0.1.2.ebuild @@ -24,7 +24,7 @@ pkg_setup() { src_compile() { pushd src/${EGO_PN} || die - GOPATH="${S}" emake build || die + GOPATH="${S}" emake build popd || die } diff --git a/app-misc/blink1/blink1-1.98.ebuild b/app-misc/blink1/blink1-1.98.ebuild index db7709ef64d0..5c644a5a7e37 100644 --- a/app-misc/blink1/blink1-1.98.ebuild +++ b/app-misc/blink1/blink1-1.98.ebuild @@ -57,17 +57,17 @@ src_compile() { # USBLIB_TYPE=HIDAPI # USBLIB_TYPE=HIDAPI_HIDRAW # USBLIB_TYPE=HIDDATA - emake OS=linux USBLIB_TYPE=HIDAPI blink1-tool || die "emake blink1-tool failed" + emake OS=linux USBLIB_TYPE=HIDAPI blink1-tool popd &>/dev/null fi if use mini-tool; then pushd commandline/blink1-mini-tool &>/dev/null - emake OS=linux blink1-mini-tool || die "emake blink1-mini-tool failed" + emake OS=linux blink1-mini-tool popd &>/dev/null fi if use server; then pushd commandline &>/dev/null - emake OS=linux blink1-tiny-server || die "emake blink1-tiny-server failed" + emake OS=linux blink1-tiny-server popd &>/dev/null fi } diff --git a/app-misc/digitemp/digitemp-3.7.1.ebuild b/app-misc/digitemp/digitemp-3.7.1.ebuild index 6fd05c710080..01e1ebe0ca3a 100644 --- a/app-misc/digitemp/digitemp-3.7.1.ebuild +++ b/app-misc/digitemp/digitemp-3.7.1.ebuild @@ -42,7 +42,7 @@ src_compile() { for target in $targets; do emake clean - emake CC="$(tc-getCC)" LOCK="no" ${target} || die "emake ${target} failed" + emake CC="$(tc-getCC)" LOCK="no" ${target} done } diff --git a/app-misc/dvtm/dvtm-0.14-r1.ebuild b/app-misc/dvtm/dvtm-0.14-r1.ebuild index bbd504088eee..302a81e984be 100644 --- a/app-misc/dvtm/dvtm-0.14-r1.ebuild +++ b/app-misc/dvtm/dvtm-0.14-r1.ebuild @@ -47,7 +47,7 @@ src_prepare() { src_compile() { local msg="" use savedconfig && msg=", please check the configfile" - emake CC=$(tc-getCC) ${PN} || die "emake failed${msg}" + emake CC=$(tc-getCC) ${PN} } src_install() { diff --git a/app-misc/dvtm/dvtm-0.15-r2.ebuild b/app-misc/dvtm/dvtm-0.15-r2.ebuild index bc1f7d84a70e..6c0a09bddd82 100644 --- a/app-misc/dvtm/dvtm-0.15-r2.ebuild +++ b/app-misc/dvtm/dvtm-0.15-r2.ebuild @@ -41,7 +41,7 @@ src_compile() { tc-export PKG_CONFIG local msg="" use savedconfig && msg=", please check the configfile" - emake CC=$(tc-getCC) ${PN} || die "emake failed${msg}" + emake CC=$(tc-getCC) ${PN} } src_install() { diff --git a/app-misc/dvtm/dvtm-0.15-r3.ebuild b/app-misc/dvtm/dvtm-0.15-r3.ebuild index 08f42e49fa3e..e31217f2b0b0 100644 --- a/app-misc/dvtm/dvtm-0.15-r3.ebuild +++ b/app-misc/dvtm/dvtm-0.15-r3.ebuild @@ -39,7 +39,7 @@ src_compile() { tc-export PKG_CONFIG local msg="" use savedconfig && msg=", please check the configfile" - emake CC=$(tc-getCC) ${PN} || die "emake failed${msg}" + emake CC=$(tc-getCC) ${PN} } src_install() { diff --git a/app-misc/dvtm/dvtm-9999.ebuild b/app-misc/dvtm/dvtm-9999.ebuild index 64b9d7335b2b..8de03bafd8cd 100644 --- a/app-misc/dvtm/dvtm-9999.ebuild +++ b/app-misc/dvtm/dvtm-9999.ebuild @@ -39,7 +39,7 @@ src_compile() { tc-export PKG_CONFIG local msg="" use savedconfig && msg=", please check the configfile" - emake CC=$(tc-getCC) ${PN} || die "emake failed${msg}" + emake CC=$(tc-getCC) ${PN} } src_install() { diff --git a/app-misc/g15mpd/g15mpd-1.0.0-r1.ebuild b/app-misc/g15mpd/g15mpd-1.0.0-r1.ebuild index 13ecc8900f6a..b7c7430f5385 100644 --- a/app-misc/g15mpd/g15mpd-1.0.0-r1.ebuild +++ b/app-misc/g15mpd/g15mpd-1.0.0-r1.ebuild @@ -32,6 +32,6 @@ src_prepare() { } src_install() { - emake DESTDIR="${D}" install || die "emake install failed" + emake DESTDIR="${D}" install rm "${D}"/usr/share/doc/${P}/{COPYING,NEWS} } diff --git a/app-misc/g15stats/g15stats-1.9.7.ebuild b/app-misc/g15stats/g15stats-1.9.7.ebuild index d28c95aee6ee..c46f9b7e499b 100644 --- a/app-misc/g15stats/g15stats-1.9.7.ebuild +++ b/app-misc/g15stats/g15stats-1.9.7.ebuild @@ -35,7 +35,7 @@ src_compile() { } src_install() { - emake DESTDIR="${D}" install || die "make install failed" + emake DESTDIR="${D}" install rm "$D"/usr/share/doc/${P}/{COPYING,NEWS} newconfd "${FILESDIR}/${PN}-1.9.7.confd" ${PN} diff --git a/app-misc/hddled/hddled-0.3.ebuild b/app-misc/hddled/hddled-0.3.ebuild index 7197a4970c71..97557da00d47 100644 --- a/app-misc/hddled/hddled-0.3.ebuild +++ b/app-misc/hddled/hddled-0.3.ebuild @@ -32,9 +32,9 @@ src_compile() { } src_install() { - dobin ${PN} || die + dobin ${PN} if use X ; then - dobin x${PN} || die + dobin x${PN} elog "X version was renamed to x${PN}" fi } diff --git a/app-misc/ifp-line/ifp-line-0.3.ebuild b/app-misc/ifp-line/ifp-line-0.3.ebuild index ca5f7b8af6aa..c77ec2937f0f 100644 --- a/app-misc/ifp-line/ifp-line-0.3.ebuild +++ b/app-misc/ifp-line/ifp-line-0.3.ebuild @@ -18,11 +18,11 @@ DEPEND="${RDEPEND}" PATCHES=( "${FILESDIR}/${P}-fix-warnings.patch" ) src_install() { - dobin ifp || die + dobin ifp doman ifp.1 exeinto /usr/share/${PN} - doexe nonroot.sh || die + doexe nonroot.sh default } diff --git a/app-misc/mtail/mtail-1.1.1-r3.ebuild b/app-misc/mtail/mtail-1.1.1-r3.ebuild index 1ab1926f586f..74792b6f1948 100644 --- a/app-misc/mtail/mtail-1.1.1-r3.ebuild +++ b/app-misc/mtail/mtail-1.1.1-r3.ebuild @@ -26,5 +26,5 @@ src_prepare() { src_install() { dobin "${PN}" - dodoc CHANGES "${PN}rc.sample" README "${DISTDIR}"/mtailrc-syslog.sample || die + dodoc CHANGES "${PN}rc.sample" README "${DISTDIR}"/mtailrc-syslog.sample } diff --git a/app-misc/oneko/oneko-1.2-r2.ebuild b/app-misc/oneko/oneko-1.2-r2.ebuild index 9866e7ac2964..8ef1f755b8e6 100644 --- a/app-misc/oneko/oneko-1.2-r2.ebuild +++ b/app-misc/oneko/oneko-1.2-r2.ebuild @@ -43,8 +43,7 @@ src_compile() { emake \ CC="$(tc-getCC)" \ CCOPTIONS="${CFLAGS}" \ - EXTRA_LDOPTIONS="${LDFLAGS}" \ - || die + EXTRA_LDOPTIONS="${LDFLAGS}" } src_install() { diff --git a/app-misc/pipeworks/pipeworks-0.4-r1.ebuild b/app-misc/pipeworks/pipeworks-0.4-r1.ebuild index c1cb72b55af3..cd98048938b0 100644 --- a/app-misc/pipeworks/pipeworks-0.4-r1.ebuild +++ b/app-misc/pipeworks/pipeworks-0.4-r1.ebuild @@ -18,11 +18,11 @@ RDEPEND="" DEPEND="${RDEPEND}" src_compile() { - emake CC="$(tc-getCC) ${CFLAGS} ${LDFLAGS}" || die "emake failed" + emake CC="$(tc-getCC) ${CFLAGS} ${LDFLAGS}" } src_install() { - dobin pipeworks || die "dobin failed" + dobin pipeworks doman pipeworks.1 dodoc Changelog README } diff --git a/app-misc/rlwrap/rlwrap-0.42.ebuild b/app-misc/rlwrap/rlwrap-0.42.ebuild index 75ca6471b3cb..3d2669f8328d 100644 --- a/app-misc/rlwrap/rlwrap-0.42.ebuild +++ b/app-misc/rlwrap/rlwrap-0.42.ebuild @@ -21,6 +21,6 @@ src_configure() { } src_install() { - emake DESTDIR="${D}" install || die + emake DESTDIR="${D}" install dodoc AUTHORS BUGS ChangeLog NEWS README # PLEA TODO } diff --git a/app-misc/screenie/screenie-1.30.0-r1.ebuild b/app-misc/screenie/screenie-1.30.0-r1.ebuild index 8bfdb47624bf..13d51de9d136 100644 --- a/app-misc/screenie/screenie-1.30.0-r1.ebuild +++ b/app-misc/screenie/screenie-1.30.0-r1.ebuild @@ -17,6 +17,6 @@ RDEPEND="app-misc/screen" PATCHES=( "${FILESDIR}/${PN}-CVE-2008-5371.patch" ) src_install() { - dobin screenie || die "dobin failed" + dobin screenie default } diff --git a/app-misc/sleepyhead/sleepyhead-1.0.0_beta2.ebuild b/app-misc/sleepyhead/sleepyhead-1.0.0_beta2.ebuild index 779450ed1051..dfebd75552c2 100644 --- a/app-misc/sleepyhead/sleepyhead-1.0.0_beta2.ebuild +++ b/app-misc/sleepyhead/sleepyhead-1.0.0_beta2.ebuild @@ -47,7 +47,7 @@ src_prepare() { src_install() { cd "${S}/sleepyhead" - dobin SleepyHead || die - dodoc ../README || die - dodoc docs/* || die + dobin SleepyHead + dodoc ../README + dodoc docs/* } diff --git a/app-misc/slmon/slmon-0.5.13.ebuild b/app-misc/slmon/slmon-0.5.13.ebuild index ee5e459384f3..d6edcbdd9074 100644 --- a/app-misc/slmon/slmon-0.5.13.ebuild +++ b/app-misc/slmon/slmon-0.5.13.ebuild @@ -35,7 +35,7 @@ src_configure() { } src_install() { - emake DESTDIR="${D}" install || die + emake DESTDIR="${D}" install dodoc AUTHORS ChangeLog README slmonrc TODO dohtml *.html } diff --git a/app-misc/sphinx/sphinx-2.1.9.ebuild b/app-misc/sphinx/sphinx-2.1.9.ebuild index 2bdec82fc326..843e49c094ee 100644 --- a/app-misc/sphinx/sphinx-2.1.9.ebuild +++ b/app-misc/sphinx/sphinx-2.1.9.ebuild @@ -65,9 +65,9 @@ src_configure() { } src_compile() { - emake AR="$(tc-getAR)" || die "emake failed" + emake AR="$(tc-getAR)" - emake -j 1 -C api/libsphinxclient || die "emake libsphinxclient failed" + emake -j 1 -C api/libsphinxclient } src_test() { @@ -76,8 +76,8 @@ src_test() { } src_install() { - emake DESTDIR="${D}" install || die "install failed" - emake DESTDIR="${D}" -C api/libsphinxclient install || die "install libsphinxclient failed" + emake DESTDIR="${D}" install + emake DESTDIR="${D}" -C api/libsphinxclient install dodoc doc/* diff --git a/app-misc/sphinx/sphinx-2.2.11-r1.ebuild b/app-misc/sphinx/sphinx-2.2.11-r1.ebuild index b3133ba92eb8..5f45a59d12a7 100644 --- a/app-misc/sphinx/sphinx-2.2.11-r1.ebuild +++ b/app-misc/sphinx/sphinx-2.2.11-r1.ebuild @@ -87,9 +87,9 @@ src_configure() { } src_compile() { - emake AR="$(tc-getAR)" || die "emake failed" + emake AR="$(tc-getAR)" - emake -j 1 -C api/libsphinxclient || die "emake libsphinxclient failed" + emake -j 1 -C api/libsphinxclient } src_test() { @@ -99,8 +99,8 @@ src_test() { } src_install() { - emake DESTDIR="${D}" install || die "install failed" - emake DESTDIR="${D}" -C api/libsphinxclient install || die "install libsphinxclient failed" + emake DESTDIR="${D}" install + emake DESTDIR="${D}" -C api/libsphinxclient install dodoc doc/* diff --git a/app-misc/sphinx/sphinx-2.2.11-r2.ebuild b/app-misc/sphinx/sphinx-2.2.11-r2.ebuild index 7bbac2622e51..459f921dc69a 100644 --- a/app-misc/sphinx/sphinx-2.2.11-r2.ebuild +++ b/app-misc/sphinx/sphinx-2.2.11-r2.ebuild @@ -88,9 +88,9 @@ src_configure() { } src_compile() { - emake AR="$(tc-getAR)" || die "emake failed" + emake AR="$(tc-getAR)" - emake -j 1 -C api/libsphinxclient || die "emake libsphinxclient failed" + emake -j 1 -C api/libsphinxclient } src_test() { @@ -100,8 +100,8 @@ src_test() { } src_install() { - emake DESTDIR="${D}" install || die "install failed" - emake DESTDIR="${D}" -C api/libsphinxclient install || die "install libsphinxclient failed" + emake DESTDIR="${D}" install + emake DESTDIR="${D}" -C api/libsphinxclient install dodoc doc/* diff --git a/app-misc/sphinx/sphinx-2.2.11.ebuild b/app-misc/sphinx/sphinx-2.2.11.ebuild index c49c70b819b1..3889473b1575 100644 --- a/app-misc/sphinx/sphinx-2.2.11.ebuild +++ b/app-misc/sphinx/sphinx-2.2.11.ebuild @@ -70,9 +70,9 @@ src_configure() { } src_compile() { - emake AR="$(tc-getAR)" || die "emake failed" + emake AR="$(tc-getAR)" - emake -j 1 -C api/libsphinxclient || die "emake libsphinxclient failed" + emake -j 1 -C api/libsphinxclient } src_test() { @@ -82,8 +82,8 @@ src_test() { } src_install() { - emake DESTDIR="${D}" install || die "install failed" - emake DESTDIR="${D}" -C api/libsphinxclient install || die "install libsphinxclient failed" + emake DESTDIR="${D}" install + emake DESTDIR="${D}" -C api/libsphinxclient install dodoc doc/* diff --git a/app-mobilephone/kannel-sqlbox/kannel-sqlbox-1.5.0-r1.ebuild b/app-mobilephone/kannel-sqlbox/kannel-sqlbox-1.5.0-r1.ebuild index 06043457fe0c..02efd90850fc 100644 --- a/app-mobilephone/kannel-sqlbox/kannel-sqlbox-1.5.0-r1.ebuild +++ b/app-mobilephone/kannel-sqlbox/kannel-sqlbox-1.5.0-r1.ebuild @@ -49,16 +49,15 @@ src_configure() { --without-ctlib \ --without-mssql \ $(use_enable ssl) \ - $(use_enable doc docs) \ - || die "econf failed" + $(use_enable doc docs) } src_install() { - emake DESTDIR="${D}" install || die "failed emake install" + emake DESTDIR="${D}" install if use doc; then - emake doc/userguide.html || die "emake docs failed" - dohtml doc/userguide.html || die "userguide.html not found" + emake doc/userguide.html + dohtml doc/userguide.html fi newinitd "${FILESDIR}"/kannel-sqlbox.initd kannel-sqlbox diff --git a/app-mobilephone/kannel/kannel-1.5.0-r3.ebuild b/app-mobilephone/kannel/kannel-1.5.0-r3.ebuild index 174f609ce784..611d5ed24dc3 100644 --- a/app-mobilephone/kannel/kannel-1.5.0-r3.ebuild +++ b/app-mobilephone/kannel/kannel-1.5.0-r3.ebuild @@ -81,14 +81,14 @@ src_configure() { # phase disabled by RESTRICT # src_test() { -# emake check || die "emake check failed" +# emake check # } src_install() { default if use doc; then - emake -j1 DESTDIR="${D}" install-docs || die "emake install-docs failed" + emake -j1 DESTDIR="${D}" install-docs fi diropts -g kannel -m0750 diff --git a/app-mobilephone/kannel/kannel-1.5.0-r4.ebuild b/app-mobilephone/kannel/kannel-1.5.0-r4.ebuild index 0dc10f178c91..94543779012f 100644 --- a/app-mobilephone/kannel/kannel-1.5.0-r4.ebuild +++ b/app-mobilephone/kannel/kannel-1.5.0-r4.ebuild @@ -81,14 +81,14 @@ src_configure() { # phase disabled by RESTRICT # src_test() { -# emake check || die "emake check failed" +# emake check # } src_install() { default if use doc; then - emake -j1 DESTDIR="${D}" install-docs || die "emake install-docs failed" + emake -j1 DESTDIR="${D}" install-docs fi diropts -g kannel -m0750 diff --git a/app-office/projectlibre-bin/projectlibre-bin-1.6.2.ebuild b/app-office/projectlibre-bin/projectlibre-bin-1.6.2.ebuild index 4631aa88b465..6100648a8483 100644 --- a/app-office/projectlibre-bin/projectlibre-bin-1.6.2.ebuild +++ b/app-office/projectlibre-bin/projectlibre-bin-1.6.2.ebuild @@ -40,11 +40,11 @@ src_prepare() { src_install() { local d="/opt/${MY_PN}" insinto ${d} - doins -r * || die + doins -r * fperms a+rx ${d}/${MY_PN}.sh dodir /opt/bin - dosym ../${MY_PN}/${MY_PN}.sh /opt/bin/${MY_PN} || die + dosym ../${MY_PN}/${MY_PN}.sh /opt/bin/${MY_PN} newmenu ../${MY_PN}.desktop ${MY_PN}.desktop || die newicon ../${MY_PN}.png ${MY_PN}.png || die diff --git a/app-office/unoconv/unoconv-0.8.2.ebuild b/app-office/unoconv/unoconv-0.8.2.ebuild index 02da637f2ae8..578d57995ee4 100644 --- a/app-office/unoconv/unoconv-0.8.2.ebuild +++ b/app-office/unoconv/unoconv-0.8.2.ebuild @@ -36,7 +36,7 @@ src_prepare() { src_compile() { :; } src_install() { - emake -j1 doc-install install install-links DESTDIR="${D}" || die + emake -j1 doc-install install install-links DESTDIR="${D}" - dodoc ChangeLog CHANGELOG.md README.adoc || die + dodoc ChangeLog CHANGELOG.md README.adoc } diff --git a/app-office/unoconv/unoconv-0.9.ebuild b/app-office/unoconv/unoconv-0.9.ebuild index 1b1189bb0d81..c4555c5eadd4 100644 --- a/app-office/unoconv/unoconv-0.9.ebuild +++ b/app-office/unoconv/unoconv-0.9.ebuild @@ -36,7 +36,7 @@ src_prepare() { src_compile() { :; } src_install() { - emake -j1 doc-install install install-links DESTDIR="${D}" || die + emake -j1 doc-install install install-links DESTDIR="${D}" - dodoc ChangeLog CHANGELOG.md README.adoc || die + dodoc ChangeLog CHANGELOG.md README.adoc } diff --git a/app-portage/demerge/demerge-0.047-r3.ebuild b/app-portage/demerge/demerge-0.047-r3.ebuild index 852d7901a8f7..91e025ff6079 100644 --- a/app-portage/demerge/demerge-0.047-r3.ebuild +++ b/app-portage/demerge/demerge-0.047-r3.ebuild @@ -26,7 +26,7 @@ src_prepare() { } src_install() { - dobin demerge || die + dobin demerge dodoc Changelog doman demerge.3 } diff --git a/app-portage/g-octave/g-octave-0.4.1-r6.ebuild b/app-portage/g-octave/g-octave-0.4.1-r6.ebuild index 88b2d88d7950..dbf8ea63a922 100644 --- a/app-portage/g-octave/g-octave-0.4.1-r6.ebuild +++ b/app-portage/g-octave/g-octave-0.4.1-r6.ebuild @@ -39,13 +39,13 @@ python_prepare_all() { python_compile_all() { if use doc; then - emake -C docs html || die 'failed to compile the documentation.' + emake -C docs html fi } python_install_all() { local HTML_DOCS=( ${PN}.html ) - doman ${PN}.1 || die 'doman failed.' + doman ${PN}.1 if use doc; then mv docs/_build/{html,sphinx} || die 'mv failed.' HTML_DOCS+=( docs/_build/sphinx ) diff --git a/app-portage/genlop/genlop-0.30.9-r1.ebuild b/app-portage/genlop/genlop-0.30.9-r1.ebuild index ec2523cc02ca..4a68ff1273be 100644 --- a/app-portage/genlop/genlop-0.30.9-r1.ebuild +++ b/app-portage/genlop/genlop-0.30.9-r1.ebuild @@ -23,7 +23,7 @@ RDEPEND="${DEPEND}" PATCHES=( "${FILESDIR}"/${P}-display.patch ) src_install() { - dobin genlop || die "failed to install genlop (via dobin)" + dobin genlop dodoc README Changelog doman genlop.1 newbashcomp genlop.bash-completion genlop diff --git a/app-portage/getdelta/getdelta-0.7.9-r2.ebuild b/app-portage/getdelta/getdelta-0.7.9-r2.ebuild index df2523078442..cff0c6a6fe5e 100644 --- a/app-portage/getdelta/getdelta-0.7.9-r2.ebuild +++ b/app-portage/getdelta/getdelta-0.7.9-r2.ebuild @@ -30,7 +30,7 @@ src_install () { sed -i -e "s:source /etc/make.conf:source /etc/make.conf || source /etc/portage/make.conf:" "${WORKDIR}"/getdelta.sh || die "Couldn't fix make.conf path" sed -i -e "s:/bin/sh:/bin/bash:" "${WORKDIR}"/getdelta.sh || die - dobin "${WORKDIR}"/getdelta.sh || die + dobin "${WORKDIR}"/getdelta.sh } pkg_postinst() { diff --git a/app-portage/pqlop/pqlop-0.02-r1.ebuild b/app-portage/pqlop/pqlop-0.02-r1.ebuild index 0985141d34c4..72d9da4d8017 100644 --- a/app-portage/pqlop/pqlop-0.02-r1.ebuild +++ b/app-portage/pqlop/pqlop-0.02-r1.ebuild @@ -29,6 +29,6 @@ src_unpack() { } src_install() { - newbin "${DISTDIR}"/${P}.py ${PN} || die "newbin failed" + newbin "${DISTDIR}"/${P}.py ${PN} python_replicate_script "${ED}"/usr/bin/${PN} || die "python_replicate_script failed" } diff --git a/app-shells/localshell/localshell-1.3.4-r1.ebuild b/app-shells/localshell/localshell-1.3.4-r1.ebuild index dbc6064a4f9f..f2c8e8a51be3 100644 --- a/app-shells/localshell/localshell-1.3.4-r1.ebuild +++ b/app-shells/localshell/localshell-1.3.4-r1.ebuild @@ -20,7 +20,7 @@ src_configure() { } src_install() { - emake install DESTDIR="${D}" || die "emake install failed" + emake install DESTDIR="${D}" rm -f "${D}"/usr/share/doc/${PF}/{COPYING,INSTALL} } diff --git a/app-shells/smrsh/smrsh-8.15.2.ebuild b/app-shells/smrsh/smrsh-8.15.2.ebuild index c825f0f179de..a3333b5cad37 100644 --- a/app-shells/smrsh/smrsh-8.15.2.ebuild +++ b/app-shells/smrsh/smrsh-8.15.2.ebuild @@ -38,11 +38,11 @@ src_compile() { } src_install() { - dosbin "${S}/obj.$(uname -s).$(uname -r).$(arch)/${PN}/${PN}" || die + dosbin "${S}/obj.$(uname -s).$(uname -r).$(arch)/${PN}/${PN}" cd "${S}/${PN}" || die - doman "${PN}.8" || die - dodoc README || die + doman "${PN}.8" + dodoc README keepdir "/var/lib/${PN}" } diff --git a/app-shells/soapbox/soapbox-0.3.1-r2.ebuild b/app-shells/soapbox/soapbox-0.3.1-r2.ebuild index 79b53cdb9220..0dee6af50c31 100644 --- a/app-shells/soapbox/soapbox-0.3.1-r2.ebuild +++ b/app-shells/soapbox/soapbox-0.3.1-r2.ebuild @@ -29,12 +29,11 @@ src_compile() { CC="$(tc-getCC)" \ LD="$(tc-getCC)" \ CFLAGS="${CFLAGS} -fPIC" \ - LDFLAGS="${LDFLAGS}" \ - || die "emake failed" + LDFLAGS="${LDFLAGS}" } src_install() { - dolib.so libsoapbox.so || die "soapsox.so" - newbin soapbox.sh soapbox || die "soapbox" + dolib.so libsoapbox.so + newbin soapbox.sh soapbox dodoc AUTHORS BUGS ChangeLog README THANKS TODO } diff --git a/app-text/antiword/antiword-0.37-r1.ebuild b/app-text/antiword/antiword-0.37-r1.ebuild index 7aafe949cf22..53c8c77377b0 100644 --- a/app-text/antiword/antiword-0.37-r1.ebuild +++ b/app-text/antiword/antiword-0.37-r1.ebuild @@ -33,18 +33,18 @@ src_configure() { :; } src_compile() { emake PREFIX="${EPREFIX}" OPT="${CFLAGS}" CC="$(tc-getCC)" LD="$(tc-getCC)" \ - LDFLAGS="${LDFLAGS}" || die "emake failed" + LDFLAGS="${LDFLAGS}" } src_install() { - emake -j1 PREFIX="${EPREFIX}" DESTDIR="${D}" global_install || die + emake -j1 PREFIX="${EPREFIX}" DESTDIR="${D}" global_install use kde || rm -f "${ED}"/usr/bin/kantiword insinto /usr/share/${PN}/examples - doins Docs/testdoc.doc Docs/antiword.php || die + doins Docs/testdoc.doc Docs/antiword.php cd Docs - doman antiword.1 || die - dodoc ChangeLog Exmh Emacs FAQ History Netscape QandA ReadMe Mozilla Mutt || die + doman antiword.1 + dodoc ChangeLog Exmh Emacs FAQ History Netscape QandA ReadMe Mozilla Mutt } diff --git a/app-text/bogosort/bogosort-0.4.2-r1.ebuild b/app-text/bogosort/bogosort-0.4.2-r1.ebuild index 5eff84f8ed58..f62f8e4978fa 100644 --- a/app-text/bogosort/bogosort-0.4.2-r1.ebuild +++ b/app-text/bogosort/bogosort-0.4.2-r1.ebuild @@ -25,10 +25,10 @@ src_prepare() { src_configure() { tc-export CC - econf || die + econf } src_install() { make DESTDIR="${D}" install || die - dodoc README NEWS ChangeLog AUTHORS || die + dodoc README NEWS ChangeLog AUTHORS } diff --git a/app-text/docbook-xml-dtd/docbook-xml-dtd-4.1.2-r7.ebuild b/app-text/docbook-xml-dtd/docbook-xml-dtd-4.1.2-r7.ebuild index c66dcb07d7c7..c6ceaa35945b 100644 --- a/app-text/docbook-xml-dtd/docbook-xml-dtd-4.1.2-r7.ebuild +++ b/app-text/docbook-xml-dtd/docbook-xml-dtd-4.1.2-r7.ebuild @@ -30,7 +30,7 @@ src_install() { keepdir /etc/xml insinto "/usr/share/sgml/docbook/xml-dtd-${PV}" - doins *.cat *.dtd *.mod || die + doins *.cat *.dtd *.mod insinto "/usr/share/sgml/docbook/xml-dtd-${PV}/ent" doins ent/*.ent diff --git a/app-text/docbook-xml-dtd/docbook-xml-dtd-4.2-r3.ebuild b/app-text/docbook-xml-dtd/docbook-xml-dtd-4.2-r3.ebuild index 33be69e94534..275c23a389fa 100644 --- a/app-text/docbook-xml-dtd/docbook-xml-dtd-4.2-r3.ebuild +++ b/app-text/docbook-xml-dtd/docbook-xml-dtd-4.2-r3.ebuild @@ -30,7 +30,7 @@ src_install() { keepdir /etc/xml insinto "/usr/share/sgml/docbook/xml-dtd-${PV}" - doins *.cat *.dtd *.mod || die + doins *.cat *.dtd *.mod insinto "/usr/share/sgml/docbook/xml-dtd-${PV}/ent" doins ent/*.ent diff --git a/app-text/docbook-xml-dtd/docbook-xml-dtd-4.3-r2.ebuild b/app-text/docbook-xml-dtd/docbook-xml-dtd-4.3-r2.ebuild index 33be69e94534..275c23a389fa 100644 --- a/app-text/docbook-xml-dtd/docbook-xml-dtd-4.3-r2.ebuild +++ b/app-text/docbook-xml-dtd/docbook-xml-dtd-4.3-r2.ebuild @@ -30,7 +30,7 @@ src_install() { keepdir /etc/xml insinto "/usr/share/sgml/docbook/xml-dtd-${PV}" - doins *.cat *.dtd *.mod || die + doins *.cat *.dtd *.mod insinto "/usr/share/sgml/docbook/xml-dtd-${PV}/ent" doins ent/*.ent diff --git a/app-text/docbook-xml-dtd/docbook-xml-dtd-4.4-r3.ebuild b/app-text/docbook-xml-dtd/docbook-xml-dtd-4.4-r3.ebuild index 127fcd260207..b1cb368058b6 100644 --- a/app-text/docbook-xml-dtd/docbook-xml-dtd-4.4-r3.ebuild +++ b/app-text/docbook-xml-dtd/docbook-xml-dtd-4.4-r3.ebuild @@ -30,7 +30,7 @@ src_install() { keepdir /etc/xml insinto "/usr/share/sgml/docbook/xml-dtd-${PV}" - doins *.cat *.dtd *.mod *.xml || die + doins *.cat *.dtd *.mod *.xml insinto "/usr/share/sgml/docbook/xml-dtd-${PV}/ent" doins ent/*.ent diff --git a/app-text/docbook-xml-dtd/docbook-xml-dtd-4.5-r2.ebuild b/app-text/docbook-xml-dtd/docbook-xml-dtd-4.5-r2.ebuild index 127fcd260207..b1cb368058b6 100644 --- a/app-text/docbook-xml-dtd/docbook-xml-dtd-4.5-r2.ebuild +++ b/app-text/docbook-xml-dtd/docbook-xml-dtd-4.5-r2.ebuild @@ -30,7 +30,7 @@ src_install() { keepdir /etc/xml insinto "/usr/share/sgml/docbook/xml-dtd-${PV}" - doins *.cat *.dtd *.mod *.xml || die + doins *.cat *.dtd *.mod *.xml insinto "/usr/share/sgml/docbook/xml-dtd-${PV}/ent" doins ent/*.ent diff --git a/app-text/htp/htp-1.16-r1.ebuild b/app-text/htp/htp-1.16-r1.ebuild index f3fd15c02c87..6a5c090922df 100644 --- a/app-text/htp/htp-1.16-r1.ebuild +++ b/app-text/htp/htp-1.16-r1.ebuild @@ -32,12 +32,11 @@ src_compile() { emake \ CCOPT="-c ${CFLAGS} ${CPPFLAGS} -DHAVE_SNPRINTF -DHAVE_VASPRINTF -DHAVE_ASPRINTF" \ CC="$(tc-getCC)" \ - LINK='$(CC) $(LDFLAGS)' \ - || die + LINK='$(CC) $(LDFLAGS)' } src_test() { - emake -C tests || die + emake -C tests } src_install() { @@ -45,5 +44,5 @@ src_install() { DESTDIR="${D}" \ prefix='$(DESTDIR)/usr' \ pkgdocdir='$(DESTDIR)/usr/share/doc/${PF}/html' \ - install || die + install } diff --git a/app-text/pylize/pylize-1.3b-r1.ebuild b/app-text/pylize/pylize-1.3b-r1.ebuild index a82f173bad45..799e97bf41da 100644 --- a/app-text/pylize/pylize-1.3b-r1.ebuild +++ b/app-text/pylize/pylize-1.3b-r1.ebuild @@ -30,7 +30,7 @@ python_configure() { python_compile_all() { if use doc; then - emake -C doc PYTHON="${PYTHON}" PYLIZE="../pylize" || die + emake -C doc PYTHON="${PYTHON}" PYLIZE="../pylize" fi } diff --git a/app-text/teckit/teckit-2.5.6.ebuild b/app-text/teckit/teckit-2.5.6.ebuild index 868e68907d9e..4988e808f6d9 100644 --- a/app-text/teckit/teckit-2.5.6.ebuild +++ b/app-text/teckit/teckit-2.5.6.ebuild @@ -30,7 +30,7 @@ src_configure() { } src_install() { - emake DESTDIR="${D}" install || die + emake DESTDIR="${D}" install dodoc AUTHORS README NEWS find "${ED}" -name '*.la' -delete || die } diff --git a/app-text/txt2tags/txt2tags-2.6-r1.ebuild b/app-text/txt2tags/txt2tags-2.6-r1.ebuild index 701f24a7853a..a1ae6ff89610 100644 --- a/app-text/txt2tags/txt2tags-2.6-r1.ebuild +++ b/app-text/txt2tags/txt2tags-2.6-r1.ebuild @@ -61,11 +61,11 @@ src_install() { if use vim-syntax; then insinto /usr/share/vim/vimfiles/syntax/ - doins extras/txt2tags.vim || die + doins extras/txt2tags.vim echo 'au BufNewFile,BufRead *.t2t set ft=txt2tags' > "${T}/${PN}.vim" insinto /usr/share/vim/vimfiles/ftdetect - doins "${T}/${PN}.vim" || die + doins "${T}/${PN}.vim" fi python_fix_shebang "${D}" diff --git a/app-text/wv/wv-1.2.9-r2.ebuild b/app-text/wv/wv-1.2.9-r2.ebuild index da374a9fc56e..68d702fa29a9 100644 --- a/app-text/wv/wv-1.2.9-r2.ebuild +++ b/app-text/wv/wv-1.2.9-r2.ebuild @@ -57,6 +57,6 @@ src_install () { rm -f "${ED}"/usr/share/man/man1/wvConvert.1 if use tools; then - dosym /usr/share/man/man1/wvWare.1 /usr/share/man/man1/wvConvert.1 || die + dosym /usr/share/man/man1/wvWare.1 /usr/share/man/man1/wvConvert.1 fi } diff --git a/app-text/xml2doc/xml2doc-20030510-r1.ebuild b/app-text/xml2doc/xml2doc-20030510-r1.ebuild index ee66dcf4fb06..481bd3d247ee 100644 --- a/app-text/xml2doc/xml2doc-20030510-r1.ebuild +++ b/app-text/xml2doc/xml2doc-20030510-r1.ebuild @@ -47,13 +47,13 @@ src_install() { # xml2doc's make install is unfortunately broken # binary - dobin src/xml2doc || die + dobin src/xml2doc # documentation - dodoc BUGS README TODO || die + dodoc BUGS README TODO docinto examples - dodoc examples/*.{xml,png} || die + dodoc examples/*.{xml,png} # manpage - doman doc/xml2doc.1 || die + doman doc/xml2doc.1 } diff --git a/dev-ada/gnat-suite-bin/gnat-suite-bin-2014.ebuild b/dev-ada/gnat-suite-bin/gnat-suite-bin-2014.ebuild index 9dcff4585b0a..84e63a9aef84 100644 --- a/dev-ada/gnat-suite-bin/gnat-suite-bin-2014.ebuild +++ b/dev-ada/gnat-suite-bin/gnat-suite-bin-2014.ebuild @@ -89,15 +89,15 @@ src_install() { doins -r etc include lib* share insinto ${PREFIX}/share/gps/plug-ins doins share/examples/gnat/gnat-examples.xml - fperms 755 ${PREFIX}/libexec/gcc/${machine}/${basever}/cc1 || die - fperms 755 ${PREFIX}/libexec/gcc/${machine}/${basever}/cc1plus || die - fperms 755 ${PREFIX}/libexec/gcc/${machine}/${basever}/collect2 || die - fperms 755 ${PREFIX}/libexec/gcc/${machine}/${basever}/gnat1 || die - fperms 755 ${PREFIX}/libexec/gcc/${machine}/${basever}/liblto_plugin.so.0.0.0 || die - fperms 755 ${PREFIX}/libexec/gcc/${machine}/${basever}/lto1 || die - fperms 755 ${PREFIX}/libexec/gcc/${machine}/${basever}/lto-wrapper || die - fperms 755 ${PREFIX}/libexec/gprbuild/gprbind || die - fperms 755 ${PREFIX}/libexec/gprbuild/gprlib || die + fperms 755 ${PREFIX}/libexec/gcc/${machine}/${basever}/cc1 + fperms 755 ${PREFIX}/libexec/gcc/${machine}/${basever}/cc1plus + fperms 755 ${PREFIX}/libexec/gcc/${machine}/${basever}/collect2 + fperms 755 ${PREFIX}/libexec/gcc/${machine}/${basever}/gnat1 + fperms 755 ${PREFIX}/libexec/gcc/${machine}/${basever}/liblto_plugin.so.0.0.0 + fperms 755 ${PREFIX}/libexec/gcc/${machine}/${basever}/lto1 + fperms 755 ${PREFIX}/libexec/gcc/${machine}/${basever}/lto-wrapper + fperms 755 ${PREFIX}/libexec/gprbuild/gprbind + fperms 755 ${PREFIX}/libexec/gprbuild/gprlib } pkg_postinst () { diff --git a/dev-ada/gnat-suite-bin/gnat-suite-bin-2016.ebuild b/dev-ada/gnat-suite-bin/gnat-suite-bin-2016.ebuild index 03db6ca157d7..fe753f78bac8 100644 --- a/dev-ada/gnat-suite-bin/gnat-suite-bin-2016.ebuild +++ b/dev-ada/gnat-suite-bin/gnat-suite-bin-2016.ebuild @@ -84,15 +84,15 @@ src_install() { doins -r etc include lib* share insinto ${PREFIX}/share/gps/plug-ins doins share/examples/gnat/gnat-examples.xml - fperms 755 ${PREFIX}/libexec/gcc/${machine}/${basever}/cc1 || die - fperms 755 ${PREFIX}/libexec/gcc/${machine}/${basever}/cc1plus || die - fperms 755 ${PREFIX}/libexec/gcc/${machine}/${basever}/collect2 || die - fperms 755 ${PREFIX}/libexec/gcc/${machine}/${basever}/gnat1 || die - fperms 755 ${PREFIX}/libexec/gcc/${machine}/${basever}/liblto_plugin.so.0.0.0 || die - fperms 755 ${PREFIX}/libexec/gcc/${machine}/${basever}/lto1 || die - fperms 755 ${PREFIX}/libexec/gcc/${machine}/${basever}/lto-wrapper || die - fperms 755 ${PREFIX}/libexec/gprbuild/gprbind || die - fperms 755 ${PREFIX}/libexec/gprbuild/gprlib || die + fperms 755 ${PREFIX}/libexec/gcc/${machine}/${basever}/cc1 + fperms 755 ${PREFIX}/libexec/gcc/${machine}/${basever}/cc1plus + fperms 755 ${PREFIX}/libexec/gcc/${machine}/${basever}/collect2 + fperms 755 ${PREFIX}/libexec/gcc/${machine}/${basever}/gnat1 + fperms 755 ${PREFIX}/libexec/gcc/${machine}/${basever}/liblto_plugin.so.0.0.0 + fperms 755 ${PREFIX}/libexec/gcc/${machine}/${basever}/lto1 + fperms 755 ${PREFIX}/libexec/gcc/${machine}/${basever}/lto-wrapper + fperms 755 ${PREFIX}/libexec/gprbuild/gprbind + fperms 755 ${PREFIX}/libexec/gprbuild/gprlib } pkg_postinst () { diff --git a/dev-ada/gnat-suite-bin/gnat-suite-bin-2017.ebuild b/dev-ada/gnat-suite-bin/gnat-suite-bin-2017.ebuild index 32edf6f51a1c..538f8b0544bb 100644 --- a/dev-ada/gnat-suite-bin/gnat-suite-bin-2017.ebuild +++ b/dev-ada/gnat-suite-bin/gnat-suite-bin-2017.ebuild @@ -84,15 +84,15 @@ src_install() { doins -r etc include lib* share insinto ${PREFIX}/share/gps/plug-ins doins share/examples/gnat/gnat-examples.xml - fperms 755 ${PREFIX}/libexec/gcc/${machine}/${basever}/cc1 || die - fperms 755 ${PREFIX}/libexec/gcc/${machine}/${basever}/cc1plus || die - fperms 755 ${PREFIX}/libexec/gcc/${machine}/${basever}/collect2 || die - fperms 755 ${PREFIX}/libexec/gcc/${machine}/${basever}/gnat1 || die - fperms 755 ${PREFIX}/libexec/gcc/${machine}/${basever}/liblto_plugin.so.0.0.0 || die - fperms 755 ${PREFIX}/libexec/gcc/${machine}/${basever}/lto1 || die - fperms 755 ${PREFIX}/libexec/gcc/${machine}/${basever}/lto-wrapper || die - fperms 755 ${PREFIX}/libexec/gprbuild/gprbind || die - fperms 755 ${PREFIX}/libexec/gprbuild/gprlib || die + fperms 755 ${PREFIX}/libexec/gcc/${machine}/${basever}/cc1 + fperms 755 ${PREFIX}/libexec/gcc/${machine}/${basever}/cc1plus + fperms 755 ${PREFIX}/libexec/gcc/${machine}/${basever}/collect2 + fperms 755 ${PREFIX}/libexec/gcc/${machine}/${basever}/gnat1 + fperms 755 ${PREFIX}/libexec/gcc/${machine}/${basever}/liblto_plugin.so.0.0.0 + fperms 755 ${PREFIX}/libexec/gcc/${machine}/${basever}/lto1 + fperms 755 ${PREFIX}/libexec/gcc/${machine}/${basever}/lto-wrapper + fperms 755 ${PREFIX}/libexec/gprbuild/gprbind + fperms 755 ${PREFIX}/libexec/gprbuild/gprlib } pkg_postinst () { diff --git a/dev-ada/gnat-suite-bin/gnat-suite-bin-2018.ebuild b/dev-ada/gnat-suite-bin/gnat-suite-bin-2018.ebuild index 2edb4e58a554..a6d08d2be740 100644 --- a/dev-ada/gnat-suite-bin/gnat-suite-bin-2018.ebuild +++ b/dev-ada/gnat-suite-bin/gnat-suite-bin-2018.ebuild @@ -64,15 +64,15 @@ src_install() { doins share/examples/gnat/gnat-examples.xml basever=7.3.1 machine=x86_64-pc-linux-gnu - fperms 755 ${PREFIX}/libexec/gcc/${machine}/${basever}/cc1 || die - fperms 755 ${PREFIX}/libexec/gcc/${machine}/${basever}/cc1plus || die - fperms 755 ${PREFIX}/libexec/gcc/${machine}/${basever}/collect2 || die - fperms 755 ${PREFIX}/libexec/gcc/${machine}/${basever}/gnat1 || die - fperms 755 ${PREFIX}/libexec/gcc/${machine}/${basever}/liblto_plugin.so.0.0.0 || die - fperms 755 ${PREFIX}/libexec/gcc/${machine}/${basever}/lto1 || die - fperms 755 ${PREFIX}/libexec/gcc/${machine}/${basever}/lto-wrapper || die - fperms 755 ${PREFIX}/libexec/gprbuild/gprbind || die - fperms 755 ${PREFIX}/libexec/gprbuild/gprlib || die + fperms 755 ${PREFIX}/libexec/gcc/${machine}/${basever}/cc1 + fperms 755 ${PREFIX}/libexec/gcc/${machine}/${basever}/cc1plus + fperms 755 ${PREFIX}/libexec/gcc/${machine}/${basever}/collect2 + fperms 755 ${PREFIX}/libexec/gcc/${machine}/${basever}/gnat1 + fperms 755 ${PREFIX}/libexec/gcc/${machine}/${basever}/liblto_plugin.so.0.0.0 + fperms 755 ${PREFIX}/libexec/gcc/${machine}/${basever}/lto1 + fperms 755 ${PREFIX}/libexec/gcc/${machine}/${basever}/lto-wrapper + fperms 755 ${PREFIX}/libexec/gprbuild/gprbind + fperms 755 ${PREFIX}/libexec/gprbuild/gprlib } pkg_postinst () { diff --git a/dev-cpp/libglademm/libglademm-2.6.7-r2.ebuild b/dev-cpp/libglademm/libglademm-2.6.7-r2.ebuild index 924487e145d2..e1efe0c66b0d 100644 --- a/dev-cpp/libglademm/libglademm-2.6.7-r2.ebuild +++ b/dev-cpp/libglademm/libglademm-2.6.7-r2.ebuild @@ -46,7 +46,7 @@ multilib_src_compile() { gnome2_src_compile if multilib_is_native_abi && use doc; then - emake -C "docs/reference" all || die "emake doc failed" + emake -C "docs/reference" all fi } @@ -54,7 +54,7 @@ multilib_src_install() { gnome2_src_install if use examples; then - emake -C "examples" distclean || die "examples clean up failed" + emake -C "examples" distclean fi } @@ -69,6 +69,6 @@ multilib_src_install_all() { find "${S}/examples" -name "Makefile*" -delete \ || die "examples cleanup failed" insinto "/usr/share/doc/${PF}" - doins -r examples || die "doins failed" + doins -r examples fi } diff --git a/dev-cpp/libgnomecanvasmm/libgnomecanvasmm-2.26.0-r1.ebuild b/dev-cpp/libgnomecanvasmm/libgnomecanvasmm-2.26.0-r1.ebuild index 5fa5463f6bdc..8d23e443e853 100644 --- a/dev-cpp/libgnomecanvasmm/libgnomecanvasmm-2.26.0-r1.ebuild +++ b/dev-cpp/libgnomecanvasmm/libgnomecanvasmm-2.26.0-r1.ebuild @@ -39,7 +39,7 @@ src_compile() { if use doc; then cd "${S}/docs/reference" - emake all || die "failed to build API docs" + emake all fi } diff --git a/dev-db/4store/4store-1.1.5-r1.ebuild b/dev-db/4store/4store-1.1.5-r1.ebuild index cbbefd39efa2..bc3835b91931 100644 --- a/dev-db/4store/4store-1.1.5-r1.ebuild +++ b/dev-db/4store/4store-1.1.5-r1.ebuild @@ -39,7 +39,7 @@ src_install() { # patch the Makefiles to use /usr/ instead of /usr/local/ find . -name "Makefile" -execdir sed -e "s#/usr/local/#/usr/#" -i {} \; - MAKEOPTS="-j1" emake DESTDIR="${D}" install || die "emake install failed" + MAKEOPTS="-j1" emake DESTDIR="${D}" install dodir /var/log/4store fowners fourstore:fourstore \ diff --git a/dev-db/cdb/cdb-0.75-r4.ebuild b/dev-db/cdb/cdb-0.75-r4.ebuild index 89db70153cf3..4ba24d9d243a 100644 --- a/dev-db/cdb/cdb-0.75-r4.ebuild +++ b/dev-db/cdb/cdb-0.75-r4.ebuild @@ -32,21 +32,20 @@ src_configure() { } src_install() { - dobin cdbdump cdbget cdbmake cdbmake-12 cdbmake-sv cdbstats cdbtest \ - || die "dobin failed" + dobin cdbdump cdbget cdbmake cdbmake-12 cdbmake-sv cdbstats cdbtest # ok so ... first off, some automakes fail at finding # cdb.a, so install that now - dolib *.a || die "dolib failed" + dolib *.a # then do this pretty little symlinking to solve the somewhat # cosmetic library issue at hand - dosym cdb.a /usr/$(get_libdir)/libcdb.a || die "dosym failed" + dosym cdb.a /usr/$(get_libdir)/libcdb.a # uint32.h needs installation too, otherwise compiles depending # on it will fail insinto /usr/include/cdb - doins cdb*.h buffer.h alloc.h uint32.h || die "doins failed" + doins cdb*.h buffer.h alloc.h uint32.h dodoc CHANGES FILES README SYSDEPS TODO VERSION } diff --git a/dev-db/henplus/henplus-0.9.8-r1.ebuild b/dev-db/henplus/henplus-0.9.8-r1.ebuild index a1d41261fac3..c42f56c5c950 100644 --- a/dev-db/henplus/henplus-0.9.8-r1.ebuild +++ b/dev-db/henplus/henplus-0.9.8-r1.ebuild @@ -35,8 +35,8 @@ src_install () { java-pkg_dolauncher ${PN} -pre "${FILESDIR}/${PN}.pre" \ --main henplus.HenPlus - dodoc README || die - dohtml doc/HenPlus.html || die + dodoc README + dohtml doc/HenPlus.html use doc && java-pkg_dojavadoc javadoc/api use source && java-pkg_dosrc "src/${PN}" diff --git a/dev-db/hyperdex/hyperdex-1.6.0-r1.ebuild b/dev-db/hyperdex/hyperdex-1.6.0-r1.ebuild index ba8e0bd4d3de..0a3b4c5bc249 100644 --- a/dev-db/hyperdex/hyperdex-1.6.0-r1.ebuild +++ b/dev-db/hyperdex/hyperdex-1.6.0-r1.ebuild @@ -54,8 +54,8 @@ src_configure() { } src_install() { - emake DESTDIR="${D}" install || die "Failed to install" - newinitd "${FILESDIR}/hyperdex.initd" hyperdex || die "Failed to install init script" - newconfd "${FILESDIR}/hyperdex.confd" hyperdex || die "Failed to install config file" + emake DESTDIR="${D}" install + newinitd "${FILESDIR}/hyperdex.initd" hyperdex + newconfd "${FILESDIR}/hyperdex.confd" hyperdex find "${D}" -name '*.la' -exec rm {} \; # bad buildsystem! bad! } diff --git a/dev-db/hyperdex/hyperdex-1.7.1.ebuild b/dev-db/hyperdex/hyperdex-1.7.1.ebuild index ba8e0bd4d3de..0a3b4c5bc249 100644 --- a/dev-db/hyperdex/hyperdex-1.7.1.ebuild +++ b/dev-db/hyperdex/hyperdex-1.7.1.ebuild @@ -54,8 +54,8 @@ src_configure() { } src_install() { - emake DESTDIR="${D}" install || die "Failed to install" - newinitd "${FILESDIR}/hyperdex.initd" hyperdex || die "Failed to install init script" - newconfd "${FILESDIR}/hyperdex.confd" hyperdex || die "Failed to install config file" + emake DESTDIR="${D}" install + newinitd "${FILESDIR}/hyperdex.initd" hyperdex + newconfd "${FILESDIR}/hyperdex.confd" hyperdex find "${D}" -name '*.la' -exec rm {} \; # bad buildsystem! bad! } diff --git a/dev-db/hyperdex/hyperdex-1.8.0.ebuild b/dev-db/hyperdex/hyperdex-1.8.0.ebuild index 107843edc025..de31c1703020 100644 --- a/dev-db/hyperdex/hyperdex-1.8.0.ebuild +++ b/dev-db/hyperdex/hyperdex-1.8.0.ebuild @@ -55,9 +55,9 @@ src_configure() { } src_install() { - emake DESTDIR="${D}" install || die "Failed to install" - newinitd "${FILESDIR}/hyperdex.initd" hyperdex || die "Failed to install init script" - newconfd "${FILESDIR}/hyperdex.confd" hyperdex || die "Failed to install config file" + emake DESTDIR="${D}" install + newinitd "${FILESDIR}/hyperdex.initd" hyperdex + newconfd "${FILESDIR}/hyperdex.confd" hyperdex find "${D}" -name '*.la' -exec rm {} \; # bad buildsystem! bad! } diff --git a/dev-db/hyperdex/hyperdex-1.8.1.ebuild b/dev-db/hyperdex/hyperdex-1.8.1.ebuild index 107843edc025..de31c1703020 100644 --- a/dev-db/hyperdex/hyperdex-1.8.1.ebuild +++ b/dev-db/hyperdex/hyperdex-1.8.1.ebuild @@ -55,9 +55,9 @@ src_configure() { } src_install() { - emake DESTDIR="${D}" install || die "Failed to install" - newinitd "${FILESDIR}/hyperdex.initd" hyperdex || die "Failed to install init script" - newconfd "${FILESDIR}/hyperdex.confd" hyperdex || die "Failed to install config file" + emake DESTDIR="${D}" install + newinitd "${FILESDIR}/hyperdex.initd" hyperdex + newconfd "${FILESDIR}/hyperdex.confd" hyperdex find "${D}" -name '*.la' -exec rm {} \; # bad buildsystem! bad! } diff --git a/dev-db/hyperdex/hyperdex-9999.ebuild b/dev-db/hyperdex/hyperdex-9999.ebuild index d1d8b48d8504..24f6526f77b6 100644 --- a/dev-db/hyperdex/hyperdex-9999.ebuild +++ b/dev-db/hyperdex/hyperdex-9999.ebuild @@ -52,8 +52,8 @@ src_configure() { } src_install() { - emake DESTDIR="${D}" install || die "Failed to install" - newinitd "${FILESDIR}/hyperdex.initd" hyperdex || die "Failed to install init script" - newconfd "${FILESDIR}/hyperdex.confd" hyperdex || die "Failed to install config file" + emake DESTDIR="${D}" install + newinitd "${FILESDIR}/hyperdex.initd" hyperdex + newconfd "${FILESDIR}/hyperdex.confd" hyperdex find "${D}" -name '*.la' -exec rm {} \; # bad buildsystem! bad! } diff --git a/dev-db/libodbc++/libodbc++-0.2.5-r2.ebuild b/dev-db/libodbc++/libodbc++-0.2.5-r2.ebuild index 2ff9b64fa4bf..ca2d04023a40 100644 --- a/dev-db/libodbc++/libodbc++-0.2.5-r2.ebuild +++ b/dev-db/libodbc++/libodbc++-0.2.5-r2.ebuild @@ -74,8 +74,7 @@ src_configure() { #--without-qt \ econf \ ${commonconf} \ - ${commonconf2} \ - || die "econf failed" + ${commonconf2} done } diff --git a/dev-db/phpmyadmin/phpmyadmin-4.9.2.ebuild b/dev-db/phpmyadmin/phpmyadmin-4.9.2.ebuild index fbece53dcc9b..1bf18d49625f 100644 --- a/dev-db/phpmyadmin/phpmyadmin-4.9.2.ebuild +++ b/dev-db/phpmyadmin/phpmyadmin-4.9.2.ebuild @@ -37,7 +37,7 @@ pkg_setup() { src_install() { webapp_src_preinst - dodoc README RELEASE-DATE-${MY_PV} ChangeLog || die + dodoc README RELEASE-DATE-${MY_PV} ChangeLog rm -f LICENSE README* RELEASE-DATE-${MY_PV} if ! use setup; then diff --git a/dev-db/tokyocabinet/tokyocabinet-1.4.48-r1.ebuild b/dev-db/tokyocabinet/tokyocabinet-1.4.48-r1.ebuild index a7c0ed8ebb55..5ce9ea0274ad 100644 --- a/dev-db/tokyocabinet/tokyocabinet-1.4.48-r1.ebuild +++ b/dev-db/tokyocabinet/tokyocabinet-1.4.48-r1.ebuild @@ -42,19 +42,19 @@ src_configure() { } src_install() { - emake DESTDIR="${D}" install || die "Install failed" + emake DESTDIR="${D}" install if use examples; then insinto /usr/share/${PF}/example - doins example/* || die "Install failed" + doins example/* fi if use doc; then insinto /usr/share/doc/${PF} - doins -r doc/* || die "Install failed" + doins -r doc/* fi } src_test() { - emake -j1 check || die "Tests failed" + emake -j1 check } diff --git a/dev-haskell/alex/alex-3.1.7.ebuild b/dev-haskell/alex/alex-3.1.7.ebuild index 2ded8cc77471..8d4d94c9bf9e 100644 --- a/dev-haskell/alex/alex-3.1.7.ebuild +++ b/dev-haskell/alex/alex-3.1.7.ebuild @@ -66,7 +66,7 @@ src_compile() { src_test() { # workaround https://github.com/haskell/cabal/issues/2398 - emake -k -C tests all || die + emake -k -C tests all } src_install() { diff --git a/dev-haskell/alex/alex-3.2.1.ebuild b/dev-haskell/alex/alex-3.2.1.ebuild index e56cee1d07ba..1460cbdca36f 100644 --- a/dev-haskell/alex/alex-3.2.1.ebuild +++ b/dev-haskell/alex/alex-3.2.1.ebuild @@ -70,7 +70,7 @@ src_compile() { src_test() { # workaround https://github.com/haskell/cabal/issues/2398 - emake -k -C tests all || die + emake -k -C tests all } src_install() { diff --git a/dev-haskell/happy/happy-1.19.5.ebuild b/dev-haskell/happy/happy-1.19.5.ebuild index eeda02741f94..7f2455f1cbeb 100644 --- a/dev-haskell/happy/happy-1.19.5.ebuild +++ b/dev-haskell/happy/happy-1.19.5.ebuild @@ -60,7 +60,7 @@ src_compile() { src_test() { # workaround https://github.com/haskell/cabal/issues/2398 - emake -k -C tests all || die + emake -k -C tests all } src_install() { 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}/* diff --git a/dev-lang/gforth/gforth-0.7.3-r1.ebuild b/dev-lang/gforth/gforth-0.7.3-r1.ebuild index ef990ca837bc..0a50f9613e86 100644 --- a/dev-lang/gforth/gforth-0.7.3-r1.ebuild +++ b/dev-lang/gforth/gforth-0.7.3-r1.ebuild @@ -31,7 +31,7 @@ src_configure() { src_compile() { # Parallel make breaks here - emake -j1 || die "emake failed" + emake -j1 } src_install() { diff --git a/dev-lang/logtalk/logtalk-3.11.2.ebuild b/dev-lang/logtalk/logtalk-3.11.2.ebuild index a9cb4028bfed..6a29f2f8591b 100644 --- a/dev-lang/logtalk/logtalk-3.11.2.ebuild +++ b/dev-lang/logtalk/logtalk-3.11.2.ebuild @@ -46,7 +46,7 @@ src_install() { rm -f man/man1/logtalk_backend_select.1 rm -f man/man1/logtalk_version_select.1 - doman man/man1/*.1 || die "Failed to install man pages" + doman man/man1/*.1 # Integration symlinks dosym /usr/share/${P}/integration/logtalk_user_setup.sh \ diff --git a/dev-lang/logtalk/logtalk-3.18.0.ebuild b/dev-lang/logtalk/logtalk-3.18.0.ebuild index f7bd2a861f1c..ebc48ba9a70b 100644 --- a/dev-lang/logtalk/logtalk-3.18.0.ebuild +++ b/dev-lang/logtalk/logtalk-3.18.0.ebuild @@ -48,7 +48,7 @@ src_install() { rm -f man/man1/logtalk_backend_select.1 rm -f man/man1/logtalk_version_select.1 - doman man/man1/*.1 || die "Failed to install man pages" + doman man/man1/*.1 # Integration symlinks dosym ../share/${P}/integration/logtalk_user_setup.sh \ diff --git a/dev-lang/lua/lua-5.2.3.ebuild b/dev-lang/lua/lua-5.2.3.ebuild index 1dc833e32a07..06d5e005376f 100644 --- a/dev-lang/lua/lua-5.2.3.ebuild +++ b/dev-lang/lua/lua-5.2.3.ebuild @@ -86,13 +86,12 @@ src_compile() { LUA_LIBS="${mylibs}" \ LIB_LIBS="${liblibs}" \ V=$(get_version_component_range 1-2) \ - gentoo_all || die "emake failed" + gentoo_all } src_install() { emake INSTALL_TOP="${ED}/usr" INSTALL_LIB="${ED}/usr/$(get_libdir)" \ - V=${SLOT} gentoo_install \ - || die "emake install gentoo_install failed" + V=${SLOT} gentoo_install dodoc README dohtml doc/*.html doc/*.png doc/*.css doc/*.gif diff --git a/dev-lang/mercury-extras/mercury-extras-14.01.1.ebuild b/dev-lang/mercury-extras/mercury-extras-14.01.1.ebuild index cd9279191c5b..11bd6cc09b48 100644 --- a/dev-lang/mercury-extras/mercury-extras-14.01.1.ebuild +++ b/dev-lang/mercury-extras/mercury-extras-14.01.1.ebuild @@ -129,71 +129,71 @@ src_install() { cd "${S}" if use examples; then insinto /usr/share/doc/${PF}/samples/base64 - doins base64/*.m || die + doins base64/*.m insinto /usr/share/doc/${PF}/samples/complex_numbers - doins complex_numbers/samples/* || die + doins complex_numbers/samples/* insinto /usr/share/doc/${PF}/samples/dynamic_linking - doins dynamic_linking/hello.m || die + doins dynamic_linking/hello.m insinto /usr/share/doc/${PF}/samples/error - doins error/* || die + doins error/* insinto /usr/share/doc/${PF}/samples/fixed - doins fixed/*.m || die + doins fixed/*.m insinto /usr/share/doc/${PF}/samples/gator - doins -r gator/* || die + doins -r gator/* insinto /usr/share/doc/${PF}/samples/lex - doins lex/samples/* || die + doins lex/samples/* insinto /usr/share/doc/${PF}/samples/log4m - doins log4m/*.m || die + doins log4m/*.m insinto /usr/share/doc/${PF}/samples/monte - doins monte/*.m || die + doins monte/*.m insinto /usr/share/doc/${PF}/samples/moose - doins moose/samples/* || die + doins moose/samples/* insinto /usr/share/doc/${PF}/samples/net - doins net/*.m || die + doins net/*.m if use ncurses; then insinto /usr/share/doc/${PF}/samples/curs - doins curs/samples/* || die + doins curs/samples/* insinto /usr/share/doc/${PF}/samples/curses - doins curses/sample/* || die + doins curses/sample/* fi if use X; then insinto /usr/share/doc/${PF}/samples/graphics - doins graphics/easyx/samples/*.m || die + doins graphics/easyx/samples/*.m fi if use glut && use opengl; then insinto /usr/share/doc/${PF}/samples/graphics - doins graphics/samples/calc/* || die - doins graphics/samples/gears/* || die - doins graphics/samples/maze/* || die - doins graphics/samples/pent/* || die + doins graphics/samples/calc/* + doins graphics/samples/gears/* + doins graphics/samples/maze/* + doins graphics/samples/pent/* fi if use opengl && use tcl && use tk; then insinto /usr/share/doc/${PF}/samples/graphics - doins graphics/samples/pent/*.m || die + doins graphics/samples/pent/*.m fi if use ssl; then insinto /usr/share/doc/${PF}/samples/mopenssl - doins mopenssl/*.m || die + doins mopenssl/*.m fi ecvs_clean fi - dodoc README || die + dodoc README } diff --git a/dev-lang/mercury/mercury-14.01.1-r1.ebuild b/dev-lang/mercury/mercury-14.01.1-r1.ebuild index 21f002551abb..25c4317109dd 100644 --- a/dev-lang/mercury/mercury-14.01.1-r1.ebuild +++ b/dev-lang/mercury/mercury-14.01.1-r1.ebuild @@ -88,8 +88,7 @@ src_compile() { # Build Mercury using bootstrap grade emake \ PARALLEL="'${MAKEOPTS}'" \ - TEXI2DVI="" PDFTEX="" \ - || die "emake failed" + TEXI2DVI="" PDFTEX="" # We can now patch .m Mercury compiler files since we # have just built mercury_compiler. @@ -109,7 +108,7 @@ src_compile() { PARALLEL="'${MAKEOPTS}'" \ MERCURY_COMPILER="${S}"/compiler/mercury_compile \ TEXI2DVI="" PDFTEX="" \ - compiler || die "emake compiler failed" + compiler # The default Mercury grade may not be the same as the bootstrap # grade. Since src_test() is run before src_install() we compile @@ -118,7 +117,7 @@ src_compile() { PARALLEL="'${MAKEOPTS}'" \ MERCURY_COMPILER="${S}"/compiler/mercury_compile \ TEXI2DVI="" PDFTEX="" \ - default_grade || die "emake default_grade failed" + default_grade } src_test() { @@ -169,7 +168,7 @@ src_install() { INSTALL_INFO_DIR="${D}"/usr/share/info \ INSTALL_HTML_DIR="${D}"/usr/share/doc/${PF}/html \ INSTALL_ELISP_DIR="${D}/${SITELISP}"/${PN} \ - install || die "emake install failed" + install if use java; then keepdir /usr/$(get_libdir)/mercury/modules/java @@ -190,25 +189,25 @@ src_install() { RELEASE_NOTES TODO VERSION WORK_IN_PROGRESS || die if use erlang; then - dodoc README.Erlang || die + dodoc README.Erlang fi if use java; then - dodoc README.Java || die + dodoc README.Java fi if use examples; then insinto /usr/share/doc/${PF}/samples - doins samples/{*.m,README,Mmakefile} || die + doins samples/{*.m,README,Mmakefile} doins -r samples/c_interface \ samples/diff \ samples/muz \ samples/rot13 \ samples/solutions \ - samples/solver_types || die + samples/solver_types if use java; then - doins -r samples/java_interface || die + doins -r samples/java_interface fi ecvs_clean "${D}"/usr/share/doc/${PF}/samples diff --git a/dev-lang/mlton/mlton-20130715.ebuild b/dev-lang/mlton/mlton-20130715.ebuild index a306bfabb1c3..1e3533a37670 100644 --- a/dev-lang/mlton/mlton-20130715.ebuild +++ b/dev-lang/mlton/mlton-20130715.ebuild @@ -79,15 +79,15 @@ src_compile() { sed -i 's@^MAN_PREFIX_EXTRA :=.*@MAN_PREFIX_EXTRA := /share@' \ Makefile || die 'sed Makefile failed' - emake -j1 dirs runtime compiler CFLAGS="${CFLAGS}" || die + emake -j1 dirs runtime compiler CFLAGS="${CFLAGS}" pax-mark m "${S}/mlton/mlton-compile" pax-mark m "${S}/build/lib/mlton-compile" # Does not support parallel make - emake -j1 all-no-docs CFLAGS="${CFLAGS}" || die + emake -j1 all-no-docs CFLAGS="${CFLAGS}" if use doc; then export VARTEXFONTS="${T}/fonts" - emake docs || die "failed to create documentation" + emake docs fi fi } @@ -101,8 +101,8 @@ src_install() { pax-mark m "${S}/usr/bin/mlyacc" mv "${S}/usr" "${D}" || die "mv failed" else - emake DESTDIR="${D}" install-no-docs || die - if use doc; then emake DESTDIR="${D}" TDOC="${D}"/usr/share/doc/${P} install-docs || die; fi + emake DESTDIR="${D}" install-no-docs + use doc && emake DESTDIR="${D}" TDOC="${D}"/usr/share/doc/${P} install-docs fi } diff --git a/dev-lang/opendylan/opendylan-2013.1-r1.ebuild b/dev-lang/opendylan/opendylan-2013.1-r1.ebuild index a5a3a00fc97d..78ee3789828b 100644 --- a/dev-lang/opendylan/opendylan-2013.1-r1.ebuild +++ b/dev-lang/opendylan/opendylan-2013.1-r1.ebuild @@ -71,9 +71,9 @@ src_configure() { PATH=/opt/opendylan/bin:$PATH fi if use amd64; then - econf --prefix=/opt/opendylan || die + econf --prefix=/opt/opendylan else - econf --prefix=/opt/opendylan --with-mps=/usr/include/mps/ || die + econf --prefix=/opt/opendylan --with-mps=/usr/include/mps/ fi if use x86; then # Includedir, pointing at something wrong @@ -87,7 +87,7 @@ src_configure() { src_compile() { ulimit -s 32000 # this is naughty build system - emake -j1 3-stage-bootstrap || die + emake -j1 3-stage-bootstrap } src_install() { diff --git a/dev-lang/opendylan/opendylan-2013.2.ebuild b/dev-lang/opendylan/opendylan-2013.2.ebuild index 1d752a9bd300..60566f683474 100644 --- a/dev-lang/opendylan/opendylan-2013.2.ebuild +++ b/dev-lang/opendylan/opendylan-2013.2.ebuild @@ -76,9 +76,9 @@ src_configure() { fi if use amd64; then - econf --prefix=/opt/opendylan || die + econf --prefix=/opt/opendylan else - econf --prefix=/opt/opendylan --with-mps=/usr/include/mps/ || die + econf --prefix=/opt/opendylan --with-mps=/usr/include/mps/ fi if use x86; then # Includedir, pointing at something wrong @@ -92,7 +92,7 @@ src_configure() { src_compile() { ulimit -s 32000 # this is naughty build system - emake -j1 3-stage-bootstrap || die + emake -j1 3-stage-bootstrap } src_install() { diff --git a/dev-lang/opendylan/opendylan-2014.1.ebuild b/dev-lang/opendylan/opendylan-2014.1.ebuild index 6bced74464e6..9bf1ebb1bece 100644 --- a/dev-lang/opendylan/opendylan-2014.1.ebuild +++ b/dev-lang/opendylan/opendylan-2014.1.ebuild @@ -72,9 +72,9 @@ src_configure() { fi if use amd64; then - econf --prefix=/opt/opendylan || die + econf --prefix=/opt/opendylan else - econf --prefix=/opt/opendylan --with-mps=/usr/include/mps/ || die + econf --prefix=/opt/opendylan --with-mps=/usr/include/mps/ fi if use x86; then # Includedir, pointing at something wrong @@ -88,7 +88,7 @@ src_configure() { src_compile() { ulimit -s 32000 # this is naughty build system - emake -j1 3-stage-bootstrap || die + emake -j1 3-stage-bootstrap } src_install() { diff --git a/dev-lang/opendylan/opendylan-9999.ebuild b/dev-lang/opendylan/opendylan-9999.ebuild index 6315b304da3b..adf7e63d28bd 100644 --- a/dev-lang/opendylan/opendylan-9999.ebuild +++ b/dev-lang/opendylan/opendylan-9999.ebuild @@ -46,12 +46,12 @@ src_configure() { else PATH=/opt/opendylan/bin/:$PATH fi - econf --prefix=/opt/opendylan || die + econf --prefix=/opt/opendylan } src_compile() { ulimit -s 32000 # this is naughty build system - emake -j1 || die + emake -j1 } src_install() { diff --git a/dev-lang/parrot/parrot-7.1.0-r1.ebuild b/dev-lang/parrot/parrot-7.1.0-r1.ebuild index 3ba3c774a34c..4c68d410926e 100644 --- a/dev-lang/parrot/parrot-7.1.0-r1.ebuild +++ b/dev-lang/parrot/parrot-7.1.0-r1.ebuild @@ -55,27 +55,27 @@ src_configure() { src_compile() { export LD_LIBRARY_PATH=${LD_LIBRARY_PATH:+$LD_LIBRARY_PATH:}"${S}"/blib/lib # occasionally dies in parallel make - emake -j1 || die + emake -j1 if use doc ; then - emake -j1 html || die + emake -j1 html fi } src_test() { - emake -j1 test || die + emake -j1 test } src_install() { - emake -j1 install-dev DESTDIR="${D}" DOC_DIR="${EPREFIX}/usr/share/doc/${PF}" || die - dodoc CREDITS DONORS.pod PBC_COMPAT PLATFORMS RESPONSIBLE_PARTIES TODO || die - dosym parrot-ops2c /usr/bin/ops2c || die + emake -j1 install-dev DESTDIR="${D}" DOC_DIR="${EPREFIX}/usr/share/doc/${PF}" + dodoc CREDITS DONORS.pod PBC_COMPAT PLATFORMS RESPONSIBLE_PARTIES TODO + dosym parrot-ops2c /usr/bin/ops2c if use examples; then insinto "/usr/share/doc/${PF}/examples" - doins -r examples/* || die + doins -r examples/* fi if use doc; then insinto "/usr/share/doc/${PF}/editor" - doins -r editor || die + doins -r editor cd docs/html dohtml -r developer.html DONORS.pod.html index.html ops.html parrotbug.html pdds.html \ pmc.html tools.html docs src tools || die diff --git a/dev-lang/parrot/parrot-7.11.0-r1.ebuild b/dev-lang/parrot/parrot-7.11.0-r1.ebuild index ecedd1c6ff5f..fe5c23fecbf8 100644 --- a/dev-lang/parrot/parrot-7.11.0-r1.ebuild +++ b/dev-lang/parrot/parrot-7.11.0-r1.ebuild @@ -55,27 +55,27 @@ src_configure() { src_compile() { export LD_LIBRARY_PATH=${LD_LIBRARY_PATH:+$LD_LIBRARY_PATH:}"${S}"/blib/lib # occasionally dies in parallel make - emake -j1 || die + emake -j1 if use doc ; then - emake -j1 html || die + emake -j1 html fi } src_test() { - emake -j1 test || die + emake -j1 test } src_install() { - emake -j1 install-dev DESTDIR="${D}" DOC_DIR="${EPREFIX}/usr/share/doc/${PF}" || die - dodoc CREDITS DONORS.pod PBC_COMPAT PLATFORMS RESPONSIBLE_PARTIES TODO || die - dosym parrot-ops2c /usr/bin/ops2c || die + emake -j1 install-dev DESTDIR="${D}" DOC_DIR="${EPREFIX}/usr/share/doc/${PF}" + dodoc CREDITS DONORS.pod PBC_COMPAT PLATFORMS RESPONSIBLE_PARTIES TODO + dosym parrot-ops2c /usr/bin/ops2c if use examples; then insinto "/usr/share/doc/${PF}/examples" - doins -r examples/* || die + doins -r examples/* fi if use doc; then insinto "/usr/share/doc/${PF}/editor" - doins -r editor || die + doins -r editor cd docs/html dohtml -r developer.html DONORS.pod.html index.html ops.html parrotbug.html pdds.html \ pmc.html tools.html docs src tools || die diff --git a/dev-lang/parrot/parrot-7.5.0-r1.ebuild b/dev-lang/parrot/parrot-7.5.0-r1.ebuild index ecedd1c6ff5f..fe5c23fecbf8 100644 --- a/dev-lang/parrot/parrot-7.5.0-r1.ebuild +++ b/dev-lang/parrot/parrot-7.5.0-r1.ebuild @@ -55,27 +55,27 @@ src_configure() { src_compile() { export LD_LIBRARY_PATH=${LD_LIBRARY_PATH:+$LD_LIBRARY_PATH:}"${S}"/blib/lib # occasionally dies in parallel make - emake -j1 || die + emake -j1 if use doc ; then - emake -j1 html || die + emake -j1 html fi } src_test() { - emake -j1 test || die + emake -j1 test } src_install() { - emake -j1 install-dev DESTDIR="${D}" DOC_DIR="${EPREFIX}/usr/share/doc/${PF}" || die - dodoc CREDITS DONORS.pod PBC_COMPAT PLATFORMS RESPONSIBLE_PARTIES TODO || die - dosym parrot-ops2c /usr/bin/ops2c || die + emake -j1 install-dev DESTDIR="${D}" DOC_DIR="${EPREFIX}/usr/share/doc/${PF}" + dodoc CREDITS DONORS.pod PBC_COMPAT PLATFORMS RESPONSIBLE_PARTIES TODO + dosym parrot-ops2c /usr/bin/ops2c if use examples; then insinto "/usr/share/doc/${PF}/examples" - doins -r examples/* || die + doins -r examples/* fi if use doc; then insinto "/usr/share/doc/${PF}/editor" - doins -r editor || die + doins -r editor cd docs/html dohtml -r developer.html DONORS.pod.html index.html ops.html parrotbug.html pdds.html \ pmc.html tools.html docs src tools || die diff --git a/dev-lang/parrot/parrot-8.1.0-r1.ebuild b/dev-lang/parrot/parrot-8.1.0-r1.ebuild index 271931b3b1af..741003d7549c 100644 --- a/dev-lang/parrot/parrot-8.1.0-r1.ebuild +++ b/dev-lang/parrot/parrot-8.1.0-r1.ebuild @@ -56,27 +56,27 @@ src_configure() { src_compile() { export LD_LIBRARY_PATH=${LD_LIBRARY_PATH:+$LD_LIBRARY_PATH:}"${S}"/blib/lib # occasionally dies in parallel make - emake -j1 || die + emake -j1 if use doc ; then - emake -j1 html || die + emake -j1 html fi } src_test() { - emake -j1 test || die + emake -j1 test } src_install() { - emake -j1 install-dev DESTDIR="${D}" DOC_DIR="${EPREFIX}/usr/share/doc/${PF}" || die - dodoc CREDITS DONORS.pod PBC_COMPAT PLATFORMS RESPONSIBLE_PARTIES TODO || die - dosym parrot-ops2c /usr/bin/ops2c || die + emake -j1 install-dev DESTDIR="${D}" DOC_DIR="${EPREFIX}/usr/share/doc/${PF}" + dodoc CREDITS DONORS.pod PBC_COMPAT PLATFORMS RESPONSIBLE_PARTIES TODO + dosym parrot-ops2c /usr/bin/ops2c if use examples; then insinto "/usr/share/doc/${PF}/examples" - doins -r examples/* || die + doins -r examples/* fi if use doc; then insinto "/usr/share/doc/${PF}/editor" - doins -r editor || die + doins -r editor cd docs/html dohtml -r developer.html DONORS.pod.html index.html ops.html parrotbug.html pdds.html \ pmc.html tools.html docs src tools || die diff --git a/dev-lang/pcc/pcc-1.1.0-r1.ebuild b/dev-lang/pcc/pcc-1.1.0-r1.ebuild index ec8b8967851e..e360baaad232 100644 --- a/dev-lang/pcc/pcc-1.1.0-r1.ebuild +++ b/dev-lang/pcc/pcc-1.1.0-r1.ebuild @@ -29,9 +29,9 @@ src_configure() { } src_compile() { - emake || die "emake failed" + emake } src_install() { - emake DESTDIR="${D}" install || die "emake install failed" + emake DESTDIR="${D}" install } diff --git a/dev-lang/pcc/pcc-9999.ebuild b/dev-lang/pcc/pcc-9999.ebuild index d2a776ab5d72..df09ab6d97d7 100644 --- a/dev-lang/pcc/pcc-9999.ebuild +++ b/dev-lang/pcc/pcc-9999.ebuild @@ -36,9 +36,9 @@ src_configure() { } src_compile() { - emake || die "emake failed" + emake } src_install() { - emake DESTDIR="${D}" install || die "emake install failed" + emake DESTDIR="${D}" install } diff --git a/dev-lang/polyml/polyml-5.4.1.ebuild b/dev-lang/polyml/polyml-5.4.1.ebuild index 8909e4e033c2..022401f5434b 100644 --- a/dev-lang/polyml/polyml-5.4.1.ebuild +++ b/dev-lang/polyml/polyml-5.4.1.ebuild @@ -41,5 +41,5 @@ src_configure() { } src_test() { - emake tests || die "tests failed" + emake tests } diff --git a/dev-lang/polyml/polyml-5.5.0.ebuild b/dev-lang/polyml/polyml-5.5.0.ebuild index 5a8e3e560661..3cde23196400 100644 --- a/dev-lang/polyml/polyml-5.5.0.ebuild +++ b/dev-lang/polyml/polyml-5.5.0.ebuild @@ -47,5 +47,5 @@ src_configure() { } src_test() { - emake tests || die "tests failed" + emake tests } diff --git a/dev-lang/polyml/polyml-5.5.1.ebuild b/dev-lang/polyml/polyml-5.5.1.ebuild index 6b1bcd7ecab0..0ceb98cb5d9c 100644 --- a/dev-lang/polyml/polyml-5.5.1.ebuild +++ b/dev-lang/polyml/polyml-5.5.1.ebuild @@ -68,5 +68,5 @@ src_compile() { } src_test() { - emake tests || die "tests failed" + emake tests } diff --git a/dev-lang/polyml/polyml-5.5.2.ebuild b/dev-lang/polyml/polyml-5.5.2.ebuild index a04a5c764f77..0cb11d7b3447 100644 --- a/dev-lang/polyml/polyml-5.5.2.ebuild +++ b/dev-lang/polyml/polyml-5.5.2.ebuild @@ -68,5 +68,5 @@ src_compile() { } src_test() { - emake tests || die "tests failed" + emake tests } diff --git a/dev-lang/polyml/polyml-5.6.ebuild b/dev-lang/polyml/polyml-5.6.ebuild index 37fc5a07d0fe..6f30939f7d53 100644 --- a/dev-lang/polyml/polyml-5.6.ebuild +++ b/dev-lang/polyml/polyml-5.6.ebuild @@ -55,5 +55,5 @@ src_compile() { } src_test() { - emake tests || die "tests failed" + emake tests } diff --git a/dev-lang/polyml/polyml-5.8.ebuild b/dev-lang/polyml/polyml-5.8.ebuild index 82e42d8d208d..37dc19e4e1db 100644 --- a/dev-lang/polyml/polyml-5.8.ebuild +++ b/dev-lang/polyml/polyml-5.8.ebuild @@ -55,5 +55,5 @@ src_compile() { } src_test() { - emake tests || die "tests failed" + emake tests } diff --git a/dev-lang/ruby/ruby-2.4.9.ebuild b/dev-lang/ruby/ruby-2.4.9.ebuild index 855960b6f5cf..8f8e27dd860f 100644 --- a/dev-lang/ruby/ruby-2.4.9.ebuild +++ b/dev-lang/ruby/ruby-2.4.9.ebuild @@ -143,16 +143,15 @@ src_configure() { $(use_with static-libs static-linked-ext) \ $(use_enable debug) \ ${myconf} \ - --enable-option-checking=no \ - || die "econf failed" + --enable-option-checking=no } src_compile() { - emake V=1 EXTLDFLAGS="${LDFLAGS}" || die "emake failed" + emake V=1 EXTLDFLAGS="${LDFLAGS}" } src_test() { - emake -j1 V=1 test || die "make test failed" + emake -j1 V=1 test elog "Ruby's make test has been run. Ruby also ships with a make check" elog "that cannot be run until after ruby has been installed." @@ -187,7 +186,7 @@ src_install() { done export LD_LIBRARY_PATH RUBYLIB - emake V=1 DESTDIR="${D}" install || die "make install failed" + emake V=1 DESTDIR="${D}" install # Remove installed rubygems and rdoc copy rm -rf "${ED}/usr/$(get_libdir)/ruby/${RUBYVERSION}/rubygems" || die "rm rubygems failed" @@ -204,7 +203,7 @@ src_install() { doins -r sample fi - dodoc ChangeLog NEWS doc/NEWS* README* || die + dodoc ChangeLog NEWS doc/NEWS* README* if use rubytests; then pushd test diff --git a/dev-lang/ruby/ruby-2.5.7.ebuild b/dev-lang/ruby/ruby-2.5.7.ebuild index e63ff54b17b1..992d04bc501d 100644 --- a/dev-lang/ruby/ruby-2.5.7.ebuild +++ b/dev-lang/ruby/ruby-2.5.7.ebuild @@ -138,16 +138,15 @@ src_configure() { $(use_with static-libs static-linked-ext) \ $(use_enable debug) \ ${myconf} \ - --enable-option-checking=no \ - || die "econf failed" + --enable-option-checking=no } src_compile() { - emake V=1 EXTLDFLAGS="${LDFLAGS}" || die "emake failed" + emake V=1 EXTLDFLAGS="${LDFLAGS}" } src_test() { - emake -j1 V=1 test || die "make test failed" + emake -j1 V=1 test elog "Ruby's make test has been run. Ruby also ships with a make check" elog "that cannot be run until after ruby has been installed." @@ -182,7 +181,7 @@ src_install() { done export LD_LIBRARY_PATH RUBYLIB - emake V=1 DESTDIR="${D}" install || die "make install failed" + emake V=1 DESTDIR="${D}" install # Remove installed rubygems and rdoc copy rm -rf "${ED}/usr/$(get_libdir)/ruby/${RUBYVERSION}/rubygems" || die "rm rubygems failed" @@ -199,7 +198,7 @@ src_install() { doins -r sample fi - dodoc ChangeLog NEWS doc/NEWS* README* || die + dodoc ChangeLog NEWS doc/NEWS* README* if use rubytests; then pushd test diff --git a/dev-lang/ruby/ruby-2.6.5.ebuild b/dev-lang/ruby/ruby-2.6.5.ebuild index 57bd24dcd4f5..563576964c50 100644 --- a/dev-lang/ruby/ruby-2.6.5.ebuild +++ b/dev-lang/ruby/ruby-2.6.5.ebuild @@ -142,19 +142,18 @@ src_configure() { $(use_with static-libs static-linked-ext) \ $(use_enable debug) \ ${myconf} \ - --enable-option-checking=no \ - || die "econf failed" + --enable-option-checking=no # Makefile is broken because it lacks -ldl rm -rf ext/-test-/popen_deadlock || die } src_compile() { - emake V=1 EXTLDFLAGS="${LDFLAGS}" MJIT_CFLAGS="${CFLAGS}" MJIT_OPTFLAGS="" MJIT_DEBUGFLAGS="" || die "emake failed" + emake V=1 EXTLDFLAGS="${LDFLAGS}" MJIT_CFLAGS="${CFLAGS}" MJIT_OPTFLAGS="" MJIT_DEBUGFLAGS="" } src_test() { - emake -j1 V=1 test || die "make test failed" + emake -j1 V=1 test elog "Ruby's make test has been run. Ruby also ships with a make check" elog "that cannot be run until after ruby has been installed." @@ -194,7 +193,7 @@ src_install() { local gem_home="${EPREFIX}/usr/$(get_libdir)/ruby/gems/${RUBYVERSION}" mkdir -p "${D}/${gem_home}" || die "mkdir gem home failed" - emake V=1 DESTDIR="${D}" GEM_DESTDIR=${gem_home} install || die "make install failed" + emake V=1 DESTDIR="${D}" GEM_DESTDIR=${gem_home} install # Remove installed rubygems and rdoc copy rm -rf "${ED}/usr/$(get_libdir)/ruby/${RUBYVERSION}/rubygems" || die "rm rubygems failed" @@ -203,7 +202,7 @@ src_install() { rm -rf "${ED}/usr/bin/"{bundle,bundler,ri,rdoc}"${MY_SUFFIX}" || die "rm rdoc bins failed" if use doc; then - emake DESTDIR="${D}" GEM_DESTDIR=${gem_home} install-doc || die "make install-doc failed" + emake DESTDIR="${D}" GEM_DESTDIR=${gem_home} install-doc fi if use examples; then @@ -211,7 +210,7 @@ src_install() { doins -r sample fi - dodoc ChangeLog NEWS doc/NEWS* README* || die + dodoc ChangeLog NEWS doc/NEWS* README* if use rubytests; then pushd test diff --git a/dev-lang/smlnj/smlnj-110.75.ebuild b/dev-lang/smlnj/smlnj-110.75.ebuild index 5a4ca406ed7a..9c8f42af0b28 100644 --- a/dev-lang/smlnj/smlnj-110.75.ebuild +++ b/dev-lang/smlnj/smlnj-110.75.ebuild @@ -98,11 +98,11 @@ src_install() { mv bin lib "${D}"/${DIR} || die # for file in "${D}"/${DIR}/bin/*; do -# dosym /${DIR}/bin/$(basename "${file}") /usr/bin/$(basename "${file}") || die +# dosym /${DIR}/bin/$(basename "${file}") /usr/bin/$(basename "${file}") # done # for file in $(find "${D}"/usr/lib/${PN}/bin/ -maxdepth 1 -type f ! -name ".*"); do -# dosym /${DIR}/bin/$(basename "${file}") /usr/bin/$(basename "${file}") || die +# dosym /${DIR}/bin/$(basename "${file}") /usr/bin/$(basename "${file}") # done for file in "${D}"/usr/bin/{*,.*}; do diff --git a/dev-lang/whitespace/whitespace-0.3.ebuild b/dev-lang/whitespace/whitespace-0.3.ebuild index a3d12e7590f6..92b1bb97583b 100644 --- a/dev-lang/whitespace/whitespace-0.3.ebuild +++ b/dev-lang/whitespace/whitespace-0.3.ebuild @@ -28,6 +28,6 @@ src_prepare() { src_install() { cabal_src_install - dohtml docs/tutorial.html || die "dohtml failed" - use examples && { dodoc -r examples || die "dodoc failed"; } + dohtml docs/tutorial.html + use examples && dodoc -r examples } diff --git a/dev-lang/xsb/xsb-3.6.0.ebuild b/dev-lang/xsb/xsb-3.6.0.ebuild index f0ea2805b12f..033bb06053d6 100644 --- a/dev-lang/xsb/xsb-3.6.0.ebuild +++ b/dev-lang/xsb/xsb-3.6.0.ebuild @@ -81,120 +81,120 @@ src_configure() { src_compile() { cd "${S}"/build - emake || die "emake failed" + emake # All XSB Packages are compiled using a single Prolog engine. # Consequently they must all be compiled using a single make job. cd "${S}"/packages rm -f *.xwam - emake -j1 || die "emake packages failed" + emake -j1 if use curl ; then - emake -j1 curl || die "emake curl package failed" - emake -j1 sgml || die "emake sgml package failed" + emake -j1 curl + emake -j1 sgml if use xml ; then - emake -j1 xpath || die "emake xpath package failed" + emake -j1 xpath fi fi if use mysql ; then - emake -j1 mysql || die "emake mysql package failed" + emake -j1 mysql fi if use odbc ; then - emake -j1 odbc || die "emake odbc package failed" + emake -j1 odbc fi if use pcre ; then - emake -j1 pcre || die "emake pcre package failed" + emake -j1 pcre fi } src_install() { cd "${S}"/build - emake DESTDIR="${D}" install || die "make install failed" + emake DESTDIR="${D}" install local XSB_INSTALL_DIR=/usr/$(get_libdir)/xsb-${PV} - dosym ${XSB_INSTALL_DIR}/bin/xsb /usr/bin/xsb || die + dosym ${XSB_INSTALL_DIR}/bin/xsb /usr/bin/xsb cd "${S}"/packages local PACKAGES=${XSB_INSTALL_DIR}/packages insinto ${PACKAGES} - doins *.xwam || die + doins *.xwam insinto ${PACKAGES}/chr - doins chr/*.xwam || die + doins chr/*.xwam insinto ${PACKAGES}/clpqr - doins clpqr/*.xwam || die + doins clpqr/*.xwam insinto ${PACKAGES}/gap - doins gap/*.xwam || die + doins gap/*.xwam insinto ${PACKAGES}/justify - doins justify/*.xwam || die - doins justify/*.H || die + doins justify/*.xwam + doins justify/*.H insinto ${PACKAGES}/regmatch - doins regmatch/*.xwam || die + doins regmatch/*.xwam insinto ${PACKAGES}/regmatch/cc - doins regmatch/cc/*.H || die + doins regmatch/cc/*.H insinto ${PACKAGES}/slx - doins slx/*.xwam || die + doins slx/*.xwam insinto ${PACKAGES}/wildmatch - doins wildmatch/*.xwam || die + doins wildmatch/*.xwam insinto ${PACKAGES}/wildmatch/cc - doins wildmatch/cc/*.H || die + doins wildmatch/cc/*.H if use curl ; then insinto ${PACKAGES}/curl - doins curl/*.xwam || die + doins curl/*.xwam insinto ${PACKAGES}/curl/cc - doins curl/cc/*.H || die + doins curl/cc/*.H insinto ${PACKAGES}/sgml - doins sgml/*.xwam || die + doins sgml/*.xwam insinto ${PACKAGES}/sgml/cc - doins sgml/cc/*.H || die + doins sgml/cc/*.H insinto ${PACKAGES}/sgml/cc/dtd - doins sgml/cc/dtd/* || die + doins sgml/cc/dtd/* if use xml ; then insinto ${PACKAGES}/xpath - doins xpath/*xwam || die + doins xpath/*xwam insinto ${PACKAGES}/xpath/cc - doins xpath/cc/*.H || die + doins xpath/cc/*.H fi fi if use mysql || use odbc ; then insinto ${PACKAGES}/dbdrivers - doins dbdrivers/*.xwam || die - doins dbdrivers/*.H || die + doins dbdrivers/*.xwam + doins dbdrivers/*.H insinto ${PACKAGES}/dbdrivers/cc - doins dbdrivers/cc/*.H || die + doins dbdrivers/cc/*.H if use mysql ; then insinto ${PACKAGES}/dbdrivers/mysql - doins dbdrivers/mysql/*.xwam || die + doins dbdrivers/mysql/*.xwam insinto ${PACKAGES}/dbdrivers/mysql/cc - doins dbdrivers/mysql/cc/*.H || die + doins dbdrivers/mysql/cc/*.H fi if use odbc ; then insinto ${PACKAGES}/dbdrivers/odbc - doins dbdrivers/odbc/*.xwam || die + doins dbdrivers/odbc/*.xwam insinto ${PACKAGES}/dbdrivers/odbc/cc - doins dbdrivers/odbc/cc/*.H || die + doins dbdrivers/odbc/cc/*.H fi fi if use pcre ; then insinto ${PACKAGES}/pcre - doins pcre/*.xwam || die + doins pcre/*.xwam insinto ${PACKAGES}/pcre/cc - doins pcre/cc/*.H || die + doins pcre/cc/*.H fi cd "${S}" - dodoc FAQ README || die + dodoc FAQ README } diff --git a/dev-libs/389-adminutil/389-adminutil-1.1.15.ebuild b/dev-libs/389-adminutil/389-adminutil-1.1.15.ebuild index 1339f84e150c..9920bcb5065a 100644 --- a/dev-libs/389-adminutil/389-adminutil-1.1.15.ebuild +++ b/dev-libs/389-adminutil/389-adminutil-1.1.15.ebuild @@ -37,10 +37,10 @@ src_configure() { --with-fhs \ --with-openldap \ --disable-rpath \ - --disable-tests ||die "econf failed" + --disable-tests } src_install () { - emake DESTDIR="${D}" install || die "emake failed" + emake DESTDIR="${D}" install dodoc README NEWS } diff --git a/dev-libs/OpenSRF/OpenSRF-2.1.1.ebuild b/dev-libs/OpenSRF/OpenSRF-2.1.1.ebuild index 7080fd53a102..ed235d5aab1e 100644 --- a/dev-libs/OpenSRF/OpenSRF-2.1.1.ebuild +++ b/dev-libs/OpenSRF/OpenSRF-2.1.1.ebuild @@ -73,15 +73,15 @@ src_prepare() { # -e "/^export APR_HEADERS=/s,/.*,${APR_HEADERS}," \ # -e "/^export LIBXML2_HEADERS=/s,/.*,${LIBXML2_HEADERS}," \ # install.conf -# emake verbose || die "Failed to build" +# emake verbose #} src_configure() { APXS2_INSTALL="-i" \ econf \ --with-apxs=/usr/sbin/apxs2 \ --sysconfdir=/etc/opensrf \ - --localstatedir=/var \ - || die "econf failed" + --localstatedir=/var + cd "${PERL_S}" && S="${PERL_S}" perl-module_src_configure || die "perl-module_src_configure failed" } @@ -92,7 +92,7 @@ src_compile() { src_install() { einfo "Doing src_install" - #emake install-verbose DESTDIR="${D}" || die "Failed to install" + #emake install-verbose DESTDIR="${D}" emake install DESTDIR="${D}" APXS2_INSTALL="-i" apache-module_src_install || die "apache-module_src_install failed" cd "${PERL_S}" && S="${PERL_S}" perl-module_src_install || die "perl-module_src_install failed" diff --git a/dev-libs/go-usb/go-usb-9999.ebuild b/dev-libs/go-usb/go-usb-9999.ebuild index e634c7ea3b82..7c84be80dbe4 100644 --- a/dev-libs/go-usb/go-usb-9999.ebuild +++ b/dev-libs/go-usb/go-usb-9999.ebuild @@ -24,7 +24,7 @@ GO_PN="/usr/lib/go/src/github.com/hanwen/usb" src_install() { insinto "${GO_PN}" - doins *.go LICENSE || die "Install failed" + doins *.go LICENSE } src_test() { diff --git a/dev-libs/klibc/klibc-2.0.4-r3.ebuild b/dev-libs/klibc/klibc-2.0.4-r3.ebuild index 0ce5d3b94957..15cd0619685d 100644 --- a/dev-libs/klibc/klibc-2.0.4-r3.ebuild +++ b/dev-libs/klibc/klibc-2.0.4-r3.ebuild @@ -155,7 +155,7 @@ src_compile() { unset KBUILD_OUTPUT # we are using a private copy cd "${KS}" - emake ${defconfig} CC="${CC}" HOSTCC="${HOSTCC}" ARCH="${KLIBCASMARCH}" || die "No defconfig" + emake ${defconfig} CC="${CC}" HOSTCC="${HOSTCC}" ARCH="${KLIBCASMARCH}" if [[ "${KLIBCARCH/arm}" != "${KLIBCARCH}" ]] && \ [[ "${CHOST/eabi}" != "${CHOST}" ]]; then # The delete and insert are seperate statements @@ -169,7 +169,7 @@ src_compile() { "${KS}"/.config \ "${S}"/defconfig fi - emake prepare CC="${CC}" HOSTCC="${HOSTCC}" ARCH="${KLIBCASMARCH}" || die "Failed to prepare kernel sources for header usage" + emake prepare CC="${CC}" HOSTCC="${HOSTCC}" ARCH="${KLIBCASMARCH}" cd "${S}" @@ -196,7 +196,7 @@ src_compile() { $(use custom-cflags || echo SKIP_)HOSTCFLAGS="${CFLAGS}" \ $(use custom-cflags || echo SKIP_)HOSTLDFLAGS="${LDFLAGS}" \ $(use custom-cflags || echo SKIP_)KLIBCOPTFLAGS="${CFLAGS}" \ - ${myargs} || die "Compile failed!" + ${myargs} #SHLIBDIR="/${libdir}" \ @@ -248,7 +248,7 @@ src_install() { $(use custom-cflags || echo SKIP_)HOSTLDFLAGS="${LDFLAGS}" \ $(use custom-cflags || echo SKIP_)KLIBCOPTFLAGS="${CFLAGS}" \ ${myargs} \ - install || die "Install failed!" + install #SHLIBDIR="/${libdir}" \ diff --git a/dev-libs/libcgroup/libcgroup-0.41-r5.ebuild b/dev-libs/libcgroup/libcgroup-0.41-r5.ebuild index 153dd574401d..b8847f2fdc27 100644 --- a/dev-libs/libcgroup/libcgroup-0.41-r5.ebuild +++ b/dev-libs/libcgroup/libcgroup-0.41-r5.ebuild @@ -88,15 +88,15 @@ src_install() { prune_libtool_files --all insinto /etc/cgroup - doins samples/*.conf || die + doins samples/*.conf if use tools; then - newconfd "${FILESDIR}"/cgconfig.confd-r1 cgconfig || die - newinitd "${FILESDIR}"/cgconfig.initd-r1 cgconfig || die + newconfd "${FILESDIR}"/cgconfig.confd-r1 cgconfig + newinitd "${FILESDIR}"/cgconfig.initd-r1 cgconfig fi if use daemon; then - newconfd "${FILESDIR}"/cgred.confd-r2 cgred || die - newinitd "${FILESDIR}"/cgred.initd-r1 cgred || die + newconfd "${FILESDIR}"/cgred.confd-r2 cgred + newinitd "${FILESDIR}"/cgred.initd-r1 cgred fi } diff --git a/dev-libs/libelf/libelf-0.8.13-r2.ebuild b/dev-libs/libelf/libelf-0.8.13-r2.ebuild index 20f15d7e1782..9cb4e75ff9d0 100644 --- a/dev-libs/libelf/libelf-0.8.13-r2.ebuild +++ b/dev-libs/libelf/libelf-0.8.13-r2.ebuild @@ -44,7 +44,7 @@ multilib_src_install() { libdir="${ED}usr/$(get_libdir)" \ install \ install-compat \ - -j1 || die + -j1 # Stop libelf from stamping on the system nlist.h use elibc_FreeBSD && rm "${ED}"/usr/include/nlist.h diff --git a/dev-libs/libmacaroons/libmacaroons-0.2.0-r1.ebuild b/dev-libs/libmacaroons/libmacaroons-0.2.0-r1.ebuild index 448465a2c6ea..2e904c76228f 100644 --- a/dev-libs/libmacaroons/libmacaroons-0.2.0-r1.ebuild +++ b/dev-libs/libmacaroons/libmacaroons-0.2.0-r1.ebuild @@ -36,5 +36,5 @@ src_configure() { } src_test() { - emake -j1 check || die + emake -j1 check } diff --git a/dev-libs/libmacaroons/libmacaroons-0.3.0.ebuild b/dev-libs/libmacaroons/libmacaroons-0.3.0.ebuild index 448465a2c6ea..2e904c76228f 100644 --- a/dev-libs/libmacaroons/libmacaroons-0.3.0.ebuild +++ b/dev-libs/libmacaroons/libmacaroons-0.3.0.ebuild @@ -36,5 +36,5 @@ src_configure() { } src_test() { - emake -j1 check || die + emake -j1 check } diff --git a/dev-libs/libmissing/libmissing-1.1.0.ebuild b/dev-libs/libmissing/libmissing-1.1.0.ebuild index b7099ebe7775..a60e94ec453f 100644 --- a/dev-libs/libmissing/libmissing-1.1.0.ebuild +++ b/dev-libs/libmissing/libmissing-1.1.0.ebuild @@ -135,7 +135,7 @@ src_configure() { # gnulib cannot be used a shared library, doing so results in stack # protector checks failing for reasons yet unknown to me - econf --disable-shared --enable-static || die + econf --disable-shared --enable-static } src_compile() { diff --git a/dev-libs/libnl/libnl-1.1.4-r1.ebuild b/dev-libs/libnl/libnl-1.1.4-r1.ebuild index 2b9928fc0566..39205ce0c9ca 100644 --- a/dev-libs/libnl/libnl-1.1.4-r1.ebuild +++ b/dev-libs/libnl/libnl-1.1.4-r1.ebuild @@ -42,7 +42,7 @@ src_compile() { if use doc ; then cd "${S}/doc" - emake gendoc || die + emake gendoc fi } diff --git a/dev-libs/libnl/libnl-1.1.4.ebuild b/dev-libs/libnl/libnl-1.1.4.ebuild index 686c171132d1..8fc958567840 100644 --- a/dev-libs/libnl/libnl-1.1.4.ebuild +++ b/dev-libs/libnl/libnl-1.1.4.ebuild @@ -39,7 +39,7 @@ src_compile() { if use doc ; then cd "${S}/doc" - emake gendoc || die + emake gendoc fi } diff --git a/dev-libs/libsigsegv/libsigsegv-2.11.ebuild b/dev-libs/libsigsegv/libsigsegv-2.11.ebuild index 5ab74d80c3a5..3acf972b408d 100644 --- a/dev-libs/libsigsegv/libsigsegv-2.11.ebuild +++ b/dev-libs/libsigsegv/libsigsegv-2.11.ebuild @@ -13,7 +13,7 @@ KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 ~s390 ~sh sparc x86 ~amd64- IUSE="" src_configure () { - econf --enable-shared || die "Configure phase failed" + econf --enable-shared } src_test () { @@ -22,10 +22,10 @@ src_test () { ewarn "Skipped tests. Please disable sandbox to run tests." return 0 fi - emake check || die "Tests failed" + emake check } src_install() { - emake DESTDIR="${D}" install || die "emake install failed" + emake DESTDIR="${D}" install dodoc AUTHORS ChangeLog* NEWS PORTING README } diff --git a/dev-libs/libxml2/libxml2-2.9.9-r2.ebuild b/dev-libs/libxml2/libxml2-2.9.9-r2.ebuild index 24baa153a846..4181f92e6dae 100644 --- a/dev-libs/libxml2/libxml2-2.9.9-r2.ebuild +++ b/dev-libs/libxml2/libxml2-2.9.9-r2.ebuild @@ -158,7 +158,7 @@ multilib_src_compile() { multilib_src_test() { ln -s "${S}"/xmlconf || die - emake check || die "tests failed" + emake check multilib_is_native_abi && use python && python_foreach_impl libxml2_py_emake test } diff --git a/dev-libs/mpfr/mpfr-3.1.3_p4.ebuild b/dev-libs/mpfr/mpfr-3.1.3_p4.ebuild index 4c65b8c578d1..6784eb0171f7 100644 --- a/dev-libs/mpfr/mpfr-3.1.3_p4.ebuild +++ b/dev-libs/mpfr/mpfr-3.1.3_p4.ebuild @@ -49,7 +49,8 @@ multilib_src_install_all() { # clean up html/license install pushd "${ED}"/usr/share/doc/${PF} >/dev/null - dohtml *.html && rm COPYING* *.html || die + dohtml *.html + rm COPYING* *.html || die popd >/dev/null } diff --git a/dev-libs/mpfr/mpfr-3.1.4.ebuild b/dev-libs/mpfr/mpfr-3.1.4.ebuild index a832b4410b00..6067024dc290 100644 --- a/dev-libs/mpfr/mpfr-3.1.4.ebuild +++ b/dev-libs/mpfr/mpfr-3.1.4.ebuild @@ -50,6 +50,7 @@ multilib_src_install_all() { # clean up html/license install pushd "${ED}"/usr/share/doc/${PF} >/dev/null - dohtml *.html && rm COPYING* *.html || die + dohtml *.html + rm COPYING* *.html || die popd >/dev/null } diff --git a/dev-libs/mps/mps-1.111.0.ebuild b/dev-libs/mps/mps-1.111.0.ebuild index 1bd9a1f18277..685b7aef5c9e 100644 --- a/dev-libs/mps/mps-1.111.0.ebuild +++ b/dev-libs/mps/mps-1.111.0.ebuild @@ -27,5 +27,5 @@ src_prepare() { } src_install() { - emake DESTDIR="${D}" install || die + emake DESTDIR="${D}" install } diff --git a/dev-libs/mps/mps-1.114.0.ebuild b/dev-libs/mps/mps-1.114.0.ebuild index 7adf0b24abc9..767c250c487b 100644 --- a/dev-libs/mps/mps-1.114.0.ebuild +++ b/dev-libs/mps/mps-1.114.0.ebuild @@ -27,5 +27,5 @@ src_prepare() { } src_install() { - emake DESTDIR="${D}" install || die + emake DESTDIR="${D}" install } diff --git a/dev-libs/pcc-libs/pcc-libs-1.1.0.ebuild b/dev-libs/pcc-libs/pcc-libs-1.1.0.ebuild index a045911ed6cf..1c1352594b89 100644 --- a/dev-libs/pcc-libs/pcc-libs-1.1.0.ebuild +++ b/dev-libs/pcc-libs/pcc-libs-1.1.0.ebuild @@ -20,9 +20,9 @@ S=${WORKDIR}/${PN}-${PVR/*_pre/}/ src_compile() { # not parallel-safe yet - emake -j1 || die "emake failed" + emake -j1 } src_install() { - emake DESTDIR="${D}" install || die "emake install failed" + emake DESTDIR="${D}" install } diff --git a/dev-libs/pcc-libs/pcc-libs-9999.ebuild b/dev-libs/pcc-libs/pcc-libs-9999.ebuild index ce43fb4adbd4..d15e96041f3d 100644 --- a/dev-libs/pcc-libs/pcc-libs-9999.ebuild +++ b/dev-libs/pcc-libs/pcc-libs-9999.ebuild @@ -27,9 +27,9 @@ RDEPEND="${DEPEND}" src_compile() { # not parallel-safe yet - emake -j1 || die "emake failed" + emake -j1 } src_install() { - emake DESTDIR="${D}" install || die "emake install failed" + emake DESTDIR="${D}" install } diff --git a/dev-libs/snowball-stemmer/snowball-stemmer-0.20140325.ebuild b/dev-libs/snowball-stemmer/snowball-stemmer-0.20140325.ebuild index 4eb1aa6c4305..644a3a6f436d 100644 --- a/dev-libs/snowball-stemmer/snowball-stemmer-0.20140325.ebuild +++ b/dev-libs/snowball-stemmer/snowball-stemmer-0.20140325.ebuild @@ -30,10 +30,10 @@ src_prepare() { } src_compile() { - CC=$(tc-getCC) emake libstemmer.so stemwords || die "Make failed!" + CC=$(tc-getCC) emake libstemmer.so stemwords if use static-libs; then - CC=$(tc-getCC) AR=$(tc-getAR) emake libstemmer.a || die "Make failed!" + CC=$(tc-getCC) AR=$(tc-getAR) emake libstemmer.a fi } diff --git a/dev-libs/svrcore/svrcore-4.0.4-r1.ebuild b/dev-libs/svrcore/svrcore-4.0.4-r1.ebuild index b88e4a800e90..86751402c273 100644 --- a/dev-libs/svrcore/svrcore-4.0.4-r1.ebuild +++ b/dev-libs/svrcore/svrcore-4.0.4-r1.ebuild @@ -25,7 +25,7 @@ src_prepare() { } src_configure() { - econf --with-pic || die "cannot configure" + econf --with-pic } src_install () { diff --git a/dev-libs/tntnet/tntnet-2.2.1-r1.ebuild b/dev-libs/tntnet/tntnet-2.2.1-r1.ebuild index cc25ab03fdfb..0b0c372cdd83 100644 --- a/dev-libs/tntnet/tntnet-2.2.1-r1.ebuild +++ b/dev-libs/tntnet/tntnet-2.2.1-r1.ebuild @@ -66,11 +66,11 @@ src_configure() { } src_install() { - emake DESTDIR="${D}" install || die + emake DESTDIR="${D}" install dodoc AUTHORS ChangeLog README TODO if use doc; then - dodoc doc/*.pdf || die + dodoc doc/*.pdf fi if use examples; then @@ -80,7 +80,7 @@ src_install() { cd "${S}" insinto /usr/share/doc/${PF}/examples - doins -r sdk/demos/* || die + doins -r sdk/demos/* fi if use server; then diff --git a/dev-libs/tntnet/tntnet-2.2.1.ebuild b/dev-libs/tntnet/tntnet-2.2.1.ebuild index bd46d16526d7..63a7484d2e88 100644 --- a/dev-libs/tntnet/tntnet-2.2.1.ebuild +++ b/dev-libs/tntnet/tntnet-2.2.1.ebuild @@ -63,11 +63,11 @@ src_configure() { } src_install() { - emake DESTDIR="${D}" install || die + emake DESTDIR="${D}" install dodoc AUTHORS ChangeLog README TODO if use doc; then - dodoc doc/*.pdf || die + dodoc doc/*.pdf fi if use examples; then @@ -77,7 +77,7 @@ src_install() { cd "${S}" insinto /usr/share/doc/${PF}/examples - doins -r sdk/demos/* || die + doins -r sdk/demos/* fi if use server; then diff --git a/dev-libs/yaz/yaz-3.0.53.ebuild b/dev-libs/yaz/yaz-3.0.53.ebuild index 66af93b48754..028369d37be8 100644 --- a/dev-libs/yaz/yaz-3.0.53.ebuild +++ b/dev-libs/yaz/yaz-3.0.53.ebuild @@ -40,12 +40,12 @@ src_configure() { } src_compile() { - emake || die "emake failed" + emake } src_install() { local docdir="/usr/share/doc/${PF}" - emake DESTDIR="${D}" docdir="${docdir}" install || die "install failed" + emake DESTDIR="${D}" docdir="${docdir}" install dodir ${docdir}/html mv -f "${D}"/${docdir}/*.{html,png} "${D}"/${docdir}/html/ || die "Failed to move HTML docs" diff --git a/dev-libs/zlog/zlog-1.2.12-r1.ebuild b/dev-libs/zlog/zlog-1.2.12-r1.ebuild index 234c16b0954e..d49daa11b495 100644 --- a/dev-libs/zlog/zlog-1.2.12-r1.ebuild +++ b/dev-libs/zlog/zlog-1.2.12-r1.ebuild @@ -25,7 +25,7 @@ src_compile() { } src_test () { - emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}" test || die "Tests failed." + emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}" test } src_install() { diff --git a/dev-libs/zlog/zlog-1.2.12.ebuild b/dev-libs/zlog/zlog-1.2.12.ebuild index 010e98c10de7..ca74561e511e 100644 --- a/dev-libs/zlog/zlog-1.2.12.ebuild +++ b/dev-libs/zlog/zlog-1.2.12.ebuild @@ -24,7 +24,7 @@ src_prepare() { } src_test () { - emake test || die "Tests failed." + emake test } src_install() { diff --git a/dev-lisp/abcl/abcl-1.5.0.ebuild b/dev-lisp/abcl/abcl-1.5.0.ebuild index 6cb5cefcfec9..e044eb611f12 100644 --- a/dev-lisp/abcl/abcl-1.5.0.ebuild +++ b/dev-lisp/abcl/abcl-1.5.0.ebuild @@ -30,5 +30,5 @@ src_compile() { src_install() { java-pkg_dojar dist/abcl.jar java-pkg_dolauncher ${PN} --java_args "-server -Xrs" --main org.armedbear.lisp.Main - dodoc README || die "Can't install README" + dodoc README } diff --git a/dev-lisp/cmucl/cmucl-21c.ebuild b/dev-lisp/cmucl/cmucl-21c.ebuild index 1970e290a1c6..0de64d060786 100644 --- a/dev-lisp/cmucl/cmucl-21c.ebuild +++ b/dev-lisp/cmucl/cmucl-21c.ebuild @@ -98,7 +98,7 @@ src_install() { > "${D}"/usr/$(get_libdir)/cmucl/site-init.lisp \ || die "Cannot fix site-init.lisp" insinto /etc/common-lisp - doins "${FILESDIR}"/cmuclrc || die "Failed to install cmuclrc" + doins "${FILESDIR}"/cmuclrc # Documentation dodoc doc/cmucl/README diff --git a/dev-lisp/ecls/ecls-16.1.3.ebuild b/dev-lisp/ecls/ecls-16.1.3.ebuild index d0b75dd9dd39..294b95487e82 100644 --- a/dev-lisp/ecls/ecls-16.1.3.ebuild +++ b/dev-lisp/ecls/ecls-16.1.3.ebuild @@ -81,11 +81,11 @@ src_compile() { fi #parallel make fails - emake -j1 || die "Compilation failed" + emake -j1 } src_install () { - emake DESTDIR="${D}" install || die "Installation failed" + emake DESTDIR="${D}" install dodoc README.md CHANGELOG dodoc "${FILESDIR}"/README.Gentoo diff --git a/dev-lua/lua-openssl/lua-openssl-0.7.7_p0-r1.ebuild b/dev-lua/lua-openssl/lua-openssl-0.7.7_p0-r1.ebuild index 2f9abd5424dd..2cb97de1988c 100644 --- a/dev-lua/lua-openssl/lua-openssl-0.7.7_p0-r1.ebuild +++ b/dev-lua/lua-openssl/lua-openssl-0.7.7_p0-r1.ebuild @@ -57,7 +57,7 @@ src_compile() { } src_test() { - emake CC="$(tc-getCC)" test || die "tests failed" + emake CC="$(tc-getCC)" test } src_install() { diff --git a/dev-lua/luaevent/luaevent-0.4.4.ebuild b/dev-lua/luaevent/luaevent-0.4.4.ebuild index 57fc5cf893f5..fc40540709ab 100644 --- a/dev-lua/luaevent/luaevent-0.4.4.ebuild +++ b/dev-lua/luaevent/luaevent-0.4.4.ebuild @@ -35,5 +35,5 @@ src_prepare() { } src_install() { - emake DESTDIR="${D}" install || die "Install failed" + emake DESTDIR="${D}" install } diff --git a/dev-lua/luaevent/luaevent-0.4.6.ebuild b/dev-lua/luaevent/luaevent-0.4.6.ebuild index 84700e9d48e4..e814d6b25c58 100644 --- a/dev-lua/luaevent/luaevent-0.4.6.ebuild +++ b/dev-lua/luaevent/luaevent-0.4.6.ebuild @@ -36,5 +36,5 @@ src_prepare() { } src_install() { - emake DESTDIR="${D}" install || die "Install failed" + emake DESTDIR="${D}" install } diff --git a/dev-lua/luafilesystem/luafilesystem-1.5.0.ebuild b/dev-lua/luafilesystem/luafilesystem-1.5.0.ebuild index 2b6daaa15806..657786056c85 100644 --- a/dev-lua/luafilesystem/luafilesystem-1.5.0.ebuild +++ b/dev-lua/luafilesystem/luafilesystem-1.5.0.ebuild @@ -27,7 +27,7 @@ src_prepare() { } src_install() { - emake PREFIX="${ED}usr" install || die - dodoc README || die - dohtml doc/us/* || die + emake PREFIX="${ED}usr" install + dodoc README + dohtml doc/us/* } diff --git a/dev-lua/luarocks/luarocks-2.2.0.ebuild b/dev-lua/luarocks/luarocks-2.2.0.ebuild index a64514f182e2..5a450c989c0d 100644 --- a/dev-lua/luarocks/luarocks-2.2.0.ebuild +++ b/dev-lua/luarocks/luarocks-2.2.0.ebuild @@ -39,12 +39,12 @@ src_configure() { src_compile() { # -j1 b/c make tries to delete files it has yet to create (bug #402005) - emake DESTDIR="${D}" -j1 || die "make failed" + emake DESTDIR="${D}" -j1 } src_install() { # -j1 b/c otherwise it fails to find src/bin/luarocks - emake DESTDIR="${D}" -j1 install || die "einstall" + emake DESTDIR="${D}" -j1 install } pkg_preinst() { diff --git a/dev-ml/dose3/dose3-5.0.1.ebuild b/dev-ml/dose3/dose3-5.0.1.ebuild index 3d2b19a0b099..161fafebbd3f 100644 --- a/dev-ml/dose3/dose3-5.0.1.ebuild +++ b/dev-ml/dose3/dose3-5.0.1.ebuild @@ -59,6 +59,6 @@ src_compile() { } src_install() { - emake DESTDIR="${D}" BINDIR="${ED}/usr/bin" install || die + emake DESTDIR="${D}" BINDIR="${ED}/usr/bin" install dodoc CHANGES CREDITS README.architecture TODO } diff --git a/dev-ml/ocaml-mysql/ocaml-mysql-1.2.1.ebuild b/dev-ml/ocaml-mysql/ocaml-mysql-1.2.1.ebuild index 061aa0eae84e..dda4373d060f 100644 --- a/dev-ml/ocaml-mysql/ocaml-mysql-1.2.1.ebuild +++ b/dev-ml/ocaml-mysql/ocaml-mysql-1.2.1.ebuild @@ -34,5 +34,5 @@ src_install() findlib_src_preinst emake install - dodoc CHANGES README VERSION || die + dodoc CHANGES README VERSION } diff --git a/dev-ml/ocsigen-i18n/ocsigen-i18n-3.1.0.ebuild b/dev-ml/ocsigen-i18n/ocsigen-i18n-3.1.0.ebuild index ab2fac7140f3..17aa48b18580 100644 --- a/dev-ml/ocsigen-i18n/ocsigen-i18n-3.1.0.ebuild +++ b/dev-ml/ocsigen-i18n/ocsigen-i18n-3.1.0.ebuild @@ -18,6 +18,6 @@ DEPEND="${RDEPEND} src_install() { dodir /usr/bin - emake bindir="${ED}/usr/bin" install || die + emake bindir="${ED}/usr/bin" install dodoc README.MD } diff --git a/dev-php/pecl-translit/pecl-translit-0.6.2-r2.ebuild b/dev-php/pecl-translit/pecl-translit-0.6.2-r2.ebuild index 82fd86110534..f97d236b0bc0 100644 --- a/dev-php/pecl-translit/pecl-translit-0.6.2-r2.ebuild +++ b/dev-php/pecl-translit/pecl-translit-0.6.2-r2.ebuild @@ -28,6 +28,6 @@ PHP_EXT_ECONF_ARGS=() src_test() { for slot in $(php_get_slots); do php_init_slot_env ${slot} - NO_INTERACTION="yes" emake test || die "emake test failed for slot ${slot}" + NO_INTERACTION="yes" emake test done } diff --git a/dev-php/pecl-translit/pecl-translit-0.6.3.ebuild b/dev-php/pecl-translit/pecl-translit-0.6.3.ebuild index 60031ae382c4..767d97480c0e 100644 --- a/dev-php/pecl-translit/pecl-translit-0.6.3.ebuild +++ b/dev-php/pecl-translit/pecl-translit-0.6.3.ebuild @@ -25,6 +25,6 @@ PHP_EXT_ECONF_ARGS=() src_test() { for slot in $(php_get_slots); do php_init_slot_env ${slot} - NO_INTERACTION="yes" emake test || die "emake test failed for slot ${slot}" + NO_INTERACTION="yes" emake test done } diff --git a/dev-php/suhosin/suhosin-0.9.38-r1.ebuild b/dev-php/suhosin/suhosin-0.9.38-r1.ebuild index 3372f3abe755..3f2162f1716d 100644 --- a/dev-php/suhosin/suhosin-0.9.38-r1.ebuild +++ b/dev-php/suhosin/suhosin-0.9.38-r1.ebuild @@ -51,6 +51,6 @@ src_test() { # away from there in src_compile for slot in `php_get_slots`; do php_init_slot_env ${slot} - NO_INTERACTION="yes" emake test || die "emake test failed for slot ${slot}" + NO_INTERACTION="yes" emake test done } diff --git a/dev-python/deform/deform-0.9.9.ebuild b/dev-python/deform/deform-0.9.9.ebuild index 9f5b59fc1fce..64f187924daf 100644 --- a/dev-python/deform/deform-0.9.9.ebuild +++ b/dev-python/deform/deform-0.9.9.ebuild @@ -36,5 +36,5 @@ src_install() { # the docs would not actually work offline). Install the # source, which is somewhat readable. docinto docs - dodoc docs/*.rst || die + dodoc docs/*.rst } diff --git a/dev-python/demjson/demjson-2.2.4.ebuild b/dev-python/demjson/demjson-2.2.4.ebuild index 4e3c6cc80948..45f254647785 100644 --- a/dev-python/demjson/demjson-2.2.4.ebuild +++ b/dev-python/demjson/demjson-2.2.4.ebuild @@ -30,6 +30,6 @@ python_install_all() { distutils-r1_python_install_all # Docs are .txt files if use doc; then - dodoc docs/*.txt || die "Installation of documentation failed" + dodoc docs/*.txt fi } diff --git a/dev-python/gst-python/gst-python-1.14.1-r1.ebuild b/dev-python/gst-python/gst-python-1.14.1-r1.ebuild index 569085071b25..e3f7b6251a8d 100644 --- a/dev-python/gst-python/gst-python-1.14.1-r1.ebuild +++ b/dev-python/gst-python/gst-python-1.14.1-r1.ebuild @@ -40,18 +40,18 @@ src_compile() { # Python plugin support is of limited use (GIL gets in the way). If it's ever requested or needed, it should be a # separate python-single-r1 media-plugins/gst-plugins-python package that only builds the plugin directory. compile_gst() { - emake -C common || die "emake common failed" - emake -C gi || die "emake gi failed" - emake -C testsuite || die "emake testsuite failed" + emake -C common + emake -C gi + emake -C testsuite } python_foreach_impl run_in_build_dir compile_gst } src_install() { install_gst() { - emake DESTDIR="${D}" install -C common || die "emake install common failed" - emake DESTDIR="${D}" install -C gi || die "emake install gi failed" - emake DESTDIR="${D}" install -C testsuite || die "emake install testsuite failed" + emake DESTDIR="${D}" install -C common + emake DESTDIR="${D}" install -C gi + emake DESTDIR="${D}" install -C testsuite } python_foreach_impl run_in_build_dir install_gst prune_libtool_files --modules @@ -60,7 +60,7 @@ src_install() { src_test() { test_gst() { - emake check -C testsuite || die "emake check failed" + emake check -C testsuite } python_foreach_impl run_in_build_dir default } diff --git a/dev-python/kombu/kombu-4.1.0-r1.ebuild b/dev-python/kombu/kombu-4.1.0-r1.ebuild index fd89b019d00b..62ce4473535f 100644 --- a/dev-python/kombu/kombu-4.1.0-r1.ebuild +++ b/dev-python/kombu/kombu-4.1.0-r1.ebuild @@ -61,7 +61,7 @@ python_prepare_all() { python_compile_all() { # Doc build misses and skips only content re librabbitmq which is not in portage if use doc; then - emake -C docs html || die "kombu docs failed installation" + emake -C docs html fi } diff --git a/dev-python/kombu/kombu-4.2.1.ebuild b/dev-python/kombu/kombu-4.2.1.ebuild index 1825bba9b97c..9a01b53918ed 100644 --- a/dev-python/kombu/kombu-4.2.1.ebuild +++ b/dev-python/kombu/kombu-4.2.1.ebuild @@ -61,7 +61,7 @@ python_prepare_all() { python_compile_all() { # Doc build misses and skips only content re librabbitmq which is not in portage if use doc; then - emake -C docs html || die "kombu docs failed installation" + emake -C docs html fi } diff --git a/dev-python/kombu/kombu-4.4.0.ebuild b/dev-python/kombu/kombu-4.4.0.ebuild index 02ecc18e0153..150bcb6f11c2 100644 --- a/dev-python/kombu/kombu-4.4.0.ebuild +++ b/dev-python/kombu/kombu-4.4.0.ebuild @@ -60,7 +60,7 @@ python_prepare_all() { python_compile_all() { # Doc build misses and skips only content re librabbitmq which is not in portage if use doc; then - emake -C docs html || die "kombu docs failed installation" + emake -C docs html fi } diff --git a/dev-python/kombu/kombu-4.6.3.ebuild b/dev-python/kombu/kombu-4.6.3.ebuild index 21fbbd1c8de1..76cd369ab368 100644 --- a/dev-python/kombu/kombu-4.6.3.ebuild +++ b/dev-python/kombu/kombu-4.6.3.ebuild @@ -60,7 +60,7 @@ python_prepare_all() { python_compile_all() { # Doc build misses and skips only content re librabbitmq which is not in portage if use doc; then - emake -C docs html || die "kombu docs failed installation" + emake -C docs html fi } diff --git a/dev-python/lockfile/lockfile-0.11.0-r1.ebuild b/dev-python/lockfile/lockfile-0.11.0-r1.ebuild index e018c9015d74..917b45b73559 100644 --- a/dev-python/lockfile/lockfile-0.11.0-r1.ebuild +++ b/dev-python/lockfile/lockfile-0.11.0-r1.ebuild @@ -34,7 +34,7 @@ python_prepare_all() { python_compile_all() { if use doc; then einfo "Generation of documentation" - emake -C doc/source html || die "Generation of documentation failed" + emake -C doc/source html fi } diff --git a/dev-python/natgrid/natgrid-0.2.1-r3.ebuild b/dev-python/natgrid/natgrid-0.2.1-r3.ebuild index 80b2f3f2d0aa..8da62ea3e277 100644 --- a/dev-python/natgrid/natgrid-0.2.1-r3.ebuild +++ b/dev-python/natgrid/natgrid-0.2.1-r3.ebuild @@ -21,7 +21,7 @@ RDEPEND="${DEPEND}" python_install_all() { insinto /usr/share/doc/${PF} - doins test.py || die "doins failed" + doins test.py distutils-r1_python_install_all } diff --git a/dev-python/plyr/plyr-1.0.6.ebuild b/dev-python/plyr/plyr-1.0.6.ebuild index 50781aa5e809..b4ad8f55d1d4 100644 --- a/dev-python/plyr/plyr-1.0.6.ebuild +++ b/dev-python/plyr/plyr-1.0.6.ebuild @@ -43,7 +43,7 @@ python_compile() { python_compile_all() { if use doc; then - emake -C docs html || die "Generating documentation failed" + emake -C docs html fi } diff --git a/dev-python/pyasn1-modules/pyasn1-modules-0.0.5-r1.ebuild b/dev-python/pyasn1-modules/pyasn1-modules-0.0.5-r1.ebuild index 82f177d6e636..4f5d068ba0ea 100644 --- a/dev-python/pyasn1-modules/pyasn1-modules-0.0.5-r1.ebuild +++ b/dev-python/pyasn1-modules/pyasn1-modules-0.0.5-r1.ebuild @@ -33,5 +33,5 @@ python_test() { python_install_all() { distutils-r1_python_install_all insinto /usr/share/doc/${PF}/tools - doins tools/* || die "doins failed" + doins tools/* } diff --git a/dev-python/pygobject/pygobject-3.28.3.ebuild b/dev-python/pygobject/pygobject-3.28.3.ebuild index 1c3a17815bd3..316b173782ab 100644 --- a/dev-python/pygobject/pygobject-3.28.3.ebuild +++ b/dev-python/pygobject/pygobject-3.28.3.ebuild @@ -88,7 +88,7 @@ src_test() { testing() { local -x XDG_CACHE_HOME="${T}/${EPYTHON}" - emake -C "${BUILD_DIR}" check || die "emake check failed" + emake -C "${BUILD_DIR}" check } virtx python_foreach_impl testing } diff --git a/dev-python/pyminuit/pyminuit-1.2.1-r1.ebuild b/dev-python/pyminuit/pyminuit-1.2.1-r1.ebuild index 5b91f0546d16..51eafea936d2 100644 --- a/dev-python/pyminuit/pyminuit-1.2.1-r1.ebuild +++ b/dev-python/pyminuit/pyminuit-1.2.1-r1.ebuild @@ -22,11 +22,14 @@ IUSE="" S="${WORKDIR}"/${PN} src_configure() { - cd "${WORKDIR}"/Minuit-1_7_9 && econf --disable-static || die + cd "${WORKDIR}"/Minuit-1_7_9 || die + econf --disable-static } + src_compile() { - cd "${WORKDIR}"/Minuit-1_7_9 && emake - cd "${S}" + cd "${WORKDIR}"/Minuit-1_7_9 || die + emake + cd "${S}" || die distutils-r1_src_compile } diff --git a/dev-python/python-backoff/python-backoff-1.6.0.ebuild b/dev-python/python-backoff/python-backoff-1.6.0.ebuild index a79914430125..18ceb6574358 100644 --- a/dev-python/python-backoff/python-backoff-1.6.0.ebuild +++ b/dev-python/python-backoff/python-backoff-1.6.0.ebuild @@ -21,5 +21,5 @@ S=${WORKDIR}/${MY_P} DOCS=( README.rst ) python_test() { - emake test || die "tests failed under ${EPYTHON}" + emake test } diff --git a/dev-python/python-ntpdshm/python-ntpdshm-0.2.1.ebuild b/dev-python/python-ntpdshm/python-ntpdshm-0.2.1.ebuild index 2018fe932467..6f3c061f3c0b 100644 --- a/dev-python/python-ntpdshm/python-ntpdshm-0.2.1.ebuild +++ b/dev-python/python-ntpdshm/python-ntpdshm-0.2.1.ebuild @@ -22,7 +22,7 @@ DEPEND="${RDEPEND} dev-lang/swig:0" src_prepare() { - emake swig || die + emake swig distutils-r1_src_prepare } diff --git a/dev-python/ropeide/ropeide-1.5.1-r2.ebuild b/dev-python/ropeide/ropeide-1.5.1-r2.ebuild index 691c560be705..36d9ec81b2d2 100644 --- a/dev-python/ropeide/ropeide-1.5.1-r2.ebuild +++ b/dev-python/ropeide/ropeide-1.5.1-r2.ebuild @@ -21,7 +21,7 @@ RDEPEND="${DEPEND}" python_install_all() { if use doc; then - dodoc docs/*.txt || die "dodoc failed" + dodoc docs/*.txt fi distutils-r1_python_install_all } diff --git a/dev-python/soya/soya-0.15_rc1-r1.ebuild b/dev-python/soya/soya-0.15_rc1-r1.ebuild index 37ff57f4f1fa..b65bea0bde73 100644 --- a/dev-python/soya/soya-0.15_rc1-r1.ebuild +++ b/dev-python/soya/soya-0.15_rc1-r1.ebuild @@ -54,10 +54,10 @@ src_install() { insinto /usr/share/${PF} if use doc; then cd "${WORKDIR}/${TUT_P}/doc" - doins soya_guide.pdf pudding/pudding.pdf || die "doins failed" + doins soya_guide.pdf pudding/pudding.pdf fi if use examples; then cd "${WORKDIR}/${TUT_P}" - doins -r tutorial || die "doins failed" + doins -r tutorial fi } diff --git a/dev-python/sqlalchemy-migrate/sqlalchemy-migrate-0.11.0-r1.ebuild b/dev-python/sqlalchemy-migrate/sqlalchemy-migrate-0.11.0-r1.ebuild index b10c9c978663..4687b6bc6238 100644 --- a/dev-python/sqlalchemy-migrate/sqlalchemy-migrate-0.11.0-r1.ebuild +++ b/dev-python/sqlalchemy-migrate/sqlalchemy-migrate-0.11.0-r1.ebuild @@ -33,7 +33,7 @@ python_compile_all() { if use doc; then einfo ""; einfo "The build seeks to import modules from an installed state of the package" einfo "simply ignore all warnings / errors of failure to import module migrate.<module>"; einfo "" - emake -C doc/source html || die "Generation of documentation failed" + emake -C doc/source html fi } diff --git a/dev-python/sqlalchemy-migrate/sqlalchemy-migrate-0.11.0.ebuild b/dev-python/sqlalchemy-migrate/sqlalchemy-migrate-0.11.0.ebuild index 7ff3ee775474..496cd9854974 100644 --- a/dev-python/sqlalchemy-migrate/sqlalchemy-migrate-0.11.0.ebuild +++ b/dev-python/sqlalchemy-migrate/sqlalchemy-migrate-0.11.0.ebuild @@ -39,7 +39,7 @@ python_compile_all() { if use doc; then einfo ""; einfo "The build seeks to import modules from an installed state of the package" einfo "simply ignore all warnings / errors of failure to import module migrate.<module>"; einfo "" - emake -C doc/source html || die "Generation of documentation failed" + emake -C doc/source html fi } diff --git a/dev-python/sqlalchemy-migrate/sqlalchemy-migrate-0.12.0.ebuild b/dev-python/sqlalchemy-migrate/sqlalchemy-migrate-0.12.0.ebuild index b45e9b97e52c..fc9c7059b29e 100644 --- a/dev-python/sqlalchemy-migrate/sqlalchemy-migrate-0.12.0.ebuild +++ b/dev-python/sqlalchemy-migrate/sqlalchemy-migrate-0.12.0.ebuild @@ -32,7 +32,7 @@ python_compile_all() { if use doc; then einfo ""; einfo "The build seeks to import modules from an installed state of the package" einfo "simply ignore all warnings / errors of failure to import module migrate.<module>"; einfo "" - emake -C doc/source html || die "Generation of documentation failed" + emake -C doc/source html fi } diff --git a/dev-python/uncompyle6/uncompyle6-2.10.1.ebuild b/dev-python/uncompyle6/uncompyle6-2.10.1.ebuild index b4ca9f67d466..b6efee3fc7bc 100644 --- a/dev-python/uncompyle6/uncompyle6-2.10.1.ebuild +++ b/dev-python/uncompyle6/uncompyle6-2.10.1.ebuild @@ -39,5 +39,5 @@ python_test() { distutils_install_for_testing PYTHONPATH="${S}/test:${BUILD_DIR}/lib" \ - emake check || die "Tests failed under ${EPYTHON}" + emake check } diff --git a/dev-python/webhelpers/webhelpers-1.3-r1.ebuild b/dev-python/webhelpers/webhelpers-1.3-r1.ebuild index 591aa7b96271..53ca061c7f9f 100644 --- a/dev-python/webhelpers/webhelpers-1.3-r1.ebuild +++ b/dev-python/webhelpers/webhelpers-1.3-r1.ebuild @@ -55,7 +55,7 @@ python_install_all() { pushd docs/_build/html > /dev/null docinto html insinto /usr/share/doc/${PF}/html - doins -r [a-z]* _static || die "Installation of documentation failed" + doins -r [a-z]* _static popd > /dev/null fi distutils-r1_python_install_all 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 } diff --git a/dev-scheme/elk/elk-3.99.8.ebuild b/dev-scheme/elk/elk-3.99.8.ebuild index cf741d71b8c2..991a0ed09213 100644 --- a/dev-scheme/elk/elk-3.99.8.ebuild +++ b/dev-scheme/elk/elk-3.99.8.ebuild @@ -16,7 +16,7 @@ DEPEND="" src_compile() { # parallel build is broken - emake -j1 || die "Make failed!" + emake -j1 } # tests are run automatically during make and fail with default src_test @@ -26,5 +26,5 @@ src_test() { src_install() { # parallel install is broken - emake -j1 DESTDIR="${D}" install || die "Install failed" + emake -j1 DESTDIR="${D}" install } diff --git a/dev-scheme/tinyscheme/tinyscheme-1.41.ebuild b/dev-scheme/tinyscheme/tinyscheme-1.41.ebuild index 4819bc573162..e8622924cdf0 100644 --- a/dev-scheme/tinyscheme/tinyscheme-1.41.ebuild +++ b/dev-scheme/tinyscheme/tinyscheme-1.41.ebuild @@ -45,7 +45,7 @@ src_install() { newlib.so ${tslib} ${tslibx} dosym ${tslibx} /usr/$(get_libdir)/${tslib} - dodoc Manual.txt || die "dodoc failed" + dodoc Manual.txt if use static-libs; then dolib.a libtinyscheme.a diff --git a/dev-tex/cjk-latex/cjk-latex-4.8.4.ebuild b/dev-tex/cjk-latex/cjk-latex-4.8.4.ebuild index df0a850f7e88..4393972bc9c6 100644 --- a/dev-tex/cjk-latex/cjk-latex-4.8.4.ebuild +++ b/dev-tex/cjk-latex/cjk-latex-4.8.4.ebuild @@ -60,11 +60,11 @@ src_compile() { cd utils for d in *conv; do cd $d - emake || die + emake cd - done cd hbf2gf - emake || die + emake cd - if use emacs ; then @@ -108,14 +108,14 @@ src_install() { for d in fonts/pk/modeless/*/* ; do insinto ${TEXMF}/${d} for f in "${T}"/${d##*/}*.pk ; do - newins $f `basename ${f/.pk/.500pk}` || die "newins failed" + newins $f `basename ${f/.pk/.500pk}` done done popd &>/dev/null insinto "${TEXMF}/tex/latex/${PN}" - doins -r texinput/* || die "installing texinput files failed" - doins -r contrib/wadalab || die "installing wadalab failed" + doins -r texinput/* + doins -r contrib/wadalab if use emacs ; then cd utils/lisp @@ -140,7 +140,7 @@ src_install() { use doc || rm -rf texmf/doc insinto ${TEXMF} - doins -r texmf/* || die "installing texmf failed" + doins -r texmf/* # Move fonts because hbf2gf expects them in MISCFONTS mv "${ED}/${TEXMF}/fonts/hbf" "${ED}/${TEXMF}/fonts/misc" || die "mv font failed" diff --git a/dev-tex/hevea/hevea-2.29.ebuild b/dev-tex/hevea/hevea-2.29.ebuild index 4eba8726f009..3f91c929d1aa 100644 --- a/dev-tex/hevea/hevea-2.29.ebuild +++ b/dev-tex/hevea/hevea-2.29.ebuild @@ -22,19 +22,19 @@ DEPEND="${DEPEND} dev-ml/ocamlbuild" src_compile() { rm -f config.sh - emake PREFIX=/usr DESTDIR="${D}" LIBDIR="/usr/$(get_libdir)/hevea" LATEXLIBDIR="/usr/share/texmf-site/tex/latex/hevea" config.sh || die "Failed to create config.sh" + emake PREFIX=/usr DESTDIR="${D}" LIBDIR="/usr/$(get_libdir)/hevea" LATEXLIBDIR="/usr/share/texmf-site/tex/latex/hevea" config.sh if use ocamlopt; then - emake PREFIX=/usr || die "Failed to build native code binaries" + emake PREFIX=/usr else - emake PREFIX=/usr TARGET=byte || die "Failed to build bytecode binaries" + emake PREFIX=/usr TARGET=byte fi } src_install() { if use ocamlopt; then - emake DESTDIR="${D}" PREFIX=/usr install || die "Install failed" + emake DESTDIR="${D}" PREFIX=/usr install else - emake DESTDIR="${D}" PREFIX=/usr TARGET=byte install || die "Install failed" + emake DESTDIR="${D}" PREFIX=/usr TARGET=byte install fi dodoc README CHANGES diff --git a/dev-tex/hevea/hevea-2.30.ebuild b/dev-tex/hevea/hevea-2.30.ebuild index a09af4ace2c4..c49589ed4c53 100644 --- a/dev-tex/hevea/hevea-2.30.ebuild +++ b/dev-tex/hevea/hevea-2.30.ebuild @@ -22,19 +22,19 @@ DEPEND="${DEPEND} dev-ml/ocamlbuild" src_compile() { rm -f config.sh - emake PREFIX=/usr DESTDIR="${D}" LIBDIR="/usr/$(get_libdir)/hevea" LATEXLIBDIR="/usr/share/texmf-site/tex/latex/hevea" config.sh || die "Failed to create config.sh" + emake PREFIX=/usr DESTDIR="${D}" LIBDIR="/usr/$(get_libdir)/hevea" LATEXLIBDIR="/usr/share/texmf-site/tex/latex/hevea" config.sh if use ocamlopt; then - emake PREFIX=/usr || die "Failed to build native code binaries" + emake PREFIX=/usr else - emake PREFIX=/usr TARGET=byte || die "Failed to build bytecode binaries" + emake PREFIX=/usr TARGET=byte fi } src_install() { if use ocamlopt; then - emake DESTDIR="${D}" PREFIX=/usr install || die "Install failed" + emake DESTDIR="${D}" PREFIX=/usr install else - emake DESTDIR="${D}" PREFIX=/usr TARGET=byte install || die "Install failed" + emake DESTDIR="${D}" PREFIX=/usr TARGET=byte install fi dodoc README CHANGES diff --git a/dev-tex/hevea/hevea-2.31.ebuild b/dev-tex/hevea/hevea-2.31.ebuild index a09af4ace2c4..c49589ed4c53 100644 --- a/dev-tex/hevea/hevea-2.31.ebuild +++ b/dev-tex/hevea/hevea-2.31.ebuild @@ -22,19 +22,19 @@ DEPEND="${DEPEND} dev-ml/ocamlbuild" src_compile() { rm -f config.sh - emake PREFIX=/usr DESTDIR="${D}" LIBDIR="/usr/$(get_libdir)/hevea" LATEXLIBDIR="/usr/share/texmf-site/tex/latex/hevea" config.sh || die "Failed to create config.sh" + emake PREFIX=/usr DESTDIR="${D}" LIBDIR="/usr/$(get_libdir)/hevea" LATEXLIBDIR="/usr/share/texmf-site/tex/latex/hevea" config.sh if use ocamlopt; then - emake PREFIX=/usr || die "Failed to build native code binaries" + emake PREFIX=/usr else - emake PREFIX=/usr TARGET=byte || die "Failed to build bytecode binaries" + emake PREFIX=/usr TARGET=byte fi } src_install() { if use ocamlopt; then - emake DESTDIR="${D}" PREFIX=/usr install || die "Install failed" + emake DESTDIR="${D}" PREFIX=/usr install else - emake DESTDIR="${D}" PREFIX=/usr TARGET=byte install || die "Install failed" + emake DESTDIR="${D}" PREFIX=/usr TARGET=byte install fi dodoc README CHANGES diff --git a/dev-tex/latex2rtf/latex2rtf-2.3.11.ebuild b/dev-tex/latex2rtf/latex2rtf-2.3.11.ebuild index 50537d6a876f..17ae8b6a4908 100644 --- a/dev-tex/latex2rtf/latex2rtf-2.3.11.ebuild +++ b/dev-tex/latex2rtf/latex2rtf-2.3.11.ebuild @@ -33,7 +33,7 @@ src_compile() { export VARTEXFONTS="${T}/fonts" tc-export CC # Set DESTDIR here too so that compiled-in paths are correct. - emake DESTDIR="${EPREFIX}/usr" || die "emake failed" + emake DESTDIR="${EPREFIX}/usr" cd "${S}/doc" emake realclean diff --git a/dev-tex/latex2rtf/latex2rtf-2.3.15.ebuild b/dev-tex/latex2rtf/latex2rtf-2.3.15.ebuild index 712cb73c6193..6bfab71d3f27 100644 --- a/dev-tex/latex2rtf/latex2rtf-2.3.15.ebuild +++ b/dev-tex/latex2rtf/latex2rtf-2.3.15.ebuild @@ -33,7 +33,7 @@ src_compile() { export VARTEXFONTS="${T}/fonts" tc-export CC # Set DESTDIR here too so that compiled-in paths are correct. - emake DESTDIR="${EPREFIX}/usr" || die "emake failed" + emake DESTDIR="${EPREFIX}/usr" # Needed for tests chmod +x test/bracecheck || die diff --git a/dev-tex/pscyr/pscyr-0.4d_beta9.ebuild b/dev-tex/pscyr/pscyr-0.4d_beta9.ebuild index f6011b526184..c680a9c179c1 100644 --- a/dev-tex/pscyr/pscyr-0.4d_beta9.ebuild +++ b/dev-tex/pscyr/pscyr-0.4d_beta9.ebuild @@ -29,11 +29,11 @@ src_install() { done cd "${S}" insinto "${TEXMF}/fonts/map/dvips/pscyr" - doins dvips/pscyr/pscyr.map || die "doins $i failed" + doins dvips/pscyr/pscyr.map for each in dvips/pscyr/*.enc; do insinto "${TEXMF}/fonts/enc/dvips/pscyr" - doins "$each" || die "doins $i failed" + doins "$each" done insinto /etc/texmf/updmap.d diff --git a/dev-util/amtterm/amtterm-1.6.ebuild b/dev-util/amtterm/amtterm-1.6.ebuild index d9222f8bf2e6..7f7b43b37eb4 100644 --- a/dev-util/amtterm/amtterm-1.6.ebuild +++ b/dev-util/amtterm/amtterm-1.6.ebuild @@ -33,11 +33,11 @@ src_configure() { } src_compile() { - prefix="/usr" emake || die + prefix="/usr" emake } src_install() { - prefix="/usr" emake DESTDIR=${ED} install || die + prefix="/usr" emake DESTDIR=${ED} install if ! use gtk; then rm -rf "${D}"/usr/share/applications || die diff --git a/dev-util/android-sdk-update-manager/android-sdk-update-manager-21.ebuild b/dev-util/android-sdk-update-manager/android-sdk-update-manager-21.ebuild index 6a654da49cba..d905b0019864 100644 --- a/dev-util/android-sdk-update-manager/android-sdk-update-manager-21.ebuild +++ b/dev-util/android-sdk-update-manager/android-sdk-update-manager-21.ebuild @@ -60,8 +60,8 @@ src_install(){ # Maybe this is needed for the tools directory too. dodir "${ANDROID_SDK_DIR}"/{add-ons,docs,platforms,temp} - fowners root:android "${ANDROID_SDK_DIR}"/{,add-ons,docs,platforms,temp,tools} || die - fperms 0775 "${ANDROID_SDK_DIR}"/{,add-ons,docs,platforms,temp,tools} || die + fowners root:android "${ANDROID_SDK_DIR}"/{,add-ons,docs,platforms,temp,tools} + fperms 0775 "${ANDROID_SDK_DIR}"/{,add-ons,docs,platforms,temp,tools} echo "PATH=\"${EPREFIX}${ANDROID_SDK_DIR}/tools:${EPREFIX}${ANDROID_SDK_DIR}/platform-tools\"" > "${T}/80${PN}" || die diff --git a/dev-util/catkin/catkin-0.7.14.ebuild b/dev-util/catkin/catkin-0.7.14.ebuild index a51330b83293..74a1aa7e9e01 100644 --- a/dev-util/catkin/catkin-0.7.14.ebuild +++ b/dev-util/catkin/catkin-0.7.14.ebuild @@ -95,7 +95,7 @@ catkin_src_install_internal() { if [ ! -f "${T}/.catkin_python_symlinks_generated" ]; then dodir /usr/bin for i in "${D}/${PYTHON_SCRIPTDIR}"/* ; do - dosym ../lib/python-exec/python-exec2 "/usr/bin/${i##*/}" || die + dosym ../lib/python-exec/python-exec2 "/usr/bin/${i##*/}" done touch "${T}/.catkin_python_symlinks_generated" fi diff --git a/dev-util/catkin/catkin-0.7.17.ebuild b/dev-util/catkin/catkin-0.7.17.ebuild index 92350f4085ab..061b05be08af 100644 --- a/dev-util/catkin/catkin-0.7.17.ebuild +++ b/dev-util/catkin/catkin-0.7.17.ebuild @@ -95,7 +95,7 @@ catkin_src_install_internal() { if [ ! -f "${T}/.catkin_python_symlinks_generated" ]; then dodir /usr/bin for i in "${D}/${PYTHON_SCRIPTDIR}"/* ; do - dosym ../lib/python-exec/python-exec2 "/usr/bin/${i##*/}" || die + dosym ../lib/python-exec/python-exec2 "/usr/bin/${i##*/}" done touch "${T}/.catkin_python_symlinks_generated" fi diff --git a/dev-util/catkin/catkin-9999.ebuild b/dev-util/catkin/catkin-9999.ebuild index 92350f4085ab..061b05be08af 100644 --- a/dev-util/catkin/catkin-9999.ebuild +++ b/dev-util/catkin/catkin-9999.ebuild @@ -95,7 +95,7 @@ catkin_src_install_internal() { if [ ! -f "${T}/.catkin_python_symlinks_generated" ]; then dodir /usr/bin for i in "${D}/${PYTHON_SCRIPTDIR}"/* ; do - dosym ../lib/python-exec/python-exec2 "/usr/bin/${i##*/}" || die + dosym ../lib/python-exec/python-exec2 "/usr/bin/${i##*/}" done touch "${T}/.catkin_python_symlinks_generated" fi diff --git a/dev-util/cccc/cccc-3.1.5-r1.ebuild b/dev-util/cccc/cccc-3.1.5-r1.ebuild index a26523720d4b..856607a6df29 100644 --- a/dev-util/cccc/cccc-3.1.5-r1.ebuild +++ b/dev-util/cccc/cccc-3.1.5-r1.ebuild @@ -59,12 +59,12 @@ src_install() { if use doc ; then insinto /usr/share/doc/${PF}/html - doins cccc/*.html || die "html docs failed" + doins cccc/*.html if use apidoc ; then insinto /usr/share/doc/${PF}/html/api - doins -r doxygen/html/* || die "dox failed" + doins -r doxygen/html/* insinto /usr/share/doc/${PF}/html/metrics - doins ccccout/* || die "metrics failed" + doins ccccout/* fi fi } diff --git a/dev-util/cpuinfo-collection/cpuinfo-collection-20101114.ebuild b/dev-util/cpuinfo-collection/cpuinfo-collection-20101114.ebuild index 56b58f428226..b2a1451e175e 100644 --- a/dev-util/cpuinfo-collection/cpuinfo-collection-20101114.ebuild +++ b/dev-util/cpuinfo-collection/cpuinfo-collection-20101114.ebuild @@ -17,5 +17,5 @@ S=${WORKDIR}/${MY_P} src_install() { insinto /usr/share/cpuinfo - doins -r * || die + doins -r * } diff --git a/dev-util/gprof2dot/gprof2dot-2013.05.17.ebuild b/dev-util/gprof2dot/gprof2dot-2013.05.17.ebuild index 0dfc78249914..b9aea7e30d80 100644 --- a/dev-util/gprof2dot/gprof2dot-2013.05.17.ebuild +++ b/dev-util/gprof2dot/gprof2dot-2013.05.17.ebuild @@ -36,19 +36,19 @@ _make_call_script() { Main().main() EOF - fperms a+x "$1" || die + fperms a+x "$1" } src_install() { abi_specific_install() { local sitedir="$(python_get_sitedir)" insinto ${sitedir#"${EPREFIX}"} - doins ${PN}.py || die + doins ${PN}.py python_optimize || die } python_foreach_impl abi_specific_install - dodir /usr/bin || die + dodir /usr/bin _make_call_script /usr/bin/${PN} || die python_replicate_script "${ED}"/usr/bin/${PN} || die } diff --git a/dev-util/jconfig/jconfig-2.9.ebuild b/dev-util/jconfig/jconfig-2.9.ebuild index 723f36264573..c5be45f93782 100644 --- a/dev-util/jconfig/jconfig-2.9.ebuild +++ b/dev-util/jconfig/jconfig-2.9.ebuild @@ -39,7 +39,7 @@ JAVA_ANT_ENCODING="ISO-8859-1" src_install() { java-pkg_dojar dist/jconfig.jar - dodoc README || die + dodoc README use doc && java-pkg_dojavadoc javadoc use source && java-pkg_dosrc src/* diff --git a/dev-util/quilt/quilt-0.66.ebuild b/dev-util/quilt/quilt-0.66.ebuild index 13481d763f2f..cb3d5eb528a2 100644 --- a/dev-util/quilt/quilt-0.66.ebuild +++ b/dev-util/quilt/quilt-0.66.ebuild @@ -44,7 +44,7 @@ src_configure() { } src_install() { - emake BUILD_ROOT="${D}" install || die "make install failed" + emake BUILD_ROOT="${D}" install rm -rf "${ED}"usr/share/doc/${P} dodoc AUTHORS TODO "doc/README" "doc/README.MAIL" "doc/quilt.pdf" diff --git a/dev-util/weka/weka-3.7.13.ebuild b/dev-util/weka/weka-3.7.13.ebuild index 7f39cee56198..3b118c2f74e3 100644 --- a/dev-util/weka/weka-3.7.13.ebuild +++ b/dev-util/weka/weka-3.7.13.ebuild @@ -57,7 +57,7 @@ src_install() { use source && java-pkg_dosrc src/main/java/weka/ - dodoc README || die + dodoc README dodir /usr/share/${PN}/data/ insinto /usr/share/${PN}/data/ diff --git a/dev-vcs/bzr/bzr-2.7.0.ebuild b/dev-vcs/bzr/bzr-2.7.0.ebuild index b873780921b1..a8a4e4ad7a78 100644 --- a/dev-vcs/bzr/bzr-2.7.0.ebuild +++ b/dev-vcs/bzr/bzr-2.7.0.ebuild @@ -82,10 +82,10 @@ python_install_all() { if use doc; then docinto developers - dodoc -r doc/developers/* || die + dodoc -r doc/developers/* for doc in mini-tutorial tutorials user-{guide,reference}; do docinto ${doc} - dodoc -r doc/en/${doc}/* || die + dodoc -r doc/en/${doc}/* done fi diff --git a/dev-vcs/colorsvn/colorsvn-0.3.3.ebuild b/dev-vcs/colorsvn/colorsvn-0.3.3.ebuild index 9ae642f733ff..18675f876ded 100644 --- a/dev-vcs/colorsvn/colorsvn-0.3.3.ebuild +++ b/dev-vcs/colorsvn/colorsvn-0.3.3.ebuild @@ -29,7 +29,7 @@ src_prepare() { src_compile() { # bug 335134 - emake -j1 || die + emake -j1 } pkg_postinst() { diff --git a/dev-vcs/cvsps/cvsps-2.2_beta1.ebuild b/dev-vcs/cvsps/cvsps-2.2_beta1.ebuild index 3bbdb2bc9580..d5f68f1b445b 100644 --- a/dev-vcs/cvsps/cvsps-2.2_beta1.ebuild +++ b/dev-vcs/cvsps/cvsps-2.2_beta1.ebuild @@ -31,7 +31,7 @@ src_prepare() { } src_install() { - dobin cvsps || die + dobin cvsps doman cvsps.1 dodoc README CHANGELOG } diff --git a/dev-vcs/darcs/darcs-2.10.1.ebuild b/dev-vcs/darcs/darcs-2.10.1.ebuild index da23ab5a4f93..40404e1b806d 100644 --- a/dev-vcs/darcs/darcs-2.10.1.ebuild +++ b/dev-vcs/darcs/darcs-2.10.1.ebuild @@ -94,5 +94,5 @@ src_install() { # fixup perms in such an an awkward way mv "${ED}/usr/share/man/man1/darcs.1" "${S}/darcs.1" || die "darcs.1 not found" - doman "${S}/darcs.1" || die "failed to register darcs.1 as a manpage" + doman "${S}/darcs.1" } diff --git a/dev-vcs/darcs/darcs-2.10.3-r1.ebuild b/dev-vcs/darcs/darcs-2.10.3-r1.ebuild index 4bbed55412c0..ecf1eda0544d 100644 --- a/dev-vcs/darcs/darcs-2.10.3-r1.ebuild +++ b/dev-vcs/darcs/darcs-2.10.3-r1.ebuild @@ -99,5 +99,5 @@ src_install() { # fixup perms in such an an awkward way mv "${ED}/usr/share/man/man1/darcs.1" "${S}/darcs.1" || die "darcs.1 not found" - doman "${S}/darcs.1" || die "failed to register darcs.1 as a manpage" + doman "${S}/darcs.1" } diff --git a/dev-vcs/darcs/darcs-2.12.0.ebuild b/dev-vcs/darcs/darcs-2.12.0.ebuild index 0d2bac89c4e3..160bcf620c14 100644 --- a/dev-vcs/darcs/darcs-2.12.0.ebuild +++ b/dev-vcs/darcs/darcs-2.12.0.ebuild @@ -93,5 +93,5 @@ src_install() { # fixup perms in such an an awkward way mv "${ED}/usr/share/man/man1/darcs.1" "${S}/darcs.1" || die "darcs.1 not found" - doman "${S}/darcs.1" || die "failed to register darcs.1 as a manpage" + doman "${S}/darcs.1" } diff --git a/dev-vcs/darcs/darcs-2.8.4-r6.ebuild b/dev-vcs/darcs/darcs-2.8.4-r6.ebuild index 85d765676744..41b7649deacc 100644 --- a/dev-vcs/darcs/darcs-2.8.4-r6.ebuild +++ b/dev-vcs/darcs/darcs-2.8.4-r6.ebuild @@ -121,7 +121,7 @@ src_install() { # fixup perms in such an an awkward way mv "${ED}/usr/share/man/man1/darcs.1" "${S}/darcs.1" || die "darcs.1 not found" - doman "${S}/darcs.1" || die "failed to register darcs.1 as a manpage" + doman "${S}/darcs.1" } pkg_postinst() { diff --git a/dev-vcs/gitolite-gentoo/gitolite-gentoo-2.3.1-r1.ebuild b/dev-vcs/gitolite-gentoo/gitolite-gentoo-2.3.1-r1.ebuild index 68d699eaea57..f4ed513d8334 100644 --- a/dev-vcs/gitolite-gentoo/gitolite-gentoo-2.3.1-r1.ebuild +++ b/dev-vcs/gitolite-gentoo/gitolite-gentoo-2.3.1-r1.ebuild @@ -39,7 +39,7 @@ src_install() { local gl_bin="${D}/usr/bin" gl_bin=${gl_bin/\/\//\/} - dodir /usr/share/gitolite/{conf,hooks} /usr/bin || die + dodir /usr/share/gitolite/{conf,hooks} /usr/bin export PATH="${gl_bin}:${PATH}" ./src/gl-system-install ${gl_bin} \ @@ -49,13 +49,13 @@ src_install() { rm "${D}"/usr/bin/*.pm insinto "${VENDOR_LIB}" - doins src/*.pm || die + doins src/*.pm dodoc README.mkd doc/* if use contrib; then insinto /usr/share/doc/${PF} - doins -r contrib/ || die + doins -r contrib/ fi keepdir /var/lib/gitolite diff --git a/dev-vcs/gitolite-gentoo/gitolite-gentoo-2.3.3-r1.ebuild b/dev-vcs/gitolite-gentoo/gitolite-gentoo-2.3.3-r1.ebuild index f03af212c5f8..7445c714339b 100644 --- a/dev-vcs/gitolite-gentoo/gitolite-gentoo-2.3.3-r1.ebuild +++ b/dev-vcs/gitolite-gentoo/gitolite-gentoo-2.3.3-r1.ebuild @@ -39,7 +39,7 @@ src_install() { local gl_bin="${D}/usr/bin" gl_bin=${gl_bin/\/\//\/} - dodir /usr/share/gitolite/{conf,hooks} /usr/bin || die + dodir /usr/share/gitolite/{conf,hooks} /usr/bin export PATH="${gl_bin}:${PATH}" ./src/gl-system-install ${gl_bin} \ @@ -49,13 +49,13 @@ src_install() { rm "${D}"/usr/bin/*.pm insinto "${VENDOR_LIB}" - doins src/*.pm || die + doins src/*.pm dodoc README.mkd doc/* if use contrib; then insinto /usr/share/doc/${PF} - doins -r contrib/ || die + doins -r contrib/ fi keepdir /var/lib/gitolite diff --git a/dev-vcs/gitolite/gitolite-2.3.1-r1.ebuild b/dev-vcs/gitolite/gitolite-2.3.1-r1.ebuild index ced390150277..8f8730181c0a 100644 --- a/dev-vcs/gitolite/gitolite-2.3.1-r1.ebuild +++ b/dev-vcs/gitolite/gitolite-2.3.1-r1.ebuild @@ -38,7 +38,7 @@ src_install() { local gl_bin="${D}/usr/bin" gl_bin=${gl_bin/\/\//\/} - dodir /usr/share/gitolite/{conf,hooks} /usr/bin || die + dodir /usr/share/gitolite/{conf,hooks} /usr/bin # install using upstream method export PATH="${gl_bin}:${PATH}" @@ -49,13 +49,13 @@ src_install() { rm "${D}"/usr/bin/*.pm insinto "${VENDOR_LIB}" - doins src/*.pm || die + doins src/*.pm dodoc README.mkd doc/* if use contrib; then insinto /usr/share/doc/${PF} - doins -r contrib/ || die + doins -r contrib/ fi keepdir /var/lib/gitolite diff --git a/dev-vcs/svn2git/svn2git-1.0.11-r1.ebuild b/dev-vcs/svn2git/svn2git-1.0.11-r1.ebuild index 0fd35c4b742f..5df2948ca14b 100644 --- a/dev-vcs/svn2git/svn2git-1.0.11-r1.ebuild +++ b/dev-vcs/svn2git/svn2git-1.0.11-r1.ebuild @@ -47,7 +47,7 @@ src_configure() { src_install() { einstalldocs insinto /usr/share/${PN}/samples - doins samples/*.rules || die 'doins failed' - dobin svn-all-fast-export || die 'dobin failed' - dosym svn-all-fast-export /usr/bin/svn2git || die 'dosym failed' + doins samples/*.rules + dobin svn-all-fast-export + dosym svn-all-fast-export /usr/bin/svn2git } diff --git a/dev-vcs/svn2git/svn2git-1.0.12.ebuild b/dev-vcs/svn2git/svn2git-1.0.12.ebuild index ab7c62035ef9..f9d80383124c 100644 --- a/dev-vcs/svn2git/svn2git-1.0.12.ebuild +++ b/dev-vcs/svn2git/svn2git-1.0.12.ebuild @@ -41,7 +41,7 @@ src_configure() { src_install() { einstalldocs insinto /usr/share/${PN}/samples - doins samples/*.rules || die 'doins failed' - dobin svn-all-fast-export || die 'dobin failed' - dosym svn-all-fast-export /usr/bin/svn2git || die 'dosym failed' + doins samples/*.rules + dobin svn-all-fast-export + dosym svn-all-fast-export /usr/bin/svn2git } diff --git a/dev-vcs/svn2git/svn2git-1.0.13-r1.ebuild b/dev-vcs/svn2git/svn2git-1.0.13-r1.ebuild index dc22eca75dd5..7ff0f668cf45 100644 --- a/dev-vcs/svn2git/svn2git-1.0.13-r1.ebuild +++ b/dev-vcs/svn2git/svn2git-1.0.13-r1.ebuild @@ -45,7 +45,7 @@ src_configure() { src_install() { einstalldocs insinto /usr/share/${PN}/samples - doins samples/*.rules || die 'doins failed' - dobin svn-all-fast-export || die 'dobin failed' - dosym svn-all-fast-export /usr/bin/svn2git || die 'dosym failed' + doins samples/*.rules + dobin svn-all-fast-export + dosym svn-all-fast-export /usr/bin/svn2git } diff --git a/dev-vcs/svn2git/svn2git-1.0.13.ebuild b/dev-vcs/svn2git/svn2git-1.0.13.ebuild index ab7c62035ef9..f9d80383124c 100644 --- a/dev-vcs/svn2git/svn2git-1.0.13.ebuild +++ b/dev-vcs/svn2git/svn2git-1.0.13.ebuild @@ -41,7 +41,7 @@ src_configure() { src_install() { einstalldocs insinto /usr/share/${PN}/samples - doins samples/*.rules || die 'doins failed' - dobin svn-all-fast-export || die 'dobin failed' - dosym svn-all-fast-export /usr/bin/svn2git || die 'dosym failed' + doins samples/*.rules + dobin svn-all-fast-export + dosym svn-all-fast-export /usr/bin/svn2git } diff --git a/dev-vcs/svn2git/svn2git-1.0.16.ebuild b/dev-vcs/svn2git/svn2git-1.0.16.ebuild index eaaa32f003ea..0db87be987a4 100644 --- a/dev-vcs/svn2git/svn2git-1.0.16.ebuild +++ b/dev-vcs/svn2git/svn2git-1.0.16.ebuild @@ -41,7 +41,7 @@ src_configure() { src_install() { einstalldocs insinto /usr/share/${PN}/samples - doins samples/*.rules || die 'doins failed' - dobin svn-all-fast-export || die 'dobin failed' - dosym svn-all-fast-export /usr/bin/svn2git || die 'dosym failed' + doins samples/*.rules + dobin svn-all-fast-export + dosym svn-all-fast-export /usr/bin/svn2git } diff --git a/dev-vcs/svn2git/svn2git-9999.ebuild b/dev-vcs/svn2git/svn2git-9999.ebuild index 77393d1e3fbe..7f86d838d122 100644 --- a/dev-vcs/svn2git/svn2git-9999.ebuild +++ b/dev-vcs/svn2git/svn2git-9999.ebuild @@ -40,7 +40,7 @@ src_configure() { src_install() { einstalldocs insinto /usr/share/${PN}/samples - doins samples/*.rules || die 'doins failed' - dobin svn-all-fast-export || die 'dobin failed' - dosym svn-all-fast-export /usr/bin/svn2git || die 'dosym failed' + doins samples/*.rules + dobin svn-all-fast-export + dosym svn-all-fast-export /usr/bin/svn2git } diff --git a/games-arcade/opentyrian/opentyrian-2.1.20130907-r1.ebuild b/games-arcade/opentyrian/opentyrian-2.1.20130907-r1.ebuild index fc82628bc521..d6898a9647ff 100644 --- a/games-arcade/opentyrian/opentyrian-2.1.20130907-r1.ebuild +++ b/games-arcade/opentyrian/opentyrian-2.1.20130907-r1.ebuild @@ -29,23 +29,23 @@ PATCHES=( ) src_compile() { - emake DATA_PATH="/usr/share/${PN}" || die "Compilation failed" + emake DATA_PATH="/usr/share/${PN}" } src_install() { - dobin opentyrian || die "Failed to install game binary" - dosym ../../usr/bin/opentyrian /usr/bin/tyrian || die "Failed to symlink" - dodoc CREDITS NEWS README || die "Failed to install documentation" + dobin opentyrian + dosym ../../usr/bin/opentyrian /usr/bin/tyrian + dodoc CREDITS NEWS README domenu linux/opentyrian.desktop || die "Failed to install desktop file" for i in linux/icons/*.png ; do local size=`echo ${i} | sed -e 's:.*-\([0-9]\+\).png:\1:'` insinto /usr/share/icons/hicolor/${size}x${size}/apps - newins ${i} opentyrian.png || die "Failed to install program icon" + newins ${i} opentyrian.png done insinto "/usr/share/${PN}" cd "${WORKDIR}/tyrian21" rm *.exe dpmi16bi.ovl loudness.awe || die "Failed to remove win32 binaries" - doins * || die "Failed to install game data" + doins * } pkg_postinst() { diff --git a/games-arcade/tecnoballz/tecnoballz-0.92.ebuild b/games-arcade/tecnoballz/tecnoballz-0.92.ebuild index 3ece75e8838e..272be1639d8f 100644 --- a/games-arcade/tecnoballz/tecnoballz-0.92.ebuild +++ b/games-arcade/tecnoballz/tecnoballz-0.92.ebuild @@ -32,7 +32,7 @@ src_prepare() { src_install() { default - fperms g+w "${GAMES_STATEDIR}"/${PN}.hi || die + fperms g+w "${GAMES_STATEDIR}"/${PN}.hi make_desktop_entry ${PN} Tecnoballz prepgamesdirs } diff --git a/games-emulation/mekanix/mekanix-070-r1.ebuild b/games-emulation/mekanix/mekanix-070-r1.ebuild index ee7f2d85c12d..875e65fbf79c 100644 --- a/games-emulation/mekanix/mekanix-070-r1.ebuild +++ b/games-emulation/mekanix/mekanix-070-r1.ebuild @@ -27,7 +27,7 @@ src_install() { local dir="/opt/${PN}" insinto "${dir}" - doins * || die "doins failed" + doins * fperms a+x "${dir}/meka.exe" make_wrapper mekanix ./meka.exe "${dir}" } diff --git a/games-fps/legends/legends-0.4.1.43-r2.ebuild b/games-fps/legends/legends-0.4.1.43-r2.ebuild index 0412178e3f4b..e516f30fffca 100644 --- a/games-fps/legends/legends-0.4.1.43-r2.ebuild +++ b/games-fps/legends/legends-0.4.1.43-r2.ebuild @@ -46,11 +46,11 @@ src_unpack() { src_install() { insinto "${dir}" - doins -r * || die "doins * failed" + doins -r * rm "${D}/${dir}/"/{lindedicated,LinLegends,*.so.0} exeinto "${dir}" - doexe lindedicated LinLegends *.so.0 || die "doexe failed" + doexe lindedicated LinLegends *.so.0 make_wrapper ${PN} "./LinLegends" "${dir}" "${dir}" if use dedicated ; then diff --git a/games-fps/serious-sam-tse/serious-sam-tse-1_beta1-r1.ebuild b/games-fps/serious-sam-tse/serious-sam-tse-1_beta1-r1.ebuild index 266685806eba..0a0dc429f256 100644 --- a/games-fps/serious-sam-tse/serious-sam-tse-1_beta1-r1.ebuild +++ b/games-fps/serious-sam-tse/serious-sam-tse-1_beta1-r1.ebuild @@ -77,7 +77,7 @@ src_install() { einfo "Copying from ${CDROM_ROOT}" insinto "${dir}" - doins -r "${CDROM_ROOT}"/Install/* || die "doins CD failed" + doins -r "${CDROM_ROOT}"/Install/* # Correct paths of copied resource files mv "${D}/${dir}"/Locales/eng/Controls/* "${D}/${dir}"/Controls/ || die "Failed to move file" @@ -105,8 +105,7 @@ src_install() { mv Levels/Mods/Warped/ Mods/ || die "Failed to move file" rmdir Levels/Mods/ || die "Failed to remove dir" - doins -r Bin Data Levels Mods *.txt README* \ - || die "doins main failed" + doins -r Bin Data Levels Mods *.txt README* # Install bins last to ensure they are marked executable exeinto "${dir}" diff --git a/games-fps/ut2003-data/ut2003-data-2107.ebuild b/games-fps/ut2003-data/ut2003-data-2107.ebuild index 933dc8498d89..4a77c1f15e5a 100644 --- a/games-fps/ut2003-data/ut2003-data-2107.ebuild +++ b/games-fps/ut2003-data/ut2003-data-2107.ebuild @@ -93,7 +93,7 @@ src_install() { # copy libraries exeinto "${dir}"/System - doexe "${S}"/System/libSDL-1.2.so.0 || die + doexe "${S}"/System/libSDL-1.2.so.0 # uncompressing files einfo "Uncompressing files... this may take a while..." @@ -102,12 +102,12 @@ src_install() { done # installing documentation/icon - dodoc "${S}"/README.linux || die "dodoc README.linux" + dodoc "${S}"/README.linux newicon "${S}"/Unreal.xpm ut2003.xpm || die "copying icon" - doins "${S}"/README.linux "${S}"/Unreal.xpm || die "copying readme/icon" + doins "${S}"/README.linux "${S}"/Unreal.xpm # copy ut2003/ucc exeinto "${dir}" - doexe "${S}"/bin/ut2003 "${S}"/ucc || die "copying ut2003/ucc" + doexe "${S}"/bin/ut2003 "${S}"/ucc # Here we apply DrSiN's crash patch cp "${S}"/CrashFix/System/crashfix.u "${Ddir}"/System diff --git a/games-fps/wolfgl/wolfgl-0.93-r2.ebuild b/games-fps/wolfgl/wolfgl-0.93-r2.ebuild index a76843aa4066..8bb95ed031e2 100644 --- a/games-fps/wolfgl/wolfgl-0.93-r2.ebuild +++ b/games-fps/wolfgl/wolfgl-0.93-r2.ebuild @@ -35,7 +35,7 @@ PATCHES=( ) src_compile() { - emake -j1 CFLAGS="${CFLAGS}" DATADIR="/usr/share/${PN}" || die "emake failed" + emake -j1 CFLAGS="${CFLAGS}" DATADIR="/usr/share/${PN}" } src_install() { diff --git a/games-misc/fortune-mod-mormon/fortune-mod-mormon-1.1.0.ebuild b/games-misc/fortune-mod-mormon/fortune-mod-mormon-1.1.0.ebuild index b38c5cf5a095..9f78bc606bb6 100644 --- a/games-misc/fortune-mod-mormon/fortune-mod-mormon-1.1.0.ebuild +++ b/games-misc/fortune-mod-mormon/fortune-mod-mormon-1.1.0.ebuild @@ -20,6 +20,6 @@ RDEPEND=" src_install() { dodoc ChangeLog README insinto /usr/share/fortune - doins mods/dc mods/dc.dat mods/mormon mods/mormon.dat mods/pgp || die - doins mods/scriptures.dat mods/scriptures mods/aof.dat mods/aof || die + doins mods/dc mods/dc.dat mods/mormon mods/mormon.dat mods/pgp + doins mods/scriptures.dat mods/scriptures mods/aof.dat mods/aof } diff --git a/games-misc/openmsx/openmsx-0.3.1-r2.ebuild b/games-misc/openmsx/openmsx-0.3.1-r2.ebuild index 5d0b5b452449..d1ebb5545815 100644 --- a/games-misc/openmsx/openmsx-0.3.1-r2.ebuild +++ b/games-misc/openmsx/openmsx-0.3.1-r2.ebuild @@ -23,11 +23,11 @@ pkg_setup() { } src_compile() { - emake _V= bundle || die + emake _V= bundle } src_install() { insinto "/usr/share/games/openttd/gm/${P}" - doins ${P}/{*.mid,openmsx.obm} || die - dodoc ${P}/{changelog.txt,readme.txt} || die + doins ${P}/{*.mid,openmsx.obm} + dodoc ${P}/{changelog.txt,readme.txt} } diff --git a/games-rpg/vendetta-online-bin/vendetta-online-bin-1.8.296-r1.ebuild b/games-rpg/vendetta-online-bin/vendetta-online-bin-1.8.296-r1.ebuild index fc3e5e7afad7..8c863e4c4e78 100644 --- a/games-rpg/vendetta-online-bin/vendetta-online-bin-1.8.296-r1.ebuild +++ b/games-rpg/vendetta-online-bin/vendetta-online-bin-1.8.296-r1.ebuild @@ -46,9 +46,8 @@ src_install() { local dir=/opt/${PN} insinto "${dir}" - doins -r * || die "doins failed" - fperms +x "${dir}"/{vendetta,install/{media.rlb,update.rlb,vendetta}} \ - || die "fperms failed" + doins -r * + fperms +x "${dir}"/{vendetta,install/{media.rlb,update.rlb,vendetta}} sed \ -e "s:DATADIR:${dir}:" \ diff --git a/games-simulation/singularity/singularity-0.30c-r2.ebuild b/games-simulation/singularity/singularity-0.30c-r2.ebuild index 51ceaa93529d..b00c722f9da3 100644 --- a/games-simulation/singularity/singularity-0.30c-r2.ebuild +++ b/games-simulation/singularity/singularity-0.30c-r2.ebuild @@ -37,11 +37,11 @@ src_prepare() { src_install() { insinto /usr/share/${PN} - doins -r code data ${PN}.py || die + doins -r code data ${PN}.py python_optimize ${ED%/}/usr/share/${PN} if use music ; then - doins -r ../${MUSIC}/music || die + doins -r ../${MUSIC}/music fi make_wrapper ${PN} "${EPYTHON} ${PN}.py" /usr/share/${PN} diff --git a/games-util/wiiload/wiiload-0.5.ebuild b/games-util/wiiload/wiiload-0.5.ebuild index 43aa072d0fb7..036f5aba5c9b 100644 --- a/games-util/wiiload/wiiload-0.5.ebuild +++ b/games-util/wiiload/wiiload-0.5.ebuild @@ -14,7 +14,7 @@ KEYWORDS="~amd64 ~x86" IUSE="" src_compile() { - emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}" LFLAGS="${LDFLAGS}" || die + emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}" LFLAGS="${LDFLAGS}" } src_install() { diff --git a/mail-client/mailx-support/mailx-support-20060102-r2.ebuild b/mail-client/mailx-support/mailx-support-20060102-r2.ebuild index 409e2a4d0ab7..fcad4903c028 100644 --- a/mail-client/mailx-support/mailx-support-20060102-r2.ebuild +++ b/mail-client/mailx-support/mailx-support-20060102-r2.ebuild @@ -30,7 +30,7 @@ src_prepare() { } src_compile() { - emake CC="$(tc-getCC)" BINDNOW_FLAGS="" || die "emake failed" + emake CC="$(tc-getCC)" BINDNOW_FLAGS="" } src_install() { diff --git a/mail-client/mutt/mutt-1.10.1.ebuild b/mail-client/mutt/mutt-1.10.1.ebuild index 2c5a5a9392f4..291ba186831a 100644 --- a/mail-client/mutt/mutt-1.10.1.ebuild +++ b/mail-client/mutt/mutt-1.10.1.ebuild @@ -208,11 +208,11 @@ src_configure() { myconf+=( "--with-homespool=Maildir" ) fi - econf "${myconf[@]}" || die "configure failed" + econf "${myconf[@]}" } src_install() { - emake DESTDIR="${D}" install || die "install failed" + emake DESTDIR="${D}" install if use mbox; then insinto /etc/mutt newins "${FILESDIR}"/Muttrc.mbox Muttrc @@ -227,7 +227,7 @@ src_install() { # A man-page is always handy, so fake one if use !doc; then - emake -C doc DESTDIR="${D}" muttrc.man || die + emake -C doc DESTDIR="${D}" muttrc.man # make the fake slightly better, bug #413405 sed -e 's#@docdir@/manual.txt#http://www.mutt.org/doc/devel/manual.html#' \ -e 's#in @docdir@,#at http://www.mutt.org/,#' \ diff --git a/mail-client/mutt/mutt-1.11.4.ebuild b/mail-client/mutt/mutt-1.11.4.ebuild index 3f6633e30d9e..9a75061ed7ca 100644 --- a/mail-client/mutt/mutt-1.11.4.ebuild +++ b/mail-client/mutt/mutt-1.11.4.ebuild @@ -210,11 +210,11 @@ src_configure() { myconf+=( "--with-homespool=Maildir" ) fi - econf "${myconf[@]}" || die "configure failed" + econf "${myconf[@]}" } src_install() { - emake DESTDIR="${D}" install || die "install failed" + emake DESTDIR="${D}" install if use mbox; then insinto /etc/mutt newins "${FILESDIR}"/Muttrc.mbox Muttrc @@ -229,7 +229,7 @@ src_install() { # A man-page is always handy, so fake one if use !doc; then - emake -C doc DESTDIR="${D}" muttrc.man || die + emake -C doc DESTDIR="${D}" muttrc.man # make the fake slightly better, bug #413405 sed -e 's#@docdir@/manual.txt#http://www.mutt.org/doc/devel/manual.html#' \ -e 's#in @docdir@,#at http://www.mutt.org/,#' \ diff --git a/mail-client/mutt/mutt-1.12.1.ebuild b/mail-client/mutt/mutt-1.12.1.ebuild index 95e66231cb21..c6dbb7693066 100644 --- a/mail-client/mutt/mutt-1.12.1.ebuild +++ b/mail-client/mutt/mutt-1.12.1.ebuild @@ -211,11 +211,11 @@ src_configure() { myconf+=( "--with-homespool=Maildir" ) fi - econf "${myconf[@]}" || die "configure failed" + econf "${myconf[@]}" } src_install() { - emake DESTDIR="${D}" install || die "install failed" + emake DESTDIR="${D}" install if use mbox; then insinto /etc/mutt newins "${FILESDIR}"/Muttrc.mbox Muttrc @@ -230,7 +230,7 @@ src_install() { # A man-page is always handy, so fake one if use !doc; then - emake -C doc DESTDIR="${D}" muttrc.man || die + emake -C doc DESTDIR="${D}" muttrc.man # make the fake slightly better, bug #413405 sed -e 's#@docdir@/manual.txt#http://www.mutt.org/doc/devel/manual.html#' \ -e 's#in @docdir@,#at http://www.mutt.org/,#' \ diff --git a/mail-client/mutt/mutt-1.12.2-r1.ebuild b/mail-client/mutt/mutt-1.12.2-r1.ebuild index 461d17b16b6b..b246b32c07b2 100644 --- a/mail-client/mutt/mutt-1.12.2-r1.ebuild +++ b/mail-client/mutt/mutt-1.12.2-r1.ebuild @@ -211,11 +211,11 @@ src_configure() { myconf+=( "--with-homespool=Maildir" ) fi - econf "${myconf[@]}" || die "configure failed" + econf "${myconf[@]}" } src_install() { - emake DESTDIR="${D}" install || die "install failed" + emake DESTDIR="${D}" install if use mbox; then insinto /etc/mutt newins "${FILESDIR}"/Muttrc.mbox Muttrc @@ -230,7 +230,7 @@ src_install() { # A man-page is always handy, so fake one if use !doc; then - emake -C doc DESTDIR="${D}" muttrc.man || die + emake -C doc DESTDIR="${D}" muttrc.man # make the fake slightly better, bug #413405 sed -e 's#@docdir@/manual.txt#http://www.mutt.org/doc/devel/manual.html#' \ -e 's#in @docdir@,#at http://www.mutt.org/,#' \ diff --git a/mail-client/mutt/mutt-1.12.2-r2.ebuild b/mail-client/mutt/mutt-1.12.2-r2.ebuild index 1300423d9a3d..77e569123721 100644 --- a/mail-client/mutt/mutt-1.12.2-r2.ebuild +++ b/mail-client/mutt/mutt-1.12.2-r2.ebuild @@ -205,11 +205,11 @@ src_configure() { myconf+=( "--with-homespool=Maildir" ) fi - econf "${myconf[@]}" || die "configure failed" + econf "${myconf[@]}" } src_install() { - emake DESTDIR="${D}" install || die "install failed" + emake DESTDIR="${D}" install if use mbox; then insinto /etc/mutt newins "${FILESDIR}"/Muttrc.mbox Muttrc @@ -224,7 +224,7 @@ src_install() { # A man-page is always handy, so fake one if use !doc; then - emake -C doc DESTDIR="${D}" muttrc.man || die + emake -C doc DESTDIR="${D}" muttrc.man # make the fake slightly better, bug #413405 sed -e 's#@docdir@/manual.txt#http://www.mutt.org/doc/devel/manual.html#' \ -e 's#in @docdir@,#at http://www.mutt.org/,#' \ diff --git a/mail-client/mutt/mutt-1.13.0.ebuild b/mail-client/mutt/mutt-1.13.0.ebuild index 031717cb2e38..4cd23e5423af 100644 --- a/mail-client/mutt/mutt-1.13.0.ebuild +++ b/mail-client/mutt/mutt-1.13.0.ebuild @@ -193,11 +193,11 @@ src_configure() { myconf+=( "--with-homespool=Maildir" ) fi - econf "${myconf[@]}" || die "configure failed" + econf "${myconf[@]}" } src_install() { - emake DESTDIR="${D}" install || die "install failed" + emake DESTDIR="${D}" install if use mbox; then insinto /etc/mutt newins "${FILESDIR}"/Muttrc.mbox Muttrc diff --git a/mail-filter/spamdyke/spamdyke-4.3.0.ebuild b/mail-filter/spamdyke/spamdyke-4.3.0.ebuild index 24eabfe02920..14aae8f1ea05 100644 --- a/mail-filter/spamdyke/spamdyke-4.3.0.ebuild +++ b/mail-filter/spamdyke/spamdyke-4.3.0.ebuild @@ -41,25 +41,25 @@ src_prepare() { src_configure() { econf \ - $(use_enable ssl tls) || die "econf failed" + $(use_enable ssl tls) cd ../utils - econf || die "econf failed in utils" + econf } src_compile() { - emake CFLAGS="${CFLAGS}" || die "emake failed" + emake CFLAGS="${CFLAGS}" cd ../utils - emake CFLAGS="${CFLAGS}" || die "emake in utils died" + emake CFLAGS="${CFLAGS}" } src_install() { - dobin ${PN} || die "Installing ${PN} binary failed" + dobin ${PN} insinto /etc/${PN} - doins ${PN}.conf || die "Installing ${PN} configuration file failed" + doins ${PN}.conf dodir /var/tmp/${PN}/graylist fowners -R qmaild /var/tmp/${PN}/graylist cd ../utils - dobin domain2path || die "Installing domain2path binary failed" + dobin domain2path cd ../documentation dodoc {Changelog,INSTALL,UPGRADING}.txt dohtml FAQ.html \ diff --git a/mail-mta/courier/courier-1.0.5.ebuild b/mail-mta/courier/courier-1.0.5.ebuild index 845fd449bf7f..b165cabcf331 100644 --- a/mail-mta/courier/courier-1.0.5.ebuild +++ b/mail-mta/courier/courier-1.0.5.ebuild @@ -242,7 +242,7 @@ src_install() { src_test() { if [ `whoami` != 'root' ]; then - emake -j1 check || die "Make check failed." + emake -j1 check else einfo "make check skipped, can't run as root." einfo "You can enable it with FEATURES=\"userpriv\"" diff --git a/mail-mta/exim/exim-4.92.2.ebuild b/mail-mta/exim/exim-4.92.2.ebuild index 3628f1466d78..737806a2d8a1 100644 --- a/mail-mta/exim/exim-4.92.2.ebuild +++ b/mail-mta/exim/exim-4.92.2.ebuild @@ -487,8 +487,7 @@ src_configure() { src_compile() { emake CC="$(tc-getCC)" HOSTCC="$(tc-getBUILD_CC)" \ - AR="$(tc-getAR) cq" RANLIB="$(tc-getRANLIB)" FULLECHO='' \ - || die "make failed" + AR="$(tc-getAR) cq" RANLIB="$(tc-getRANLIB)" FULLECHO='' } src_install () { diff --git a/mail-mta/exim/exim-4.92.3.ebuild b/mail-mta/exim/exim-4.92.3.ebuild index 7b828027f63d..05dbf4afa52d 100644 --- a/mail-mta/exim/exim-4.92.3.ebuild +++ b/mail-mta/exim/exim-4.92.3.ebuild @@ -487,8 +487,7 @@ src_configure() { src_compile() { emake CC="$(tc-getCC)" HOSTCC="$(tc-getBUILD_CC)" \ - AR="$(tc-getAR) cq" RANLIB="$(tc-getRANLIB)" FULLECHO='' \ - || die "make failed" + AR="$(tc-getAR) cq" RANLIB="$(tc-getRANLIB)" FULLECHO='' } src_install () { diff --git a/mail-mta/exim/exim-4.93.ebuild b/mail-mta/exim/exim-4.93.ebuild index 6feaa1836fa7..1374ea7d36c7 100644 --- a/mail-mta/exim/exim-4.93.ebuild +++ b/mail-mta/exim/exim-4.93.ebuild @@ -485,8 +485,7 @@ src_configure() { src_compile() { emake CC="$(tc-getCC)" HOSTCC="$(tc-getBUILD_CC)" \ - AR="$(tc-getAR) cq" RANLIB="$(tc-getRANLIB)" FULLECHO='' \ - || die "make failed" + AR="$(tc-getAR) cq" RANLIB="$(tc-getRANLIB)" FULLECHO='' } src_install () { diff --git a/mail-mta/ssmtp/ssmtp-2.64-r2.ebuild b/mail-mta/ssmtp/ssmtp-2.64-r2.ebuild index 30b375ca20d5..885dd6a73045 100644 --- a/mail-mta/ssmtp/ssmtp-2.64-r2.ebuild +++ b/mail-mta/ssmtp/ssmtp-2.64-r2.ebuild @@ -70,7 +70,7 @@ src_configure() { } src_compile() { - emake etcdir="${EPREFIX}"/etc || die + emake etcdir="${EPREFIX}"/etc } src_install() { diff --git a/mail-mta/ssmtp/ssmtp-2.64-r3.ebuild b/mail-mta/ssmtp/ssmtp-2.64-r3.ebuild index 3578fd7d685a..4d7d47e86f81 100644 --- a/mail-mta/ssmtp/ssmtp-2.64-r3.ebuild +++ b/mail-mta/ssmtp/ssmtp-2.64-r3.ebuild @@ -73,7 +73,7 @@ src_configure() { } src_compile() { - emake etcdir="${EPREFIX}"/etc || die + emake etcdir="${EPREFIX}"/etc } src_install() { diff --git a/media-fonts/culmus/culmus-0.120-r5.ebuild b/media-fonts/culmus/culmus-0.120-r5.ebuild index eaa1f5351242..13ba5f1211b9 100644 --- a/media-fonts/culmus/culmus-0.120-r5.ebuild +++ b/media-fonts/culmus/culmus-0.120-r5.ebuild @@ -156,7 +156,7 @@ src_install() { done pushd ${PN}$(use fontforge && echo -src)-${PV} - dodoc CHANGES || die + dodoc CHANGES popd >/dev/null if use ancient; then diff --git a/media-fonts/culmus/culmus-0.133.ebuild b/media-fonts/culmus/culmus-0.133.ebuild index cc33ae78e598..d21d6b87d735 100644 --- a/media-fonts/culmus/culmus-0.133.ebuild +++ b/media-fonts/culmus/culmus-0.133.ebuild @@ -156,7 +156,7 @@ src_install() { done pushd ${PN}$(use fontforge && echo -src)-${PV} - dodoc CHANGES || die + dodoc CHANGES popd >/dev/null if use ancient; then diff --git a/media-fonts/dejavu/dejavu-2.35.ebuild b/media-fonts/dejavu/dejavu-2.35.ebuild index 0a0e131e0794..0f47efe4b70b 100644 --- a/media-fonts/dejavu/dejavu-2.35.ebuild +++ b/media-fonts/dejavu/dejavu-2.35.ebuild @@ -63,8 +63,7 @@ src_compile() { BLOCKS=/usr/share/unicode-data/Blocks.txt \ UNICODEDATA=/usr/share/unicode-data/UnicodeData.txt \ FC-LANG=/usr/share/fc-lang \ - full sans \ - || die "emake failed" + full sans fi } diff --git a/media-fonts/dejavu/dejavu-2.37.ebuild b/media-fonts/dejavu/dejavu-2.37.ebuild index f46826227e59..739c84999e4c 100644 --- a/media-fonts/dejavu/dejavu-2.37.ebuild +++ b/media-fonts/dejavu/dejavu-2.37.ebuild @@ -70,8 +70,7 @@ src_compile() { BLOCKS=/usr/share/unicode-data/Blocks.txt \ UNICODEDATA=/usr/share/unicode-data/UnicodeData.txt \ FC-LANG=/usr/share/fc-lang \ - full sans \ - || die "emake failed" + full sans fi } diff --git a/media-fonts/wqy-unibit/wqy-unibit-1.1.0_p1-r1.ebuild b/media-fonts/wqy-unibit/wqy-unibit-1.1.0_p1-r1.ebuild index 1fa0abb9ab19..f99e97246832 100644 --- a/media-fonts/wqy-unibit/wqy-unibit-1.1.0_p1-r1.ebuild +++ b/media-fonts/wqy-unibit/wqy-unibit-1.1.0_p1-r1.ebuild @@ -32,6 +32,6 @@ src_prepare() { } src_compile() { - emake || die + emake gzip -9 wqy-unibit.pcf || die } diff --git a/media-gfx/dcraw/dcraw-9.28.0-r1.ebuild b/media-gfx/dcraw/dcraw-9.28.0-r1.ebuild index 6f0ec1521e68..5d256c4636ec 100644 --- a/media-gfx/dcraw/dcraw-9.28.0-r1.ebuild +++ b/media-gfx/dcraw/dcraw-9.28.0-r1.ebuild @@ -104,7 +104,7 @@ src_install() { if has ${lang} ${LINGUAS-${lang}}; then [[ -f dcraw.${lang}.1 ]] && doman dcraw.${lang}.1 insinto /usr/share/locale/${lang}/LC_MESSAGES - newins dcraw_${lang}.mo dcraw.mo || die "failed to install dcraw_${lang}.mo" + newins dcraw_${lang}.mo dcraw.mo fi done fi diff --git a/media-gfx/engauge/engauge-10.6.ebuild b/media-gfx/engauge/engauge-10.6.ebuild index 7d8aba7d2cce..d9161fe8f238 100644 --- a/media-gfx/engauge/engauge-10.6.ebuild +++ b/media-gfx/engauge/engauge-10.6.ebuild @@ -74,11 +74,11 @@ src_install() { if use doc; then pushd doc >/dev/null || die - doins -r . || die "install documentation failed" + doins -r . popd >/dev/null || die fi if use examples; then - doins -r samples || die "install examples failed" + doins -r samples fi } diff --git a/media-gfx/libimagequant/libimagequant-2.11.7.ebuild b/media-gfx/libimagequant/libimagequant-2.11.7.ebuild index d884ee7fac2d..b318487fa32a 100644 --- a/media-gfx/libimagequant/libimagequant-2.11.7.ebuild +++ b/media-gfx/libimagequant/libimagequant-2.11.7.ebuild @@ -34,8 +34,8 @@ src_configure() { } src_compile() { - emake shared || die "make failed" - use static-libs && (emake static || die "make failed") + emake shared + use static-libs && emake static } src_install() { diff --git a/media-gfx/libimagequant/libimagequant-2.12.2.ebuild b/media-gfx/libimagequant/libimagequant-2.12.2.ebuild index 3b54e4177a1b..3143dad9cd89 100644 --- a/media-gfx/libimagequant/libimagequant-2.12.2.ebuild +++ b/media-gfx/libimagequant/libimagequant-2.12.2.ebuild @@ -40,8 +40,8 @@ src_configure() { } src_compile() { - emake shared imagequant.pc || die "make failed" - use static-libs && (emake static || die "make failed") + emake shared imagequant.pc + use static-libs && emake static } src_install() { diff --git a/media-gfx/libimagequant/libimagequant-2.12.3.ebuild b/media-gfx/libimagequant/libimagequant-2.12.3.ebuild index 3b54e4177a1b..3143dad9cd89 100644 --- a/media-gfx/libimagequant/libimagequant-2.12.3.ebuild +++ b/media-gfx/libimagequant/libimagequant-2.12.3.ebuild @@ -40,8 +40,8 @@ src_configure() { } src_compile() { - emake shared imagequant.pc || die "make failed" - use static-libs && (emake static || die "make failed") + emake shared imagequant.pc + use static-libs && emake static } src_install() { diff --git a/media-gfx/pencil/pencil-0.6.1.1.ebuild b/media-gfx/pencil/pencil-0.6.1.1.ebuild index e40717fe2bd8..69c4eb9be6d8 100644 --- a/media-gfx/pencil/pencil-0.6.1.1.ebuild +++ b/media-gfx/pencil/pencil-0.6.1.1.ebuild @@ -40,7 +40,7 @@ src_install() { einstalldocs # install target not yet provided - # emake INSTALL_ROOT="${D}" install || die "emake install failed" + # emake INSTALL_ROOT="${D}" install newbin bin/pencil2d ${PN} newicon app/data/icons/icon.png ${PN}.png diff --git a/media-gfx/pngtoico/pngtoico-1.0.1-r1.ebuild b/media-gfx/pngtoico/pngtoico-1.0.1-r1.ebuild index 2c6647ac4bd3..882109dd88e5 100644 --- a/media-gfx/pngtoico/pngtoico-1.0.1-r1.ebuild +++ b/media-gfx/pngtoico/pngtoico-1.0.1-r1.ebuild @@ -23,7 +23,7 @@ src_prepare() { } src_compile() { - emake CC="$(tc-getCC)" || die + emake CC="$(tc-getCC)" } src_install() { diff --git a/media-gfx/qvv/qvv-4.04.ebuild b/media-gfx/qvv/qvv-4.04.ebuild index bd8c0105b3bc..50d847492219 100644 --- a/media-gfx/qvv/qvv-4.04.ebuild +++ b/media-gfx/qvv/qvv-4.04.ebuild @@ -31,7 +31,7 @@ src_configure() { src_install() { einstalldocs - dobin qvv || die "dobin failed" + dobin qvv doicon images/qvv_icon_128x128.png || die "doicon failed" make_desktop_entry qvv QVV qvv_icon_128x128 } diff --git a/media-gfx/transfig/transfig-3.2.5e.ebuild b/media-gfx/transfig/transfig-3.2.5e.ebuild index e93b71f45406..268d2795797f 100644 --- a/media-gfx/transfig/transfig-3.2.5e.ebuild +++ b/media-gfx/transfig/transfig-3.2.5e.ebuild @@ -81,7 +81,7 @@ src_install() { newins "${WORKDIR}/${P}-gentoo-patchset/transfig-ru_RU.KOI8-R.ps" ru_RU.KOI8-R.ps newins "${WORKDIR}/${P}-gentoo-patchset/transfig-uk_UA.KOI8-U.ps" uk_UA.KOI8-U.ps - dohtml "${WORKDIR}/fig2mpdf/doc/"* || die + dohtml "${WORKDIR}/fig2mpdf/doc/"* mv "${ED}"/usr/bin/fig2ps2tex{.sh,} || die #338295 diff --git a/media-gfx/tuxpaint-stamps/tuxpaint-stamps-20090628-r1.ebuild b/media-gfx/tuxpaint-stamps/tuxpaint-stamps-20090628-r1.ebuild index d07338e4201e..d235d332f2d0 100644 --- a/media-gfx/tuxpaint-stamps/tuxpaint-stamps-20090628-r1.ebuild +++ b/media-gfx/tuxpaint-stamps/tuxpaint-stamps-20090628-r1.ebuild @@ -24,7 +24,7 @@ src_prepare() { } src_install() { - emake PREFIX="${D}/usr" install-all || die + emake PREFIX="${D}/usr" install-all rm -f docs/COPYING.txt || die dodoc docs/*.txt diff --git a/media-libs/hamlib/hamlib-3.1.ebuild b/media-libs/hamlib/hamlib-3.1.ebuild index 5cf4c9fed288..a7bc3b024dcb 100644 --- a/media-libs/hamlib/hamlib-3.1.ebuild +++ b/media-libs/hamlib/hamlib-3.1.ebuild @@ -81,8 +81,8 @@ src_install() { autotools-utils_src_install insinto /usr/$(get_libdir)/pkgconfig - doins "${AUTOTOOLS_BUILD_DIR}"/hamlib.pc || die "doins failed" + doins "${AUTOTOOLS_BUILD_DIR}"/hamlib.pc echo "LDPATH=/usr/$(get_libdir)/hamlib" > "${T}"/73hamlib - doenvd "${T}"/73hamlib || die "doenvd failed" + doenvd "${T}"/73hamlib } diff --git a/media-libs/hamlib/hamlib-3.2.ebuild b/media-libs/hamlib/hamlib-3.2.ebuild index e5eb1f9a6b1b..16773a38a259 100644 --- a/media-libs/hamlib/hamlib-3.2.ebuild +++ b/media-libs/hamlib/hamlib-3.2.ebuild @@ -81,8 +81,8 @@ src_install() { autotools-utils_src_install insinto /usr/$(get_libdir)/pkgconfig - doins "${AUTOTOOLS_BUILD_DIR}"/hamlib.pc || die "doins failed" + doins "${AUTOTOOLS_BUILD_DIR}"/hamlib.pc echo "LDPATH=/usr/$(get_libdir)/hamlib" > "${T}"/73hamlib - doenvd "${T}"/73hamlib || die "doenvd failed" + doenvd "${T}"/73hamlib } diff --git a/media-libs/hamlib/hamlib-3.3.ebuild b/media-libs/hamlib/hamlib-3.3.ebuild index f8782dee5719..e263b96f43f7 100644 --- a/media-libs/hamlib/hamlib-3.3.ebuild +++ b/media-libs/hamlib/hamlib-3.3.ebuild @@ -82,8 +82,8 @@ src_install() { einstalldocs insinto /usr/$(get_libdir)/pkgconfig - doins hamlib.pc || die "doins failed" + doins hamlib.pc echo "LDPATH=/usr/$(get_libdir)/hamlib" > "${T}"/73hamlib - doenvd "${T}"/73hamlib || die "doenvd failed" + doenvd "${T}"/73hamlib } diff --git a/media-libs/libclthreads/libclthreads-2.4.0-r1.ebuild b/media-libs/libclthreads/libclthreads-2.4.0-r1.ebuild index 68b3a2233e65..22339f553e9c 100644 --- a/media-libs/libclthreads/libclthreads-2.4.0-r1.ebuild +++ b/media-libs/libclthreads/libclthreads-2.4.0-r1.ebuild @@ -28,6 +28,6 @@ src_compile() { } src_install() { - emake CLTHREADS_LIBDIR="/usr/$(get_libdir)" DESTDIR="${ED}" install || die "make install failed" + emake CLTHREADS_LIBDIR="/usr/$(get_libdir)" DESTDIR="${ED}" install dodoc AUTHORS } diff --git a/media-libs/libclthreads/libclthreads-2.4.2.ebuild b/media-libs/libclthreads/libclthreads-2.4.2.ebuild index 885e5e9700ea..6efe7ccf191e 100644 --- a/media-libs/libclthreads/libclthreads-2.4.2.ebuild +++ b/media-libs/libclthreads/libclthreads-2.4.2.ebuild @@ -32,5 +32,5 @@ src_install() { default cd "${S}"/source || die "Failed to cd to sources" - emake PREFIX="${EPREFIX}/usr" INCDIR="include" LIBDIR="$(get_libdir)" DESTDIR="${ED}" install || die "make install failed" + emake PREFIX="${EPREFIX}/usr" INCDIR="include" LIBDIR="$(get_libdir)" DESTDIR="${ED}" install } diff --git a/media-libs/libdca/libdca-0.0.5-r3.ebuild b/media-libs/libdca/libdca-0.0.5-r3.ebuild index 5135522c6500..e261e853d4f4 100644 --- a/media-libs/libdca/libdca-0.0.5-r3.ebuild +++ b/media-libs/libdca/libdca-0.0.5-r3.ebuild @@ -43,11 +43,11 @@ multilib_src_configure() { } multilib_src_compile() { - emake OPT_CFLAGS="" || die + emake OPT_CFLAGS="" } multilib_src_install() { - emake DESTDIR="${D}" install || die + emake DESTDIR="${D}" install find "${ED}" -name '*.la' -exec rm -f '{}' + rm -f "${ED}"/usr/$(get_libdir)/libdts.a diff --git a/media-libs/libiptcdata/libiptcdata-1.0.4-r1.ebuild b/media-libs/libiptcdata/libiptcdata-1.0.4-r1.ebuild index 575825e620b6..f51580672d25 100644 --- a/media-libs/libiptcdata/libiptcdata-1.0.4-r1.ebuild +++ b/media-libs/libiptcdata/libiptcdata-1.0.4-r1.ebuild @@ -37,13 +37,13 @@ src_configure () { } src_install () { - emake DESTDIR="${D}" install || die "emake install failed." - dodoc AUTHORS ChangeLog NEWS README TODO || die "dodoc failed." + emake DESTDIR="${D}" install + dodoc AUTHORS ChangeLog NEWS README TODO if use examples; then insinto /usr/share/doc/${PF}/python - doins python/README || die "doins failed" - doins -r python/examples || die "doins 2 failed" + doins python/README + doins -r python/examples fi find "${D}" -name '*.la' -delete || die "failed to remove *.la files" diff --git a/media-plugins/ir_lv2/ir_lv2-1.3.2.ebuild b/media-plugins/ir_lv2/ir_lv2-1.3.2.ebuild index cc7e46fac82a..56c7f8b6a29f 100644 --- a/media-plugins/ir_lv2/ir_lv2-1.3.2.ebuild +++ b/media-plugins/ir_lv2/ir_lv2-1.3.2.ebuild @@ -33,10 +33,10 @@ src_prepare() { src_compile() { tc-export CC CXX - emake || die + emake } src_install() { - emake INSTDIR="${D}/usr/$(get_libdir)/lv2/ir.lv2" install || die - dodoc README ChangeLog || die + emake INSTDIR="${D}/usr/$(get_libdir)/lv2/ir.lv2" install + dodoc README ChangeLog } diff --git a/media-plugins/live/live-2017.10.28.ebuild b/media-plugins/live/live-2017.10.28.ebuild index 1f4629ae3c1b..6c6dc0f85b53 100644 --- a/media-plugins/live/live-2017.10.28.ebuild +++ b/media-plugins/live/live-2017.10.28.ebuild @@ -83,14 +83,14 @@ multilib_src_compile() { einfo "Beginning static library build" ./genMakefiles gentoo - emake -j1 LINK_OPTS="-L. $(raw-ldflags)" || die "failed to build static libraries" + emake -j1 LINK_OPTS="-L. $(raw-ldflags)" fi cd "${BUILD_DIR}/live-shared" einfo "Beginning shared library build" ./genMakefiles gentoo-so-r1 local suffix=$(get_libname ${LIVE_ABI_VERSION}) - emake -j1 LINK_OPTS="-L. ${LDFLAGS}" LIB_SUFFIX="${suffix#.}" || die "failed to build shared libraries" + emake -j1 LINK_OPTS="-L. ${LDFLAGS}" LIB_SUFFIX="${suffix#.}" for i in liveMedia groupsock UsageEnvironment BasicUsageEnvironment ; do pushd "${BUILD_DIR}/live-shared/${i}" > /dev/null @@ -102,7 +102,7 @@ multilib_src_compile() { einfo "Beginning programs build" for i in $(use examples && echo "testProgs") proxyServer mediaServer ; do cd "${BUILD_DIR}/live-shared/${i}" - emake LINK_OPTS="-L. ${LDFLAGS}" || die "failed to build test programs" + emake LINK_OPTS="-L. ${LDFLAGS}" done fi } diff --git a/media-plugins/live/live-2018.01.29.ebuild b/media-plugins/live/live-2018.01.29.ebuild index be60aaac5014..d833ddf75eb2 100644 --- a/media-plugins/live/live-2018.01.29.ebuild +++ b/media-plugins/live/live-2018.01.29.ebuild @@ -83,14 +83,14 @@ multilib_src_compile() { einfo "Beginning static library build" ./genMakefiles gentoo - emake -j1 LINK_OPTS="-L. $(raw-ldflags)" || die "failed to build static libraries" + emake -j1 LINK_OPTS="-L. $(raw-ldflags)" fi cd "${BUILD_DIR}/live-shared" einfo "Beginning shared library build" ./genMakefiles gentoo-so-r1 local suffix=$(get_libname ${LIVE_ABI_VERSION}) - emake -j1 LINK_OPTS="-L. ${LDFLAGS}" LIB_SUFFIX="${suffix#.}" || die "failed to build shared libraries" + emake -j1 LINK_OPTS="-L. ${LDFLAGS}" LIB_SUFFIX="${suffix#.}" for i in liveMedia groupsock UsageEnvironment BasicUsageEnvironment ; do pushd "${BUILD_DIR}/live-shared/${i}" > /dev/null @@ -102,7 +102,7 @@ multilib_src_compile() { einfo "Beginning programs build" for i in $(use examples && echo "testProgs") proxyServer mediaServer ; do cd "${BUILD_DIR}/live-shared/${i}" - emake LINK_OPTS="-L. ${LDFLAGS}" || die "failed to build test programs" + emake LINK_OPTS="-L. ${LDFLAGS}" done fi } diff --git a/media-plugins/live/live-2018.07.07.ebuild b/media-plugins/live/live-2018.07.07.ebuild index be60aaac5014..d833ddf75eb2 100644 --- a/media-plugins/live/live-2018.07.07.ebuild +++ b/media-plugins/live/live-2018.07.07.ebuild @@ -83,14 +83,14 @@ multilib_src_compile() { einfo "Beginning static library build" ./genMakefiles gentoo - emake -j1 LINK_OPTS="-L. $(raw-ldflags)" || die "failed to build static libraries" + emake -j1 LINK_OPTS="-L. $(raw-ldflags)" fi cd "${BUILD_DIR}/live-shared" einfo "Beginning shared library build" ./genMakefiles gentoo-so-r1 local suffix=$(get_libname ${LIVE_ABI_VERSION}) - emake -j1 LINK_OPTS="-L. ${LDFLAGS}" LIB_SUFFIX="${suffix#.}" || die "failed to build shared libraries" + emake -j1 LINK_OPTS="-L. ${LDFLAGS}" LIB_SUFFIX="${suffix#.}" for i in liveMedia groupsock UsageEnvironment BasicUsageEnvironment ; do pushd "${BUILD_DIR}/live-shared/${i}" > /dev/null @@ -102,7 +102,7 @@ multilib_src_compile() { einfo "Beginning programs build" for i in $(use examples && echo "testProgs") proxyServer mediaServer ; do cd "${BUILD_DIR}/live-shared/${i}" - emake LINK_OPTS="-L. ${LDFLAGS}" || die "failed to build test programs" + emake LINK_OPTS="-L. ${LDFLAGS}" done fi } diff --git a/media-plugins/swh-lv2/swh-lv2-1.0.16.ebuild b/media-plugins/swh-lv2/swh-lv2-1.0.16.ebuild index 60c107b0b478..c134ba72c5e5 100644 --- a/media-plugins/swh-lv2/swh-lv2-1.0.16.ebuild +++ b/media-plugins/swh-lv2/swh-lv2-1.0.16.ebuild @@ -27,10 +27,10 @@ src_prepare() { } src_compile() { - emake CC=$(tc-getCC) || die + emake CC=$(tc-getCC) } src_install() { - emake INSTALL_DIR="${D}/usr/$(get_libdir)/lv2" install-system || die + emake INSTALL_DIR="${D}/usr/$(get_libdir)/lv2" install-system dodoc README } diff --git a/media-plugins/vdr-imonlcd/vdr-imonlcd-1.0.2.ebuild b/media-plugins/vdr-imonlcd/vdr-imonlcd-1.0.2.ebuild index d67f1e90c8a2..9010c74f2f13 100644 --- a/media-plugins/vdr-imonlcd/vdr-imonlcd-1.0.2.ebuild +++ b/media-plugins/vdr-imonlcd/vdr-imonlcd-1.0.2.ebuild @@ -36,5 +36,5 @@ src_install() { vdr-plugin-2_src_install insinto $(get_udevdir)/rules.d - doins "${FILESDIR}"/99-imonlcd.rules || die + doins "${FILESDIR}"/99-imonlcd.rules } diff --git a/media-plugins/xbmc-addon-xvdr/xbmc-addon-xvdr-9999.ebuild b/media-plugins/xbmc-addon-xvdr/xbmc-addon-xvdr-9999.ebuild index 897eb4d0ccc5..0c3fcf9b0dad 100644 --- a/media-plugins/xbmc-addon-xvdr/xbmc-addon-xvdr-9999.ebuild +++ b/media-plugins/xbmc-addon-xvdr/xbmc-addon-xvdr-9999.ebuild @@ -25,7 +25,7 @@ src_configure() { } src_install() { - emake DESTDIR="${D}" install || die "emake install failed" + emake DESTDIR="${D}" install } pkg_info() { diff --git a/media-sound/id3ed/id3ed-1.10.4-r1.ebuild b/media-sound/id3ed/id3ed-1.10.4-r1.ebuild index 45fd013ab93d..047402e4be69 100644 --- a/media-sound/id3ed/id3ed-1.10.4-r1.ebuild +++ b/media-sound/id3ed/id3ed-1.10.4-r1.ebuild @@ -26,7 +26,7 @@ src_prepare() { } src_compile() { - emake CXX="$(tc-getCXX)" CFLAGS="${CFLAGS} -I./" || die + emake CXX="$(tc-getCXX)" CFLAGS="${CFLAGS} -I./" } src_install() { diff --git a/media-sound/peercast/peercast-0.1218-r2.ebuild b/media-sound/peercast/peercast-0.1218-r2.ebuild index 8034fe6aef9d..463ecc557718 100644 --- a/media-sound/peercast/peercast-0.1218-r2.ebuild +++ b/media-sound/peercast/peercast-0.1218-r2.ebuild @@ -32,7 +32,7 @@ src_compile() { cd ui/linux emake CC="$(tc-getCC)" CXX="$(tc-getCXX)" \ AR="$(tc-getAR)" LDFLAGS="${LDFLAGS}" \ - LD="$(tc-getCXX)" || die "emake failed" + LD="$(tc-getCXX)" } src_install() { diff --git a/media-sound/pwavecat/pwavecat-0.4.5.ebuild b/media-sound/pwavecat/pwavecat-0.4.5.ebuild index 91a5792d8a0c..21a4580caba4 100644 --- a/media-sound/pwavecat/pwavecat-0.4.5.ebuild +++ b/media-sound/pwavecat/pwavecat-0.4.5.ebuild @@ -21,10 +21,10 @@ PATCHES=( src_compile() { append-flags -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE - emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}" || die "emake failed" + emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}" } src_install() { - dobin pwavecat || die + dobin pwavecat default } diff --git a/media-sound/sndpeek/sndpeek-1.4.ebuild b/media-sound/sndpeek/sndpeek-1.4.ebuild index 854e6e44670c..b60e397e0d76 100644 --- a/media-sound/sndpeek/sndpeek-1.4.ebuild +++ b/media-sound/sndpeek/sndpeek-1.4.ebuild @@ -37,7 +37,7 @@ compile_backend() { cd "${S}/src/sndpeek" einfo "Compiling against ${backend}" emake -f "makefile.${backend}" CC=$(tc-getCC) \ - CXX=$(tc-getCXX) || die "emake failed" + CXX=$(tc-getCXX) mv sndpeek{,-${backend}} emake -f "makefile.${backend}" clean cd - diff --git a/media-sound/xwax/xwax-1.6.ebuild b/media-sound/xwax/xwax-1.6.ebuild index 9565610d9290..fe9164967149 100644 --- a/media-sound/xwax/xwax-1.6.ebuild +++ b/media-sound/xwax/xwax-1.6.ebuild @@ -67,12 +67,12 @@ src_install() { # This is easier than setting all the environment variables # needed, running the sed script required to get the man directory # correct, and removing the GPL-2 after a 'make install' run - dobin xwax || die "failed to install xwax" - newbin scan xwax-scan || die "failed to install xwax-scan" - newbin import xwax-import || die "failed to install xwax-import" - doman xwax.1 || die "failed to install man page" + dobin xwax + newbin scan xwax-scan + newbin import xwax-import + doman xwax.1 - dodoc ${DOCS} || die "failed to install docs" + dodoc ${DOCS} insinto "/etc/security/limits.d" newins "${FILESDIR}/xwax-etc-security-limits.conf" xwax.conf diff --git a/media-tv/gentoo-vdr-scripts/gentoo-vdr-scripts-2.0.0.ebuild b/media-tv/gentoo-vdr-scripts/gentoo-vdr-scripts-2.0.0.ebuild index 7dfa59508244..9bcc52db6948 100644 --- a/media-tv/gentoo-vdr-scripts/gentoo-vdr-scripts-2.0.0.ebuild +++ b/media-tv/gentoo-vdr-scripts/gentoo-vdr-scripts-2.0.0.ebuild @@ -38,7 +38,7 @@ src_prepare() { } src_install() { - emake -s install DESTDIR="${D}" || die "make install failed" + emake -s install DESTDIR="${D}" dodoc README TODO ChangeLog README.grub2 # create necessary directories diff --git a/media-tv/gentoo-vdr-scripts/gentoo-vdr-scripts-2.5.ebuild b/media-tv/gentoo-vdr-scripts/gentoo-vdr-scripts-2.5.ebuild index 9e6b28936a4c..8336694cbce9 100644 --- a/media-tv/gentoo-vdr-scripts/gentoo-vdr-scripts-2.5.ebuild +++ b/media-tv/gentoo-vdr-scripts/gentoo-vdr-scripts-2.5.ebuild @@ -38,7 +38,7 @@ src_prepare() { } src_install() { - emake -s install DESTDIR="${D}" || die "make install failed" + emake -s install DESTDIR="${D}" dodoc README TODO ChangeLog README.grub2 README.shutdown README.shutdown-jobs README.systemd README.vdrcaps # create necessary directories diff --git a/media-video/dvbsnoop/dvbsnoop-1.4.50-r1.ebuild b/media-video/dvbsnoop/dvbsnoop-1.4.50-r1.ebuild index f43b51400d77..9072540ce20a 100644 --- a/media-video/dvbsnoop/dvbsnoop-1.4.50-r1.ebuild +++ b/media-video/dvbsnoop/dvbsnoop-1.4.50-r1.ebuild @@ -21,7 +21,7 @@ src_prepare () { } src_install () { - emake DESTDIR="${D}" install || die "emake install failed" + emake DESTDIR="${D}" install dodoc AUTHORS ChangeLog README } diff --git a/media-video/lxdvdrip/lxdvdrip-1.77.ebuild b/media-video/lxdvdrip/lxdvdrip-1.77.ebuild index 74763867b526..8dac5c83b2b3 100644 --- a/media-video/lxdvdrip/lxdvdrip-1.77.ebuild +++ b/media-video/lxdvdrip/lxdvdrip-1.77.ebuild @@ -27,14 +27,14 @@ src_prepare() { } src_compile() { - CC="$(tc-getCC)" emake || die "emake failed" + CC="$(tc-getCC)" emake cd "${S}/vamps" - emake CC="$(tc-getCC)" || die "emake lxdvdip vamps failed" + emake CC="$(tc-getCC)" } src_install () { - dobin lxdvdrip || die - dobin lxac3scan || die + dobin lxdvdrip + dobin lxac3scan dodoc doc-pak/Changelog* doc-pak/Credits doc-pak/Debugging.* dodoc doc-pak/lxdvdrip.conf* doc-pak/README* doman lxdvdrip.1 @@ -46,5 +46,5 @@ src_install () { newins doc-pak/lxdvdrip.conf.EN lxdvdrip.conf cd "${S}/vamps" - emake PREFIX="${D}/usr" install || die "make install failed for vamps!" + emake PREFIX="${D}/usr" install } diff --git a/media-video/shrip/shrip-0.6.0-r1.ebuild b/media-video/shrip/shrip-0.6.0-r1.ebuild index c39bbd4530d9..cfc6ffb404a2 100644 --- a/media-video/shrip/shrip-0.6.0-r1.ebuild +++ b/media-video/shrip/shrip-0.6.0-r1.ebuild @@ -33,9 +33,9 @@ src_configure() { } src_install() { - emake DESTDIR="${D}" install || die + emake DESTDIR="${D}" install dodoc AUTHORS ChangeLog README TODO insinto /etc - doins shrip.conf || die + doins shrip.conf } diff --git a/media-video/xvattr/xvattr-1.3-r3.ebuild b/media-video/xvattr/xvattr-1.3-r3.ebuild index be3c419d34db..1a41d60604e0 100644 --- a/media-video/xvattr/xvattr-1.3-r3.ebuild +++ b/media-video/xvattr/xvattr-1.3-r3.ebuild @@ -33,6 +33,6 @@ src_configure() { } src_install() { - emake DESTDIR="${D}" install || die "emake install failed." + emake DESTDIR="${D}" install dodoc AUTHORS ChangeLog NEWS README } diff --git a/net-analyzer/openbsd-netcat/openbsd-netcat-1.105-r1.ebuild b/net-analyzer/openbsd-netcat/openbsd-netcat-1.105-r1.ebuild index fbc35796377b..298a47420fd0 100644 --- a/net-analyzer/openbsd-netcat/openbsd-netcat-1.105-r1.ebuild +++ b/net-analyzer/openbsd-netcat/openbsd-netcat-1.105-r1.ebuild @@ -34,7 +34,7 @@ src_prepare() { } src_compile() { - emake CC=$(tc-getCC) CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" || die + emake CC=$(tc-getCC) CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" } src_install() { diff --git a/net-analyzer/tcpreplay/tcpreplay-4.3.2.ebuild b/net-analyzer/tcpreplay/tcpreplay-4.3.2.ebuild index 3d0c5b4f1d7a..003400e4ef70 100644 --- a/net-analyzer/tcpreplay/tcpreplay-4.3.2.ebuild +++ b/net-analyzer/tcpreplay/tcpreplay-4.3.2.ebuild @@ -65,7 +65,7 @@ src_test() { ewarn "Some tests were disabled due to FEATURES=userpriv" ewarn "To run all tests issue the following command as root:" ewarn " # make -C ${S}/test" - emake -j1 -C test tcpprep || die "self test failed - see ${S}/test/test.log" + emake -j1 -C test tcpprep else emake -j1 test || { ewarn "Note that some tests require eth0 iface to be up." ; diff --git a/net-analyzer/tcpreplay/tcpreplay-999999.ebuild b/net-analyzer/tcpreplay/tcpreplay-999999.ebuild index 36c173f66f59..9e2776949df2 100644 --- a/net-analyzer/tcpreplay/tcpreplay-999999.ebuild +++ b/net-analyzer/tcpreplay/tcpreplay-999999.ebuild @@ -64,7 +64,7 @@ src_test() { ewarn "Some tests will be disabled due to FEATURES=userpriv" ewarn "To run all tests issue the following command as root:" ewarn " # make -C ${S}/test" - emake -j1 -C test tcpprep || die "self test failed - see ${S}/test/test.log" + emake -j1 -C test tcpprep else emake -j1 test || { ewarn "Note that some tests require eth0 iface to be up." ; diff --git a/net-analyzer/thrulay/thrulay-0.9-r1.ebuild b/net-analyzer/thrulay/thrulay-0.9-r1.ebuild index f7e905e1772a..f66426aacee5 100644 --- a/net-analyzer/thrulay/thrulay-0.9-r1.ebuild +++ b/net-analyzer/thrulay/thrulay-0.9-r1.ebuild @@ -20,11 +20,11 @@ src_prepare() { } src_install() { - emake install DESTDIR="${D}" || die "emake install failed" + emake install DESTDIR="${D}" #dobin src/thrulay || die "dobin failed" #dosbin src/thrulayd || die "dosbin failed" - dodoc LICENSE README TODO doc/thrulay-protocol.txt || die "dodoc failed" - doman doc/thrulay*.[1-8] || die "doman failed" - newinitd "${FILESDIR}"/thrulayd-init.d thrulayd || die "newinitd failed" - newconfd "${FILESDIR}"/thrulayd-conf.d thrulayd || die "newconfd failed" + dodoc LICENSE README TODO doc/thrulay-protocol.txt + doman doc/thrulay*.[1-8] + newinitd "${FILESDIR}"/thrulayd-init.d thrulayd + newconfd "${FILESDIR}"/thrulayd-conf.d thrulayd } diff --git a/net-analyzer/tptest/tptest-3.1.7-r2.ebuild b/net-analyzer/tptest/tptest-3.1.7-r2.ebuild index d580934eae8f..709ad3a89a3e 100644 --- a/net-analyzer/tptest/tptest-3.1.7-r2.ebuild +++ b/net-analyzer/tptest/tptest-3.1.7-r2.ebuild @@ -26,12 +26,11 @@ src_prepare() { src_compile() { emake -C apps/unix/client \ CC=$(tc-getCC) \ - LDFLAGS="${LDFLAGS}" \ - || die + LDFLAGS="${LDFLAGS}" + emake -C apps/unix/server \ CC=$(tc-getCC) \ - LDFLAGS="${LDFLAGS}" \ - || die + LDFLAGS="${LDFLAGS}" } src_install() { diff --git a/net-analyzer/tsung/tsung-1.7.0.ebuild b/net-analyzer/tsung/tsung-1.7.0.ebuild index d2d90fd44c21..80940ea2f4aa 100644 --- a/net-analyzer/tsung/tsung-1.7.0.ebuild +++ b/net-analyzer/tsung/tsung-1.7.0.ebuild @@ -30,9 +30,9 @@ src_configure() { } src_compile() { - emake || die "Failed building" + emake } src_install() { - emake -j1 DESTDIR="${D}" install || die "Failed installing" + emake -j1 DESTDIR="${D}" install } diff --git a/net-analyzer/zabbix/zabbix-2.2.16-r1.ebuild b/net-analyzer/zabbix/zabbix-2.2.16-r1.ebuild index cd75b8d90b24..26b70005d753 100644 --- a/net-analyzer/zabbix/zabbix-2.2.16-r1.ebuild +++ b/net-analyzer/zabbix/zabbix-2.2.16-r1.ebuild @@ -135,13 +135,12 @@ src_configure() { $(use_with openipmi openipmi) \ $(use_with ssh ssh2) \ $(use_with libxml2) \ - $(use_with odbc unixodbc) \ - || die "econf failed" + $(use_with odbc unixodbc) } src_compile() { if [ -f Makefile ] || [ -f GNUmakefile ] || [ -f makefile ]; then - emake AR="$(tc-getAR)" RANLIB="$(tc-getRANLIB)" || die "emake failed" + emake AR="$(tc-getAR)" RANLIB="$(tc-getRANLIB)" fi } diff --git a/net-analyzer/zabbix/zabbix-3.0.28.ebuild b/net-analyzer/zabbix/zabbix-3.0.28.ebuild index 64dc6af6ad83..09ba412f2f86 100644 --- a/net-analyzer/zabbix/zabbix-3.0.28.ebuild +++ b/net-analyzer/zabbix/zabbix-3.0.28.ebuild @@ -137,13 +137,12 @@ src_configure() { $(use_with ssh ssh2) \ $(use_with libxml2) \ $(use_with odbc unixodbc) \ - $(use_with ssl openssl) \ - || die "econf failed" + $(use_with ssl openssl) } src_compile() { if [ -f Makefile ] || [ -f GNUmakefile ] || [ -f makefile ]; then - emake AR="$(tc-getAR)" RANLIB="$(tc-getRANLIB)" || die "emake failed" + emake AR="$(tc-getAR)" RANLIB="$(tc-getRANLIB)" fi } diff --git a/net-analyzer/zabbix/zabbix-3.4.15.ebuild b/net-analyzer/zabbix/zabbix-3.4.15.ebuild index 4d9f2799daa6..0169c3ac73bf 100644 --- a/net-analyzer/zabbix/zabbix-3.4.15.ebuild +++ b/net-analyzer/zabbix/zabbix-3.4.15.ebuild @@ -138,13 +138,12 @@ src_configure() { $(use_with ssh ssh2) \ $(use_with libxml2) \ $(use_with odbc unixodbc) \ - $(use_with ssl openssl) \ - || die "econf failed" + $(use_with ssl openssl) } src_compile() { if [ -f Makefile ] || [ -f GNUmakefile ] || [ -f makefile ]; then - emake AR="$(tc-getAR)" RANLIB="$(tc-getRANLIB)" || die "emake failed" + emake AR="$(tc-getAR)" RANLIB="$(tc-getRANLIB)" fi } diff --git a/net-analyzer/zabbix/zabbix-4.0.13.ebuild b/net-analyzer/zabbix/zabbix-4.0.13.ebuild index 7b8602240625..2e1f7d320991 100644 --- a/net-analyzer/zabbix/zabbix-4.0.13.ebuild +++ b/net-analyzer/zabbix/zabbix-4.0.13.ebuild @@ -142,13 +142,12 @@ src_configure() { $(use_with ssh ssh2) \ $(use_with libxml2) \ $(use_with odbc unixodbc) \ - $(use_with ssl openssl) \ - || die "econf failed" + $(use_with ssl openssl) } src_compile() { if [ -f Makefile ] || [ -f GNUmakefile ] || [ -f makefile ]; then - emake AR="$(tc-getAR)" RANLIB="$(tc-getRANLIB)" || die "emake failed" + emake AR="$(tc-getAR)" RANLIB="$(tc-getRANLIB)" fi } diff --git a/net-analyzer/zabbix/zabbix-4.2.7.ebuild b/net-analyzer/zabbix/zabbix-4.2.7.ebuild index ce4694480bfa..190162272899 100644 --- a/net-analyzer/zabbix/zabbix-4.2.7.ebuild +++ b/net-analyzer/zabbix/zabbix-4.2.7.ebuild @@ -142,13 +142,12 @@ src_configure() { $(use_with ssh ssh2) \ $(use_with libxml2) \ $(use_with odbc unixodbc) \ - $(use_with ssl openssl) \ - || die "econf failed" + $(use_with ssl openssl) } src_compile() { if [ -f Makefile ] || [ -f GNUmakefile ] || [ -f makefile ]; then - emake AR="$(tc-getAR)" RANLIB="$(tc-getRANLIB)" || die "emake failed" + emake AR="$(tc-getAR)" RANLIB="$(tc-getRANLIB)" fi } diff --git a/net-analyzer/zabbix/zabbix-4.4.0.ebuild b/net-analyzer/zabbix/zabbix-4.4.0.ebuild index ce4694480bfa..190162272899 100644 --- a/net-analyzer/zabbix/zabbix-4.4.0.ebuild +++ b/net-analyzer/zabbix/zabbix-4.4.0.ebuild @@ -142,13 +142,12 @@ src_configure() { $(use_with ssh ssh2) \ $(use_with libxml2) \ $(use_with odbc unixodbc) \ - $(use_with ssl openssl) \ - || die "econf failed" + $(use_with ssl openssl) } src_compile() { if [ -f Makefile ] || [ -f GNUmakefile ] || [ -f makefile ]; then - emake AR="$(tc-getAR)" RANLIB="$(tc-getRANLIB)" || die "emake failed" + emake AR="$(tc-getAR)" RANLIB="$(tc-getRANLIB)" fi } diff --git a/net-dialup/mgetty/mgetty-1.2.1.ebuild b/net-dialup/mgetty/mgetty-1.2.1.ebuild index 3f2e2683eddd..0bf35cf88fda 100644 --- a/net-dialup/mgetty/mgetty-1.2.1.ebuild +++ b/net-dialup/mgetty/mgetty-1.2.1.ebuild @@ -120,7 +120,7 @@ src_install () { #Install mgetty into /sbin (#119078) dodir /sbin && \ mv "${D}"/usr/sbin/mgetty "${D}"/sbin && \ - dosym /sbin/mgetty /usr/sbin/mgetty || die "failed to install /sbin/mgetty" + dosym /sbin/mgetty /usr/sbin/mgetty #Don't install ct (#106337) rm "${D}"/usr/bin/ct || die "failed to remove useless ct program" diff --git a/net-dialup/rp-pppoe/rp-pppoe-3.12-r1.ebuild b/net-dialup/rp-pppoe/rp-pppoe-3.12-r1.ebuild index 4ac3355af7cb..ec86e01bd7fb 100644 --- a/net-dialup/rp-pppoe/rp-pppoe-3.12-r1.ebuild +++ b/net-dialup/rp-pppoe/rp-pppoe-3.12-r1.ebuild @@ -73,7 +73,7 @@ src_compile() { emake if use tk; then - emake -C "${S}/gui" || die "gui make failed" + emake -C "${S}/gui" fi } diff --git a/net-dialup/rp-pppoe/rp-pppoe-3.13.ebuild b/net-dialup/rp-pppoe/rp-pppoe-3.13.ebuild index 5a62bbd85690..2f775fca64a2 100644 --- a/net-dialup/rp-pppoe/rp-pppoe-3.13.ebuild +++ b/net-dialup/rp-pppoe/rp-pppoe-3.13.ebuild @@ -75,7 +75,7 @@ src_compile() { emake if use tk; then - emake -C "${S}/gui" || die "gui make failed" + emake -C "${S}/gui" fi } diff --git a/net-dns/avahi/avahi-0.7-r2.ebuild b/net-dns/avahi/avahi-0.7-r2.ebuild index 7728bc27faac..5768b6f05c1a 100644 --- a/net-dns/avahi/avahi-0.7-r2.ebuild +++ b/net-dns/avahi/avahi-0.7-r2.ebuild @@ -190,7 +190,7 @@ multilib_src_install() { docinto html dodoc -r doxygen/html/. insinto /usr/share/devhelp/books/avahi - doins avahi.devhelp || die + doins avahi.devhelp fi # The build system creates an empty "/run" directory, so we clean it up here diff --git a/net-dns/avahi/avahi-0.7-r4.ebuild b/net-dns/avahi/avahi-0.7-r4.ebuild index 3891e557578a..045191094868 100644 --- a/net-dns/avahi/avahi-0.7-r4.ebuild +++ b/net-dns/avahi/avahi-0.7-r4.ebuild @@ -184,7 +184,7 @@ multilib_src_install() { docinto html dodoc -r doxygen/html/. insinto /usr/share/devhelp/books/avahi - doins avahi.devhelp || die + doins avahi.devhelp fi # The build system creates an empty "/run" directory, so we clean it up here diff --git a/net-dns/odsclient/odsclient-1.03-r1.ebuild b/net-dns/odsclient/odsclient-1.03-r1.ebuild index 4f928f134a1e..7222b961927d 100644 --- a/net-dns/odsclient/odsclient-1.03-r1.ebuild +++ b/net-dns/odsclient/odsclient-1.03-r1.ebuild @@ -25,8 +25,7 @@ src_compile() { emake \ CC=$(tc-getCC) \ CFLAGS="${CFLAGS}" \ - LDFLAGS="${LDFLAGS}" \ - || die + LDFLAGS="${LDFLAGS}" } src_install() { diff --git a/net-dns/sheerdns/sheerdns-1.0.3.ebuild b/net-dns/sheerdns/sheerdns-1.0.3.ebuild index d1e7c5e721a3..4ef9604323b8 100644 --- a/net-dns/sheerdns/sheerdns-1.0.3.ebuild +++ b/net-dns/sheerdns/sheerdns-1.0.3.ebuild @@ -22,7 +22,7 @@ src_prepare() { } src_compile() { - emake CC=$(tc-getCC) || die + emake CC=$(tc-getCC) } src_install() { diff --git a/net-fs/ncpfs/ncpfs-2.2.6-r3.ebuild b/net-fs/ncpfs/ncpfs-2.2.6-r3.ebuild index aeda73ee956a..3cababd6aa33 100644 --- a/net-fs/ncpfs/ncpfs-2.2.6-r3.ebuild +++ b/net-fs/ncpfs/ncpfs-2.2.6-r3.ebuild @@ -77,8 +77,8 @@ src_install() { #ln -s "${D}"/usr/lib64/libncp.so.2.3 "${D}"/libncp.so.2.3.0 # Install the main programs, then the headers. - emake DESTDIR="${D}" install || die - emake DESTDIR="${D}" install-dev || die + emake DESTDIR="${D}" install + emake DESTDIR="${D}" install-dev # Install a startup script in /etc/init.d and a conf file in /etc/conf.d newconfd "${FILESDIR}"/ipx.confd ipx diff --git a/net-fs/samba/samba-4.10.10.ebuild b/net-fs/samba/samba-4.10.10.ebuild index d24131ca91cb..1f0de6ef9a86 100644 --- a/net-fs/samba/samba-4.10.10.ebuild +++ b/net-fs/samba/samba-4.10.10.ebuild @@ -280,7 +280,7 @@ multilib_src_install() { newpamd "${CONFDIR}/system-auth-winbind.pam" system-auth-winbind # bugs #376853 and #590374 insinto /etc/security - doins examples/pam_winbind/pam_winbind.conf || die + doins examples/pam_winbind/pam_winbind.conf fi keepdir /var/cache/samba diff --git a/net-fs/samba/samba-4.10.2.ebuild b/net-fs/samba/samba-4.10.2.ebuild index a1e8acf7aed2..7517cb4afc56 100644 --- a/net-fs/samba/samba-4.10.2.ebuild +++ b/net-fs/samba/samba-4.10.2.ebuild @@ -279,7 +279,7 @@ multilib_src_install() { newpamd "${CONFDIR}/system-auth-winbind.pam" system-auth-winbind # bugs #376853 and #590374 insinto /etc/security - doins examples/pam_winbind/pam_winbind.conf || die + doins examples/pam_winbind/pam_winbind.conf fi keepdir /var/cache/samba diff --git a/net-fs/samba/samba-4.10.8.ebuild b/net-fs/samba/samba-4.10.8.ebuild index 66119026d236..b675f8c85a89 100644 --- a/net-fs/samba/samba-4.10.8.ebuild +++ b/net-fs/samba/samba-4.10.8.ebuild @@ -280,7 +280,7 @@ multilib_src_install() { newpamd "${CONFDIR}/system-auth-winbind.pam" system-auth-winbind # bugs #376853 and #590374 insinto /etc/security - doins examples/pam_winbind/pam_winbind.conf || die + doins examples/pam_winbind/pam_winbind.conf fi keepdir /var/cache/samba diff --git a/net-fs/samba/samba-4.11.1.ebuild b/net-fs/samba/samba-4.11.1.ebuild index e971356a350a..8a88f65a21d8 100644 --- a/net-fs/samba/samba-4.11.1.ebuild +++ b/net-fs/samba/samba-4.11.1.ebuild @@ -276,7 +276,7 @@ multilib_src_install() { newpamd "${CONFDIR}/system-auth-winbind.pam" system-auth-winbind # bugs #376853 and #590374 insinto /etc/security - doins examples/pam_winbind/pam_winbind.conf || die + doins examples/pam_winbind/pam_winbind.conf fi keepdir /var/cache/samba diff --git a/net-fs/samba/samba-4.11.2.ebuild b/net-fs/samba/samba-4.11.2.ebuild index e971356a350a..8a88f65a21d8 100644 --- a/net-fs/samba/samba-4.11.2.ebuild +++ b/net-fs/samba/samba-4.11.2.ebuild @@ -276,7 +276,7 @@ multilib_src_install() { newpamd "${CONFDIR}/system-auth-winbind.pam" system-auth-winbind # bugs #376853 and #590374 insinto /etc/security - doins examples/pam_winbind/pam_winbind.conf || die + doins examples/pam_winbind/pam_winbind.conf fi keepdir /var/cache/samba diff --git a/net-fs/samba/samba-4.8.12.ebuild b/net-fs/samba/samba-4.8.12.ebuild index a16b7a81e761..ad3cf03c2386 100644 --- a/net-fs/samba/samba-4.8.12.ebuild +++ b/net-fs/samba/samba-4.8.12.ebuild @@ -275,7 +275,7 @@ multilib_src_install() { newpamd "${CONFDIR}/system-auth-winbind.pam" system-auth-winbind # bugs #376853 and #590374 insinto /etc/security - doins examples/pam_winbind/pam_winbind.conf || die + doins examples/pam_winbind/pam_winbind.conf fi keepdir /var/cache/samba diff --git a/net-fs/samba/samba-4.8.6-r3.ebuild b/net-fs/samba/samba-4.8.6-r3.ebuild index 6be58e9b9728..9d93bd81c79e 100644 --- a/net-fs/samba/samba-4.8.6-r3.ebuild +++ b/net-fs/samba/samba-4.8.6-r3.ebuild @@ -273,7 +273,7 @@ multilib_src_install() { newpamd "${CONFDIR}/system-auth-winbind.pam" system-auth-winbind # bugs #376853 and #590374 insinto /etc/security - doins examples/pam_winbind/pam_winbind.conf || die + doins examples/pam_winbind/pam_winbind.conf fi keepdir /var/cache/samba diff --git a/net-fs/samba/samba-4.9.13.ebuild b/net-fs/samba/samba-4.9.13.ebuild index d2b15f5811ff..b65c53c68ed6 100644 --- a/net-fs/samba/samba-4.9.13.ebuild +++ b/net-fs/samba/samba-4.9.13.ebuild @@ -279,7 +279,7 @@ multilib_src_install() { newpamd "${CONFDIR}/system-auth-winbind.pam" system-auth-winbind # bugs #376853 and #590374 insinto /etc/security - doins examples/pam_winbind/pam_winbind.conf || die + doins examples/pam_winbind/pam_winbind.conf fi keepdir /var/cache/samba diff --git a/net-fs/samba/samba-4.9.15.ebuild b/net-fs/samba/samba-4.9.15.ebuild index 0253eb32433a..3ad0587ccb32 100644 --- a/net-fs/samba/samba-4.9.15.ebuild +++ b/net-fs/samba/samba-4.9.15.ebuild @@ -279,7 +279,7 @@ multilib_src_install() { newpamd "${CONFDIR}/system-auth-winbind.pam" system-auth-winbind # bugs #376853 and #590374 insinto /etc/security - doins examples/pam_winbind/pam_winbind.conf || die + doins examples/pam_winbind/pam_winbind.conf fi keepdir /var/cache/samba diff --git a/net-fs/samba/samba-4.9.16.ebuild b/net-fs/samba/samba-4.9.16.ebuild index 0253eb32433a..3ad0587ccb32 100644 --- a/net-fs/samba/samba-4.9.16.ebuild +++ b/net-fs/samba/samba-4.9.16.ebuild @@ -279,7 +279,7 @@ multilib_src_install() { newpamd "${CONFDIR}/system-auth-winbind.pam" system-auth-winbind # bugs #376853 and #590374 insinto /etc/security - doins examples/pam_winbind/pam_winbind.conf || die + doins examples/pam_winbind/pam_winbind.conf fi keepdir /var/cache/samba diff --git a/net-ftp/ftpbase/ftpbase-0.01-r3.ebuild b/net-ftp/ftpbase/ftpbase-0.01-r3.ebuild index e6aa6b99df8c..54fd9199f7a6 100644 --- a/net-ftp/ftpbase/ftpbase-0.01-r3.ebuild +++ b/net-ftp/ftpbase/ftpbase-0.01-r3.ebuild @@ -28,7 +28,7 @@ src_install() { # The ftpusers file is a list of people who are NOT allowed # to use the ftp service. insinto /etc - doins "${FILESDIR}/ftpusers" || die + doins "${FILESDIR}/ftpusers" cp "${FILESDIR}/ftp-pamd-include" "${T}" || die if use elibc_FreeBSD; then diff --git a/net-ftp/tnftp/tnftp-20141104.ebuild b/net-ftp/tnftp/tnftp-20141104.ebuild index d36fa9f33364..b8180b5c2ab6 100644 --- a/net-ftp/tnftp/tnftp-20141104.ebuild +++ b/net-ftp/tnftp/tnftp-20141104.ebuild @@ -21,11 +21,10 @@ src_configure() { econf \ --enable-editcomplete \ $(use_enable ipv6) \ - $(use_with socks5 socks) \ - || die "econf failed" + $(use_with socks5 socks) } src_install() { - emake install DESTDIR="${D}" || die "emake install failed" - dodoc ChangeLog README THANKS || die "dodoc failed" + emake install DESTDIR="${D}" + dodoc ChangeLog README THANKS } diff --git a/net-ftp/tnftp/tnftp-20151004.ebuild b/net-ftp/tnftp/tnftp-20151004.ebuild index c39d0e1b907c..fff01fa2c0b8 100644 --- a/net-ftp/tnftp/tnftp-20151004.ebuild +++ b/net-ftp/tnftp/tnftp-20151004.ebuild @@ -21,11 +21,10 @@ src_configure() { econf \ --enable-editcomplete \ $(use_enable ipv6) \ - $(use_with socks5 socks) \ - || die "econf failed" + $(use_with socks5 socks) } src_install() { - emake install DESTDIR="${D}" || die "emake install failed" - dodoc ChangeLog README THANKS || die "dodoc failed" + emake install DESTDIR="${D}" + dodoc ChangeLog README THANKS } diff --git a/net-ftp/vsftpd/vsftpd-3.0.3-r2.ebuild b/net-ftp/vsftpd/vsftpd-3.0.3-r2.ebuild index 6559c9946105..361b7f7bfc3f 100644 --- a/net-ftp/vsftpd/vsftpd-3.0.3-r2.ebuild +++ b/net-ftp/vsftpd/vsftpd-3.0.3-r2.ebuild @@ -81,7 +81,7 @@ src_compile() { src_install() { into /usr doman ${PN}.conf.5 ${PN}.8 - dosbin ${PN} || die "disbin failed" + dosbin ${PN} dodoc AUDIT BENCHMARKS BUGS Changelog FAQ \ README README.security REWARD SIZE \ @@ -89,10 +89,10 @@ src_install() { newdoc ${PN}.conf ${PN}.conf.example docinto security - dodoc SECURITY/* || die "dodoc failed" + dodoc SECURITY/* insinto "/usr/share/doc/${PF}/examples" - doins -r EXAMPLE/* || die "doins faileD" + doins -r EXAMPLE/* insinto /etc/${PN} newins ${PN}.conf{,.example} diff --git a/net-irc/pisg/pisg-0.73-r1.ebuild b/net-irc/pisg/pisg-0.73-r1.ebuild index 0f18934b56e2..54dc6db49cb8 100644 --- a/net-irc/pisg/pisg-0.73-r1.ebuild +++ b/net-irc/pisg/pisg-0.73-r1.ebuild @@ -32,7 +32,7 @@ src_compile() { src_install() { perl_set_version - dobin pisg || die "dobin failed" + dobin pisg insinto "${VENDOR_LIB}" doins -r modules/. diff --git a/net-irc/ptlink-opm/ptlink-opm-1.3.1-r1.ebuild b/net-irc/ptlink-opm/ptlink-opm-1.3.1-r1.ebuild index 982206e1e300..7ad9abad1cc4 100644 --- a/net-irc/ptlink-opm/ptlink-opm-1.3.1-r1.ebuild +++ b/net-irc/ptlink-opm/ptlink-opm-1.3.1-r1.ebuild @@ -36,7 +36,7 @@ src_install() { keepdir /var/{lib,log}/ptlink-opm dosym /var/log/ptlink-opm /var/lib/ptlink-opm/log - dodoc CHANGES README || die "dodoc failed" + dodoc CHANGES README newinitd "${FILESDIR}"/ptlink-opm.init.d ptlink-opm newconfd "${FILESDIR}"/ptlink-opm.conf.d ptlink-opm diff --git a/net-libs/NativeThread/NativeThread-0_pre20190914.ebuild b/net-libs/NativeThread/NativeThread-0_pre20190914.ebuild index ccecbccb7bc7..a13407892c05 100644 --- a/net-libs/NativeThread/NativeThread-0_pre20190914.ebuild +++ b/net-libs/NativeThread/NativeThread-0_pre20190914.ebuild @@ -23,10 +23,10 @@ S="${WORKDIR}" src_compile() { append-flags -fPIC tc-export CC - emake || die + emake } src_install() { - dolib.so lib${PN}.so || die - dosym lib${PN}.so /usr/$(get_libdir)/libnative.so || die + dolib.so lib${PN}.so + dosym lib${PN}.so /usr/$(get_libdir)/libnative.so } diff --git a/net-libs/axtls/axtls-1.5.3.ebuild b/net-libs/axtls/axtls-1.5.3.ebuild index 47c0da37b128..1f02d467d121 100644 --- a/net-libs/axtls/axtls-1.5.3.ebuild +++ b/net-libs/axtls/axtls-1.5.3.ebuild @@ -117,7 +117,7 @@ use_flag_config() { config/.config || die fi - yes "n" | emake -j1 oldconfig > /dev/null || die + emake -j1 oldconfig < <(yes n) > /dev/null } multilib_src_configure() { @@ -137,7 +137,7 @@ multilib_src_configure() { ewarn "No saved config, seeding with the default" cp "${FILESDIR}"/config config/.config || die fi - yes "" | emake -j1 oldconfig > /dev/null || die + emake -j1 oldconfig < <(yes '') > /dev/null else use_flag_config fi diff --git a/net-libs/axtls/axtls-2.1.3.ebuild b/net-libs/axtls/axtls-2.1.3.ebuild index 06c5a89a4df1..b856997fc616 100644 --- a/net-libs/axtls/axtls-2.1.3.ebuild +++ b/net-libs/axtls/axtls-2.1.3.ebuild @@ -119,7 +119,7 @@ use_flag_config() { config/.config || die fi - yes "n" | emake -j1 oldconfig > /dev/null || die + emake -j1 oldconfig < <(yes n) > /dev/null } multilib_src_configure() { @@ -139,7 +139,7 @@ multilib_src_configure() { ewarn "No saved config, seeding with the default" cp "${FILESDIR}"/config config/.config || die fi - yes "" | emake -j1 oldconfig > /dev/null || die + emake -j1 oldconfig < <(yes '') > /dev/null else use_flag_config fi diff --git a/net-libs/axtls/axtls-2.1.4.ebuild b/net-libs/axtls/axtls-2.1.4.ebuild index b9c459a225e2..dcd2852e8235 100644 --- a/net-libs/axtls/axtls-2.1.4.ebuild +++ b/net-libs/axtls/axtls-2.1.4.ebuild @@ -119,7 +119,7 @@ use_flag_config() { config/.config || die fi - yes "n" | emake -j1 oldconfig > /dev/null || die + emake -j1 oldconfig < <(yes n) > /dev/null } multilib_src_configure() { @@ -139,7 +139,7 @@ multilib_src_configure() { ewarn "No saved config, seeding with the default" cp "${FILESDIR}"/config config/.config || die fi - yes "" | emake -j1 oldconfig > /dev/null || die + emake -j1 oldconfig < <(yes '') > /dev/null else use_flag_config fi diff --git a/net-libs/axtls/axtls-2.1.5.ebuild b/net-libs/axtls/axtls-2.1.5.ebuild index 490ad132093a..674385dd40d6 100644 --- a/net-libs/axtls/axtls-2.1.5.ebuild +++ b/net-libs/axtls/axtls-2.1.5.ebuild @@ -119,7 +119,7 @@ use_flag_config() { config/.config || die fi - yes "n" | emake -j1 oldconfig > /dev/null || die + emake -j1 oldconfig < <(yes n) > /dev/null } multilib_src_configure() { @@ -139,7 +139,7 @@ multilib_src_configure() { ewarn "No saved config, seeding with the default" cp "${FILESDIR}"/config config/.config || die fi - yes "" | emake -j1 oldconfig > /dev/null || die + emake -j1 oldconfig < <(yes '') > /dev/null else use_flag_config fi diff --git a/net-libs/gupnp-ui/gupnp-ui-0.1.1.ebuild b/net-libs/gupnp-ui/gupnp-ui-0.1.1.ebuild index b76fb5174a79..1469081e3807 100644 --- a/net-libs/gupnp-ui/gupnp-ui-0.1.1.ebuild +++ b/net-libs/gupnp-ui/gupnp-ui-0.1.1.ebuild @@ -34,6 +34,6 @@ src_configure() { } src_install() { - emake DESTDIR="${D}" install || die "emake install failed" + emake DESTDIR="${D}" install dodoc AUTHORS NEWS README } diff --git a/net-libs/libsmi/libsmi-0.4.8-r1.ebuild b/net-libs/libsmi/libsmi-0.4.8-r1.ebuild index d16177829871..ea0bf896ff10 100644 --- a/net-libs/libsmi/libsmi-0.4.8-r1.ebuild +++ b/net-libs/libsmi/libsmi-0.4.8-r1.ebuild @@ -26,7 +26,7 @@ src_test() { # sming test is known to fail and some other fail if LC_ALL!=C: # https://mail.ibr.cs.tu-bs.de/pipermail/libsmi/2008-March/001014.html sed -i '/^[[:space:]]*smidump-sming.test \\$/d' test/Makefile - LC_ALL=C emake -j1 check || die + LC_ALL=C emake -j1 check } src_install () { diff --git a/net-libs/libsmi/libsmi-0.5.0.ebuild b/net-libs/libsmi/libsmi-0.5.0.ebuild index 086a1135f946..464dd62053c4 100644 --- a/net-libs/libsmi/libsmi-0.5.0.ebuild +++ b/net-libs/libsmi/libsmi-0.5.0.ebuild @@ -21,7 +21,7 @@ src_test() { # sming test is known to fail and some other fail if LC_ALL!=C: # https://mail.ibr.cs.tu-bs.de/pipermail/libsmi/2008-March/001014.html sed -i '/^[[:space:]]*smidump-sming.test \\$/d' test/Makefile - LC_ALL=C emake -j1 check || die + LC_ALL=C emake -j1 check } src_install () { diff --git a/net-libs/nfqueue-bindings/nfqueue-bindings-0.5.ebuild b/net-libs/nfqueue-bindings/nfqueue-bindings-0.5.ebuild index a236c6709f93..208daba1fd23 100644 --- a/net-libs/nfqueue-bindings/nfqueue-bindings-0.5.ebuild +++ b/net-libs/nfqueue-bindings/nfqueue-bindings-0.5.ebuild @@ -63,7 +63,7 @@ src_prepare() { } src_install() { - emake DESTDIR="${D}" install PREFIX=/usr || die + emake DESTDIR="${D}" install PREFIX=/usr docinto examples use examples && dodoc examples/* } diff --git a/net-libs/nfqueue-bindings/nfqueue-bindings-0.6.ebuild b/net-libs/nfqueue-bindings/nfqueue-bindings-0.6.ebuild index f3bce16be25a..fb8f566b9270 100644 --- a/net-libs/nfqueue-bindings/nfqueue-bindings-0.6.ebuild +++ b/net-libs/nfqueue-bindings/nfqueue-bindings-0.6.ebuild @@ -61,7 +61,7 @@ src_prepare() { } src_install() { - emake DESTDIR="${D}" install PREFIX=/usr || die + emake DESTDIR="${D}" install PREFIX=/usr docinto examples use examples && dodoc examples/* } diff --git a/net-libs/zeromq/zeromq-2.2.0.ebuild b/net-libs/zeromq/zeromq-2.2.0.ebuild index a4cbd5d813aa..faa4e909ee3c 100644 --- a/net-libs/zeromq/zeromq-2.2.0.ebuild +++ b/net-libs/zeromq/zeromq-2.2.0.ebuild @@ -40,9 +40,9 @@ src_configure() { } src_install() { - emake DESTDIR="${D}" install || die "emake install failed" - dodoc NEWS README AUTHORS ChangeLog || die "dodoc failed" - doman doc/*.[1-9] || die "doman failed" + emake DESTDIR="${D}" install + dodoc NEWS README AUTHORS ChangeLog + doman doc/*.[1-9] # remove useless .la files find "${D}" -name '*.la' -delete diff --git a/net-mail/autorespond/autorespond-2.0.4.ebuild b/net-mail/autorespond/autorespond-2.0.4.ebuild index 94509c8a81be..d3be500ebcd5 100644 --- a/net-mail/autorespond/autorespond-2.0.4.ebuild +++ b/net-mail/autorespond/autorespond-2.0.4.ebuild @@ -19,12 +19,12 @@ PATCHES=( DOCS=( README help_message qmail-auto ChangeLog ) src_compile() { - emake CFLAGS="${CFLAGS}" || die + emake CFLAGS="${CFLAGS}" } src_install () { into /var/qmail - dobin autorespond || die "dobin failed" + dobin autorespond doman *.1 einstalldocs } diff --git a/net-mail/autorespond/autorespond-2.0.5.ebuild b/net-mail/autorespond/autorespond-2.0.5.ebuild index 813522f4365b..5e32640b6e10 100644 --- a/net-mail/autorespond/autorespond-2.0.5.ebuild +++ b/net-mail/autorespond/autorespond-2.0.5.ebuild @@ -18,12 +18,12 @@ PATCHES=( DOCS=( README help_message qmail-auto ) src_compile() { - emake CFLAGS="${CFLAGS}" || die + emake CFLAGS="${CFLAGS}" } src_install () { into /var/qmail - dobin autorespond || die "dobin failed" + dobin autorespond doman *.1 einstalldocs } diff --git a/net-mail/offlineimap/offlineimap-6.5.6.ebuild b/net-mail/offlineimap/offlineimap-6.5.6.ebuild index 8c7b027d79a2..960a6e04aad2 100644 --- a/net-mail/offlineimap/offlineimap-6.5.6.ebuild +++ b/net-mail/offlineimap/offlineimap-6.5.6.ebuild @@ -47,7 +47,7 @@ src_install() { dodoc offlineimap.conf offlineimap.conf.minimal if use doc ; then cd docs - doman offlineimap.1 || die "installing manpage failed" + doman offlineimap.1 fi } diff --git a/net-mail/pop-before-smtp/pop-before-smtp-1.42.ebuild b/net-mail/pop-before-smtp/pop-before-smtp-1.42.ebuild index 89c00b0fa817..4c233e12778f 100644 --- a/net-mail/pop-before-smtp/pop-before-smtp-1.42.ebuild +++ b/net-mail/pop-before-smtp/pop-before-smtp-1.42.ebuild @@ -26,10 +26,9 @@ src_prepare() { } src_install() { - dosbin pop-before-smtp || die "dosbin failed" + dosbin pop-before-smtp dodoc README ChangeLog TODO contrib/README.QUICKSTART insinto /etc - doins pop-before-smtp-conf.pl || die "doins failed" - newinitd "${FILESDIR}/pop-before-smtp.init" pop-before.smtp \ - || die "newinitd failed" + doins pop-before-smtp-conf.pl + newinitd "${FILESDIR}/pop-before-smtp.init" pop-before.smtp } diff --git a/net-mail/renattach/renattach-1.2.4-r1.ebuild b/net-mail/renattach/renattach-1.2.4-r1.ebuild index d89611b23f15..229c8450c7cc 100644 --- a/net-mail/renattach/renattach-1.2.4-r1.ebuild +++ b/net-mail/renattach/renattach-1.2.4-r1.ebuild @@ -13,9 +13,9 @@ KEYWORDS="~amd64 ~x86" IUSE="" src_install () { - emake DESTDIR="${D}" install || die + emake DESTDIR="${D}" install mv "${D}"/etc/renattach.conf.ex "${D}"/etc/renattach.conf || die - dodoc AUTHORS ChangeLog README NEWS || die + dodoc AUTHORS ChangeLog README NEWS } diff --git a/net-mail/rss2email/rss2email-2.71-r1.ebuild b/net-mail/rss2email/rss2email-2.71-r1.ebuild index 1fbb40b32186..215277e290fb 100644 --- a/net-mail/rss2email/rss2email-2.71-r1.ebuild +++ b/net-mail/rss2email/rss2email-2.71-r1.ebuild @@ -50,10 +50,10 @@ src_install() { python_foreach_impl my_install insinto /etc/${PN} - doins config.py.example || die + doins config.py.example - dodoc CHANGELOG readme.html || die - doman r2e.1 || die + dodoc CHANGELOG readme.html + doman r2e.1 # Replace r2e wrapper cat <<-"EOF" >r2e @@ -64,5 +64,5 @@ src_install() { exec python2 "${SITE_PACKAGES}"/rss2email/main.py "${CONF_DIR}"/feeds.dat $* EOF - dobin r2e || die + dobin r2e } diff --git a/net-mail/sendEmail/sendEmail-1.56-r1.ebuild b/net-mail/sendEmail/sendEmail-1.56-r1.ebuild index 65f4ff4912fc..acc2cc71391d 100644 --- a/net-mail/sendEmail/sendEmail-1.56-r1.ebuild +++ b/net-mail/sendEmail/sendEmail-1.56-r1.ebuild @@ -23,6 +23,6 @@ PATCHES=( "${FILESDIR}/${PV}-overzealous-version-check.patch" ) S="${WORKDIR}/${MY_P}" src_install() { - dobin sendEmail || die "failed to install sendEmail script" + dobin sendEmail dodoc CHANGELOG README TODO } diff --git a/net-mail/sendEmail/sendEmail-1.56-r2.ebuild b/net-mail/sendEmail/sendEmail-1.56-r2.ebuild index aaa924980ff6..8b8af8e7a317 100644 --- a/net-mail/sendEmail/sendEmail-1.56-r2.ebuild +++ b/net-mail/sendEmail/sendEmail-1.56-r2.ebuild @@ -24,6 +24,6 @@ PATCHES=( "${FILESDIR}/${PV}-overzealous-version-check.patch" S="${WORKDIR}/${MY_P}" src_install() { - dobin sendEmail || die "failed to install sendEmail script" + dobin sendEmail dodoc CHANGELOG README TODO } diff --git a/net-mail/swaks/swaks-20130209.0-r1.ebuild b/net-mail/swaks/swaks-20130209.0-r1.ebuild index cfbd70a84663..069127b07c96 100644 --- a/net-mail/swaks/swaks-20130209.0-r1.ebuild +++ b/net-mail/swaks/swaks-20130209.0-r1.ebuild @@ -35,7 +35,7 @@ src_compile() { } src_install() { - newbin swaks swaks || die "newbin failed" - doman swaks.1 || die - dodoc README doc/*.txt || die + newbin swaks swaks + doman swaks.1 + dodoc README doc/*.txt } diff --git a/net-misc/cfengine/cfengine-3.3.9.ebuild b/net-misc/cfengine/cfengine-3.3.9.ebuild index 7588c8da106d..a671fd89e08f 100644 --- a/net-misc/cfengine/cfengine-3.3.9.ebuild +++ b/net-misc/cfengine/cfengine-3.3.9.ebuild @@ -57,11 +57,11 @@ src_configure() { } src_install() { - newinitd "${FILESDIR}"/cf-serverd.rc6 cf-serverd || die - newinitd "${FILESDIR}"/cf-monitord.rc6 cf-monitord || die - newinitd "${FILESDIR}"/cf-execd.rc6 cf-execd || die + newinitd "${FILESDIR}"/cf-serverd.rc6 cf-serverd + newinitd "${FILESDIR}"/cf-monitord.rc6 cf-monitord + newinitd "${FILESDIR}"/cf-execd.rc6 cf-execd - emake DESTDIR="${D}" install || die + emake DESTDIR="${D}" install # Evil workaround for now.. mv "${D}"/usr/share/doc/${PN}/ "${D}"/usr/share/doc/${PF} @@ -81,12 +81,12 @@ src_install() { # binaries here. This is the default search location for the # binaries. for bin in know promises agent monitord serverd execd runagent key report; do - dosym /usr/sbin/cf-$bin /var/cfengine/bin/cf-$bin || die + dosym /usr/sbin/cf-$bin /var/cfengine/bin/cf-$bin done if use html; then docinto html - dohtml -r docs/ || die + dohtml -r docs/ fi } diff --git a/net-misc/cfengine/cfengine-3.4.5.ebuild b/net-misc/cfengine/cfengine-3.4.5.ebuild index 074d4d8593a4..f3399734b57b 100644 --- a/net-misc/cfengine/cfengine-3.4.5.ebuild +++ b/net-misc/cfengine/cfengine-3.4.5.ebuild @@ -72,11 +72,11 @@ src_configure() { } src_install() { - newinitd "${FILESDIR}"/cf-serverd.rc6 cf-serverd || die - newinitd "${FILESDIR}"/cf-monitord.rc6 cf-monitord || die - newinitd "${FILESDIR}"/cf-execd.rc6 cf-execd || die + newinitd "${FILESDIR}"/cf-serverd.rc6 cf-serverd + newinitd "${FILESDIR}"/cf-monitord.rc6 cf-monitord + newinitd "${FILESDIR}"/cf-execd.rc6 cf-execd - emake DESTDIR="${D}" install || die + emake DESTDIR="${D}" install # Evil workaround for now.. mv "${D}"/usr/share/doc/${PN}/ "${D}"/usr/share/doc/${PF} @@ -96,12 +96,12 @@ src_install() { # binaries here. This is the default search location for the # binaries. for bin in promises agent monitord serverd execd runagent key report; do - dosym /usr/sbin/cf-$bin /var/cfengine/bin/cf-$bin || die + dosym /usr/sbin/cf-$bin /var/cfengine/bin/cf-$bin done if use html; then docinto html - dohtml -r docs/ || die + dohtml -r docs/ fi } diff --git a/net-misc/cfengine/cfengine-3.5.3.ebuild b/net-misc/cfengine/cfengine-3.5.3.ebuild index 1afbf48c234c..911431636bda 100644 --- a/net-misc/cfengine/cfengine-3.5.3.ebuild +++ b/net-misc/cfengine/cfengine-3.5.3.ebuild @@ -71,11 +71,11 @@ src_configure() { } src_install() { - newinitd "${FILESDIR}"/cf-serverd.rc6 cf-serverd || die - newinitd "${FILESDIR}"/cf-monitord.rc6 cf-monitord || die - newinitd "${FILESDIR}"/cf-execd.rc6 cf-execd || die + newinitd "${FILESDIR}"/cf-serverd.rc6 cf-serverd + newinitd "${FILESDIR}"/cf-monitord.rc6 cf-monitord + newinitd "${FILESDIR}"/cf-execd.rc6 cf-execd - emake DESTDIR="${D}" install || die + emake DESTDIR="${D}" install # fix ifconfig path in provided promises find "${D}"/usr/share -name "*.cf" | xargs sed -i "s,/sbin/ifconfig,$(which ifconfig),g" @@ -98,7 +98,7 @@ src_install() { # binaries here. This is the default search location for the # binaries. for bin in promises agent monitord serverd execd runagent key; do - dosym /usr/sbin/cf-$bin /var/cfengine/bin/cf-$bin || die + dosym /usr/sbin/cf-$bin /var/cfengine/bin/cf-$bin done } diff --git a/net-misc/cfengine/cfengine-3.6.2.ebuild b/net-misc/cfengine/cfengine-3.6.2.ebuild index fd0b75a9d5c7..d0d55340c25f 100644 --- a/net-misc/cfengine/cfengine-3.6.2.ebuild +++ b/net-misc/cfengine/cfengine-3.6.2.ebuild @@ -77,11 +77,11 @@ src_configure() { } src_install() { - newinitd "${FILESDIR}"/cf-serverd.rc6 cf-serverd || die - newinitd "${FILESDIR}"/cf-monitord.rc6 cf-monitord || die - newinitd "${FILESDIR}"/cf-execd.rc6 cf-execd || die + newinitd "${FILESDIR}"/cf-serverd.rc6 cf-serverd + newinitd "${FILESDIR}"/cf-monitord.rc6 cf-monitord + newinitd "${FILESDIR}"/cf-execd.rc6 cf-execd - emake DESTDIR="${D}" install || die + emake DESTDIR="${D}" install # fix ifconfig path in provided promises find "${D}"/usr/share -name "*.cf" | xargs sed -i "s,/sbin/ifconfig,$(which ifconfig),g" @@ -104,7 +104,7 @@ src_install() { # binaries here. This is the default search location for the # binaries. for bin in promises agent monitord serverd execd runagent key; do - dosym /usr/sbin/cf-$bin /var/cfengine/bin/cf-$bin || die + dosym /usr/sbin/cf-$bin /var/cfengine/bin/cf-$bin done if use masterfiles; then diff --git a/net-misc/hashcash/hashcash-1.22-r2.ebuild b/net-misc/hashcash/hashcash-1.22-r2.ebuild index 1533c90bd7b5..e29148642453 100644 --- a/net-misc/hashcash/hashcash-1.22-r2.ebuild +++ b/net-misc/hashcash/hashcash-1.22-r2.ebuild @@ -19,7 +19,7 @@ src_prepare() { } src_compile() { - emake CC="$(tc-getCC)" generic || die + emake CC="$(tc-getCC)" generic } src_install() { diff --git a/net-misc/ndisc6/ndisc6-1.0.3.ebuild b/net-misc/ndisc6/ndisc6-1.0.3.ebuild index 5302cb4d211d..8c33ffaefa15 100644 --- a/net-misc/ndisc6/ndisc6-1.0.3.ebuild +++ b/net-misc/ndisc6/ndisc6-1.0.3.ebuild @@ -21,10 +21,10 @@ src_configure() { } src_install() { - emake DESTDIR="${D}" install || die - newinitd "${FILESDIR}"/rdnssd.rc-1 rdnssd || die - newconfd "${FILESDIR}"/rdnssd.conf rdnssd || die + emake DESTDIR="${D}" install + newinitd "${FILESDIR}"/rdnssd.rc-1 rdnssd + newconfd "${FILESDIR}"/rdnssd.conf rdnssd exeinto /etc/rdnssd newexe "${FILESDIR}"/resolvconf-1 resolvconf || die - dodoc AUTHORS ChangeLog NEWS README || die + dodoc AUTHORS ChangeLog NEWS README } diff --git a/net-misc/proxytunnel/proxytunnel-1.9.1-r1.ebuild b/net-misc/proxytunnel/proxytunnel-1.9.1-r1.ebuild index 40ac24ea6cf2..4807d1daeff2 100644 --- a/net-misc/proxytunnel/proxytunnel-1.9.1-r1.ebuild +++ b/net-misc/proxytunnel/proxytunnel-1.9.1-r1.ebuild @@ -28,10 +28,10 @@ src_prepare() { src_compile() { use static && append-ldflags -static - emake CC="$(tc-getCC)" || die + emake CC="$(tc-getCC)" } src_install() { - emake install prefix="${EPREFIX}"/usr DESTDIR="${D}" || die + emake install prefix="${EPREFIX}"/usr DESTDIR="${D}" dodoc CHANGES CREDITS INSTALL KNOWN_ISSUES LICENSE.txt README RELNOTES TODO } diff --git a/net-misc/proxytunnel/proxytunnel-1.9.1-r2.ebuild b/net-misc/proxytunnel/proxytunnel-1.9.1-r2.ebuild index c3a2f9493841..eaf7123e2b0c 100644 --- a/net-misc/proxytunnel/proxytunnel-1.9.1-r2.ebuild +++ b/net-misc/proxytunnel/proxytunnel-1.9.1-r2.ebuild @@ -39,10 +39,10 @@ src_prepare() { src_compile() { use static && append-ldflags -static - emake CC="$(tc-getCC)" || die + emake CC="$(tc-getCC)" } src_install() { - emake install prefix="${EPREFIX}"/usr DESTDIR="${D}" || die + emake install prefix="${EPREFIX}"/usr DESTDIR="${D}" einstalldocs } diff --git a/net-misc/proxytunnel/proxytunnel-9999.ebuild b/net-misc/proxytunnel/proxytunnel-9999.ebuild index 16a4a63d0bb9..2622cf670239 100644 --- a/net-misc/proxytunnel/proxytunnel-9999.ebuild +++ b/net-misc/proxytunnel/proxytunnel-9999.ebuild @@ -36,10 +36,10 @@ src_prepare() { src_compile() { use static && append-ldflags -static - emake CC="$(tc-getCC)" || die + emake CC="$(tc-getCC)" } src_install() { - emake install prefix="${EPREFIX}"/usr DESTDIR="${D}" || die + emake install prefix="${EPREFIX}"/usr DESTDIR="${D}" einstalldocs } diff --git a/net-misc/sipsak/sipsak-0.9.6_p1-r1.ebuild b/net-misc/sipsak/sipsak-0.9.6_p1-r1.ebuild index 8532201199aa..c82636600396 100644 --- a/net-misc/sipsak/sipsak-0.9.6_p1-r1.ebuild +++ b/net-misc/sipsak/sipsak-0.9.6_p1-r1.ebuild @@ -30,6 +30,6 @@ src_configure() { } src_install() { - emake DESTDIR="${D}" install || die + emake DESTDIR="${D}" install dodoc AUTHORS ChangeLog NEWS README TODO } diff --git a/net-misc/sipsak/sipsak-0.9.6_p1-r2.ebuild b/net-misc/sipsak/sipsak-0.9.6_p1-r2.ebuild index 6893d2605d39..8b19b230546d 100644 --- a/net-misc/sipsak/sipsak-0.9.6_p1-r2.ebuild +++ b/net-misc/sipsak/sipsak-0.9.6_p1-r2.ebuild @@ -32,6 +32,6 @@ src_configure() { } src_install() { - emake DESTDIR="${D}" install || die + emake DESTDIR="${D}" install dodoc AUTHORS ChangeLog NEWS README TODO } diff --git a/net-misc/ssh-askpass-fullscreen/ssh-askpass-fullscreen-1.0-r1.ebuild b/net-misc/ssh-askpass-fullscreen/ssh-askpass-fullscreen-1.0-r1.ebuild index dbd21787dcc2..ae3f4983f181 100644 --- a/net-misc/ssh-askpass-fullscreen/ssh-askpass-fullscreen-1.0-r1.ebuild +++ b/net-misc/ssh-askpass-fullscreen/ssh-askpass-fullscreen-1.0-r1.ebuild @@ -34,5 +34,5 @@ src_install() { # Automatically display the passphrase dialog - see bug #437764 echo "SSH_ASKPASS='${EPREFIX}/usr/bin/ssh-askpass-fullscreen'" >> "${T}/99ssh_askpass" \ || die "envd file creation failed" - doenvd "${T}"/99ssh_askpass || die "doenvd failed" + doenvd "${T}"/99ssh_askpass } diff --git a/net-misc/termpkg/termpkg-3.3.9.1-r2.ebuild b/net-misc/termpkg/termpkg-3.3.9.1-r2.ebuild index 9b4e786d429a..112f96195585 100644 --- a/net-misc/termpkg/termpkg-3.3.9.1-r2.ebuild +++ b/net-misc/termpkg/termpkg-3.3.9.1-r2.ebuild @@ -45,7 +45,7 @@ src_configure() { } src_compile() { - emake -C linux CC=$(tc-getCC) LIBS="${LDFLAGS}" || die "emake failed" + emake -C linux CC=$(tc-getCC) LIBS="${LDFLAGS}" } src_install() { diff --git a/net-misc/vmpsd/vmpsd-1.4.ebuild b/net-misc/vmpsd/vmpsd-1.4.ebuild index 3921400cd694..e2dd42654288 100644 --- a/net-misc/vmpsd/vmpsd-1.4.ebuild +++ b/net-misc/vmpsd/vmpsd-1.4.ebuild @@ -28,12 +28,11 @@ src_configure() { econf \ --sysconfdir=/etc/vmpsd \ --enable-snmp \ - LIBS="-lssl" \ - || die "econf failed" + LIBS="-lssl" } src_install() { - emake DESTDIR="${D}" install || die + emake DESTDIR="${D}" install dodoc README INSTALL AUTHORS doc/*txt newdoc external/README README.external newdoc tools/README README.tools diff --git a/net-nds/jxplorer/jxplorer-3.3.1.1.ebuild b/net-nds/jxplorer/jxplorer-3.3.1.1.ebuild index bbbcea98f709..1e9182ed85aa 100644 --- a/net-nds/jxplorer/jxplorer-3.3.1.1.ebuild +++ b/net-nds/jxplorer/jxplorer-3.3.1.1.ebuild @@ -51,7 +51,7 @@ src_install() { insinto /usr/share/${PN} doins -r icons images htmldocs language templates plugins security.default csvconfig.txt.default - dodoc README*.TXT || die + dodoc README*.TXT # By default the config dir is ${HOME}/jxplorer java-pkg_dolauncher ${PN} \ diff --git a/net-nds/jxplorer/jxplorer-3.3.1.2.ebuild b/net-nds/jxplorer/jxplorer-3.3.1.2.ebuild index 24b83acf99b6..161a2fe5f6cc 100644 --- a/net-nds/jxplorer/jxplorer-3.3.1.2.ebuild +++ b/net-nds/jxplorer/jxplorer-3.3.1.2.ebuild @@ -58,7 +58,7 @@ src_install() { insinto /usr/share/${PN} doins -r icons images htmldocs language templates plugins security.default csvconfig.txt.default - dodoc README*.TXT || die + dodoc README*.TXT # By default the config dir is ${HOME}/jxplorer java-pkg_dolauncher ${PN} \ diff --git a/net-nds/jxplorer/jxplorer-3.3.1.ebuild b/net-nds/jxplorer/jxplorer-3.3.1.ebuild index 4ad7b4dfb867..0ee4964b2fe2 100644 --- a/net-nds/jxplorer/jxplorer-3.3.1.ebuild +++ b/net-nds/jxplorer/jxplorer-3.3.1.ebuild @@ -51,7 +51,7 @@ src_install() { insinto /usr/share/${PN} doins -r icons images htmldocs language templates plugins security.default csvconfig.txt.default - dodoc README*.TXT || die + dodoc README*.TXT # By default the config dir is ${HOME}/jxplorer java-pkg_dolauncher ${PN} \ diff --git a/net-nds/openldap/openldap-2.4.45.ebuild b/net-nds/openldap/openldap-2.4.45.ebuild index 344d168105b3..04e0c6793983 100644 --- a/net-nds/openldap/openldap-2.4.45.ebuild +++ b/net-nds/openldap/openldap-2.4.45.ebuild @@ -703,7 +703,7 @@ multilib_src_compile() { multilib_src_test() { if multilib_is_native_abi; then cd tests || die - emake tests || die "make tests failed" + emake tests fi } diff --git a/net-nds/openldap/openldap-2.4.48.ebuild b/net-nds/openldap/openldap-2.4.48.ebuild index ba833c3f7a0a..36678c333b5d 100644 --- a/net-nds/openldap/openldap-2.4.48.ebuild +++ b/net-nds/openldap/openldap-2.4.48.ebuild @@ -720,7 +720,7 @@ multilib_src_compile() { multilib_src_test() { if multilib_is_native_abi; then cd tests || die - emake tests || die "make tests failed" + emake tests fi } diff --git a/net-nds/tac_plus/tac_plus-4.0.4.19-r3.ebuild b/net-nds/tac_plus/tac_plus-4.0.4.19-r3.ebuild index 7fe26ccea4b6..0bb83adc7821 100644 --- a/net-nds/tac_plus/tac_plus-4.0.4.19-r3.ebuild +++ b/net-nds/tac_plus/tac_plus-4.0.4.19-r3.ebuild @@ -37,12 +37,11 @@ src_configure() { $(use_enable debug) \ $(use_enable finger) \ $(use_enable maxsess) \ - $(use_enable static-libs static) \ - || die "econf failed" + $(use_enable static-libs static) } src_install() { - emake DESTDIR="${D}" install || die "install failed" + emake DESTDIR="${D}" install use static-libs || find "${D}" -name '*.la' -delete || die "Unable to remove spurious libtool archive" dodoc CHANGES FAQ diff --git a/net-nds/tac_plus/tac_plus-4.0.4.19-r4.ebuild b/net-nds/tac_plus/tac_plus-4.0.4.19-r4.ebuild index dfb57ee97661..f94caec0a181 100644 --- a/net-nds/tac_plus/tac_plus-4.0.4.19-r4.ebuild +++ b/net-nds/tac_plus/tac_plus-4.0.4.19-r4.ebuild @@ -40,12 +40,11 @@ src_configure() { $(use_enable debug) \ $(use_enable finger) \ $(use_enable maxsess) \ - $(use_enable static-libs static) \ - || die "econf failed" + $(use_enable static-libs static) } src_install() { - emake DESTDIR="${D}" install || die "install failed" + emake DESTDIR="${D}" install use static-libs || find "${D}" -name '*.la' -delete || die "Unable to remove spurious libtool archive" dodoc CHANGES FAQ diff --git a/net-nds/tac_plus/tac_plus-4.0.4.27a.ebuild b/net-nds/tac_plus/tac_plus-4.0.4.27a.ebuild index fc1a2ef19e67..710eeb83ce89 100644 --- a/net-nds/tac_plus/tac_plus-4.0.4.27a.ebuild +++ b/net-nds/tac_plus/tac_plus-4.0.4.27a.ebuild @@ -41,12 +41,11 @@ src_configure() { $(use_enable debug) \ $(use_enable finger) \ $(use_enable maxsess) \ - $(use_enable static-libs static) \ - || die "econf failed" + $(use_enable static-libs static) } src_install() { - emake DESTDIR="${D}" install || die "install failed" + emake DESTDIR="${D}" install use static-libs || find "${D}" -name '*.la' -delete || die "Unable to remove spurious libtool archive" dodoc CHANGES FAQ diff --git a/net-p2p/fms/fms-0.3.79.ebuild b/net-p2p/fms/fms-0.3.79.ebuild index 32d9bfaa99ce..60669d4aaf80 100644 --- a/net-p2p/fms/fms-0.3.79.ebuild +++ b/net-p2p/fms/fms-0.3.79.ebuild @@ -46,13 +46,13 @@ src_configure() { src_install() { insinto /var/freenet/fms - dobin "${CMAKE_BUILD_DIR}"/fms || die - doins *.htm || die "doinstall failed" - doins -r fonts images styles translations || die + dobin "${CMAKE_BUILD_DIR}"/fms + doins *.htm + doins -r fonts images styles translations fperms -R o-rwx /var/freenet/fms/ /usr/bin/fms fowners -R freenet:freenet /var/freenet/fms/ /usr/bin/fms - doinitd "${FILESDIR}/fms" || die "installing init.d file failed" - dodoc readme.txt || die "installing doc failed" + doinitd "${FILESDIR}/fms" + dodoc readme.txt } pkg_postinst() { diff --git a/net-p2p/fms/fms-0.3.80.ebuild b/net-p2p/fms/fms-0.3.80.ebuild index 1b85e8e83668..057149a612c4 100644 --- a/net-p2p/fms/fms-0.3.80.ebuild +++ b/net-p2p/fms/fms-0.3.80.ebuild @@ -49,13 +49,13 @@ src_configure() { src_install() { insinto /var/freenet/fms - dobin "${CMAKE_BUILD_DIR}"/fms || die - doins *.htm || die "doinstall failed" - doins -r fonts images styles translations || die + dobin "${CMAKE_BUILD_DIR}"/fms + doins *.htm + doins -r fonts images styles translations fperms -R o-rwx /var/freenet/fms/ /usr/bin/fms fowners -R freenet:freenet /var/freenet/fms/ /usr/bin/fms - doinitd "${FILESDIR}/fms" || die "installing init.d file failed" - dodoc readme.txt || die "installing doc failed" + doinitd "${FILESDIR}/fms" + dodoc readme.txt } pkg_postinst() { diff --git a/net-p2p/gtk-gnutella/gtk-gnutella-1.1.14.ebuild b/net-p2p/gtk-gnutella/gtk-gnutella-1.1.14.ebuild index 0dec1bcfd052..1996dcafb443 100644 --- a/net-p2p/gtk-gnutella/gtk-gnutella-1.1.14.ebuild +++ b/net-p2p/gtk-gnutella/gtk-gnutella-1.1.14.ebuild @@ -82,7 +82,7 @@ src_compile() { src_install() { dodir /usr/bin - emake INSTALL_PREFIX="${D}" install || die "Install failed" + emake INSTALL_PREFIX="${D}" install dodoc AUTHORS ChangeLog README TODO # Touch the symbols file into the future to avoid warnings from diff --git a/net-p2p/gtk-gnutella/gtk-gnutella-1.1.15.ebuild b/net-p2p/gtk-gnutella/gtk-gnutella-1.1.15.ebuild index b7e9bc27bfcd..a81988b38c5f 100644 --- a/net-p2p/gtk-gnutella/gtk-gnutella-1.1.15.ebuild +++ b/net-p2p/gtk-gnutella/gtk-gnutella-1.1.15.ebuild @@ -80,7 +80,7 @@ src_compile() { src_install() { dodir /usr/bin - emake INSTALL_PREFIX="${D}" install || die "Install failed" + emake INSTALL_PREFIX="${D}" install dodoc AUTHORS ChangeLog README TODO # Touch the symbols file into the future to avoid warnings from diff --git a/net-print/cndrvcups-common-lb/cndrvcups-common-lb-3.60-r1.ebuild b/net-print/cndrvcups-common-lb/cndrvcups-common-lb-3.60-r1.ebuild index 9e25fae92195..cbdab7f9b8cb 100644 --- a/net-print/cndrvcups-common-lb/cndrvcups-common-lb-3.60-r1.ebuild +++ b/net-print/cndrvcups-common-lb/cndrvcups-common-lb-3.60-r1.ebuild @@ -77,7 +77,8 @@ src_compile() { change_dir emake # Cannot be moved to 'change_dir' as it doesn't need eautoreconf - ( cd "${S}/c3plmod_ipc" && emake ) || die + cd "${S}/c3plmod_ipc" || die + emake } src_install() { diff --git a/net-print/cndrvcups-common-lb/cndrvcups-common-lb-3.70.ebuild b/net-print/cndrvcups-common-lb/cndrvcups-common-lb-3.70.ebuild index 92dd9f05754d..23e5c3724b52 100644 --- a/net-print/cndrvcups-common-lb/cndrvcups-common-lb-3.70.ebuild +++ b/net-print/cndrvcups-common-lb/cndrvcups-common-lb-3.70.ebuild @@ -80,7 +80,8 @@ src_compile() { change_dir emake # Cannot be moved to 'change_dir' as it doesn't need eautoreconf - ( cd "${S}/c3plmod_ipc" && emake ) || die + cd "${S}/c3plmod_ipc" || die + emake } src_install() { diff --git a/net-print/cups/cups-2.2.12.ebuild b/net-print/cups/cups-2.2.12.ebuild index 70574c1dd3d0..972e518ff81a 100644 --- a/net-print/cups/cups-2.2.12.ebuild +++ b/net-print/cups/cups-2.2.12.ebuild @@ -265,7 +265,7 @@ multilib_src_install_all() { grep -w 'disable' "${ED}"/etc/xinetd.d/cups-lpd || \ { sed -i -e "s:}:\tdisable = yes\n}:" "${ED}"/etc/xinetd.d/cups-lpd || die ; } # write permission for file owner (root), bug #296221 - fperms u+w /etc/xinetd.d/cups-lpd || die "fperms failed" + fperms u+w /etc/xinetd.d/cups-lpd else # always configure with --with-xinetd= and clean up later, # bug #525604 diff --git a/net-print/cups/cups-2.3.0.ebuild b/net-print/cups/cups-2.3.0.ebuild index 5d1def034fe6..46eed6927902 100644 --- a/net-print/cups/cups-2.3.0.ebuild +++ b/net-print/cups/cups-2.3.0.ebuild @@ -262,7 +262,7 @@ multilib_src_install_all() { grep -w 'disable' "${ED}"/etc/xinetd.d/cups-lpd || \ { sed -i -e "s:}:\tdisable = yes\n}:" "${ED}"/etc/xinetd.d/cups-lpd || die ; } # write permission for file owner (root), bug #296221 - fperms u+w /etc/xinetd.d/cups-lpd || die "fperms failed" + fperms u+w /etc/xinetd.d/cups-lpd else # always configure with --with-xinetd= and clean up later, # bug #525604 diff --git a/net-print/cups/cups-9999.ebuild b/net-print/cups/cups-9999.ebuild index 5d1def034fe6..46eed6927902 100644 --- a/net-print/cups/cups-9999.ebuild +++ b/net-print/cups/cups-9999.ebuild @@ -262,7 +262,7 @@ multilib_src_install_all() { grep -w 'disable' "${ED}"/etc/xinetd.d/cups-lpd || \ { sed -i -e "s:}:\tdisable = yes\n}:" "${ED}"/etc/xinetd.d/cups-lpd || die ; } # write permission for file owner (root), bug #296221 - fperms u+w /etc/xinetd.d/cups-lpd || die "fperms failed" + fperms u+w /etc/xinetd.d/cups-lpd else # always configure with --with-xinetd= and clean up later, # bug #525604 diff --git a/net-print/dymo-cups-drivers/dymo-cups-drivers-1.4.0-r1.ebuild b/net-print/dymo-cups-drivers/dymo-cups-drivers-1.4.0-r1.ebuild index 339b8008b67b..f5dba4224b3f 100644 --- a/net-print/dymo-cups-drivers/dymo-cups-drivers-1.4.0-r1.ebuild +++ b/net-print/dymo-cups-drivers/dymo-cups-drivers-1.4.0-r1.ebuild @@ -47,10 +47,10 @@ src_test() { # upstream tests are designed to be run AFTER make install, because they depend on final paths. testroot="${T}/testroot" mkdir -p "${testroot}" - emake install DESTDIR="${testroot}" || die "Failed to install for testing" + emake install DESTDIR="${testroot}" # -W filters is because CUPS tries really hard for secure filters: they must be root/root for the filter tests to pass #chown root:root "${testroot}"/usr/libexec/cups/filter/{raster2dymolm,raster2dymolw} || die "failed to set ownership for tests" # This will trigger the following warning repeatedly #Bad permissions on cupsFilter file "..${testroot}/usr/libexec/cups/filter/raster2dymolm" - emake check CUPSTESTPPD_OPTS="-R ${testroot} -W filters" || die "failed tests" + emake check CUPSTESTPPD_OPTS="-R ${testroot} -W filters" } diff --git a/net-print/kyocera-mita-ppds/kyocera-mita-ppds-8.4-r1.ebuild b/net-print/kyocera-mita-ppds/kyocera-mita-ppds-8.4-r1.ebuild index 8c66696feaf6..739a186c508c 100644 --- a/net-print/kyocera-mita-ppds/kyocera-mita-ppds-8.4-r1.ebuild +++ b/net-print/kyocera-mita-ppds/kyocera-mita-ppds-8.4-r1.ebuild @@ -32,7 +32,7 @@ src_install() { inslanguage() { if use l10n_$1; then - doins $2/*.ppd || die "failed to install $2 ppds" + doins $2/*.ppd fi } diff --git a/net-print/pykota/pykota-1.26-r1.ebuild b/net-print/pykota/pykota-1.26-r1.ebuild index f7181c518167..ccab1c34b787 100644 --- a/net-print/pykota/pykota-1.26-r1.ebuild +++ b/net-print/pykota/pykota-1.26-r1.ebuild @@ -57,7 +57,7 @@ python_install_all() { doins -r initscripts/* # Fixes permissions for bug 155865 - fperms 0700 /usr/share/pykota/cupspykota || die + fperms 0700 /usr/share/pykota/cupspykota rm "${ED%/}"/usr/share/doc/${PN}/{LICENSE,COPYING} || die mv "${ED%/}"/usr/share/doc/{${PN},${PF}} || die diff --git a/net-proxy/nutcracker/nutcracker-0.2.4.ebuild b/net-proxy/nutcracker/nutcracker-0.2.4.ebuild index 3a41d6658396..fa6a1948951b 100644 --- a/net-proxy/nutcracker/nutcracker-0.2.4.ebuild +++ b/net-proxy/nutcracker/nutcracker-0.2.4.ebuild @@ -25,7 +25,7 @@ src_prepare() { } src_configure() { - econf $(use debug) || die "Econf failed" + econf $(use debug) } src_install() { diff --git a/net-proxy/nutcracker/nutcracker-0.3.0.ebuild b/net-proxy/nutcracker/nutcracker-0.3.0.ebuild index 123d9cb88672..bd06f918d24a 100644 --- a/net-proxy/nutcracker/nutcracker-0.3.0.ebuild +++ b/net-proxy/nutcracker/nutcracker-0.3.0.ebuild @@ -25,7 +25,7 @@ src_prepare() { } src_configure() { - econf $(use debug) || die "Econf failed" + econf $(use debug) } src_install() { diff --git a/net-proxy/nutcracker/nutcracker-0.4.1-r1.ebuild b/net-proxy/nutcracker/nutcracker-0.4.1-r1.ebuild index 2b8f82b4c02d..7fa901b297c4 100644 --- a/net-proxy/nutcracker/nutcracker-0.4.1-r1.ebuild +++ b/net-proxy/nutcracker/nutcracker-0.4.1-r1.ebuild @@ -27,7 +27,7 @@ src_prepare() { } src_configure() { - econf $(use debug) || die "Econf failed" + econf $(use debug) } src_install() { diff --git a/net-proxy/obfs4proxy/obfs4proxy-0.0.11.ebuild b/net-proxy/obfs4proxy/obfs4proxy-0.0.11.ebuild index e0d6e07a19be..c5626e850c86 100644 --- a/net-proxy/obfs4proxy/obfs4proxy-0.0.11.ebuild +++ b/net-proxy/obfs4proxy/obfs4proxy-0.0.11.ebuild @@ -43,8 +43,8 @@ src_compile() { src_install() { default - dobin obfs4proxy || die "install failed" + dobin obfs4proxy cd src/${EGO_SRC} - doman doc/obfs4proxy.1 || die "install failed" - dodoc README.md ChangeLog doc/obfs4-spec.txt || die "install failed" + doman doc/obfs4proxy.1 + dodoc README.md ChangeLog doc/obfs4-spec.txt } diff --git a/net-proxy/redsocks/redsocks-0.5.ebuild b/net-proxy/redsocks/redsocks-0.5.ebuild index 1f61ade46a23..187dcecd68ad 100644 --- a/net-proxy/redsocks/redsocks-0.5.ebuild +++ b/net-proxy/redsocks/redsocks-0.5.ebuild @@ -32,7 +32,7 @@ pkg_setup() { } src_compile() { - CC="$(tc-getCC)" emake || die "emake failed" + CC="$(tc-getCC)" emake } src_install() { diff --git a/net-proxy/redsocks/redsocks-9999.ebuild b/net-proxy/redsocks/redsocks-9999.ebuild index 1f61ade46a23..187dcecd68ad 100644 --- a/net-proxy/redsocks/redsocks-9999.ebuild +++ b/net-proxy/redsocks/redsocks-9999.ebuild @@ -32,7 +32,7 @@ pkg_setup() { } src_compile() { - CC="$(tc-getCC)" emake || die "emake failed" + CC="$(tc-getCC)" emake } src_install() { diff --git a/net-vpn/peervpn/peervpn-0.044-r4.ebuild b/net-vpn/peervpn/peervpn-0.044-r4.ebuild index 7d270551df87..0415a2741e17 100644 --- a/net-vpn/peervpn/peervpn-0.044-r4.ebuild +++ b/net-vpn/peervpn/peervpn-0.044-r4.ebuild @@ -35,7 +35,7 @@ src_prepare() { } src_compile() { - emake CC=$(tc-getCC) || die + emake CC=$(tc-getCC) } src_install() { diff --git a/net-vpn/strongswan/strongswan-5.7.2.ebuild b/net-vpn/strongswan/strongswan-5.7.2.ebuild index 4bf09e5d4a85..2c19bfbd44ab 100644 --- a/net-vpn/strongswan/strongswan-5.7.2.ebuild +++ b/net-vpn/strongswan/strongswan-5.7.2.ebuild @@ -202,7 +202,7 @@ src_install() { /etc/ipsec.d/private \ /etc/ipsec.d/reqs - dodoc NEWS README TODO || die + dodoc NEWS README TODO # shared libs are used only internally and there are no static libs, # so it's safe to get rid of the .la files diff --git a/net-vpn/strongswan/strongswan-5.8.1.ebuild b/net-vpn/strongswan/strongswan-5.8.1.ebuild index 58ef88965e76..2ab3a0ed5d3a 100644 --- a/net-vpn/strongswan/strongswan-5.8.1.ebuild +++ b/net-vpn/strongswan/strongswan-5.8.1.ebuild @@ -206,7 +206,7 @@ src_install() { /etc/ipsec.d/private \ /etc/ipsec.d/reqs - dodoc NEWS README TODO || die + dodoc NEWS README TODO # shared libs are used only internally and there are no static libs, # so it's safe to get rid of the .la files diff --git a/net-wireless/airtraf/airtraf-1.1-r3.ebuild b/net-wireless/airtraf/airtraf-1.1-r3.ebuild index a300d2391bbd..2556d4e95885 100644 --- a/net-wireless/airtraf/airtraf-1.1-r3.ebuild +++ b/net-wireless/airtraf/airtraf-1.1-r3.ebuild @@ -43,8 +43,7 @@ src_compile() { CXX=$(tc-getCXX) \ CFLAGS="${CFLAGS}" \ CXXFLAGS="${CXXFLAGS}" \ - LDFLAGS="${LDFLAGS}" \ - || die + LDFLAGS="${LDFLAGS}" } src_install () { diff --git a/net-wireless/gobi_loader/gobi_loader-0.7-r2.ebuild b/net-wireless/gobi_loader/gobi_loader-0.7-r2.ebuild index 4d649f9e0ea5..e82cf16252f2 100644 --- a/net-wireless/gobi_loader/gobi_loader-0.7-r2.ebuild +++ b/net-wireless/gobi_loader/gobi_loader-0.7-r2.ebuild @@ -24,7 +24,7 @@ src_prepare() { } src_install() { - emake install || die + emake install } pkg_postinst() { diff --git a/net-wireless/rfkill/rfkill-0.5-r2.ebuild b/net-wireless/rfkill/rfkill-0.5-r2.ebuild index ab6b3fa74faf..ac0d53456b95 100644 --- a/net-wireless/rfkill/rfkill-0.5-r2.ebuild +++ b/net-wireless/rfkill/rfkill-0.5-r2.ebuild @@ -18,9 +18,9 @@ RDEPEND="!>=sys-apps/util-linux-2.31_rc1" DEPEND="" src_compile() { - emake CC=$(tc-getCC) LD=$(tc-getLD) V=1 || die "Failed to compile" + emake CC=$(tc-getCC) LD=$(tc-getLD) V=1 } src_install() { - emake install V=1 DESTDIR="${D}" || die "Failed to install" + emake install V=1 DESTDIR="${D}" } diff --git a/sci-biology/fasta/fasta-36.3.5e.ebuild b/sci-biology/fasta/fasta-36.3.5e.ebuild index 2f4e3fc06bd5..392ee4c76410 100644 --- a/sci-biology/fasta/fasta-36.3.5e.ebuild +++ b/sci-biology/fasta/fasta-36.3.5e.ebuild @@ -67,7 +67,7 @@ src_install() { pushd bin > /dev/null || die for bin in *36; do - dosym ${bin} /usr/bin/${bin%36} || die + dosym ${bin} /usr/bin/${bin%36} done popd diff --git a/sci-biology/mira/mira-4.0.2.ebuild b/sci-biology/mira/mira-4.0.2.ebuild index fd95fbfb2a78..f5ac6cfe70f5 100644 --- a/sci-biology/mira/mira-4.0.2.ebuild +++ b/sci-biology/mira/mira-4.0.2.ebuild @@ -81,7 +81,7 @@ src_configure() { #src_compile() { # base_src_compile # # TODO: resolve docbook incompatibility for building docs -# if use doc; then emake -C doc clean docs || die; fi +# use doc && emake -C doc clean docs #} src_install() { diff --git a/sci-biology/ncbi-tools/ncbi-tools-2.2.26-r2.ebuild b/sci-biology/ncbi-tools/ncbi-tools-2.2.26-r2.ebuild index 1d3b5784a3a1..2c59e13b5a97 100644 --- a/sci-biology/ncbi-tools/ncbi-tools-2.2.26-r2.ebuild +++ b/sci-biology/ncbi-tools/ncbi-tools-2.2.26-r2.ebuild @@ -114,7 +114,7 @@ src_install() { dobin "${S}"/bin/* for i in ${EXTRA_VIB}; do - dobin "${S}"/build/${i} || die "Failed to install binaries." + dobin "${S}"/build/${i} done use static-libs && dolib.a "${S}"/lib/*.a mkdir -p "${ED}"/usr/include/ncbi diff --git a/sci-biology/phylip/phylip-3.696-r1.ebuild b/sci-biology/phylip/phylip-3.696-r1.ebuild index 3943d3637946..85150acaf9cb 100644 --- a/sci-biology/phylip/phylip-3.696-r1.ebuild +++ b/sci-biology/phylip/phylip-3.696-r1.ebuild @@ -42,7 +42,7 @@ src_install() { mv exe/font* fonts || die "Font move failed." mv exe/factor exe/factor-${PN} || die "Renaming factor failed." - dolib.so exe/*so && rm exe/*so || die + dolib.so exe/*so && rm exe/*so dobin exe/* dodoc "${FILESDIR}"/README.Gentoo diff --git a/sci-biology/phylip/phylip-3.696-r2.ebuild b/sci-biology/phylip/phylip-3.696-r2.ebuild index b3488d65421c..66391e0e662d 100644 --- a/sci-biology/phylip/phylip-3.696-r2.ebuild +++ b/sci-biology/phylip/phylip-3.696-r2.ebuild @@ -43,7 +43,7 @@ src_install() { mv exe/font* fonts || die "Font move failed." mv exe/factor exe/factor-${PN} || die "Renaming factor failed." - dolib.so exe/*so && rm exe/*so || die + dolib.so exe/*so && rm exe/*so dobin exe/* dodoc "${FILESDIR}"/README.Gentoo diff --git a/sci-biology/repeatmasker/repeatmasker-4.0.1.ebuild b/sci-biology/repeatmasker/repeatmasker-4.0.1.ebuild index 41c28eb17f4e..bf6097df1f68 100644 --- a/sci-biology/repeatmasker/repeatmasker-4.0.1.ebuild +++ b/sci-biology/repeatmasker/repeatmasker-4.0.1.ebuild @@ -42,16 +42,16 @@ Y src_install() { exeinto /usr/share/${PN} for i in DateRepeats ProcessRepeats RepeatMasker DupMasker RepeatProteinMask; do - doexe $i || die - dosym /usr/share/${PN}/$i /usr/bin/$i || die + doexe $i + dosym /usr/share/${PN}/$i /usr/bin/$i done dodir /usr/share/${PN}/lib insinto /usr/share/${PN}/lib - doins "${S}"/*.pm || die + doins "${S}"/*.pm insinto /usr/share/${PN} - doins -r util Matrices Libraries taxonomy.dat *.help || die + doins -r util Matrices Libraries taxonomy.dat *.help keepdir /usr/share/${PN}/Libraries dodoc README INSTALL *.help diff --git a/sci-chemistry/moldy/moldy-2.16e-r2.ebuild b/sci-chemistry/moldy/moldy-2.16e-r2.ebuild index 8ba71f621898..0d3399860306 100644 --- a/sci-chemistry/moldy/moldy-2.16e-r2.ebuild +++ b/sci-chemistry/moldy/moldy-2.16e-r2.ebuild @@ -61,7 +61,7 @@ src_install() { if use examples; then rm Makefile.in configure.in config.h.in insinto /usr/share/${PN}/examples/ - doins *.in *.out control.* || die + doins *.in *.out control.* fi if use doc; then insinto /usr/share/doc/${PF}/pdf diff --git a/sci-chemistry/p3d/p3d-9999.ebuild b/sci-chemistry/p3d/p3d-9999.ebuild index f5eb1e8c1b42..5dd3fdc9a942 100644 --- a/sci-chemistry/p3d/p3d-9999.ebuild +++ b/sci-chemistry/p3d/p3d-9999.ebuild @@ -22,6 +22,6 @@ src_install() { if use examples; then insinto /usr/share/${PN} - doins -r pdbs exampleScripts || die + doins -r pdbs exampleScripts fi } diff --git a/sci-chemistry/surf/surf-1.0.ebuild b/sci-chemistry/surf/surf-1.0.ebuild index 138830fe777c..5b6ff83975fd 100644 --- a/sci-chemistry/surf/surf-1.0.ebuild +++ b/sci-chemistry/surf/surf-1.0.ebuild @@ -33,11 +33,10 @@ src_compile() { && emake \ CC="$(tc-getCC)" \ OPT_CFLAGS="${CFLAGS} \$(INCLUDE)" \ - CFLAGS="${CFLAGS} \$(INCLUDE)" \ - || die + CFLAGS="${CFLAGS} \$(INCLUDE)" } src_install() { - dobin ${PN} || die - dodoc README || die + dobin ${PN} + dodoc README } diff --git a/sci-electronics/linsmith/linsmith-0.99.30-r1.ebuild b/sci-electronics/linsmith/linsmith-0.99.30-r1.ebuild index 1ae70e969a06..6ee6d95fdf63 100644 --- a/sci-electronics/linsmith/linsmith-0.99.30-r1.ebuild +++ b/sci-electronics/linsmith/linsmith-0.99.30-r1.ebuild @@ -62,6 +62,6 @@ src_install() { if use examples; then insinto "/usr/share/doc/${PF}/examples" - doins datafiles/*.circ datafiles/*.load || die + doins datafiles/*.circ datafiles/*.load fi } diff --git a/sci-electronics/linsmith/linsmith-0.99.31.ebuild b/sci-electronics/linsmith/linsmith-0.99.31.ebuild index 540df23b8513..911fd0398417 100644 --- a/sci-electronics/linsmith/linsmith-0.99.31.ebuild +++ b/sci-electronics/linsmith/linsmith-0.99.31.ebuild @@ -65,6 +65,6 @@ src_install() { if use examples; then insinto "/usr/share/doc/${PF}/examples" - doins datafiles/*.circ datafiles/*.load || die + doins datafiles/*.circ datafiles/*.load fi } diff --git a/sci-libs/lapack-reference/lapack-reference-3.2.1-r4.ebuild b/sci-libs/lapack-reference/lapack-reference-3.2.1-r4.ebuild index 5a099088ec3b..0973af2b1f1c 100644 --- a/sci-libs/lapack-reference/lapack-reference-3.2.1-r4.ebuild +++ b/sci-libs/lapack-reference/lapack-reference-3.2.1-r4.ebuild @@ -79,8 +79,8 @@ src_install() { src_test() { MAKEOPTS+=" -j1" - cd "${S}"/TESTING/MATGEN && emake || die - cd "${S}"/TESTING && emake || die + cd "${S}"/TESTING/MATGEN && emake + cd "${S}"/TESTING && emake } pkg_postinst() { diff --git a/sci-libs/mkl/mkl-10.0.5.025-r1.ebuild b/sci-libs/mkl/mkl-10.0.5.025-r1.ebuild index 0a4d33acc080..33fe7c30d1d4 100644 --- a/sci-libs/mkl/mkl-10.0.5.025-r1.ebuild +++ b/sci-libs/mkl/mkl-10.0.5.025-r1.ebuild @@ -307,7 +307,7 @@ src_install() { # install license if [[ ! -f ${INTEL_LIC_DIR}/${MKL_LIC} ]]; then insinto ${INTEL_LIC_DIR} - doins "${WORKDIR}"/${MKL_LIC} || die "install license failed" + doins "${WORKDIR}"/${MKL_LIC} fi # install main stuff: cp faster than doins @@ -317,7 +317,7 @@ src_install() { cp -pPR ${cpdirs} "${D}"${MKL_DIR} \ || die "installing mkl failed" insinto ${MKL_DIR} - doins -r ${doinsdirs} || die "doins ${doinsdirs} failed" + doins -r ${doinsdirs} dosym mkl_cblas.h ${MKL_DIR}/include/cblas.h # install blas/lapack profiles diff --git a/sci-libs/mkl/mkl-10.0.5.025.ebuild b/sci-libs/mkl/mkl-10.0.5.025.ebuild index 4de67341b9e1..dce78de61457 100644 --- a/sci-libs/mkl/mkl-10.0.5.025.ebuild +++ b/sci-libs/mkl/mkl-10.0.5.025.ebuild @@ -215,8 +215,7 @@ src_test() { emake \ compiler=${MKL_FC} \ ${myconf} \ - so${MKL_ARCH} \ - || die "emake ${x} failed" + so${MKL_ARCH} popd done } @@ -310,7 +309,7 @@ src_install() { # install license if [[ ! -f ${INTEL_LIC_DIR}/${MKL_LIC} ]]; then insinto ${INTEL_LIC_DIR} - doins "${WORKDIR}"/${MKL_LIC} || die "install license failed" + doins "${WORKDIR}"/${MKL_LIC} fi # install main stuff: cp faster than doins @@ -320,7 +319,7 @@ src_install() { cp -pPR ${cpdirs} "${D}"${MKL_DIR} \ || die "installing mkl failed" insinto ${MKL_DIR} - doins -r ${doinsdirs} || die "doins ${doinsdirs} failed" + doins -r ${doinsdirs} dosym mkl_cblas.h ${MKL_DIR}/include/cblas.h # install blas/lapack profiles diff --git a/sci-libs/ogdi/ogdi-3.2.0.ebuild b/sci-libs/ogdi/ogdi-3.2.0.ebuild index da6e21103bd3..7f42ae15c1e6 100644 --- a/sci-libs/ogdi/ogdi-3.2.0.ebuild +++ b/sci-libs/ogdi/ogdi-3.2.0.ebuild @@ -69,6 +69,6 @@ src_install() { doins ogdi/include/ecs.h ogdi/include/ecs_util.h dolib.so lib/${TARGET}/lib* use static-libs && dolib.a lib/${TARGET}/static/*.a -# dosym libogdi31.so /usr/$(get_libdir)/libogdi.so || die "symlink failed" +# dosym libogdi31.so /usr/$(get_libdir)/libogdi.so dodoc ChangeLog NEWS README } diff --git a/sci-libs/ogdi/ogdi-3.2.0_beta2.ebuild b/sci-libs/ogdi/ogdi-3.2.0_beta2.ebuild index 4e7a9c4adf8a..fcd803cbbad7 100644 --- a/sci-libs/ogdi/ogdi-3.2.0_beta2.ebuild +++ b/sci-libs/ogdi/ogdi-3.2.0_beta2.ebuild @@ -61,6 +61,6 @@ src_install() { doins ogdi/include/ecs.h ogdi/include/ecs_util.h dolib.so lib/${TARGET}/lib* use static-libs && dolib.a lib/${TARGET}/static/*.a -# dosym libogdi31.so /usr/$(get_libdir)/libogdi.so || die "symlink failed" +# dosym libogdi31.so /usr/$(get_libdir)/libogdi.so dodoc ChangeLog NEWS README } diff --git a/sci-libs/plotmm/plotmm-0.1.2.ebuild b/sci-libs/plotmm/plotmm-0.1.2.ebuild index e6a0447c3f7f..5cf316ca2678 100644 --- a/sci-libs/plotmm/plotmm-0.1.2.ebuild +++ b/sci-libs/plotmm/plotmm-0.1.2.ebuild @@ -40,7 +40,7 @@ src_install() { default if use doc; then - dohtml -r doc/html/* || die "dohtml failed" + dohtml -r doc/html/* fi if use examples; then @@ -50,7 +50,7 @@ src_install() { # install sources insinto /usr/share/doc/${PF}/examples/ - doins examples/{curves/curves,simple/simple}.cc || die "doins failed" + doins examples/{curves/curves,simple/simple}.cc elog "You can use examples by calling ${PN}-curves or ${PN}-simple." elog "Examples source code is in /usr/share/doc/${PF}/examples." diff --git a/sci-mathematics/msieve/msieve-1.51-r1.ebuild b/sci-mathematics/msieve/msieve-1.51-r1.ebuild index 0b4672d57dc6..25cedcc0c961 100644 --- a/sci-mathematics/msieve/msieve-1.51-r1.ebuild +++ b/sci-mathematics/msieve/msieve-1.51-r1.ebuild @@ -49,6 +49,6 @@ src_install() { mkdir -p "${D}/usr/share/doc/${P}/" cp include/* "${D}/usr/include/msieve" || die "Failed to install" cp libmsieve.a "${D}/usr/lib/" || die "Failed to install" - dobin msieve || die "Failed to install" + dobin msieve cp Readme* "${D}/usr/share/doc/${P}/" || die "Failed to install" } diff --git a/sci-mathematics/msieve/msieve-1.53-r1.ebuild b/sci-mathematics/msieve/msieve-1.53-r1.ebuild index 67933ca55dfd..f590609455e3 100644 --- a/sci-mathematics/msieve/msieve-1.53-r1.ebuild +++ b/sci-mathematics/msieve/msieve-1.53-r1.ebuild @@ -51,6 +51,6 @@ src_install() { mkdir -p "${ED%/}/usr/share/doc/${P}/" cp include/* "${ED%/}/usr/include/msieve" || die "Failed to install" cp libmsieve.a "${ED%/}/usr/lib/" || die "Failed to install" - dobin msieve || die "Failed to install" + dobin msieve cp Readme* "${ED%/}/usr/share/doc/${P}/" || die "Failed to install" } diff --git a/sci-mathematics/msieve/msieve-9999.ebuild b/sci-mathematics/msieve/msieve-9999.ebuild index d5ad2a8ec1b9..72fa0aaf997f 100644 --- a/sci-mathematics/msieve/msieve-9999.ebuild +++ b/sci-mathematics/msieve/msieve-9999.ebuild @@ -45,6 +45,6 @@ src_install() { mkdir -p "${D}/usr/share/doc/${P}/" cp include/* "${D}/usr/include/msieve" || die "Failed to install" cp libmsieve.a "${D}/usr/lib/" || die "Failed to install" - dobin msieve || die "Failed to install" + dobin msieve cp Readme* "${D}/usr/share/doc/${P}/" || die "Failed to install" } diff --git a/sci-mathematics/singular/singular-4.0.2.ebuild b/sci-mathematics/singular/singular-4.0.2.ebuild index fd44a959ad62..114d83fd0a31 100644 --- a/sci-mathematics/singular/singular-4.0.2.ebuild +++ b/sci-mathematics/singular/singular-4.0.2.ebuild @@ -80,7 +80,7 @@ src_configure() { } src_compile() { - emake || die "emake failed" + emake if use emacs; then cd "${MY_SHARE_DIR}"singular/emacs/ @@ -92,26 +92,24 @@ src_compile() { # dodoc README # # execs and libraries # cd "${S}"/build/bin -# dobin ${MY_PN}* gen_test change_cost solve_IP toric_ideal LLL \ -# || die "failed to install binaries" +# dobin ${MY_PN}* gen_test change_cost solve_IP toric_ideal LLL # insinto /usr/$(get_libdir)/${PN} -# doins *.so || die "failed to install libraries" +# doins *.so # -# dosym ${MY_PN}-${MY_DIR} /usr/bin/${MY_PN} \ -# || die "failed to create symbolic link" +# dosym ${MY_PN}-${MY_DIR} /usr/bin/${MY_PN} # # # stuff from the share tar ball # cd "${WORKDIR}"/${MY_PN}/${MY_SHARE_DIR} # insinto /usr/share/${PN} -# doins -r LIB || die "failed to install lib files" +# doins -r LIB # if use examples; then # insinto /usr/share/doc/${PF} -# doins -r examples || die "failed to install examples" +# doins -r examples # fi # if use doc; then -# dohtml -r html/* || die "failed to install html docs" +# dohtml -r html/* # insinto /usr/share/${PN} -# doins doc/singular.idx || die "failed to install idx file" +# doins doc/singular.idx # cp info/${PN}.hlp info/${PN}.info && # doinfo info/${PN}.info \ # || die "failed to install info files" diff --git a/sci-mathematics/singular/singular-4.0.3.ebuild b/sci-mathematics/singular/singular-4.0.3.ebuild index 819a33a186cc..6d898b9c9fcb 100644 --- a/sci-mathematics/singular/singular-4.0.3.ebuild +++ b/sci-mathematics/singular/singular-4.0.3.ebuild @@ -74,7 +74,7 @@ src_configure() { } src_compile() { - emake || die "emake failed" + emake if use emacs; then cd "${S}"/emacs/ diff --git a/sci-physics/jaxodraw/jaxodraw-2.0.1-r1.ebuild b/sci-physics/jaxodraw/jaxodraw-2.0.1-r1.ebuild index 2d27c3827c23..4e03b5e6e0a3 100644 --- a/sci-physics/jaxodraw/jaxodraw-2.0.1-r1.ebuild +++ b/sci-physics/jaxodraw/jaxodraw-2.0.1-r1.ebuild @@ -33,7 +33,7 @@ src_install() { use source && java-pkg_dosrc src/main/java/net - dodoc src/doc/BUGS src/doc/CHANGELOG src/doc/README src/doc/TODO || die + dodoc src/doc/BUGS src/doc/CHANGELOG src/doc/README src/doc/TODO use doc && java-pkg_dojavadoc build/javadoc java-pkg_dolauncher "${PN}" diff --git a/sci-visualization/zhu3d/zhu3d-4.2.6-r1.ebuild b/sci-visualization/zhu3d/zhu3d-4.2.6-r1.ebuild index 8704bda7f1f0..e20dc4f875c4 100644 --- a/sci-visualization/zhu3d/zhu3d-4.2.6-r1.ebuild +++ b/sci-visualization/zhu3d/zhu3d-4.2.6-r1.ebuild @@ -48,7 +48,7 @@ src_prepare() { } src_install() { - # not working: emake install INSTALL_ROOT="${D}" || die + # not working: emake install INSTALL_ROOT="${D}" dobin zhu3d dodoc readme.txt src/changelog.txt diff --git a/sec-policy/selinux-base-policy/selinux-base-policy-2.20180114-r1.ebuild b/sec-policy/selinux-base-policy/selinux-base-policy-2.20180114-r1.ebuild index f912f538e6ea..df6143b7d93f 100644 --- a/sec-policy/selinux-base-policy/selinux-base-policy-2.20180114-r1.ebuild +++ b/sec-policy/selinux-base-policy/selinux-base-policy-2.20180114-r1.ebuild @@ -74,7 +74,7 @@ src_prepare() { src_compile() { for i in ${POLICY_TYPES}; do - emake NAME=$i -C "${S}"/${i} || die "${i} compile failed" + emake NAME=$i -C "${S}"/${i} done } @@ -85,7 +85,7 @@ src_install() { for j in ${MODS}; do einfo "Installing ${i} ${j} policy package" insinto ${BASEDIR}/${i} - doins "${S}"/${i}/${j}.pp || die "Failed to add ${j}.pp to ${i}" + doins "${S}"/${i}/${j}.pp done done } diff --git a/sec-policy/selinux-base-policy/selinux-base-policy-2.20180114-r2.ebuild b/sec-policy/selinux-base-policy/selinux-base-policy-2.20180114-r2.ebuild index 168222b80661..3a81feba60c1 100644 --- a/sec-policy/selinux-base-policy/selinux-base-policy-2.20180114-r2.ebuild +++ b/sec-policy/selinux-base-policy/selinux-base-policy-2.20180114-r2.ebuild @@ -75,7 +75,7 @@ src_prepare() { src_compile() { for i in ${POLICY_TYPES}; do - emake NAME=$i SHAREDIR="${ROOT%/}"/usr/share/selinux -C "${S}"/${i} || die "${i} compile failed" + emake NAME=$i SHAREDIR="${ROOT%/}"/usr/share/selinux -C "${S}"/${i} done } @@ -86,7 +86,7 @@ src_install() { for j in ${MODS}; do einfo "Installing ${i} ${j} policy package" insinto ${BASEDIR}/${i} - doins "${S}"/${i}/${j}.pp || die "Failed to add ${j}.pp to ${i}" + doins "${S}"/${i}/${j}.pp done done } diff --git a/sec-policy/selinux-base-policy/selinux-base-policy-2.20180114-r3.ebuild b/sec-policy/selinux-base-policy/selinux-base-policy-2.20180114-r3.ebuild index 2ec944121acd..0a9c31702c14 100644 --- a/sec-policy/selinux-base-policy/selinux-base-policy-2.20180114-r3.ebuild +++ b/sec-policy/selinux-base-policy/selinux-base-policy-2.20180114-r3.ebuild @@ -75,7 +75,7 @@ src_prepare() { src_compile() { for i in ${POLICY_TYPES}; do - emake NAME=$i SHAREDIR="${ROOT%/}"/usr/share/selinux -C "${S}"/${i} || die "${i} compile failed" + emake NAME=$i SHAREDIR="${ROOT%/}"/usr/share/selinux -C "${S}"/${i} done } @@ -86,7 +86,7 @@ src_install() { for j in ${MODS}; do einfo "Installing ${i} ${j} policy package" insinto ${BASEDIR}/${i} - doins "${S}"/${i}/${j}.pp || die "Failed to add ${j}.pp to ${i}" + doins "${S}"/${i}/${j}.pp done done } diff --git a/sec-policy/selinux-base-policy/selinux-base-policy-2.20180701-r1.ebuild b/sec-policy/selinux-base-policy/selinux-base-policy-2.20180701-r1.ebuild index edafab22ce16..1e6cc589b6d2 100644 --- a/sec-policy/selinux-base-policy/selinux-base-policy-2.20180701-r1.ebuild +++ b/sec-policy/selinux-base-policy/selinux-base-policy-2.20180701-r1.ebuild @@ -75,7 +75,7 @@ src_prepare() { src_compile() { for i in ${POLICY_TYPES}; do - emake NAME=$i SHAREDIR="${ROOT%/}"/usr/share/selinux -C "${S}"/${i} || die "${i} compile failed" + emake NAME=$i SHAREDIR="${ROOT%/}"/usr/share/selinux -C "${S}"/${i} done } @@ -86,7 +86,7 @@ src_install() { for j in ${MODS}; do einfo "Installing ${i} ${j} policy package" insinto ${BASEDIR}/${i} - doins "${S}"/${i}/${j}.pp || die "Failed to add ${j}.pp to ${i}" + doins "${S}"/${i}/${j}.pp done done } diff --git a/sec-policy/selinux-base-policy/selinux-base-policy-2.20180701-r2.ebuild b/sec-policy/selinux-base-policy/selinux-base-policy-2.20180701-r2.ebuild index 6905e0f14863..7b6afaf3e213 100644 --- a/sec-policy/selinux-base-policy/selinux-base-policy-2.20180701-r2.ebuild +++ b/sec-policy/selinux-base-policy/selinux-base-policy-2.20180701-r2.ebuild @@ -75,7 +75,7 @@ src_prepare() { src_compile() { for i in ${POLICY_TYPES}; do - emake NAME=$i SHAREDIR="${ROOT%/}"/usr/share/selinux -C "${S}"/${i} || die "${i} compile failed" + emake NAME=$i SHAREDIR="${ROOT%/}"/usr/share/selinux -C "${S}"/${i} done } @@ -86,7 +86,7 @@ src_install() { for j in ${MODS}; do einfo "Installing ${i} ${j} policy package" insinto ${BASEDIR}/${i} - doins "${S}"/${i}/${j}.pp || die "Failed to add ${j}.pp to ${i}" + doins "${S}"/${i}/${j}.pp done done } diff --git a/sec-policy/selinux-base-policy/selinux-base-policy-2.20190201-r1.ebuild b/sec-policy/selinux-base-policy/selinux-base-policy-2.20190201-r1.ebuild index 6905e0f14863..7b6afaf3e213 100644 --- a/sec-policy/selinux-base-policy/selinux-base-policy-2.20190201-r1.ebuild +++ b/sec-policy/selinux-base-policy/selinux-base-policy-2.20190201-r1.ebuild @@ -75,7 +75,7 @@ src_prepare() { src_compile() { for i in ${POLICY_TYPES}; do - emake NAME=$i SHAREDIR="${ROOT%/}"/usr/share/selinux -C "${S}"/${i} || die "${i} compile failed" + emake NAME=$i SHAREDIR="${ROOT%/}"/usr/share/selinux -C "${S}"/${i} done } @@ -86,7 +86,7 @@ src_install() { for j in ${MODS}; do einfo "Installing ${i} ${j} policy package" insinto ${BASEDIR}/${i} - doins "${S}"/${i}/${j}.pp || die "Failed to add ${j}.pp to ${i}" + doins "${S}"/${i}/${j}.pp done done } diff --git a/sec-policy/selinux-base-policy/selinux-base-policy-9999.ebuild b/sec-policy/selinux-base-policy/selinux-base-policy-9999.ebuild index 6905e0f14863..7b6afaf3e213 100644 --- a/sec-policy/selinux-base-policy/selinux-base-policy-9999.ebuild +++ b/sec-policy/selinux-base-policy/selinux-base-policy-9999.ebuild @@ -75,7 +75,7 @@ src_prepare() { src_compile() { for i in ${POLICY_TYPES}; do - emake NAME=$i SHAREDIR="${ROOT%/}"/usr/share/selinux -C "${S}"/${i} || die "${i} compile failed" + emake NAME=$i SHAREDIR="${ROOT%/}"/usr/share/selinux -C "${S}"/${i} done } @@ -86,7 +86,7 @@ src_install() { for j in ${MODS}; do einfo "Installing ${i} ${j} policy package" insinto ${BASEDIR}/${i} - doins "${S}"/${i}/${j}.pp || die "Failed to add ${j}.pp to ${i}" + doins "${S}"/${i}/${j}.pp done done } diff --git a/sec-policy/selinux-base/selinux-base-2.20180114-r1.ebuild b/sec-policy/selinux-base/selinux-base-2.20180114-r1.ebuild index 5c86e23535ce..96529c150417 100644 --- a/sec-policy/selinux-base/selinux-base-2.20180114-r1.ebuild +++ b/sec-policy/selinux-base/selinux-base-2.20180114-r1.ebuild @@ -72,7 +72,7 @@ src_configure() { # Prepare initial configuration cd "${S}/refpolicy" || die - emake conf || die "Make conf failed" + emake conf # Setup the policies based on the types delivered by the end user. # These types can be "targeted", "strict", "mcs" and "mls". @@ -125,11 +125,8 @@ src_install() { for i in ${POLICY_TYPES}; do cd "${S}/${i}" || die - emake DESTDIR="${D}" install \ - || die "${i} install failed." - - emake DESTDIR="${D}" install-headers \ - || die "${i} headers install failed." + emake DESTDIR="${D}" install + emake DESTDIR="${D}" install-headers echo "run_init_t" > "${D}/etc/selinux/${i}/contexts/run_init_type" || die diff --git a/sec-policy/selinux-base/selinux-base-2.20180114-r2.ebuild b/sec-policy/selinux-base/selinux-base-2.20180114-r2.ebuild index 5c86e23535ce..96529c150417 100644 --- a/sec-policy/selinux-base/selinux-base-2.20180114-r2.ebuild +++ b/sec-policy/selinux-base/selinux-base-2.20180114-r2.ebuild @@ -72,7 +72,7 @@ src_configure() { # Prepare initial configuration cd "${S}/refpolicy" || die - emake conf || die "Make conf failed" + emake conf # Setup the policies based on the types delivered by the end user. # These types can be "targeted", "strict", "mcs" and "mls". @@ -125,11 +125,8 @@ src_install() { for i in ${POLICY_TYPES}; do cd "${S}/${i}" || die - emake DESTDIR="${D}" install \ - || die "${i} install failed." - - emake DESTDIR="${D}" install-headers \ - || die "${i} headers install failed." + emake DESTDIR="${D}" install + emake DESTDIR="${D}" install-headers echo "run_init_t" > "${D}/etc/selinux/${i}/contexts/run_init_type" || die diff --git a/sec-policy/selinux-base/selinux-base-2.20180114-r3.ebuild b/sec-policy/selinux-base/selinux-base-2.20180114-r3.ebuild index b4344907d547..91587c4968eb 100644 --- a/sec-policy/selinux-base/selinux-base-2.20180114-r3.ebuild +++ b/sec-policy/selinux-base/selinux-base-2.20180114-r3.ebuild @@ -72,7 +72,7 @@ src_configure() { # Prepare initial configuration cd "${S}/refpolicy" || die - emake conf || die "Make conf failed" + emake conf # Setup the policies based on the types delivered by the end user. # These types can be "targeted", "strict", "mcs" and "mls". @@ -125,11 +125,8 @@ src_install() { for i in ${POLICY_TYPES}; do cd "${S}/${i}" || die - emake DESTDIR="${D}" install \ - || die "${i} install failed." - - emake DESTDIR="${D}" install-headers \ - || die "${i} headers install failed." + emake DESTDIR="${D}" install + emake DESTDIR="${D}" install-headers echo "run_init_t" > "${D}/etc/selinux/${i}/contexts/run_init_type" || die diff --git a/sec-policy/selinux-base/selinux-base-2.20180701-r1.ebuild b/sec-policy/selinux-base/selinux-base-2.20180701-r1.ebuild index 020f30cfb94e..c27d17d32999 100644 --- a/sec-policy/selinux-base/selinux-base-2.20180701-r1.ebuild +++ b/sec-policy/selinux-base/selinux-base-2.20180701-r1.ebuild @@ -72,7 +72,7 @@ src_configure() { # Prepare initial configuration cd "${S}/refpolicy" || die - emake conf || die "Make conf failed" + emake conf # Setup the policies based on the types delivered by the end user. # These types can be "targeted", "strict", "mcs" and "mls". @@ -125,11 +125,8 @@ src_install() { for i in ${POLICY_TYPES}; do cd "${S}/${i}" || die - emake DESTDIR="${D}" install \ - || die "${i} install failed." - - emake DESTDIR="${D}" install-headers \ - || die "${i} headers install failed." + emake DESTDIR="${D}" install + emake DESTDIR="${D}" install-headers echo "run_init_t" > "${D}/etc/selinux/${i}/contexts/run_init_type" || die diff --git a/sec-policy/selinux-base/selinux-base-2.20180701-r2.ebuild b/sec-policy/selinux-base/selinux-base-2.20180701-r2.ebuild index 942ea13d67f1..16ee9f2b2abb 100644 --- a/sec-policy/selinux-base/selinux-base-2.20180701-r2.ebuild +++ b/sec-policy/selinux-base/selinux-base-2.20180701-r2.ebuild @@ -72,7 +72,7 @@ src_configure() { # Prepare initial configuration cd "${S}/refpolicy" || die - emake conf || die "Make conf failed" + emake conf # Setup the policies based on the types delivered by the end user. # These types can be "targeted", "strict", "mcs" and "mls". @@ -125,11 +125,8 @@ src_install() { for i in ${POLICY_TYPES}; do cd "${S}/${i}" || die - emake DESTDIR="${D}" install \ - || die "${i} install failed." - - emake DESTDIR="${D}" install-headers \ - || die "${i} headers install failed." + emake DESTDIR="${D}" install + emake DESTDIR="${D}" install-headers echo "run_init_t" > "${D}/etc/selinux/${i}/contexts/run_init_type" || die diff --git a/sec-policy/selinux-base/selinux-base-2.20190201-r1.ebuild b/sec-policy/selinux-base/selinux-base-2.20190201-r1.ebuild index 942ea13d67f1..16ee9f2b2abb 100644 --- a/sec-policy/selinux-base/selinux-base-2.20190201-r1.ebuild +++ b/sec-policy/selinux-base/selinux-base-2.20190201-r1.ebuild @@ -72,7 +72,7 @@ src_configure() { # Prepare initial configuration cd "${S}/refpolicy" || die - emake conf || die "Make conf failed" + emake conf # Setup the policies based on the types delivered by the end user. # These types can be "targeted", "strict", "mcs" and "mls". @@ -125,11 +125,8 @@ src_install() { for i in ${POLICY_TYPES}; do cd "${S}/${i}" || die - emake DESTDIR="${D}" install \ - || die "${i} install failed." - - emake DESTDIR="${D}" install-headers \ - || die "${i} headers install failed." + emake DESTDIR="${D}" install + emake DESTDIR="${D}" install-headers echo "run_init_t" > "${D}/etc/selinux/${i}/contexts/run_init_type" || die diff --git a/sec-policy/selinux-base/selinux-base-9999.ebuild b/sec-policy/selinux-base/selinux-base-9999.ebuild index 942ea13d67f1..16ee9f2b2abb 100644 --- a/sec-policy/selinux-base/selinux-base-9999.ebuild +++ b/sec-policy/selinux-base/selinux-base-9999.ebuild @@ -72,7 +72,7 @@ src_configure() { # Prepare initial configuration cd "${S}/refpolicy" || die - emake conf || die "Make conf failed" + emake conf # Setup the policies based on the types delivered by the end user. # These types can be "targeted", "strict", "mcs" and "mls". @@ -125,11 +125,8 @@ src_install() { for i in ${POLICY_TYPES}; do cd "${S}/${i}" || die - emake DESTDIR="${D}" install \ - || die "${i} install failed." - - emake DESTDIR="${D}" install-headers \ - || die "${i} headers install failed." + emake DESTDIR="${D}" install + emake DESTDIR="${D}" install-headers echo "run_init_t" > "${D}/etc/selinux/${i}/contexts/run_init_type" || die diff --git a/sys-apps/baselayout/baselayout-2.4.1-r2.ebuild b/sys-apps/baselayout/baselayout-2.4.1-r2.ebuild index 195fe1e39f60..d6f3e81d5ed6 100644 --- a/sys-apps/baselayout/baselayout-2.4.1-r2.ebuild +++ b/sys-apps/baselayout/baselayout-2.4.1-r2.ebuild @@ -130,7 +130,7 @@ pkg_preinst() { # Also, we cannot reference $S as binpkg will break so we do this. multilib_layout if use build ; then - emake -C "${ED}/usr/share/${PN}" DESTDIR="${EROOT}" layout || die + emake -C "${ED}/usr/share/${PN}" DESTDIR="${EROOT}" layout fi rm -f "${ED}"/usr/share/${PN}/Makefile } diff --git a/sys-apps/cciss_vol_status/cciss_vol_status-1.12.ebuild b/sys-apps/cciss_vol_status/cciss_vol_status-1.12.ebuild index 7b55e244be5f..4aa99c221aa3 100644 --- a/sys-apps/cciss_vol_status/cciss_vol_status-1.12.ebuild +++ b/sys-apps/cciss_vol_status/cciss_vol_status-1.12.ebuild @@ -14,7 +14,7 @@ RDEPEND="" DEPEND="" src_install() { - emake DESTDIR="${D}" install || die "Install failed." + emake DESTDIR="${D}" install dodoc AUTHORS ChangeLog NEWS README exeinto /etc/cron.hourly newexe "${FILESDIR}/cciss_vol_status.cron2" cciss_vol_status diff --git a/sys-apps/entropy-server/entropy-server-302.ebuild b/sys-apps/entropy-server/entropy-server-302.ebuild index c2eff7b2fcd9..cd447283274e 100644 --- a/sys-apps/entropy-server/entropy-server-302.ebuild +++ b/sys-apps/entropy-server/entropy-server-302.ebuild @@ -28,7 +28,7 @@ DEPEND="app-text/asciidoc" REQUIRED_USE="${PYTHON_REQUIRED_USE}" src_install() { - emake DESTDIR="${D}" install || die "make install failed" + emake DESTDIR="${D}" install newbashcomp "${S}/eit-completion.bash" eit python_optimize "${D}/usr/lib/entropy/server" diff --git a/sys-apps/entropy/entropy-302-r1.ebuild b/sys-apps/entropy/entropy-302-r1.ebuild index 0cd3b60c7998..a617ded3def4 100644 --- a/sys-apps/entropy/entropy-302-r1.ebuild +++ b/sys-apps/entropy/entropy-302-r1.ebuild @@ -50,7 +50,7 @@ pkg_setup() { } src_install() { - emake DESTDIR="${D}" LIBDIR="usr/lib" install || die "make install failed" + emake DESTDIR="${D}" LIBDIR="usr/lib" install python_optimize "${D}/usr/lib/entropy/lib/entropy" } diff --git a/sys-apps/fbset/fbset-2.1.ebuild b/sys-apps/fbset/fbset-2.1.ebuild index 1c334fdbfb9f..387e1a904e25 100644 --- a/sys-apps/fbset/fbset-2.1.ebuild +++ b/sys-apps/fbset/fbset-2.1.ebuild @@ -27,11 +27,11 @@ src_prepare() { src_compile() { use static && append-ldflags -static tc-export CC - emake || die "emake failed" + emake } src_install() { - dobin fbset modeline2fb || die "dobin failed" + dobin fbset modeline2fb doman *.[58] dodoc etc/fb.modes.* INSTALL } diff --git a/sys-apps/heirloom-tools/heirloom-tools-070715.ebuild b/sys-apps/heirloom-tools/heirloom-tools-070715.ebuild index dbf4b1181691..00037ab30d24 100644 --- a/sys-apps/heirloom-tools/heirloom-tools-070715.ebuild +++ b/sys-apps/heirloom-tools/heirloom-tools-070715.ebuild @@ -25,12 +25,12 @@ S="${WORKDIR}/heirloom-${PV}" src_compile() { append-cppflags -D_GNU_SOURCE - emake -j1 ||die + emake -j1 } src_install() { # we don't want to strip here, so use "true" as noop - emake STRIP="true" ROOT="${D}" -j1 install || die + emake STRIP="true" ROOT="${D}" -j1 install } pkg_postinst() { diff --git a/sys-apps/ipmiutil/ipmiutil-3.0.6.ebuild b/sys-apps/ipmiutil/ipmiutil-3.0.6.ebuild index e157b5eb274c..7f746df64c56 100644 --- a/sys-apps/ipmiutil/ipmiutil-3.0.6.ebuild +++ b/sys-apps/ipmiutil/ipmiutil-3.0.6.ebuild @@ -39,7 +39,7 @@ src_compile() { # and it doesn't even work. # Please check on each bump if this workaround is still required. pushd lib/lanplus &>/dev/null || die - emake || die "emake lanplus failed" + emake cp libipmi_lanplus.a .. || die popd &>/dev/null || die diff --git a/sys-apps/ipmiutil/ipmiutil-3.0.9.ebuild b/sys-apps/ipmiutil/ipmiutil-3.0.9.ebuild index ac6d2f9004f7..670520a6b9cd 100644 --- a/sys-apps/ipmiutil/ipmiutil-3.0.9.ebuild +++ b/sys-apps/ipmiutil/ipmiutil-3.0.9.ebuild @@ -40,7 +40,7 @@ src_compile() { # and it doesn't even work. # Please check on each bump if this workaround is still required. pushd lib/lanplus &>/dev/null || die - emake || die "emake lanplus failed" + emake cp libipmi_lanplus.a .. || die popd &>/dev/null || die diff --git a/sys-apps/ipmiutil/ipmiutil-3.1.3.ebuild b/sys-apps/ipmiutil/ipmiutil-3.1.3.ebuild index 426199d3e70b..e05227de53b1 100644 --- a/sys-apps/ipmiutil/ipmiutil-3.1.3.ebuild +++ b/sys-apps/ipmiutil/ipmiutil-3.1.3.ebuild @@ -40,7 +40,7 @@ src_compile() { # and it doesn't even work. # Please check on each bump if this workaround is still required. pushd lib/lanplus &>/dev/null || die - emake || die "emake lanplus failed" + emake cp libipmi_lanplus.a .. || die popd &>/dev/null || die diff --git a/sys-apps/ipmiutil/ipmiutil-3.1.4.ebuild b/sys-apps/ipmiutil/ipmiutil-3.1.4.ebuild index 4eefd0cd1de8..a8fbfd6eff87 100644 --- a/sys-apps/ipmiutil/ipmiutil-3.1.4.ebuild +++ b/sys-apps/ipmiutil/ipmiutil-3.1.4.ebuild @@ -43,7 +43,7 @@ src_compile() { # and it doesn't even work. # Please check on each bump if this workaround is still required. pushd lib/lanplus &>/dev/null || die - emake || die "emake lanplus failed" + emake cp libipmi_lanplus.a .. || die popd &>/dev/null || die diff --git a/sys-apps/likwid/likwid-4.3.3.ebuild b/sys-apps/likwid/likwid-4.3.3.ebuild index eba012a63dbd..ef60b4927a7a 100644 --- a/sys-apps/likwid/likwid-4.3.3.ebuild +++ b/sys-apps/likwid/likwid-4.3.3.ebuild @@ -136,8 +136,7 @@ export_emake_opts() { src_compile() { export_emake_opts emake \ - "${src_compile_opts[@]}" \ - || die 'emake failed' + "${src_compile_opts[@]}" } src_install () { @@ -146,7 +145,7 @@ src_install () { "${src_compile_opts[@]}" \ "${src_install_opts[@]}" \ DESTDIR="${D}" \ - install || die 'emake install failed' + install use fortran && doheader likwid.mod diff --git a/sys-apps/likwid/likwid-4.3.4.ebuild b/sys-apps/likwid/likwid-4.3.4.ebuild index eba012a63dbd..ef60b4927a7a 100644 --- a/sys-apps/likwid/likwid-4.3.4.ebuild +++ b/sys-apps/likwid/likwid-4.3.4.ebuild @@ -136,8 +136,7 @@ export_emake_opts() { src_compile() { export_emake_opts emake \ - "${src_compile_opts[@]}" \ - || die 'emake failed' + "${src_compile_opts[@]}" } src_install () { @@ -146,7 +145,7 @@ src_install () { "${src_compile_opts[@]}" \ "${src_install_opts[@]}" \ DESTDIR="${D}" \ - install || die 'emake install failed' + install use fortran && doheader likwid.mod diff --git a/sys-apps/lmctfy/lmctfy-0.2.0.ebuild b/sys-apps/lmctfy/lmctfy-0.2.0.ebuild index 42165974ce90..a239974b055b 100644 --- a/sys-apps/lmctfy/lmctfy-0.2.0.ebuild +++ b/sys-apps/lmctfy/lmctfy-0.2.0.ebuild @@ -31,5 +31,5 @@ src_install() { # silly upstream! mkdir -p "${D}/usr/bin" cp "${S}/bin/lmctfy/cli/lmctfy" "${D}/usr/bin/" || die "Failed to copy cli binary" - dolib.a "${S}/bin/liblmctfy.a" || die "Failed to copy library" + dolib.a "${S}/bin/liblmctfy.a" } diff --git a/sys-apps/lmctfy/lmctfy-0.3.0.ebuild b/sys-apps/lmctfy/lmctfy-0.3.0.ebuild index 42165974ce90..a239974b055b 100644 --- a/sys-apps/lmctfy/lmctfy-0.3.0.ebuild +++ b/sys-apps/lmctfy/lmctfy-0.3.0.ebuild @@ -31,5 +31,5 @@ src_install() { # silly upstream! mkdir -p "${D}/usr/bin" cp "${S}/bin/lmctfy/cli/lmctfy" "${D}/usr/bin/" || die "Failed to copy cli binary" - dolib.a "${S}/bin/liblmctfy.a" || die "Failed to copy library" + dolib.a "${S}/bin/liblmctfy.a" } diff --git a/sys-apps/lmctfy/lmctfy-0.3.1.ebuild b/sys-apps/lmctfy/lmctfy-0.3.1.ebuild index 42165974ce90..a239974b055b 100644 --- a/sys-apps/lmctfy/lmctfy-0.3.1.ebuild +++ b/sys-apps/lmctfy/lmctfy-0.3.1.ebuild @@ -31,5 +31,5 @@ src_install() { # silly upstream! mkdir -p "${D}/usr/bin" cp "${S}/bin/lmctfy/cli/lmctfy" "${D}/usr/bin/" || die "Failed to copy cli binary" - dolib.a "${S}/bin/liblmctfy.a" || die "Failed to copy library" + dolib.a "${S}/bin/liblmctfy.a" } diff --git a/sys-apps/man-pages-posix/man-pages-posix-2013a.ebuild b/sys-apps/man-pages-posix/man-pages-posix-2013a.ebuild index 743f17c98a2e..822c0fcb1ec0 100644 --- a/sys-apps/man-pages-posix/man-pages-posix-2013a.ebuild +++ b/sys-apps/man-pages-posix/man-pages-posix-2013a.ebuild @@ -27,6 +27,6 @@ src_configure() { :; } src_compile() { :; } src_install() { - emake install DESTDIR="${ED}" || die + emake install DESTDIR="${ED}" dodoc man-pages-*.Announce README } diff --git a/sys-apps/man/man-1.6g-r1.ebuild b/sys-apps/man/man-1.6g-r1.ebuild index 77a3f91809bf..098628c40d4b 100644 --- a/sys-apps/man/man-1.6g-r1.ebuild +++ b/sys-apps/man/man-1.6g-r1.ebuild @@ -90,7 +90,7 @@ src_configure() { src_install() { unset NLSPATH #175258 - emake PREFIX="${D}" install || die "make install failed" + emake PREFIX="${D}" install dosym man /usr/bin/manpath dodoc LSM README* TODO diff --git a/sys-apps/tcp-wrappers/tcp-wrappers-7.6.22-r1.ebuild b/sys-apps/tcp-wrappers/tcp-wrappers-7.6.22-r1.ebuild index 0129109fb5b9..b3131aa342ba 100644 --- a/sys-apps/tcp-wrappers/tcp-wrappers-7.6.22-r1.ebuild +++ b/sys-apps/tcp-wrappers/tcp-wrappers-7.6.22-r1.ebuild @@ -50,7 +50,7 @@ temake() { RANLIB="$(tc-getRANLIB)" \ COPTS="${CFLAGS} ${CPPFLAGS} ${mycppflags}" \ LDFLAGS="${LDFLAGS}" \ - "$@" || die + "$@" } multilib_src_configure() { diff --git a/sys-apps/tcp-wrappers/tcp-wrappers-7.6.28.ebuild b/sys-apps/tcp-wrappers/tcp-wrappers-7.6.28.ebuild index 406bea3c32e2..bcec6bbb9ec4 100644 --- a/sys-apps/tcp-wrappers/tcp-wrappers-7.6.28.ebuild +++ b/sys-apps/tcp-wrappers/tcp-wrappers-7.6.28.ebuild @@ -51,7 +51,7 @@ temake() { RANLIB="$(tc-getRANLIB)" \ COPTS="${CFLAGS} ${CPPFLAGS} ${mycppflags}" \ LDFLAGS="${LDFLAGS}" \ - "$@" || die + "$@" } multilib_src_configure() { diff --git a/sys-apps/timer_entropyd/timer_entropyd-0.3.ebuild b/sys-apps/timer_entropyd/timer_entropyd-0.3.ebuild index 1509f4f394e7..041a72467d56 100644 --- a/sys-apps/timer_entropyd/timer_entropyd-0.3.ebuild +++ b/sys-apps/timer_entropyd/timer_entropyd-0.3.ebuild @@ -25,14 +25,14 @@ src_compile() { use debug && append-cppflags -D_DEBUG tc-export CC - emake DEBUG= || die + emake DEBUG= } src_install() { exeinto /usr/libexec doexe ${PN} dodoc Changes readme.txt - newinitd "${FILESDIR}/timer_entropyd.initd.1" ${PN} || die + newinitd "${FILESDIR}/timer_entropyd.initd.1" ${PN} } pkg_postinst() { diff --git a/sys-apps/tomoyo-tools/tomoyo-tools-2.5.0_p20130214.ebuild b/sys-apps/tomoyo-tools/tomoyo-tools-2.5.0_p20130214.ebuild index 581fb1868f8b..998598543f43 100644 --- a/sys-apps/tomoyo-tools/tomoyo-tools-2.5.0_p20130214.ebuild +++ b/sys-apps/tomoyo-tools/tomoyo-tools-2.5.0_p20130214.ebuild @@ -49,7 +49,7 @@ src_install() { # Fix out-of-place readme and license rm "${D}"/usr/$(get_libdir)/tomoyo/{COPYING.tomoyo,README.tomoyo} || die - dodoc README.tomoyo || die + dodoc README.tomoyo } pkg_postinst() { diff --git a/sys-apps/ucspi-ssl/ucspi-ssl-0.94-r1.ebuild b/sys-apps/ucspi-ssl/ucspi-ssl-0.94-r1.ebuild index a840f03132d7..5d5ac164b3c2 100644 --- a/sys-apps/ucspi-ssl/ucspi-ssl-0.94-r1.ebuild +++ b/sys-apps/ucspi-ssl/ucspi-ssl-0.94-r1.ebuild @@ -48,6 +48,6 @@ src_compile() { src_install() { dodoc ../doc/* doman ../man/*.* - dobin sslserver sslclient sslcat sslconnect https\@ || die + dobin sslserver sslclient sslcat sslconnect https\@ use perl && dobin sslperl } diff --git a/sys-apps/ucspi-ssl/ucspi-ssl-0.97.ebuild b/sys-apps/ucspi-ssl/ucspi-ssl-0.97.ebuild index d76d76649ae7..4aedc6d67c98 100644 --- a/sys-apps/ucspi-ssl/ucspi-ssl-0.97.ebuild +++ b/sys-apps/ucspi-ssl/ucspi-ssl-0.97.ebuild @@ -52,6 +52,6 @@ src_compile() { src_install() { dodoc doc/* doman man/*.* - dobin src/https\@ src/sslcat src/sslclient src/sslconnect src/sslprint src/sslserver || die + dobin src/https\@ src/sslcat src/sslclient src/sslconnect src/sslprint src/sslserver use perl && dobin src/sslperl } diff --git a/sys-apps/ucspi-ssl/ucspi-ssl-0.98b.ebuild b/sys-apps/ucspi-ssl/ucspi-ssl-0.98b.ebuild index b2959f43d85a..b02355b0c476 100644 --- a/sys-apps/ucspi-ssl/ucspi-ssl-0.98b.ebuild +++ b/sys-apps/ucspi-ssl/ucspi-ssl-0.98b.ebuild @@ -52,6 +52,6 @@ src_compile() { src_install() { dodoc doc/* doman man/*.* - dobin src/https\@ src/sslcat src/sslclient src/sslconnect src/sslprint src/sslserver || die + dobin src/https\@ src/sslcat src/sslclient src/sslconnect src/sslprint src/sslserver use perl && dobin src/sslperl } diff --git a/sys-auth/munge/munge-0.5.10-r2.ebuild b/sys-auth/munge/munge-0.5.10-r2.ebuild index 7054e80d56db..2af3da4bd7d0 100644 --- a/sys-auth/munge/munge-0.5.10-r2.ebuild +++ b/sys-auth/munge/munge-0.5.10-r2.ebuild @@ -40,23 +40,23 @@ src_configure() { } src_install() { - emake DESTDIR="${D}" install || die + emake DESTDIR="${D}" install # 450830 if [ -d "${D}"/var/run ]; then rm -rf "${D}"/var/run || die fi - dodir /etc/munge || die + dodir /etc/munge [ -d "${D}"/etc/init.d ] && rm -r "${D}"/etc/init.d [ -d "${D}"/etc/default ] && rm -r "${D}"/etc/default [ -d "${D}"/etc/sysconfig ] && rm -r "${D}"/etc/sysconfig - newconfd "${FILESDIR}"/${PN}d.confd ${PN}d || die - newinitd "${FILESDIR}"/${PN}d.initd ${PN}d || die + newconfd "${FILESDIR}"/${PN}d.confd ${PN}d + newinitd "${FILESDIR}"/${PN}d.initd ${PN}d } src_test() { - emake check || die + emake check } diff --git a/sys-auth/pam-pgsql/pam-pgsql-0.7.3.2.ebuild b/sys-auth/pam-pgsql/pam-pgsql-0.7.3.2.ebuild index 250886ba0d57..cf69a6bf4c9d 100644 --- a/sys-auth/pam-pgsql/pam-pgsql-0.7.3.2.ebuild +++ b/sys-auth/pam-pgsql/pam-pgsql-0.7.3.2.ebuild @@ -32,7 +32,7 @@ src_configure() { } src_compile() { - emake pammoddir="$(getpam_mod_dir)" || die "emake failed" + emake pammoddir="$(getpam_mod_dir)" } src_install() { diff --git a/sys-block/lsiutil/lsiutil-1.62-r1.ebuild b/sys-block/lsiutil/lsiutil-1.62-r1.ebuild index 143ae1b0c3fe..cb29c7db8358 100644 --- a/sys-block/lsiutil/lsiutil-1.62-r1.ebuild +++ b/sys-block/lsiutil/lsiutil-1.62-r1.ebuild @@ -33,7 +33,7 @@ src_install() { exeinto /opt/bin if use x86; then - doexe Linux/lsiutil || die + doexe Linux/lsiutil elif use amd64; then newexe Linux/lsiutil.x86_64 lsiutil elif use ia64; then diff --git a/sys-block/lsiutil/lsiutil-1.62-r2.ebuild b/sys-block/lsiutil/lsiutil-1.62-r2.ebuild index 9b209fe60347..c9cb2cb12fa7 100644 --- a/sys-block/lsiutil/lsiutil-1.62-r2.ebuild +++ b/sys-block/lsiutil/lsiutil-1.62-r2.ebuild @@ -27,7 +27,7 @@ src_install() { exeinto /opt/bin if use x86; then - doexe Linux/lsiutil || die + doexe Linux/lsiutil elif use amd64; then newexe Linux/lsiutil.x86_64 lsiutil || die elif use ia64; then diff --git a/sys-boot/aboot/aboot-1.0_pre20040408-r3.ebuild b/sys-boot/aboot/aboot-1.0_pre20040408-r3.ebuild index cba6251a37af..b0de4bb7a385 100644 --- a/sys-boot/aboot/aboot-1.0_pre20040408-r3.ebuild +++ b/sys-boot/aboot/aboot-1.0_pre20040408-r3.ebuild @@ -48,7 +48,7 @@ src_prepare() { src_compile() { # too many problems with parallel building - emake -j1 AR=$(tc-getAR) CC=$(tc-getCC) LD=$(tc-getLD) || die "emake failed" + emake -j1 AR=$(tc-getAR) CC=$(tc-getCC) LD=$(tc-getLD) } src_install() { diff --git a/sys-boot/lilo/lilo-24.0-r1.ebuild b/sys-boot/lilo/lilo-24.0-r1.ebuild index b0639924ba39..becc561f7416 100644 --- a/sys-boot/lilo/lilo-24.0-r1.ebuild +++ b/sys-boot/lilo/lilo-24.0-r1.ebuild @@ -56,24 +56,24 @@ src_compile() { local target=all fi - emake CC="$(tc-getCC) ${LDFLAGS}" ${target} || die + emake CC="$(tc-getCC) ${LDFLAGS}" ${target} } src_install() { keepdir /boot - emake DESTDIR="${D}" install || die + emake DESTDIR="${D}" install if use !minimal; then into / - dosbin "${WORKDIR}"/dolilo/dolilo || die + dosbin "${WORKDIR}"/dolilo/dolilo into /usr - dosbin keytab-lilo.pl || die + dosbin keytab-lilo.pl insinto /etc - newins "${FILESDIR}"/lilo.conf lilo.conf.example || die + newins "${FILESDIR}"/lilo.conf lilo.conf.example - newconfd "${WORKDIR}"/dolilo/dolilo.conf.d dolilo.example || die + newconfd "${WORKDIR}"/dolilo/dolilo.conf.d dolilo.example dodoc CHANGELOG* readme/README.* readme/INCOMPAT README docinto samples ; dodoc sample/* diff --git a/sys-boot/lilo/lilo-24.1.ebuild b/sys-boot/lilo/lilo-24.1.ebuild index 9431f2659608..aa4787b06c10 100644 --- a/sys-boot/lilo/lilo-24.1.ebuild +++ b/sys-boot/lilo/lilo-24.1.ebuild @@ -56,24 +56,24 @@ src_compile() { local target=all fi - emake CC="$(tc-getCC) ${LDFLAGS}" ${target} || die + emake CC="$(tc-getCC) ${LDFLAGS}" ${target} } src_install() { keepdir /boot - emake DESTDIR="${D}" install || die + emake DESTDIR="${D}" install if use !minimal; then into / - dosbin "${WORKDIR}"/dolilo/dolilo || die + dosbin "${WORKDIR}"/dolilo/dolilo into /usr - dosbin keytab-lilo.pl || die + dosbin keytab-lilo.pl insinto /etc - newins "${FILESDIR}"/lilo.conf lilo.conf.example || die + newins "${FILESDIR}"/lilo.conf lilo.conf.example - newconfd "${WORKDIR}"/dolilo/dolilo.conf.d dolilo.example || die + newconfd "${WORKDIR}"/dolilo/dolilo.conf.d dolilo.example dodoc CHANGELOG* readme/README.* readme/INCOMPAT README docinto samples ; dodoc sample/* diff --git a/sys-boot/lilo/lilo-24.2.ebuild b/sys-boot/lilo/lilo-24.2.ebuild index 854b8dba4364..c84d6257d959 100644 --- a/sys-boot/lilo/lilo-24.2.ebuild +++ b/sys-boot/lilo/lilo-24.2.ebuild @@ -56,24 +56,24 @@ src_compile() { local target=all fi - emake CC="$(tc-getCC) ${LDFLAGS}" ${target} || die + emake CC="$(tc-getCC) ${LDFLAGS}" ${target} } src_install() { keepdir /boot - emake DESTDIR="${D}" install || die + emake DESTDIR="${D}" install if use !minimal; then into / - dosbin "${WORKDIR}"/dolilo/dolilo || die + dosbin "${WORKDIR}"/dolilo/dolilo into /usr - dosbin keytab-lilo.pl || die + dosbin keytab-lilo.pl insinto /etc - newins "${FILESDIR}"/lilo.conf lilo.conf.example || die + newins "${FILESDIR}"/lilo.conf lilo.conf.example - newconfd "${WORKDIR}"/dolilo/dolilo.conf.d dolilo.example || die + newconfd "${WORKDIR}"/dolilo/dolilo.conf.d dolilo.example dodoc CHANGELOG* readme/README.* readme/INCOMPAT README docinto samples ; dodoc sample/* diff --git a/sys-boot/tboot/tboot-1.9.6_p20171118.ebuild b/sys-boot/tboot/tboot-1.9.6_p20171118.ebuild index d858b8202cf6..e33aa1ee7e93 100644 --- a/sys-boot/tboot/tboot-1.9.6_p20171118.ebuild +++ b/sys-boot/tboot/tboot-1.9.6_p20171118.ebuild @@ -51,7 +51,7 @@ src_install() { emake DISTDIR="${D}" install dodoc "${DOCS[@]}" - dodoc docs/*.txt lcptools/*.{txt,pdf} || die "docs failed" + dodoc docs/*.txt lcptools/*.{txt,pdf} cd "${D}" mkdir -p usr/lib/tboot/ || die diff --git a/sys-cluster/cluster-glue/cluster-glue-1.0.11.ebuild b/sys-cluster/cluster-glue/cluster-glue-1.0.11.ebuild index a8286bdae265..1b4e7d2933cc 100644 --- a/sys-cluster/cluster-glue/cluster-glue-1.0.11.ebuild +++ b/sys-cluster/cluster-glue/cluster-glue-1.0.11.ebuild @@ -78,7 +78,7 @@ src_install() { sed -i \ -e "s:%libdir%:$(get_libdir):" \ "${T}/heartbeat-logd.init" || die -# newinitd "${T}/heartbeat-logd.init" heartbeat-logd || die +# newinitd "${T}/heartbeat-logd.init" heartbeat-logd rm "${D}"/etc/init.d/logd use static-libs || find "${D}" -type f -name "*.la" -delete diff --git a/sys-cluster/cluster-glue/cluster-glue-1.0.12-r1.ebuild b/sys-cluster/cluster-glue/cluster-glue-1.0.12-r1.ebuild index ad5e78db7935..c067016843b1 100644 --- a/sys-cluster/cluster-glue/cluster-glue-1.0.12-r1.ebuild +++ b/sys-cluster/cluster-glue/cluster-glue-1.0.12-r1.ebuild @@ -85,7 +85,7 @@ src_install() { sed -i \ -e "s:%libdir%:$(get_libdir):" \ "${T}/heartbeat-logd.init" || die -# newinitd "${T}/heartbeat-logd.init" heartbeat-logd || die +# newinitd "${T}/heartbeat-logd.init" heartbeat-logd rm "${D}"/etc/init.d/logd use static-libs || find "${D}" -type f -name "*.la" -delete diff --git a/sys-cluster/cluster-glue/cluster-glue-1.0.12.ebuild b/sys-cluster/cluster-glue/cluster-glue-1.0.12.ebuild index de7e47b7ac8d..55d62dcee077 100644 --- a/sys-cluster/cluster-glue/cluster-glue-1.0.12.ebuild +++ b/sys-cluster/cluster-glue/cluster-glue-1.0.12.ebuild @@ -79,7 +79,7 @@ src_install() { sed -i \ -e "s:%libdir%:$(get_libdir):" \ "${T}/heartbeat-logd.init" || die -# newinitd "${T}/heartbeat-logd.init" heartbeat-logd || die +# newinitd "${T}/heartbeat-logd.init" heartbeat-logd rm "${D}"/etc/init.d/logd use static-libs || find "${D}" -type f -name "*.la" -delete diff --git a/sys-cluster/ganglia/ganglia-3.7.1-r1.ebuild b/sys-cluster/ganglia/ganglia-3.7.1-r1.ebuild index cf52cb43963a..5509498cc08a 100644 --- a/sys-cluster/ganglia/ganglia-3.7.1-r1.ebuild +++ b/sys-cluster/ganglia/ganglia-3.7.1-r1.ebuild @@ -67,11 +67,11 @@ src_compile() { src_install() { local exdir=/usr/share/doc/${P} - emake DESTDIR="${D}" install || die + emake DESTDIR="${D}" install newinitd "${FILESDIR}"/gmond.rc-2 gmond - doman {mans/*.1,gmond/*.5} || die "Failed to install manpages" - dodoc AUTHORS INSTALL NEWS README || die + doman {mans/*.1,gmond/*.5} + dodoc AUTHORS INSTALL NEWS README dodir /etc/ganglia/conf.d use python && dodir /usr/$(get_libdir)/ganglia/python_modules diff --git a/sys-cluster/heartbeat/heartbeat-3.0.5-r3.ebuild b/sys-cluster/heartbeat/heartbeat-3.0.5-r3.ebuild index 20aadc77cebf..d0a16996c2b3 100644 --- a/sys-cluster/heartbeat/heartbeat-3.0.5-r3.ebuild +++ b/sys-cluster/heartbeat/heartbeat-3.0.5-r3.ebuild @@ -81,6 +81,6 @@ src_install() { fi if use doc ; then - dodoc README doc/*.txt doc/AUTHORS || die + dodoc README doc/*.txt doc/AUTHORS fi } diff --git a/sys-cluster/heartbeat/heartbeat-3.0.6-r1.ebuild b/sys-cluster/heartbeat/heartbeat-3.0.6-r1.ebuild index f4ea34d9baf5..26457bab784e 100644 --- a/sys-cluster/heartbeat/heartbeat-3.0.6-r1.ebuild +++ b/sys-cluster/heartbeat/heartbeat-3.0.6-r1.ebuild @@ -79,6 +79,6 @@ src_install() { fi if use doc ; then - dodoc README doc/*.txt doc/AUTHORS || die + dodoc README doc/*.txt doc/AUTHORS fi } diff --git a/sys-cluster/heartbeat/heartbeat-3.0.6.ebuild b/sys-cluster/heartbeat/heartbeat-3.0.6.ebuild index 87b148818ad4..1d86b2f1ab01 100644 --- a/sys-cluster/heartbeat/heartbeat-3.0.6.ebuild +++ b/sys-cluster/heartbeat/heartbeat-3.0.6.ebuild @@ -80,6 +80,6 @@ src_install() { fi if use doc ; then - dodoc README doc/*.txt doc/AUTHORS || die + dodoc README doc/*.txt doc/AUTHORS fi } diff --git a/sys-cluster/maui/maui-3.3.1-r2.ebuild b/sys-cluster/maui/maui-3.3.1-r2.ebuild index f14cfeaf5d75..af2623ae6e15 100644 --- a/sys-cluster/maui/maui-3.3.1-r2.ebuild +++ b/sys-cluster/maui/maui-3.3.1-r2.ebuild @@ -47,10 +47,10 @@ src_configure() { } src_install() { - emake BUILDROOT="${D}" INST_DIR="${ED}/usr" install || die - dodoc docs/README CHANGELOG || die - dohtml docs/mauidocs.html || die - newinitd "${FILESDIR}/${PN}.initd" ${PN} || die + emake BUILDROOT="${D}" INST_DIR="${ED}/usr" install + dodoc docs/README CHANGELOG + dohtml docs/mauidocs.html + newinitd "${FILESDIR}/${PN}.initd" ${PN} } pkg_nofetch() { diff --git a/sys-cluster/maui/maui-3.3.1-r3.ebuild b/sys-cluster/maui/maui-3.3.1-r3.ebuild index 8f5c03da2d52..82459ce3849b 100644 --- a/sys-cluster/maui/maui-3.3.1-r3.ebuild +++ b/sys-cluster/maui/maui-3.3.1-r3.ebuild @@ -49,10 +49,10 @@ src_configure() { } src_install() { - emake BUILDROOT="${D}" INST_DIR="${ED}/usr" install || die - dodoc docs/README CHANGELOG || die - dohtml docs/mauidocs.html || die - newinitd "${FILESDIR}/${PN}.initd" ${PN} || die + emake BUILDROOT="${D}" INST_DIR="${ED}/usr" install + dodoc docs/README CHANGELOG + dohtml docs/mauidocs.html + newinitd "${FILESDIR}/${PN}.initd" ${PN} } pkg_nofetch() { diff --git a/sys-cluster/mvapich2/mvapich2-1.6.ebuild b/sys-cluster/mvapich2/mvapich2-1.6.ebuild index 6277a6a7a4c0..d5bc03fc1b7d 100644 --- a/sys-cluster/mvapich2/mvapich2-1.6.ebuild +++ b/sys-cluster/mvapich2/mvapich2-1.6.ebuild @@ -125,7 +125,7 @@ src_configure() { } src_install() { - emake DESTDIR="${D}"|| die + emake DESTDIR="${D}" dodoc CHANGES_MPICH2 COPYRIGHT COPYRIGHT_MVAPICH2 LICENSE.TXT \ README* RELEASE_NOTES* } diff --git a/sys-cluster/openmpi/openmpi-1.4.3.ebuild b/sys-cluster/openmpi/openmpi-1.4.3.ebuild index 8bf92f0e2f57..db37d6581843 100644 --- a/sys-cluster/openmpi/openmpi-1.4.3.ebuild +++ b/sys-cluster/openmpi/openmpi-1.4.3.ebuild @@ -91,11 +91,11 @@ src_configure() { } src_install () { - emake DESTDIR="${D}" install || die "make install failed" - dodoc README AUTHORS NEWS VERSION || die + emake DESTDIR="${D}" install + dodoc README AUTHORS NEWS VERSION } src_test() { # Doesn't work with the default src_test as the dry run (-n) fails. - emake -j1 check || die "emake check failed" + emake -j1 check } diff --git a/sys-cluster/openmpi/openmpi-1.4.5.ebuild b/sys-cluster/openmpi/openmpi-1.4.5.ebuild index ad3f8b66f21a..0bbe9b66f66f 100644 --- a/sys-cluster/openmpi/openmpi-1.4.5.ebuild +++ b/sys-cluster/openmpi/openmpi-1.4.5.ebuild @@ -93,11 +93,11 @@ src_configure() { } src_install () { - emake DESTDIR="${D}" install || die "make install failed" - dodoc README AUTHORS NEWS VERSION || die + emake DESTDIR="${D}" install + dodoc README AUTHORS NEWS VERSION } src_test() { # Doesn't work with the default src_test as the dry run (-n) fails. - emake -j1 check || die "emake check failed" + emake -j1 check } diff --git a/sys-cluster/openmpi/openmpi-1.6.5-r1.ebuild b/sys-cluster/openmpi/openmpi-1.6.5-r1.ebuild index 94fbe5f02330..df2aebcc202a 100644 --- a/sys-cluster/openmpi/openmpi-1.6.5-r1.ebuild +++ b/sys-cluster/openmpi/openmpi-1.6.5-r1.ebuild @@ -155,13 +155,13 @@ src_configure() { } src_install () { - emake DESTDIR="${D}" install || die "make install failed" + emake DESTDIR="${D}" install # From USE=vt see #359917 rm "${ED}"/usr/share/libtool &> /dev/null - dodoc README AUTHORS NEWS VERSION || die + dodoc README AUTHORS NEWS VERSION } src_test() { # Doesn't work with the default src_test as the dry run (-n) fails. - emake -j1 check || die "emake check failed" + emake -j1 check } diff --git a/sys-cluster/openmpi/openmpi-1.7.5-r1.ebuild b/sys-cluster/openmpi/openmpi-1.7.5-r1.ebuild index 0c59f5e20d45..3ac5a69985c9 100644 --- a/sys-cluster/openmpi/openmpi-1.7.5-r1.ebuild +++ b/sys-cluster/openmpi/openmpi-1.7.5-r1.ebuild @@ -152,7 +152,7 @@ src_install () { rm "${ED}"/usr/share/libtool &> /dev/null # Avoid collisions with libevent rm -rf "${ED}"/usr/include/event2 &> /dev/null - dodoc README AUTHORS NEWS VERSION || die + dodoc README AUTHORS NEWS VERSION } src_test() { diff --git a/sys-cluster/openmpi/openmpi-1.8.4-r4.ebuild b/sys-cluster/openmpi/openmpi-1.8.4-r4.ebuild index b445c75dae49..2c81eb423270 100644 --- a/sys-cluster/openmpi/openmpi-1.8.4-r4.ebuild +++ b/sys-cluster/openmpi/openmpi-1.8.4-r4.ebuild @@ -157,7 +157,7 @@ src_install () { # Remove la files, no static libs are installed and we have pkg-config find "${ED}"/usr/$(get_libdir)/ -type f -name '*.la' -delete - dodoc README AUTHORS NEWS VERSION || die + dodoc README AUTHORS NEWS VERSION } src_test() { diff --git a/sys-cluster/openmpi/openmpi-1.8.7-r1.ebuild b/sys-cluster/openmpi/openmpi-1.8.7-r1.ebuild index 876003287360..95e3f08eb07e 100644 --- a/sys-cluster/openmpi/openmpi-1.8.7-r1.ebuild +++ b/sys-cluster/openmpi/openmpi-1.8.7-r1.ebuild @@ -170,7 +170,7 @@ src_install () { rm "${mpi_jar}" || die fi - dodoc README AUTHORS NEWS VERSION || die + dodoc README AUTHORS NEWS VERSION } src_test() { diff --git a/sys-cluster/openmpi/openmpi-1.8.8.ebuild b/sys-cluster/openmpi/openmpi-1.8.8.ebuild index 0907f4880539..df5defd234e3 100644 --- a/sys-cluster/openmpi/openmpi-1.8.8.ebuild +++ b/sys-cluster/openmpi/openmpi-1.8.8.ebuild @@ -170,7 +170,7 @@ src_install () { rm "${mpi_jar}" || die fi - dodoc README AUTHORS NEWS VERSION || die + dodoc README AUTHORS NEWS VERSION } src_test() { diff --git a/sys-cluster/pacemaker/pacemaker-1.1.16.ebuild b/sys-cluster/pacemaker/pacemaker-1.1.16.ebuild index 019e26300394..f58cbbd86bea 100644 --- a/sys-cluster/pacemaker/pacemaker-1.1.16.ebuild +++ b/sys-cluster/pacemaker/pacemaker-1.1.16.ebuild @@ -68,9 +68,9 @@ src_configure() { src_install() { default rm -rf "${D}"/var/run "${D}"/etc/init.d - newinitd "${FILESDIR}/${PN}.initd" ${PN} || die + newinitd "${FILESDIR}/${PN}.initd" ${PN} if has_version "<sys-cluster/corosync-2.0"; then insinto /etc/corosync/service.d - newins "${FILESDIR}/${PN}.service" ${PN} || die + newins "${FILESDIR}/${PN}.service" ${PN} fi } diff --git a/sys-cluster/pacemaker/pacemaker-1.1.19-r1.ebuild b/sys-cluster/pacemaker/pacemaker-1.1.19-r1.ebuild index ed65ac8337a0..879fa861bc17 100644 --- a/sys-cluster/pacemaker/pacemaker-1.1.19-r1.ebuild +++ b/sys-cluster/pacemaker/pacemaker-1.1.19-r1.ebuild @@ -71,10 +71,10 @@ src_configure() { src_install() { default rm -rf "${D}/var/run" "${D}/etc/init.d" - newinitd "${FILESDIR}/${PN}.initd" "${PN}" || die + newinitd "${FILESDIR}/${PN}.initd" "${PN}" if has_version "<sys-cluster/corosync-2.0"; then insinto /etc/corosync/service.d - newins "${FILESDIR}/${PN}.service" "${PN}" || die + newins "${FILESDIR}/${PN}.service" "${PN}" fi find "${D}" -name '*.la' -delete || die } diff --git a/sys-cluster/pacemaker/pacemaker-1.1.19.ebuild b/sys-cluster/pacemaker/pacemaker-1.1.19.ebuild index 610fa658e5fc..eea845a19fe1 100644 --- a/sys-cluster/pacemaker/pacemaker-1.1.19.ebuild +++ b/sys-cluster/pacemaker/pacemaker-1.1.19.ebuild @@ -68,9 +68,9 @@ src_configure() { src_install() { default rm -rf "${D}"/var/run "${D}"/etc/init.d - newinitd "${FILESDIR}/${PN}.initd" ${PN} || die + newinitd "${FILESDIR}/${PN}.initd" ${PN} if has_version "<sys-cluster/corosync-2.0"; then insinto /etc/corosync/service.d - newins "${FILESDIR}/${PN}.service" ${PN} || die + newins "${FILESDIR}/${PN}.service" ${PN} fi } diff --git a/sys-cluster/swift/swift-2.21.0-r1.ebuild b/sys-cluster/swift/swift-2.21.0-r1.ebuild index 25a2b591ac5e..e0892e4069a1 100644 --- a/sys-cluster/swift/swift-2.21.0-r1.ebuild +++ b/sys-cluster/swift/swift-2.21.0-r1.ebuild @@ -114,7 +114,7 @@ python_install_all() { dodoc -r doc/{s3api,saio,source} fi - fowners root:swift "/etc/swift" || die "fowners failed" + fowners root:swift "/etc/swift" fperms 0750 /etc/swift } diff --git a/sys-cluster/swift/swift-2.22.0.ebuild b/sys-cluster/swift/swift-2.22.0.ebuild index a88677f29fd8..9a409be64721 100644 --- a/sys-cluster/swift/swift-2.22.0.ebuild +++ b/sys-cluster/swift/swift-2.22.0.ebuild @@ -112,7 +112,7 @@ python_install_all() { dodoc -r doc/{s3api,saio,source} fi - fowners root:swift "/etc/swift" || die "fowners failed" + fowners root:swift "/etc/swift" fperms 0750 /etc/swift } diff --git a/sys-cluster/swift/swift-2.23.1.ebuild b/sys-cluster/swift/swift-2.23.1.ebuild index aaecc71181d4..3e3deb94d7f2 100644 --- a/sys-cluster/swift/swift-2.23.1.ebuild +++ b/sys-cluster/swift/swift-2.23.1.ebuild @@ -112,7 +112,7 @@ python_install_all() { dodoc -r doc/{s3api,saio,source} fi - fowners root:swift "/etc/swift" || die "fowners failed" + fowners root:swift "/etc/swift" fperms 0750 /etc/swift } diff --git a/sys-cluster/swift/swift-2019.1.9999.ebuild b/sys-cluster/swift/swift-2019.1.9999.ebuild index ec5ee0cd41ee..537207edd2a7 100644 --- a/sys-cluster/swift/swift-2019.1.9999.ebuild +++ b/sys-cluster/swift/swift-2019.1.9999.ebuild @@ -114,7 +114,7 @@ python_install_all() { dodoc -r doc/{s3api,saio,source} fi - fowners root:swift "/etc/swift" || die "fowners failed" + fowners root:swift "/etc/swift" fperms 0750 /etc/swift } diff --git a/sys-cluster/swift/swift-2019.2.9999.ebuild b/sys-cluster/swift/swift-2019.2.9999.ebuild index 73b14dde3ae6..d90ce6aa21ec 100644 --- a/sys-cluster/swift/swift-2019.2.9999.ebuild +++ b/sys-cluster/swift/swift-2019.2.9999.ebuild @@ -112,7 +112,7 @@ python_install_all() { dodoc -r doc/{s3api,saio,source} fi - fowners root:swift "/etc/swift" || die "fowners failed" + fowners root:swift "/etc/swift" fperms 0750 /etc/swift } diff --git a/sys-cluster/wulfware/wulfware-2.6.0.ebuild b/sys-cluster/wulfware/wulfware-2.6.0.ebuild index dee0715397e4..c38cff22bd46 100644 --- a/sys-cluster/wulfware/wulfware-2.6.0.ebuild +++ b/sys-cluster/wulfware/wulfware-2.6.0.ebuild @@ -47,7 +47,7 @@ src_compile() { src_install() { emake prefix="${D}/usr" libdir="${D}/usr/$(get_libdir)" \ includedir="${D}/usr/include" sysconfdir="${D}/etc" \ - install || die "emake install failed." + install dodoc AUTHORS ChangeLog NEWS NOTES README xmlsysd/DESIGN diff --git a/sys-cluster/zookeeper-bin/zookeeper-bin-3.4.10.ebuild b/sys-cluster/zookeeper-bin/zookeeper-bin-3.4.10.ebuild index bc0ae0982c2b..8f6e4bd484fb 100644 --- a/sys-cluster/zookeeper-bin/zookeeper-bin-3.4.10.ebuild +++ b/sys-cluster/zookeeper-bin/zookeeper-bin-3.4.10.ebuild @@ -86,5 +86,5 @@ src_install() { PATH=${INSTALL_DIR}/bin CONFIG_PROTECT=${INSTALL_DIR}/conf EOF - doenvd 99"${PN}" || die "doenvd failed" + doenvd 99"${PN}" } diff --git a/sys-cluster/zookeeper-bin/zookeeper-bin-3.4.11.ebuild b/sys-cluster/zookeeper-bin/zookeeper-bin-3.4.11.ebuild index bc0ae0982c2b..8f6e4bd484fb 100644 --- a/sys-cluster/zookeeper-bin/zookeeper-bin-3.4.11.ebuild +++ b/sys-cluster/zookeeper-bin/zookeeper-bin-3.4.11.ebuild @@ -86,5 +86,5 @@ src_install() { PATH=${INSTALL_DIR}/bin CONFIG_PROTECT=${INSTALL_DIR}/conf EOF - doenvd 99"${PN}" || die "doenvd failed" + doenvd 99"${PN}" } diff --git a/sys-cluster/zookeeper-bin/zookeeper-bin-3.4.12.ebuild b/sys-cluster/zookeeper-bin/zookeeper-bin-3.4.12.ebuild index a35bfb4d98d4..a68eac797592 100644 --- a/sys-cluster/zookeeper-bin/zookeeper-bin-3.4.12.ebuild +++ b/sys-cluster/zookeeper-bin/zookeeper-bin-3.4.12.ebuild @@ -86,5 +86,5 @@ src_install() { PATH=${INSTALL_DIR}/bin CONFIG_PROTECT=${INSTALL_DIR}/conf EOF - doenvd 99"${PN}" || die "doenvd failed" + doenvd 99"${PN}" } diff --git a/sys-cluster/zookeeper-bin/zookeeper-bin-3.4.13.ebuild b/sys-cluster/zookeeper-bin/zookeeper-bin-3.4.13.ebuild index 0ed0f10b5ef0..d911c9fc1da5 100644 --- a/sys-cluster/zookeeper-bin/zookeeper-bin-3.4.13.ebuild +++ b/sys-cluster/zookeeper-bin/zookeeper-bin-3.4.13.ebuild @@ -89,5 +89,5 @@ src_install() { PATH=${INSTALL_DIR}/bin CONFIG_PROTECT=${INSTALL_DIR}/conf EOF - doenvd 99"${PN}" || die "doenvd failed" + doenvd 99"${PN}" } diff --git a/sys-devel/binutils-apple/binutils-apple-3.2.6.ebuild b/sys-devel/binutils-apple/binutils-apple-3.2.6.ebuild index 6636b170fc58..fe828d3b1644 100644 --- a/sys-devel/binutils-apple/binutils-apple-3.2.6.ebuild +++ b/sys-devel/binutils-apple/binutils-apple-3.2.6.ebuild @@ -158,8 +158,8 @@ compile_ld64() { [[ ${CHOST} == *-apple-darwin8 ]] && \ append-flags -isystem "${S}"/${CCTOOLS}/include/ local myincs="-Iinclude -Iabstraction -Ild" - emake CFLAGS="${CFLAGS} ${myincs}" CXXFLAGS="${CXXFLAGS} ${myincs}" \ - || die "emake failed for ld64" + emake CFLAGS="${CFLAGS} ${myincs}" CXXFLAGS="${CXXFLAGS} ${myincs}" + use test && emake build_test } @@ -171,13 +171,12 @@ compile_cctools() { EFITOOLS= \ COMMON_SUBDIRS='libstuff ar misc otool' \ SUBDIRS_32= \ - RC_CFLAGS="${CFLAGS}" OFLAG="${CFLAGS}" \ - || die "emake failed for the cctools" + RC_CFLAGS="${CFLAGS}" OFLAG="${CFLAGS}" + cd "${S}"/${CCTOOLS}/as emake \ BUILD_OBSOLETE_ARCH= \ - RC_CFLAGS="-DASLIBEXECDIR=\"\\\"${EPREFIX}${LIBPATH}/\\\"\" ${CFLAGS}" \ - || die "emake failed for as" + RC_CFLAGS="-DASLIBEXECDIR=\"\\\"${EPREFIX}${LIBPATH}/\\\"\" ${CFLAGS}" } src_compile() { diff --git a/sys-devel/binutils-apple/binutils-apple-3.2.ebuild b/sys-devel/binutils-apple/binutils-apple-3.2.ebuild index e60586c9425b..4ccf5b257b9c 100644 --- a/sys-devel/binutils-apple/binutils-apple-3.2.ebuild +++ b/sys-devel/binutils-apple/binutils-apple-3.2.ebuild @@ -134,7 +134,7 @@ compile_ld64() { # but not on tiger. [[ ${CHOST} == *-apple-darwin8 ]] && \ append-flags -isystem "${S}"/${CCTOOLS}/include/ - emake || die "emake failed for ld64" + emake use test && emake build_test } @@ -146,13 +146,12 @@ compile_cctools() { EFITOOLS= \ COMMON_SUBDIRS='libstuff ar misc otool' \ SUBDIRS_32= \ - RC_CFLAGS="${CFLAGS}" OFLAG="${CFLAGS}" \ - || die "emake failed for the cctools" + RC_CFLAGS="${CFLAGS}" OFLAG="${CFLAGS}" + cd "${S}"/${CCTOOLS}/as emake \ BUILD_OBSOLETE_ARCH= \ - RC_CFLAGS="-DASLIBEXECDIR=\"\\\"${EPREFIX}${LIBPATH}/\\\"\" ${CFLAGS}" \ - || die "emake failed for as" + RC_CFLAGS="-DASLIBEXECDIR=\"\\\"${EPREFIX}${LIBPATH}/\\\"\" ${CFLAGS}" } src_compile() { diff --git a/sys-devel/binutils-apple/binutils-apple-4.3-r2.ebuild b/sys-devel/binutils-apple/binutils-apple-4.3-r2.ebuild index f959d52dadb7..b3cf69bdae49 100644 --- a/sys-devel/binutils-apple/binutils-apple-4.3-r2.ebuild +++ b/sys-devel/binutils-apple/binutils-apple-4.3-r2.ebuild @@ -213,8 +213,8 @@ compile_ld64() { einfo "building ${LD64}" cd "${S}"/${LD64}/src emake \ - LTO=${ENABLE_LTO} \ - || die "emake failed for ld64" + LTO=${ENABLE_LTO} + use test && emake build_test } @@ -232,15 +232,14 @@ compile_cctools() { RC_ProjectSourceVersion=${CCTOOLS_VERSION} \ RC_CFLAGS="${CFLAGS}" \ OFLAG="${CCTOOLS_OFLAG}" \ - -j1 \ - || die "emake failed for the cctools" + -j1 + cd "${S}"/${CCTOOLS}/as emake \ BUILD_OBSOLETE_ARCH= \ RC_ProjectSourceVersion=${CCTOOLS_VERSION} \ RC_CFLAGS="-DASLIBEXECDIR=\"\\\"${EPREFIX}${LIBPATH}/\\\"\" ${CFLAGS}" \ - OFLAG="${CCTOOLS_OFLAG}" \ - || die "emake failed for as" + OFLAG="${CCTOOLS_OFLAG}" } src_compile() { diff --git a/sys-devel/binutils-apple/binutils-apple-5.1-r1.ebuild b/sys-devel/binutils-apple/binutils-apple-5.1-r1.ebuild index e2bead82b9e7..73ec964cbefc 100644 --- a/sys-devel/binutils-apple/binutils-apple-5.1-r1.ebuild +++ b/sys-devel/binutils-apple/binutils-apple-5.1-r1.ebuild @@ -253,8 +253,8 @@ compile_ld64() { einfo "building ${LD64}" cd "${S}"/${LD64}/src emake \ - LTO=${ENABLE_LTO} \ - || die "emake failed for ld64" + LTO=${ENABLE_LTO} + use test && emake build_test } @@ -278,16 +278,15 @@ compile_cctools() { OFLAG="${CCTOOLS_OFLAG}" \ CXXLIB="${CXXLIB}" \ DSYMUTIL=": disabled: dsymutil" \ - -j1 \ - || die "emake failed for the cctools" + -j1 + cd "${S}"/${CCTOOLS}/as emake \ BUILD_OBSOLETE_ARCH= \ RC_ProjectSourceVersion=${CCTOOLS_VERSION} \ RC_CFLAGS="-DASLIBEXECDIR=\"\\\"${EPREFIX}${LIBPATH}/\\\"\" ${CFLAGS}" \ OFLAG="${CCTOOLS_OFLAG}" \ - DSYMUTIL=": disabled: dsymutil" \ - || die "emake failed for as" + DSYMUTIL=": disabled: dsymutil" } src_compile() { diff --git a/sys-devel/binutils-apple/binutils-apple-6.1-r1.ebuild b/sys-devel/binutils-apple/binutils-apple-6.1-r1.ebuild index 3e68d58f0b9f..041d9a329ada 100644 --- a/sys-devel/binutils-apple/binutils-apple-6.1-r1.ebuild +++ b/sys-devel/binutils-apple/binutils-apple-6.1-r1.ebuild @@ -254,8 +254,8 @@ compile_ld64() { einfo "building ${LD64}" cd "${S}"/${LD64}/src emake \ - LTO=${ENABLE_LTO} \ - || die "emake failed for ld64" + LTO=${ENABLE_LTO} + use test && emake build_test } @@ -279,16 +279,15 @@ compile_cctools() { OFLAG="${CCTOOLS_OFLAG}" \ CXXLIB="${CXXLIB}" \ DSYMUTIL=": disabled: dsymutil" \ - -j1 \ - || die "emake failed for the cctools" + -j1 + cd "${S}"/${CCTOOLS}/as emake \ BUILD_OBSOLETE_ARCH= \ RC_ProjectSourceVersion=${CCTOOLS_VERSION} \ RC_CFLAGS="-DASLIBEXECDIR=\"\\\"${EPREFIX}${LIBPATH}/\\\"\" ${CFLAGS}" \ OFLAG="${CCTOOLS_OFLAG}" \ - DSYMUTIL=": disabled: dsymutil" \ - || die "emake failed for as" + DSYMUTIL=": disabled: dsymutil" } src_compile() { diff --git a/sys-devel/binutils-apple/binutils-apple-6.3-r2.ebuild b/sys-devel/binutils-apple/binutils-apple-6.3-r2.ebuild index 2471067df89b..b3af64fe16d6 100644 --- a/sys-devel/binutils-apple/binutils-apple-6.3-r2.ebuild +++ b/sys-devel/binutils-apple/binutils-apple-6.3-r2.ebuild @@ -255,8 +255,8 @@ compile_ld64() { einfo "building ${LD64}" cd "${S}"/${LD64}/src emake \ - LTO=${ENABLE_LTO} \ - || die "emake failed for ld64" + LTO=${ENABLE_LTO} + use test && emake build_test } @@ -280,16 +280,15 @@ compile_cctools() { OFLAG="${CCTOOLS_OFLAG}" \ CXXLIB="${CXXLIB}" \ DSYMUTIL=": disabled: dsymutil" \ - -j1 \ - || die "emake failed for the cctools" + -j1 + cd "${S}"/${CCTOOLS}/as emake \ BUILD_OBSOLETE_ARCH= \ RC_ProjectSourceVersion=${CCTOOLS_VERSION} \ RC_CFLAGS="-DASLIBEXECDIR=\"\\\"${EPREFIX}${LIBPATH}/\\\"\" ${CFLAGS}" \ OFLAG="${CCTOOLS_OFLAG}" \ - DSYMUTIL=": disabled: dsymutil" \ - || die "emake failed for as" + DSYMUTIL=": disabled: dsymutil" } src_compile() { diff --git a/sys-devel/binutils-apple/binutils-apple-7.0-r1.ebuild b/sys-devel/binutils-apple/binutils-apple-7.0-r1.ebuild index 26cdc62a049f..7607b1e4624c 100644 --- a/sys-devel/binutils-apple/binutils-apple-7.0-r1.ebuild +++ b/sys-devel/binutils-apple/binutils-apple-7.0-r1.ebuild @@ -240,8 +240,8 @@ compile_ld64() { einfo "building ${LD64}" cd "${S}"/${LD64}/src emake \ - LTO=${ENABLE_LTO} \ - || die "emake failed for ld64" + LTO=${ENABLE_LTO} + use test && emake build_test } @@ -263,16 +263,15 @@ compile_cctools() { RC_ProjectSourceVersion=${CCTOOLS_VERSION} \ RC_CFLAGS="${CFLAGS}" \ OFLAG="${CCTOOLS_OFLAG}" \ - DSYMUTIL=": disabled: dsymutil" \ - || die "emake failed for the cctools" + DSYMUTIL=": disabled: dsymutil" + cd "${S}"/${CCTOOLS}/as emake \ BUILD_OBSOLETE_ARCH= \ RC_ProjectSourceVersion=${CCTOOLS_VERSION} \ RC_CFLAGS="-DASLIBEXECDIR=\"\\\"${EPREFIX}${LIBPATH}/\\\"\" -DCLANGDIR=\"\\\"${EPREFIX}/usr/bin/\\\"\" ${CFLAGS}" \ OFLAG="${CCTOOLS_OFLAG}" \ - DSYMUTIL=": disabled: dsymutil" \ - || die "emake failed for as" + DSYMUTIL=": disabled: dsymutil" } src_compile() { diff --git a/sys-devel/binutils-apple/binutils-apple-7.1-r1.ebuild b/sys-devel/binutils-apple/binutils-apple-7.1-r1.ebuild index 1726e46df84b..46382b1d6785 100644 --- a/sys-devel/binutils-apple/binutils-apple-7.1-r1.ebuild +++ b/sys-devel/binutils-apple/binutils-apple-7.1-r1.ebuild @@ -240,8 +240,8 @@ compile_ld64() { einfo "building ${LD64}" cd "${S}"/${LD64}/src emake \ - LTO=${ENABLE_LTO} \ - || die "emake failed for ld64" + LTO=${ENABLE_LTO} + use test && emake build_test } @@ -263,16 +263,15 @@ compile_cctools() { RC_ProjectSourceVersion=${CCTOOLS_VERSION} \ RC_CFLAGS="${CFLAGS}" \ OFLAG="${CCTOOLS_OFLAG}" \ - DSYMUTIL=": disabled: dsymutil" \ - || die "emake failed for the cctools" + DSYMUTIL=": disabled: dsymutil" + cd "${S}"/${CCTOOLS}/as emake \ BUILD_OBSOLETE_ARCH= \ RC_ProjectSourceVersion=${CCTOOLS_VERSION} \ RC_CFLAGS="-DASLIBEXECDIR=\"\\\"${EPREFIX}${LIBPATH}/\\\"\" -DCLANGDIR=\"\\\"${EPREFIX}/usr/bin/\\\"\" ${CFLAGS}" \ OFLAG="${CCTOOLS_OFLAG}" \ - DSYMUTIL=": disabled: dsymutil" \ - || die "emake failed for as" + DSYMUTIL=": disabled: dsymutil" } src_compile() { diff --git a/sys-devel/binutils-apple/binutils-apple-7.2-r1.ebuild b/sys-devel/binutils-apple/binutils-apple-7.2-r1.ebuild index 2c95149c0179..e7e593598c92 100644 --- a/sys-devel/binutils-apple/binutils-apple-7.2-r1.ebuild +++ b/sys-devel/binutils-apple/binutils-apple-7.2-r1.ebuild @@ -241,8 +241,8 @@ compile_ld64() { einfo "building ${LD64}" cd "${S}"/${LD64}/src emake \ - LTO=${ENABLE_LTO} \ - || die "emake failed for ld64" + LTO=${ENABLE_LTO} + use test && emake build_test } @@ -264,16 +264,15 @@ compile_cctools() { RC_ProjectSourceVersion=${CCTOOLS_VERSION} \ RC_CFLAGS="${CFLAGS}" \ OFLAG="${CCTOOLS_OFLAG}" \ - DSYMUTIL=": disabled: dsymutil" \ - || die "emake failed for the cctools" + DSYMUTIL=": disabled: dsymutil" + cd "${S}"/${CCTOOLS}/as emake \ BUILD_OBSOLETE_ARCH= \ RC_ProjectSourceVersion=${CCTOOLS_VERSION} \ RC_CFLAGS="-DASLIBEXECDIR=\"\\\"${EPREFIX}${LIBPATH}/\\\"\" -DCLANGDIR=\"\\\"${EPREFIX}/usr/bin/\\\"\" ${CFLAGS}" \ OFLAG="${CCTOOLS_OFLAG}" \ - DSYMUTIL=": disabled: dsymutil" \ - || die "emake failed for as" + DSYMUTIL=": disabled: dsymutil" } src_compile() { diff --git a/sys-devel/binutils-apple/binutils-apple-7.3.1.ebuild b/sys-devel/binutils-apple/binutils-apple-7.3.1.ebuild index 6c1ac5689e24..9497b6024a8e 100644 --- a/sys-devel/binutils-apple/binutils-apple-7.3.1.ebuild +++ b/sys-devel/binutils-apple/binutils-apple-7.3.1.ebuild @@ -248,8 +248,8 @@ compile_ld64() { einfo "building ${LD64}" cd "${S}"/${LD64}/src emake \ - LTO=${ENABLE_LTO} \ - || die "emake failed for ld64" + LTO=${ENABLE_LTO} + use test && emake build_test } @@ -271,16 +271,15 @@ compile_cctools() { RC_ProjectSourceVersion=${CCTOOLS_VERSION} \ RC_CFLAGS="${CFLAGS}" \ OFLAG="${CCTOOLS_OFLAG}" \ - DSYMUTIL=": disabled: dsymutil" \ - || die "emake failed for the cctools" + DSYMUTIL=": disabled: dsymutil" + cd "${S}"/${CCTOOLS}/as emake \ BUILD_OBSOLETE_ARCH= \ RC_ProjectSourceVersion=${CCTOOLS_VERSION} \ RC_CFLAGS="-DASLIBEXECDIR=\"\\\"${EPREFIX}${LIBPATH}/\\\"\" -DCLANGDIR=\"\\\"${EPREFIX}/usr/bin/\\\"\" ${CFLAGS}" \ OFLAG="${CCTOOLS_OFLAG}" \ - DSYMUTIL=": disabled: dsymutil" \ - || die "emake failed for as" + DSYMUTIL=": disabled: dsymutil" } src_compile() { diff --git a/sys-devel/binutils-apple/binutils-apple-8.1.ebuild b/sys-devel/binutils-apple/binutils-apple-8.1.ebuild index ba6816417faf..945873754651 100644 --- a/sys-devel/binutils-apple/binutils-apple-8.1.ebuild +++ b/sys-devel/binutils-apple/binutils-apple-8.1.ebuild @@ -182,8 +182,8 @@ compile_ld64() { cd "${S}"/${LD64}/src emake \ LTO=${ENABLE_LTO} \ - TAPI=$(use tapi && echo 1 || echo 0) \ - || die "emake failed for ld64" + TAPI=$(use tapi && echo 1 || echo 0) + use test && emake build_test } @@ -205,16 +205,15 @@ compile_cctools() { RC_ProjectSourceVersion=${CCTOOLS_VERSION} \ RC_CFLAGS="${CFLAGS}" \ OFLAG="${CCTOOLS_OFLAG}" \ - DSYMUTIL=": disabled: dsymutil" \ - || die "emake failed for the cctools" + DSYMUTIL=": disabled: dsymutil" + cd "${S}"/${CCTOOLS}/as emake \ BUILD_OBSOLETE_ARCH= \ RC_ProjectSourceVersion=${CCTOOLS_VERSION} \ RC_CFLAGS="-DASLIBEXECDIR=\"\\\"${EPREFIX}${LIBPATH}/\\\"\" -DCLANGDIR=\"\\\"${EPREFIX}/usr/bin/\\\"\" ${CFLAGS}" \ OFLAG="${CCTOOLS_OFLAG}" \ - DSYMUTIL=": disabled: dsymutil" \ - || die "emake failed for as" + DSYMUTIL=": disabled: dsymutil" } src_compile() { diff --git a/sys-devel/binutils-apple/binutils-apple-8.2.1-r1.ebuild b/sys-devel/binutils-apple/binutils-apple-8.2.1-r1.ebuild index 2ff38c2b3909..f7a37367f25f 100644 --- a/sys-devel/binutils-apple/binutils-apple-8.2.1-r1.ebuild +++ b/sys-devel/binutils-apple/binutils-apple-8.2.1-r1.ebuild @@ -201,8 +201,8 @@ compile_ld64() { LTO_INCDIR=${LLVM_INCDIR} \ LTO_LIBDIR=${LLVM_LIBDIR} \ TAPI=$(use tapi && echo 1 || echo 0) \ - TAPI_LIBDIR="${EPREFIX}"/usr/lib \ - || die "emake failed for ld64" + TAPI_LIBDIR="${EPREFIX}"/usr/lib + use test && emake build_test } @@ -223,16 +223,15 @@ compile_cctools() { RC_ProjectSourceVersion=${CCTOOLS_VERSION} \ RC_CFLAGS="${CFLAGS}" \ OFLAG="${CCTOOLS_OFLAG}" \ - DSYMUTIL=": disabled: dsymutil" \ - || die "emake failed for the cctools" + DSYMUTIL=": disabled: dsymutil" + cd "${S}"/${CCTOOLS}/as emake \ BUILD_OBSOLETE_ARCH= \ RC_ProjectSourceVersion=${CCTOOLS_VERSION} \ RC_CFLAGS="-DASLIBEXECDIR=\"\\\"${EPREFIX}${LIBPATH}/\\\"\" ${CFLAGS}" \ OFLAG="${CCTOOLS_OFLAG}" \ - DSYMUTIL=": disabled: dsymutil" \ - || die "emake failed for as" + DSYMUTIL=": disabled: dsymutil" } src_compile() { diff --git a/sys-devel/binutils-hppa64/binutils-hppa64-2.30-r4.ebuild b/sys-devel/binutils-hppa64/binutils-hppa64-2.30-r4.ebuild index 400a9dd6eaad..a9281b7319d6 100644 --- a/sys-devel/binutils-hppa64/binutils-hppa64-2.30-r4.ebuild +++ b/sys-devel/binutils-hppa64/binutils-hppa64-2.30-r4.ebuild @@ -322,7 +322,7 @@ src_install() { objalloc.h splay-tree.h ) - doins "${libiberty_headers[@]/#/${S}/include/}" || die + doins "${libiberty_headers[@]/#/${S}/include/}" if [[ -d ${ED}/${LIBPATH}/lib ]] ; then mv "${ED}"/${LIBPATH}/lib/* "${ED}"/${LIBPATH}/ rm -r "${ED}"/${LIBPATH}/lib diff --git a/sys-devel/binutils-hppa64/binutils-hppa64-2.31.1-r6.ebuild b/sys-devel/binutils-hppa64/binutils-hppa64-2.31.1-r6.ebuild index 0d7844e47004..33a031dfb6ee 100644 --- a/sys-devel/binutils-hppa64/binutils-hppa64-2.31.1-r6.ebuild +++ b/sys-devel/binutils-hppa64/binutils-hppa64-2.31.1-r6.ebuild @@ -340,7 +340,7 @@ src_install() { objalloc.h splay-tree.h ) - doins "${libiberty_headers[@]/#/${S}/include/}" || die + doins "${libiberty_headers[@]/#/${S}/include/}" if [[ -d ${ED}/${LIBPATH}/lib ]] ; then mv "${ED}"/${LIBPATH}/lib/* "${ED}"/${LIBPATH}/ rm -r "${ED}"/${LIBPATH}/lib diff --git a/sys-devel/binutils-hppa64/binutils-hppa64-2.32-r1.ebuild b/sys-devel/binutils-hppa64/binutils-hppa64-2.32-r1.ebuild index 9cea689fb6a9..3871f19978cf 100644 --- a/sys-devel/binutils-hppa64/binutils-hppa64-2.32-r1.ebuild +++ b/sys-devel/binutils-hppa64/binutils-hppa64-2.32-r1.ebuild @@ -339,7 +339,7 @@ src_install() { objalloc.h splay-tree.h ) - doins "${libiberty_headers[@]/#/${S}/include/}" || die + doins "${libiberty_headers[@]/#/${S}/include/}" if [[ -d ${ED}/${LIBPATH}/lib ]] ; then mv "${ED}"/${LIBPATH}/lib/* "${ED}"/${LIBPATH}/ rm -r "${ED}"/${LIBPATH}/lib diff --git a/sys-devel/binutils-hppa64/binutils-hppa64-2.33.1.ebuild b/sys-devel/binutils-hppa64/binutils-hppa64-2.33.1.ebuild index 9c1e764963b4..550e2c504747 100644 --- a/sys-devel/binutils-hppa64/binutils-hppa64-2.33.1.ebuild +++ b/sys-devel/binutils-hppa64/binutils-hppa64-2.33.1.ebuild @@ -334,7 +334,7 @@ src_install() { objalloc.h splay-tree.h ) - doins "${libiberty_headers[@]/#/${S}/include/}" || die + doins "${libiberty_headers[@]/#/${S}/include/}" if [[ -d ${ED}/${LIBPATH}/lib ]] ; then mv "${ED}"/${LIBPATH}/lib/* "${ED}"/${LIBPATH}/ rm -r "${ED}"/${LIBPATH}/lib diff --git a/sys-devel/binutils/binutils-2.30-r4.ebuild b/sys-devel/binutils/binutils-2.30-r4.ebuild index e57b8ed86e04..a33cb8814d06 100644 --- a/sys-devel/binutils/binutils-2.30-r4.ebuild +++ b/sys-devel/binutils/binutils-2.30-r4.ebuild @@ -322,7 +322,7 @@ src_install() { objalloc.h splay-tree.h ) - doins "${libiberty_headers[@]/#/${S}/include/}" || die + doins "${libiberty_headers[@]/#/${S}/include/}" if [[ -d ${ED}/${LIBPATH}/lib ]] ; then mv "${ED}"/${LIBPATH}/lib/* "${ED}"/${LIBPATH}/ rm -r "${ED}"/${LIBPATH}/lib diff --git a/sys-devel/binutils/binutils-2.31.1-r6.ebuild b/sys-devel/binutils/binutils-2.31.1-r6.ebuild index 537b7b8ea786..1fc6a19d0b0e 100644 --- a/sys-devel/binutils/binutils-2.31.1-r6.ebuild +++ b/sys-devel/binutils/binutils-2.31.1-r6.ebuild @@ -339,7 +339,7 @@ src_install() { objalloc.h splay-tree.h ) - doins "${libiberty_headers[@]/#/${S}/include/}" || die + doins "${libiberty_headers[@]/#/${S}/include/}" if [[ -d ${ED}/${LIBPATH}/lib ]] ; then mv "${ED}"/${LIBPATH}/lib/* "${ED}"/${LIBPATH}/ rm -r "${ED}"/${LIBPATH}/lib diff --git a/sys-devel/binutils/binutils-2.32-r1.ebuild b/sys-devel/binutils/binutils-2.32-r1.ebuild index 682714c5e9d1..26b1cf7470f7 100644 --- a/sys-devel/binutils/binutils-2.32-r1.ebuild +++ b/sys-devel/binutils/binutils-2.32-r1.ebuild @@ -343,7 +343,7 @@ src_install() { objalloc.h splay-tree.h ) - doins "${libiberty_headers[@]/#/${S}/include/}" || die + doins "${libiberty_headers[@]/#/${S}/include/}" if [[ -d ${ED}/${LIBPATH}/lib ]] ; then mv "${ED}"/${LIBPATH}/lib/* "${ED}"/${LIBPATH}/ rm -r "${ED}"/${LIBPATH}/lib diff --git a/sys-devel/binutils/binutils-2.33.1.ebuild b/sys-devel/binutils/binutils-2.33.1.ebuild index 9a1640aa4078..12f4ae430537 100644 --- a/sys-devel/binutils/binutils-2.33.1.ebuild +++ b/sys-devel/binutils/binutils-2.33.1.ebuild @@ -333,7 +333,7 @@ src_install() { objalloc.h splay-tree.h ) - doins "${libiberty_headers[@]/#/${S}/include/}" || die + doins "${libiberty_headers[@]/#/${S}/include/}" if [[ -d ${ED}/${LIBPATH}/lib ]] ; then mv "${ED}"/${LIBPATH}/lib/* "${ED}"/${LIBPATH}/ rm -r "${ED}"/${LIBPATH}/lib diff --git a/sys-devel/binutils/binutils-9999.ebuild b/sys-devel/binutils/binutils-9999.ebuild index d55698ff4926..67a0fcb0d900 100644 --- a/sys-devel/binutils/binutils-9999.ebuild +++ b/sys-devel/binutils/binutils-9999.ebuild @@ -334,7 +334,7 @@ src_install() { objalloc.h splay-tree.h ) - doins "${libiberty_headers[@]/#/${S}/include/}" || die + doins "${libiberty_headers[@]/#/${S}/include/}" if [[ -d ${ED}/${LIBPATH}/lib ]] ; then mv "${ED}"/${LIBPATH}/lib/* "${ED}"/${LIBPATH}/ rm -r "${ED}"/${LIBPATH}/lib diff --git a/sys-devel/gcc-apple/gcc-apple-4.2.1_p5666-r2.ebuild b/sys-devel/gcc-apple/gcc-apple-4.2.1_p5666-r2.ebuild index 22cbde635fe1..df8487554d73 100644 --- a/sys-devel/gcc-apple/gcc-apple-4.2.1_p5666-r2.ebuild +++ b/sys-devel/gcc-apple/gcc-apple-4.2.1_p5666-r2.ebuild @@ -268,13 +268,13 @@ src_compile() { else GCC_MAKE_TARGET=${GCC_MAKE_TARGET-bootstrap} fi - emake ${GCC_MAKE_TARGET} || die "emake failed" + emake ${GCC_MAKE_TARGET} } src_install() { cd "${WORKDIR}"/build # -jX doesn't work - emake -j1 DESTDIR="${D}" install || die + emake -j1 DESTDIR="${D}" install # Punt some tools which are really only useful while building gcc find "${ED}" -name install-tools -prune -type d -exec rm -rf "{}" \; diff --git a/sys-devel/gdb-apple/gdb-apple-1752.ebuild b/sys-devel/gdb-apple/gdb-apple-1752.ebuild index 6f9458c8f084..05d3827575a1 100644 --- a/sys-devel/gdb-apple/gdb-apple-1752.ebuild +++ b/sys-devel/gdb-apple/gdb-apple-1752.ebuild @@ -56,15 +56,14 @@ src_configure() { econf \ --disable-werror \ --disable-debug-symbols-framework \ - $(use_enable nls) \ - || die + $(use_enable nls) } src_compile() { # unable to work around parallel make issue # ignore texinfo issues (version mismatch, to hard to fix or # disable) - emake -j2 MAKEINFOFLAGS="--force" || die + emake -j2 MAKEINFOFLAGS="--force" } src_install() { diff --git a/sys-devel/gnuconfig/gnuconfig-20190912.ebuild b/sys-devel/gnuconfig/gnuconfig-20190912.ebuild index 95ceccf19f19..ee23a02cd86c 100644 --- a/sys-devel/gnuconfig/gnuconfig-20190912.ebuild +++ b/sys-devel/gnuconfig/gnuconfig-20190912.ebuild @@ -57,7 +57,7 @@ src_test() { src_install() { insinto /usr/share/${PN} - doins config.{sub,guess} || die + doins config.{sub,guess} fperms +x /usr/share/${PN}/config.{sub,guess} dodoc ChangeLog } diff --git a/sys-devel/gnuconfig/gnuconfig-99999999.ebuild b/sys-devel/gnuconfig/gnuconfig-99999999.ebuild index 4c2531767d3e..5d49b8940d9d 100644 --- a/sys-devel/gnuconfig/gnuconfig-99999999.ebuild +++ b/sys-devel/gnuconfig/gnuconfig-99999999.ebuild @@ -57,7 +57,7 @@ src_test() { src_install() { insinto /usr/share/${PN} - doins config.{sub,guess} || die + doins config.{sub,guess} fperms +x /usr/share/${PN}/config.{sub,guess} dodoc ChangeLog } diff --git a/sys-devel/native-cctools/native-cctools-4.ebuild b/sys-devel/native-cctools/native-cctools-4.ebuild index e94fdaa2f606..c05aee16d1b5 100644 --- a/sys-devel/native-cctools/native-cctools-4.ebuild +++ b/sys-devel/native-cctools/native-cctools-4.ebuild @@ -30,7 +30,7 @@ src_install() { BINPATH=/usr/${CHOST}/binutils-bin/native-${PV} keepdir ${LIBPATH} || die - dodir ${BINPATH} || die + dodir ${BINPATH} # allow for future hosts with different paths nativepath="" diff --git a/sys-firmware/b43-firmware/b43-firmware-5.100.138.ebuild b/sys-firmware/b43-firmware/b43-firmware-5.100.138.ebuild index 88b0e5dc76fb..a256b4cf53bb 100644 --- a/sys-firmware/b43-firmware/b43-firmware-5.100.138.ebuild +++ b/sys-firmware/b43-firmware/b43-firmware-5.100.138.ebuild @@ -28,5 +28,5 @@ src_compile() { src_install() { insinto /lib/firmware - doins -r ebuild-output/* || die + doins -r ebuild-output/* } diff --git a/sys-firmware/b43-firmware/b43-firmware-6.30.163.46.ebuild b/sys-firmware/b43-firmware/b43-firmware-6.30.163.46.ebuild index 67b2e995dfd1..5dc8e46d721e 100644 --- a/sys-firmware/b43-firmware/b43-firmware-6.30.163.46.ebuild +++ b/sys-firmware/b43-firmware/b43-firmware-6.30.163.46.ebuild @@ -28,5 +28,5 @@ src_compile() { src_install() { insinto /lib/firmware - doins -r ebuild-output/* || die + doins -r ebuild-output/* } diff --git a/sys-fs/jdiskreport-bin/jdiskreport-bin-1.2.5-r1.ebuild b/sys-fs/jdiskreport-bin/jdiskreport-bin-1.2.5-r1.ebuild index 050e68827747..7eefac0eba94 100644 --- a/sys-fs/jdiskreport-bin/jdiskreport-bin-1.2.5-r1.ebuild +++ b/sys-fs/jdiskreport-bin/jdiskreport-bin-1.2.5-r1.ebuild @@ -27,5 +27,5 @@ src_install() { java-pkg_newjar ${MY_PN}-${PV}.jar java-pkg_dolauncher ${MY_PN} - dodoc README.txt RELEASE-NOTES.txt || die + dodoc README.txt RELEASE-NOTES.txt } diff --git a/sys-fs/jdiskreport-bin/jdiskreport-bin-1.3.0.ebuild b/sys-fs/jdiskreport-bin/jdiskreport-bin-1.3.0.ebuild index 050e68827747..7eefac0eba94 100644 --- a/sys-fs/jdiskreport-bin/jdiskreport-bin-1.3.0.ebuild +++ b/sys-fs/jdiskreport-bin/jdiskreport-bin-1.3.0.ebuild @@ -27,5 +27,5 @@ src_install() { java-pkg_newjar ${MY_PN}-${PV}.jar java-pkg_dolauncher ${MY_PN} - dodoc README.txt RELEASE-NOTES.txt || die + dodoc README.txt RELEASE-NOTES.txt } diff --git a/sys-fs/jdiskreport-bin/jdiskreport-bin-1.4.1.ebuild b/sys-fs/jdiskreport-bin/jdiskreport-bin-1.4.1.ebuild index 287bb83f39ad..69ad393e3a39 100644 --- a/sys-fs/jdiskreport-bin/jdiskreport-bin-1.4.1.ebuild +++ b/sys-fs/jdiskreport-bin/jdiskreport-bin-1.4.1.ebuild @@ -27,5 +27,5 @@ src_install() { java-pkg_newjar ${MY_PN}-${PV}.jar java-pkg_dolauncher ${MY_PN} - dodoc README.txt RELEASE-NOTES.txt || die + dodoc README.txt RELEASE-NOTES.txt } diff --git a/sys-fs/unionfs-fuse/unionfs-fuse-1.0.ebuild b/sys-fs/unionfs-fuse/unionfs-fuse-1.0.ebuild index e9658f33fb12..1dd309e439f7 100644 --- a/sys-fs/unionfs-fuse/unionfs-fuse-1.0.ebuild +++ b/sys-fs/unionfs-fuse/unionfs-fuse-1.0.ebuild @@ -17,5 +17,5 @@ DEPEND="sys-fs/fuse:0" RDEPEND="${DEPEND}" src_install() { - emake DESTDIR="${D}" PREFIX="${EPREFIX}/usr" install || die "emake install failed" + emake DESTDIR="${D}" PREFIX="${EPREFIX}/usr" install } diff --git a/sys-fs/unionfs-fuse/unionfs-fuse-2.0.ebuild b/sys-fs/unionfs-fuse/unionfs-fuse-2.0.ebuild index fe5a7ef6d178..bf4a922ce675 100644 --- a/sys-fs/unionfs-fuse/unionfs-fuse-2.0.ebuild +++ b/sys-fs/unionfs-fuse/unionfs-fuse-2.0.ebuild @@ -17,5 +17,5 @@ DEPEND="sys-fs/fuse:0" RDEPEND="${DEPEND}" src_install() { - emake DESTDIR="${D}" PREFIX="${EPREFIX}/usr" install || die "emake install failed" + emake DESTDIR="${D}" PREFIX="${EPREFIX}/usr" install } diff --git a/sys-fs/unionfs-fuse/unionfs-fuse-9999.ebuild b/sys-fs/unionfs-fuse/unionfs-fuse-9999.ebuild index bf42f96d4078..76d6d822dd89 100644 --- a/sys-fs/unionfs-fuse/unionfs-fuse-9999.ebuild +++ b/sys-fs/unionfs-fuse/unionfs-fuse-9999.ebuild @@ -19,5 +19,5 @@ DEPEND="sys-fs/fuse:0" RDEPEND="${DEPEND}" src_install() { - emake DESTDIR="${D}" PREFIX="${EPREFIX}/usr" install || die "emake install failed" + emake DESTDIR="${D}" PREFIX="${EPREFIX}/usr" install } diff --git a/sys-kernel/linux-docs/linux-docs-4.19.ebuild b/sys-kernel/linux-docs/linux-docs-4.19.ebuild index b475835f2458..9a13e1c5f773 100644 --- a/sys-kernel/linux-docs/linux-docs-4.19.ebuild +++ b/sys-kernel/linux-docs/linux-docs-4.19.ebuild @@ -22,7 +22,7 @@ RDEPEND="" src_compile() { local ARCH=$(tc-arch-kernel) unset KBUILD_OUTPUT - emake htmldocs || die "make htmldocs failed" + emake htmldocs } src_install() { diff --git a/sys-libs/csu/csu-79.ebuild b/sys-libs/csu/csu-79.ebuild index bd386e8f1cdc..465515a1d795 100644 --- a/sys-libs/csu/csu-79.ebuild +++ b/sys-libs/csu/csu-79.ebuild @@ -32,7 +32,7 @@ src_prepare() { } src_compile() { - emake USRLIBDIR="${EPREFIX}"/lib || die + emake USRLIBDIR="${EPREFIX}"/lib } src_install() { @@ -40,5 +40,5 @@ src_install() { USRLIBDIR="${EPREFIX}"/lib \ LOCLIBDIR="${EPREFIX}"/lib \ DSTROOT="${D}" \ - install || die + install } diff --git a/sys-libs/csu/csu-85.ebuild b/sys-libs/csu/csu-85.ebuild index 4e6c9fd1daf8..6d0fb053db7f 100644 --- a/sys-libs/csu/csu-85.ebuild +++ b/sys-libs/csu/csu-85.ebuild @@ -52,7 +52,7 @@ src_compile() { # so this isn't used, should they have gcc-apple installed, then # this wouldn't hurt either. type -P gcc-4.2.1 > /dev/null && export CC=gcc-4.2.1 - emake USRLIBDIR="${EPREFIX}"/lib || die + emake USRLIBDIR="${EPREFIX}"/lib } src_install() { @@ -60,5 +60,5 @@ src_install() { USRLIBDIR="${EPREFIX}"/lib \ LOCLIBDIR="${EPREFIX}"/lib \ DSTROOT="${D}" \ - install || die + install } diff --git a/sys-libs/e2fsprogs-libs/e2fsprogs-libs-1.44.5.ebuild b/sys-libs/e2fsprogs-libs/e2fsprogs-libs-1.44.5.ebuild index 2dcb1838de26..31a4fa3fa902 100644 --- a/sys-libs/e2fsprogs-libs/e2fsprogs-libs-1.44.5.ebuild +++ b/sys-libs/e2fsprogs-libs/e2fsprogs-libs-1.44.5.ebuild @@ -58,23 +58,23 @@ multilib_src_configure() { } multilib_src_compile() { - emake -C lib/et V=1 || die "Failed to build libcom" + emake -C lib/et V=1 - emake -C lib/ss V=1 || die "Failed to build libss" + emake -C lib/ss V=1 } multilib_src_test() { if multilib_is_native_abi; then - emake -C lib/et V=1 check || die "Failed to test libcom" + emake -C lib/et V=1 check - emake -C lib/ss V=1 check || die "Failed to test libss" + emake -C lib/ss V=1 check fi } multilib_src_install() { - emake -C lib/et V=1 DESTDIR="${D%/}" install || die "Failed to install libcom" + emake -C lib/et V=1 DESTDIR="${D%/}" install - emake -C lib/ss V=1 DESTDIR="${D%/}" install || die "Failed to install libss" + emake -C lib/ss V=1 DESTDIR="${D%/}" install # We call "gen_usr_ldscript -a" to ensure libs are present in /lib to support # split /usr (e.g. "e2fsck" from sys-fs/e2fsprogs is installed in /sbin and diff --git a/sys-libs/e2fsprogs-libs/e2fsprogs-libs-1.45.2.ebuild b/sys-libs/e2fsprogs-libs/e2fsprogs-libs-1.45.2.ebuild index 610d4705abb0..24859270ad92 100644 --- a/sys-libs/e2fsprogs-libs/e2fsprogs-libs-1.45.2.ebuild +++ b/sys-libs/e2fsprogs-libs/e2fsprogs-libs-1.45.2.ebuild @@ -58,23 +58,23 @@ multilib_src_configure() { } multilib_src_compile() { - emake -C lib/et V=1 || die "Failed to build libcom" + emake -C lib/et V=1 - emake -C lib/ss V=1 || die "Failed to build libss" + emake -C lib/ss V=1 } multilib_src_test() { if multilib_is_native_abi; then - emake -C lib/et V=1 check || die "Failed to test libcom" + emake -C lib/et V=1 check - emake -C lib/ss V=1 check || die "Failed to test libss" + emake -C lib/ss V=1 check fi } multilib_src_install() { - emake -C lib/et V=1 DESTDIR="${D}" install || die "Failed to install libcom" + emake -C lib/et V=1 DESTDIR="${D}" install - emake -C lib/ss V=1 DESTDIR="${D}" install || die "Failed to install libss" + emake -C lib/ss V=1 DESTDIR="${D}" install # We call "gen_usr_ldscript -a" to ensure libs are present in /lib to support # split /usr (e.g. "e2fsck" from sys-fs/e2fsprogs is installed in /sbin and diff --git a/sys-libs/e2fsprogs-libs/e2fsprogs-libs-1.45.3.ebuild b/sys-libs/e2fsprogs-libs/e2fsprogs-libs-1.45.3.ebuild index a65bd89cf144..f5538bc2e807 100644 --- a/sys-libs/e2fsprogs-libs/e2fsprogs-libs-1.45.3.ebuild +++ b/sys-libs/e2fsprogs-libs/e2fsprogs-libs-1.45.3.ebuild @@ -58,23 +58,23 @@ multilib_src_configure() { } multilib_src_compile() { - emake -C lib/et V=1 || die "Failed to build libcom" + emake -C lib/et V=1 - emake -C lib/ss V=1 || die "Failed to build libss" + emake -C lib/ss V=1 } multilib_src_test() { if multilib_is_native_abi; then - emake -C lib/et V=1 check || die "Failed to test libcom" + emake -C lib/et V=1 check - emake -C lib/ss V=1 check || die "Failed to test libss" + emake -C lib/ss V=1 check fi } multilib_src_install() { - emake -C lib/et V=1 DESTDIR="${D}" install || die "Failed to install libcom" + emake -C lib/et V=1 DESTDIR="${D}" install - emake -C lib/ss V=1 DESTDIR="${D}" install || die "Failed to install libss" + emake -C lib/ss V=1 DESTDIR="${D}" install # We call "gen_usr_ldscript -a" to ensure libs are present in /lib to support # split /usr (e.g. "e2fsck" from sys-fs/e2fsprogs is installed in /sbin and diff --git a/sys-libs/e2fsprogs-libs/e2fsprogs-libs-1.45.4.ebuild b/sys-libs/e2fsprogs-libs/e2fsprogs-libs-1.45.4.ebuild index 610d4705abb0..24859270ad92 100644 --- a/sys-libs/e2fsprogs-libs/e2fsprogs-libs-1.45.4.ebuild +++ b/sys-libs/e2fsprogs-libs/e2fsprogs-libs-1.45.4.ebuild @@ -58,23 +58,23 @@ multilib_src_configure() { } multilib_src_compile() { - emake -C lib/et V=1 || die "Failed to build libcom" + emake -C lib/et V=1 - emake -C lib/ss V=1 || die "Failed to build libss" + emake -C lib/ss V=1 } multilib_src_test() { if multilib_is_native_abi; then - emake -C lib/et V=1 check || die "Failed to test libcom" + emake -C lib/et V=1 check - emake -C lib/ss V=1 check || die "Failed to test libss" + emake -C lib/ss V=1 check fi } multilib_src_install() { - emake -C lib/et V=1 DESTDIR="${D}" install || die "Failed to install libcom" + emake -C lib/et V=1 DESTDIR="${D}" install - emake -C lib/ss V=1 DESTDIR="${D}" install || die "Failed to install libss" + emake -C lib/ss V=1 DESTDIR="${D}" install # We call "gen_usr_ldscript -a" to ensure libs are present in /lib to support # split /usr (e.g. "e2fsck" from sys-fs/e2fsprogs is installed in /sbin and diff --git a/sys-libs/glibc/glibc-2.19-r2.ebuild b/sys-libs/glibc/glibc-2.19-r2.ebuild index ee7e71796970..2ba5fba1eef8 100644 --- a/sys-libs/glibc/glibc-2.19-r2.ebuild +++ b/sys-libs/glibc/glibc-2.19-r2.ebuild @@ -983,7 +983,7 @@ src_configure() { } do_src_compile() { - emake -C "$(builddir nptl)" || die "make nptl for ${ABI} failed" + emake -C "$(builddir nptl)" } src_compile() { @@ -1032,7 +1032,7 @@ glibc_do_src_install() { local builddir=$(builddir nptl) cd "${builddir}" - emake install_root="${D}$(alt_prefix)" install || die + emake install_root="${D}$(alt_prefix)" install # This version (2.26) provides some compatibility libraries for the NIS/NIS+ support # which come without headers etc. Only needed for binary packages since the diff --git a/sys-libs/glibc/glibc-2.26-r7.ebuild b/sys-libs/glibc/glibc-2.26-r7.ebuild index ae725c40c7cf..7194206b39a5 100644 --- a/sys-libs/glibc/glibc-2.26-r7.ebuild +++ b/sys-libs/glibc/glibc-2.26-r7.ebuild @@ -577,7 +577,7 @@ src_configure() { } do_src_compile() { - emake -C "$(builddir nptl)" || die "make nptl for ${ABI} failed" + emake -C "$(builddir nptl)" } src_compile() { @@ -616,7 +616,7 @@ glibc_do_src_install() { local builddir=$(builddir nptl) cd "${builddir}" - emake install_root="${D}$(alt_prefix)" install || die + emake install_root="${D}$(alt_prefix)" install # This version (2.26) provides some compatibility libraries for the NIS/NIS+ support # which come without headers etc. Only needed for binary packages since the diff --git a/sys-libs/glibc/glibc-2.27-r6.ebuild b/sys-libs/glibc/glibc-2.27-r6.ebuild index 1e6d8113f9f7..39bd251ae522 100644 --- a/sys-libs/glibc/glibc-2.27-r6.ebuild +++ b/sys-libs/glibc/glibc-2.27-r6.ebuild @@ -1086,7 +1086,7 @@ src_configure() { } do_src_compile() { - emake -C "$(builddir nptl)" || die "make nptl for ${ABI} failed" + emake -C "$(builddir nptl)" } src_compile() { @@ -1139,7 +1139,7 @@ glibc_do_src_install() { local builddir=$(builddir nptl) cd "${builddir}" - emake install_root="${D}$(alt_prefix)" install || die + emake install_root="${D}$(alt_prefix)" install # This version (2.26) provides some compatibility libraries for the NIS/NIS+ support # which come without headers etc. Only needed for binary packages since the diff --git a/sys-libs/glibc/glibc-2.28-r6.ebuild b/sys-libs/glibc/glibc-2.28-r6.ebuild index 797405fefda1..8752c87248c9 100644 --- a/sys-libs/glibc/glibc-2.28-r6.ebuild +++ b/sys-libs/glibc/glibc-2.28-r6.ebuild @@ -1084,7 +1084,7 @@ src_configure() { } do_src_compile() { - emake -C "$(builddir nptl)" || die "make nptl for ${ABI} failed" + emake -C "$(builddir nptl)" } src_compile() { @@ -1137,7 +1137,7 @@ glibc_do_src_install() { local builddir=$(builddir nptl) cd "${builddir}" - emake install_root="${D}$(alt_prefix)" install || die + emake install_root="${D}$(alt_prefix)" install # This version (2.26) provides some compatibility libraries for the NIS/NIS+ support # which come without headers etc. Only needed for binary packages since the diff --git a/sys-libs/glibc/glibc-2.29-r2.ebuild b/sys-libs/glibc/glibc-2.29-r2.ebuild index af2826f3bcec..2f287c1a1b22 100644 --- a/sys-libs/glibc/glibc-2.29-r2.ebuild +++ b/sys-libs/glibc/glibc-2.29-r2.ebuild @@ -1112,7 +1112,7 @@ src_configure() { } do_src_compile() { - emake -C "$(builddir nptl)" || die "make nptl for ${ABI} failed" + emake -C "$(builddir nptl)" } src_compile() { @@ -1165,7 +1165,7 @@ glibc_do_src_install() { local builddir=$(builddir nptl) cd "${builddir}" - emake install_root="${D}$(build_eprefix)$(alt_prefix)" install || die + emake install_root="${D}$(build_eprefix)$(alt_prefix)" install # This version (2.26) provides some compatibility libraries for the NIS/NIS+ support # which come without headers etc. Only needed for binary packages since the diff --git a/sys-libs/libchipcard/libchipcard-5.0.4.ebuild b/sys-libs/libchipcard/libchipcard-5.0.4.ebuild index eaa041a3d6c5..cb9f5a1708d1 100644 --- a/sys-libs/libchipcard/libchipcard-5.0.4.ebuild +++ b/sys-libs/libchipcard/libchipcard-5.0.4.ebuild @@ -32,7 +32,7 @@ src_configure() { } src_install() { - emake DESTDIR="${D}" install || die + emake DESTDIR="${D}" install einstalldocs diff --git a/sys-libs/libhugetlbfs/libhugetlbfs-2.21.ebuild b/sys-libs/libhugetlbfs/libhugetlbfs-2.21.ebuild index 117d74e685b8..8afaeb6120b1 100644 --- a/sys-libs/libhugetlbfs/libhugetlbfs-2.21.ebuild +++ b/sys-libs/libhugetlbfs/libhugetlbfs-2.21.ebuild @@ -73,7 +73,7 @@ src_test_alloc_one() { src_test() { [[ $UID -eq 0 ]] || die "Need FEATURES=-userpriv to run this testsuite" einfo "Building testsuite" - emake -j1 tests || die "Failed to build tests" + emake -j1 tests hugeadm='obj/hugeadm' allocated='' diff --git a/sys-libs/libhugetlbfs/libhugetlbfs-2.22.ebuild b/sys-libs/libhugetlbfs/libhugetlbfs-2.22.ebuild index e9ace7861409..b62aa943041e 100644 --- a/sys-libs/libhugetlbfs/libhugetlbfs-2.22.ebuild +++ b/sys-libs/libhugetlbfs/libhugetlbfs-2.22.ebuild @@ -73,7 +73,7 @@ src_test_alloc_one() { src_test() { [[ $UID -eq 0 ]] || die "Need FEATURES=-userpriv to run this testsuite" einfo "Building testsuite" - emake -j1 tests || die "Failed to build tests" + emake -j1 tests local hugeadm='obj/hugeadm' local allocated='' diff --git a/sys-libs/libvpd/libvpd-2.1.3.ebuild b/sys-libs/libvpd/libvpd-2.1.3.ebuild index fc751d0e4407..e4566e2fcdee 100644 --- a/sys-libs/libvpd/libvpd-2.1.3.ebuild +++ b/sys-libs/libvpd/libvpd-2.1.3.ebuild @@ -23,10 +23,9 @@ src_unpack() { src_configure() { ./bootstrap.sh - econf || die "Unable to configure" + econf } src_install(){ - emake DESTDIR="${D}" install || die "Something went wrong" - + emake DESTDIR="${D}" install } diff --git a/sys-libs/musl/musl-1.1.22.ebuild b/sys-libs/musl/musl-1.1.22.ebuild index 129c83020221..47c54d2eb79c 100644 --- a/sys-libs/musl/musl-1.1.22.ebuild +++ b/sys-libs/musl/musl-1.1.22.ebuild @@ -109,7 +109,7 @@ src_install() { dobin "${T}"/getent dobin "${T}"/iconv echo 'LDPATH="include ld.so.conf.d/*.conf"' > "${T}"/00musl || die - doenvd "${T}"/00musl || die + doenvd "${T}"/00musl fi } diff --git a/sys-libs/musl/musl-1.1.23.ebuild b/sys-libs/musl/musl-1.1.23.ebuild index 129c83020221..47c54d2eb79c 100644 --- a/sys-libs/musl/musl-1.1.23.ebuild +++ b/sys-libs/musl/musl-1.1.23.ebuild @@ -109,7 +109,7 @@ src_install() { dobin "${T}"/getent dobin "${T}"/iconv echo 'LDPATH="include ld.so.conf.d/*.conf"' > "${T}"/00musl || die - doenvd "${T}"/00musl || die + doenvd "${T}"/00musl fi } diff --git a/sys-libs/musl/musl-1.1.24.ebuild b/sys-libs/musl/musl-1.1.24.ebuild index 36f4183156b3..eb6063619101 100644 --- a/sys-libs/musl/musl-1.1.24.ebuild +++ b/sys-libs/musl/musl-1.1.24.ebuild @@ -109,7 +109,7 @@ src_install() { dobin "${T}"/getent dobin "${T}"/iconv echo 'LDPATH="include ld.so.conf.d/*.conf"' > "${T}"/00musl || die - doenvd "${T}"/00musl || die + doenvd "${T}"/00musl fi } diff --git a/sys-libs/musl/musl-9999.ebuild b/sys-libs/musl/musl-9999.ebuild index 0827b9d412bf..9c1ddb9d501b 100644 --- a/sys-libs/musl/musl-9999.ebuild +++ b/sys-libs/musl/musl-9999.ebuild @@ -109,7 +109,7 @@ src_install() { dobin "${T}"/getent dobin "${T}"/iconv echo 'LDPATH="include ld.so.conf.d/*.conf"' > "${T}"/00musl || die - doenvd "${T}"/00musl || die + doenvd "${T}"/00musl fi } diff --git a/sys-power/apcupsd/apcupsd-3.14.13.ebuild b/sys-power/apcupsd/apcupsd-3.14.13.ebuild index cbebbb1a5c2d..a888ac246e8b 100644 --- a/sys-power/apcupsd/apcupsd-3.14.13.ebuild +++ b/sys-power/apcupsd/apcupsd-3.14.13.ebuild @@ -74,7 +74,7 @@ src_compile() { # the text files in the distribution, but I wouldn't count on them # doing that anytime soon. MANPAGER=$(type -p cat) \ - emake || die "emake failed" + emake } src_install() { diff --git a/sys-power/nut/nut-2.7.4-r1.ebuild b/sys-power/nut/nut-2.7.4-r1.ebuild index 33146bc92d79..48deb79389f8 100644 --- a/sys-power/nut/nut-2.7.4-r1.ebuild +++ b/sys-power/nut/nut-2.7.4-r1.ebuild @@ -155,7 +155,7 @@ src_configure() { } src_install() { - emake DESTDIR="${D}" install || die + emake DESTDIR="${D}" install find "${D}" -name '*.la' -exec rm -f {} + @@ -174,19 +174,19 @@ src_install() { mv "${i}" "${i/.sample/}" done - dodoc AUTHORS ChangeLog docs/*.txt MAINTAINERS NEWS README TODO UPGRADING || die + dodoc AUTHORS ChangeLog docs/*.txt MAINTAINERS NEWS README TODO UPGRADING newdoc lib/README README.lib || die newdoc "${FILESDIR}"/lighttpd_nut.conf-2.2.0 lighttpd_nut.conf || die docinto cables - dodoc docs/cables/* || die + dodoc docs/cables/* - newinitd "${FILESDIR}"/nut-2.6.5-init.d-upsd upsd || die - newinitd "${FILESDIR}"/nut-2.2.2-init.d-upsdrv upsdrv || die - newinitd "${FILESDIR}"/nut-2.6.5-init.d-upsmon upsmon || die - newinitd "${FILESDIR}"/nut-2.6.5-init.d-upslog upslog || die - newinitd "${FILESDIR}"/nut.powerfail.initd nut.powerfail || die + newinitd "${FILESDIR}"/nut-2.6.5-init.d-upsd upsd + newinitd "${FILESDIR}"/nut-2.2.2-init.d-upsdrv upsdrv + newinitd "${FILESDIR}"/nut-2.6.5-init.d-upsmon upsmon + newinitd "${FILESDIR}"/nut-2.6.5-init.d-upslog upslog + newinitd "${FILESDIR}"/nut.powerfail.initd nut.powerfail keepdir /var/lib/nut diff --git a/sys-power/pmtools/pmtools-20110323-r1.ebuild b/sys-power/pmtools/pmtools-20110323-r1.ebuild index 705fa4ffcf16..2b6a541659eb 100644 --- a/sys-power/pmtools/pmtools-20110323-r1.ebuild +++ b/sys-power/pmtools/pmtools-20110323-r1.ebuild @@ -34,7 +34,7 @@ src_prepare() { src_compile() { # respect user's LDFLAGS - emake CC="$(tc-getCC)" LDFLAGS="${LDFLAGS}" || die "emake failed" + emake CC="$(tc-getCC)" LDFLAGS="${LDFLAGS}" } src_install() { diff --git a/www-apps/Apache-Gallery/Apache-Gallery-1.0_rc3-r1.ebuild b/www-apps/Apache-Gallery/Apache-Gallery-1.0_rc3-r1.ebuild index 99bffd1ecaf4..29567e33253b 100644 --- a/www-apps/Apache-Gallery/Apache-Gallery-1.0_rc3-r1.ebuild +++ b/www-apps/Apache-Gallery/Apache-Gallery-1.0_rc3-r1.ebuild @@ -38,7 +38,7 @@ src_install() { perl-module_src_install webapp_src_preinst - dodoc Changes INSTALL README TODO UPGRADE || die + dodoc Changes INSTALL README TODO UPGRADE insinto "${MY_ICONSDIR}"/gallery doins htdocs/*.png diff --git a/www-apps/agendav/agendav-2.2.0.ebuild b/www-apps/agendav/agendav-2.2.0.ebuild index ead4966a1fa6..80287540c33a 100644 --- a/www-apps/agendav/agendav-2.2.0.ebuild +++ b/www-apps/agendav/agendav-2.2.0.ebuild @@ -23,12 +23,12 @@ src_install() { # fix references to the rest of the application code sed -i -e '/__DIR__/s:/\.\./:/../../agendav/:' web/public/index.php || die insinto "${MY_HTDOCSDIR}" - doins -r web/public/* || die + doins -r web/public/* einfo "Installing main files" cp web/config/{default.,}settings.php || die insinto "${MY_HOSTROOTDIR}/${PN}" - doins -r web/{app,config,lang,src,templates,var,vendor} || die + doins -r web/{app,config,lang,src,templates,var,vendor} einfo "Installing agendavcli utility" sed -i -e '/__DIR__/s:/web/:/:' agendavcli || die diff --git a/www-apps/baikal/baikal-0.5.2.ebuild b/www-apps/baikal/baikal-0.5.2.ebuild index a1de25422205..c44cf7d9ddaf 100644 --- a/www-apps/baikal/baikal-0.5.2.ebuild +++ b/www-apps/baikal/baikal-0.5.2.ebuild @@ -25,11 +25,11 @@ S=${WORKDIR}/${PN} src_install() { webapp_src_preinst - dodoc *.md || die "dodoc failed" + dodoc *.md einfo "Installing web files" insinto "${MY_HTDOCSDIR}" - doins -r html/* html/.htaccess Core vendor || die "doins failed" + doins -r html/* html/.htaccess Core vendor einfo "Setting up container for configuration" insinto /etc/${PN} diff --git a/www-apps/baikal/baikal-0.6.0.ebuild b/www-apps/baikal/baikal-0.6.0.ebuild index 7984fe26d1e2..76fe4e54b4cc 100644 --- a/www-apps/baikal/baikal-0.6.0.ebuild +++ b/www-apps/baikal/baikal-0.6.0.ebuild @@ -25,11 +25,11 @@ S=${WORKDIR}/${PN} src_install() { webapp_src_preinst - dodoc *.md || die "dodoc failed" + dodoc *.md einfo "Installing web files" insinto "${MY_HTDOCSDIR}" - doins -r html/* html/.htaccess Core vendor || die "doins failed" + doins -r html/* html/.htaccess Core vendor einfo "Setting up container for configuration" insinto /etc/${PN} diff --git a/www-apps/viewvc/viewvc-1.1.26.ebuild b/www-apps/viewvc/viewvc-1.1.26.ebuild index d0627301f127..787b46c03658 100644 --- a/www-apps/viewvc/viewvc-1.1.26.ebuild +++ b/www-apps/viewvc/viewvc-1.1.26.ebuild @@ -70,7 +70,7 @@ src_install() { python_domodule lib/. insinto "${MY_APPDIR}" - doins -r templates/ || die "doins failed" + doins -r templates/ doins -r templates-contrib/ if use mysql; then diff --git a/www-apps/wiliki/wiliki-0.6.1-r1.ebuild b/www-apps/wiliki/wiliki-0.6.1-r1.ebuild index 4add1c335f63..b617915fe753 100644 --- a/www-apps/wiliki/wiliki-0.6.1-r1.ebuild +++ b/www-apps/wiliki/wiliki-0.6.1-r1.ebuild @@ -35,16 +35,16 @@ PATCHES=( src_install() { webapp_src_preinst - emake DESTDIR="${D}" install || die "Install failed" + emake DESTDIR="${D}" install insinto "${MY_CGIBINDIR}" - doins -r src/wiliki.cgi src/wiliki2.cgi || die "doins failed" - fperms +x "${MY_CGIBINDIR}"/wiliki.cgi || die "fperms failed" + doins -r src/wiliki.cgi src/wiliki2.cgi + fperms +x "${MY_CGIBINDIR}"/wiliki.cgi insinto "${MY_HTDOCSDIR}" - doins src/wiliki.css src/wiliki2.css || die "doins failed" + doins src/wiliki.css src/wiliki2.css - dodir "${MY_HOSTROOTDIR}"/${PF}/data || die "dodir failed" + dodir "${MY_HOSTROOTDIR}"/${PF}/data webapp_serverowned "${MY_HOSTROOTDIR}"/${PF}/data webapp_src_install 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 diff --git a/www-misc/awstats/awstats-7.1_p20121017.ebuild b/www-misc/awstats/awstats-7.1_p20121017.ebuild index d9163b128103..2257b4cdf060 100644 --- a/www-misc/awstats/awstats-7.1_p20121017.ebuild +++ b/www-misc/awstats/awstats-7.1_p20121017.ebuild @@ -92,7 +92,7 @@ src_install() { newbin maillogconvert.pl awstats_maillogconvert.pl newbin urlaliasbuilder.pl awstats_urlaliasbuilder.pl - dosym ../share/awstats/wwwroot/cgi-bin/awstats.pl /usr/bin/awstats.pl || die + dosym ../share/awstats/wwwroot/cgi-bin/awstats.pl /usr/bin/awstats.pl } pkg_postinst() { diff --git a/www-misc/awstats/awstats-7.4.ebuild b/www-misc/awstats/awstats-7.4.ebuild index b915d62d25db..bac4b390c7bb 100644 --- a/www-misc/awstats/awstats-7.4.ebuild +++ b/www-misc/awstats/awstats-7.4.ebuild @@ -93,7 +93,7 @@ src_install() { newbin maillogconvert.pl awstats_maillogconvert.pl newbin urlaliasbuilder.pl awstats_urlaliasbuilder.pl - dosym ../share/awstats/wwwroot/cgi-bin/awstats.pl /usr/bin/awstats.pl || die + dosym ../share/awstats/wwwroot/cgi-bin/awstats.pl /usr/bin/awstats.pl } pkg_postinst() { diff --git a/www-misc/awstats/awstats-7.5.ebuild b/www-misc/awstats/awstats-7.5.ebuild index 8e7b28821a6b..b53c2ad5ba11 100644 --- a/www-misc/awstats/awstats-7.5.ebuild +++ b/www-misc/awstats/awstats-7.5.ebuild @@ -97,7 +97,7 @@ src_install() { newbin maillogconvert.pl awstats_maillogconvert.pl newbin urlaliasbuilder.pl awstats_urlaliasbuilder.pl - dosym ../share/awstats/wwwroot/cgi-bin/awstats.pl /usr/bin/awstats.pl || die + dosym ../share/awstats/wwwroot/cgi-bin/awstats.pl /usr/bin/awstats.pl } pkg_postinst() { diff --git a/www-servers/gatling/gatling-0.15.ebuild b/www-servers/gatling/gatling-0.15.ebuild index b404cfd8a5c9..ba78c1bb2f64 100644 --- a/www-servers/gatling/gatling-0.15.ebuild +++ b/www-servers/gatling/gatling-0.15.ebuild @@ -41,21 +41,20 @@ src_compile() { emake DIET="${DIET}" CC="$(tc-getCC)" \ CFLAGS="${CFLAGS} -I${ROOT}usr/include/libowfat" \ - LDFLAGS="${LDFLAGS}" prefix=/usr ${targets} \ - || die "emake ${targets} failed" + LDFLAGS="${LDFLAGS}" prefix=/usr ${targets} } src_install() { - doman gatling.1 || die "installing manpage failed" + doman gatling.1 - newconfd "${FILESDIR}/gatling.confd" gatling || die - newinitd "${FILESDIR}/gatling.initd-3" gatling || die - dodoc README.{ftp,http} || die "installing docs failed" + newconfd "${FILESDIR}/gatling.confd" gatling + newinitd "${FILESDIR}/gatling.initd-3" gatling + dodoc README.{ftp,http} - dobin gatling || die "installing gatling binary failed" + dobin gatling use ssl && { - dodoc README.tls || die "installing docs failed" - dobin tlsgatling || die "installing tlsgatling binary failed" + dodoc README.tls + dobin tlsgatling } } diff --git a/www-servers/ocsigenserver/ocsigenserver-2.8.ebuild b/www-servers/ocsigenserver/ocsigenserver-2.8.ebuild index 6f80dda9a2fd..19602549a243 100644 --- a/www-servers/ocsigenserver/ocsigenserver-2.8.ebuild +++ b/www-servers/ocsigenserver/ocsigenserver-2.8.ebuild @@ -90,8 +90,8 @@ src_install() { fi emake logrotate - newinitd "${FILESDIR}"/ocsigenserver.initd ocsigenserver || die - newconfd "${FILESDIR}"/ocsigenserver.confd ocsigenserver || die + newinitd "${FILESDIR}"/ocsigenserver.initd ocsigenserver + newconfd "${FILESDIR}"/ocsigenserver.confd ocsigenserver dodoc README.md diff --git a/www-servers/ocsigenserver/ocsigenserver-9999.ebuild b/www-servers/ocsigenserver/ocsigenserver-9999.ebuild index 6f80dda9a2fd..19602549a243 100644 --- a/www-servers/ocsigenserver/ocsigenserver-9999.ebuild +++ b/www-servers/ocsigenserver/ocsigenserver-9999.ebuild @@ -90,8 +90,8 @@ src_install() { fi emake logrotate - newinitd "${FILESDIR}"/ocsigenserver.initd ocsigenserver || die - newconfd "${FILESDIR}"/ocsigenserver.confd ocsigenserver || die + newinitd "${FILESDIR}"/ocsigenserver.initd ocsigenserver + newconfd "${FILESDIR}"/ocsigenserver.confd ocsigenserver dodoc README.md diff --git a/www-servers/resin/resin-4.0.48-r1.ebuild b/www-servers/resin/resin-4.0.48-r1.ebuild index ad098405d02f..f6273d76edc8 100644 --- a/www-servers/resin/resin-4.0.48-r1.ebuild +++ b/www-servers/resin/resin-4.0.48-r1.ebuild @@ -78,7 +78,7 @@ src_configure() { append-flags -fPIC -DPIC chmod 755 "${S}/configure" || die - econf --prefix=${RESIN_HOME} || die "econf failed" + econf --prefix=${RESIN_HOME} } src_compile() { diff --git a/www-servers/servefile/servefile-0.4.4.ebuild b/www-servers/servefile/servefile-0.4.4.ebuild index 268ad61c03c7..3766aa87b240 100644 --- a/www-servers/servefile/servefile-0.4.4.ebuild +++ b/www-servers/servefile/servefile-0.4.4.ebuild @@ -25,6 +25,6 @@ RDEPEND=" src_install() { distutils-r1_src_install - dodoc ChangeLog || die - doman ${PN}.1 || die + dodoc ChangeLog + doman ${PN}.1 } diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-390.132-r1.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-390.132-r1.ebuild index 152ff221b9a3..b47a737853e4 100644 --- a/x11-drivers/nvidia-drivers/nvidia-drivers-390.132-r1.ebuild +++ b/x11-drivers/nvidia-drivers/nvidia-drivers-390.132-r1.ebuild @@ -237,12 +237,10 @@ donvidia() { # If the library has a SONAME and SONAME does not match the library name, # then we need to create a symlink if [[ ${nv_SOVER} ]] && ! [[ "${nv_SOVER}" = "${nv_LIBNAME}" ]]; then - dosym ${nv_LIBNAME} ${nv_DEST}/${nv_SOVER} \ - || die "failed to create ${nv_DEST}/${nv_SOVER} symlink" + dosym ${nv_LIBNAME} ${nv_DEST}/${nv_SOVER} fi - dosym ${nv_LIBNAME} ${nv_DEST}/${nv_LIBNAME/.so*/.so} \ - || die "failed to create ${nv_LIBNAME/.so*/.so} symlink" + dosym ${nv_LIBNAME} ${nv_DEST}/${nv_LIBNAME/.so*/.so} } src_install() { diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-430.64-r1.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-430.64-r1.ebuild index ea3b902f920c..e6e492ff9590 100644 --- a/x11-drivers/nvidia-drivers/nvidia-drivers-430.64-r1.ebuild +++ b/x11-drivers/nvidia-drivers/nvidia-drivers-430.64-r1.ebuild @@ -227,12 +227,10 @@ donvidia() { # If the library has a SONAME and SONAME does not match the library name, # then we need to create a symlink if [[ ${nv_SOVER} ]] && ! [[ "${nv_SOVER}" = "${nv_LIBNAME}" ]]; then - dosym ${nv_LIBNAME} ${nv_DEST}/${nv_SOVER} \ - || die "failed to create ${nv_DEST}/${nv_SOVER} symlink" + dosym ${nv_LIBNAME} ${nv_DEST}/${nv_SOVER} fi - dosym ${nv_LIBNAME} ${nv_DEST}/${nv_LIBNAME/.so*/.so} \ - || die "failed to create ${nv_LIBNAME/.so*/.so} symlink" + dosym ${nv_LIBNAME} ${nv_DEST}/${nv_LIBNAME/.so*/.so} } src_install() { diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-435.21-r1.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-435.21-r1.ebuild index 78ef9ed1cd22..e8abec24def6 100644 --- a/x11-drivers/nvidia-drivers/nvidia-drivers-435.21-r1.ebuild +++ b/x11-drivers/nvidia-drivers/nvidia-drivers-435.21-r1.ebuild @@ -231,12 +231,10 @@ donvidia() { # If the library has a SONAME and SONAME does not match the library name, # then we need to create a symlink if [[ ${nv_SOVER} ]] && ! [[ "${nv_SOVER}" = "${nv_LIBNAME}" ]]; then - dosym ${nv_LIBNAME} ${nv_DEST}/${nv_SOVER} \ - || die "failed to create ${nv_DEST}/${nv_SOVER} symlink" + dosym ${nv_LIBNAME} ${nv_DEST}/${nv_SOVER} fi - dosym ${nv_LIBNAME} ${nv_DEST}/${nv_LIBNAME/.so*/.so} \ - || die "failed to create ${nv_LIBNAME/.so*/.so} symlink" + dosym ${nv_LIBNAME} ${nv_DEST}/${nv_LIBNAME/.so*/.so} } src_install() { diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-440.36-r1.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-440.36-r1.ebuild index ae550bed7379..8b0f81f91d27 100644 --- a/x11-drivers/nvidia-drivers/nvidia-drivers-440.36-r1.ebuild +++ b/x11-drivers/nvidia-drivers/nvidia-drivers-440.36-r1.ebuild @@ -234,12 +234,10 @@ donvidia() { # If the library has a SONAME and SONAME does not match the library name, # then we need to create a symlink if [[ ${nv_SOVER} ]] && ! [[ "${nv_SOVER}" = "${nv_LIBNAME}" ]]; then - dosym ${nv_LIBNAME} ${nv_DEST}/${nv_SOVER} \ - || die "failed to create ${nv_DEST}/${nv_SOVER} symlink" + dosym ${nv_LIBNAME} ${nv_DEST}/${nv_SOVER} fi - dosym ${nv_LIBNAME} ${nv_DEST}/${nv_LIBNAME/.so*/.so} \ - || die "failed to create ${nv_LIBNAME/.so*/.so} symlink" + dosym ${nv_LIBNAME} ${nv_DEST}/${nv_LIBNAME/.so*/.so} } src_install() { diff --git a/x11-libs/gtkglarea/gtkglarea-2.0.1-r1.ebuild b/x11-libs/gtkglarea/gtkglarea-2.0.1-r1.ebuild index a90b252b4c68..8e2d39c4b40b 100644 --- a/x11-libs/gtkglarea/gtkglarea-2.0.1-r1.ebuild +++ b/x11-libs/gtkglarea/gtkglarea-2.0.1-r1.ebuild @@ -41,6 +41,6 @@ src_install() { if use examples; then cd "${S}"/examples insinto /usr/share/doc/${PF}/examples - doins *.c *.h *.lwo README || die "doins failed" + doins *.c *.h *.lwo README fi } diff --git a/x11-libs/gtkglarea/gtkglarea-2.1.0.ebuild b/x11-libs/gtkglarea/gtkglarea-2.1.0.ebuild index 96ee0444ee5f..b21107ae36e4 100644 --- a/x11-libs/gtkglarea/gtkglarea-2.1.0.ebuild +++ b/x11-libs/gtkglarea/gtkglarea-2.1.0.ebuild @@ -41,6 +41,6 @@ src_install() { if use examples; then cd "${S}"/examples insinto /usr/share/doc/${PF}/examples - doins *.c *.h *.lwo README || die "doins failed" + doins *.c *.h *.lwo README fi } diff --git a/x11-misc/bbrun/bbrun-1.6-r1.ebuild b/x11-misc/bbrun/bbrun-1.6-r1.ebuild index c4340fdd041d..07fa033e05dc 100644 --- a/x11-misc/bbrun/bbrun-1.6-r1.ebuild +++ b/x11-misc/bbrun/bbrun-1.6-r1.ebuild @@ -25,7 +25,7 @@ src_prepare() { } src_compile() { - emake -C ${PN} CC="$(tc-getCC)" || die + emake -C ${PN} CC="$(tc-getCC)" } src_install() { diff --git a/x11-misc/gmrun/gmrun-0.9.2-r1.ebuild b/x11-misc/gmrun/gmrun-0.9.2-r1.ebuild index 237b61d4f568..4a0f55c5db3e 100644 --- a/x11-misc/gmrun/gmrun-0.9.2-r1.ebuild +++ b/x11-misc/gmrun/gmrun-0.9.2-r1.ebuild @@ -35,6 +35,6 @@ src_prepare() { } src_install() { - emake DESTDIR="${D}" install || die "emake install failed" + emake DESTDIR="${D}" install dodoc AUTHORS ChangeLog README NEWS } diff --git a/x11-misc/icewmcp/icewmcp-3.2-r4.ebuild b/x11-misc/icewmcp/icewmcp-3.2-r4.ebuild index 65d5ea53bf13..7304b1186c53 100644 --- a/x11-misc/icewmcp/icewmcp-3.2-r4.ebuild +++ b/x11-misc/icewmcp/icewmcp-3.2-r4.ebuild @@ -54,7 +54,7 @@ src_install() { for w in "${wraps[@]}" ; do set -- ${w} printf '#!/bin/sh\nexec %s %s/%s\n' "${EPYTHON}" "${dest}" "$1" > "${T}"/$2 - dobin "${T}"/$2 || die + dobin "${T}"/$2 done dodoc ../doc/*.txt diff --git a/x11-misc/macopix/macopix-1.7.4-r1.ebuild b/x11-misc/macopix/macopix-1.7.4-r1.ebuild index 59e739739fd5..2d547a63583e 100644 --- a/x11-misc/macopix/macopix-1.7.4-r1.ebuild +++ b/x11-misc/macopix/macopix-1.7.4-r1.ebuild @@ -74,7 +74,7 @@ src_install() { cd "${WORKDIR}/${d}" || die insinto /usr/share/"${PN}" for i in *.mcpx *.menu ; do - doins "$i" || die + doins "$i" done insinto /usr/share/"${PN}"/pixmap for i in *.png ; do diff --git a/x11-misc/peksystray/peksystray-0.4.0.ebuild b/x11-misc/peksystray/peksystray-0.4.0.ebuild index 7b9185bd136c..470c7f0efdc0 100644 --- a/x11-misc/peksystray/peksystray-0.4.0.ebuild +++ b/x11-misc/peksystray/peksystray-0.4.0.ebuild @@ -24,6 +24,6 @@ src_prepare() { } src_install() { - dobin src/peksystray || die + dobin src/peksystray default } diff --git a/x11-misc/screen-message/screen-message-0.24.ebuild b/x11-misc/screen-message/screen-message-0.24.ebuild index 660c376e0ee0..9ddb6ea960fd 100644 --- a/x11-misc/screen-message/screen-message-0.24.ebuild +++ b/x11-misc/screen-message/screen-message-0.24.ebuild @@ -20,7 +20,7 @@ RDEPEND="${DEPEND}" src_install() { default - dodir /usr/bin || die + dodir /usr/bin mv "${D}"/usr/{games,bin}/sm || die sed -i 's|Exec=/usr/games/sm||' "${D}"/usr/share/applications/sm.desktop || die } diff --git a/x11-misc/screen-message/screen-message-0.25.ebuild b/x11-misc/screen-message/screen-message-0.25.ebuild index f3df7c0075dd..2c0b46504706 100644 --- a/x11-misc/screen-message/screen-message-0.25.ebuild +++ b/x11-misc/screen-message/screen-message-0.25.ebuild @@ -20,7 +20,7 @@ RDEPEND="${DEPEND}" src_install() { default - dodir /usr/bin || die + dodir /usr/bin mv "${D}"/usr/{games,bin}/sm || die sed -i 's|Exec=/usr/games/sm||' "${D}"/usr/share/applications/sm.desktop || die } diff --git a/x11-misc/shutter/shutter-0.93.1-r3.ebuild b/x11-misc/shutter/shutter-0.93.1-r3.ebuild index 56732b72603c..e16c4a878a4e 100644 --- a/x11-misc/shutter/shutter-0.93.1-r3.ebuild +++ b/x11-misc/shutter/shutter-0.93.1-r3.ebuild @@ -54,18 +54,18 @@ src_prepare() { } src_install() { - dobin bin/${PN} || die "dobin failed" + dobin bin/${PN} insinto /usr/share/${PN} - doins -r share/${PN}/* || die "doins failed" - dodoc README || die "dodoc failed" + doins -r share/${PN}/* + dodoc README domenu share/applications/${PN}.desktop # Man page is broken. Reconstruct it. gunzip share/man/man1/${PN}.1.gz || die "gunzip failed" - doman share/man/man1/${PN}.1 || die "doman failed" + doman share/man/man1/${PN}.1 doicon share/pixmaps/${PN}.png - doins -r share/locale || die "doins failed" + doins -r share/locale insinto /usr/share/icons/hicolor - doins -r share/icons/hicolor/* || die "doins failed" + doins -r share/icons/hicolor/* find "${D}"/usr/share/shutter/resources/system/plugins/ -type f ! -name '*.*' -exec chmod 755 {} \; \ || die "failed to make plugins executables" find "${D}"/usr/share/shutter/resources/system/upload_plugins/upload -type f \ diff --git a/x11-misc/shutter/shutter-0.94.3.ebuild b/x11-misc/shutter/shutter-0.94.3.ebuild index 1bdd2fcc248d..18f36792dd4b 100644 --- a/x11-misc/shutter/shutter-0.94.3.ebuild +++ b/x11-misc/shutter/shutter-0.94.3.ebuild @@ -51,18 +51,18 @@ src_prepare() { } src_install() { - dobin bin/${PN} || die "dobin failed" + dobin bin/${PN} insinto /usr/share/${PN} - doins -r share/${PN}/* || die "doins failed" - dodoc README || die "dodoc failed" + doins -r share/${PN}/* + dodoc README domenu share/applications/${PN}.desktop # Man page is broken. Reconstruct it. gunzip share/man/man1/${PN}.1.gz || die "gunzip failed" - doman share/man/man1/${PN}.1 || die "doman failed" + doman share/man/man1/${PN}.1 doicon share/pixmaps/${PN}.png - doins -r share/locale || die "doins failed" + doins -r share/locale insinto /usr/share/icons/hicolor - doins -r share/icons/hicolor/* || die "doins failed" + doins -r share/icons/hicolor/* find "${D}"/usr/share/shutter/resources/system/plugins/ -type f ! -name '*.*' -exec chmod 755 {} \; \ || die "failed to make plugins executables" find "${D}"/usr/share/shutter/resources/system/upload_plugins/upload -type f \ diff --git a/x11-terms/cool-retro-term/cool-retro-term-1.1.0.ebuild b/x11-terms/cool-retro-term/cool-retro-term-1.1.0.ebuild index 1fe6e1ea0e55..23c927425471 100644 --- a/x11-terms/cool-retro-term/cool-retro-term-1.1.0.ebuild +++ b/x11-terms/cool-retro-term/cool-retro-term-1.1.0.ebuild @@ -42,7 +42,7 @@ src_configure() { src_install() { # default attempts to install directly to /usr - emake INSTALL_ROOT="${D}" install || die + emake INSTALL_ROOT="${D}" install doman packaging/debian/cool-retro-term.1 } diff --git a/x11-terms/cool-retro-term/cool-retro-term-1.1.1.ebuild b/x11-terms/cool-retro-term/cool-retro-term-1.1.1.ebuild index 4204a69a50b2..d1ed07a10486 100644 --- a/x11-terms/cool-retro-term/cool-retro-term-1.1.1.ebuild +++ b/x11-terms/cool-retro-term/cool-retro-term-1.1.1.ebuild @@ -42,7 +42,7 @@ src_configure() { src_install() { # default attempts to install directly to /usr - emake INSTALL_ROOT="${D}" install || die + emake INSTALL_ROOT="${D}" install doman packaging/debian/cool-retro-term.1 } diff --git a/x11-themes/gentoo10-backgrounds/gentoo10-backgrounds-20110309.ebuild b/x11-themes/gentoo10-backgrounds/gentoo10-backgrounds-20110309.ebuild index 1e71574ad87d..7718adab6a51 100644 --- a/x11-themes/gentoo10-backgrounds/gentoo10-backgrounds-20110309.ebuild +++ b/x11-themes/gentoo10-backgrounds/gentoo10-backgrounds-20110309.ebuild @@ -29,10 +29,10 @@ src_test() { :; } src_install() { insinto /usr/share/backgrounds/gentoo10 - doins -r {purple,blue,red}.xml netbook standard wide wider || die + doins -r {purple,blue,red}.xml netbook standard wide wider insinto /usr/share/gnome-background-properties - doins desktop-*.xml || die + doins desktop-*.xml # KDE wallpapers for color in purple blue red; do diff --git a/x11-themes/gnome-colors-common/gnome-colors-common-5.5.1-r1.ebuild b/x11-themes/gnome-colors-common/gnome-colors-common-5.5.1-r1.ebuild index d469a500e013..6d9348d2499c 100644 --- a/x11-themes/gnome-colors-common/gnome-colors-common-5.5.1-r1.ebuild +++ b/x11-themes/gnome-colors-common/gnome-colors-common-5.5.1-r1.ebuild @@ -46,7 +46,7 @@ src_compile() { src_install() { dodir /usr/share/icons insinto /usr/share/icons - doins -r "${WORKDIR}/${PN}" || die "Installing icons failed" + doins -r "${WORKDIR}/${PN}" einstalldocs } diff --git a/x11-themes/gnome-colors-themes/gnome-colors-themes-5.5.1.ebuild b/x11-themes/gnome-colors-themes/gnome-colors-themes-5.5.1.ebuild index 78c5094149c1..5fb52b368dcc 100644 --- a/x11-themes/gnome-colors-themes/gnome-colors-themes-5.5.1.ebuild +++ b/x11-themes/gnome-colors-themes/gnome-colors-themes-5.5.1.ebuild @@ -31,7 +31,7 @@ src_install() { insinto /usr/share/icons for i in gnome*; do if [ "$i" != "gnome-colors-common" ]; then - doins -r "${i}" || die + doins -r "${i}" fi done einstalldocs diff --git a/x11-themes/larry-backgrounds/larry-backgrounds-20110822-r1.ebuild b/x11-themes/larry-backgrounds/larry-backgrounds-20110822-r1.ebuild index b9f4fccc6099..38dcdb486677 100644 --- a/x11-themes/larry-backgrounds/larry-backgrounds-20110822-r1.ebuild +++ b/x11-themes/larry-backgrounds/larry-backgrounds-20110822-r1.ebuild @@ -62,21 +62,22 @@ src_install() { local backdrops='/usr/share/xfce4/backdrops' local share_home='backgrounds/larry-the-cow' + cd "${DISTDIR}" || die insinto /usr/share/${share_home}/ - ( cd "${DISTDIR}" && doins ${A} ) || die + doins ${A} # Integrate with KDE 4 - dosym ../${share_home} /usr/share/wallpapers/larry-the-cow || die + dosym ../${share_home} /usr/share/wallpapers/larry-the-cow # Integrate with XFCE 4 - dodir ${backdrops}/ || die - dosym ../../${share_home}/gentoo-abducted-1600x1200.png ${backdrops}/gentoo-abducted-4:3.png || die - dosym ../../${share_home}/gentoo-abducted-1280x1024.png ${backdrops}/gentoo-abducted-5:4.png || die - dosym ../../${share_home}/gentoo-abducted-1680x1050.png ${backdrops}/gentoo-abducted-8:5.png || die - dosym ../../${share_home}/gentoo-cow-gdm-remake-1600x1200.png ${backdrops}/gentoo-cow-gdm-remake-4:3.png || die - dosym ../../${share_home}/gentoo-cow-gdm-remake-1280x1024.png ${backdrops}/gentoo-cow-gdm-remake-5:4.png || die - dosym ../../${share_home}/gentoo-cow-gdm-remake-1680x1050.png ${backdrops}/gentoo-cow-gdm-remake-8:5.png || die + dodir ${backdrops}/ + dosym ../../${share_home}/gentoo-abducted-1600x1200.png ${backdrops}/gentoo-abducted-4:3.png + dosym ../../${share_home}/gentoo-abducted-1280x1024.png ${backdrops}/gentoo-abducted-5:4.png + dosym ../../${share_home}/gentoo-abducted-1680x1050.png ${backdrops}/gentoo-abducted-8:5.png + dosym ../../${share_home}/gentoo-cow-gdm-remake-1600x1200.png ${backdrops}/gentoo-cow-gdm-remake-4:3.png + dosym ../../${share_home}/gentoo-cow-gdm-remake-1280x1024.png ${backdrops}/gentoo-cow-gdm-remake-5:4.png + dosym ../../${share_home}/gentoo-cow-gdm-remake-1680x1050.png ${backdrops}/gentoo-cow-gdm-remake-8:5.png for ratio in 4-3 5-4 16-9 16-10 ; do - dosym ../../${share_home}/gentoo-larry-bg-${ratio}.svg ${backdrops}/gentoo-larry-bg-${ratio/-/:}.svg || die + dosym ../../${share_home}/gentoo-larry-bg-${ratio}.svg ${backdrops}/gentoo-larry-bg-${ratio/-/:}.svg done } diff --git a/x11-wm/awesome/awesome-3.5.9-r2.ebuild b/x11-wm/awesome/awesome-3.5.9-r2.ebuild index 099659de11bc..619a51c6f336 100644 --- a/x11-wm/awesome/awesome-3.5.9-r2.ebuild +++ b/x11-wm/awesome/awesome-3.5.9-r2.ebuild @@ -86,7 +86,7 @@ src_install() { ( cd "${CMAKE_BUILD_DIR}"/doc mv html doxygen - dohtml -r doxygen || die + dohtml -r doxygen ) fi rm -rf "${ED}"/usr/share/doc/${PN} || die "Cleanup of dupe docs failed" @@ -98,12 +98,12 @@ src_install() { if use gnome ; then # GNOME session insinto /usr/share/gnome-session/sessions - newins "${FILESDIR}/${PN}-gnome-3.session" "${PN}-gnome.session" || die + newins "${FILESDIR}/${PN}-gnome-3.session" "${PN}-gnome.session" # Application launcher domenu "${FILESDIR}/${PN}-gnome.desktop" || die # X Session insinto /usr/share/xsessions/ - doins "${FILESDIR}/${PN}-gnome-xsession.desktop" || die + doins "${FILESDIR}/${PN}-gnome-xsession.desktop" fi } diff --git a/x11-wm/fvwm/fvwm-2.6.5-r3.ebuild b/x11-wm/fvwm/fvwm-2.6.5-r3.ebuild index 2dc00c44059a..62f0374f99b3 100644 --- a/x11-wm/fvwm/fvwm-2.6.5-r3.ebuild +++ b/x11-wm/fvwm/fvwm-2.6.5-r3.ebuild @@ -153,7 +153,7 @@ src_install() { dodir /etc/X11/Sessions echo "/usr/bin/fvwm" > "${D}/etc/X11/Sessions/${PN}" || die - fperms a+x /etc/X11/Sessions/${PN} || die + fperms a+x /etc/X11/Sessions/${PN} dodoc AUTHORS ChangeLog NEWS README \ docs/{ANNOUNCE,BUGS,COMMANDS,CONVENTIONS} \ diff --git a/x11-wm/fvwm/fvwm-2.6.8-r2.ebuild b/x11-wm/fvwm/fvwm-2.6.8-r2.ebuild index eb52e364b68c..b5e6d5907947 100644 --- a/x11-wm/fvwm/fvwm-2.6.8-r2.ebuild +++ b/x11-wm/fvwm/fvwm-2.6.8-r2.ebuild @@ -144,7 +144,7 @@ src_install() { dodir /etc/X11/Sessions echo "/usr/bin/fvwm" > "${D}"/etc/X11/Sessions/${PN} || die - fperms a+x /etc/X11/Sessions/${PN} || die + fperms a+x /etc/X11/Sessions/${PN} dodoc docs/{COMMANDS,DEVELOPERS.md} |