diff options
author | V3n3RiX <venerix@redcorelinux.org> | 2018-10-27 12:48:57 +0100 |
---|---|---|
committer | V3n3RiX <venerix@redcorelinux.org> | 2018-10-27 12:48:57 +0100 |
commit | 70b82ae359a5538711e103b0e8dfb92654296644 (patch) | |
tree | 8412b84ff9ce02a22be5251052b00feefe1d5b70 /dev-lang/mercury | |
parent | 64e107b9b6058580ff0432107eb37cefb0b2a7d8 (diff) |
gentoo resync : 27.10.2018
Diffstat (limited to 'dev-lang/mercury')
-rw-r--r-- | dev-lang/mercury/Manifest | 8 | ||||
-rw-r--r-- | dev-lang/mercury/mercury-13.05.2.ebuild | 198 | ||||
-rw-r--r-- | dev-lang/mercury/mercury-14.01.1.ebuild | 9 | ||||
-rw-r--r-- | dev-lang/mercury/mercury-14.01.ebuild | 203 |
4 files changed, 8 insertions, 410 deletions
diff --git a/dev-lang/mercury/Manifest b/dev-lang/mercury/Manifest index 47d0e278db6a..ebb69e5f84e9 100644 --- a/dev-lang/mercury/Manifest +++ b/dev-lang/mercury/Manifest @@ -1,11 +1,5 @@ AUX 50mercury-gentoo.el 130 BLAKE2B b0108f529cbe5b66b510b2ebab6f091825df9ac92dc1d98bc98b34532b6c217ea5ede7bc5960f6616c3a8201788c6a5094b30871fba15e5ded87eb97ab3f7c1f SHA512 e790f1b396f63bf36e57160d588b1377d3f889156446a7d26a6edd3f7175ee8ac5b8972ee4d0b6045b5442ae750341b5e06adc42f094fd6d08f2b519f4432071 -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 -EBUILD mercury-13.05.2.ebuild 5152 BLAKE2B b8dc2001cb09c8e2d650c5da88e547033deb0658a25b622722cbabed16d93a13a571b62ff19b67c5abf576ceab44c11641d934bcd88e646cd2c54779d4532953 SHA512 6f8626feb482d14df74dfc92b2ede7dcf2bf20123d35844ccb6be82d930a89aefa50595f9e06ba9f4f3eeec37facaea2001bcc27452106f398b72db1d24d5a42 -EBUILD mercury-14.01.1.ebuild 5641 BLAKE2B 8cd31808725d2ff9a7c0d514354490ffeccaa983849f1ba680103fd7a691da469501d8da7aed37be1281309f11e92762f874fbedd2b02bee6b1b4e1629047e29 SHA512 d8f9585ab946319246d43df724a4c63dbb608ebc93f123ca68038211bbb210c31247212c8a0029a561c932c2edf3aa336a1fca7c2058007bef46452e64f75a3c -EBUILD mercury-14.01.ebuild 5246 BLAKE2B 2dea0f6f2c474e48e3a189ffd366fb5501bcfb1fc1d82782a5a3f65a3a59a2ab32542b91a65375cc682da66df955cc5e78690b92f5b4d347c9c25b54c2b04ae0 SHA512 11ea88c393886743c926f0ee5fb19f6e2b1ce9386f1c2a5dcd6d9afde23a70d63af31217f3148ed26359300c180a6ceadbebc9be6d52f290d6bd108eed5c79e1 +EBUILD mercury-14.01.1.ebuild 5776 BLAKE2B c10d6796feb3444789d94f197cd3a749c56397bb44bcca1eadcaed4292262dadb93041ebfa3937cbdc113d2632a9b35302158f341b9eb1549ac79eb706407b2d SHA512 719728c2b2aca118f788fba427cc6dee1a72f670c1119924f1054c6edefed6e14c766555f96260e2111702f9dc26a52e26274a6d9b7d764683738352033b0691 MISC metadata.xml 384 BLAKE2B eaed468c341970157e4e641d25d5d87e0851bdbd31ba9d6c1e428c9f0239ad98220395858d6291fabe41561fb2ecc5c894700a86b290fc3cab2eaeda2a9df372 SHA512 c90a7a81ab16bac0af4bb9dd3f47cfb3987e0c3aebe08bb7ac6125baf7c619269318bd2c7a45e4213184544d981c920cace23ccb61fbb60c0872db77a10e3ecf 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 99339c2a2bc4..000000000000 --- 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.1.ebuild b/dev-lang/mercury/mercury-14.01.1.ebuild index ff23c0e2a730..f09175693e3e 100644 --- a/dev-lang/mercury/mercury-14.01.1.ebuild +++ b/dev-lang/mercury/mercury-14.01.1.ebuild @@ -17,7 +17,7 @@ LICENSE="GPL-2 LGPL-2" SLOT="0" KEYWORDS="amd64 x86" -IUSE="debug emacs erlang examples java mono profile readline threads trail" +IUSE="debug doc emacs erlang examples java mono profile readline threads trail" DEPEND="!dev-libs/mpatrol !dev-util/mono-debugger @@ -25,7 +25,8 @@ DEPEND="!dev-libs/mpatrol readline? ( sys-libs/readline:= ) erlang? ( dev-lang/erlang ) java? ( >=virtual/jdk-1.6:= ) - mono? ( dev-lang/mono )" + mono? ( dev-lang/mono ) + doc? ( sys-apps/texinfo )" RDEPEND="${DEPEND} emacs? ( virtual/emacs )" @@ -87,6 +88,7 @@ src_compile() { # Build Mercury using bootstrap grade emake \ PARALLEL="'${MAKEOPTS}'" \ + TEXI2DVI="" PDFTEX="" \ || die "emake failed" # We can now patch .m Mercury compiler files since we @@ -106,6 +108,7 @@ src_compile() { emake \ PARALLEL="'${MAKEOPTS}'" \ MERCURY_COMPILER="${S}"/compiler/mercury_compile \ + TEXI2DVI="" PDFTEX="" \ compiler || die "emake compiler failed" # The default Mercury grade may not be the same as the bootstrap @@ -114,6 +117,7 @@ src_compile() { emake \ PARALLEL="'${MAKEOPTS}'" \ MERCURY_COMPILER="${S}"/compiler/mercury_compile \ + TEXI2DVI="" PDFTEX="" \ default_grade || die "emake default_grade failed" } @@ -158,6 +162,7 @@ src_install() { emake \ PARALLEL="'${MAKEOPTS}'" \ MERCURY_COMPILER="${S}"/compiler/mercury_compile \ + TEXI2DVI="" PDFTEX="" \ DESTDIR="${D}" \ INSTALL_PREFIX="${D}"/usr \ INSTALL_MAN_DIR="${D}"/usr/share/man \ diff --git a/dev-lang/mercury/mercury-14.01.ebuild b/dev-lang/mercury/mercury-14.01.ebuild deleted file mode 100644 index 3ef81523edac..000000000000 --- 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 -} |