remove old

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

6 files changed, 10 insertions, 153 deletions

diff --git a/dev-ml/camlimages/ChangeLog b/dev-ml/camlimages/ChangeLog
index 2d1d53a2f0c3..42f2b6464ff2 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.24 2010/04/12 06:16:54 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ml/camlimages/ChangeLog,v 1.25 2010/04/12 06:21:42 aballier Exp $
+
+  12 Apr 2010; Alexis Ballier <aballier@gentoo.org>
+  -camlimages-2.20-r2.ebuild, -files/camlimages-2.20-ocaml-3.09.diff,
+  -files/META, -files/META.camlimages.in:
+  remove old
 
   12 Apr 2010; Alexis Ballier <aballier@gentoo.org> camlimages-3.0.2.ebuild,
   +files/camlimages-3.0.2-noxpm.patch:
diff --git a/dev-ml/camlimages/Manifest b/dev-ml/camlimages/Manifest
index 42e90e9eeb9f..50759a178b9d 100644
--- a/dev-ml/camlimages/Manifest
+++ b/dev-ml/camlimages/Manifest
@@ -1,27 +1,22 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-AUX META 143 RMD160 dedf7cbe1a4511c1791ae536bfd078c47c6db69b SHA1 e7777bcbc6ba245734131eb1ee9645269db7338e SHA256 2a934de5f1649633f656014b95f342029de034fd3c7a7057d6d3164201b97579
-AUX META.camlimages.in 850 RMD160 25b79bc73cdc1010ee62efe8f0ce5ae557f6cad7 SHA1 8f77fbe9f52b44bc054876040e58bc803ca54e5a SHA256 0303478d950eb12bcbc9dbab8b315830d9b60a757fb9c770fe505b609a103a66
-AUX camlimages-2.20-ocaml-3.09.diff 385 RMD160 b235b80d0e972a9c05c1f6acbdff335775c0a4e5 SHA1 c53ec44ab5c363b085eeca099d6cda7349b14a8b SHA256 5666ac67637d63fd40248ae2ead4ab6a9ab8b96139a670926ba28f186ed5027f
 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
 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-2.2.tgz 1385525 RMD160 0f108ef3da565aeb0ab10d00e45819399af36d8c SHA1 bc0062739be5ca9236f28145f17f840bf3f295ee SHA256 9b8861d7b8c6752ad33ef2af5c486efa626b19ad9ea190641a736384629f1026
 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-2.20-r2.ebuild 2060 RMD160 a6919fbe0b600dea4e80befd52cc4378c60743e4 SHA1 b33aefe88e241fbc4ea27eb92de1b0ae25cacbca SHA256 2fe138f59365de3e9be98da58fb4cb838eb2dcc256b4bce29f977c6aa035fa1f
 EBUILD camlimages-3.0.1.ebuild 1334 RMD160 2920462ba7081710b889c6b63ec6a8975e261806 SHA1 64b8af161384e3246a5c5fb15cd4e648758a0ced SHA256 731d6f76cf742fed67c4ce82c5a2ff4c33b2b52870b06f5d7720b164d51df3a6
 EBUILD camlimages-3.0.2.ebuild 1474 RMD160 75b531e7eb88d0025cbcee3b13da237e2900a83f SHA1 905a2e00ffe0a1de175368c79cd184f661686360 SHA256 51ee6ae2413563ccbb6912698206e14d29175fedd3cc53a8dedd064a6d3084de
-MISC ChangeLog 4283 RMD160 a04a76dedc29d6ddf0dd243001e7a7ab32383ced SHA1 e678e0993edb6ec2ace9a7205a5598444bcd1807 SHA256 c415f09932facc9977cad07b96ac6b69a83bdb0d6edba0ca38265c599c99f285
+MISC ChangeLog 4461 RMD160 3ab787de1c5cfa189d19306c75b35b2bf93571f9 SHA1 bb4ee1174a16b1998e0520588aa2b011b27dd671 SHA256 fa3058bf94381078c63072011ae92e691bb5c49d55564148477e739de560df6b
 MISC metadata.xml 250 RMD160 598e56c53e73f20d9f66aa719a344dd151d72e00 SHA1 eb18ff902a727aa9352e813aacb53831c43a36f0 SHA256 5e4fa04a77d47a0f481ef815f7a82527865397a89ffd15b3288c7d9559644b42
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.14 (GNU/Linux)
 
-iEYEARECAAYFAkvCutwACgkQvFcC4BYPU0qJhACeITiI8kP58TTUu0PiW06vfha0
-F0cAoJvaMbQFLXpc0chxqBKrsBRY6PAc
-=qxjr
+iEYEARECAAYFAkvCu/sACgkQvFcC4BYPU0qAMgCgoOtsM2a0/c5OcG5njsca4o29
+58IAn2MuPuOCMZ6FIM+iWGaFtJOgiOlS
+=Plfa
 -----END PGP SIGNATURE-----
