From e748ba9741f6540f4675c23e3e37b73e822c13a4 Mon Sep 17 00:00:00 2001
From: V3n3RiX <venerix@redcorelinux.org>
Date: Mon, 31 May 2021 20:59:14 +0100
Subject: gentoo resync : 31.05.2021

---
 dev-lang/mercury/Manifest                |   2 +-
 dev-lang/mercury/mercury-20.06-r1.ebuild | 207 +++++++++++++++++++++++++++++++
 dev-lang/mercury/mercury-20.06.ebuild    | 207 -------------------------------
 3 files changed, 208 insertions(+), 208 deletions(-)
 create mode 100644 dev-lang/mercury/mercury-20.06-r1.ebuild
 delete mode 100644 dev-lang/mercury/mercury-20.06.ebuild

(limited to 'dev-lang/mercury')

diff --git a/dev-lang/mercury/Manifest b/dev-lang/mercury/Manifest
index f1de56062df8..dfe82b1fe60e 100644
--- a/dev-lang/mercury/Manifest
+++ b/dev-lang/mercury/Manifest
@@ -1,5 +1,5 @@
 AUX 50mercury-gentoo.el 130 BLAKE2B b0108f529cbe5b66b510b2ebab6f091825df9ac92dc1d98bc98b34532b6c217ea5ede7bc5960f6616c3a8201788c6a5094b30871fba15e5ded87eb97ab3f7c1f SHA512 e790f1b396f63bf36e57160d588b1377d3f889156446a7d26a6edd3f7175ee8ac5b8972ee4d0b6045b5442ae750341b5e06adc42f094fd6d08f2b519f4432071
 DIST mercury-20.06-gentoo-patchset-1.tar.gz 4555 BLAKE2B 8609ba7cd43d82ceb6b6e25fd6af3b2c750df6446c1235bd9c6f8e3bc87bb1fe0a43cafb9f1d061562bb80ade1deb7809889bf0d703c99ea1e2286bbeb7c5182 SHA512 23fae769c5c1204154c6ed55cc31644967e3554f499b23a6585d34615d062a214d6485de3a4acf8cf90a582a229aeab519e57a6df80cee62e9e6789f210e8256
 DIST mercury-srcdist-20.06.tar.gz 47768559 BLAKE2B f242aa2ef7da53aa2dfa054e4fee8646434d276f0748b014e33ea52d22f2a8a37e6fecaa20617f4943c4c1e7d8c179ed0603a344fde2dd58da98b2bacadf1a71 SHA512 b76bd22d8eb16242c68b614ff122ed7ee7535efef6c0ceb8cc798fee4c550bc41b6faff2135cea43b24c652b654bb35ae049656585d8e7bf3a1122d07cb1ecf4
-EBUILD mercury-20.06.ebuild 5174 BLAKE2B 2ba70a541761a17305d6cea9c36919034336fe0f61114904e1070ef23312ac1f63277a764bcad6235e2baa82e647032b276d8a9f1854df0b01867617e798903e SHA512 8ad6ca07eac5d2deb7ab6521f3d64fc749ca75a8700900417496d1977ab333d3814cefcc01228924e0c55932fc5755203e5bb49733658eccffd6fac9bef8b6e5
+EBUILD mercury-20.06-r1.ebuild 5153 BLAKE2B 2e1ccc281035b3c264f03effec1b3d65766004430df07e397dff09a082b4be033ea0eaf37ac1c10a17f47b7bab096dc98565f8ccbcb90c6bd8c181f80044dc85 SHA512 d6a94cb0a5598145b5c9f77ad946a3b440acbaa5ca45721c0cb62dd5874fc3e42d304a3f54ce2799a06d7644711e52eef4bd5cbc2b58f0a694c3b0c170967b0e
 MISC metadata.xml 384 BLAKE2B eaed468c341970157e4e641d25d5d87e0851bdbd31ba9d6c1e428c9f0239ad98220395858d6291fabe41561fb2ecc5c894700a86b290fc3cab2eaeda2a9df372 SHA512 c90a7a81ab16bac0af4bb9dd3f47cfb3987e0c3aebe08bb7ac6125baf7c619269318bd2c7a45e4213184544d981c920cace23ccb61fbb60c0872db77a10e3ecf
