Removed broken -r4. Merged ccc support from -r3 to -r5.

7 files changed, 21 insertions, 71 deletions

diff --git a/media-gfx/xv/ChangeLog b/media-gfx/xv/ChangeLog
index 59539a5904c8..85403b28ed12 100644
--- a/media-gfx/xv/ChangeLog
+++ b/media-gfx/xv/ChangeLog
@@ -1,9 +1,14 @@
 # ChangeLog for media-gfx/xv
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/xv/ChangeLog,v 1.18 2003/08/14 14:33:35 usata Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/xv/ChangeLog,v 1.19 2003/09/04 03:47:05 usata Exp $
 
 *xv-3.10a-r5 (07 Aug 2003)
 
+  04 Sep 2003; Mamoru KOMACHI <usata@gentoo.org> xv-3.10a-r2.ebuild,
+  xv-3.10a-r3.ebuild, xv-3.10a-r4.ebuild, xv-3.10a-r5.ebuild:
+  Deleted trailing white-spaces.  Removed unused IUSE flags from -r5.
+  Merged ccc support from -r3 to -r5 and removed broken -r4.
+
   14 Aug 2003; Mamoru KOMACHI <usata@gentoo.org> xv-3.10a-r5.ebuild,
   files/xv-3.10a-r5-ppc.patch:
   Corrected ppc patch.  Thanks to Christophe Boyanique
diff --git a/media-gfx/xv/Manifest b/media-gfx/xv/Manifest
index 922042658569..28f1f16d90a1 100644
--- a/media-gfx/xv/Manifest
+++ b/media-gfx/xv/Manifest
@@ -1,13 +1,11 @@
-MD5 918bb7883501321dfec7749bd393dbee ChangeLog 3562
-MD5 c43be6aa3ea10a656877920dfbb6f0ee xv-3.10a-r2.ebuild 1130
-MD5 1cfce42e36c27b0384ad8dff37b2ec69 xv-3.10a-r3.ebuild 1304
-MD5 29859f2d7d39a27a32928721ca1bbf21 xv-3.10a-r4.ebuild 1423
-MD5 c634e19d934b51d62a75694776795cf2 xv-3.10a-r5.ebuild 1423
+MD5 de458973beb5c08b5da258f5f4cf836a ChangeLog 3825
+MD5 fb73490416d935f891388d70f6a52a07 xv-3.10a-r2.ebuild 1128
+MD5 e4cf48926b671bbd730af8d96356de83 xv-3.10a-r3.ebuild 1300
+MD5 cec311a34b242bb7697fca16d41142e3 xv-3.10a-r5.ebuild 1450
 MD5 f0dfce1262042f01e76412c96ba62d25 files/digest-xv-3.10a-r2 125
 MD5 f0dfce1262042f01e76412c96ba62d25 files/digest-xv-3.10a-r3 125
 MD5 a533b616d1b8911f97cc37cd89dccd6f files/xv-3.10a-ppc.patch 1202
 MD5 4590eadc74a630f5aa530a08b4102a3c files/xv.diff 3838
-MD5 6d5302abe89d4c1586933d5694b0aab1 files/digest-xv-3.10a-r4 61
 MD5 038271e3c5a7a3e94b5d1f5eb63c9f1e files/xv-3.10a-enhanced-Nu.patch 155050
 MD5 4613999032e0b97099ddb2cfefc9f631 files/xv-3.10a-gentoo-Nu.patch 35839
 MD5 14eb913966c7e03b1014219c2620cac5 files/xv-3.10a-r5-gentoo-Nu.patch 27873
diff --git a/media-gfx/xv/files/digest-xv-3.10a-r4 b/media-gfx/xv/files/digest-xv-3.10a-r4
deleted file mode 100644
index f6f83423ac38..000000000000
--- a/media-gfx/xv/files/digest-xv-3.10a-r4
+++ /dev/null
@@ -1 +0,0 @@
-MD5 2d4fbeec1561304362781cc8e2f7f72d xv-3.10a.tar.gz 2259124
diff --git a/media-gfx/xv/xv-3.10a-r2.ebuild b/media-gfx/xv/xv-3.10a-r2.ebuild
index 6963cb8f5d09..7c8c909acc09 100644
--- a/media-gfx/xv/xv-3.10a-r2.ebuild
+++ b/media-gfx/xv/xv-3.10a-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 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.15 2003/08/05 17:17:40 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/xv/xv-3.10a-r2.ebuild,v 1.16 2003/09/04 03:47:05 usata Exp $
 
 inherit eutils
 
