remove old

(Portage version: 2.2.0_alpha163/cvs/Linux x86_64, signed Manifest commit with key 160F534A)

7 files changed, 9 insertions, 198 deletions

diff --git a/dev-ml/camlimages/ChangeLog b/dev-ml/camlimages/ChangeLog
index 351b6a1ba54e..6312412d2b2d 100644
--- a/dev-ml/camlimages/ChangeLog
+++ b/dev-ml/camlimages/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-ml/camlimages
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ml/camlimages/ChangeLog,v 1.34 2012/08/22 23:54:41 xmw Exp $
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-ml/camlimages/ChangeLog,v 1.35 2013/02/18 15:11:51 aballier Exp $
+
+  18 Feb 2013; Alexis Ballier <aballier@gentoo.org> -camlimages-3.0.2.ebuild,
+  -files/camlimages-3.0.2-annot.patch, -files/camlimages-3.0.2-libpng15.patch,
+  -files/camlimages-3.0.2-noxpm.patch,
+  -files/camlimages-3.0.2-ocaml-autoconf11.patch,
+  -files/camlimages-3.0.2-tiffread-CVE-2009-3296.patch:
+  remove old
 
   22 Aug 2012; Michael Weber <xmw@gentoo.org> camlimages-4.0.1.ebuild:
   ppc stable (bug 416527).
