diff options
| author | V3n3RiX <venerix@redcorelinux.org> | 2019-12-15 18:09:03 +0000 |
|---|---|---|
| committer | V3n3RiX <venerix@redcorelinux.org> | 2019-12-15 18:09:03 +0000 |
| commit | 7bc9c63c9da678a7e6fceb095d56c634afd22c56 (patch) | |
| tree | 4a67d50a439e9af63947e5f8b6ba3719af98b6c9 /dev-lang/mercury | |
| parent | b284a3168fa91a038925d2ecf5e4791011ea5e7d (diff) | |
gentoo resync : 15.12.2019
Diffstat (limited to 'dev-lang/mercury')
| -rw-r--r-- | dev-lang/mercury/Manifest | 2 | ||||
| -rw-r--r-- | dev-lang/mercury/mercury-14.01.1-r1.ebuild | 19 |
2 files changed, 10 insertions, 11 deletions
diff --git a/dev-lang/mercury/Manifest b/dev-lang/mercury/Manifest index dd9ffad20815..8ca5a92ae914 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-14.01.1-gentoo-patchset-4.tar.gz 4903 BLAKE2B 3301e220a5d4461c268bf68f1596e2204b4f0931b20c027fcdd35128af20317eb32d646b64fceebd4958e7e4c7efd2fd289e7f57013c1f78f80ee6b97da5d91d SHA512 3fbf75fb88c8fdebefcf847acb7959fe582503922f0cbb6c234f18a56cea8153eaf2325db3b827e8cc802803c9ecf9e755493a895c4a15445dc406ac143d0200 DIST mercury-srcdist-14.01.1.tar.gz 52658945 BLAKE2B 6497921a0227b9a6fbcbabdd309ef3325f32dda14fc4ddb443368385b89be4011d677a24b30b3702147d1b782fe2597760ad66dd34503aa6aebaf79707466529 SHA512 a128ef0fd4955abadea32019ec59297ffe32537415f32e9e948cbc1c3439bb40eb09de77569690fb18dd7d6969a2b1141b3ae5baeb87f2627eaa65ad93add92c -EBUILD mercury-14.01.1-r1.ebuild 5776 BLAKE2B 1523808cb99bb4c9681f398e51cb194d92cf80eff8776026a319d900b94d52a41ed4708a77daea708a2d22c8f04b3a1779863271f4452da437f8c23e7a129a1f SHA512 2ba8eee927b8848067fc1bc66099c2c704977cd9bc6710906f9dcc01fc00bb1771884eb1dd79f61ed292ed7f04e8f3d676afc65a21f9eb720fc9bc76db023b0b +EBUILD mercury-14.01.1-r1.ebuild 5618 BLAKE2B 4927ef283d123ebab4c1c427f6d4ec2ccc90b7d3d2e760b381158912543b1a0e5f7ae30e26cf3f7a3b2202319380469e57ae55daef95a01eabcf9caaa48d794d SHA512 3077841c51816fc180bda350c91e76f84dc644fe65fe5bc5157ecbe24a4624d373bbd83bbff5a913fb919e9c14772c046cac587a3c07444f09c9fdf6fd0b6651 MISC metadata.xml 384 BLAKE2B eaed468c341970157e4e641d25d5d87e0851bdbd31ba9d6c1e428c9f0239ad98220395858d6291fabe41561fb2ecc5c894700a86b290fc3cab2eaeda2a9df372 SHA512 c90a7a81ab16bac0af4bb9dd3f47cfb3987e0c3aebe08bb7ac6125baf7c619269318bd2c7a45e4213184544d981c920cace23ccb61fbb60c0872db77a10e3ecf diff --git a/dev-lang/mercury/mercury-14.01.1-r1.ebuild b/dev-lang/mercury/mercury-14.01.1-r1.ebuild index 21f002551abb..25c4317109dd 100644 --- a/dev-lang/mercury/mercury-14.01.1-r1.ebuild +++ b/dev-lang/mercury/mercury-14.01.1-r1.ebuild @@ -88,8 +88,7 @@ src_compile() { # Build Mercury using bootstrap grade emake \ PARALLEL="'${MAKEOPTS}'" \ - TEXI2DVI="" PDFTEX="" \ - || die "emake failed" + TEXI2DVI="" PDFTEX="" # We can now patch .m Mercury compiler files since we # have just built mercury_compiler. @@ -109,7 +108,7 @@ src_compile() { PARALLEL="'${MAKEOPTS}'" \ MERCURY_COMPILER="${S}"/compiler/mercury_compile \ TEXI2DVI="" PDFTEX="" \ - compiler || die "emake compiler failed" + compiler # The default Mercury grade may not be the same as the bootstrap # grade. Since src_test() is run before src_install() we compile @@ -118,7 +117,7 @@ src_compile() { PARALLEL="'${MAKEOPTS}'" \ MERCURY_COMPILER="${S}"/compiler/mercury_compile \ TEXI2DVI="" PDFTEX="" \ - default_grade || die "emake default_grade failed" + default_grade } src_test() { @@ -169,7 +168,7 @@ src_install() { 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" + install if use java; then keepdir /usr/$(get_libdir)/mercury/modules/java @@ -190,25 +189,25 @@ src_install() { RELEASE_NOTES TODO VERSION WORK_IN_PROGRESS || die if use erlang; then - dodoc README.Erlang || die + dodoc README.Erlang fi if use java; then - dodoc README.Java || die + dodoc README.Java fi if use examples; then insinto /usr/share/doc/${PF}/samples - doins samples/{*.m,README,Mmakefile} || die + doins samples/{*.m,README,Mmakefile} doins -r samples/c_interface \ samples/diff \ samples/muz \ samples/rot13 \ samples/solutions \ - samples/solver_types || die + samples/solver_types if use java; then - doins -r samples/java_interface || die + doins -r samples/java_interface fi ecvs_clean "${D}"/usr/share/doc/${PF}/samples |