Index: xv-3.10a-r12.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/media-gfx/xv/xv-3.10a-r12.ebuild,v
retrieving revision 1.16
diff -u -b -B -r1.16 xv-3.10a-r12.ebuild
--- xv-3.10a-r12.ebuild	2 Jun 2007 18:28:26 -0000	1.16
+++ xv-3.10a-r12.ebuild	24 Jun 2007 21:45:58 -0000
@@ -4,10 +4,10 @@
 
 inherit flag-o-matic eutils toolchain-funcs
 
-JUMBOV=20050501
+JUMBOV=20070520
 DESCRIPTION="An interactive image manipulation program for X, supporting a wide variety of image formats"
 HOMEPAGE="http://www.trilon.com/xv/index.html http://www.sonic.net/~roelofs/greg_xv.html"
-SRC_URI="mirror://sourceforge/png-mng/${P}-jumbo-patches-${JUMBOV}.tar.bz2 ftp://ftp.cis.upenn.edu/pub/xv/${P}.tar.gz"
+SRC_URI="http://downloads.sourceforge.net/png-mng/${P}-jumbo-patches-${JUMBOV}.tar.gz ftp://ftp.cis.upenn.edu/pub/xv/${P}.tar.gz"
 
 LICENSE="xv"
 SLOT="0"
@@ -22,21 +22,19 @@
 
 src_unpack() {
 	unpack ${A}
+	cd "${S}"
 
-	# bug #109012
-	cd ${WORKDIR}; epatch ${FILESDIR}/jumbo-patch-nojpeg.diff || die
-
-	cd ${S}
-
-	# XXX: fix version on subsequent releases.
-	epatch ${WORKDIR}/${P}-jumbo-fix-patch-20050410.txt || die
-	epatch ${WORKDIR}/${P}-jumbo-enh-patch-${JUMBOV}.txt || die
+	# Apply the jumbo patch
+	epatch ${WORKDIR}/${P}-jumbo-fix-enh-patch-${JUMBOV}.txt
 
 	# OSX and BSD xv.h define patches
-	epatch "${FILESDIR}/${P}"-osx-bsd.patch || die
+	epatch "${FILESDIR}/${P}"-osx-bsd-${JUMBOV}.patch
 
 	# OSX malloc patch
-	epatch "${FILESDIR}/${P}"-vdcomp-osx.patch || die
+	epatch "${FILESDIR}/${P}"-vdcomp-osx-${JUMBOV}.patch
+
+	# Disable JP2K (i.e. use system JPEG libs)
+	epatch "${FILESDIR}/${P}"-disable-jp2k-${JUMBOV}.patch
 
 	sed -i	-e 's/\(^JPEG.*\)/#\1/g' \
 			-e 's/\(^PNG.*\)/#\1/g' \