remove old

Package-Manager: portage-2.2.0_alpha163/cvs/Linux x86_64
Manifest-Sign-Key: 0x160F534A

8 files changed, 13 insertions, 209 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/Manifest b/dev-ml/camlimages/Manifest
index 9b4d8d18e645..c8fd74419dd3 100644
--- a/dev-ml/camlimages/Manifest
+++ b/dev-ml/camlimages/Manifest
@@ -1,22 +1,15 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-AUX camlimages-3.0.2-annot.patch 386 SHA256 f3c4a883b344f0a54dac5ffc34341e842f76997d7d36e1e18642011e47a8053b SHA512 db28b23e970bd58038c93169a369a28aa4204c2c039c839b65c13fdfdc17c4ceec92647b285a7daecf826815764a7f717ee2e6fc3cb7a136e8cb9e19e59a6ec7 WHIRLPOOL 90faa835ac217cf69b5f24599c629aa322e3f63f6d0b10c5a6e203c167104955b429c6b904d53909c075da67cc9732f22f97d8b8d687d1ca6719558e014d1138
-AUX camlimages-3.0.2-libpng15.patch 2392 SHA256 771d38f136cf493938744eca8e5aaf0761778ce1fce58ae24d91455518e3ee29 SHA512 dcbdbb3765050b4a21614c157ff8edc3cfc727a5acd4f4bda27639adef38945bec904fda7063357432ddc9dab1028218c5fc4347ab6b020701ef027319391531 WHIRLPOOL 6a55b0f63111703413655516a9513c643f6c9738bbf5006467ae84ed5a077c7f0c7205abe0620842ff2a3be5c74edd52c4ab599afb277fcff664751173ed2342
-AUX camlimages-3.0.2-noxpm.patch 444 SHA256 7fa917003af4bd2b541499d5d724e5e5f8d6ebcf280361544ea680394115de9f SHA512 cac1e6979927768d868cd808997df38e0313c30bf3c2ab2ad657fedc2410153b514361dbdeaf5398e26b2079f6650a6d81cb082efc3b0dcfa9bf8fca09ebabcc WHIRLPOOL c8f5420add139906ca8d4d09d28456a725aaf8c5b2d02fd3ff7053e715ed5631793a474c83e154ec20bbb11fcef206a3a53a1bc8b3ec9b92a0abfdd76f48144e
-AUX camlimages-3.0.2-ocaml-autoconf11.patch 355 SHA256 b02c43105ffc90144c66dcef68f8c65dfdc39d0ba39adc8976f05d7f0d7b9668 SHA512 a102ba74b35912ad8f6cf0a7c10a1a9317328f08118d4ffa1a46a92e84eaacf02f910cb791c8f838a7d3f8c3cf4bca46b8ac03be11b874a6e08cc0a9de38ecec WHIRLPOOL 96d8e085e3dfc1cb9523878aa8e66abc93078d77316a1bd62dd68da15d9f311ea8bcc8828d3c5ffaa1aeceff55160e5435df492fcf82d423ea181e0601541a8a
-AUX camlimages-3.0.2-tiffread-CVE-2009-3296.patch 995 SHA256 1db69c1993cba70226dfd4e179e9f4754d3d43fcb571e319d97accd91947493f SHA512 6c5985494a233964556b716f20309bffcac05ab19548bb6ea84750dbca7a255298aaa7176aa99ac5745747da741af14b883670df03fcc409281e44f9c4352900 WHIRLPOOL cd942923c48dff67aa7b26627af2e4a1b3ececd63daa6cc367d403b42838c68bfb694a5b99d2b3385f1a37e772d146034058079d07d4919ffd389c4aef6f09b3
 AUX camlimages-4.0.1-libpng15.patch 2354 SHA256 2a7852d67eb31055aff8225666530d808da688f98560e3c0853fc475a27dc29f SHA512 2c4e0ec272cef021c9759e0d3934cd8363d02a2d82bc3c8ec2c8c7a96e1ca426005d342432412fc62b89f269b6b221b402e48e8dbdffce4b5da608ddb3d9c9da WHIRLPOOL b234a0e4200ca50b83e19f41a4b9c342d395a38c4c79edb5aeddfee8427e900fb8c05dea408bcd23a293924edebacdea468838b1d91d2c9426ddf6735465754a
