From 229147d070a9c5d32533e577029dfe661edaaef1 Mon Sep 17 00:00:00 2001
From: Maciej Barć <xgqt@gentoo.org>
Date: Sun, 5 Dec 2021 21:40:06 +0100
Subject: dev-lang/haxe: make - ensure correct ocamlopt(.opt)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Package-Manager: Portage-3.0.28, Repoman-3.0.3
Signed-off-by: Maciej Barć <xgqt@gentoo.org>
---
 dev-lang/haxe/haxe-4.2.4-r1.ebuild | 68 -----------------------------------
 dev-lang/haxe/haxe-4.2.4-r2.ebuild | 73 ++++++++++++++++++++++++++++++++++++++
 2 files changed, 73 insertions(+), 68 deletions(-)
 delete mode 100644 dev-lang/haxe/haxe-4.2.4-r1.ebuild
 create mode 100644 dev-lang/haxe/haxe-4.2.4-r2.ebuild

(limited to 'dev-lang/haxe')

diff --git a/dev-lang/haxe/haxe-4.2.4-r1.ebuild b/dev-lang/haxe/haxe-4.2.4-r1.ebuild
deleted file mode 100644
index b391ef467182..000000000000
--- a/dev-lang/haxe/haxe-4.2.4-r1.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DESCRIPTION="Multi-target universal programming language"
-HOMEPAGE="https://haxe.org/"
-
-if [[ "${PV}" == *9999* ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/HaxeFoundation/haxe.git"
-else
-	# Haxe-debian already contains correct git modules
-	SRC_URI="https://github.com/HaxeFoundation/haxe-debian/archive/upstream/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64"
-	S="${WORKDIR}/haxe-debian-upstream-${PV}"
-fi
-
-LICENSE="GPL-2+ MIT"
-SLOT="0/${PV}"
-IUSE="+ocamlopt"
-
-# NOTICE:
-# Theoretically luv <= 0.5.8 is pinned but it is because of mingw issues
-RDEPEND="
-	>=dev-lang/ocaml-4:=[ocamlopt?]
-	dev-ml/extlib:=
-	dev-ml/luv:=
-	dev-ml/ocaml-sha:=
-	dev-ml/ptmap:=
-	dev-ml/sedlex:=
-	dev-ml/xml-light:=
-
-	dev-lang/neko:=
-	dev-libs/boehm-gc:=
-	dev-libs/libpcre:=
-	net-libs/mbedtls:=
-	sys-libs/zlib:=
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	dev-ml/camlp5
-	dev-ml/dune
-	dev-ml/findlib
-"
-
-QA_FLAGS_IGNORED="usr/bin/haxelib"
-QA_PRESTRIPPED="usr/bin/haxelib"
-
-src_configure() {
-	use ocamlopt && export OCAMLOPT=ocamlopt.opt
-}
-
-src_compile() {
-	local mymakeargs=(
-		BRANCH=""
-		COMMIT_DATE=""
-		COMMIT_SHA=""
-		INSTALL_DIR=/usr
-	)
-	emake -j1
-}
-
-src_install() {
-	emake DESTDIR="${D}" INSTALL_DIR=/usr install
-
-	dodoc *.md
-}
diff --git a/dev-lang/haxe/haxe-4.2.4-r2.ebuild b/dev-lang/haxe/haxe-4.2.4-r2.ebuild
new file mode 100644
index 000000000000..6a8441c77ab2
--- /dev/null
+++ b/dev-lang/haxe/haxe-4.2.4-r2.ebuild
@@ -0,0 +1,73 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DESCRIPTION="Multi-target universal programming language"
+HOMEPAGE="https://haxe.org/"
+
+if [[ "${PV}" == *9999* ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/HaxeFoundation/haxe.git"
+else
+	# Haxe-debian already contains correct git modules
+	SRC_URI="https://github.com/HaxeFoundation/haxe-debian/archive/upstream/${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64"
+	S="${WORKDIR}/haxe-debian-upstream-${PV}"
+fi
+
+LICENSE="GPL-2+ MIT"
+SLOT="0/${PV}"
+IUSE="+ocamlopt"
+
+# NOTICE:
+# Theoretically luv <= 0.5.8 is pinned but it is because of mingw issues
+RDEPEND="
+	>=dev-lang/ocaml-4:=[ocamlopt?]
+	dev-ml/extlib:=
+	dev-ml/luv:=
+	dev-ml/ocaml-sha:=
+	dev-ml/ptmap:=
+	dev-ml/sedlex:=
+	dev-ml/xml-light:=
+
+	dev-lang/neko:=
+	dev-libs/boehm-gc:=
+	dev-libs/libpcre:=
+	net-libs/mbedtls:=
+	sys-libs/zlib:=
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	dev-ml/camlp5
+	dev-ml/dune
+	dev-ml/findlib
+"
+
+QA_FLAGS_IGNORED="usr/bin/haxelib"
+QA_PRESTRIPPED="usr/bin/haxelib"
+
+src_configure() {
+	if use ocamlopt ; then
+		export OCAMLOPT=ocamlopt.opt
+	else
+		export OCAMLOPT=ocamlopt
+	fi
+}
+
+src_compile() {
+	local mymakeargs=(
+		BRANCH=""
+		COMMIT_DATE=""
+		COMMIT_SHA=""
+		OCAMLOPT=${OCAMLOPT}
+		INSTALL_DIR=/usr
+	)
+	emake -j1
+}
+
+src_install() {
+	emake DESTDIR="${D}" INSTALL_DIR=/usr install
+
+	dodoc *.md
+}
-- 
cgit v1.2.3-65-gdbad