Fix use invocation, fix sed expressions, add error checking

5 files changed, 43 insertions, 30 deletions

diff --git a/media-gfx/xv/ChangeLog b/media-gfx/xv/ChangeLog
index c8ab5c3183eb..9a2f2f86e6ce 100644
--- a/media-gfx/xv/ChangeLog
+++ b/media-gfx/xv/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-gfx/xv
 # Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/xv/ChangeLog,v 1.28 2004/04/17 18:53:41 lv Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/xv/ChangeLog,v 1.29 2004/06/07 21:52:09 agriffis Exp $
+
+  07 Jun 2004; Aron Griffis <agriffis@gentoo.org> xv-3.10a-r3.ebuild,
+  xv-3.10a-r5.ebuild, xv-3.10a-r6.ebuild:
+  Fix use invocation, fix sed expressions, add error checking
 
   17 Apr 2004; Travis Tilley <lv@gentoo.org> +files/xv-use-getcwd.patch,
   xv-3.10a-r6.ebuild:
diff --git a/media-gfx/xv/Manifest b/media-gfx/xv/Manifest
index 80d1ca95d2c1..4a9c53927e8a 100644
--- a/media-gfx/xv/Manifest
+++ b/media-gfx/xv/Manifest
@@ -1,11 +1,11 @@
-MD5 d0aee6fb34e4a778886901e96054bf11 ChangeLog 5191
-MD5 f4e47e9ee0c9c99847dadceed0eedd77 xv-3.10a-r3.ebuild 1369
-MD5 25ab6127faa9cf817e98fb384df6eeca xv-3.10a-r5.ebuild 1498
-MD5 b6d1159861f8a4e15add438d4400a951 xv-3.10a-r6.ebuild 1868
+MD5 7c8fa86e6733eddba67a8b87fff67cf9 xv-3.10a-r6.ebuild 2049
+MD5 dd76c21ca815b1ed9405a71129523495 xv-3.10a-r3.ebuild 1354
+MD5 df604c7334297eff0a83c5577bafba06 xv-3.10a-r5.ebuild 1472
+MD5 7580f4d4a98787d2d67e69b14e051fbe ChangeLog 5371
 MD5 f0dfce1262042f01e76412c96ba62d25 files/digest-xv-3.10a-r3 125
 MD5 6d5302abe89d4c1586933d5694b0aab1 files/digest-xv-3.10a-r5 61
 MD5 6d5302abe89d4c1586933d5694b0aab1 files/digest-xv-3.10a-r6 61
-MD5 038271e3c5a7a3e94b5d1f5eb63c9f1e files/xv-3.10a-enhanced-Nu.patch 155050
-MD5 14eb913966c7e03b1014219c2620cac5 files/xv-3.10a-gentoo-Nu.patch 27873
 MD5 4b034e22d5bb0502e383afcfeb8ea4b0 files/xv-3.10a-ppc.patch 359
 MD5 cda66dd1f3a032802881a6ae4430e0d6 files/xv-use-getcwd.patch 222
+MD5 038271e3c5a7a3e94b5d1f5eb63c9f1e files/xv-3.10a-enhanced-Nu.patch 155050
+MD5 14eb913966c7e03b1014219c2620cac5 files/xv-3.10a-gentoo-Nu.patch 27873
diff --git a/media-gfx/xv/xv-3.10a-r3.ebuild b/media-gfx/xv/xv-3.10a-r3.ebuild
index 449ee951a35e..8832d22543e9 100644
--- a/media-gfx/xv/xv-3.10a-r3.ebuild
+++ b/media-gfx/xv/xv-3.10a-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/xv/xv-3.10a-r3.ebuild,v 1.12 2004/02/02 19:46:01 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/xv/xv-3.10a-r3.ebuild,v 1.13 2004/06/07 21:52:09 agriffis Exp $
 
 inherit ccc eutils
 
