7 files changed, 37 insertions, 46 deletions
diff --git a/app-office/lyx/lyx-1.2.0.20020705.ebuild b/app-office/lyx/lyx-1.2.0.20020705.ebuild
index bd10ff9e0ba1..e6e4b4dbbffe 100644
--- a/app-office/lyx/lyx-1.2.0.20020705.ebuild
+++ b/app-office/lyx/lyx-1.2.0.20020705.ebuild
@@ -1,17 +1,16 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/lyx/lyx-1.2.0.20020705.ebuild,v 1.11 2003/02/13 09:17:44 vapier Exp $
-
-IUSE="nls cups"
+# $Header: /var/cvsroot/gentoo-x86/app-office/lyx/lyx-1.2.0.20020705.ebuild,v 1.12 2003/03/01 01:13:50 vapier Exp $
 
 S=${WORKDIR}/lyx-devel
-DESCRIPTION="LyX is an WYSIWYM frontend for LaTeX"
+DESCRIPTION="WYSIWYM frontend for LaTeX"
 SRC_URI="mirror://gentoo//${P}.tar.bz2"
 HOMEPAGE="http://www.lyx.org/"
 
 SLOT="0"
 LICENSE="GPL-2"
 KEYWORDS="x86 ppc"
+IUSE="nls cups"
 
 # This lyx-base ebuild only depends on the absolutely necessary packages.
 # The acompanying lyx-utils ebuild depends on lyx-base and on everything
