Added || die after make, thank tove. Drop old.

(Portage version: 2.1.7.1/cvs/Linux x86_64)

6 files changed, 10 insertions, 376 deletions

diff --git a/app-text/djvu/ChangeLog b/app-text/djvu/ChangeLog
index c0be9c1b5979..56565df8582b 100644
--- a/app-text/djvu/ChangeLog
+++ b/app-text/djvu/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-text/djvu
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/djvu/ChangeLog,v 1.96 2009/10/09 18:24:00 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/djvu/ChangeLog,v 1.97 2009/10/28 09:50:48 pva Exp $
+
+  28 Oct 2009; Peter Volkov <pva@gentoo.org> -djvu-3.5.19.ebuild,
+  -djvu-3.5.20-r1.ebuild, -djvu-3.5.21.ebuild, djvu-3.5.21_p20090103.ebuild,
+  djvu-3.5.22.ebuild:
+  Added die after make, thank tove. Drop old.
 
 *djvu-3.5.22 (09 Oct 2009)
 
diff --git a/app-text/djvu/djvu-3.5.19.ebuild b/app-text/djvu/djvu-3.5.19.ebuild
deleted file mode 100644
index 8e77a7900934..000000000000
--- a/app-text/djvu/djvu-3.5.19.ebuild
+++ /dev/null
@@ -1,112 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/djvu/djvu-3.5.19.ebuild,v 1.9 2007/06/27 06:03:59 corsair Exp $
-
-WANT_AUTOCONF="latest"
-WANT_AUTOMAKE="latest"
-inherit fdo-mime nsplugins flag-o-matic eutils multilib toolchain-funcs autotools
-
-MY_P="${PN}libre-${PV}"
-
-DESCRIPTION="DjVu viewers, encoders and utilities."
-HOMEPAGE="http://djvu.sourceforge.net"
-SRC_URI="mirror://sourceforge/djvu/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 s390 sh sparc x86 ~x86-fbsd"
-IUSE="xml qt3 jpeg tiff debug threads nls nsplugin kde doc"
-
-DEPEND="jpeg? ( >=media-libs/jpeg-6b-r2 )
-	tiff? ( media-libs/tiff )
-	qt3? ( <x11-libs/qt-4 )"
-
-S="${WORKDIR}/${MY_P}"
-
-pkg_setup() {
-	if ! use qt3; then
-		ewarn
-		ewarn "The standalone djvu viewer, djview, will not be compiled."
-		ewarn "Add \"qt3\" to your USE flags if you want it."
-		ewarn
-	fi
-}
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	# Do not strip binaries as portage does this for us. bug #135208
-	sed -i 's:${INSTALL_PROGRAM} -s:${INSTALL_PROGRAM}:' \
-		gui/djview/Makefile.in tools/Makefile.in xmltools/Makefile.in
-
-	# Fix compilaton with --as-needed. bug #132473
-	epatch "${FILESDIR}"/djvulibre-3.5.17-pthread-flag.patch
-
-	AT_M4DIR="config" eautoreconf
-}
-
-src_compile() {
-	# assembler problems and hence non-building with pentium4
-	# <obz@gentoo.org>
-	replace-flags -march=pentium4 -march=pentium3
-	echo LINGUAS=$LINGUAS
-
-	# When enabling qt it must be compiled with threads. See bug #89544.
-	if use qt3 ; then
-		QTCONF=" --with-qt --enable-threads "
-	elif use threads ; then
-		QTCONF=" --without-qt --disable-djview --enable-threads "
-	else
-		QTCONF=" --without-qt --disable-djview --disable-threads "
-	fi
-
-	# We install all desktop files by hand.
-	econf --disable-desktopfiles \
-		$(use_enable xml xmltools) \
-		$(use_with jpeg) \
-		$(use_with tiff) \
-		$(use_enable nls i18n) \
-		$(use_enable debug) \
-		${QTCONF} \
-		|| die "econf failed"
-
-	if ! use nsplugin; then
-		sed -e 's:nsdejavu::' -i "${S}"/gui/Makefile || die
-	fi
-
-	emake -j1 || die "emake failed"
-}
-
-src_install() {
-	make DESTDIR="${D}" plugindir=/usr/$(get_libdir)/${PLUGINS_DIR} install
-
-	dodoc README TODO NEWS
-
-	use doc && cp -r doc/ "${D}"/usr/share/doc/${PF}
-
-	# Install desktop files.
-	cd desktopfiles
-	insinto /usr/share/icons/hicolor/22x22/mimetypes && newins hi22-djvu.png image-vnd.djvu.png
-	insinto	/usr/share/icons/hicolor/32x32/mimetypes && newins hi32-djvu.png image-vnd.djvu.png
-	insinto	/usr/share/icons/hicolor/48x48/mimetypes && newins hi48-djvu.png image-vnd.djvu.png
-	insinto	/usr/share/mime/packages && doins djvulibre-mime.xml
-	if use kde ; then
-		insinto /usr/share/mimelnk/image && doins vnd.djvu.desktop x-djvu.desktop
-		cp "${D}"/usr/share/mimelnk/image/{vnd.djvu.desktop,x-djvu.desktop}
-		sed -i -e 's:image/vnd.djvu:image/x-djvu:' "${D}"/usr/share/mimelnk/image/x-djvu.desktop
-	fi
-
-	insinto /usr/share/icons/hicolor/32x32/apps && newins hi32-djview3.png djvulibre-djview3.png
-	insinto /usr/share/applications/ && doins djvulibre-djview3.desktop
-}
-
-pkg_postinst() {
-	fdo-mime_desktop_database_update
-	fdo-mime_mime_database_update
-}
-
-pkg_postrm() {
-	fdo-mime_desktop_database_update
-	fdo-mime_mime_database_update
-}
diff --git a/app-text/djvu/djvu-3.5.20-r1.ebuild b/app-text/djvu/djvu-3.5.20-r1.ebuild
deleted file mode 100644
index eb07c0f1838e..000000000000
--- a/app-text/djvu/djvu-3.5.20-r1.ebuild
+++ /dev/null
@@ -1,132 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/djvu/djvu-3.5.20-r1.ebuild,v 1.9 2008/10/27 05:50:09 vapier Exp $
-
-WANT_AUTOCONF="latest"
-WANT_AUTOMAKE="latest"
-inherit fdo-mime nsplugins flag-o-matic eutils multilib toolchain-funcs autotools confutils
-
-MY_P="${PN}libre-${PV}"
-
-DESCRIPTION="DjVu viewers, encoders and utilities."
-HOMEPAGE="http://djvu.sourceforge.net"
-SRC_URI="mirror://sourceforge/djvu/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 s390 sh sparc x86 ~x86-fbsd"
-IUSE="xml qt3 jpeg tiff debug threads nls nsplugin kde doc"
-
-DEPEND="jpeg? ( >=media-libs/jpeg-6b-r2 )
-	tiff? ( media-libs/tiff )
-	qt3? ( =x11-libs/qt-3* )"
-
-S=${WORKDIR}/${MY_P}
-
-LANGS="cs de fr ja"
-for X in ${LANGS}; do
-	IUSE="${IUSE} linguas_${X}"
-done
-
-pkg_setup() {
-	if ! use qt3; then
-		ewarn
-		ewarn "The standalone djvu viewer, djview, will not be compiled."
-		ewarn "Add \"qt3\" to your USE flags if you want it."
-		ewarn
-	fi
-
-	confutils_use_depend_all nsplugin qt3
-}
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	# Do not strip binaries as portage does this for us. bug #135208
-	find -name Makefile.in -exec sed -i 's:${INSTALL_PROGRAM} -s:${INSTALL_PROGRAM}:' \{\} \;
-	eautomake
-}
-
-src_compile() {
-	# assembler problems and hence non-building with pentium4
-	# <obz@gentoo.org>
-	replace-flags -march=pentium4 -march=pentium3
-
-	local I18N
-	if use nls; then
-		for X in ${LANGS}; do
-			if use linguas_${X}; then
-				I18N="${I18N} ${X}"
-			fi
-		done
-		I18N="${I18N# }"
-		if test -n "$I18N"; then
-			I18N="--enable-i18n=${I18N}"
-		else
-			I18N="--enable-i18n"
-		fi
-	else
-		I18N="--disable-i18n"
-	fi
-
-	# When enabling qt it must be compiled with threads. See bug #89544.
-	if use qt3 ; then
-		QTCONF=" --with-qt --enable-threads "
-	elif use threads ; then
-		QTCONF=" --without-qt --disable-djview --enable-threads "
-	else
-		QTCONF=" --without-qt --disable-djview --disable-threads "
-	fi
-
-	# We install all desktop files by hand.
-	econf --disable-desktopfiles \
-		$(use_enable xml xmltools) \
-		$(use_with jpeg) \
-		$(use_with tiff) \
-		"${I18N}" \
-		$(use_enable debug) \
-		${QTCONF} \
-		|| die "econf failed"
-
-	if ! use nsplugin; then
-		sed -e 's:nsdejavu::' -i "${S}"/gui/Makefile || die
-	fi
-
-	emake -j1 || die "emake failed"
-}
-
-src_install() {
-	make DESTDIR="${D}" plugindir=/usr/$(get_libdir)/${PLUGINS_DIR} install
-
-	dodoc README TODO NEWS
-
-	use doc && cp -r doc/ "${D}"/usr/share/doc/${PF}
-
-	# Install desktop files.
-	cd desktopfiles
-	insinto /usr/share/icons/hicolor/22x22/mimetypes && newins hi22-djvu.png image-vnd.djvu.png
-	insinto	/usr/share/icons/hicolor/32x32/mimetypes && newins hi32-djvu.png image-vnd.djvu.png
-	insinto	/usr/share/icons/hicolor/48x48/mimetypes && newins hi48-djvu.png image-vnd.djvu.png
-	insinto	/usr/share/mime/packages && doins djvulibre-mime.xml
-	if use kde ; then
-		insinto /usr/share/mimelnk/image && doins vnd.djvu.desktop x-djvu.desktop
-		cp "${D}"/usr/share/mimelnk/image/{vnd.djvu.desktop,x-djvu.desktop}
-		sed -i -e 's:image/vnd.djvu:image/x-djvu:' "${D}"/usr/share/mimelnk/image/x-djvu.desktop
-	fi
-
-	if use qt3 ; then
-		insinto /usr/share/icons/hicolor/32x32/apps && newins hi32-djview3.png djvulibre-djview3.png
-		insinto /usr/share/applications/ && doins djvulibre-djview3.desktop
-	fi
-}
-
-pkg_postinst() {
-	fdo-mime_desktop_database_update
-	fdo-mime_mime_database_update
-}
-
-pkg_postrm() {
-	fdo-mime_desktop_database_update
-	fdo-mime_mime_database_update
-}
diff --git a/app-text/djvu/djvu-3.5.21.ebuild b/app-text/djvu/djvu-3.5.21.ebuild
deleted file mode 100644
index 388287b1d011..000000000000
--- a/app-text/djvu/djvu-3.5.21.ebuild
+++ /dev/null
@@ -1,127 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/djvu/djvu-3.5.21.ebuild,v 1.11 2008/12/01 21:23:48 ranger Exp $
-
-EAPI=1
-inherit fdo-mime nsplugins flag-o-matic eutils multilib toolchain-funcs confutils
-
-MY_P="${PN}libre-${PV}"
-
-DESCRIPTION="DjVu viewers, encoders and utilities."
-HOMEPAGE="http://djvu.sourceforge.net"
-SRC_URI="mirror://sourceforge/djvu/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd"
-IUSE="xml qt3 jpeg tiff debug threads nls nsplugin kde doc"
-
-RDEPEND="jpeg? ( >=media-libs/jpeg-6b-r2 )
-	tiff? ( media-libs/tiff )
-	qt3? ( x11-libs/qt:3 )"
-DEPEND="${RDEPEND}
-	qt3? ( nsplugin? ( x11-libs/libXt ) )"
-
-S=${WORKDIR}/${MY_P}
-
-LANGS="cs de en fr ja zh"
-for X in ${LANGS}; do
-	IUSE="${IUSE} linguas_${X}"
-done
-
-pkg_setup() {
-	if ! use qt3; then
-		ewarn
-		ewarn "The standalone djvu viewer, djview, will not be compiled."
-		ewarn "Add \"qt3\" to your USE flags if you want it."
-		ewarn
-	fi
-
-	confutils_use_depend_all nsplugin qt3
-}
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	epatch "${FILESDIR}"/${P}-parallel-build.patch
-}
-
-src_compile() {
-	local I18N
-	if use nls; then
-		for X in ${LANGS}; do
-			if use linguas_${X}; then
-				I18N="${I18N} ${X}"
-			fi
-		done
-		I18N="${I18N# }"
-		if test -n "$I18N"; then
-			I18N="--enable-i18n=${I18N}"
-		else
-			I18N="--enable-i18n"
-		fi
-	else
-		I18N="--disable-i18n"
-	fi
-
-	# When enabling qt it must be compiled with threads. See bug #89544.
-	if use qt3 ; then
-		QTCONF=" --with-qt --enable-threads "
-	elif use threads ; then
-		QTCONF=" --without-qt --disable-djview --enable-threads "
-	else
-		QTCONF=" --without-qt --disable-djview --disable-threads "
-	fi
-
-	# We install all desktop files by hand.
-	econf --disable-desktopfiles \
-		$(use_enable xml xmltools) \
-		$(use_with jpeg) \
-		$(use_with tiff) \
-		"${I18N}" \
-		$(use_enable debug) \
-		${QTCONF} \
-		|| die "econf failed"
-
-	if ! use nsplugin; then
-		sed -e 's:nsdejavu::' -i "${S}"/gui/Makefile || die
-	fi
-
-	emake || die "emake failed"
-}
-
-src_install() {
-	emake DESTDIR="${D}" plugindir=/usr/$(get_libdir)/${PLUGINS_DIR} install
-
-	dodoc README TODO NEWS
-
-	use doc && cp -r doc/ "${D}"/usr/share/doc/${PF}
-
-	# Install desktop files.
-	cd desktopfiles
-	insinto /usr/share/icons/hicolor/22x22/mimetypes && newins hi22-djvu.png image-vnd.djvu.png || die
-	insinto	/usr/share/icons/hicolor/32x32/mimetypes && newins hi32-djvu.png image-vnd.djvu.png || die
-	insinto	/usr/share/icons/hicolor/48x48/mimetypes && newins hi48-djvu.png image-vnd.djvu.png || die
-	insinto	/usr/share/mime/packages && doins djvulibre-mime.xml || die
-	if use kde ; then
-		insinto /usr/share/mimelnk/image && doins vnd.djvu.desktop || die
-		cp "${D}"/usr/share/mimelnk/image/{vnd.djvu.desktop,x-djvu.desktop}
-		sed -i -e 's:image/vnd.djvu:image/x-djvu:' "${D}"/usr/share/mimelnk/image/x-djvu.desktop
-	fi
-
-	if use qt3 ; then
-		insinto /usr/share/icons/hicolor/32x32/apps && newins hi32-djview3.png djvulibre-djview3.png || die
-		insinto /usr/share/applications/ && doins djvulibre-djview3.desktop || die
-	fi
-}
-
-pkg_postinst() {
-	fdo-mime_desktop_database_update
-	fdo-mime_mime_database_update
-}
-
-pkg_postrm() {
-	fdo-mime_desktop_database_update
-	fdo-mime_mime_database_update
-}
diff --git a/app-text/djvu/djvu-3.5.21_p20090103.ebuild b/app-text/djvu/djvu-3.5.21_p20090103.ebuild
index a41db23f1d3c..83372ee5915a 100644
--- a/app-text/djvu/djvu-3.5.21_p20090103.ebuild
+++ b/app-text/djvu/djvu-3.5.21_p20090103.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/djvu/djvu-3.5.21_p20090103.ebuild,v 1.8 2009/04/15 16:53:46 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/djvu/djvu-3.5.21_p20090103.ebuild,v 1.9 2009/10/28 09:50:48 pva Exp $
 
 EAPI=1
 inherit fdo-mime nsplugins flag-o-matic eutils multilib toolchain-funcs confutils
