remove old

Package-Manager: portage-2.2_rc67/cvs/Linux x86_64

5 files changed, 17 insertions, 269 deletions

diff --git a/dev-ml/camlimages/ChangeLog b/dev-ml/camlimages/ChangeLog
index 0308fb22bd47..1360427422ef 100644
--- a/dev-ml/camlimages/ChangeLog
+++ b/dev-ml/camlimages/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-ml/camlimages
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ml/camlimages/ChangeLog,v 1.27 2010/04/15 14:47:40 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ml/camlimages/ChangeLog,v 1.28 2010/04/24 12:20:50 aballier Exp $
+
+  24 Apr 2010; Alexis Ballier <aballier@gentoo.org>
+  -camlimages-3.0.1.ebuild, -files/camlimages-3.0.1-CVE-2009-2295.patch,
+  -files/camlimages-3.0.1-lablgtk.patch:
+  remove old
 
   15 Apr 2010; Brent Baude <ranger@gentoo.org> camlimages-3.0.2.ebuild:
   Marking camlimages-3.0.2 ppc for sec bug 290222
diff --git a/dev-ml/camlimages/Manifest b/dev-ml/camlimages/Manifest
index 94eecb28ad73..9e5a07388503 100644
--- a/dev-ml/camlimages/Manifest
+++ b/dev-ml/camlimages/Manifest
@@ -1,12 +1,18 @@
-AUX camlimages-3.0.1-CVE-2009-2295.patch 4347 RMD160 e383255355958e23ccf1136eb2482868fbba403c SHA1 0285ff2fb792946443ab9e25d83472dc6a51640d SHA256 5b8c460ee211169bd65e42469a7ed3428dc4ace6a76ecd67c2c99dcf1d392ac0
-AUX camlimages-3.0.1-lablgtk.patch 1375 RMD160 537f4e3008388fad9ffcd05f8b3ddfe171940a73 SHA1 053cf492697b65532cf06d2da702482d1acbb8c9 SHA256 413efcc6b767966ea2c6abb4219f821574987bb8094a615c7575e60e7a617aea
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX camlimages-3.0.2-annot.patch 386 RMD160 05735cb525f633a67115987cd0f343811d6f035b SHA1 58c97e7dea986ef1ae9433f4fcfa9dc648507a57 SHA256 f3c4a883b344f0a54dac5ffc34341e842f76997d7d36e1e18642011e47a8053b
 AUX camlimages-3.0.2-noxpm.patch 444 RMD160 cf4db800eb5c6316f0047a1b6db143b82d0b6077 SHA1 837ebb781bd5810b4c57f431915eb321a364699b SHA256 7fa917003af4bd2b541499d5d724e5e5f8d6ebcf280361544ea680394115de9f
 AUX camlimages-3.0.2-ocaml-autoconf11.patch 355 RMD160 4775a64d3021dfb4268aede3a121cf78eccfcf65 SHA1 ea69cd1dfb5aca48203584020bab3a948c896087 SHA256 b02c43105ffc90144c66dcef68f8c65dfdc39d0ba39adc8976f05d7f0d7b9668
 AUX camlimages-3.0.2-tiffread-CVE-2009-3296.patch 995 RMD160 ccf0d82e20c4c11ebe38e7331e8fcee751a78eaa SHA1 71c43011cf3005787678e0885b4904f55473ede1 SHA256 1db69c1993cba70226dfd4e179e9f4754d3d43fcb571e319d97accd91947493f
-DIST camlimages-3.0.1.tar.gz 1320064 RMD160 fcc2be8bd98bf06a268d7247118d8f4f4bcbacb5 SHA1 ca53397c76fa82da4bfa1ad0650032483a352d0c SHA256 d4e0edc9f11d5997166f5cd08b0e043fa7b917bd0d271f6591c24220ae6b3521
 DIST camlimages-3.0.2.tgz 1429138 RMD160 f3b741a30afc23f5d68747830bcd192402514a50 SHA1 7e33e0de1e1afb3b370140fe9c3a610a32bfb9f5 SHA256 db5aec421c89bea7b1bf55df6a674a0a6ac245f89c220c818e2e5d83f623662c
