p.masked, removed.

9 files changed, 0 insertions, 566 deletions

diff --git a/media-gfx/xzgv/ChangeLog b/media-gfx/xzgv/ChangeLog
deleted file mode 100644
index f70662b60543..000000000000
--- a/media-gfx/xzgv/ChangeLog
+++ /dev/null
@@ -1,98 +0,0 @@
-# ChangeLog for media-gfx/xzgv
-# Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/xzgv/ChangeLog,v 1.29 2007/02/09 03:40:49 flameeyes Exp $
-
-  09 Feb 2007; Diego Pettenò <flameeyes@gentoo.org> ChangeLog:
-  Regenerate digest in Manifest2 format.
-
-  23 May 2006; Markus Rothe <corsair@gentoo.org> xzgv-0.8-r2.ebuild:
-  Stable on ppc64
-
-  10 Apr 2006; Gustavo Zacarias <gustavoz@gentoo.org> xzgv-0.8-r2.ebuild:
-  Stable on sparc wrt security #127008
-
-  09 Apr 2006; Simon Stelling <blubb@gentoo.org> xzgv-0.8-r2.ebuild:
-  stable on amd64
-
-  08 Apr 2006; Bryan Østergaard <kloeri@gentoo.org xzgv-0.8-r2.ebuild:
-  Stable on alpha + ia64, bug 127008.
-
-  08 Apr 2006; Tobias Scherbaum <dertobi123@gentoo.org> xzgv-0.8-r2.ebuild:
-  ppc stable, bug #127008
-
-*xzgv-0.8-r2 (07 Apr 2006)
-
-  07 Apr 2006; <smithj@gentoo.org>
-  +files/xzgv-0.8-patched-cmyk-ycck-fix.diff, -xzgv-0.8-r1.ebuild,
-  +xzgv-0.8-r2.ebuild:
-  SECURITY: CVE-2006-1060 and gentoo bug #127008; fixed heap overflow in xzgv
-
-  14 Dec 2005; Donnie Berkholz <spyderous@gentoo.org>; xzgv-0.8-r1.ebuild:
-  Fix modular X dependencies. GTK+-1 pulls in libX11.
-
-  13 Sep 2005; Aron Griffis <agriffis@gentoo.org> xzgv-0.8-r1.ebuild:
-  Mark 0.8-r1 stable on alpha
-
-  24 Aug 2005; Aron Griffis <agriffis@gentoo.org> xzgv-0.8-r1.ebuild:
-  stable on ia64
-
-  13 Jun 2005; Jonathan Smith <smithj@gentoo.org> metadata.xml:
-  taking over this package
-
-  24 May 2005; Joseph Jezak <josejx@gentoo.org> xzgv-0.8-r1.ebuild:
-  Marked ppc stable for bug #93132.
-
-  21 May 2005; Jose Luis Rivero <yoswink@gentoo.org> xzgv-0.8-r1.ebuild:
-  Keyworded ~alpha
-
-  19 May 2005; Gustavo Zacarias <gustavoz@gentoo.org> xzgv-0.8-r1.ebuild:
-  Stable on sparc wrt #93132
-
-  19 May 2005; Rene Nussbaumer <killerfox@gentoo.org> xzgv-0.8-r1.ebuild:
-  Add ~hppa; bug #93132
-
-  19 May 2005; Markus Rothe <corsair@gentoo.org> xzgv-0.8-r1.ebuild:
-  Added ~ppc64 to KEYWORDS; bug #93132
-
-  19 May 2005; Olivier Crête <tester@gentoo.org> -xzgv-0.7-r1.ebuild,
-  -xzgv-0.8.ebuild, xzgv-0.8-r1.ebuild:
-  Fixed homepage and src_uri, removed vulnerable versions (see GLSA 200501-09)
-  and marked stable on amd64, closes bugs #42092 and #93132
-
-  16 Jan 2005; Danny van Dyk <kugelfang@gentoo.org> xzgv-0.8-r1.ebuild:
-  Marked ~amd64.
-
-  06 Jan 2005; Chris White <chriswhite@gentoo.org> xzgv-0.8-r1.ebuild:
-  Marked x86 stable for bug #74069.
-
-*xzgv-0.8-r1 (06 Jan 2005)
-
-  06 Jan 2005; Chris White <chriswhite@gentoo.org>
-  +files/xzgv-0.8-integer-overflow-fix.diff, +xzgv-0.8-r1.ebuild:
-  Fixing Security bug #74069 and added ~ppc while I was there.
-
-  06 Sep 2004; Gustavo Zacarias <gustavoz@gentoo.org> xzgv-0.7-r1.ebuild,
-  xzgv-0.8.ebuild:
-  Keyworded 0.7-r1 -sparc, 0.8 ~sparc
-
-  02 Jun 2004; Danny van Dyk <kugelfang@gentoo.org> xzgv-0.8.ebuild:
-  Marked ~amd64 after adding patch to disable mmx on amd64.
-
-*xzgv-0.8 (07 Oct 2003)
-
-  07 Oct 2003; Brandy Westcott brandy@gentoo.org xzgv-0.8.ebuild:
-  Version bump. This version will compile with gcc-3.3. Added sys-apps/gawk as a
-  dependency
-
-*xzgv-0.7-r1 (28 Jun 2002)
-
-  28 Jun 2002; Seemant Kulleen <seemant@gentoo.org> xzgv-0.7-r1.ebuild
-  files/digest-xzgv-0.7-r1 :
-
-  LFH/man page fixes; SLOT and LICENSE
-
-*xzgv-0.7 (24 April 2002)
-
-  24 April 2002; Bart Verwilst <verwilst@gentoo.org> ChangeLog :
-  
-  Initial ebuild... Enjoy..
diff --git a/media-gfx/xzgv/Manifest b/media-gfx/xzgv/Manifest
deleted file mode 100644
index cf9494af98be..000000000000
--- a/media-gfx/xzgv/Manifest
+++ /dev/null
@@ -1,41 +0,0 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-AUX xzgv-0.8-integer-overflow-fix.diff 6374 RMD160 bd75c87cf6f20e4fa2757afe472111e2253cb640 SHA1 b18dfdaafe295e2c42764f59784b6b6201b489ea SHA256 c8a01e234cc0ce3a0b9f1b99d3781be0eaec65c284dc3752a68cb929a1daf71f
-MD5 9495e82307945c08599a0bd9ffc2f4f6 files/xzgv-0.8-integer-overflow-fix.diff 6374
-RMD160 bd75c87cf6f20e4fa2757afe472111e2253cb640 files/xzgv-0.8-integer-overflow-fix.diff 6374
-SHA256 c8a01e234cc0ce3a0b9f1b99d3781be0eaec65c284dc3752a68cb929a1daf71f files/xzgv-0.8-integer-overflow-fix.diff 6374
-AUX xzgv-0.8-patched-cmyk-ycck-fix.diff 1844 RMD160 2e1c4cf43455b9b95c35133b5b4db308fb513340 SHA1 870cc360136c9a316f5bf5d825203cd4816e5234 SHA256 ae8b857d71006d5986d5f72894e637ec0dcf63edd77195cc1c17c7f556d856c2
-MD5 5bd803c395982c07ce099415b6f51402 files/xzgv-0.8-patched-cmyk-ycck-fix.diff 1844
-RMD160 2e1c4cf43455b9b95c35133b5b4db308fb513340 files/xzgv-0.8-patched-cmyk-ycck-fix.diff 1844
-SHA256 ae8b857d71006d5986d5f72894e637ec0dcf63edd77195cc1c17c7f556d856c2 files/xzgv-0.8-patched-cmyk-ycck-fix.diff 1844
-DIST xzgv-0.8.tar.gz 302801 RMD160 e36466a73c27616610fd032b3a92898d95a55a17 SHA1 1aa21336e2562849e6f5f984cbbfcb745489df3b SHA256 4f6247665dfc3e4d376f457379b9e4c77c2a848659ff2b0dd5377c0aa09e5884
-EBUILD xzgv-0.8-r1.ebuild 1391 RMD160 31a0a8f7ade8a0b345cc9360b64a654678598cc8 SHA1 81df338bb7920201fac3449661fa4174963d49a7 SHA256 5a4e39b5b49258104c2f54f91ba7014e5313ccd969e899ecffffccc7390fbeb7
-MD5 72bcbe17722af56b599a478b250ae931 xzgv-0.8-r1.ebuild 1391
-RMD160 31a0a8f7ade8a0b345cc9360b64a654678598cc8 xzgv-0.8-r1.ebuild 1391
-SHA256 5a4e39b5b49258104c2f54f91ba7014e5313ccd969e899ecffffccc7390fbeb7 xzgv-0.8-r1.ebuild 1391
-EBUILD xzgv-0.8-r2.ebuild 1465 RMD160 44178637d7826db4879772b3e6f7f47dfc042548 SHA1 2ca939fcd0c136c6de773b7c0e5fbecc83d10661 SHA256 be4c067d254ebe0c94f14d288d0317468bd08c947a5527fc8e68b619a7ed2679
-MD5 cf939bff9c4df9373f573b0911dc14aa xzgv-0.8-r2.ebuild 1465
-RMD160 44178637d7826db4879772b3e6f7f47dfc042548 xzgv-0.8-r2.ebuild 1465
-SHA256 be4c067d254ebe0c94f14d288d0317468bd08c947a5527fc8e68b619a7ed2679 xzgv-0.8-r2.ebuild 1465
-MISC ChangeLog 3366 RMD160 f467b497179b50af0bb7e8176c4452d5d672c0f5 SHA1 e7610863443d4c8f18c64f21bac4151a9265e3d2 SHA256 f157b98de90656eef6485d1eac3c4fe1382539c7014c801ec666b68961adfaf5
-MD5 b284f314c72e6681881e7246ac97b985 ChangeLog 3366
-RMD160 f467b497179b50af0bb7e8176c4452d5d672c0f5 ChangeLog 3366
-SHA256 f157b98de90656eef6485d1eac3c4fe1382539c7014c801ec666b68961adfaf5 ChangeLog 3366
-MISC metadata.xml 218 RMD160 2d49623b0718e8ef5056a06bfc3bc51c65c9f6a3 SHA1 2e2894f5a815031440a911383cbca2f80192afc7 SHA256 794091c4d1e23e2f0b2b7a3d7c52ba5b56a15f2599b55b85210aaff6cb54500e
-MD5 ba9c20ee3f3568176dc0dd45b3cab35b metadata.xml 218
-RMD160 2d49623b0718e8ef5056a06bfc3bc51c65c9f6a3 metadata.xml 218
-SHA256 794091c4d1e23e2f0b2b7a3d7c52ba5b56a15f2599b55b85210aaff6cb54500e metadata.xml 218
-MD5 e72199e9175d25ece180121f3031c93c files/digest-xzgv-0.8-r1 226
-RMD160 4dda9ce561816d5413e66004f40a1ec9cb95dedd files/digest-xzgv-0.8-r1 226
-SHA256 e77f7af9469e3de557755540e9587dc45eca766cea116786b0b9163b474ce83b files/digest-xzgv-0.8-r1 226
-MD5 e72199e9175d25ece180121f3031c93c files/digest-xzgv-0.8-r2 226
-RMD160 4dda9ce561816d5413e66004f40a1ec9cb95dedd files/digest-xzgv-0.8-r2 226
-SHA256 e77f7af9469e3de557755540e9587dc45eca766cea116786b0b9163b474ce83b files/digest-xzgv-0.8-r2 226
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.2 (GNU/Linux)
-
-iD8DBQFFy+1HAiZjviIA2XgRAkmrAJ49t+MgGg7eiR09Czca3DAQNPpMDQCfZc/J
-0viuxuM8mPX41Va+CNDwKR0=
-=cbOR
------END PGP SIGNATURE-----
diff --git a/media-gfx/xzgv/files/digest-xzgv-0.8-r1 b/media-gfx/xzgv/files/digest-xzgv-0.8-r1
deleted file mode 100644
index 9523647e2c49..000000000000
--- a/media-gfx/xzgv/files/digest-xzgv-0.8-r1
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 e392277f1447076402df2e3d9e782cb2 xzgv-0.8.tar.gz 302801
-RMD160 e36466a73c27616610fd032b3a92898d95a55a17 xzgv-0.8.tar.gz 302801
-SHA256 4f6247665dfc3e4d376f457379b9e4c77c2a848659ff2b0dd5377c0aa09e5884 xzgv-0.8.tar.gz 302801
diff --git a/media-gfx/xzgv/files/digest-xzgv-0.8-r2 b/media-gfx/xzgv/files/digest-xzgv-0.8-r2
deleted file mode 100644
index 9523647e2c49..000000000000
--- a/media-gfx/xzgv/files/digest-xzgv-0.8-r2
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 e392277f1447076402df2e3d9e782cb2 xzgv-0.8.tar.gz 302801
-RMD160 e36466a73c27616610fd032b3a92898d95a55a17 xzgv-0.8.tar.gz 302801
-SHA256 4f6247665dfc3e4d376f457379b9e4c77c2a848659ff2b0dd5377c0aa09e5884 xzgv-0.8.tar.gz 302801
diff --git a/media-gfx/xzgv/files/xzgv-0.8-integer-overflow-fix.diff b/media-gfx/xzgv/files/xzgv-0.8-integer-overflow-fix.diff
deleted file mode 100644
index 627ba199af63..000000000000
--- a/media-gfx/xzgv/files/xzgv-0.8-integer-overflow-fix.diff
+++ /dev/null
@@ -1,197 +0,0 @@
-diff -urN xzgv-0.8/ChangeLog xzgv/ChangeLog
---- xzgv-0.8/ChangeLog	Tue Sep 16 15:08:42 2003
-+++ xzgv/ChangeLog	Wed Dec 15 03:30:46 2004
-@@ -1,3 +1,13 @@
-+2004-11-03  Russell Marks  <russell.marks@ntlworld.com>
-+
-+	* Added width/height limits to all native picture readers. This is
-+	a crude (albeit effective) fix for heap overflow bugs - there may
-+	yet be more subtle problems, but I can't really fix them until I
-+	know they're there. :-) Thanks to Luke Macken for letting me know
-+	about the heap overflow problems (in zgv). I suppose I should also
-+	thank "infamous41md" for publishing the original advisory/exploit
-+	(again for zgv), even if he didn't bother emailing me or anything.
-+
- 2003-09-16  Russell Marks  <russell.marks@ntlworld.com>
- 
- 	* Version 0.8.
-diff -urN xzgv-0.8/src/Makefile xzgv/src/Makefile
---- xzgv-0.8/src/Makefile	Tue Jan  1 05:37:45 2002
-+++ xzgv/src/Makefile	Wed Dec 15 03:30:46 2004
-@@ -84,18 +84,19 @@
- logo.o: logo.c logodata.h
- logoconv.o: logoconv.c
- main.o: main.c backend.h readmrf.h readgif.h readpng.h readjpeg.h \
-- readtiff.h resizepic.h rcfile.h filedetails.h gotodir.h updatetn.h \
-- confirm.h misc.h copymove.h rename.h help.h dir_icon.xpm \
-+ readtiff.h readprf.h resizepic.h rcfile.h filedetails.h gotodir.h \
-+ updatetn.h confirm.h misc.h copymove.h rename.h help.h dir_icon.xpm \
-  dir_icon_small.xpm file_icon.xpm file_icon_small.xpm logo.h \
-  icon-48.xpm main.h
- misc.o: misc.c misc.h
- rcfile.o: rcfile.c getopt.h rcfile.h rcfile_opt.h rcfile_var.h \
-  rcfile_short.h
--readgif.o: readgif.c readgif.h
--readjpeg.o: readjpeg.c rcfile.h readjpeg.h
--readmrf.o: readmrf.c readmrf.h
-+readgif.o: readgif.c reader.h readgif.h
-+readjpeg.o: readjpeg.c rcfile.h reader.h readjpeg.h
-+readmrf.o: readmrf.c reader.h readmrf.h
- readpng.o: readpng.c readpng.h
--readtiff.o: readtiff.c readtiff.h
-+readprf.o: readprf.c reader.h readprf.h
-+readtiff.o: readtiff.c reader.h readtiff.h
- rename.o: rename.c backend.h main.h rename.h
- resizepic.o: resizepic.c resizepic.h
- updatetn.o: updatetn.c backend.h main.h rcfile.h dither.h resizepic.h \
-diff -urN xzgv-0.8/src/reader.h xzgv/src/reader.h
---- xzgv-0.8/src/reader.h	Thu Jan  1 01:00:00 1970
-+++ xzgv/src/reader.h	Wed Dec 15 03:30:46 2004
-@@ -0,0 +1,15 @@
-+/* xzgv 0.8 - picture viewer for X, with file selector.
-+ * Copyright (C) 1999-2004 Russell Marks. See main.c for license details.
-+ *
-+ * reader.h
-+ */
-+
-+/* range check on width and height as a crude way of avoiding overflows
-+ * when calling malloc/calloc. 32767 is the obvious limit to use given that
-+ * xzgv effectively imposes such a limit anyway.
-+ * Adds an extra 2 to height for max-height check, partly to reflect what
-+ * the check in zgv does but also to allow for readtiff.c allocating an
-+ * extra line (so at least an extra 1 would have been needed in any case).
-+ */
-+#define WH_MAX	32767
-+#define WH_BAD(w,h)	((w)<=0 || (w)>WH_MAX || (h)<=0 || ((h)+2)>WH_MAX)
-diff -urN xzgv-0.8/src/readgif.c xzgv/src/readgif.c
---- xzgv-0.8/src/readgif.c	Sun Mar  3 04:34:32 2002
-+++ xzgv/src/readgif.c	Wed Dec 15 03:30:46 2004
-@@ -8,6 +8,7 @@
- #include <string.h>
- #include <unistd.h>
- #include <stdlib.h>
-+#include "reader.h"
- #include "readgif.h"
- 
- 
-@@ -103,7 +104,7 @@
-   
-   if(local_colour_map) readcolmap(in);
-   
--  if((image=malloc(width*height*3))==NULL)
-+  if(WH_BAD(width,height) || (image=malloc(width*height*3))==NULL)
-     {
-     fclose(in);
-     return(0);
-diff -urN xzgv-0.8/src/readjpeg.c xzgv/src/readjpeg.c
---- xzgv-0.8/src/readjpeg.c	Tue Sep 16 12:52:04 2003
-+++ xzgv/src/readjpeg.c	Wed Dec 15 03:30:46 2004
-@@ -13,6 +13,7 @@
- #include <jpeglib.h>
- 
- #include "rcfile.h"
-+#include "reader.h"
- 
- #include "readjpeg.h"
- 
-@@ -265,7 +266,7 @@
- /* this one shouldn't hurt */
- cinfo.do_block_smoothing=FALSE;
- 
--if((*imagep=image=malloc(width*height*3))==NULL)
-+if(WH_BAD(width,height) || (*imagep=image=malloc(width*height*3))==NULL)
-   longjmp(jerr.setjmp_buffer,1);
- 
- jpeg_start_decompress(&cinfo);
-diff -urN xzgv-0.8/src/readmrf.c xzgv/src/readmrf.c
---- xzgv-0.8/src/readmrf.c	Sat Oct  7 14:26:55 2000
-+++ xzgv/src/readmrf.c	Wed Dec 15 03:30:46 2004
-@@ -7,6 +7,7 @@
- #include <stdio.h>
- #include <string.h>
- #include <stdlib.h>
-+#include "reader.h"
- #include "readmrf.h"
- 
- 
-@@ -91,7 +92,8 @@
- w64=(w+63)/64;
- h64=(h+63)/64;
- 
--if((*bmap=malloc(w*h*3))==NULL ||
-+if(WH_BAD(w64*64,h64*64) || WH_BAD(w,h) ||
-+   (*bmap=malloc(w*h*3))==NULL ||
-    (image=calloc(w64*h64*64*64,1))==NULL)
-   {
-   if(*bmap) free(*bmap),*bmap=NULL;
-diff -urN xzgv-0.8/src/readpng.c xzgv/src/readpng.c
---- xzgv-0.8/src/readpng.c	Thu Jul 10 16:13:43 2003
-+++ xzgv/src/readpng.c	Wed Dec 15 03:32:46 2004
-@@ -16,6 +16,7 @@
- #include <stdlib.h>
- #include <png.h>
- #include <setjmp.h>	/* after png.h to avoid horrible thing in pngconf.h */
-+#include "reader.h"
- #include "readpng.h"
- 
- 
-@@ -129,7 +130,8 @@
-   }
- 
- /* allocate image memory */
--if((*theimageptr=theimage=malloc(width*height*3))==NULL)
-+if(WH_BAD(width,height) ||
-+   (*theimageptr=theimage=malloc(width*height*3))==NULL)
-   {
-   png_read_end(png_ptr,info_ptr);
-   png_destroy_read_struct(&png_ptr,&info_ptr,NULL);
-diff -urN xzgv-0.8/src/readprf.c xzgv/src/readprf.c
---- xzgv-0.8/src/readprf.c	Mon Apr  9 19:08:19 2001
-+++ xzgv/src/readprf.c	Wed Dec 15 03:30:46 2004
-@@ -7,6 +7,7 @@
- #include <stdio.h>
- #include <string.h>
- #include <stdlib.h>
-+#include "reader.h"
- #include "readprf.h"
- 
- #define squaresize	64
-@@ -164,7 +165,7 @@
-   bytepp=1;
- 
- n=width*squaresize;
--if((planebuf[0]=calloc(n,planes))==NULL)
-+if(WH_BAD(width,height) || (planebuf[0]=calloc(n,planes))==NULL)
-   {
-   fclose(in);
-   return(0);
-@@ -173,6 +174,7 @@
- for(f=1;f<planes;f++)
-   planebuf[f]=planebuf[f-1]+n;
- 
-+/* width/height already checked above */
- if((*theimageptr=malloc(width*height*3))==NULL)
-   {
-   free(planebuf[0]);
-diff -urN xzgv-0.8/src/readtiff.c xzgv/src/readtiff.c
---- xzgv-0.8/src/readtiff.c	Thu Dec 28 03:20:55 2000
-+++ xzgv/src/readtiff.c	Wed Dec 15 03:30:46 2004
-@@ -11,7 +11,7 @@
- #include <setjmp.h>
- #include <sys/file.h>  /* for open et al */
- #include <tiffio.h>
--
-+#include "reader.h"
- #include "readtiff.h"
- 
- 
-@@ -36,7 +36,8 @@
-  * spare for the flip afterwards.
-  */
- numpix=width*height;
--if((image=malloc(numpix*sizeof(uint32)+width*3))==NULL)
-+if(WH_BAD(width,height) ||
-+   (image=malloc(numpix*sizeof(uint32)+width*3))==NULL)
-   {
-   TIFFClose(in);
-   return(0);
diff --git a/media-gfx/xzgv/files/xzgv-0.8-patched-cmyk-ycck-fix.diff b/media-gfx/xzgv/files/xzgv-0.8-patched-cmyk-ycck-fix.diff
deleted file mode 100644
index f5385863b880..000000000000
--- a/media-gfx/xzgv/files/xzgv-0.8-patched-cmyk-ycck-fix.diff
+++ /dev/null
@@ -1,80 +0,0 @@
---- xzgv-0.8-patched/src/readjpeg.c	Tue Mar 21 12:16:07 2006
-+++ xzgv/src/readjpeg.c	Wed Sep 21 21:15:01 2005
-@@ -179,11 +179,13 @@
- static int have_image;
- static int width,height;
- static unsigned char *image;
-+static int cmyk;
- unsigned char *ptr,*ptr2;
- int chkw,chkh;
- int f,rec;
- static int greyscale;	/* static to satisfy gcc -Wall */
- 
-+cmyk=0;
- greyscale=0;
- 
- lineptrs=NULL;
-@@ -225,6 +227,15 @@
-   greyscale=1;
-   }
- 
-+if(cinfo.jpeg_color_space==JCS_CMYK)
-+  cmyk=1;
-+
-+if(cinfo.jpeg_color_space==JCS_YCCK)
-+  {
-+  cmyk=1;
-+  cinfo.out_color_space=JCS_CMYK;
-+  }
-+
- *wp=width=cinfo.image_width;
- *hp=height=cinfo.image_height;
- 
-@@ -266,7 +277,7 @@
- /* this one shouldn't hurt */
- cinfo.do_block_smoothing=FALSE;
- 
--if(WH_BAD(width,height) || (*imagep=image=malloc(width*height*3))==NULL)
-+if(WH_BAD(width,height) || (*imagep=image=malloc(width*(height+cmyk)*3))==NULL)
-   longjmp(jerr.setjmp_buffer,1);
- 
- jpeg_start_decompress(&cinfo);
-@@ -279,12 +290,33 @@
- for(f=0;f<height;f++,ptr+=width*3)
-   lineptrs[f]=ptr;
- 
--rec=cinfo.rec_outbuf_height;
--while(cinfo.output_scanline<height)
-+if(!cmyk)
-   {
--  f=height-cinfo.output_scanline;
--  jpeg_read_scanlines(&cinfo,lineptrs+cinfo.output_scanline,
--                      f>rec?rec:f);
-+  rec=cinfo.rec_outbuf_height;
-+  while(cinfo.output_scanline<height)
-+    {
-+    f=height-cinfo.output_scanline;
-+    jpeg_read_scanlines(&cinfo,lineptrs+cinfo.output_scanline,
-+                        f>rec?rec:f);
-+    }
-+  }
-+else	/* cmyk output */
-+  {
-+  int tmp;
-+
-+  ptr=image;
-+  while(cinfo.output_scanline<height)
-+    {
-+    jpeg_read_scanlines(&cinfo,&ptr,1);
-+    ptr2=ptr;
-+    for(f=0;f<width;f++,ptr+=3,ptr2+=4)
-+      {
-+      tmp=ptr2[3];
-+      ptr[0]=(tmp*ptr2[0])/255;
-+      ptr[1]=(tmp*ptr2[1])/255;
-+      ptr[2]=(tmp*ptr2[2])/255;
-+      }
-+    }
-   }
- 
- free(lineptrs);
diff --git a/media-gfx/xzgv/metadata.xml b/media-gfx/xzgv/metadata.xml
deleted file mode 100644
index 1db51a098ef5..000000000000
--- a/media-gfx/xzgv/metadata.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<herd>no-herd</herd>
-<maintainer><email>smithj@gentoo.org</email></maintainer>
-</pkgmetadata>
diff --git a/media-gfx/xzgv/xzgv-0.8-r1.ebuild b/media-gfx/xzgv/xzgv-0.8-r1.ebuild
deleted file mode 100644
index 4287276cd12a..000000000000
--- a/media-gfx/xzgv/xzgv-0.8-r1.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/xzgv/xzgv-0.8-r1.ebuild,v 1.16 2006/04/07 18:02:32 smithj Exp $
-
-inherit eutils
-
-DESCRIPTION="An X image viewer"
-HOMEPAGE="http://rus.members.beeb.net/xzgv.html"
-SRC_URI="ftp://ftp.ibiblio.org/pub/Linux/apps/graphics/viewers/X/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 ~hppa ia64 ppc ~ppc64 sparc x86"
-IUSE=""
-
-DEPEND="media-libs/libpng
-	media-libs/jpeg
-	media-libs/tiff
-	sys-libs/zlib
-	=x11-libs/gtk+-1.2*
-	>=media-libs/imlib-1.0"
-
-src_unpack() {
-	unpack ${A}
-
-	cd ${S}
-	cp config.mk config.mk.orig
-	sed -i -e "s:-O2 -Wall:${CFLAGS}:" config.mk
-
-	case "${ARCH}" in
-		"x86")
-			;;
-		*)
-			sed -i -e "s/CFLAGS+=-DINTERP_MMX/#&/" config.mk
-			;;
-	esac
-
-	# Fix for bug #74069
-	epatch ${FILESDIR}/${P}-integer-overflow-fix.diff
-}
-
-src_compile() {
-	emake || die
-}
-
-src_install() {
-	dodir /usr/bin /usr/share/info /usr/share/man/man1
-	make PREFIX=${D}/usr \
-		 SHARE_INFIX=/share \
-		 INFO_DIR_UPDATE=no \
-		 MANDIR=${D}/usr/share/man/man1 \
-	     install || die
-
-	# Fix info files
-	cd ${D}/usr/share/info
-	for i in 1 2 3
-	do
-		mv xzgv-$i.gz xzgv.info-$i.gz
-	done
-	gzip -dc xzgv.gz | \
-		sed -e 's:^xzgv-:xzgv\.info-:g' | \
-		gzip -9c > xzgv.info.gz
-	rm xzgv.gz
-
-	cd ${S}
-
-	dodoc AUTHORS ChangeLog INSTALL NEWS README* TODO
-}
diff --git a/media-gfx/xzgv/xzgv-0.8-r2.ebuild b/media-gfx/xzgv/xzgv-0.8-r2.ebuild
deleted file mode 100644
index 2993d370f5fb..000000000000
--- a/media-gfx/xzgv/xzgv-0.8-r2.ebuild
+++ /dev/null
@@ -1,70 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/xzgv/xzgv-0.8-r2.ebuild,v 1.7 2006/05/23 11:45:01 corsair Exp $
-
-inherit eutils
-
-DESCRIPTION="An X image viewer"
-HOMEPAGE="http://rus.members.beeb.net/xzgv.html"
-SRC_URI="ftp://ftp.ibiblio.org/pub/Linux/apps/graphics/viewers/X/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 ~hppa ia64 ppc ppc64 sparc x86"
-IUSE=""
-
-DEPEND="media-libs/libpng
-	media-libs/jpeg
-	media-libs/tiff
-	sys-libs/zlib
-	=x11-libs/gtk+-1.2*
-	>=media-libs/imlib-1.0"
-
-src_unpack() {
-	unpack ${A}
-
-	cd ${S}
-	cp config.mk config.mk.orig
-	sed -i -e "s:-O2 -Wall:${CFLAGS}:" config.mk
-
-	case "${ARCH}" in
-		"x86")
-			;;
-		*)
-			sed -i -e "s/CFLAGS+=-DINTERP_MMX/#&/" config.mk
-			;;
-	esac
-
-	# Fix for bug #74069
-	epatch ${FILESDIR}/${P}-integer-overflow-fix.diff
-	# Fix for bug #127008
-	epatch ${FILESDIR}/${P}-patched-cmyk-ycck-fix.diff
-}
-
-src_compile() {
-	emake || die
-}
-
-src_install() {
-	dodir /usr/bin /usr/share/info /usr/share/man/man1
-	make PREFIX=${D}/usr \
-		 SHARE_INFIX=/share \
-		 INFO_DIR_UPDATE=no \
-		 MANDIR=${D}/usr/share/man/man1 \
-	     install || die
-
-	# Fix info files
-	cd ${D}/usr/share/info
-	for i in 1 2 3
-	do
-		mv xzgv-$i.gz xzgv.info-$i.gz
-	done
-	gzip -dc xzgv.gz | \
-		sed -e 's:^xzgv-:xzgv\.info-:g' | \
-		gzip -9c > xzgv.info.gz
-	rm xzgv.gz
-
-	cd ${S}
-
-	dodoc AUTHORS ChangeLog INSTALL NEWS README* TODO
-}