@@ -35,7 +35,7 @@ src_compile() {
 src_install() {
 	dodir /usr/bin
 	dodir /usr/share/man/man1
-	
+
 	make \
 		DESTDIR=${D} \
 		BINDIR=${D}/usr/bin \
diff --git a/media-gfx/xv/xv-3.10a-r3.ebuild b/media-gfx/xv/xv-3.10a-r3.ebuild
index b4e1e264626d..221377c238a3 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-2003 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.7 2003/08/05 17:17:41 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/xv/xv-3.10a-r3.ebuild,v 1.8 2003/09/04 03:47:05 usata Exp $
 
 inherit ccc eutils
 
@@ -24,21 +24,21 @@ src_unpack() {
 	unpack ${A}
 
 	cd ${S}
-	[ `use png` ] && epatch ${WORKDIR}/${P}-naz-gentoo.patch	
+	[ `use png` ] && epatch ${WORKDIR}/${P}-naz-gentoo.patch
 	[ `use ppc` ] && [ -z `use png` ] && epatch ${FILESDIR}/xv-${PV}-ppc.patch
 }
 
 src_compile() {
 	sed -i "s:CCOPTS = -O:CCOPTS = ${CFLAGS}:" Makefile
 	sed -i "s:COPTS=\t-O:COPTS= ${CFLAGS}:" tiff/Makefile
-	is-ccc && replace-cc-hardcode 
+	is-ccc && replace-cc-hardcode
 	make || die
 }
 
 src_install() {
 	dodir /usr/bin
 	dodir /usr/share/man/man1
-	
+
 	make \
 		DESTDIR=${D} \
 		BINDIR=${D}/usr/bin \
diff --git a/media-gfx/xv/xv-3.10a-r4.ebuild b/media-gfx/xv/xv-3.10a-r4.ebuild
deleted file mode 100644
index 39e12446f528..000000000000
--- a/media-gfx/xv/xv-3.10a-r4.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2003 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-r4.ebuild,v 1.3 2003/08/05 17:17:41 vapier Exp $
-
-inherit flag-o-matic eutils
-
-DESCRIPTION="An interactive image manipulation program for X which can deal with a wide variety of image formats"
-HOMEPAGE="http://www.trilon.com/xv/index.html"
-SRC_URI="ftp://ftp.cis.upenn.edu/pub/xv/${P}.tar.gz"
-
-LICENSE="as-is"
-SLOT="0"
-KEYWORDS="~x86 ~ppc ~sparc ~alpha"
-IUSE="jpeg tiff png zlib X"
-RESTRICT="fetch"
-
-DEPEND="virtual/x11
-	jpeg? ( >=media-libs/jpeg-6b )
-	tiff? ( >=media-libs/tiff-3.5 )
-	png? ( >=media-libs/libpng-1.2 )
-	>=sys-libs/zlib-1.1.4"
-
-src_unpack() {
-	unpack ${A}
-	
-	cd ${S}
-	epatch ${FILESDIR}/${P}-enhanced-Nu.patch || die
-	epatch ${FILESDIR}/${P}-gentoo-Nu.patch || die
-	[ `use ppc` ] && epatch ${FILESDIR}/${P}-ppc.patch
-}
-
-src_compile() {
-	[ `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
-	make || die
-}
-
-src_install() {
-	dodir /usr/bin
-	dodir /usr/share/man/man1
-	
-	make \
-		DESTDIR=${D} \
-		BINDIR=${D}/usr/bin \
-		MANDIR=${D}/usr/share/man/man1 \
-		LIBDIR=${D}/usr/lib \
-		install || die
-
-	dodoc README INSTALL CHANGELOG BUGS IDEAS docs/*.ps docs/*.doc
-}
diff --git a/media-gfx/xv/xv-3.10a-r5.ebuild b/media-gfx/xv/xv-3.10a-r5.ebuild
index 23cd18e1dddf..d3138f754e5d 100644
--- a/media-gfx/xv/xv-3.10a-r5.ebuild
+++ b/media-gfx/xv/xv-3.10a-r5.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/media-gfx/xv/xv-3.10a-r5.ebuild,v 1.2 2003/08/14 14:33:35 usata Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/xv/xv-3.10a-r5.ebuild,v 1.3 2003/09/04 03:47:05 usata Exp $
 
-inherit flag-o-matic eutils
+inherit ccc flag-o-matic eutils
 
 DESCRIPTION="An interactive image manipulation program for X which can deal with a wide variety of image formats"
 HOMEPAGE="http://www.trilon.com/xv/index.html"
@@ -11,7 +11,7 @@ SRC_URI="ftp://ftp.cis.upenn.edu/pub/xv/${P}.tar.gz"
 LICENSE="as-is"
 SLOT="0"
 KEYWORDS="~x86 ~ppc ~sparc ~alpha"
-IUSE="jpeg tiff png zlib X"
+IUSE="jpeg tiff png"
 RESTRICT="fetch"
 
 DEPEND="virtual/x11
@@ -22,7 +22,7 @@ DEPEND="virtual/x11
 
 src_unpack() {
 	unpack ${A}
-	
+
 	cd ${S}
 	epatch ${FILESDIR}/${P}-enhanced-Nu.patch || die
 	epatch ${FILESDIR}/${PF}-gentoo-Nu.patch || die
@@ -35,6 +35,7 @@ src_compile() {
 	[ `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
 	make || die
 }