@@ -76,7 +76,7 @@ src_compile() {
 }
 
 src_install() {
-	emake DESTDIR="${D}" plugindir=/usr/$(get_libdir)/${PLUGINS_DIR} install
+	emake DESTDIR="${D}" plugindir=/usr/$(get_libdir)/${PLUGINS_DIR} install || die
 
 	dodoc README TODO NEWS
 
diff --git a/app-text/djvu/djvu-3.5.22.ebuild b/app-text/djvu/djvu-3.5.22.ebuild
index fa064e431e61..a6215e2e5fc5 100644
--- a/app-text/djvu/djvu-3.5.22.ebuild
+++ b/app-text/djvu/djvu-3.5.22.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/djvu/djvu-3.5.22.ebuild,v 1.1 2009/10/09 18:24:00 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/djvu/djvu-3.5.22.ebuild,v 1.2 2009/10/28 09:50:48 pva Exp $
 
 EAPI=1
 inherit fdo-mime nsplugins flag-o-matic eutils multilib toolchain-funcs confutils
@@ -76,7 +76,7 @@ src_compile() {
 }
 
 src_install() {
-	emake DESTDIR="${D}" plugindir=/usr/$(get_libdir)/${PLUGINS_DIR} install
+	emake DESTDIR="${D}" plugindir=/usr/$(get_libdir)/${PLUGINS_DIR} install || die
 
 	dodoc README TODO NEWS