diff --git a/dev-ml/camlimages/camlimages-2.20-r2.ebuild b/dev-ml/camlimages/camlimages-2.20-r2.ebuild
deleted file mode 100644
index 57403ea1b4c7..000000000000
--- a/dev-ml/camlimages/camlimages-2.20-r2.ebuild
+++ /dev/null
@@ -1,90 +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-2.20-r2.ebuild,v 1.4 2009/12/26 17:34:19 pva Exp $
-
-inherit findlib eutils
-
-IUSE="gtk opengl"
-
-DESCRIPTION="An image manipulation library for ocaml"
-HOMEPAGE="http://pauillac.inria.fr/camlimages/"
-SRC_URI="ftp://ftp.inria.fr/INRIA/caml-light/bazar-ocaml/${P/20/2}.tgz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~amd64 ppc x86"
-
-DEPEND=">=dev-lang/ocaml-3.09
-	gtk? ( dev-ml/lablgtk )
-	opengl? ( dev-ml/lablgl )
-	media-libs/giflib
-	media-libs/libpng
-	media-libs/jpeg
-	media-libs/tiff
-	x11-libs/libXpm
-	>=media-libs/freetype-2
-	app-text/ghostscript-gpl"
-
-S="${WORKDIR}/${P/20/2}"
-
-pkg_setup() {
-	if ! built_with_use --missing true dev-lang/ocaml ocamlopt; then
-		eerror "${PN} needs to be built with native code support from ocaml"
-		eerror "You first need to have a native code ocaml compiler."
-		eerror "You need to install dev-lang/ocaml with ocamlopt useflag on."
-		die "Please install ocaml with ocamlopt useflag"
-	fi
-}
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}/${P}-ocaml-3.09.diff"
-}
-
-src_compile() {
-	local myconf
-
-	if !(use gtk);
-	then
-		myconf="--with-lablgtk=/dev/null --with-lablgtk2=/dev/null"
-	fi
-
-	if !(use opengl);
-	then
-		myconf="$myconf --with-lablgl=/dev/null"
-	fi
-
-	econf ${myconf} || die
-	emake -j1 || die
-	emake -j1 opt || die
-}
-
-src_test() {
-	cd "${S}/test"
-	emake || die "building test failed"
-	./test
-	./test.byt
-}
-
-src_install() {
-	# Use findlib to install properly, especially to avoid
-	# the shared library mess
-	findlib_src_preinst
-	mkdir "${T}/tmp"
-	emake CAMLDIR="${T}/tmp" \
-		LIBDIR="${T}/tmp" \
-		DESTDIR="${T}/tmp" \
-		install || die
-	sed -e "s/@VERSION@/${PV}/" "${FILESDIR}/META.camlimages.in" > "${T}/tmp/META"
-	if use gtk; then
-		cat >> "${T}/tmp/META" << EOF
-package "lablgtk2" (
-	requires="camlimages lablgtk2"
-	archive(byte)="ci_lablgtk2.cma"
-	archive(native)="ci_lablgtk2.cmxa"
-)
-EOF
-	fi
-	ocamlfind install camlimages "${T}"/tmp/*
-}
diff --git a/dev-ml/camlimages/files/META b/dev-ml/camlimages/files/META
deleted file mode 100644
index 3fe7400f37c6..000000000000
--- a/dev-ml/camlimages/files/META
+++ /dev/null
@@ -1,5 +0,0 @@
-description = "Image manipulation library"
-version = "VERSION"
-requires=""
-archive(byte) = "camlimages.cmo"
-archive(native) = "camlimages.cmx"
diff --git a/dev-ml/camlimages/files/META.camlimages.in b/dev-ml/camlimages/files/META.camlimages.in
deleted file mode 100644
index 46f08ed21242..000000000000
--- a/dev-ml/camlimages/files/META.camlimages.in
+++ /dev/null
@@ -1,30 +0,0 @@
-version="@VERSION@"
-description = "Image manipulation library"
-
-requires="graphics"
-
-archive(byte)   ="ci_core.cma"
-archive(byte)  +="ci_freetype.cma"
-archive(byte)  +="ci_gif.cma"
-archive(byte)  +="ci_jpeg.cma"
-archive(byte)  +="ci_tiff.cma"
-archive(byte)  +="ci_bmp.cma"
-archive(byte)  +="ci_ppm.cma"
-archive(byte)  +="ci_png.cma"
-archive(byte)  +="ci_xvthumb.cma"
-archive(byte)  +="ci_xpm.cma"
-archive(byte)  +="ci_ps.cma"
-archive(byte)  +="ci_graphics.cma"
-
-archive(native) ="ci_core.cmxa"
-archive(native)+="ci_freetype.cmxa"
-archive(native)+="ci_gif.cmxa"
-archive(native)+="ci_jpeg.cmxa"
-archive(native)+="ci_tiff.cmxa"
-archive(native)+="ci_bmp.cmxa"
-archive(native)+="ci_ppm.cmxa"
-archive(native)+="ci_png.cmxa"
-archive(native)+="ci_xvthumb.cmxa"
-archive(native)+="ci_xpm.cmxa"
-archive(native)+="ci_ps.cmxa"
-archive(native)+="ci_graphics.cmxa"
diff --git a/dev-ml/camlimages/files/camlimages-2.20-ocaml-3.09.diff b/dev-ml/camlimages/files/camlimages-2.20-ocaml-3.09.diff
deleted file mode 100644
index 833626936f48..000000000000
--- a/dev-ml/camlimages/files/camlimages-2.20-ocaml-3.09.diff
+++ /dev/null
@@ -1,18 +0,0 @@
---- tiff/tiffread.c.orig	2006-02-04 14:07:45.000000000 +0100
-+++ tiff/tiffread.c	2006-02-04 14:07:56.000000000 +0100
-@@ -21,15 +21,11 @@
- #if HAVE_TIFF
- 
- /* These are defined in caml/config.h */
--#define int16 int16tiff
--#define uint16 uint16tiff
- #define int32 int32tiff
- #define uint32 uint32tiff
- 
- #include <tiffio.h>
- 
--#undef int16
--#undef uint16
- #undef int32
- #undef uint32
-