From 9a20e7496c31397af5f1bf750f7fd4bd7cb52ba6 Mon Sep 17 00:00:00 2001
From: Michał Górny <mgorny@gentoo.org>
Date: Tue, 28 Jun 2016 17:04:30 +0200
Subject: dev-ml/ocamlnet: Copy ||+:= dep fix from newer version

---
 dev-ml/ocamlnet/ocamlnet-3.7.7-r1.ebuild | 76 ++++++++++++++++++++++++++++++++
 dev-ml/ocamlnet/ocamlnet-3.7.7.ebuild    | 76 --------------------------------
 2 files changed, 76 insertions(+), 76 deletions(-)
 create mode 100644 dev-ml/ocamlnet/ocamlnet-3.7.7-r1.ebuild
 delete mode 100644 dev-ml/ocamlnet/ocamlnet-3.7.7.ebuild

diff --git a/dev-ml/ocamlnet/ocamlnet-3.7.7-r1.ebuild b/dev-ml/ocamlnet/ocamlnet-3.7.7-r1.ebuild
new file mode 100644
index 000000000000..1e81b0467551
--- /dev/null
+++ b/dev-ml/ocamlnet/ocamlnet-3.7.7-r1.ebuild
@@ -0,0 +1,76 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+inherit eutils findlib
+
+MY_P=${P/_beta/test}
+DESCRIPTION="Modules for OCaml application-level Internet protocols"
+HOMEPAGE="http://projects.camlcity.org/projects/ocamlnet.html"
+SRC_URI="http://download.camlcity.org/download/${MY_P}.tar.gz"
+
+LICENSE="ZLIB GPL-2+"
+SLOT="0/${PV}"
+KEYWORDS="amd64 ppc x86 ~x86-fbsd"
+IUSE="cryptokit gtk ssl tk httpd +ocamlopt +pcre zip"
+RESTRICT="installsources"
+
+# the auth-dh compile flag has been disabled as well, since it depends on
+# ocaml-cryptgps, which is not available.
+
+DEPEND=">=dev-ml/findlib-1.0
+		pcre? ( >=dev-ml/pcre-ocaml-5:= )
+		>=dev-lang/ocaml-3.10.2:=[ocamlopt?]
+		tk? ( dev-ml/labltk:= )
+		cryptokit? ( dev-ml/cryptokit:= )
+		gtk? ( >=dev-ml/lablgtk-2:= )
+		ssl? ( >=dev-ml/ocaml-ssl-0.4:= )
+		zip? ( dev-ml/camlzip:= )
+		"
+RDEPEND="${DEPEND}"
+
+S=${WORKDIR}/${MY_P}
+
+ocamlnet_use_with() {
+	if use $1; then
+		echo "-with-$2"
+	else
+		echo "-without-$2"
+	fi
+}
+
+ocamlnet_use_enable() {
+	if use $1; then
+		echo "-enable-$2"
+	else
+		echo "-disable-$2"
+	fi
+}
+
+src_configure() {
+	./configure \
+		-bindir /usr/bin \
+		-datadir /usr/share/${PN} \
+		$(ocamlnet_use_enable cryptokit crypto) \
+		$(ocamlnet_use_enable gtk gtk2) \
+		$(ocamlnet_use_enable pcre pcre) \
+		$(ocamlnet_use_enable ssl ssl) \
+		$(ocamlnet_use_enable tk tcl) \
+		$(ocamlnet_use_enable zip zip) \
+		$(ocamlnet_use_with httpd nethttpd) \
+		|| die "Error : econf failed!"
+}
+
+src_compile() {
+	emake -j1 all
+	if use ocamlopt; then
+		emake -j1 opt
+	fi
+}
+
+src_install() {
+	export STRIP_MASK="*/bin/*"
+	findlib_src_install
+}
diff --git a/dev-ml/ocamlnet/ocamlnet-3.7.7.ebuild b/dev-ml/ocamlnet/ocamlnet-3.7.7.ebuild
deleted file mode 100644
index 779f710c2fb5..000000000000
--- a/dev-ml/ocamlnet/ocamlnet-3.7.7.ebuild
+++ /dev/null
@@ -1,76 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-
-inherit eutils findlib
-
-MY_P=${P/_beta/test}
-DESCRIPTION="Modules for OCaml application-level Internet protocols"
-HOMEPAGE="http://projects.camlcity.org/projects/ocamlnet.html"
-SRC_URI="http://download.camlcity.org/download/${MY_P}.tar.gz"
-
-LICENSE="ZLIB GPL-2+"
-SLOT="0/${PV}"
-KEYWORDS="amd64 ppc x86 ~x86-fbsd"
-IUSE="cryptokit gtk ssl tk httpd +ocamlopt +pcre zip"
-RESTRICT="installsources"
-
-# the auth-dh compile flag has been disabled as well, since it depends on
-# ocaml-cryptgps, which is not available.
-
-DEPEND=">=dev-ml/findlib-1.0
-		pcre? ( >=dev-ml/pcre-ocaml-5:= )
-		>=dev-lang/ocaml-3.10.2:=[ocamlopt?]
-		tk? ( || ( dev-ml/labltk:= <dev-lang/ocaml-4.02[tk] ) )
-		cryptokit? ( dev-ml/cryptokit:= )
-		gtk? ( >=dev-ml/lablgtk-2:= )
-		ssl? ( >=dev-ml/ocaml-ssl-0.4:= )
-		zip? ( dev-ml/camlzip:= )
-		"
-RDEPEND="${DEPEND}"
-
-S=${WORKDIR}/${MY_P}
-
-ocamlnet_use_with() {
-	if use $1; then
-		echo "-with-$2"
-	else
-		echo "-without-$2"
-	fi
-}
-
-ocamlnet_use_enable() {
-	if use $1; then
-		echo "-enable-$2"
-	else
-		echo "-disable-$2"
-	fi
-}
-
-src_configure() {
-	./configure \
-		-bindir /usr/bin \
-		-datadir /usr/share/${PN} \
-		$(ocamlnet_use_enable cryptokit crypto) \
-		$(ocamlnet_use_enable gtk gtk2) \
-		$(ocamlnet_use_enable pcre pcre) \
-		$(ocamlnet_use_enable ssl ssl) \
-		$(ocamlnet_use_enable tk tcl) \
-		$(ocamlnet_use_enable zip zip) \
-		$(ocamlnet_use_with httpd nethttpd) \
-		|| die "Error : econf failed!"
-}
-
-src_compile() {
-	emake -j1 all
-	if use ocamlopt; then
-		emake -j1 opt
-	fi
-}
-
-src_install() {
-	export STRIP_MASK="*/bin/*"
-	findlib_src_install
-}
-- 
cgit v1.2.3-65-gdbad