From 593b66fb6ac6aa53bd2016d7409fc12a22a10214 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Fri, 22 Jul 2022 08:46:22 +0100 Subject: gentoo auto-resync : 22:07:2022 - 08:46:22 --- dev-ml/Manifest.gz | Bin 35147 -> 35152 bytes dev-ml/findlib/Manifest | 4 +- dev-ml/findlib/findlib-1.9.1.ebuild | 75 ----------------------------------- dev-ml/findlib/findlib-1.9.5.ebuild | 75 +++++++++++++++++++++++++++++++++++ dev-ml/merlin/Manifest | 8 ++-- dev-ml/merlin/merlin-4.2-r2.ebuild | 2 +- dev-ml/merlin/merlin-4.3.1-r3.ebuild | 2 +- dev-ml/merlin/merlin-4.4-r3.ebuild | 2 +- dev-ml/merlin/merlin-4.5-r3.ebuild | 2 +- 9 files changed, 85 insertions(+), 85 deletions(-) delete mode 100644 dev-ml/findlib/findlib-1.9.1.ebuild create mode 100644 dev-ml/findlib/findlib-1.9.5.ebuild (limited to 'dev-ml') diff --git a/dev-ml/Manifest.gz b/dev-ml/Manifest.gz index 398bac878073..2007735a223e 100644 Binary files a/dev-ml/Manifest.gz and b/dev-ml/Manifest.gz differ diff --git a/dev-ml/findlib/Manifest b/dev-ml/findlib/Manifest index 818a3f20db6f..23bbbb6bd44a 100644 --- a/dev-ml/findlib/Manifest +++ b/dev-ml/findlib/Manifest @@ -1,8 +1,8 @@ AUX externalmeta7.patch 527 BLAKE2B bf4a4aec02096766f9741705fbf99201c742abc992ddb05c143378d7bb6d0b79f3c3541199eb5a81142fa1b317980646c3fe12528f792cbfaa7762f024bd88d1 SHA512 61c1e03e5b0d021f2cd7d013bed54edd610edb48cf9f6c063d3542abea2d2fc811c1cf7284b54a584491064dee8dd4e72656ba90a63c144586f40705b8443a1d DIST findlib-1.8.1.tar.gz 261544 BLAKE2B acfa9d4e0d118ebbc0dd7b03da1fe5eaa994e5fec13dc54e60ba42f643d93968469a1a43fe4f832433dca6c3902e8846616fcf460c748bf037fe16cb2f93a847 SHA512 0d8e1ff21217fcc6823aab3ac71282789691e4ae8c3607703d0393468247f93e2d084bd4e2a8795b523f2c7f193521d3aae4b8122c934ebf8b58c3185a5bc9c1 -DIST findlib-1.9.1.tar.gz 273012 BLAKE2B 8b51e3ca3dde04e77e225638f9d45166acf42fb1e3321aa5ce6e66fcddcfb978a301f2fa22a26172e1a8c2f8a879c5d1d10e8c984994d6b2879c21c4392955ce SHA512 83a05f3e310fa7cabb0475c5525f7a87c1b6bc2dc5e39f094cabfb5d944a826a5581844ba00ec1a48dd96184eb9de3c4d1055cdddee2b83c700a2de5a6dc6f84 DIST findlib-1.9.3.tar.gz 264132 BLAKE2B 3779cb437c607d04ae6c7d8124270f36c9bd9baccce669f3785a9cd4a1a582302844019b69be14598ca807edecb26645d9d7b241e1d704c3f023ed039cad21f0 SHA512 27cc4ce141576bf477fb9d61a82ad65f55478740eed59fb43f43edb794140829fd2ff89ad27d8a890cfc336b54c073a06de05b31100fc7c01cacbd7d88e928ea +DIST findlib-1.9.5.tar.gz 271240 BLAKE2B 6f43281298a9e443f9b92bcb8996bc2a55c2be86df492540fe8b5fb3fbb199daf1daef68e14c981d153c885c443ebc4af9ffb957235dd14904b9d75ca387cfa2 SHA512 03514c618a16b02889db997c6c4789b3436b3ad7d974348d2c6dea53eb78898ab285ce5f10297c074bab4fd2c82931a8b7c5c113b994447a44abb30fca74c715 EBUILD findlib-1.8.1-r2.ebuild 1693 BLAKE2B 4bf321d8db965b8f3b6fd74158d71f1c3b8485bc5fe6db1ed266fcacdec8bdad4f0633dce14a2d79a8f64f1005d3813e74908f35a19ec306fcd517cd350923ab SHA512 33f3a66ea6eb592db2cd46c40cf03839502bf6caf3d5ae73242aba9b06705c09cd95f7008f83b75e538a29d99821399930bd1a6fc6e7952d02ba29d6f7d99511 -EBUILD findlib-1.9.1.ebuild 1629 BLAKE2B be50bf81301e64b7eebefea1e7ee454f0ff42062bf54621d92f0dd427bcee2f031f743957fff86a1e7a9d5be9075488891a2c39884a60458de5e725edf81f1fc SHA512 e3d9d8083d36446a0ed05fa6cbaf844ccb5c8fec59ff396bca6f9f600a6408c038bdb6693d1b135b4e8ef125f5fcc9f9f0e44583bc768de09fb92b65e6f4ec03 EBUILD findlib-1.9.3.ebuild 1636 BLAKE2B 160e04f5d4dbaf786ddb878dd209654a46ae2d19f1144a8136ba77b9333dfc0e9db80e236b48df652f8d2676f0ad985ef166b33ad00b6348b46af7f08ca67f22 SHA512 55f0d24b2af486ca6c091693a070ea3c8b34698e37a1d47ad531f4d7015dbf0ce9e5409c77e6f38cb9de7ecd00d29d7bd9a12fff2c5857c345f4bfd8ea8a0e49 +EBUILD findlib-1.9.5.ebuild 1636 BLAKE2B f66630b58d1ba923c399698d236d609fc23aa558d5a11186b52f49eb2d43fb096f7efc245361cf4055b04031eb3a607475fa6518a3fbba9524525e3b86d2ab34 SHA512 acfab04f5397fe87f55ee7d8c39ed247de7b6c478611d777a10ecd8566604c7cd0a3287ac85ea786405b4ccda27b5beddfe0b5f2ee2b09df9e9155fbdd41a1a7 MISC metadata.xml 418 BLAKE2B 59a2e1618b3ebec5343c419a335c5cef124f844ee5beff5e8deb3d94b48aed5f1b9f85301f348f85a518d30516a40bab613f3750a8612e8b7a4baef2966dc15a SHA512 5451f3a709e9aa824bd3159dba3f50060e7df6d097ddbfe1cec93e933c34869b5eda66e5fc8b6cfb54940820fbb829ed8b3b1fc6555e06b117bc738f7ea7a1fe diff --git a/dev-ml/findlib/findlib-1.9.1.ebuild b/dev-ml/findlib/findlib-1.9.1.ebuild deleted file mode 100644 index 4a52a554364a..000000000000 --- a/dev-ml/findlib/findlib-1.9.1.ebuild +++ /dev/null @@ -1,75 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -DESCRIPTION="OCaml tool to find/use non-standard packages" -HOMEPAGE="http://projects.camlcity.org/projects/findlib.html" -SRC_URI="http://download.camlcity.org/download/${P}.tar.gz" - -LICENSE="MIT" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos" -IUSE="doc +ocamlopt tk" - -DEPEND=">=dev-lang/ocaml-4.02.3-r1:=[ocamlopt?] - tk? ( dev-ml/labltk:= )" -RDEPEND="${DEPEND}" - -QA_FLAGS_IGNORED='.*' - -src_prepare() { - default - export ocamlfind_destdir="${EPREFIX}/usr/$(get_libdir)/ocaml" - export stublibs="${ocamlfind_destdir}/stublibs" -} - -src_configure() { - local myconf - use tk && myconf="-with-toolbox" - ./configure -bindir "${EPREFIX}"/usr/bin -mandir "${EPREFIX}"/usr/share/man \ - -sitelib ${ocamlfind_destdir} \ - -config ${ocamlfind_destdir}/findlib/findlib.conf \ - -no-custom \ - ${myconf} || die "configure failed" -} - -src_compile() { - emake -j1 all - if use ocamlopt; then - emake -j1 opt # optimized code - fi -} - -src_install() { - emake prefix="${D}" install - - dodir "${stublibs#${EPREFIX}}" - - if use doc; then - cd "${S}/doc" || die - dodoc QUICKSTART README DOCINFO - docinto html - dodoc -r ref-html guide-html - fi -} - -check_stublibs() { - local ocaml_stdlib=`ocamlc -where` - local ldconf="${ocaml_stdlib}/ld.conf" - - if [ ! -e ${ldconf} ] - then - echo "${ocaml_stdlib}" > ${ldconf} - echo "${ocaml_stdlib}/stublibs" >> ${ldconf} - fi - - if [ -z `grep -e ${stublibs} ${ldconf}` ] - then - echo ${stublibs} >> ${ldconf} - fi -} - -pkg_postinst() { - check_stublibs -} diff --git a/dev-ml/findlib/findlib-1.9.5.ebuild b/dev-ml/findlib/findlib-1.9.5.ebuild new file mode 100644 index 000000000000..1a9deac53a9b --- /dev/null +++ b/dev-ml/findlib/findlib-1.9.5.ebuild @@ -0,0 +1,75 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +DESCRIPTION="OCaml tool to find/use non-standard packages" +HOMEPAGE="http://projects.camlcity.org/projects/findlib.html" +SRC_URI="http://download.camlcity.org/download/${P}.tar.gz" + +LICENSE="MIT" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux ~ppc-macos" +IUSE="doc +ocamlopt tk" + +DEPEND=">=dev-lang/ocaml-4.02.3-r1:=[ocamlopt?] + tk? ( dev-ml/labltk:= )" +RDEPEND="${DEPEND}" + +QA_FLAGS_IGNORED='.*' + +src_prepare() { + default + export ocamlfind_destdir="${EPREFIX}/usr/$(get_libdir)/ocaml" + export stublibs="${ocamlfind_destdir}/stublibs" +} + +src_configure() { + local myconf + use tk && myconf="-with-toolbox" + ./configure -bindir "${EPREFIX}"/usr/bin -mandir "${EPREFIX}"/usr/share/man \ + -sitelib ${ocamlfind_destdir} \ + -config ${ocamlfind_destdir}/findlib/findlib.conf \ + -no-custom \ + ${myconf} || die "configure failed" +} + +src_compile() { + emake -j1 all + if use ocamlopt; then + emake -j1 opt # optimized code + fi +} + +src_install() { + emake prefix="${D}" install + + dodir "${stublibs#${EPREFIX}}" + + if use doc; then + cd "${S}/doc" || die + dodoc QUICKSTART README DOCINFO + docinto html + dodoc -r ref-html guide-html + fi +} + +check_stublibs() { + local ocaml_stdlib=`ocamlc -where` + local ldconf="${ocaml_stdlib}/ld.conf" + + if [ ! -e ${ldconf} ] + then + echo "${ocaml_stdlib}" > ${ldconf} + echo "${ocaml_stdlib}/stublibs" >> ${ldconf} + fi + + if [ -z `grep -e ${stublibs} ${ldconf}` ] + then + echo ${stublibs} >> ${ldconf} + fi +} + +pkg_postinst() { + check_stublibs +} diff --git a/dev-ml/merlin/Manifest b/dev-ml/merlin/Manifest index fed063eac95a..e002c5d2de2b 100644 --- a/dev-ml/merlin/Manifest +++ b/dev-ml/merlin/Manifest @@ -12,8 +12,8 @@ DIST merlin-4.5-412.tbz 1765436 BLAKE2B eaed065a2814f4c1bfc5337d026c7c42287b8cbb DIST merlin-4.5-413.tbz 2290507 BLAKE2B 32aeda63caec645da8043c49ceaa0ea54d095b3e286f687b5f3da1b44d54bbc291d0358768d2180825cb620a91765da83d90b645151a694a4131788ab4438fbf SHA512 b1db98c38a97ca0eef3051ab2b5d1b158e757863de6908a830308e7ea7f960eebd64b1a60bf51b10b7ea2eea3141ee0917a7c3570b63f9faa2e3f69c5d6fe0c2 DIST merlin-4.5-414.tbz 1964688 BLAKE2B 41cb76fb367545af3b5ac7d62f5b69ae031ed99956aca947dc8b91e2fa906d500bed272f7f46a7ad9e57bf3cb5620893072b52ac7f2246d6ae3be1ae22e99406 SHA512 cc2cf2c208091b3ae435a8124617e56f2002b7091532002ab49a1f817d90a5c4f9cf0bc5741dc7f2526e0352c3ca95b42c3b3a17c6cbfb80ad73d42310a25d22 EBUILD merlin-3.4.2-r3.ebuild 1268 BLAKE2B 76951d30c4572bb3b2a1560df586fe917c418b2c264023a6bb6fb4d2d2c81e221e37953bd817445ba9cbddf734c2314bce9b1e1cae168ae6daeed553c6d504c2 SHA512 671cb8164f78319a4dd69e609507e0fc3d7399729dcb9b0e7a16ad21496cd9ac54946a152e7a61c3a21ae3071d330dc853ee7aef6408b42ce2812320d9ef763f -EBUILD merlin-4.2-r2.ebuild 1628 BLAKE2B 69695d9b83e47ea4d537babdb77334a0c66789c0d26250d88fd96f4a09a668d8462ea2305df69b84bd3795074534f115c6cfa710c80623dad38d541565ffe958 SHA512 f07995eebc4983643a50edd8bd92555a5347c714660c59239b14bc3483b39456c29ed100f01f21c9443d682fe30c9876632a0f1e80a122262bf3f6c1abb7151c -EBUILD merlin-4.3.1-r3.ebuild 1649 BLAKE2B 0caada03840c4a9c823c45dcac31658e91262e4c68449aa8af58d7f04c328ad6d8d729e93e61d93351a50df620a7b628f8adbfa246161ba7b7d2deeb7462be79 SHA512 cef79fd3bcb317e6d05374cbe4d34708c9ac9a6f9aace1c8f349256cd3888615496aeb44ba0b229805cf5f0dc5e5a16bac2188bb7666e7f77309596597f77bbd -EBUILD merlin-4.4-r3.ebuild 1920 BLAKE2B 7f510f03d1c0f3aab87152cd55471ebe842c6119cdff6d7ea9eb447fbddfd0cab14aae545f3a68912f546429e89c09a394914a56e11966ef7ba6fbca4469d20a SHA512 89da2d2b46ba36d7e1df53deb89554f7fe33ddd2c9c46a461fe063692712f0db74312eafdc33effbba79baa454fe5a398e0e1209f22b9438ff50502ce1bb9bd6 -EBUILD merlin-4.5-r3.ebuild 2049 BLAKE2B 1e74babad7df27750fcc6060637a2a27f9b238968b973ce83e128650ce712d232f62eede1f0bf521ca113e2503ae4901275bd2ed7d3f602f55793c310c226e42 SHA512 c50af01b60c9e2d69fb862f137a335ac5b1b14b1b2203147a7434e656f082b4a663f16e86d46a8b9aec336caaf19f1847391c7ce2b6e6d9137d43d3dd851e1aa +EBUILD merlin-4.2-r2.ebuild 1635 BLAKE2B 2db7c065259db06f7ebacf0cd1445641488bc0d0c1040da933799a9fd59ddc4be3d089f149e0e501d0e03cdb827500584e2c3cb4a677328beebc531eca6faeb9 SHA512 f7fc91a00f293bfb9cdbc2c88e935428f1662bb42ca05b62bd5033073c1e409b0caac464fd23734f06a7e7182b4e6fb0a7ff5c5a3a0286f54948ea235337d766 +EBUILD merlin-4.3.1-r3.ebuild 1656 BLAKE2B bced8c8869f0d778725278c453a6e51000f2dcc7fba7d11efb2dc5d9cd078c476be421e257b04c3d0a9ecfa0412f3365b0d7e5b29ec15b22805d7f55d6930c10 SHA512 b05d0384e63d940213e5789b4bc29cbb7fe09de48d31abbd3e94032750152fca57ecf539b6e38f4a11cb9af6dfd1b2d48112b002dc6b21a0454a9da345ee7db5 +EBUILD merlin-4.4-r3.ebuild 1927 BLAKE2B 1cd4b4b75b017f7dd04f19dc7dbcea349717d52e3c9106342d30a1294d165d629dc3fb8bfe37944b04284a06e9782ddb667347f1dc88e8060e749d4fb9d4133a SHA512 058e859dbff209604b0fd6b9929b4bf3401349eff1cd242a973728f8dc5090c17cc1b119add9db5f073d8c32ebc2b1900cf8f023665a633b8a68092bf7a2bd7c +EBUILD merlin-4.5-r3.ebuild 2056 BLAKE2B 3d30894663dd4db412c2b3d86866aa432105e167ebb4fa427e8244cf3399b1017310aaa97a7ca432cecd17aabcb9ed5c264cc777d00c025ca1b0c6ea134397f6 SHA512 d38808870394e4575ff3bffe7ddeeb9c5b636eda86072947a5424286973f858b5179a3dc5cec0aeeb3b1cf3f6dba1dc11f45d609f3e173aacb654fd89466cbf3 MISC metadata.xml 310 BLAKE2B f1255dfdcb6984112e896735ea40f1171a8d52149fa7e8ed279efc1fe08de9b071554f5168bc3f8c0e432bd8344c69f5c5716c5c689ff4ff4edbc27569546246 SHA512 06710c33027574e4c13259e30ca5e862b7bbda0442013676020d00dd1114e92ebee92fa19d2993fc3881c10f9db7b51dd2710fcfbcf9ca7564f8f96e5065705e diff --git a/dev-ml/merlin/merlin-4.2-r2.ebuild b/dev-ml/merlin/merlin-4.2-r2.ebuild index ec4d4384818f..531c1f5309e7 100644 --- a/dev-ml/merlin/merlin-4.2-r2.ebuild +++ b/dev-ml/merlin/merlin-4.2-r2.ebuild @@ -51,7 +51,7 @@ src_prepare() { } src_compile() { - dune build @install + dune build @install || die if use emacs ; then # Build the emacs integration diff --git a/dev-ml/merlin/merlin-4.3.1-r3.ebuild b/dev-ml/merlin/merlin-4.3.1-r3.ebuild index be803860afbb..2f3b6848a507 100644 --- a/dev-ml/merlin/merlin-4.3.1-r3.ebuild +++ b/dev-ml/merlin/merlin-4.3.1-r3.ebuild @@ -52,7 +52,7 @@ src_prepare() { } src_compile() { - dune build @install + dune build @install || die if use emacs ; then # Build the emacs integration diff --git a/dev-ml/merlin/merlin-4.4-r3.ebuild b/dev-ml/merlin/merlin-4.4-r3.ebuild index 805435c72192..858b8e8cfce7 100644 --- a/dev-ml/merlin/merlin-4.4-r3.ebuild +++ b/dev-ml/merlin/merlin-4.4-r3.ebuild @@ -61,7 +61,7 @@ src_prepare() { } src_compile() { - dune build @install + dune build @install || die if use emacs ; then # Build the emacs integration diff --git a/dev-ml/merlin/merlin-4.5-r3.ebuild b/dev-ml/merlin/merlin-4.5-r3.ebuild index 0d4848e27208..c33b0aee04ac 100644 --- a/dev-ml/merlin/merlin-4.5-r3.ebuild +++ b/dev-ml/merlin/merlin-4.5-r3.ebuild @@ -66,7 +66,7 @@ src_prepare() { } src_compile() { - dune build @install + dune build @install || die if use emacs ; then # iedit isn't packaged yet -- cgit v1.2.3