Closing #29253.

4 files changed, 68 insertions, 3 deletions

diff --git a/media-gfx/xv/ChangeLog b/media-gfx/xv/ChangeLog
index ff00d72fe5d3..8057f5eddd01 100644
--- a/media-gfx/xv/ChangeLog
+++ b/media-gfx/xv/ChangeLog
@@ -1,6 +1,11 @@
 # 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.21 2003/10/26 08:58:43 bazik Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/xv/ChangeLog,v 1.22 2003/10/28 14:20:47 mholzer Exp $
+
+*xv-3.10a-r6 (28 Oct 2003)
+
+  28 Oct 2003; Martin Holzer <mholzer@gentoo.org> xv-3.10a-r6.ebuild:
+  Closing #29253.
 
   26 Oct 2003; Sven Blumenstein <bazik@gentoo.org> xv-3.10a-r5.ebuild:
   Bumped to stable on sparc, removed RESTRICT (bug #29276)
diff --git a/media-gfx/xv/Manifest b/media-gfx/xv/Manifest
index 19f17ebca168..cc4c70878eab 100644
--- a/media-gfx/xv/Manifest
+++ b/media-gfx/xv/Manifest
@@ -1,5 +1,5 @@
-MD5 8ad06bd0b22e6c859e9c2a88106d3914 ChangeLog 4128
-MD5 61439fc81b672fab7b838a5f3a9ace96 xv-3.10a-r6.ebuild 1684
+MD5 ce0b5bdf2ddca601afa0c20a121acc03 ChangeLog 4247
+MD5 3c871824a98bb8c408acb3df593e3349 xv-3.10a-r6.ebuild 1686
 MD5 d9c303faf327f9fd730972e74a3b5d5d xv-3.10a-r3.ebuild 1310
 MD5 cf8171ff6dbfdc4926d5c7aba3f096b6 xv-3.10a-r5.ebuild 1437
 MD5 6d5302abe89d4c1586933d5694b0aab1 files/digest-xv-3.10a-r6 61
diff --git a/media-gfx/xv/files/digest-xv-3.10a-r6 b/media-gfx/xv/files/digest-xv-3.10a-r6
new file mode 100644
index 000000000000..f6f83423ac38
--- /dev/null
+++ b/media-gfx/xv/files/digest-xv-3.10a-r6
@@ -0,0 +1 @@
+MD5 2d4fbeec1561304362781cc8e2f7f72d xv-3.10a.tar.gz 2259124
diff --git a/media-gfx/xv/xv-3.10a-r6.ebuild b/media-gfx/xv/xv-3.10a-r6.ebuild
new file mode 100644
index 000000000000..c7f6ea5c0f88
--- /dev/null
+++ b/media-gfx/xv/xv-3.10a-r6.ebuild
@@ -0,0 +1,59 @@
+# 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-r6.ebuild,v 1.1 2003/10/28 14:20:47 mholzer Exp $
+
+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"
+SRC_URI="ftp://ftp.cis.upenn.edu/pub/xv/${P}.tar.gz"
+
+LICENSE="as-is"
+SLOT="0"
+KEYWORDS="~x86 ~ppc ~sparc ~alpha ~amd64"
+IUSE="jpeg tiff png"
+
+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() {
+	[ -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
+	is-ccc && replace-cc-hardcode
+	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
+}