remove old

Package-Manager: portage-2.2.0_alpha43/cvs/Linux x86_64

4 files changed, 9 insertions, 92 deletions

diff --git a/dev-ml/ocamlduce/ChangeLog b/dev-ml/ocamlduce/ChangeLog
index b2e3c5762aaf..82a01e34cbc7 100644
--- a/dev-ml/ocamlduce/ChangeLog
+++ b/dev-ml/ocamlduce/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-ml/ocamlduce
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ml/ocamlduce/ChangeLog,v 1.21 2011/07/07 20:34:43 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ml/ocamlduce/ChangeLog,v 1.22 2011/07/07 20:35:57 aballier Exp $
+
+  07 Jul 2011; Alexis Ballier <aballier@gentoo.org>
+  -ocamlduce-3.12.0.0-r20.ebuild, -files/ocaml-3.12.1.patch:
+  remove old
 
 *ocamlduce-3.12.1.0 (07 Jul 2011)
 
diff --git a/dev-ml/ocamlduce/Manifest b/dev-ml/ocamlduce/Manifest
index fb0706ddadd9..365832845312 100644
--- a/dev-ml/ocamlduce/Manifest
+++ b/dev-ml/ocamlduce/Manifest
@@ -1,19 +1,16 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-AUX ocaml-3.12.1.patch 558 RMD160 674ca37b088e3cb12cc191445b49de400d998a11 SHA1 b7c8dba47b1375c3645c4a0f19e9c18216908ee7 SHA256 3baef7d620f68b42c63ec7d7790cc2a762fb9f0cc6a83d5f692212d3dfe97369
 DIST ocaml-3.12.1.tar.bz2 2949124 RMD160 61d38c0785491c8790ac02ab78fb2f26ea490fc1 SHA1 29b44117b116b1a5bc54a8b4514af483793a769f SHA256 edcf563da75e0b91f09765649caa98ab1535e0c7498f0737b5591b7de084958d
 DIST ocaml-patches-3.tar.bz2 4101 RMD160 f830b0be28a96f8892776d0372fa10fb56a605ee SHA1 f165b9fce29cc4d96a81abbc7edbde35e33b4c0c SHA256 c4ceb604f4480c78d1cf4f848b0903c8d37798d9761f582d8d1643d4e38b8658
-DIST ocamlduce-3.12.0.0.tar.gz 138677 RMD160 4deee8799ec1c8c519e008a7d7d920f424ae2f24 SHA1 1cc8cb089edeb438d57b50b51c0dda1f35476927 SHA256 fe78ff3f31dda6f3760c0b3ee13603436e42142077f8d5473f005d5290e04f8c
 DIST ocamlduce-3.12.1.0.tar.gz 140291 RMD160 33078e31c4cffade2f6d762fa9e9e4023f96fec4 SHA1 c5006c36071a1e22736ccd5bb96024f13e575302 SHA256 3eda11591d9babf9f6fc25f257367cd36fffe3cc03a6b0105a2d49fc62aa91ab
-EBUILD ocamlduce-3.12.0.0-r20.ebuild 2078 RMD160 ddc76bd5edfa2888d378206ba8f18f0dec1cabf1 SHA1 5ce431654587e9a26d6927bca984f9f6c818ee82 SHA256 f27e48a57f958594866e9f25d48115ee9a676b79d1b8efb01c8b32766ca0808e
 EBUILD ocamlduce-3.12.1.0.ebuild 2023 RMD160 6055f033a826a3246561318f15db25b83caff1e5 SHA1 9deb6585dfee602b06966b133fdcd0998b6a6c5a SHA256 77e44ad97e692471d69c08b900d682e083a915b4b0cc6064462bf4b1bb4f2728
-MISC ChangeLog 2875 RMD160 041677f7fba5e1f4fe0ff33e7842f69986849c25 SHA1 2fab9567504e520579a1e9fe79d2088d41083e45 SHA256 dfaf5c210df9864570711dc0f9ad5ee463f7933b3bf706bae3ae35cb41c1a61c
+MISC ChangeLog 3002 RMD160 960fd8dfcd9b8dacb3dda5a5e621c23f12922501 SHA1 ecfb9ecf218a7c5d3fc2a6c9d913e4822c897514 SHA256 67b9b548ae6adfe58a966ecf13333b8ad817e7800e25ac1e3b499fba90ac0fcb
 MISC metadata.xml 596 RMD160 1b88beb573543cf7b16a9287535e628b342441dd SHA1 cf8f0204da2e16dcb83d837fa5916747a589f8cf SHA256 88c57d0b9cfb5ddde09162a1b25f7412df877e030bc80bb9433089f2dee9f0ea
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEARECAAYFAk4WGGkACgkQvFcC4BYPU0q8BACeI9BXMvJmx4U+klM8SjTHLCSb
-UEMAnRFjne+IHC9Osvmi8QjsinH2sQLR
-=naj2
+iEYEARECAAYFAk4WGLIACgkQvFcC4BYPU0p2lACdGI+zh2T+r3yG00rOiOJqZY6v
+TiYAoJkQ8seR04xt9XCJxMdrw6RAaR9m
+=y+UQ
 -----END PGP SIGNATURE-----
