gentoo auto-resync : 18:07:2022 - 14:34:47

4 files changed, 3 insertions, 226 deletions

diff --git a/dev-lang/teyjus/Manifest b/dev-lang/teyjus/Manifest
index 159611292670..5d725456d30b 100644
--- a/dev-lang/teyjus/Manifest
+++ b/dev-lang/teyjus/Manifest
@@ -6,7 +6,5 @@ AUX teyjus-2.1-p004-Renaming-ccode_stubs-for-compilation.patch 2446 BLAKE2B 7731
 AUX teyjus-2.1-p005-Unbundle-ocaml-header-files.patch 1366 BLAKE2B 73d9f8c81c04e2e6557bf1d49919fe7af5552129546f7b1580e18fde23b3f4d1a11ba135b2e0025c9f6714f9f87df7b7dde7a4e8f1ce692e5d31171c710a6046 SHA512 d1f8f9dd7c707d53548a16ecceaf12623cf80a7ae325a0da53eae230aae63898629b11e96158b469f8b183b5e2125da496f37e623019552a13e422a1d0676397
 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 3278 BLAKE2B d452712ae2dd71b7c860c15b96df4dd27f438ad09b52aa942fd733d011204d6d4590dd750ed3cfbf0138b45daa7ccd12e3aa63f0e3d55c9dd98c9b23263ecaf3 SHA512 ce7c8f667f902b7bd3df01b9579de3211c72d1ff881dbdff6bce348c65036ce39ff1e287db8e7d3d4ff9502905245faed738b23c741a2acb4728c5c59791b65d
-EBUILD teyjus-2.1.ebuild 2905 BLAKE2B c3035b05c8c2c398b9c4baf4545a9c06f3bdfb978626fa8aaaf50d2765e7fca411195d3b8612b9680ea8788660dbeefd8e595d9895b81749e882cfae941b7f1b SHA512 21af8eabfc012c1e435dfaca528a1689103ff53f74c901973ab52477753a60ff6a1a9a29e9ff8403e7b33a25ea0d5f20a1ac80ef29049c21936dbb92586cefe1
+EBUILD teyjus-2.1-r2.ebuild 3314 BLAKE2B d0d9af6e61d4b4612eccf93ff6890a92fa102dfb65e827612c59ecb82f440ca31aa0f9e4ceba9f7a689a0782c2ea1d22ed629ab8b10fd745c9d56706207af84d SHA512 4599f47086179bcc02afacb606e42ac4a8acfc83ed53bee276f80f31e7fdf0faace115167f9a8237b0b66e3df5c85dde09a1f088d887d080824d267d0e7ddb09
 MISC metadata.xml 1654 BLAKE2B 6361e555cae1b12db47e36e7362c78262a5753ecdb9fb3e8e5386d3945d6f7aeeaeb32e98c3a71e40a017c0bd9ff2d576205e3db96771f67ce7ad888cc2f12cf SHA512 077b511496bda9dfa0f577bac466a33fd5d4b5b759ae243157b385b244c7e9b210c3f7fc0221ed48c7f4277dd86f9f05fed484c375747bcda590258f278cda41