-DIST camlimages-3.0.2.tgz 1429138 SHA256 db5aec421c89bea7b1bf55df6a674a0a6ac245f89c220c818e2e5d83f623662c SHA512 f7099d1cc40af1b3b399b375e1cf111dcdb4f6b060a86893bc8b251bdd011b766ece9b727b463d76da5f5075462a7c3e38138b4ec2706db3a87a0240aee17753 WHIRLPOOL 3341761d179f39cdaa85e91420546d1c36e807379252f683c1716ac6d1598d5abd9b7f46d4f7f6e2d90a4066c66154d75635df0552792eafeddbb87a3db34cb2
 DIST camlimages-4.0.1.tar.bz2 2010729 SHA256 b6a5e79abcfba1316a516f2e0290e6f06c90fa1ed94d8dcd5533a2e3d51c0c89 SHA512 1d80e6b1ab7f48e4219b7bcf6287b8403b6ad56f88d39fb8d9403b5e6f8c4b346c98112874094824ed001c71605e73fd0f4ca044669a07bcf6965619c5ff4811 WHIRLPOOL 22107c7d96995e0e2d68688c5eaa502db21e493a59a9361a59f413fa27349a3f82186d21ea4e17df12bb428d7316c5c4ccaedf0bb03d192671e187b1e5ef6410
-EBUILD camlimages-3.0.2.ebuild 1556 SHA256 aafb631bad5235376c0133ea2acd4726f70ef0d31a4f58afb1fb8f0018ec9c1e SHA512 9dba7d717a171a74059809ae6dd0039d240d637d06bcf61eb6a43a887a648fed1dad0bb9292968223b85ddb971dadb92bcecbe8060b1348e90bf57f2b02c394c WHIRLPOOL dc518c17d2ff55657f56ebc2809244bab2c7d72df61a83ff3aab56996c50b260f0b29209b0ebbd5874408c650c905085d329bf9ead5851c864fbd758663c3a31
 EBUILD camlimages-4.0.1.ebuild 2071 SHA256 6fc14fce88e0596950a71024e6279dbadc89beef9bfdbe05d6beca2e9f388338 SHA512 cacad6680a1d8ec9c4e15c80a13c61786fd42d7494fef3f405609588392ef7537281c69d9bcd1e583ff6cbe4ac68608c972610fc9617fc83e276066572419da7 WHIRLPOOL e57de5442f40e1f205a80ca1e4a138f0517e6939855f8be34079003e05dbe6b0503549ab6a644688b9a6148386c212abe19d65c7b72d6311479ed77423339401
-MISC ChangeLog 5729 SHA256 4025ec6e2d69dfe7773d17a7e1e4970853b1155808bea174b7f33516fd964f5d SHA512 763837cbe83fb22582a88f29245f87519025fe8d3be56a0af1a119c39d70d80ad726ba87fcf2c823d126c9f2b5f1a66225cab2e16cfd60c135b21a074865149a WHIRLPOOL bdf0eb4d7e126bc41b7aeac02ccf77bdc5efdd610a1afbe90320eb0c9ca89bf11809d1a6ea7e0834fdb7f0f179ed6941b2066ca3af443eb6eac9ef9f8801bf66
+MISC ChangeLog 6050 SHA256 e7df4dd6630946b896a8c2dfb2c5203be9c74a96cfe93b27c4f676ad76d78e30 SHA512 0baf6db5a6f9b874b224955150dd693c72a000e32f295a67a3252fb84921541db5b2036f3f06ce9d98ba519e0c053623cd61987056a2b7390150703d89c42fae WHIRLPOOL e484284007e395569b35096befe1a956e7395a5195c7a52442af714a66cc878ee6bf1dd717960f0066543dc171b810643c0402038fd432e5c5b2aaff44750af6
 MISC metadata.xml 155 SHA256 118048376ebb76f57628b0819f3de4856e73959c2578c88715d37ea2d1e0af81 SHA512 a525f91dd332fc144c42d1437bdae9c889cbcece6294c2d2f4baf6a532ac2e13492736e75b41c83fac31033a9ae53c37deb96286a5ab8575611136617640952c WHIRLPOOL 71a9c7aaf4e268c65c0d1e30e343911ccbcf99ef8c23773abc2b3af8d58d9f7d5c09632805d8ba9050c09eef629f2b340db9eb9ba8b9cd2e5d655fce3f91fcb6
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iF4EAREIAAYFAlA1cUYACgkQknrdDGLu8JAZsAD+LW9YNwqD99a2O4gs/T/0610K
-l3hNa5i774/SNtEDVioA/iwAcPVkH3QFxBLukABEzmOXTR778NhYiT//TXWOIupJ
-=sZpC
+iEYEAREIAAYFAlEiRLgACgkQvFcC4BYPU0q8zACfda0yH0020WkAf07hVnFTTBGF
+axIAoI0R+cggLoXkmXDy3y2xN5TfMzwO
+=2V9k
 -----END PGP SIGNATURE-----
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");