diff --git a/dev-ml/ocamlduce/files/ocaml-3.12.1.patch b/dev-ml/ocamlduce/files/ocaml-3.12.1.patch
deleted file mode 100644
index 15bfec61a7b6..000000000000
--- a/dev-ml/ocamlduce/files/ocaml-3.12.1.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: work/ocamlduce-3.12.0.0/patches/typing.diff
-===================================================================
---- work.orig/ocamlduce-3.12.0.0/patches/typing.diff
-+++ work/ocamlduce-3.12.0.0/patches/typing.diff
-@@ -1987,7 +1987,7 @@ index ce84576..7b98d21 100644
- @@ -106,6 +106,7 @@ and structure_item ppf tbl s =
-    | Pstr_class cdl -> List.iter (class_declaration ppf tbl) cdl;
-    | Pstr_class_type _ -> ()
--   | Pstr_include _ -> ()
-+   | Pstr_include me -> module_expr ppf tbl me;
- +  | Pstr_namespace _ -> ()
-  
-  and expression ppf tbl e =
diff --git a/dev-ml/ocamlduce/ocamlduce-3.12.0.0-r20.ebuild b/dev-ml/ocamlduce/ocamlduce-3.12.0.0-r20.ebuild
deleted file mode 100644
index a6a96d60289e..000000000000
--- a/dev-ml/ocamlduce/ocamlduce-3.12.0.0-r20.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ml/ocamlduce/ocamlduce-3.12.0.0-r20.ebuild,v 1.1 2011/07/06 16:32:39 aballier Exp $
-
-EAPI="2"
-
-inherit versionator eutils toolchain-funcs flag-o-matic multilib
-
-OCAML_VERSION=3.12.1
-OCAML_TARBALL=ocaml-${OCAML_VERSION}.tar.bz2
-OCAML_PATCHLEVEL=3
-OCAML_GENTOO_PATCHES=ocaml-patches-${OCAML_PATCHLEVEL}.tar.bz2
-
-DESCRIPTION="OCamlDuce is a merger between OCaml and CDuce"
-HOMEPAGE="http://ocamlduce.forge.ocamlcore.org/"
-SRC_URI="https://forge.ocamlcore.org/frs/download.php/441/${P}.tar.gz
-	ftp://ftp.inria.fr/INRIA/cristal/ocaml/ocaml-$(get_version_component_range 1-2 ${OCAML_VERSION})/${OCAML_TARBALL}
-	mirror://gentoo/${OCAML_GENTOO_PATCHES}"
-
-LICENSE="QPL-1.0 LGPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~x86-fbsd"
-IUSE="+ocamlopt"
-
-DEPEND="~dev-lang/ocaml-${OCAML_VERSION/+/_}[ocamlopt?]
-	>=dev-ml/findlib-1.2.4-r1
-	!!<dev-ml/${P}"
-
-RDEPEND="${DEPEND}"
-
-S=${WORKDIR}/${P}/ocaml-${OCAML_VERSION}
-
-src_unpack() {
-	unpack ${P}.tar.gz ${OCAML_GENTOO_PATCHES}
-}
-
-src_prepare() {
-	cd "${WORKDIR}/${P}"
-	epatch "${FILESDIR}/ocaml-${OCAML_VERSION}.patch"
-	emake OCAML_SOURCE="${DISTDIR}/${OCAML_TARBALL}" prepare || die "failed to prepare"
-	cd "${S}"
-	EPATCH_SUFFIX="patch" epatch "${WORKDIR}/patches"
-}
-
-src_configure() {
-	RAW_LDFLAGS="$(raw-ldflags)" ./configure -prefix /usr \
-		--bindir /usr/bin \
-		--libdir /usr/$(get_libdir)/ocaml \
-		--mandir /usr/share/man \
-		-host "${CHOST}" \
-		-cc "$(tc-getCC)" \
-		-as "$(tc-getAS)" \
-		-aspp "$(tc-getCC) -c" \
-		--with-pthread || die "configure failed!"
-}
-
-src_compile() {
-	if use ocamlopt; then
-		emake -f Makefile.ocamlduce -j1 world.opt || die
-	else
-		emake -f Makefile.ocamlduce -j1 world || die
-	fi
-}
-
-src_install() {
-	emake -f Makefile.ocamlduce BINDIR="${D}/usr/bin" LIBDIR="${D}/usr/$(get_libdir)/ocaml" installbyte || die
-	if use ocamlopt; then
-		emake -f Makefile.ocamlduce BINDIR="${D}/usr/bin" LIBDIR="${D}/usr/$(get_libdir)/ocaml" installopt || die
-	fi
-	dodoc Changes README
-}