bump

(Portage version: 2.0.51.19)

4 files changed, 104 insertions, 24 deletions

diff --git a/media-gfx/xv/ChangeLog b/media-gfx/xv/ChangeLog
index 9f4cb29f2d8f..66454a93f73c 100644
--- a/media-gfx/xv/ChangeLog
+++ b/media-gfx/xv/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-gfx/xv
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/xv/ChangeLog,v 1.58 2005/04/19 00:15:11 kloeri Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/xv/ChangeLog,v 1.59 2005/05/05 10:25:54 taviso Exp $
+
+*xv-3.10a-r12 (05 May 2005)
+
+  05 May 2005; Tavis Ormandy <taviso@gentoo.org> +xv-3.10a-r12.ebuild:
+  new release of patchset.
 
   19 Apr 2005; Bryan Østergaard <kloeri@gentoo.org> xv-3.10a-r11.ebuild:
   Stable on ia64, bug 88742.
diff --git a/media-gfx/xv/Manifest b/media-gfx/xv/Manifest
index a796405435a6..c9129bf9986c 100644
--- a/media-gfx/xv/Manifest
+++ b/media-gfx/xv/Manifest
@@ -1,32 +1,24 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 ae2f3128ffb336d175f6691519a8b2b5 ChangeLog 9108
 MD5 fc9929bce8b8355907b77bc26cca18b0 xv-3.10a-r11.ebuild 2117
-MD5 8fc22f08ecb2e292e60ce7553c58d0c2 metadata.xml 222
-MD5 fbe8dc0be0ab018633f1e153b56c1662 xv-3.10a-r8.ebuild 2347
 MD5 d3caaf1691b52006d2295f1443fe691b xv-3.10a-r9.ebuild 2529
 MD5 46d0c5a9c8dc6b5df90784815999b70d xv-3.10a-r10.ebuild 2635
-MD5 b6755903a15ab242469da379020a0a66 files/xv-3.10a-xv-osx.patch 615
-MD5 8edd408b62a85896b2b76411f7839c60 files/xv-smoothing-algorithm.diff 6418
+MD5 fbe8dc0be0ab018633f1e153b56c1662 xv-3.10a-r8.ebuild 2347
+MD5 58b3eed31905cd993eac158e3df7b8b4 xv-3.10a-r12.ebuild 1993
+MD5 ae2f3128ffb336d175f6691519a8b2b5 ChangeLog 9108
+MD5 8fc22f08ecb2e292e60ce7553c58d0c2 metadata.xml 222
+MD5 3b193d08268519822ea55ef0534c805a files/digest-xv-3.10a-r8 127
 MD5 3b193d08268519822ea55ef0534c805a files/digest-xv-3.10a-r9 127
-MD5 270b4d6ba55f1253d0d1edfde1640844 files/xv-3.10a-bmpfix.patch.bz2 1249
-MD5 4e152e258221470988e2fc31bd8e03d5 files/xv-3.10a-yaos.dif.bz2 4212
+MD5 24acb62ee86813a3fde2819683b2ffc9 files/xv-3.10a-makefile-osx.patch 538
 MD5 4b034e22d5bb0502e383afcfeb8ea4b0 files/xv-3.10a-ppc.patch 359
-MD5 a5b5fd8ad9fbef9a63f360d83f55e546 files/xv-optimize-jpeg.diff 553
-MD5 3b193d08268519822ea55ef0534c805a files/digest-xv-3.10a-r8 127
+MD5 270b4d6ba55f1253d0d1edfde1640844 files/xv-3.10a-bmpfix.patch.bz2 1249
+MD5 123bdb40134767bb438eeaccb50f1646 files/xv-3.10a-security.diff 4079
 MD5 3b193d08268519822ea55ef0534c805a files/digest-xv-3.10a-r10 127
-MD5 32841798fbb3c9923d5d8a26994e1b0a files/xv-3.10a-vdcomp-osx.patch 341
 MD5 6f7117c9be7e979494866250a24a3338 files/digest-xv-3.10a-r11 145
-MD5 f555e07727c8b51042dae772ae474f42 files/xv-postscript-double-free.diff 864
+MD5 bf64513c42257ec1f60b78efabf94e6e files/digest-xv-3.10a-r12 145
 MD5 cda66dd1f3a032802881a6ae4430e0d6 files/xv-use-getcwd.patch 222
+MD5 32841798fbb3c9923d5d8a26994e1b0a files/xv-3.10a-vdcomp-osx.patch 341
+MD5 b6755903a15ab242469da379020a0a66 files/xv-3.10a-xv-osx.patch 615
+MD5 4e152e258221470988e2fc31bd8e03d5 files/xv-3.10a-yaos.dif.bz2 4212
+MD5 8edd408b62a85896b2b76411f7839c60 files/xv-smoothing-algorithm.diff 6418
 MD5 63deb1e35f05b4f406f141d1e48ff17b files/xv-filename-format-string.diff 319