diff --git a/dev-ml/camlimages/camlimages-3.0.2.ebuild b/dev-ml/camlimages/camlimages-3.0.2.ebuild
deleted file mode 100644
index dc9c258dbc8d..000000000000
--- a/dev-ml/camlimages/camlimages-3.0.2.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ml/camlimages/camlimages-3.0.2.ebuild,v 1.10 2012/06/16 16:37:51 ssuominen Exp $
-
-EAPI=2
-
-inherit eutils autotools
-
-IUSE="doc gif gtk jpeg postscript tiff truetype xpm"
-
-DESCRIPTION="An image manipulation library for ocaml"
-HOMEPAGE="http://cristal.inria.fr/camlimages/"
-SRC_URI="http://cristal.inria.fr/camlimages/${P}.tgz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~amd64 ppc x86"
-
-RDEPEND=">=dev-lang/ocaml-3.10.2[X,ocamlopt]
-	gif? ( media-libs/giflib )
-	gtk? ( dev-ml/lablgtk )
-	jpeg? ( virtual/jpeg )
-	postscript? ( app-text/ghostscript-gpl )
-	tiff? ( media-libs/tiff )
-	>=media-libs/libpng-1.4:0
-	truetype? ( >=media-libs/freetype-2 )
-	xpm? ( x11-libs/libXpm )
-	"
-DEPEND="${DEPEND}
-	dev-ml/ocaml-autoconf
-	dev-ml/findlib"
-
-src_prepare() {
-	epatch "${FILESDIR}/${P}-tiffread-CVE-2009-3296.patch"
-	epatch "${FILESDIR}/${P}-ocaml-autoconf11.patch"
-	epatch "${FILESDIR}/${P}-annot.patch"
-	epatch "${FILESDIR}/${P}-noxpm.patch"
-	epatch "${FILESDIR}/${P}-libpng15.patch"
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		$(use_with gif) \
-		$(use_with postscript 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.2-annot.patch b/dev-ml/camlimages/files/camlimages-3.0.2-annot.patch
deleted file mode 100644
index b34962f12ce2..000000000000
--- a/dev-ml/camlimages/files/camlimages-3.0.2-annot.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: camlimages-3.0.2/src/Makefile.am
-===================================================================
---- camlimages-3.0.2.orig/src/Makefile.am
-+++ camlimages-3.0.2/src/Makefile.am
-@@ -35,7 +35,7 @@ endif
- 
- BUILT_SOURCES = $(OCAMLBUILTSOURCES)
- 
--OCAMLCFLAGS	= -warn-error A -annot
-+OCAMLCFLAGS	= -warn-error A
- LINKFLAGS	=	 
- AM_OCAMLCFLAGS	=
- AM_CFLAGS	= -I .. -DHAVE_CONFIG_H
diff --git a/dev-ml/camlimages/files/camlimages-3.0.2-libpng15.patch b/dev-ml/camlimages/files/camlimages-3.0.2-libpng15.patch
deleted file mode 100644
index 366a14c0de9a..000000000000
--- a/dev-ml/camlimages/files/camlimages-3.0.2-libpng15.patch
+++ /dev/null
@@ -1,62 +0,0 @@
-Index: camlimages-3.0.2/src/pngread.c
-===================================================================
---- camlimages-3.0.2.orig/src/pngread.c
-+++ camlimages-3.0.2/src/pngread.c
-@@ -69,7 +69,7 @@ value read_png_file_as_rgb24( name )
-   }
- 
-   /* error handling */
--  if (setjmp(png_ptr->jmpbuf)) {
-+  if (setjmp(png_jmpbuf(png_ptr))) {
-     /* Free all of the memory associated with the png_ptr and info_ptr */
-     png_destroy_read_struct(&png_ptr, &info_ptr, (png_infopp)NULL);
-     fclose(fp);
-@@ -134,7 +134,7 @@ value read_png_file_as_rgb24( name )
-     png_set_rows(png_ptr, info_ptr, row_pointers);
- 
-     /* Later, we can return something */
--    if (setjmp(png_ptr->jmpbuf)) {
-+    if (setjmp(png_jmpbuf(png_ptr))) {
-       /* Free all of the memory associated with the png_ptr and info_ptr */
-       png_destroy_read_struct(&png_ptr, &info_ptr, (png_infopp)NULL);
-       fclose(fp);
-@@ -243,7 +243,7 @@ value read_png_file( name )
-   }
- 
-   /* error handling */
--  if (setjmp(png_ptr->jmpbuf)) {
-+  if (setjmp(png_jmpbuf(png_ptr))) {
-     /* Free all of the memory associated with the png_ptr and info_ptr */
-     png_destroy_read_struct(&png_ptr, &info_ptr, (png_infopp)NULL);
-     fclose(fp);
-@@ -302,7 +302,7 @@ value read_png_file( name )
-     png_set_rows(png_ptr, info_ptr, row_pointers);
- 
-     /* Later, we can return something */
--    if (setjmp(png_ptr->jmpbuf)) {
-+    if (setjmp(png_jmpbuf(png_ptr))) {
-       /* Free all of the memory associated with the png_ptr and info_ptr */
-       png_destroy_read_struct(&png_ptr, &info_ptr, (png_infopp)NULL);
-       fclose(fp);
-Index: camlimages-3.0.2/src/pngwrite.c
-===================================================================
---- camlimages-3.0.2.orig/src/pngwrite.c
-+++ camlimages-3.0.2/src/pngwrite.c
-@@ -62,7 +62,7 @@ value write_png_file_rgb( name, buffer,
-   }
- 
-   /* error handling */
--  if (setjmp(png_ptr->jmpbuf)) {
-+  if (setjmp(png_jmpbuf(png_ptr))) {
-     /* Free all of the memory associated with the png_ptr and info_ptr */
-     png_destroy_write_struct(&png_ptr, &info_ptr);
-     fclose(fp);
-@@ -171,7 +171,7 @@ value write_png_file_index( name, buffer
-   }
- 
-   /* error handling */
--  if (setjmp(png_ptr->jmpbuf)) {
-+  if (setjmp(png_jmpbuf(png_ptr))) {
-     /* Free all of the memory associated with the png_ptr and info_ptr */
-     png_destroy_write_struct(&png_ptr, &info_ptr);
-     fclose(fp);
diff --git a/dev-ml/camlimages/files/camlimages-3.0.2-noxpm.patch b/dev-ml/camlimages/files/camlimages-3.0.2-noxpm.patch
deleted file mode 100644
index 8c30167febe8..000000000000
--- a/dev-ml/camlimages/files/camlimages-3.0.2-noxpm.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-Index: camlimages-3.0.2/src/Makefile.am
-===================================================================
---- camlimages-3.0.2.orig/src/Makefile.am
-+++ camlimages-3.0.2/src/Makefile.am
-@@ -185,7 +185,10 @@ CSOURCES += ftintf.c
- AM_CFLAGS += $(INCFREETYPE)
- endif
- 
--ocamlsitelib_DATA += units.cmi oXpm.cmi
-+ocamlsitelib_DATA += units.cmi
-+if HAVE_XPM
-+ocamlsitelib_DATA += oXpm.cmi
-+endif
- if HAVE_TIFF
- ocamlsitelib_DATA += oTiff.cmi
- endif
diff --git a/dev-ml/camlimages/files/camlimages-3.0.2-ocaml-autoconf11.patch b/dev-ml/camlimages/files/camlimages-3.0.2-ocaml-autoconf11.patch
deleted file mode 100644
index a9e11d8ea4d2..000000000000
--- a/dev-ml/camlimages/files/camlimages-3.0.2-ocaml-autoconf11.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-Index: camlimages-3.0.2/configure.ac
-===================================================================
---- camlimages-3.0.2.orig/configure.ac
-+++ camlimages-3.0.2/configure.ac
-@@ -5,7 +5,6 @@ AM_INIT_AUTOMAKE([foreign])
- 
- # Check ocaml
- AC_PROG_OCAML([3.08])
--AC_PROG_OCAML_TOOL(OCAMLMKLIB, ocamlmklib)
- AC_SUBST(OCAMLLIB)
- 
- # Check versions to build
diff --git a/dev-ml/camlimages/files/camlimages-3.0.2-tiffread-CVE-2009-3296.patch b/dev-ml/camlimages/files/camlimages-3.0.2-tiffread-CVE-2009-3296.patch
deleted file mode 100644
index 78b2bca85bb0..000000000000
--- a/dev-ml/camlimages/files/camlimages-3.0.2-tiffread-CVE-2009-3296.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## tiffread.dpatch by Mehdi Dogguy <mehdi@debian.org>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Fix integer overflows in tiffread.c (CVE-2009-3296)
-
-@DPATCH@
-diff -urNad camlimages~/src/tiffread.c camlimages/src/tiffread.c
---- camlimages~/src/tiffread.c	2009-10-31 21:47:57.000000000 +0100
-+++ camlimages/src/tiffread.c	2009-11-01 13:51:58.000000000 +0100
-@@ -21,6 +21,8 @@
- #include <caml/memory.h>
- #include <caml/fail.h>
- 
-+#include "oversized.h"
-+
- /* These are defined in caml/config.h */
- #define int16 int16tiff
- #define uint16 uint16tiff
-@@ -64,6 +66,10 @@
-     TIFFGetField(tif, TIFFTAG_YRESOLUTION, &yres);
-     TIFFGetField(tif, TIFFTAG_PHOTOMETRIC, &photometric);
- 
-+    if (oversized (imagewidth, imagelength)) {
-+      failwith_oversized("tiff");
-+    }
-+
-     if( imagesample == 3 && photometric == PHOTOMETRIC_RGB ){
-       if( imagebits != 8 ){
- 	failwith("Sorry, tiff rgb file must be 24bit-color");