diff options
author | Alexis Ballier <aballier@gentoo.org> | 2011-07-07 20:35:57 +0000 |
---|---|---|
committer | Alexis Ballier <aballier@gentoo.org> | 2011-07-07 20:35:57 +0000 |
commit | cad1f0b53968ab39540ad9e814f25cb53e5f0cb4 (patch) | |
tree | 862aca1c0a2570f02bad0593825c9f75c77ba0b4 /dev-ml | |
parent | version bump (diff) | |
download | gentoo-2-cad1f0b53968ab39540ad9e814f25cb53e5f0cb4.tar.gz gentoo-2-cad1f0b53968ab39540ad9e814f25cb53e5f0cb4.tar.bz2 gentoo-2-cad1f0b53968ab39540ad9e814f25cb53e5f0cb4.zip |
remove old
(Portage version: 2.2.0_alpha43/cvs/Linux x86_64)
Diffstat (limited to 'dev-ml')
-rw-r--r-- | dev-ml/ocamlduce/ChangeLog | 6 | ||||
-rw-r--r-- | dev-ml/ocamlduce/files/ocaml-3.12.1.patch | 13 | ||||
-rw-r--r-- | dev-ml/ocamlduce/ocamlduce-3.12.0.0-r20.ebuild | 71 |
3 files changed, 5 insertions, 85 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/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 -} |