-MD5 24acb62ee86813a3fde2819683b2ffc9 files/xv-3.10a-makefile-osx.patch 538
-MD5 123bdb40134767bb438eeaccb50f1646 files/xv-3.10a-security.diff 4079
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.1 (GNU/Linux)
-
-iD8DBQFCZE3CKf2g/qXtneoRApZEAKC4B5QSWzSwyxn9zBOGM/6MZzp1rACdGDA1
-oICwceIeuDlhmfowxlKh/7Y=
-=v1tN
------END PGP SIGNATURE-----
+MD5 a5b5fd8ad9fbef9a63f360d83f55e546 files/xv-optimize-jpeg.diff 553
+MD5 f555e07727c8b51042dae772ae474f42 files/xv-postscript-double-free.diff 864
diff --git a/media-gfx/xv/files/digest-xv-3.10a-r12 b/media-gfx/xv/files/digest-xv-3.10a-r12
new file mode 100644
index 000000000000..ea2183c4101c
--- /dev/null
+++ b/media-gfx/xv/files/digest-xv-3.10a-r12
@@ -0,0 +1,2 @@
+MD5 15a3f90aacc7b642439c85b45c21cf58 xv-3.10a-jumbo-patches-20050501.tar.bz2 369886
+MD5 2d4fbeec1561304362781cc8e2f7f72d xv-3.10a.tar.gz 2259124
diff --git a/media-gfx/xv/xv-3.10a-r12.ebuild b/media-gfx/xv/xv-3.10a-r12.ebuild
new file mode 100644
index 000000000000..e036fcf1b01f
--- /dev/null
+++ b/media-gfx/xv/xv-3.10a-r12.ebuild
@@ -0,0 +1,81 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/xv/xv-3.10a-r12.ebuild,v 1.1 2005/05/05 10:25:54 taviso Exp $
+
+inherit flag-o-matic eutils toolchain-funcs
+
+JUMBOV=20050501
+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"
+
+LICENSE="xv"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~sparc ~ppc ~ppc64 ~alpha ~ia64"
+IUSE="jpeg tiff png"
+
+DEPEND="virtual/x11
+	jpeg? ( >=media-libs/jpeg-6b )
+	tiff? ( >=media-libs/tiff-3.6.1-r2 )
+	png? ( >=media-libs/libpng-1.2 >=sys-libs/zlib-1.1.4 )"
+
+src_unpack() {
+	unpack ${A}
+
+	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
+
+	sed -i	-e 's/\(^JPEG.*\)/#\1/g' \
+			-e 's/\(^PNG.*\)/#\1/g' \
+			-e 's/\(^TIFF.*\)/#\1/g' \
+			-e 's/\(^LIBS = .*\)/\1 $(LDFLAGS) /g' Makefile
+
+	# /usr/bin/gzip => /bin/gzip
+	sed -i	-e 's#/usr\(/bin/gzip\)#\1#g' config.h
+
+	# fix installation of ps docs.
+	sed -i -e 's#$(DESTDIR)$(LIBDIR)#$(LIBDIR)#g' Makefile
+
+}
+
+src_compile() {
+	append-flags -DUSE_GETCWD -DLINUX -DUSLEEP
+
+	einfo "Enabling Optional Features..."
+	if use jpeg; then
+		ebegin "	jpeg"
+			append-flags -DDOJPEG
+			append-ldflags -ljpeg
+		eend
+	fi
+	if use png; then
+		ebegin "	png"
+			append-flags -DDOPNG
+			append-ldflags -lz -lpng
+		eend
+	fi
+	if use tiff; then
+		ebegin "	tiff"
+			append-flags -DDOTIFF -DUSE_TILED_TIFF_BOTLEFT_FIX
+			append-ldflags -ltiff
+		eend
+	fi
+	einfo "done."
+
+	emake CC="$(tc-getCC)" CCOPTS="${CFLAGS}" LDFLAGS="${LDFLAGS}" || die
+}
+
+src_install() {
+	dodir /usr/bin
+	dodir /usr/share/man/man1
+
+	emake	DESTDIR=${D} \
+			BINDIR=/usr/bin \
+			MANDIR=/usr/share/man/man1 \
+			LIBDIR=${T} install || die
+
+	dodoc README{,.jumbo,.pcd} INSTALL CHANGELOG BUGS IDEAS docs/*.ps docs/*.doc
+}