-EBUILD camlimages-3.0.1.ebuild 1334 RMD160 2920462ba7081710b889c6b63ec6a8975e261806 SHA1 64b8af161384e3246a5c5fb15cd4e648758a0ced SHA256 731d6f76cf742fed67c4ce82c5a2ff4c33b2b52870b06f5d7720b164d51df3a6
 EBUILD camlimages-3.0.2.ebuild 1478 RMD160 1727286476f82e2e4202b544b7697ccc23c3b679 SHA1 e7dd6e5cb347d487d89623474bf5d9aafde225e5 SHA256 1d91b2239bd55de7b170f03ac006228574e7d144681d50ddd5cc22ee906d0e0f
-MISC ChangeLog 4716 RMD160 31d2382cd11e2325e22933305f36351a308a4d4e SHA1 de0a143c28d6a39021dc6586217cd53bf1588adf SHA256 24b4f407e3d8030fac1a18b4f377a6417e0f599ede1b43564783cdcf09e038dd
+MISC ChangeLog 4898 RMD160 72b701f8d8cbf29d9a5ba872928ca0e3eccb72e5 SHA1 8fdd2d15b176563e205f59e7043c394b35292b73 SHA256 91320b8493c35aa4dd604d3e6b14c04fc2ee8e7bf96803cd6632dc5534ee535c
 MISC metadata.xml 250 RMD160 598e56c53e73f20d9f66aa719a344dd151d72e00 SHA1 eb18ff902a727aa9352e813aacb53831c43a36f0 SHA256 5e4fa04a77d47a0f481ef815f7a82527865397a89ffd15b3288c7d9559644b42
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.15 (GNU/Linux)
+
+iEYEARECAAYFAkvS4icACgkQvFcC4BYPU0oEbQCcDYu3dFbXeK+e6Ve0XUCuhylG
+dNwAn3VBbf3TlkgOxlENJgJq2qooyQKX
+=1LBY
+-----END PGP SIGNATURE-----
diff --git a/dev-ml/camlimages/camlimages-3.0.1.ebuild b/dev-ml/camlimages/camlimages-3.0.1.ebuild
deleted file mode 100644
index 31a37855fc18..000000000000
--- a/dev-ml/camlimages/camlimages-3.0.1.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ml/camlimages/camlimages-3.0.1.ebuild,v 1.4 2009/12/26 17:34:19 pva Exp $
-
-EAPI=2
-
-inherit eutils
-
-IUSE="doc gif gs gtk jpeg tiff truetype xpm"
-
-DESCRIPTION="An image manipulation library for ocaml"
-HOMEPAGE="http://gallium.inria.fr/camlimages/"
-SRC_URI="http://gallium.inria.fr/camlimages/${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~amd64 ppc x86"
-
-RDEPEND=">=dev-lang/ocaml-3.10.2[ocamlopt]
-	gif? ( media-libs/giflib )
-	gtk? ( dev-ml/lablgtk )
-	gs? ( app-text/ghostscript-gpl )
-	jpeg? ( media-libs/jpeg )
-	tiff? ( media-libs/tiff )
-	media-libs/libpng
-	truetype? ( >=media-libs/freetype-2 )
-	xpm? ( x11-libs/libXpm )
-	"
-DEPEND="${DEPEND}
-	dev-ml/findlib"
-
-src_prepare() {
-	epatch "${FILESDIR}/${P}-lablgtk.patch"
-	epatch "${FILESDIR}/${P}-CVE-2009-2295.patch"
-}
-
-src_configure() {
-	econf \
-		$(use_with gif) \
-		$(use_with gs) \
-		$(use_with gtk lablgtk2) \
-		--without-lablgtk \
-		$(use_with jpeg) \
-		--with-png \
-		$(use_with tiff) \
-		$(use_with truetype freetype) \
-		$(use_with xpm)
-}
-
-src_compile() {
-	emake -j1 || die
-}
-
-src_install() {
-	emake DESTDIR="${D}" ocamlsitelibdir="$(ocamlfind printconf destdir)/${PN}" install || die
-	dodoc README
-	use doc && dohtml doc/*
-}
diff --git a/dev-ml/camlimages/files/camlimages-3.0.1-CVE-2009-2295.patch b/dev-ml/camlimages/files/camlimages-3.0.1-CVE-2009-2295.patch
deleted file mode 100644
index c94b9b11672e..000000000000
--- a/dev-ml/camlimages/files/camlimages-3.0.1-CVE-2009-2295.patch
+++ /dev/null
@@ -1,154 +0,0 @@
-Index: src/gifread.c
-===================================================================
---- src/gifread.c.orig
-+++ src/gifread.c
-@@ -20,6 +20,8 @@
- #include <caml/memory.h>
- #include <caml/fail.h>
- 
-+#include "oversized.h"
-+
- #include <stdio.h>
- #include <string.h>
- 
-@@ -191,6 +193,9 @@ value dGifGetLine( value hdl )
- 
-   GifFileType *GifFile = (GifFileType*) hdl;
- 
-+  if( oversized( GifFile->Image.Width, sizeof(GifPixelType) ) ){
-+    failwith_oversized("gif");
-+  }
-   buf = alloc_string( GifFile->Image.Width * sizeof(GifPixelType) ); 
- 
-   if( DGifGetLine(GifFile, String_val(buf), GifFile->Image.Width ) 
-Index: src/jpegread.c
-===================================================================
---- src/jpegread.c.orig
-+++ src/jpegread.c
-@@ -20,6 +20,8 @@
- #include <caml/memory.h>
- #include <caml/fail.h>
- 
-+#include "oversized.h"
-+
- #include <stdio.h>
- #include <string.h>
- 
-@@ -156,6 +158,12 @@ read_JPEG_file (value name)
-    */ 
-   /* JSAMPLEs per row in output buffer */
- 
-+  if( oversized(cinfo.output_width, cinfo.output_components) ){
-+    jpeg_destroy_decompress(&cinfo);
-+    fclose(infile);
-+    failwith_oversized("jpeg");
-+  }
-+
-   row_stride = cinfo.output_width * cinfo.output_components;
- 
-   /* Make a one-row-high sample array that will go away when done with image */
-@@ -177,6 +185,12 @@ read_JPEG_file (value name)
-     jpeg_read_scanlines(&cinfo, buffer + cinfo.output_scanline, 1); 
-   }
- 
-+  if( oversized(row_stride, cinfo.output_height) ){
-+    jpeg_destroy_decompress(&cinfo);
-+    fclose(infile);
-+    failwith_oversized("jpeg");
-+  }
-+
-   {
-     CAMLlocalN(r,3);
-     r[0] = Val_int(cinfo.output_width);
-@@ -352,6 +366,7 @@ value open_jpeg_file_for_read_start( jpe
- 
-   { 
-     CAMLlocalN(r,3);
-+    // CR jfuruse: integer overflow
-     r[0] = Val_int(cinfop->output_width);
-     r[1] = Val_int(cinfop->output_height);
-     r[2] = alloc_tuple(3);
-Index: src/oversized.h
-===================================================================
---- /dev/null
-+++ src/oversized.h
-@@ -0,0 +1,9 @@
-+#include <limits.h>
-+/* Test if x or y are negative, or if multiplying x * y would cause an
-+ * arithmetic overflow.
-+ */
-+#define oversized(x, y)						\
-+  ((x) < 0 || (y) < 0 || ((y) != 0 && (x) > INT_MAX / (y)))
-+
-+#define failwith_oversized(lib) \
-+  failwith("#lib error: image contains oversized or bogus width and height");
-Index: src/pngread.c
-===================================================================
---- src/pngread.c.orig
-+++ src/pngread.c
-@@ -17,6 +17,8 @@
- 
- #include <png.h>
- 
-+#include "oversized.h"
-+
- #include <caml/mlvalues.h>
- #include <caml/alloc.h>
- #include <caml/memory.h>
-@@ -81,6 +83,9 @@ value read_png_file_as_rgb24( name )
-   png_get_IHDR(png_ptr, info_ptr, &width, &height, &bit_depth, &color_type,
- 	       &interlace_type, NULL, NULL);
- 
-+  if (oversized (width, height))
-+    failwith_oversized("png");
-+
-   if ( color_type == PNG_COLOR_TYPE_GRAY ||
-        color_type == PNG_COLOR_TYPE_GRAY_ALPHA ) { 
-     png_set_gray_to_rgb(png_ptr); 
-@@ -102,10 +107,16 @@ value read_png_file_as_rgb24( name )
- 
-   rowbytes = png_get_rowbytes(png_ptr, info_ptr);
- 
-+  if (oversized (rowbytes, height))
-+    failwith_oversized("png");
-+
-   {
-     int i;
-     png_bytep *row_pointers;
- 
-+    if (oversized (sizeof (png_bytep), height))
-+      failwith_oversized("png");
-+
-     row_pointers = (png_bytep*) stat_alloc(sizeof(png_bytep) * height);
- 
-     res = alloc_tuple(3);
-@@ -235,6 +246,9 @@ value read_png_file( name )
-   png_get_IHDR(png_ptr, info_ptr, &width, &height, &bit_depth, &color_type,
- 	       &interlace_type, NULL, NULL);
- 
-+  if (oversized (width, height))
-+    failwith_oversized("png");
-+
-   if ( color_type == PNG_COLOR_TYPE_GRAY ||
-        color_type == PNG_COLOR_TYPE_GRAY_ALPHA ) { 
-     png_set_gray_to_rgb(png_ptr); 
-@@ -251,6 +265,9 @@ value read_png_file( name )
- 
-   rowbytes = png_get_rowbytes(png_ptr, info_ptr);
- 
-+  if (oversized (rowbytes, height))
-+    failwith_oversized("png");
-+
- /*
- fprintf(stderr, "pngread.c: actual loading\n"); fflush(stderr);
- */
-@@ -259,6 +276,9 @@ fprintf(stderr, "pngread.c: actual loadi
-     png_bytep *row_pointers;
-     char mesg[256];
-  
-+    if (oversized (sizeof (png_bytep), height))
-+      failwith_oversized("png");
-+
-     row_pointers = (png_bytep*)stat_alloc(sizeof(png_bytep) * height);
-     res = alloc_tuple(3);
- 
diff --git a/dev-ml/camlimages/files/camlimages-3.0.1-lablgtk.patch b/dev-ml/camlimages/files/camlimages-3.0.1-lablgtk.patch
deleted file mode 100644
index 1b29dd509ed2..000000000000
--- a/dev-ml/camlimages/files/camlimages-3.0.1-lablgtk.patch
+++ /dev/null
@@ -1,51 +0,0 @@
-Index: camlimages-3.0.1/examples/liv/liv.ml
-===================================================================
---- camlimages-3.0.1.orig/examples/liv/liv.ml
-+++ camlimages-3.0.1/examples/liv/liv.ml
-@@ -12,6 +12,10 @@
- 
- (* $Id: camlimages-3.0.1-lablgtk.patch,v 1.1 2009/07/24 20:51:30 aballier Exp $ *)
- 
-+
-+module D = Display
-+open D
-+
- open Images;;
- open OImages;;
- 
-@@ -21,14 +25,13 @@ open GMain;;
- 
- open Livmisc;;
- open Gui;;
--open Display;;
- open Tout;;
- 
- open Gc;;
- 
- exception Skipped;;
- 
--let base_filters = ref ([] : Display.filter list);;
-+let base_filters = ref ([] : D.filter list);;
- 
- let r = Gc.get () in
- r.max_overhead <- 0; Gc.set r;
-@@ -52,15 +55,15 @@ Arg.parse [
-   "-root",
-     Arg.String
-       (function
--       | "center" -> Display.root_mode := `CENTER
--       | "random" -> Display.root_mode := `RANDOM
-+       | "center" -> D.root_mode := `CENTER
-+       | "random" -> D.root_mode := `RANDOM
-        | _ -> raise (Failure "root mode")),
-     ": on root [center|random]";
-   "-transition",
-     Arg.String
-       (function
--       | "myst" -> Display.transition := `MYST
--       | "transparent" -> Display.transition := `TRANSPARENT
-+       | "myst" -> D.transition := `MYST
-+       | "transparent" -> D.transition := `TRANSPARENT
-        | _ -> raise (Failure "transition")),
-     ": transition [myst|transparent]";
-   "-transparentborder",