@@ -37,7 +36,6 @@ RDEPEND="${DEPEND}
 	app-text/chktex"
 
 src_compile() {
-	
 	use nls || myconf="${myconf} --disable-nls"
 	[ -n "$DEBUG" ] && myconf="$myconf --enable-debug" || myconf="$myconf --disable-debug"
 	
@@ -54,11 +52,10 @@ src_compile() {
 	emake || die "emake failed"
 }
 
-src_install () {
+src_install() {
 	# The 'install-strip' target is provided by the LyX makefile
 	# for stripping installed binaries.  Use prefix= instead of
 	# DESTDIR=, otherwise it violates the sandbox in the po directory.
-	make prefix=${D}/usr install
+	make prefix=${D}/usr install || die
 	dodoc README* UPGRADING INSTALL* ChangeLog NEW COPYING ANNOUNCE ABOUT-NLS
 }
-
diff --git a/app-office/lyx/lyx-1.2.1.ebuild b/app-office/lyx/lyx-1.2.1.ebuild
index b49b53149cc9..c03c5cac86a8 100644
--- a/app-office/lyx/lyx-1.2.1.ebuild
+++ b/app-office/lyx/lyx-1.2.1.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/lyx/lyx-1.2.1.ebuild,v 1.9 2003/02/13 09:17:50 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/lyx/lyx-1.2.1.ebuild,v 1.10 2003/03/01 01:13:50 vapier Exp $
 
-DESCRIPTION="LyX is an WYSIWYM frontend for LaTeX"
+DESCRIPTION="WYSIWYM frontend for LaTeX"
 SRC_URI="ftp://ftp.lyx.org/pub/lyx/stable/${P}.tar.gz"
 HOMEPAGE="http://www.lyx.org/"
 
@@ -20,7 +20,6 @@ DEPEND="virtual/x11
 	>=sys-devel/perl-5
 	nls? ( sys-devel/gettext )
 	app-text/aiksaurus"
-
 RDEPEND="${DEPEND}
 	app-text/ghostscript
 	app-text/xpdf
diff --git a/app-office/lyx/lyx-1.2.3.ebuild b/app-office/lyx/lyx-1.2.3.ebuild
index cb7f6239ce05..56cb43cb04d9 100644
--- a/app-office/lyx/lyx-1.2.3.ebuild
+++ b/app-office/lyx/lyx-1.2.3.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/lyx/lyx-1.2.3.ebuild,v 1.3 2003/02/13 09:17:56 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/lyx/lyx-1.2.3.ebuild,v 1.4 2003/03/01 01:13:50 vapier Exp $
 
-DESCRIPTION="LyX is an WYSIWYM frontend for LaTeX"
+DESCRIPTION="WYSIWYM frontend for LaTeX"
 SRC_URI="ftp://ftp.lyx.org/pub/lyx/stable/${P}.tar.gz"
 HOMEPAGE="http://www.lyx.org/"
 
@@ -20,7 +20,6 @@ DEPEND="virtual/x11
 	>=sys-devel/perl-5
 	nls? ( sys-devel/gettext )
 	app-text/aiksaurus"
-
 RDEPEND="${DEPEND}
 	app-text/ghostscript
 	app-text/xpdf
diff --git a/app-office/lyx/lyx-1.3.0.ebuild b/app-office/lyx/lyx-1.3.0.ebuild
index 5eeede150c6a..fafbcdd4b0aa 100644
--- a/app-office/lyx/lyx-1.3.0.ebuild
+++ b/app-office/lyx/lyx-1.3.0.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/lyx/lyx-1.3.0.ebuild,v 1.2 2003/02/13 09:18:09 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/lyx/lyx-1.3.0.ebuild,v 1.3 2003/03/01 01:13:50 vapier Exp $
 
-DESCRIPTION="LyX is an WYSIWYM frontend for LaTeX"
+DESCRIPTION="WYSIWYM frontend for LaTeX"
 SRC_URI="ftp://ftp.lyx.org/pub/lyx/stable/${P}.tar.gz"
 HOMEPAGE="http://www.lyx.org/"
 
@@ -17,7 +17,6 @@ DEPEND="virtual/x11
 	nls? ( sys-devel/gettext )
 	app-text/aiksaurus
 	qt? ( >=x11-libs/qt-3 ) !qt? ( =x11-libs/xforms-1* )"
-
 RDEPEND="${DEPEND}
 	app-text/ghostscript
 	app-text/xpdf
@@ -33,26 +32,23 @@ RDEPEND="${DEPEND}
 	app-text/chktex"
 
 src_unpack() {
-
-    unpack $A
-    cd $S
-    # patch to fix compile problem with glibc 2.3.1 from lyx 1.3.x branch cvs.
-    # cf bugzilla.lyx.org #874.
-    patch -p0 < $FILESDIR/$P-glibc31.diff
-    patch -p0 < $FILESDIR/$P-autogen.sh.diff
-    cp -f $FILESDIR/$P-configure.in $S/configure.in
-
+	unpack ${A}
+	cd ${S}
+	# patch to fix compile problem with glibc 2.3.1 from lyx 1.3.x branch cvs.
+	# cf bugzilla.lyx.org #874.
+	patch -p0 < $FILESDIR/$P-glibc31.diff
+	patch -p0 < $FILESDIR/$P-autogen.sh.diff
+	cp -f $FILESDIR/$P-configure.in $S/configure.in
 }
 
 src_compile() {
-
 	use nls || myconf="${myconf} --disable-nls"
 	if [ -n "`use qt`" ]; then
-	    inherit kde-functions
-	    set-qtdir 3
-	    myconf="$myconf --with-frontend=qt --with-qt-dir=${QTDIR}"
+		inherit kde-functions
+		set-qtdir 3
+		myconf="$myconf --with-frontend=qt --with-qt-dir=${QTDIR}"
 	else
-	    myconf="$myconf --with-frontend=xforms"
+		myconf="$myconf --with-frontend=xforms"
 	fi
 	[ -n "$DEBUG" ] && myconf="$myconf --enable-debug" || myconf="$myconf --disable-debug"
 
diff --git a/app-office/scribus/scribus-0.8.ebuild b/app-office/scribus/scribus-0.8.ebuild
index de704b6e5b3e..05990e4fde41 100644
--- a/app-office/scribus/scribus-0.8.ebuild
+++ b/app-office/scribus/scribus-0.8.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/scribus/scribus-0.8.ebuild,v 1.6 2003/02/13 09:20:03 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/scribus/scribus-0.8.ebuild,v 1.7 2003/03/01 01:16:08 vapier Exp $
 
-DESCRIPTION="Scribus is a Layout program"
-HOMEPAGE="http://web2.altmuehlnet.de/fschmid"
+DESCRIPTION="Layout program similar to Adobe� PageMaker, QuarkXPress, or Adobe� InDesign"
+HOMEPAGE="http://web2.altmuehlnet.de/fschmid/"
 SRC_URI="http://web2.altmuehlnet.de/fschmid/${P}.tar.gz"
 
 SLOT="0"
@@ -19,13 +19,13 @@ DEPEND="=x11-libs/qt-3*
 CXXFLAGS="${CXXFLAGS} -I/usr/include/lcms"
 
 src_unpack() {
-	unpack ${P}.tar.gz
+	unpack ${A}
 	patch -p0 < ${FILESDIR}/Fonts.diff
 	patch -p0 < ${FILESDIR}/Palette.diff
 }
 
 src_compile() {
-	econf
+	econf || die
 	emake || die "make failed"
 	mv debian/scribus-debian.xpm debian/scribus.xpm
 }
diff --git a/app-office/scribus/scribus-0.9.4.ebuild b/app-office/scribus/scribus-0.9.4.ebuild
index e612ea72a265..d3f1b92a5c03 100644
--- a/app-office/scribus/scribus-0.9.4.ebuild
+++ b/app-office/scribus/scribus-0.9.4.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/scribus/scribus-0.9.4.ebuild,v 1.2 2003/02/13 09:20:08 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/scribus/scribus-0.9.4.ebuild,v 1.3 2003/03/01 01:16:08 vapier Exp $
 
-DESCRIPTION="Scribus is a Layout program"
-HOMEPAGE="http://web2.altmuehlnet.de/fschmid"
+DESCRIPTION="Layout program similar to Adobe� PageMaker, QuarkXPress, or Adobe� InDesign"
+HOMEPAGE="http://web2.altmuehlnet.de/fschmid/"
 SRC_URI="http://web2.altmuehlnet.de/fschmid/${P}.tar.gz"
 
 SLOT="0"
@@ -17,13 +17,13 @@ DEPEND="=x11-libs/qt-3*
 	sys-libs/zlib"
 
 src_compile() {
-	econf
+	econf || die
 	emake CXXFLAGS="${CXXFLAGS} -I/usr/include/lcms" || die
 	mv debian/scribus-debian.xpm debian/scribus.xpm
 }
 
 src_install() {
-	einstall destdir=${D}
+	einstall destdir=${D} || die
 
 	dodoc AUTHORS ChangeLog README TODO
 
diff --git a/app-office/scribus/scribus-0.9.6.ebuild b/app-office/scribus/scribus-0.9.6.ebuild
index 912caa2a3e7c..7d774e55d6b7 100644
--- a/app-office/scribus/scribus-0.9.6.ebuild
+++ b/app-office/scribus/scribus-0.9.6.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/scribus/scribus-0.9.6.ebuild,v 1.2 2003/02/13 09:20:13 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/scribus/scribus-0.9.6.ebuild,v 1.3 2003/03/01 01:16:08 vapier Exp $
 
-DESCRIPTION="Scribus is a Layout program"
-HOMEPAGE="http://web2.altmuehlnet.de/fschmid"
+DESCRIPTION="Layout program similar to Adobe� PageMaker, QuarkXPress, or Adobe� InDesign"
+HOMEPAGE="http://web2.altmuehlnet.de/fschmid/"
 SRC_URI="http://web2.altmuehlnet.de/fschmid/${P}.tar.gz"
 
 SLOT="0"
@@ -17,13 +17,13 @@ DEPEND="=x11-libs/qt-3*
 	sys-libs/zlib"
 
 src_compile() {
-	econf
+	econf || die
 	emake CXXFLAGS="${CXXFLAGS} -I/usr/include/lcms" || die
 	mv debian/scribus-debian.xpm debian/scribus.xpm
 }
 
 src_install() {
-	einstall destdir=${D}
+	einstall destdir=${D} || die
 
 	dodoc AUTHORS ChangeLog README TODO