@@ -24,8 +24,11 @@ src_unpack() {
 	unpack ${A}
 
 	cd ${S}
-	[ `use png` ] && epatch ${WORKDIR}/${P}-naz-gentoo.patch
-	[ `use ppc` ] && [ -z `use png` ] && epatch ${FILESDIR}/xv-${PV}-ppc.patch
+	if use png; then
+		epatch ${WORKDIR}/${P}-naz-gentoo.patch
+	else
+		use ppc && epatch ${FILESDIR}/xv-${PV}-ppc.patch
+	fi
 }
 
 src_compile() {
diff --git a/media-gfx/xv/xv-3.10a-r5.ebuild b/media-gfx/xv/xv-3.10a-r5.ebuild
index a3ef5f1e1bfd..d14d147ff151 100644
--- a/media-gfx/xv/xv-3.10a-r5.ebuild
+++ b/media-gfx/xv/xv-3.10a-r5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/xv/xv-3.10a-r5.ebuild,v 1.8 2004/02/02 19:46:01 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/xv/xv-3.10a-r5.ebuild,v 1.9 2004/06/07 21:52:10 agriffis Exp $
 
 inherit ccc flag-o-matic eutils
 
@@ -25,13 +25,13 @@ src_unpack() {
 	cd ${S}
 	epatch ${FILESDIR}/${P}-enhanced-Nu.patch || die
 	epatch ${FILESDIR}/${P}-gentoo-Nu.patch || die
-	[ `use ppc` ] && epatch ${FILESDIR}/${P}-ppc.patch
+	use ppc && epatch ${FILESDIR}/${P}-ppc.patch
 }
 
 src_compile() {
-	[ `use jpeg` ] && append-flags -DDOJPEG
-	[ `use png` ] && append-flags -DDOPNG
-	[ `use tiff` ] && append-flags -DDOTIFF
+	use jpeg && append-flags -DDOJPEG
+	use png && append-flags -DDOPNG
+	use tiff && append-flags -DDOTIFF
 	sed -i "s:CCOPTS = -O:CCOPTS = ${CFLAGS}:" Makefile
 	sed -i "s:COPTS=\t-O:COPTS= ${CFLAGS}:" tiff/Makefile
 	is-ccc && replace-cc-hardcode
diff --git a/media-gfx/xv/xv-3.10a-r6.ebuild b/media-gfx/xv/xv-3.10a-r6.ebuild
index b73b0a414a9a..56ff13cba50e 100644
--- a/media-gfx/xv/xv-3.10a-r6.ebuild
+++ b/media-gfx/xv/xv-3.10a-r6.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/xv/xv-3.10a-r6.ebuild,v 1.7 2004/04/17 18:53:41 lv Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/xv/xv-3.10a-r6.ebuild,v 1.8 2004/06/07 21:52:10 agriffis Exp $
 
 inherit ccc flag-o-matic eutils
 
@@ -24,26 +24,32 @@ src_unpack() {
 	cd ${S}
 	epatch ${FILESDIR}/${P}-enhanced-Nu.patch || die
 	epatch ${FILESDIR}/${P}-gentoo-Nu.patch || die
-	[ `use ppc` ] && epatch ${FILESDIR}/${P}-ppc.patch
+	use ppc && epatch ${FILESDIR}/${P}-ppc.patch
 	# This patch is needed to get xv to stop segfaulting on amd64
 	use amd64 && epatch ${FILESDIR}/xv-use-getcwd.patch
 }
 
 src_compile() {
-	[ -z `use jpeg` ] \
-		&& sed -i -e "s:JPEGLIB = -ljpeg:JPEGLIB =:" Makefile \
-		|| append-flags -DDOJPEG
-	[ -z `use png` ] \
-		&& sed -i -e "s:PNGLIB = -lpng:PNGLIB =:" Makefile \
-		&& sed -i -e "s:ZLIBLIB = -lz:ZLIBLIB =:" Makefile \
-		|| append-flags -DDOPNG
-	[ -z `use tiff` ] \
-		&& sed -i -e "s:TIFFLIB = -ltiff:TIFFLIB =:" Makefile \
-		|| append-flags -DDOTIFF
-	sed -i "s:CCOPTS = -O:CCOPTS = ${CFLAGS}:" Makefile
-	sed -i "s:COPTS=\t-O:COPTS= ${CFLAGS}:" tiff/Makefile
+	if use jpeg; then
+		append-flags -DDOJPEG
+	else
+		sed -i -e "s:JPEGLIB = -ljpeg:JPEGLIB =:" Makefile || die "sed jpeg failed"
+	fi
+	if use png; then
+		append-flags -DDOPNG
+	else
+		sed -i -e "s:PNGLIB = -lpng:PNGLIB =:" Makefile || die "sed png failed"
+		sed -i -e "s:ZLIBLIB = -lz:ZLIBLIB =:" Makefile || die "sed zlib failed"
+	fi
+	if use tiff; then
+		append-flags -DDOTIFF
+	else
+		sed -i -e "s:TIFFLIB = -ltiff:TIFFLIB =:" Makefile || die "sed tiff failed"
+	fi
+	sed -i 's:CCOPTS = -O:CCOPTS = $(E_CFLAGS):' Makefile || die "sed Makefile failed"
+	sed -i 's:COPTS=\t-O:COPTS= $(E_CFLAGS):' tiff/Makefile || die "sed tiff/Makefile failed"
 	is-ccc && replace-cc-hardcode
-	make || die
+	make E_CFLAGS="${CFLAGS}" || die
 }
 
 src_install() {