remove old

(Portage version: 2.2_rc67/cvs/Linux x86_64)

5 files changed, 6 insertions, 144 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/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
-