From e0d23d9d2468ec36070ef9fa63bd814db6a653da Mon Sep 17 00:00:00 2001
From: V3n3RiX <venerix@koprulu.sector>
Date: Mon, 18 Jul 2022 08:34:13 +0100
Subject: gentoo auto-resync : 18:07:2022 - 08:34:13

---
 dev-lang/teyjus/Manifest             |  2 +-
 dev-lang/teyjus/teyjus-2.1-r2.ebuild | 17 +++++++++++------
 2 files changed, 12 insertions(+), 7 deletions(-)

(limited to 'dev-lang/teyjus')

diff --git a/dev-lang/teyjus/Manifest b/dev-lang/teyjus/Manifest
index 12264ebd5914..159611292670 100644
--- a/dev-lang/teyjus/Manifest
+++ b/dev-lang/teyjus/Manifest
@@ -7,6 +7,6 @@ AUX teyjus-2.1-p005-Unbundle-ocaml-header-files.patch 1366 BLAKE2B 73d9f8c81c04e
 AUX teyjus-2.1-p006-Version.patch 444 BLAKE2B 85bbfc958760a5d738897be6d6fbe4e16cadd1d7ad64093a4b496b43b761a6ea814be9ae184ae30ad081fe1a90ebb61f1cdf9032fea38350d6c2e06764725f04 SHA512 eb5e281e76e8d235fcc325ef4a451f0bbe29f1fafd59fdd833b8da64cb9a1c15cbfd0ffddd61d4118e76f8b3ebcd3118bd5c0a3a886f81fc04a2ec09fdb764cd
 DIST teyjus-2.1.tar.gz 723763 BLAKE2B ab6a98c2d2291620b586ab0b419a214b0f7c0b27aad444324e5a417c1a0b27382e2d5c622f798ea88cab77853bca3305ec37904c50a7304ace20237afb993b91 SHA512 1f71d19502f4f4da00f635d2c3d4e141403182d65f039e0d43660edf84c5fcd900e7225ac92dc5bdbe0c8379c4e2ce6e27879af504fcfafddf2695a0c8a13379
 EBUILD teyjus-2.1-r1.ebuild 2940 BLAKE2B 25186b27d4c2d69f4e6bc9cfc5e49edc43110b75664270eb7d459c5cc85587d85a4f29255a1f7a3df771beedc3f6fc1b988ccbfeea437fabe071610a7b2edc99 SHA512 8af839bedc5049f1ac4b4128425ea1f71abeb3b38d9c3739b46ce7bc0466ce4e1df64dac0923cbd4f7017dc48eb9746ace712ca7ac32bd880a5aa7a3b70acd42
-EBUILD teyjus-2.1-r2.ebuild 3136 BLAKE2B 64dc82f30ca272ea406c29c5ec9ae1b183a9677fac6f3b21bcca4baa861bd9d531a8951f3b2d057f0e281bad91f8294fa037b74860cb8ddaef28768cfbd013f0 SHA512 f58d484a72ebe0434b36f5a1bb82737cabd0003319b0c6cdc5d32086417582a59f3c3eabdceafe4d0d8fe8b2c8d61418c25511f17028752ba3ead1df09ffc694
+EBUILD teyjus-2.1-r2.ebuild 3278 BLAKE2B d452712ae2dd71b7c860c15b96df4dd27f438ad09b52aa942fd733d011204d6d4590dd750ed3cfbf0138b45daa7ccd12e3aa63f0e3d55c9dd98c9b23263ecaf3 SHA512 ce7c8f667f902b7bd3df01b9579de3211c72d1ff881dbdff6bce348c65036ce39ff1e287db8e7d3d4ff9502905245faed738b23c741a2acb4728c5c59791b65d
 EBUILD teyjus-2.1.ebuild 2905 BLAKE2B c3035b05c8c2c398b9c4baf4545a9c06f3bdfb978626fa8aaaf50d2765e7fca411195d3b8612b9680ea8788660dbeefd8e595d9895b81749e882cfae941b7f1b SHA512 21af8eabfc012c1e435dfaca528a1689103ff53f74c901973ab52477753a60ff6a1a9a29e9ff8403e7b33a25ea0d5f20a1ac80ef29049c21936dbb92586cefe1
 MISC metadata.xml 1654 BLAKE2B 6361e555cae1b12db47e36e7362c78262a5753ecdb9fb3e8e5386d3945d6f7aeeaeb32e98c3a71e40a017c0bd9ff2d576205e3db96771f67ce7ad888cc2f12cf SHA512 077b511496bda9dfa0f577bac466a33fd5d4b5b759ae243157b385b244c7e9b210c3f7fc0221ed48c7f4277dd86f9f05fed484c375747bcda590258f278cda41
diff --git a/dev-lang/teyjus/teyjus-2.1-r2.ebuild b/dev-lang/teyjus/teyjus-2.1-r2.ebuild
index d19b8ef93092..b2cf755e19a0 100644
--- a/dev-lang/teyjus/teyjus-2.1-r2.ebuild
+++ b/dev-lang/teyjus/teyjus-2.1-r2.ebuild
@@ -14,9 +14,7 @@ KEYWORDS="~amd64 ~x86"
 LICENSE="GPL-3"
 IUSE="emacs examples"
 
-RDEPEND=">=sys-devel/binutils-2.17:*
-	>=sys-devel/gcc-2.95.3:*
-	>=dev-lang/ocaml-3.10[ocamlopt]
+RDEPEND="dev-lang/ocaml[ocamlopt]
 	emacs? ( >=app-editors/emacs-23.1:* )"
 DEPEND="${RDEPEND}
 	app-text/dos2unix
@@ -34,7 +32,7 @@ PATCHES=( "${FILESDIR}/${P}-p001-Fixes-arity-for-pervasive-modulo-operation.patc
 src_prepare() {
 	rm -rf source/front/caml \
 		|| die "Could not remove bundled ocaml header files"
-	find . -type f -exec dos2unix {} \; \
+	find . -type f -exec dos2unix --quiet {} \; \
 		|| die "Could not convert files from DOS to Unix format"
 	mv source/front/ccode_stubs.c source/front/ccode_stubs_c.c \
 	   || die "Could not rename source/front/ccode_stubs.c to source/front/ccode_stubs_c.c"
@@ -51,8 +49,15 @@ src_prepare() {
 	do
 		lflags="${lflags} -cclib ${i}"
 	done
-	sed	-e "s@\(OCAMLFLAGS= -w -A\)@\1 ${cflags}${lflags}@" \
-		-e "s@\(CFLAGS +=\) -g@\1 ${CFLAGS}\nLDFLAGS += ${LDFLAGS}@" \
+	local bs="LDFLAGS += ${LDFLAGS}\n"
+	bs+="CC = ${CC:-gcc}\n"
+	bs+="CPP = ${CPP:-cpp}\n"
+	bs+="LD = ${LD:-ld}\n"
+	bs+="AR(name) =\n"
+	bs+="    return(${AR:-ar} cq \$(name))\n"
+	bs+="AS = ${AS:-as}"
+	sed	-e "s@\(OCAMLFLAGS= -w -A\)@\1 -cc ${CC:-gcc} ${cflags}${lflags}@" \
+		-e "s@\(CFLAGS +=\) -g@\1 ${CFLAGS}\n${bs}@" \
 		-i "${S}/source/OMakefile" \
 		|| die "Could not set flags in ${S}/source/OMakefile"
 }
-- 
cgit v1.2.3