From 8ed983fd2eff485a41be9d4ada5e968663f49e5c Mon Sep 17 00:00:00 2001
From: Alexis Ballier <aballier@gentoo.org>
Date: Fri, 24 Jun 2016 11:37:50 +0200
Subject: dev-ml/camomile: drop backward compat camlp4 dep

Package-Manager: portage-2.3.0_rc1
RepoMan-Options: --force
---
 dev-ml/camomile/camomile-0.8.5-r1.ebuild | 38 ++++++++++++++++++++++++++++++++
 dev-ml/camomile/camomile-0.8.5.ebuild    | 38 --------------------------------
 2 files changed, 38 insertions(+), 38 deletions(-)
 create mode 100644 dev-ml/camomile/camomile-0.8.5-r1.ebuild
 delete mode 100644 dev-ml/camomile/camomile-0.8.5.ebuild

(limited to 'dev-ml/camomile')

diff --git a/dev-ml/camomile/camomile-0.8.5-r1.ebuild b/dev-ml/camomile/camomile-0.8.5-r1.ebuild
new file mode 100644
index 000000000000..cca5431a4d60
--- /dev/null
+++ b/dev-ml/camomile/camomile-0.8.5-r1.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+inherit findlib eutils
+
+DESCRIPTION="Camomile is a comprehensive Unicode library for ocaml"
+HOMEPAGE="https://github.com/yoriyuki/Camomile/wiki"
+SRC_URI="https://github.com/yoriyuki/Camomile/releases/download/rel-${PV}/${P}.tar.bz2"
+
+LICENSE="LGPL-2"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="debug +ocamlopt"
+
+RDEPEND="
+	>=dev-lang/ocaml-3.10.2:=[ocamlopt?]
+	dev-ml/camlp4:=
+"
+DEPEND="${RDEPEND}"
+
+src_configure() {
+	econf $(use_enable debug)
+}
+
+src_compile() {
+	emake -j1 byte unidata unimaps charmap_data locale_data
+	if use ocamlopt; then
+		emake -j1 opt
+	fi
+}
+
+src_install() {
+	dodir /usr/bin
+	findlib_src_install DATADIR="${D}/usr/share" BINDIR="${D}/usr/bin"
+}
diff --git a/dev-ml/camomile/camomile-0.8.5.ebuild b/dev-ml/camomile/camomile-0.8.5.ebuild
deleted file mode 100644
index c0cb67e32f00..000000000000
--- a/dev-ml/camomile/camomile-0.8.5.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-
-inherit findlib eutils
-
-DESCRIPTION="Camomile is a comprehensive Unicode library for ocaml"
-HOMEPAGE="https://github.com/yoriyuki/Camomile/wiki"
-SRC_URI="https://github.com/yoriyuki/Camomile/releases/download/rel-${PV}/${P}.tar.bz2"
-
-LICENSE="LGPL-2"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="debug +ocamlopt"
-
-RDEPEND="
-	>=dev-lang/ocaml-3.10.2:=[ocamlopt?]
-	|| ( dev-ml/camlp4:= <dev-lang/ocaml-4.02.0 )
-"
-DEPEND="${RDEPEND}"
-
-src_configure() {
-	econf $(use_enable debug)
-}
-
-src_compile() {
-	emake -j1 byte unidata unimaps charmap_data locale_data
-	if use ocamlopt; then
-		emake -j1 opt
-	fi
-}
-
-src_install() {
-	dodir /usr/bin
-	findlib_src_install DATADIR="${D}/usr/share" BINDIR="${D}/usr/bin"
-}
-- 
cgit v1.2.3-65-gdbad