diff --git a/dev-lang/teyjus/teyjus-2.1-r1.ebuild b/dev-lang/teyjus/teyjus-2.1-r1.ebuild
deleted file mode 100644
index 7e48f5daab8f..000000000000
--- a/dev-lang/teyjus/teyjus-2.1-r1.ebuild
+++ /dev/null
@@ -1,112 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-inherit elisp-common
-
-DESCRIPTION="Higher-order logic programming language Lambda Prolog"
-HOMEPAGE="http://teyjus.cs.umn.edu/"
-SRC_URI="https://github.com/teyjus/teyjus/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-LICENSE="GPL-3"
-IUSE="emacs examples +ocamlopt"
-
-RDEPEND=">=sys-devel/binutils-2.17:*
-	>=sys-devel/gcc-2.95.3:*
-	>=dev-lang/ocaml-3.10[ocamlopt?]
-	emacs? ( >=app-editors/emacs-23.1:* )"
-DEPEND="${RDEPEND}
-	app-text/dos2unix
-	dev-util/omake"
-
-SITEFILE=50${PN}-gentoo.el
-
-PATCHES=( "${FILESDIR}/${P}-p001-Fixes-arity-for-pervasive-modulo-operation.patch"
-		  "${FILESDIR}/${P}-p002-Add-string-literals-from-proper-character-groups.patch"
-		  "${FILESDIR}/${P}-p003-Removing-deprecated-function-String.set.patch")
-
-src_prepare() {
-	find . -type f -exec dos2unix {} \;
-	default
-	local cflags=""
-	for i in ${CFLAGS}
-	do
-		cflags="${cflags} -ccopt ${i}"
-	done
-	local lflags=""
-	for i in ${LDFLAGS}
-	do
-		lflags="${lflags} -cclib ${i}"
-	done
-	sed	-e "s@\(OCAMLFLAGS= -w -A\)@\1 ${cflags}${lflags}@" \
-		-e "s@\(CFLAGS +=\) -g@\1 ${CFLAGS}\nLDFLAGS += ${LDFLAGS}@" \
-		-i "${S}/source/OMakefile" \
-		|| die "Could not set flags in ${S}/teyjus/source/OMakefile"
-	if has_version ">=dev-lang/ocaml-4.03.0"; then
-		# bug 591368
-		pushd "${S}/source" || die
-		sed -e 's@$(FNT)/ccode_stubs@$(FNT)/ccode_stubs_c@' \
-			-e 's@\(FNT_ML_TO_C\[\] =\)@\1\n    $(FNT)/ccode_stubs@' \
-			-i OMakefile || die
-		cd "${S}/source/front" || die
-		mv ccode_stubs.mli ccode_stubs.ml || die
-		mv ccode_stubs.c ccode_stubs_c.c || die
-		popd || die
-	fi
-}
-
-src_compile() {
-	export HOME="${T}"
-	omake --verbose --force-dotomake all || die "omake all failed"
-	if use emacs ; then
-		pushd "${S}/emacs" || die "Could change directory to emacs"
-		elisp-compile *.el || die "emacs elisp compile failed"
-		popd
-	fi
-}
-
-ins_example_dir() {
-	dodir "/usr/share/${PN}/examples/${1}"
-	insinto "/usr/share/${PN}/examples/${1}"
-	cd "${S}/examples/${1}"
-	doins *
-}
-
-src_install() {
-	newbin source/tjcc.opt tjcc
-	newbin source/tjdepend.opt tjdepend
-	newbin source/tjdis.opt tjdis
-	newbin source/tjlink.opt tjlink
-	newbin source/tjsim.opt tjsim
-	dodoc README.md QUICKSTART
-	if use emacs ; then
-		elisp-install ${PN} emacs/*.{el,elc}
-		cp "${FILESDIR}"/${SITEFILE} "${S}"
-		sed -e "s@/usr/bin/tjcc@${EPREFIX}/usr/bin/tjcc@" -i ${SITEFILE} \
-			|| die "Could not set tjcc executable path in emacs site file"
-		elisp-site-file-install ${SITEFILE}
-	fi
-	if use examples; then
-		ins_example_dir "handbook/logic"
-		ins_example_dir "handbook/progs"
-		ins_example_dir "misc"
-		ins_example_dir "ndprover"
-		ins_example_dir "pcf"
-	fi
-}
-
-pkg_postinst() {
-	if use emacs; then
-		elisp-site-regen
-		ewarn "For teyjus emacs, add this line to ~/.emacs"
-		ewarn ""
-		ewarn "(require 'teyjus)"
-	fi
-}
-
-pkg_postrm() {
-	use emacs && elisp-site-regen
-}
diff --git a/dev-lang/teyjus/teyjus-2.1-r2.ebuild b/dev-lang/teyjus/teyjus-2.1-r2.ebuild
index b2cf755e19a0..f6eeceb48b83 100644
--- a/dev-lang/teyjus/teyjus-2.1-r2.ebuild
+++ b/dev-lang/teyjus/teyjus-2.1-r2.ebuild
@@ -55,7 +55,8 @@ src_prepare() {
 	bs+="LD = ${LD:-ld}\n"
 	bs+="AR(name) =\n"
 	bs+="    return(${AR:-ar} cq \$(name))\n"
-	bs+="AS = ${AS:-as}"
+	bs+="AS = ${AS:-as}\n"
+	bs+="RANLIB = ${RANLIB:-ranlib}"
 	sed	-e "s@\(OCAMLFLAGS= -w -A\)@\1 -cc ${CC:-gcc} ${cflags}${lflags}@" \
 		-e "s@\(CFLAGS +=\) -g@\1 ${CFLAGS}\n${bs}@" \
 		-i "${S}/source/OMakefile" \
diff --git a/dev-lang/teyjus/teyjus-2.1.ebuild b/dev-lang/teyjus/teyjus-2.1.ebuild
deleted file mode 100644
index ba530e02034d..000000000000
--- a/dev-lang/teyjus/teyjus-2.1.ebuild
+++ /dev/null
@@ -1,110 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-inherit elisp-common multilib versionator
-
-DESCRIPTION="Higher-order logic programming language Lambda Prolog"
-HOMEPAGE="http://teyjus.cs.umn.edu/"
-SRC_URI="https://github.com/teyjus/teyjus/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-LICENSE="GPL-3"
-IUSE="emacs examples +ocamlopt"
-
-RDEPEND=">=sys-devel/binutils-2.17:*
-	>=sys-devel/gcc-2.95.3:*
-	>=dev-lang/ocaml-3.10[ocamlopt?]
-	emacs? ( >=app-editors/emacs-23.1:* )"
-DEPEND="${RDEPEND}
-	dev-util/omake"
-
-SITEFILE=50${PN}-gentoo.el
-
-src_prepare() {
-	default
-	local cflags=""
-	for i in ${CFLAGS}
-	do
-		cflags="${cflags} -ccopt ${i}"
-	done
-	local lflags=""
-	for i in ${LDFLAGS}
-	do
-		lflags="${lflags} -cclib ${i}"
-	done
-	sed	-e "s@\(OCAMLFLAGS= -w -A\)@\1 ${cflags}${lflags}@" \
-		-e "s@\(CFLAGS +=\) -g@\1 ${CFLAGS}\nLDFLAGS += ${LDFLAGS}@" \
-		-i "${S}/source/OMakefile" \
-		|| die "Could not set flags in ${S}/teyjus/source/OMakefile"
-	if has_version ">=dev-lang/ocaml-4.03.0"; then
-		# bug 591368
-		pushd "${S}/source" || die
-		sed -e 's@$(FNT)/ccode_stubs@$(FNT)/ccode_stubs_c@' \
-			-e 's@\(FNT_ML_TO_C\[\] =\)@\1\n    $(FNT)/ccode_stubs@' \
-			-i OMakefile || die
-		cd "${S}/source/front" || die
-		mv ccode_stubs.mli ccode_stubs.ml || die
-		mv ccode_stubs.c ccode_stubs_c.c || die
-		popd || die
-	fi
-}
-
-src_compile() {
-	addpredict "/usr/$(get_libdir)/omake/Pervasives.omc"
-	addpredict "/usr/$(get_libdir)/omake/build/C.omc"
-	addpredict "/usr/$(get_libdir)/omake/build/Common.omc"
-	addpredict "/usr/$(get_libdir)/omake/configure/Configure.omc"
-	addpredict "/usr/$(get_libdir)/omake/build/OCaml.omc"
-	omake --verbose all || die "omake all failed"
-	if use emacs ; then
-		pushd "${S}/emacs" || die "Could change directory to emacs"
-		elisp-compile *.el || die "emacs elisp compile failed"
-		popd
-	fi
-}
-
-ins_example_dir() {
-	dodir "/usr/share/${PN}/examples/${1}"
-	insinto "/usr/share/${PN}/examples/${1}"
-	cd "${S}/examples/${1}"
-	doins *
-}
-
-src_install() {
-	newbin source/tjcc.opt tjcc
-	newbin source/tjdepend.opt tjdepend
-	newbin source/tjdis.opt tjdis
-	newbin source/tjlink.opt tjlink
-	newbin source/tjsim.opt tjsim
-	dodoc README.md QUICKSTART
-	if use emacs ; then
-		elisp-install ${PN} emacs/*.{el,elc}
-		cp "${FILESDIR}"/${SITEFILE} "${S}"
-		sed -e "s@/usr/bin/tjcc@${EPREFIX}/usr/bin/tjcc@" -i ${SITEFILE} \
-			|| die "Could not set tjcc executable path in emacs site file"
-		elisp-site-file-install ${SITEFILE}
-	fi
-	if use examples; then
-		ins_example_dir "handbook/logic"
-		ins_example_dir "handbook/progs"
-		ins_example_dir "misc"
-		ins_example_dir "ndprover"
-		ins_example_dir "pcf"
-	fi
-}
-
-pkg_postinst() {
-	if use emacs; then
-		elisp-site-regen
-		ewarn "For teyjus emacs, add this line to ~/.emacs"
-		ewarn ""
-		ewarn "(require 'teyjus)"
-	fi
-}
-
-pkg_postrm() {
-	use emacs && elisp-site-regen
-}