From f616ce4660c92a3fcb4f05663c2ab47c9defa0c3 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Wed, 30 Nov 2022 01:22:10 +0000 Subject: gentoo auto-resync : 30:11:2022 - 01:22:10 --- dev-ml/Manifest.gz | Bin 36282 -> 36275 bytes dev-ml/llvm-ocaml/Manifest | 3 + dev-ml/llvm-ocaml/llvm-ocaml-15.0.6.ebuild | 115 +++++++++++++++++++++++++++++ dev-ml/merlin/Manifest | 16 +--- dev-ml/merlin/merlin-3.4.2-r3.ebuild | 70 ------------------ dev-ml/merlin/merlin-4.2-r2.ebuild | 83 --------------------- dev-ml/merlin/merlin-4.3.1-r3.ebuild | 84 --------------------- dev-ml/merlin/merlin-4.4-r3.ebuild | 93 ----------------------- dev-ml/merlin/merlin-4.7.ebuild | 106 ++++++++++++++++++++++++++ 9 files changed, 228 insertions(+), 342 deletions(-) create mode 100644 dev-ml/llvm-ocaml/llvm-ocaml-15.0.6.ebuild delete mode 100644 dev-ml/merlin/merlin-3.4.2-r3.ebuild delete mode 100644 dev-ml/merlin/merlin-4.2-r2.ebuild delete mode 100644 dev-ml/merlin/merlin-4.3.1-r3.ebuild delete mode 100644 dev-ml/merlin/merlin-4.4-r3.ebuild create mode 100644 dev-ml/merlin/merlin-4.7.ebuild (limited to 'dev-ml') diff --git a/dev-ml/Manifest.gz b/dev-ml/Manifest.gz index 19d9fb186350..130ef7521b46 100644 Binary files a/dev-ml/Manifest.gz and b/dev-ml/Manifest.gz differ diff --git a/dev-ml/llvm-ocaml/Manifest b/dev-ml/llvm-ocaml/Manifest index eb06616ccb28..44ff5cdc2c0a 100644 --- a/dev-ml/llvm-ocaml/Manifest +++ b/dev-ml/llvm-ocaml/Manifest @@ -4,6 +4,8 @@ DIST llvm-project-15.0.3.src.tar.xz 112069972 BLAKE2B 3d29bab890467ba87fedcc4e76 DIST llvm-project-15.0.3.src.tar.xz.sig 438 BLAKE2B e7e0614e144eb878f694c12e97cf42ff8476e47cb55e8f259eb2ec52e303463ad753771271512e89baf0137c1382b11cfa028c85324174ebcd054a124000f537 SHA512 41229bebdb0c2df9a5e3a4d6f02d39fac7dc91f21895a659523beab4fa3ef99ff06eff5e4386221369b6e2b6f8fe974d67b7d8496d5911ce484d09ae0db8b916 DIST llvm-project-15.0.5.src.tar.xz 110931004 BLAKE2B d751e3627ee26e60a1a037a4a6cc574a31c4abe038331b86206348ac3ce93a243add2be3a0bbfc2ec5ec3f3562a5b5efea745cb1943c9c9153bc7b0fcf4de22e SHA512 cf2a89ebb6bc9d7e3f1fd09531c84ac9927cdbe5ee13a6fcb8ce4d08e5a9d6d480ad982f62126b9c757beafa283b34f2ba1fbc56223c641e70da2be4627f59a6 DIST llvm-project-15.0.5.src.tar.xz.sig 566 BLAKE2B a6e7204abc912045346a36f2b349e0829a4d5b9efcb230fb0c97caa38d5159ca17ffb47ce0485cbab276a4938ff3a5c05ef9f8b0b75f4c2028d870ee33023431 SHA512 312bc09b54408a9265f8102241089b0f674be0832dd5cb1998ff13dbccbe19324d7060ba2680457118dee96a1ff390b16282677ad825d7230008014ecebe47d5 +DIST llvm-project-15.0.6.src.tar.xz 112074576 BLAKE2B 74b1aa967c95191fa492f06b3a21930842da0ccbd9995dd33b4c2cf07852bbedcae97041fd5966209b16c63b90c87cc02fb2e858eda13dd9cc0641edcede0f75 SHA512 3311d85f4e02610af52f06e83c8c6d2b93950d24324b831b7afc47c39a20a546d39683a14e1a315da87d226379042de900a3f36a0351053547482af9035ab949 +DIST llvm-project-15.0.6.src.tar.xz.sig 438 BLAKE2B 3c97dbd55667f52dad964ef71257c36e3075794f5616cfd46de8bf874867e861bf45c0d56cff2d0ad5d4f1b5a1c9b3a395aedcc40bce545ce7f3c84ac75ae3da SHA512 a184103d84f8197a709c6c067fa83ca9290cd06532c487ad2c1fefa423438a1ac3c7f88835a94e3c9f04876e8d5f09afabef15bd8605df38aec6a4118597090c DIST llvm-project-7b91798a5d3a8432b296778da4efe169012fb7b4.tar.gz 170989337 BLAKE2B 1ab79554a05f8d7a74c0b4bab319c30375475d3fd089764733744fde55c65eb38967cdb19e5b0211a1543549c2bfc3c0f3d43facb7e041f51988e8a65e4448f3 SHA512 4c4d3a748b967cbc75372d0db87ac48d32271a54047ddeeb028d565fa6b7004b2ab3abd82d8ff4621e50c9410fce28c3044550cc94aaf0f6e4f672498f47aba8 DIST llvm-project-959c9cc7acf4d0aa433f2436e2a45b782e18022a.tar.gz 171575300 BLAKE2B 090d41a8913f8e061d297e66ca653d95e18b8da744464d7085d7a199c0a444753a82b6ff6503e142aec81be01b419323cdbe3709497738df74afa886d69fd63d SHA512 fc3b26e148ead7a07b4d1509909a42712a43b179da435b052c26a237b0d2ae88c3c8d76eaa93c415be1ed0f0b5fb55e0ad92f427a18d70bc9634a6e7d1b6a4d9 DIST llvmorg-13.0.1.tar.gz 147290251 BLAKE2B 2a44b012a672501761d0c27c6b3a315b69bfef0cd13b078a7e7d2fccc4a9c8c0f2bee0f164c4271c9106b0a99cb06e8b64986f66253b613336719fb86b82541b SHA512 9a8cb5d11964ba88b7624f19ec861fb28701f23956ea3c92f6ac644332d5f41fde97bd8933dd3ee70ed378058c252fa3a3887c8d1af90d219970c2b27691166f @@ -12,6 +14,7 @@ EBUILD llvm-ocaml-14.0.6.ebuild 2594 BLAKE2B 60511c8fbe6fb601e25db4cd2241c0539f8 EBUILD llvm-ocaml-15.0.3.ebuild 2598 BLAKE2B d04e4d0567e251d2499de4e696d6f0d93083cf821662a6f38e17ac3e34d43062acc3599ed5d36a4fbd301c8de95a8d9a6e59506baec477806b92ec88204fc8c2 SHA512 bde4b047ac38ca30c616f2ced8da379e43c770aa6d6985435e444da0602f7f73f03adefe06a58f140e16f5b436ca4ba895601dc9936ff5f21866a5b95c65db8a EBUILD llvm-ocaml-15.0.5.ebuild 2598 BLAKE2B d04e4d0567e251d2499de4e696d6f0d93083cf821662a6f38e17ac3e34d43062acc3599ed5d36a4fbd301c8de95a8d9a6e59506baec477806b92ec88204fc8c2 SHA512 bde4b047ac38ca30c616f2ced8da379e43c770aa6d6985435e444da0602f7f73f03adefe06a58f140e16f5b436ca4ba895601dc9936ff5f21866a5b95c65db8a EBUILD llvm-ocaml-15.0.6.9999.ebuild 2582 BLAKE2B 941dc173e32fcd3333cd3b8bc0424bfb52ddaab4430a384105d70b03e7a861bf7174c41662faba29e80924d14d874774c5ee5caf163df88d208acd109fa09787 SHA512 05eb8f496fc5bdcc5faa98fc1705af700855264fd0bc033bfde2bd267082dd3c849ba58c0893b427196d04fbffce9b0ec98090b51472bb36e206c86b2904b578 +EBUILD llvm-ocaml-15.0.6.ebuild 2598 BLAKE2B d04e4d0567e251d2499de4e696d6f0d93083cf821662a6f38e17ac3e34d43062acc3599ed5d36a4fbd301c8de95a8d9a6e59506baec477806b92ec88204fc8c2 SHA512 bde4b047ac38ca30c616f2ced8da379e43c770aa6d6985435e444da0602f7f73f03adefe06a58f140e16f5b436ca4ba895601dc9936ff5f21866a5b95c65db8a EBUILD llvm-ocaml-16.0.0.9999.ebuild 2516 BLAKE2B 5d42fd7ca1194bfc7fabd05d12d29b793e468ba9d46e36d80f50b1f3e654dfd01a122422ff42ba0616f6654155987be8c23999da1da422467f09ca75a7865d90 SHA512 c9fe4add6b74299cc13c961ff6d9e027d0861dda038130553ccef72189a5df19f408a8e3cb936864fa8f4a3437e1f9c71fb6fe62761c43e5d9ba9b7bd18edd0e EBUILD llvm-ocaml-16.0.0_pre20221120.ebuild 2516 BLAKE2B 5d42fd7ca1194bfc7fabd05d12d29b793e468ba9d46e36d80f50b1f3e654dfd01a122422ff42ba0616f6654155987be8c23999da1da422467f09ca75a7865d90 SHA512 c9fe4add6b74299cc13c961ff6d9e027d0861dda038130553ccef72189a5df19f408a8e3cb936864fa8f4a3437e1f9c71fb6fe62761c43e5d9ba9b7bd18edd0e EBUILD llvm-ocaml-16.0.0_pre20221126.ebuild 2516 BLAKE2B 5d42fd7ca1194bfc7fabd05d12d29b793e468ba9d46e36d80f50b1f3e654dfd01a122422ff42ba0616f6654155987be8c23999da1da422467f09ca75a7865d90 SHA512 c9fe4add6b74299cc13c961ff6d9e027d0861dda038130553ccef72189a5df19f408a8e3cb936864fa8f4a3437e1f9c71fb6fe62761c43e5d9ba9b7bd18edd0e diff --git a/dev-ml/llvm-ocaml/llvm-ocaml-15.0.6.ebuild b/dev-ml/llvm-ocaml/llvm-ocaml-15.0.6.ebuild new file mode 100644 index 000000000000..c426fd5ff1b3 --- /dev/null +++ b/dev-ml/llvm-ocaml/llvm-ocaml-15.0.6.ebuild @@ -0,0 +1,115 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +PYTHON_COMPAT=( python3_{8..11} ) +inherit cmake llvm llvm.org python-any-r1 + +DESCRIPTION="OCaml bindings for LLVM" +HOMEPAGE="https://llvm.org/" + +LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA" +SLOT="0/${PV}" +KEYWORDS="~amd64 ~arm ~x86" +IUSE="debug test" +RESTRICT="!test? ( test )" + +RDEPEND=" + >=dev-lang/ocaml-4.00.0:0= + dev-ml/ocaml-ctypes:= + ~sys-devel/llvm-${PV}:=[debug?] + !sys-devel/llvm[ocaml(-)] +" + +DEPEND=" + ${RDEPEND} +" +BDEPEND=" + ${PYTHON_DEPS} + dev-lang/perl + dev-ml/findlib + >=dev-util/cmake-3.16 +" + +LLVM_COMPONENTS=( llvm cmake third-party ) +LLVM_USE_TARGETS=llvm +llvm.org_set_globals + +pkg_setup() { + LLVM_MAX_SLOT=${LLVM_MAJOR} llvm_pkg_setup + python-any-r1_pkg_setup +} + +src_configure() { + local libdir=$(get_libdir) + local mycmakeargs=( + -DLLVM_LIBDIR_SUFFIX=${libdir#lib} + + -DBUILD_SHARED_LIBS=OFF + -DLLVM_BUILD_LLVM_DYLIB=ON + -DLLVM_LINK_LLVM_DYLIB=ON + -DLLVM_OCAML_OUT_OF_TREE=ON + + # cheap hack: LLVM combines both anyway, and the only difference + # is that the former list is explicitly verified at cmake time + -DLLVM_TARGETS_TO_BUILD="" + -DLLVM_EXPERIMENTAL_TARGETS_TO_BUILD="${LLVM_TARGETS// /;}" + -DLLVM_BUILD_TESTS=$(usex test) + + # disable various irrelevant deps and settings + -DLLVM_ENABLE_FFI=OFF + -DLLVM_ENABLE_TERMINFO=OFF + -DHAVE_HISTEDIT_H=NO + -DLLVM_ENABLE_ASSERTIONS=$(usex debug) + -DLLVM_ENABLE_EH=ON + -DLLVM_ENABLE_RTTI=ON + + -DLLVM_HOST_TRIPLE="${CHOST}" + + -DPython3_EXECUTABLE="${PYTHON}" + + # disable go bindings + -DGO_EXECUTABLE=GO_EXECUTABLE-NOTFOUND + + # TODO: ocamldoc + ) + + use test && mycmakeargs+=( + -DLLVM_LIT_ARGS="$(get_lit_flags)" + ) + + # LLVM_ENABLE_ASSERTIONS=NO does not guarantee this for us, #614844 + # also: custom rules for OCaml do not work for CPPFLAGS + use debug || local -x CFLAGS="${CFLAGS} -DNDEBUG" + cmake_src_configure + + local llvm_libdir=$(llvm-config --libdir) + # an ugly hack; TODO: figure out a way to pass -L to ocaml... + cd "${BUILD_DIR}/${libdir}" || die + ln -s "${llvm_libdir}"/*.so . || die + + if use test; then + local llvm_bindir=$(llvm-config --bindir) + # Force using system-installed tools. + sed -i -e "/llvm_tools_dir/s@\".*\"@\"${llvm_bindir}\"@" \ + "${BUILD_DIR}"/test/lit.site.cfg.py || die + fi +} + +src_compile() { + cmake_build ocaml_all +} + +src_test() { + # respect TMPDIR! + local -x LIT_PRESERVES_TMP=1 + cmake_build check-llvm-bindings-ocaml +} + +src_install() { + DESTDIR="${D}" \ + cmake -P "${BUILD_DIR}"/bindings/ocaml/cmake_install.cmake || die + + dodoc bindings/ocaml/README.txt +} diff --git a/dev-ml/merlin/Manifest b/dev-ml/merlin/Manifest index 4498f7692114..7496192bfd07 100644 --- a/dev-ml/merlin/Manifest +++ b/dev-ml/merlin/Manifest @@ -1,12 +1,4 @@ AUX 50merlin-gentoo.el 169 BLAKE2B 97dca8debe038783d44200315f883f4918cee1cca9f1d53df1c70b8fbd6e922b38c43b436ac73854970f1438eb837cbcbff4e07d12054fc0d0222b5222b95970 SHA512 00db283dffe923971fe451bcbea687bf35152e9c09783d307d9dec4ac0f273d27edfcc0e1ac74db3885bdeec98e7d60f1d46fa381d3b2c813e2f55fb5d4adbb5 -DIST merlin-3.4.2.tar.gz 11016272 BLAKE2B 6fa55423df7ae8f7a8056e90be630f148dd101194de1921605843caf805bd6c9694fa3fe5b8c2f8eff5d57d7d0e9d8653036b6165a49af655158925c7af87d2f SHA512 8225366ebf27ca656ca89fe00d5aec581487ae332aeab81568e7606eaf575648a7614d4d2de8e0757a4e69c6f4014fefa4574c95da13d42acb310c9dd58a468a -DIST merlin-4.2-411.tar.gz 1601588 BLAKE2B 348b48ccf2b209bb511450e4ba46ceb3639b1a5facd70bec4519369907e162e95575fa101aa1b79c56719927272a4feebf981692ea2bcb2299fc2c284833b1be SHA512 9ca8d3690621019b8213abcc1a32e1d754b93849f0bbd79bcab3a14915acc295eb60a7b68e997a75e777daaef83d5ca3e81944b7baf352dc4cce8480905ea2d7 -DIST merlin-4.2-ocaml-4.12.patch.gz 816740 BLAKE2B d96ab1059683799312fc8828e8a46bccaae9279b6d711eb7ed47b6e8631d80e09f236bf6f726bafb37ae243457df3220a9948f4f6de6da20c2a6c66a1edb8f3f SHA512 4eef08ac8a7f240596395d8460a4d3195c1483fb686aa7d5231d7ea28c9c6996196890f76feae951d2539ac7abc1f16ee3c453031e6d19af554ff27d67a63229 -DIST merlin-4.3.1-411.tar.gz 1626551 BLAKE2B c4340ff9b50c72208c4cb13d13e26f36463d7c257530d183a293eaaf3d86aaa71745d8154bb5c0e2149003b3cbe5a127fb6187e7bb7fa7024924fd239f981cfc SHA512 bcbba0c1bb1c84eef7becc4a537e1c2a4bd370a33333bfba1029c82fa8b1d9cdf367f98779fe3329286e418c41b06b49bfe796f5cf8058bcd189b4f33aad1abf -DIST merlin-4.3.1-ocaml-4.12.patch.gz 818559 BLAKE2B accf65bd5d5798bafe2be022d685da8f829aa9a9c98784420d8a62646d80ab73d1e189e3601266e09eebd4732ae241e8d11dc9663adac3b03a555db663a6d649 SHA512 8823b6e30e49ab3cf35a78063066f01aa7dcbc9174d45b0fed94a3f50e388c35e7ac810c5548c57d7bcf9304b045c483080496865b011269913120a5509a1149 -DIST merlin-4.4-411.tbz 1314200 BLAKE2B 0d16308e1ece70f8200e78233ecdff553f28e9a83b17f044eba8a4af170b65935b59ecf6e887299d9373b16d0a0cce24e0f9697f7cde4b3889df9db954e796c8 SHA512 82e4b025db6c6ec0c8b53bce82e980bfc2a507b9092dc513fb10c11be0bc2e37ad9efd5436263ecfa03acc3ec3a4b20ef9599b1814abe530f99d84b2f484fecc -DIST merlin-4.4-412.tbz 1762888 BLAKE2B adee3863e6fab90643db91b5da418324c65d9b2712140fa4f6b65ef3915bc24126a2cf8c2ceda14a914213595ed1951c7c79c388be7ca407f59c230bcc95eecb SHA512 f51b2875b75215d0be378de86b9dca0957b5e62241ce625a46c6341c219582510d37af94dedf67e1d3db61ebacfef8fa764e4719fac16c0b4b99bb85d0b991d4 -DIST merlin-4.4-413.tbz 2284368 BLAKE2B 1c7f0c9cda8dda4fa91888c3ba91eb74cacffe54bdcc3b9ca49ea816558216ece50cab5f69c4d54298610ca0781a6332a8d0e1ed7526711c97fbc1748f45c309 SHA512 b0bf3c7d72dfc7c70e22d60afca5b7fee71a35127839181fdb46e1e15a230e58765960548c545bbef4fdab180291c738cacb724b9ecf284eee5640ebef07c4ff DIST merlin-4.5-411.tbz 1316537 BLAKE2B 8850ea6b15819a178f763d8b55fecca9104cec5097c39afad7dc8b59543d961d7aa4a86590ebb59a3066d1f6630f11284e24835398ab967f45a52faf004477f1 SHA512 9e68ebabdc0cc398edcd255516070d6459f3bf5738c0dbe332c11c6bc4070e7bf340bc086fa2ea58597972ebe9d15860ecd0e549444809be809f0509b41652c2 DIST merlin-4.5-412.tbz 1765436 BLAKE2B eaed065a2814f4c1bfc5337d026c7c42287b8cbbe50097415a983f7fdd7323f4c88f3b8c8cff4ca88a0813204617f39807709a6703fd618269eca6063b3c47b1 SHA512 f9edc3e1c9f753d7bacbdf1b92c118b54f9e9eff0bf752a2b44f39a2f7ecc76c4cd3bbe9227e910aea8b5ea947e8fe1b8d92ba0245fe47bc8cc2f45404cca973 DIST merlin-4.5-413.tbz 2290507 BLAKE2B 32aeda63caec645da8043c49ceaa0ea54d095b3e286f687b5f3da1b44d54bbc291d0358768d2180825cb620a91765da83d90b645151a694a4131788ab4438fbf SHA512 b1db98c38a97ca0eef3051ab2b5d1b158e757863de6908a830308e7ea7f960eebd64b1a60bf51b10b7ea2eea3141ee0917a7c3570b63f9faa2e3f69c5d6fe0c2 @@ -14,10 +6,10 @@ DIST merlin-4.5-414.tbz 1964688 BLAKE2B 41cb76fb367545af3b5ac7d62f5b69ae031ed999 DIST merlin-4.6-412.tbz 1767545 BLAKE2B 95b4f4e53accf55f4d2bc381779fa31bb5db39c21fa2cd8dc0b1d5b0e4a4acf484f2eb58327bce1c990cbbb2205bb87215aeba1b923ba6a62c82862d884dd410 SHA512 4362482ecd7c8af1c4e740e3816100cd5408eba3aebc01b867b45bdd1dcc237819cb0640e0f618b6ecf00aa8d55e58e55ecfeb176ed7b358c404ea71302443b0 DIST merlin-4.6-413.tbz 2292506 BLAKE2B ec61d3b9cbfd9cddbb27fed70ebf7b69816244afb8a6c36347fbb762fc6aee1e6dd2b728db0687cd984603c3847ba3fe858b9663a7b3dcd17aedede662848299 SHA512 fe88a52c4c3c94505da142fbb7d400fce11bfafe6e47ec7cd39437308baa7122399a008bb6d0ef7b8f29636c2a51f4d49e3535136010fec198a1188293914a56 DIST merlin-4.6-414.tbz 1969647 BLAKE2B fdb55f7ba9a597fb03bb377556238dedc2a5d60bdc772a479a9ad98c0feb243a7fc61dd47a65194ddba9afb8509858d8956a87ca5af9fc68597ba746b0d56d60 SHA512 7373fadf05c692c9f054c7fe6a7d4bdfeefe237b9df432024ef9923782ee72e09021c0c3fba869da8347728105cb2d3ff0aa94b0c5eb09811bb25aa8da9fb520 -EBUILD merlin-3.4.2-r3.ebuild 1268 BLAKE2B 76951d30c4572bb3b2a1560df586fe917c418b2c264023a6bb6fb4d2d2c81e221e37953bd817445ba9cbddf734c2314bce9b1e1cae168ae6daeed553c6d504c2 SHA512 671cb8164f78319a4dd69e609507e0fc3d7399729dcb9b0e7a16ad21496cd9ac54946a152e7a61c3a21ae3071d330dc853ee7aef6408b42ce2812320d9ef763f -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 +DIST merlin-4.7-412.tbz 1771126 BLAKE2B 1454873ecc1d533a5e82adaa71082339c44b93c2626d46cc5147d1b8049b397ef34e6137256560d6c9b7eaf826155e34617c071d1aae3aa3f02807e73c209cf1 SHA512 d13e307d87b4719b56397e54e6f771a3ea77a766ab38b22414c4b1d4d5828b5f790c82f28d3feaf7fe45be10abd50d9a905ece932f43fdad98c88b73b35dd936 +DIST merlin-4.7-413.tbz 2296558 BLAKE2B 2e6d9918c911eab017bb3491cab97f2b0362d13e072a0c39a6637f25d2a15ac7f3027cec51ab0d66a2239fea055f70b5b1e3294c05985faae5d11c57bff81501 SHA512 71068a6b50628c57003b29de3968e41c24b67394dcc1d1f1a0b335211e9d1ef3e527584b868514bd5489db5a130f2ff6fd145d3665a7d2bca5a117074cb08ce8 +DIST merlin-4.7-414.tbz 1976276 BLAKE2B 91fc5221b536d20174e36c4fdf4bc32f125f2af0f23c95c2e917f425826b0c58fe65b1b849eded570b8f4aece0fb00f1bdf7d0a00fa67f6c4e58892a095e1466 SHA512 c325c29bea91699739d7cb7df12876b7ffb8edf685deabb5dce5553b570a6bf8ff415c45e3295b674edbc7711f69f4be202b866d157516380f888e80dcee1082 EBUILD merlin-4.5-r3.ebuild 2175 BLAKE2B 2673f32fff876100b2a3649e169b13d28d80647c8c1d6b928a8114c4ed70c7c4312337e606cff7253ca321363e5ea296b1a4c84c0b22531a7007b9ac6771e83c SHA512 2dd3ce00635e0d8bc32e5810f8661ccc1738fa1c44d8f14257d1f5900ab863be3994d2e3bcee2eb2a83b48b5859239e98a11ff95f2b5abb920d534781004e5be EBUILD merlin-4.6.ebuild 2418 BLAKE2B 6742961957e55ba5f34f7af4a4a5ac1906efdc0202ee2a63da2d16e57a3858656a0261296d97b1b38afeb9b3053f10b7a736034c9df1b41bee5d19abf3184a55 SHA512 f9eb8e699d311949cda3eb381f81fdaafc1a29bedd95b31595cf8f3165760bde53f4da4c397db0da6a205bc6601c633ac4683f64712ab0037de8d1673037b52c +EBUILD merlin-4.7.ebuild 2418 BLAKE2B 6742961957e55ba5f34f7af4a4a5ac1906efdc0202ee2a63da2d16e57a3858656a0261296d97b1b38afeb9b3053f10b7a736034c9df1b41bee5d19abf3184a55 SHA512 f9eb8e699d311949cda3eb381f81fdaafc1a29bedd95b31595cf8f3165760bde53f4da4c397db0da6a205bc6601c633ac4683f64712ab0037de8d1673037b52c MISC metadata.xml 310 BLAKE2B f1255dfdcb6984112e896735ea40f1171a8d52149fa7e8ed279efc1fe08de9b071554f5168bc3f8c0e432bd8344c69f5c5716c5c689ff4ff4edbc27569546246 SHA512 06710c33027574e4c13259e30ca5e862b7bbda0442013676020d00dd1114e92ebee92fa19d2993fc3881c10f9db7b51dd2710fcfbcf9ca7564f8f96e5065705e diff --git a/dev-ml/merlin/merlin-3.4.2-r3.ebuild b/dev-ml/merlin/merlin-3.4.2-r3.ebuild deleted file mode 100644 index c4d43185b391..000000000000 --- a/dev-ml/merlin/merlin-3.4.2-r3.ebuild +++ /dev/null @@ -1,70 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -# TODO: vim-plugin, although it's not clear how to make it work here -inherit elisp-common dune - -DESCRIPTION="Context sensitive completion for OCaml in Vim and Emacs" -HOMEPAGE="https://github.com/ocaml/merlin" -SRC_URI="https://github.com/ocaml/merlin/archive/v${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="MIT" -SLOT="0/${PV}" -KEYWORDS="~amd64" -IUSE="emacs +ocamlopt" - -RDEPEND=" - dev-ml/csexp:= - =dev-lang/ocaml-4.09:= - =app-editors/emacs-23.1:* - app-emacs/auto-complete - app-emacs/company-mode - ) -" -DEPEND="${RDEPEND}" - -SITEFILE="50${PN}-gentoo.el" - -src_prepare() { - default - - # Handle installation via the eclass - rm emacs/dune || die -} - -src_compile() { - dune_src_compile - - if use emacs ; then - # Build the emacs integration - cd emacs || die - - # iedit isn't packaged yet - rm merlin-iedit.el || die - - elisp-compile *.el - fi -} - -src_install() { - dune_src_install - - if use emacs ; then - cd "${S}/emacs" || die - elisp-install ${PN} *.el *.elc - elisp-site-file-install "${FILESDIR}/${SITEFILE}" - fi -} - -pkg_postinst() { - use emacs && elisp-site-regen -} - -pkg_postrm() { - use emacs && elisp-site-regen -} diff --git a/dev-ml/merlin/merlin-4.2-r2.ebuild b/dev-ml/merlin/merlin-4.2-r2.ebuild deleted file mode 100644 index 531c1f5309e7..000000000000 --- a/dev-ml/merlin/merlin-4.2-r2.ebuild +++ /dev/null @@ -1,83 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -# TODO: vim-plugin, although it's not clear how to make it work here -inherit elisp-common dune - -DESCRIPTION="Context sensitive completion for OCaml in Vim and Emacs" -HOMEPAGE="https://github.com/ocaml/merlin" -SRC_URI="https://github.com/ocaml/merlin/archive/v${PV}-411.tar.gz -> ${P}-411.tar.gz - https://dev.gentoo.org/~tupone/distfiles/${P}-ocaml-4.12.patch.gz" - -LICENSE="MIT" -SLOT="0/${PV}" -KEYWORDS="~amd64" -IUSE="emacs +ocamlopt test" -RESTRICT="!test? ( test )" - -RDEPEND=" - dev-ml/csexp:= - =app-editors/emacs-23.1:* - app-emacs/auto-complete - app-emacs/company-mode - ) -" -DEPEND="${RDEPEND} - test? ( app-misc/jq )" - -SITEFILE="50${PN}-gentoo.el" - -S="${WORKDIR}"/${P}-411 - -src_prepare() { - has_version "dev-lang/ocaml:0/4.12" && \ - eapply "${WORKDIR}"/${P}-ocaml-4.12.patch - default - - # Handle installation via the eclass - rm emacs/dune || die - - # rm failing test - rm -r tests/test-dirs/locate/context-detection/cd-mod_constr.t || die -} - -src_compile() { - dune build @install || die - - if use emacs ; then - # Build the emacs integration - cd emacs || die - - # iedit isn't packaged yet - rm merlin-iedit.el || die - - elisp-compile *.el - fi -} - -src_install() { - dune_src_install - - if use emacs ; then - cd "${S}/emacs" || die - elisp-install ${PN} *.el *.elc - elisp-site-file-install "${FILESDIR}/${SITEFILE}" - fi -} - -pkg_postinst() { - use emacs && elisp-site-regen -} - -pkg_postrm() { - use emacs && elisp-site-regen -} diff --git a/dev-ml/merlin/merlin-4.3.1-r3.ebuild b/dev-ml/merlin/merlin-4.3.1-r3.ebuild deleted file mode 100644 index 2f3b6848a507..000000000000 --- a/dev-ml/merlin/merlin-4.3.1-r3.ebuild +++ /dev/null @@ -1,84 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -# TODO: vim-plugin, although it's not clear how to make it work here -inherit elisp-common dune - -DESCRIPTION="Context sensitive completion for OCaml in Vim and Emacs" -HOMEPAGE="https://github.com/ocaml/merlin" -SRC_URI="https://github.com/ocaml/merlin/archive/v${PV}-411.tar.gz -> ${P}-411.tar.gz - https://dev.gentoo.org/~tupone/distfiles/${P}-ocaml-4.12.patch.gz" - -LICENSE="MIT" -SLOT="0/${PV}" -KEYWORDS="~amd64" -IUSE="emacs +ocamlopt test" -RESTRICT="!test? ( test )" - -RDEPEND=" - dev-ml/csexp:= - =dev-ml/dune-2.9:= - || ( - dev-lang/ocaml:0/4.11 - dev-lang/ocaml:0/4.12 - ) - emacs? ( - >=app-editors/emacs-23.1:* - app-emacs/auto-complete - app-emacs/company-mode - ) -" -DEPEND="${RDEPEND} - test? ( app-misc/jq )" - -SITEFILE="50${PN}-gentoo.el" - -S="${WORKDIR}"/${P}-411 - -src_prepare() { - has_version "dev-lang/ocaml:0/4.12" && \ - eapply "${WORKDIR}"/${P}-ocaml-4.12.patch - default - - # Handle installation via the eclass - rm emacs/dune || die - - # rm failing test - rm -r tests/test-dirs/locate/context-detection/cd-mod_constr.t || die -} - -src_compile() { - dune build @install || die - - if use emacs ; then - # Build the emacs integration - cd emacs || die - - # iedit isn't packaged yet - rm merlin-iedit.el || die - - elisp-compile *.el - fi -} - -src_install() { - dune_src_install - - if use emacs ; then - cd "${S}/emacs" || die - elisp-install ${PN} *.el *.elc - elisp-site-file-install "${FILESDIR}/${SITEFILE}" - fi -} - -pkg_postinst() { - use emacs && elisp-site-regen -} - -pkg_postrm() { - use emacs && elisp-site-regen -} diff --git a/dev-ml/merlin/merlin-4.4-r3.ebuild b/dev-ml/merlin/merlin-4.4-r3.ebuild deleted file mode 100644 index 858b8e8cfce7..000000000000 --- a/dev-ml/merlin/merlin-4.4-r3.ebuild +++ /dev/null @@ -1,93 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -# TODO: vim-plugin, although it's not clear how to make it work here -inherit elisp-common dune - -DESCRIPTION="Context sensitive completion for OCaml in Vim and Emacs" -HOMEPAGE="https://github.com/ocaml/merlin" -SRC_URI="https://github.com/ocaml/merlin/releases/download/v${PV}-411/${P}-411.tbz - https://github.com/ocaml/merlin/releases/download/v${PV}-412/${P}-412.tbz - https://github.com/ocaml/merlin/releases/download/v${PV}-413/${P}-413.tbz" - -LICENSE="MIT" -SLOT="0/${PV}" -KEYWORDS="~amd64" -IUSE="emacs +ocamlopt test" -RESTRICT="!test? ( test )" - -RDEPEND=" - dev-ml/csexp:= - =dev-ml/dune-2.9:= - || ( - dev-lang/ocaml:0/4.11 - dev-lang/ocaml:0/4.12 - dev-lang/ocaml:0/4.13 - ) - emacs? ( - >=app-editors/emacs-23.1:* - app-emacs/auto-complete - app-emacs/company-mode - ) -" -DEPEND="${RDEPEND} - test? ( app-misc/jq )" - -SITEFILE="50${PN}-gentoo.el" - -src_unpack() { - default - if has_version "dev-lang/ocaml:0/4.11" ; then - mv merlin-4.4-411 "${S}" || die - elif has_version "dev-lang/ocaml:0/4.12" ; then - mv merlin-4.4-412 "${S}" || die - elif has_version "dev-lang/ocaml:0/4.13" ; then - mv merlin-4.4-413 "${S}" || die - fi -} - -src_prepare() { - default - - # Handle installation via the eclass - rm emacs/dune || die - - # rm failing test - rm -r tests/test-dirs/locate/context-detection/cd-mod_constr.t || die -} - -src_compile() { - dune build @install || die - - if use emacs ; then - # Build the emacs integration - cd emacs || die - - # iedit isn't packaged yet - rm merlin-iedit.el || die - - elisp-compile *.el - fi -} - -src_install() { - dune_src_install - - if use emacs ; then - cd "${S}/emacs" || die - elisp-install ${PN} *.el *.elc - elisp-site-file-install "${FILESDIR}/${SITEFILE}" - fi -} - -pkg_postinst() { - use emacs && elisp-site-regen -} - -pkg_postrm() { - use emacs && elisp-site-regen -} diff --git a/dev-ml/merlin/merlin-4.7.ebuild b/dev-ml/merlin/merlin-4.7.ebuild new file mode 100644 index 000000000000..f7843381a666 --- /dev/null +++ b/dev-ml/merlin/merlin-4.7.ebuild @@ -0,0 +1,106 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +# TODO: vim-plugin, although it's not clear how to make it work here +inherit elisp-common dune + +DESCRIPTION="Context sensitive completion for OCaml in Vim and Emacs" +HOMEPAGE="https://github.com/ocaml/merlin/" +SRC_URI=" + https://github.com/ocaml/merlin/releases/download/v${PV}-412/${P}-412.tbz + https://github.com/ocaml/merlin/releases/download/v${PV}-413/${P}-413.tbz + https://github.com/ocaml/merlin/releases/download/v${PV}-414/${P}-414.tbz +" + +LICENSE="MIT" +SLOT="0/${PV}" +KEYWORDS="~amd64" +IUSE="emacs +ocamlopt test" +RESTRICT="!test? ( test )" + +RDEPEND=" + >=dev-lang/ocaml-4.12:=[ocamlopt?] + dev-ml/csexp:= + >=dev-ml/yojson-2.0.0:= + dev-ml/menhir:= + >=dev-ml/dune-2.9:= + || ( + dev-lang/ocaml:0/4.12 + dev-lang/ocaml:0/4.13 + dev-lang/ocaml:0/4.14 + ) + emacs? ( + >=app-editors/emacs-23.1:* + app-emacs/auto-complete + app-emacs/company-mode + ) +" +DEPEND="${RDEPEND}" +# NOTICE: Block dev-ml/seq (which is a back-port of code to ocaml <4.07) +# because it breaks merlin builds. +# https://github.com/ocaml/merlin/issues/1500 +BDEPEND=" + !!