diff --git a/dev-lang/mercury/mercury-20.06-r1.ebuild b/dev-lang/mercury/mercury-20.06-r1.ebuild
new file mode 100644
index 000000000000..56a047bcb576
--- /dev/null
+++ b/dev-lang/mercury/mercury-20.06-r1.ebuild
@@ -0,0 +1,207 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools elisp-common flag-o-matic java-pkg-opt-2 multilib vcs-clean xdg-utils
+
+PATCHSET_VER="1"
+MY_P=${PN}-srcdist-${PV}
+
+DESCRIPTION="Mercury is a modern general-purpose logic/functional programming language"
+HOMEPAGE="https://www.mercurylang.org/index.html"
+SRC_URI="https://dl.mercurylang.org/release-20.06/${MY_P}.tar.gz
+	https://dev.gentoo.org/~keri/distfiles/mercury/${P}-gentoo-patchset-${PATCHSET_VER}.tar.gz"
+
+LICENSE="GPL-2 LGPL-2"
+SLOT="0"
+KEYWORDS="amd64 x86"
+
+IUSE="debug doc emacs erlang examples java mono profile readline threads trail"
+
+DEPEND="net-libs/libnsl:0=
+	readline? ( sys-libs/readline:= )
+	erlang? ( dev-lang/erlang )
+	java? ( >=virtual/jdk-1.8:* )
+	mono? ( dev-lang/mono )
+	doc? ( sys-apps/texinfo )"
+
+RDEPEND="${DEPEND}
+	emacs? ( >=app-editors/emacs-23.1:* )"
+
+S="${WORKDIR}"/${MY_P}
+
+SITEFILE=50${PN}-gentoo.el
+
+src_prepare() {
+	if [[ -d "${WORKDIR}"/${PV} ]] ; then
+		eapply "${WORKDIR}"/${PV}
+	fi
+	eapply_user
+
+	AT_M4DIR=m4 eautoreconf
+
+	xdg_environment_reset
+}
+
+src_configure() {
+	strip-flags
+
+	local myconf
+	myconf="--libdir=/usr/$(get_libdir) \
+		$(use_enable mono csharp-grade) \
+		$(use_enable erlang erlang-grade) \
+		$(use_enable java java-grade) \
+		$(use_enable debug debug-grades) \
+		$(use_enable profile prof-grades) \
+		$(use_enable threads par-grades) \
+		$(use_enable trail trail-grades) \
+		$(use_with readline)"
+
+	econf ${myconf}
+}
+
+src_compile() {
+	# Prepare mmake flags
+	echo "EXTRA_CFLAGS = ${CFLAGS}"  >> Mmake.params
+	echo "EXTRA_LDFLAGS = ${LDFLAGS}" >> Mmake.params
+	echo "EXTRA_LD_LIBFLAGS = ${LDFLAGS}" >> Mmake.params
+	echo "EXTRA_MLFLAGS = --no-strip" >> Mmake.params
+
+	if use trail; then
+		echo "CFLAGS-int = -O0" >> Mmake.params
+		echo "CFLAGS-uint = -O0" >> Mmake.params
+	fi
+
+	echo "EXTRA_LD_LIBFLAGS += -Wl,-soname=libgc.so" >> boehm_gc/Mmake.boehm_gc.params
+	echo "EXTRA_LD_LIBFLAGS += -Wl,-soname=libmer_rt.so" >> runtime/Mmake.runtime.params
+	echo "EXTRA_LD_LIBFLAGS += -Wl,-soname=libmer_std.so" >> library/Mmake.library.params
+
+	# Build Mercury using bootstrap grade
+	emake \
+		PARALLEL="'${MAKEOPTS}'" \
+		TEXI2DVI="" PDFTEX=""
+
+	# We can now patch .m Mercury compiler files since we
+	# have just built mercury_compiler.
+	if [[ -d "${WORKDIR}"/${PV}-mmc ]] ; then
+		eapply "${WORKDIR}"/${PV}-mmc
+	fi
+
+	# Rebuild Mercury compiler using the just built mercury_compiler
+	emake \
+		PARALLEL="'${MAKEOPTS}'" \
+		MERCURY_COMPILER="${S}"/compiler/mercury_compile \
+		TEXI2DVI="" PDFTEX=""
+
+	# The default Mercury grade may not be the same as the bootstrap
+	# grade. Since src_test() is run before src_install() we compile
+	# the default grade now
+	emake \
+		PARALLEL="'${MAKEOPTS}'" \
+		MERCURY_COMPILER="${S}"/compiler/mercury_compile \
+		TEXI2DVI="" PDFTEX="" \
+		default_grade
+}
+
+src_test() {
+	TEST_GRADE=$(scripts/ml --print-grade)
+	if [ -d "${S}"/install_grade_dir.${TEST_GRADE} ] ; then
+		TWS="${S}"/install_grade_dir.${TEST_GRADE}
+		cp runtime/mer_rt.init "${TWS}"/runtime/
+		cp mdbcomp/mer_mdbcomp.init "${TWS}"/mdbcomp/
+		cp browser/mer_browser.init "${TWS}"/browser/
+	else
+		TWS="${S}"
+	fi
+
+	cd "${S}"/tests || die
+	sed -e "s:@WORKSPACE@:${TWS}:" \
+		< WS_FLAGS.ws \
+		> WS_FLAGS \
+		|| die "sed WORKSPACE failed"
+	sed -e "s:@WORKSPACE@:${TWS}:" \
+		< .mgnuc_copts.ws \
+		> .mgnuc_copts \
+		|| die "sed WORKSPACE failed"
+	find . -mindepth 1 -type d -exec cp .mgnuc_opts  {} \;
+	find . -mindepth 1 -type d -exec cp .mgnuc_copts {} \;
+
+	# Mercury tests must be run in C locale since Mercury output is
+	# compared to hard-coded warnings/errors
+	LC_ALL="C" \
+	PATH="${TWS}"/scripts:"${TWS}"/util:"${S}"/slice:"${PATH}" \
+	TERM="" \
+	WORKSPACE="${TWS}" \
+	WORKSPACE_FLAGS=yes \
+	MERCURY_COMPILER="${TWS}"/compiler/mercury_compile \
+	MMAKE_DIR="${TWS}"/scripts \
+	MERCURY_SUPPRESS_STACK_TRACE=yes \
+	GRADE=${TEST_GRADE} \
+		mmake || die "mmake test failed"
+}
+
+src_install() {
+	emake \
+		PARALLEL="'${MAKEOPTS}'" \
+		MERCURY_COMPILER="${S}"/compiler/mercury_compile \
+		TEXI2DVI="" PDFTEX="" \
+		DESTDIR="${D}" \
+		INSTALL_ELISP_DIR="${D}/${SITELISP}"/${PN} \
+		install
+
+	if use java; then
+		keepdir /usr/$(get_libdir)/mercury/modules/java
+	fi
+
+	if use mono; then
+		keepdir /usr/$(get_libdir)/mercury/modules/csharp
+	fi
+
+	if use emacs; then
+		elisp-site-file-install "${FILESDIR}/${SITEFILE}" \
+			|| die "elisp-site-file-install failed"
+	fi
+
+	dodoc \
+		BUGS HISTORY LIMITATIONS NEWS README README.Linux \
+		README.Linux-Alpha README.Linux-m68k README.Linux-PPC \
+		RELEASE_NOTES VERSION || die
+
+	if use erlang; then
+		dodoc README.Erlang
+	fi
+
+	if use java; then
+		dodoc README.Java
+	fi
+
+	if use mono; then
+		dodoc README.CSharp
+	fi
+
+	if use examples; then
+		docinto samples
+		dodoc samples/{*.m,README,Mmakefile}
+		dodoc -r samples/c_interface \
+			samples/diff \
+			samples/muz \
+			samples/rot13 \
+			samples/solutions \
+			samples/solver_types
+
+		if use java; then
+			dodoc -r samples/java_interface
+		fi
+
+		ecvs_clean "${D}"/usr/share/doc/${PF}/samples
+	fi
+}
+
+pkg_postinst() {
+	use emacs && elisp-site-regen
+}
+
+pkg_postrm() {
+	use emacs && elisp-site-regen
+}
diff --git a/dev-lang/mercury/mercury-20.06.ebuild b/dev-lang/mercury/mercury-20.06.ebuild
deleted file mode 100644
index be12f843b0ea..000000000000
--- a/dev-lang/mercury/mercury-20.06.ebuild
+++ /dev/null
@@ -1,207 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools elisp-common flag-o-matic java-pkg-opt-2 multilib vcs-clean xdg-utils
-
-PATCHSET_VER="1"
-MY_P=${PN}-srcdist-${PV}
-
-DESCRIPTION="Mercury is a modern general-purpose logic/functional programming language"
-HOMEPAGE="https://www.mercurylang.org/index.html"
-SRC_URI="https://dl.mercurylang.org/release-20.06/${MY_P}.tar.gz
-	https://dev.gentoo.org/~keri/distfiles/mercury/${P}-gentoo-patchset-${PATCHSET_VER}.tar.gz"
-
-LICENSE="GPL-2 LGPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-IUSE="debug doc emacs erlang examples java mono profile readline threads trail"
-
-DEPEND="net-libs/libnsl:0=
-	readline? ( sys-libs/readline:= )
-	erlang? ( dev-lang/erlang )
-	java? ( >=virtual/jdk-1.8:* )
-	mono? ( dev-lang/mono )
-	doc? ( sys-apps/texinfo )"
-
-RDEPEND="${DEPEND}
-	emacs? ( >=app-editors/emacs-23.1:* )"
-
-S="${WORKDIR}"/${MY_P}
-
-SITEFILE=50${PN}-gentoo.el
-
-src_prepare() {
-	if [[ -d "${WORKDIR}"/${PV} ]] ; then
-		eapply "${WORKDIR}"/${PV}
-	fi
-	eapply_user
-
-	AT_M4DIR=m4 eautoreconf
-
-	xdg_environment_reset
-}
-
-src_configure() {
-	strip-flags
-
-	local myconf
-	myconf="--libdir=/usr/$(get_libdir) \
-		$(use_enable mono csharp-grade) \
-		$(use_enable erlang erlang-grade) \
-		$(use_enable java java-grade) \
-		$(use_enable debug debug-grades) \
-		$(use_enable profile prof-grades) \
-		$(use_enable threads par-grades) \
-		$(use_enable trail trail-grades) \
-		$(use_with readline)"
-
-	econf ${myconf}
-}
-
-src_compile() {
-	# Prepare mmake flags
-	echo "EXTRA_CFLAGS = ${CFLAGS}"  >> Mmake.params
-	echo "EXTRA_LDFLAGS = ${LDFLAGS}" >> Mmake.params
-	echo "EXTRA_LD_LIBFLAGS = ${LDFLAGS}" >> Mmake.params
-	echo "EXTRA_MLFLAGS = --no-strip" >> Mmake.params
-
-	if use trail; then
-		echo "CFLAGS-int = -O0" >> Mmake.params
-		echo "CFLAGS-uint = -O0" >> Mmake.params
-	fi
-
-	echo "EXTRA_LD_LIBFLAGS += -Wl,-soname=libgc.so" >> boehm_gc/Mmake.boehm_gc.params
-	echo "EXTRA_LD_LIBFLAGS += -Wl,-soname=libmer_rt.so" >> runtime/Mmake.runtime.params
-	echo "EXTRA_LD_LIBFLAGS += -Wl,-soname=libmer_std.so" >> library/Mmake.library.params
-
-	# Build Mercury using bootstrap grade
-	emake \
-		PARALLEL="'${MAKEOPTS}'" \
-		TEXI2DVI="" PDFTEX=""
-
-	# We can now patch .m Mercury compiler files since we
-	# have just built mercury_compiler.
-	if [[ -d "${WORKDIR}"/${PV}-mmc ]] ; then
-		eapply "${WORKDIR}"/${PV}-mmc
-	fi
-
-	# Rebuild Mercury compiler using the just built mercury_compiler
-	emake \
-		PARALLEL="'${MAKEOPTS}'" \
-		MERCURY_COMPILER="${S}"/compiler/mercury_compile \
-		TEXI2DVI="" PDFTEX=""
-
-	# The default Mercury grade may not be the same as the bootstrap
-	# grade. Since src_test() is run before src_install() we compile
-	# the default grade now
-	emake \
-		PARALLEL="'${MAKEOPTS}'" \
-		MERCURY_COMPILER="${S}"/compiler/mercury_compile \
-		TEXI2DVI="" PDFTEX="" \
-		default_grade
-}
-
-src_test() {
-	TEST_GRADE=$(scripts/ml --print-grade)
-	if [ -d "${S}"/install_grade_dir.${TEST_GRADE} ] ; then
-		TWS="${S}"/install_grade_dir.${TEST_GRADE}
-		cp runtime/mer_rt.init "${TWS}"/runtime/
-		cp mdbcomp/mer_mdbcomp.init "${TWS}"/mdbcomp/
-		cp browser/mer_browser.init "${TWS}"/browser/
-	else
-		TWS="${S}"
-	fi
-
-	cd "${S}"/tests || die
-	sed -e "s:@WORKSPACE@:${TWS}:" \
-		< WS_FLAGS.ws \
-		> WS_FLAGS \
-		|| die "sed WORKSPACE failed"
-	sed -e "s:@WORKSPACE@:${TWS}:" \
-		< .mgnuc_copts.ws \
-		> .mgnuc_copts \
-		|| die "sed WORKSPACE failed"
-	find . -mindepth 1 -type d -exec cp .mgnuc_opts  {} \;
-	find . -mindepth 1 -type d -exec cp .mgnuc_copts {} \;
-
-	# Mercury tests must be run in C locale since Mercury output is
-	# compared to hard-coded warnings/errors
-	LC_ALL="C" \
-	PATH="${TWS}"/scripts:"${TWS}"/util:"${S}"/slice:"${PATH}" \
-	TERM="" \
-	WORKSPACE="${TWS}" \
-	WORKSPACE_FLAGS=yes \
-	MERCURY_COMPILER="${TWS}"/compiler/mercury_compile \
-	MMAKE_DIR="${TWS}"/scripts \
-	MERCURY_SUPPRESS_STACK_TRACE=yes \
-	GRADE=${TEST_GRADE} \
-		mmake || die "mmake test failed"
-}
-
-src_install() {
-	emake \
-		PARALLEL="'${MAKEOPTS}'" \
-		MERCURY_COMPILER="${S}"/compiler/mercury_compile \
-		TEXI2DVI="" PDFTEX="" \
-		DESTDIR="${D}" \
-		INSTALL_ELISP_DIR="${D}/${SITELISP}"/${PN} \
-		install
-
-	if use java; then
-		keepdir /usr/$(get_libdir)/mercury/modules/java
-	fi
-
-	if use mono; then
-		keepdir /usr/$(get_libdir)/mercury/modules/csharp
-	fi
-
-	if use emacs; then
-		elisp-site-file-install "${FILESDIR}/${SITEFILE}" \
-			|| die "elisp-site-file-install failed"
-	fi
-
-	dodoc \
-		BUGS HISTORY LIMITATIONS NEWS README README.Linux \
-		README.Linux-Alpha README.Linux-m68k README.Linux-PPC \
-		RELEASE_NOTES VERSION || die
-
-	if use erlang; then
-		dodoc README.Erlang
-	fi
-
-	if use java; then
-		dodoc README.Java
-	fi
-
-	if use mono; then
-		dodoc README.CSharp
-	fi
-
-	if use examples; then
-		docinto /usr/share/doc/${PF}/samples
-		dodoc samples/{*.m,README,Mmakefile}
-		dodoc -r samples/c_interface \
-			samples/diff \
-			samples/muz \
-			samples/rot13 \
-			samples/solutions \
-			samples/solver_types
-
-		if use java; then
-			dodoc -r samples/java_interface
-		fi
-
-		ecvs_clean "${D}"/usr/share/doc/${PF}/samples
-	fi
-}
-
-pkg_postinst() {
-	use emacs && elisp-site-regen
-}
-
-pkg_postrm() {
-	use emacs && elisp-site-regen
-}
-- 
cgit v1.2.3