From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id A56F9138334 for ; Sat, 27 Oct 2018 07:01:38 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 4DB91E09AB; Sat, 27 Oct 2018 07:01:37 +0000 (UTC) Received: from smtp.gentoo.org (dev.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 062A6E09AB for ; Sat, 27 Oct 2018 07:01:36 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id ABF28335C7D for ; Sat, 27 Oct 2018 07:01:34 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 2314B43D for ; Sat, 27 Oct 2018 07:01:33 +0000 (UTC) From: "Keri Harris" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Keri Harris" Message-ID: <1540623579.7705e75fb7f8e5035566a77e0951cc48a30e3913.keri@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-lang/mercury/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-lang/mercury/Manifest dev-lang/mercury/mercury-13.05.2.ebuild dev-lang/mercury/mercury-14.01.ebuild X-VCS-Directories: dev-lang/mercury/ X-VCS-Committer: keri X-VCS-Committer-Name: Keri Harris X-VCS-Revision: 7705e75fb7f8e5035566a77e0951cc48a30e3913 X-VCS-Branch: master Date: Sat, 27 Oct 2018 07:01:33 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 8f543491-b0af-45a9-9c4a-1daf36bc8e1f X-Archives-Hash: 535a55975c096be1f749edaa86697774 commit: 7705e75fb7f8e5035566a77e0951cc48a30e3913 Author: Keri Harris gentoo org> AuthorDate: Sat Oct 27 06:59:39 2018 +0000 Commit: Keri Harris gentoo org> CommitDate: Sat Oct 27 06:59:39 2018 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7705e75f dev-lang/mercury: remove old versions Signed-off-by: Keri Harris gentoo.org> Package-Manager: Portage-2.3.40, Repoman-2.3.9 dev-lang/mercury/Manifest | 4 - dev-lang/mercury/mercury-13.05.2.ebuild | 198 ------------------------------- dev-lang/mercury/mercury-14.01.ebuild | 203 -------------------------------- 3 files changed, 405 deletions(-) diff --git a/dev-lang/mercury/Manifest b/dev-lang/mercury/Manifest index 92b1f14cc0b..0b2d28d0261 100644 --- a/dev-lang/mercury/Manifest +++ b/dev-lang/mercury/Manifest @@ -1,6 +1,2 @@ -DIST mercury-13.05.2-gentoo-patchset-1.tar.gz 5622 BLAKE2B c22b3c21a53d10e564b703adbcde2d7986aecad378fc7f904642ad1c59e7de8a1a34c302309a03f35927782eaaa36d9b3f639fd654750d36c1af612b97cb35af SHA512 387956a120b2bbb7da1913e89cf33e7bdb8f205fe207701a33d19ccb667d1ae73a342955642120822448621bdba349ab628290d78fdef35c08b9ccbadda4177f -DIST mercury-14.01-gentoo-patchset-0.tar.gz 5728 BLAKE2B acfc49facf63c3ce4dc50463a5cd38fbfe45bc463b619c1e01d653bfe13172ce9773a3c652c0ad9f1f929ad7806d0e69327249575a2065b77a9ac02de2188469 SHA512 f1e375ac192e478a82863aa7b8e28c1044a490c41bb63f7842b16b12b7cfa9c85938eacad4c3eacf348aafd42dfaa0dea5324b734d0d2a7454e3e9334369658e DIST mercury-14.01.1-gentoo-patchset-3.tar.gz 4676 BLAKE2B 05a927ff9785fc03a94e56e2abc50f38692dbc81462e107be2b1982ea4a09916066420bef2a95c505c1a475aaa318a1679a3f377a3ac100e57493c987768d10f SHA512 acf3c04dbcf2700e6543d4a0085bad5de8e752c77f1a1f2d456ec57121e956e41cb22438a61ce602c9a355e9ad943ec27ae73c35433599e3252f2b382ee432d5 -DIST mercury-srcdist-13.05.2.tar.gz 53847394 BLAKE2B 23d2f8de6e9a4a2803fca9f3dec73215f6636389fdf388ef950042eff2ee43671577120f8324b309786d463e30ba9360d2df07ee498d78800182096f8773697e SHA512 2298804d3a04bca6be4bd3046643c7c0d0b22c447423017869cd9bf3a4fb6ec9fd29b5d8e1a386d5d52d07be5cad73608f1fcacf46732a7add93a01dcd199c08 DIST mercury-srcdist-14.01.1.tar.gz 52658945 BLAKE2B 6497921a0227b9a6fbcbabdd309ef3325f32dda14fc4ddb443368385b89be4011d677a24b30b3702147d1b782fe2597760ad66dd34503aa6aebaf79707466529 SHA512 a128ef0fd4955abadea32019ec59297ffe32537415f32e9e948cbc1c3439bb40eb09de77569690fb18dd7d6969a2b1141b3ae5baeb87f2627eaa65ad93add92c -DIST mercury-srcdist-14.01.tar.gz 52683989 BLAKE2B 32fa014f08ad6a7a4ca62dd08a460620f0c60d311021f3643a81868acdd1eb58150caca81b18612f760125c339a25ed908862e17e38b65dd56bde8c8bd0bffb0 SHA512 77f61df64fc150e08f191860f285b97d11a71a52eabc95f660b3c90d88f8ee71d1227f7ab4b8be78be9d4aa3d62a260a874020023e4795da4cfd2e6fefa9965f diff --git a/dev-lang/mercury/mercury-13.05.2.ebuild b/dev-lang/mercury/mercury-13.05.2.ebuild deleted file mode 100644 index 99339c2a2bc..00000000000 --- a/dev-lang/mercury/mercury-13.05.2.ebuild +++ /dev/null @@ -1,198 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=2 - -inherit autotools elisp-common eutils flag-o-matic java-pkg-opt-2 multilib xdg-utils - -PATCHSET_VER="1" -MY_P=${PN}-srcdist-${PV} - -DESCRIPTION="Mercury is a modern general-purpose logic/functional programming language" -HOMEPAGE="http://www.mercurylang.org/index.html" -SRC_URI="http://dl.mercurylang.org/release/${MY_P}.tar.gz - mirror://gentoo/${P}-gentoo-patchset-${PATCHSET_VER}.tar.gz" - -LICENSE="GPL-2 LGPL-2" -SLOT="0" -KEYWORDS="amd64 x86" - -IUSE="debug emacs erlang examples java minimal readline threads" - -DEPEND="!dev-libs/mpatrol - !dev-util/mono-debugger - readline? ( sys-libs/readline ) - erlang? ( dev-lang/erlang ) - java? ( >=virtual/jdk-1.5 )" - -RDEPEND="${DEPEND} - emacs? ( virtual/emacs )" - -S="${WORKDIR}"/${MY_P} - -SITEFILE=50${PN}-gentoo.el - -src_prepare() { - cd "${WORKDIR}" || die - EPATCH_FORCE=yes - EPATCH_SUFFIX=patch - epatch "${WORKDIR}"/${PV} - - sed -i -e "s/@libdir@/$(get_libdir)/" \ - "${S}"/scripts/Mmake.vars.in \ - || die "sed libdir failed" - - cd "${S}" || die - eautoconf - - xdg_environment_reset -} - -src_configure() { - strip-flags - - local myconf - myconf="--libdir=/usr/$(get_libdir) \ - --disable-deep-profiler \ - --disable-dotnet-grades \ - --without-hwloc \ - $(use_enable erlang erlang-grade) \ - $(use_enable java java-grade) \ - $(use_enable debug debug-grades) \ - $(use_enable threads par-grades) \ - $(use_enable !minimal most-grades) \ - $(use_with readline)" - - econf ${myconf} -} - -src_compile() { - # Build Mercury using base llds grade - emake \ - PARALLEL="'${MAKEOPTS}'" \ - MMAKEFLAGS="EXTRA_MLFLAGS=--no-strip \ - EXTRA_LDFLAGS='${LDFLAGS}' \ - EXTRA_LD_LIBFLAGS='${LDFLAGS}'" \ - || die "emake failed" - - # We can now patch .m Mercury compiler files since we - # have just built mercury_compiler. - EPATCH_FORCE=yes - EPATCH_SUFFIX=patch - epatch "${WORKDIR}"/${PV}-mmc - - sed -i -e "s/@libdir@/$(get_libdir)/" \ - "${S}"/compiler/file_util.m \ - "${S}"/compiler/make.program_target.m \ - || die "sed libdir failed" - - # Rebuild Mercury compiler using the just built mercury_compiler - emake \ - PARALLEL="'${MAKEOPTS}'" \ - MMAKEFLAGS="EXTRA_MLFLAGS=--no-strip \ - EXTRA_LDFLAGS='${LDFLAGS}' \ - EXTRA_LD_LIBFLAGS='${LDFLAGS}'" \ - MERCURY_COMPILER="${S}"/compiler/mercury_compile \ - compiler || die "emake compiler failed" - - # The default Mercury grade may not be the same as the grade used to - # compile the llds base grade. Since src_test() is run before - # src_install() we compile the default grade now - emake \ - PARALLEL="'${MAKEOPTS}'" \ - MMAKEFLAGS="EXTRA_MLFLAGS=--no-strip \ - EXTRA_LDFLAGS='${LDFLAGS}' \ - EXTRA_LD_LIBFLAGS='${LDFLAGS}'" \ - MERCURY_COMPILER="${S}"/compiler/mercury_compile \ - default_grade || die "emake default_grade failed" -} - -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" - - # 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} \ - MERCURY_ALL_LOCAL_C_INCL_DIRS=" -I${TWS}/boehm_gc/include \ - -I${TWS}/runtime \ - -I${TWS}/library" \ - mmake || die "mmake test failed" -} - -src_install() { - emake \ - PARALLEL="'${MAKEOPTS}'" \ - MMAKEFLAGS="EXTRA_MLFLAGS=--no-strip \ - EXTRA_LDFLAGS='${LDFLAGS}' \ - EXTRA_LD_LIBFLAGS='${LDFLAGS}'" \ - MERCURY_COMPILER="${S}"/compiler/mercury_compile \ - INSTALL_PREFIX="${D}"/usr \ - INSTALL_MAN_DIR="${D}"/usr/share/man \ - INSTALL_INFO_DIR="${D}"/usr/share/info \ - INSTALL_HTML_DIR="${D}"/usr/share/doc/${PF}/html \ - INSTALL_ELISP_DIR="${D}/${SITELISP}"/${PN} \ - install || die "emake install failed" - - 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 TODO VERSION WORK_IN_PROGRESS || die - - if use erlang; then - dodoc README.Erlang || die - fi - - if use java; then - dodoc README.Java || die - fi - - if use examples; then - insinto /usr/share/doc/${PF}/samples - doins samples/{*.m,README,Mmakefile} || die - doins -r samples/c_interface \ - samples/diff \ - samples/muz \ - samples/rot13 \ - samples/solutions \ - samples/solver_types || die - - if use java; then - doins -r samples/java_interface || die - 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-14.01.ebuild b/dev-lang/mercury/mercury-14.01.ebuild deleted file mode 100644 index 3ef81523eda..00000000000 --- a/dev-lang/mercury/mercury-14.01.ebuild +++ /dev/null @@ -1,203 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -inherit autotools elisp-common eutils flag-o-matic java-pkg-opt-2 multilib xdg-utils - -PATCHSET_VER="0" -MY_P=${PN}-srcdist-${PV} - -DESCRIPTION="Mercury is a modern general-purpose logic/functional programming language" -HOMEPAGE="http://www.mercurylang.org/index.html" -SRC_URI="http://dl.mercurylang.org/release/${MY_P}.tar.gz - mirror://gentoo/${P}-gentoo-patchset-${PATCHSET_VER}.tar.gz" - -LICENSE="GPL-2 LGPL-2" -SLOT="0" -KEYWORDS="~amd64 ~x86" - -IUSE="debug emacs erlang examples java minimal readline threads" - -DEPEND="!dev-libs/mpatrol - !dev-util/mono-debugger - net-libs/libnsl:0= - readline? ( sys-libs/readline:= ) - erlang? ( dev-lang/erlang ) - java? ( >=virtual/jdk-1.6:= )" - -RDEPEND="${DEPEND} - emacs? ( virtual/emacs )" - -S="${WORKDIR}"/${MY_P} - -SITEFILE=50${PN}-gentoo.el - -src_prepare() { - cd "${WORKDIR}" || die - EPATCH_FORCE=yes - EPATCH_SUFFIX=patch - if [[ -d "${WORKDIR}"/${PV} ]] ; then - epatch "${WORKDIR}"/${PV} - fi - - sed -i -e "s/@libdir@/$(get_libdir)/" \ - "${S}"/scripts/Mmake.vars.in \ - || die "sed libdir failed" - - cd "${S}" || die - eautoconf - - xdg_environment_reset -} - -src_configure() { - strip-flags - - local myconf - myconf="--libdir=/usr/$(get_libdir) \ - --disable-deep-profiler \ - --disable-dotnet-grades \ - --without-hwloc \ - $(use_enable erlang erlang-grade) \ - $(use_enable java java-grade) \ - $(use_enable debug debug-grades) \ - $(use_enable threads par-grades) \ - $(use_enable !minimal most-grades) \ - $(use_with readline)" - - econf ${myconf} -} - -src_compile() { - # Build Mercury using base llds grade - emake \ - PARALLEL="'${MAKEOPTS}'" \ - MMAKEFLAGS="EXTRA_MLFLAGS=--no-strip \ - EXTRA_CFLAGS='${CFLAGS}' \ - EXTRA_LDFLAGS='${LDFLAGS}'" \ - || die "emake failed" - - # We can now patch .m Mercury compiler files since we - # have just built mercury_compiler. - EPATCH_FORCE=yes - EPATCH_SUFFIX=patch - if [[ -d "${WORKDIR}"/${PV}-mmc ]] ; then - epatch "${WORKDIR}"/${PV}-mmc - fi - - sed -i -e "s/@libdir@/$(get_libdir)/" \ - "${S}"/compiler/file_util.m \ - "${S}"/compiler/make.program_target.m \ - || die "sed libdir failed" - - # Rebuild Mercury compiler using the just built mercury_compiler - emake \ - PARALLEL="'${MAKEOPTS}'" \ - MMAKEFLAGS="EXTRA_MLFLAGS=--no-strip \ - EXTRA_CFLAGS='${CFLAGS}' \ - EXTRA_LDFLAGS='${LDFLAGS}'" \ - MERCURY_COMPILER="${S}"/compiler/mercury_compile \ - compiler || die "emake compiler failed" - - # The default Mercury grade may not be the same as the grade used to - # compile the llds base grade. Since src_test() is run before - # src_install() we compile the default grade now - emake \ - PARALLEL="'${MAKEOPTS}'" \ - MMAKEFLAGS="EXTRA_MLFLAGS=--no-strip \ - EXTRA_CFLAGS='${CFLAGS}' \ - EXTRA_LDFLAGS='${LDFLAGS}'" \ - MERCURY_COMPILER="${S}"/compiler/mercury_compile \ - default_grade || die "emake default_grade failed" -} - -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" - - # 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} \ - MERCURY_ALL_LOCAL_C_INCL_DIRS=" -I${TWS}/boehm_gc/include \ - -I${TWS}/runtime \ - -I${TWS}/library" \ - mmake || die "mmake test failed" -} - -src_install() { - emake \ - PARALLEL="'${MAKEOPTS}'" \ - MMAKEFLAGS="EXTRA_MLFLAGS=--no-strip \ - EXTRA_CFLAGS='${CFLAGS}' \ - EXTRA_LDFLAGS='${LDFLAGS}'" \ - MERCURY_COMPILER="${S}"/compiler/mercury_compile \ - INSTALL_PREFIX="${D}"/usr \ - INSTALL_MAN_DIR="${D}"/usr/share/man \ - INSTALL_INFO_DIR="${D}"/usr/share/info \ - INSTALL_HTML_DIR="${D}"/usr/share/doc/${PF}/html \ - INSTALL_ELISP_DIR="${D}/${SITELISP}"/${PN} \ - install || die "emake install failed" - - 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 TODO VERSION WORK_IN_PROGRESS || die - - if use erlang; then - dodoc README.Erlang || die - fi - - if use java; then - dodoc README.Java || die - fi - - if use examples; then - insinto /usr/share/doc/${PF}/samples - doins samples/{*.m,README,Mmakefile} || die - doins -r samples/c_interface \ - samples/diff \ - samples/muz \ - samples/rot13 \ - samples/solutions \ - samples/solver_types || die - - if use java; then - doins -r samples/java_interface || die - fi - - ecvs_clean "${D}"/usr/share/doc/${PF}/samples - fi -} - -pkg_postinst() { - use emacs && elisp-site-regen -} - -pkg_postrm() { - use emacs && elisp-site-regen -}