Fixed the ebuild to apply patches correctly if we both have use ppc and use png

diff --git a/media-gfx/xv/ChangeLog b/media-gfx/xv/ChangeLog
index a65f5b9fb90c55cc731f2a2c963daf5b4df2cb6d..2cc24bd8fad808fca385f9ee01fcb3ec687f57b7 100644 (file)
--- a/media-gfx/xv/ChangeLog
+++ b/media-gfx/xv/ChangeLog
@@ -1,9 +1,12 @@
 # ChangeLog for media-gfx/xv
 # Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/xv/ChangeLog,v 1.6 2002/09/02 06:13:19 jmorgan Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/xv/ChangeLog,v 1.7 2002/10/13 16:37:52 doctomoe Exp $
 
 *xv-3.10a-r2 (05 Jun 2002)
 
+  13 Oct 2002; Olivier Reisch <doctomoe@gentoo.org> xv-3.10a-r2.ebuild:
+  Fixed the ebuild to apply patches correctly if we both have use ppc and use png
+
   02 Sep 2002; Jack Morgan <jmorgan@gentoo.org> xv-3.10a-r2.ebuild
   Added sparc/sparc64 keywords :
 

diff --git a/media-gfx/xv/xv-3.10a-r2.ebuild b/media-gfx/xv/xv-3.10a-r2.ebuild
index 28dfe5d7ea193434b8417af6f656d85b2fd269f5..9ee25992cc0168ec7b4409c227dc4afc2a912d69 100644 (file)
--- a/media-gfx/xv/xv-3.10a-r2.ebuild
+++ b/media-gfx/xv/xv-3.10a-r2.ebuild
@@ -1,12 +1,11 @@
 # Copyright 1999-2002 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-r2.ebuild,v 1.8 2002/10/05 05:39:15 drobbins Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/xv/xv-3.10a-r2.ebuild,v 1.9 2002/10/13 16:37:52 doctomoe Exp $
 
 IUSE="png"
 
 S=${WORKDIR}/${P}
-DESCRIPTION="An interactive image manipulation program for X which can
-deal with a wide variety of image formats"
+DESCRIPTION="An interactive image manipulation program for X which can deal with a wide variety of image formats"
 SRC_URI="ftp://ftp.cis.upenn.edu/pub/xv/${P}.tar.gz
        png? http://www.ibiblio.org/gentoo/distfiles/xv-png-patch.tar.bz2"
 HOMEPAGE="http://www.trilon.com/xv/index.html"
@@ -30,10 +29,11 @@ src_unpack() {
                cd ${S}
                patch -p1 < ${WORKDIR}/${P}-naz-gentoo.patch || die
        )
-       if [ ${ARCH} = "ppc" ]
+       
+        if [ `use ppc` ] && [ -z `use png` ]
        then
-       cd ${S}
-       patch -p1 < ${FILESDIR}/xv-${PV}-ppc.patch || die
+               cd ${S}
+               patch -p1 < ${FILESDIR}/xv-${PV}-ppc.patch || die
        fi
 }