diff options
Diffstat (limited to 'dev-lang')
-rw-r--r-- | dev-lang/Manifest.gz | bin | 22646 -> 22654 bytes | |||
-rw-r--r-- | dev-lang/go/Manifest | 4 | ||||
-rw-r--r-- | dev-lang/go/go-1.23.7.ebuild | 162 | ||||
-rw-r--r-- | dev-lang/go/go-1.24.1.ebuild | 133 | ||||
-rw-r--r-- | dev-lang/ocaml/Manifest | 6 | ||||
-rw-r--r-- | dev-lang/ocaml/ocaml-5.2.0-r1.ebuild (renamed from dev-lang/ocaml/ocaml-5.3.0.ebuild) | 3 | ||||
-rw-r--r-- | dev-lang/ocaml/ocaml-5.2.1-r1.ebuild (renamed from dev-lang/ocaml/ocaml-5.2.0.ebuild) | 5 | ||||
-rw-r--r-- | dev-lang/ocaml/ocaml-5.3.0-r1.ebuild (renamed from dev-lang/ocaml/ocaml-5.2.1.ebuild) | 5 |
8 files changed, 310 insertions, 8 deletions
diff --git a/dev-lang/Manifest.gz b/dev-lang/Manifest.gz Binary files differindex 59b7c83c9807..8147919fac49 100644 --- a/dev-lang/Manifest.gz +++ b/dev-lang/Manifest.gz diff --git a/dev-lang/go/Manifest b/dev-lang/go/Manifest index f4b099c923b9..3ae7e381b403 100644 --- a/dev-lang/go/Manifest +++ b/dev-lang/go/Manifest @@ -1,8 +1,12 @@ AUX go-never-download-newer-toolchains.patch 368 BLAKE2B 0c90f46492af80622f430b2d506b143f3b553b5276085f78f41b93fee8219745179038302462603b5b1677554d92911eb4865084d0488aaa4c71ae1abc307f71 SHA512 b5acf97ccf96c6a353fcb7bd97113c38562defd82338828124fcc72c71334feda9c4e839d2aae5b66b809bc8a692eac96396c54a478e17a7ffd8d2c68fea95e6 AUX go-sets.conf 256 BLAKE2B 670afd72a2fa961e2b3882ac48d10e9d047af7a68f47bc8c8985b2de7a84022410fb1acfe2c710f8b3804ec3b043bf18c948478cf7d31c982cff47714b309cdf SHA512 028fba72c2d82ef893416970c27cb277be15f7c5c67773c0a62cd8ce2c192813ba851339596f10a6f5394c479e67b62dd4e4520379cc03f764ed4a4ab834fba6 DIST go1.23.6.src.tar.gz 28179132 BLAKE2B 25c988547604c35de65aedfdee5af9f35f7a1c43f634c0147373d9c86baf2bb10068463f70013ef60acd3088149eb16502958b1ca63d7cee310e32eaddf1578a SHA512 c504476d42cdbcd1b6afe53c0974e82c19eb0efac974bc06d41c1641440676891cfe6416455a0cfc81fe82902a9b82ea0a1d95089c676667d05487e45f5e04e3 +DIST go1.23.7.src.tar.gz 28181215 BLAKE2B d3c9bff18438f90f6730e1ad9580a3f97d266f90533552cd73b63b512c694de76466435f274dc2b190c672cdbd83ffaf735e4e74c12e426cac920b81dbfd88af SHA512 79192b760ab6fcc9512fd879a9484a3566fdeec5eace36c54b728cd9cb033e7ac68065a42fc657b351a106d684b79fdbefbf682cf63209c0191e7e7c8c0a0147 DIST go1.24.0.src.tar.gz 30663922 BLAKE2B 1a74d268ad2bcfd4773eb9d24f0618491680a5347edba60606b3f50144e2d8879509b2640046e5fa535ff126958deb49c4224443210e3bd79523e65208b616e3 SHA512 36ba9a3a541208fd33aa49b969d892578e209570541d2b6ca6ff784250d8b6777597d347b823c6026acf0c2741b4abc9012693004e623a1434b06cfecdbebaa8 +DIST go1.24.1.src.tar.gz 30777528 BLAKE2B 76217ec25a721183591a434b012bd9cfb6d6206410aafffce4490bff8053440f2aa590bac0cfb839f10c19a3368fe60515a61123a21d187f5289ba0ae1399c1c SHA512 a924d6bdc7e7101917e6d063bc7b471390525394e79224c152997564657c4362b5600e0c8bf6ee857d345129ccf7368bdf4ed2251ab740446ea2abda144e6353 EBUILD go-1.23.6.ebuild 4175 BLAKE2B d1e34e725ea51929715268d3009f5035967231a4a35c59779c898d352d3d0d9a8a6b03fee8a847215ff2b057bdf980fb11b6b905b33ee3ccc8a215eb348d5317 SHA512 8d792f83f8abf11353fa5009fa29a946cc7e0c8a2f2df7cf90e5acae8aaa68c2cd239ef03c324a61316bb217ea14f0b6d7514101c5d158f3b3bc3beb74dade27 +EBUILD go-1.23.7.ebuild 4180 BLAKE2B e8e1f354167d88bf01a7b4b338a1f026bbd23f789c16e917ba38e1f73a474897e7cd18f9192936b6211e89bd91aa81435b1b2f4956d80f1cebabd36f7db22825 SHA512 6abc1ed892888e315449bcbb19f030136c0f44fbd3c4c24e267f2b8483fb9ab2393713c1641ef64dfebf421d44f5fc4f509499e43dc8580b46b5f2f08fca3b97 EBUILD go-1.24.0.ebuild 3362 BLAKE2B 4d13c4a48301f709c139ce59240f7692fe2b81463a8366bb4675e9db4ab25fd0ca780a1a0ae87dcaa3d65254e39afb4c03f56c59446c6b515f503af8ef0e5451 SHA512 2e88b9ba06e1499f1d109aa3785aeb17d4660f7eb1726089062f992e0a9c3979ed18e930cab2732bfb159a3cf6780dd163579200c4e6966d6ca5798368d54456 +EBUILD go-1.24.1.ebuild 3362 BLAKE2B 4d13c4a48301f709c139ce59240f7692fe2b81463a8366bb4675e9db4ab25fd0ca780a1a0ae87dcaa3d65254e39afb4c03f56c59446c6b515f503af8ef0e5451 SHA512 2e88b9ba06e1499f1d109aa3785aeb17d4660f7eb1726089062f992e0a9c3979ed18e930cab2732bfb159a3cf6780dd163579200c4e6966d6ca5798368d54456 EBUILD go-9999.ebuild 3363 BLAKE2B 49672850d9c2e09b4263d4fa7211608251a080be138abeef75fd4602db68e346f7591832e18ef3248a37519af5c9126f192c908549bbcb62d1e09a764aaacd7f SHA512 99ed1c3388e560e851213dc6239a2da268818fa6fc74f068e912af05f3794b49d1bc26de8d6047a961d7596dbe46a2aaacdf97a15e792dece609bbfa9403ff19 MISC metadata.xml 589 BLAKE2B 341e4c0e91d73ca668c1795035e1223eed60f85c724afd989ef1f8fb69649f7f6eaaf8a5228f6c8f587ffcc40a438c47d332fbe6866839f5a0829872a983f642 SHA512 fe58ddddfbd4d0d060516cb035592a80c0f48e125bb59c95d3c6fac0c182271e2a9ec9bd055b9cc8e6cb8c449e6c483bff4a23c362f532c24255febfdefc273a diff --git a/dev-lang/go/go-1.23.7.ebuild b/dev-lang/go/go-1.23.7.ebuild new file mode 100644 index 000000000000..bdfada7c265e --- /dev/null +++ b/dev-lang/go/go-1.23.7.ebuild @@ -0,0 +1,162 @@ +# Copyright 1999-2025 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +export CBUILD=${CBUILD:-${CHOST}} +export CTARGET=${CTARGET:-${CHOST}} + +# See "Bootstrap" in release notes +GO_BOOTSTRAP_MIN=1.20.14 +MY_PV=${PV/_/} + +inherit go-env toolchain-funcs + +case ${PV} in +*9999*) + EGIT_REPO_URI="https://github.com/golang/go.git" + inherit git-r3 + ;; +*) + SRC_URI="https://storage.googleapis.com/golang/go${MY_PV}.src.tar.gz " + S="${WORKDIR}"/go + case ${PV} in + *_beta*|*_rc*) ;; + *) + KEYWORDS="-* ~amd64 ~arm ~arm64 ~loong ~mips ~ppc64 ~riscv ~s390 ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris" + ;; + esac +esac + +DESCRIPTION="A concurrent garbage collected and typesafe programming language" +HOMEPAGE="https://go.dev" + +LICENSE="BSD" +SLOT="0/${PV}" +IUSE="cpu_flags_x86_sse2" + +RDEPEND=" +arm? ( sys-devel/binutils[gold(-)] ) +arm64? ( sys-devel/binutils[gold(-)] )" +BDEPEND="|| ( + >=dev-lang/go-${GO_BOOTSTRAP_MIN} + >=dev-lang/go-bootstrap-${GO_BOOTSTRAP_MIN} )" + +# the *.syso files have writable/executable stacks +QA_EXECSTACK='*.syso' + +# Do not complain about CFLAGS, etc, since Go doesn't use them. +QA_FLAGS_IGNORED='.*' + +# The tools in /usr/lib/go should not cause the multilib-strict check to fail. +QA_MULTILIB_PATHS="usr/lib/go/pkg/tool/.*/.*" + +# This package triggers "unrecognized elf file(s)" notices on riscv. +# https://bugs.gentoo.org/794046 +QA_PREBUILT='.*' + +# Do not strip this package. Stripping is unsupported upstream and may +# fail. +RESTRICT=" strip" + +DOCS=( + CONTRIBUTING.md + PATENTS + README.md + SECURITY.md +) + +go_tuple() { + echo "$(go-env_goos $@)_$(go-env_goarch $@)" +} + +go_cross_compile() { + [[ $(go_tuple ${CBUILD}) != $(go_tuple) ]] +} + +PATCHES=( + "${FILESDIR}"/go-never-download-newer-toolchains.patch +) + +src_compile() { + if has_version -b ">=dev-lang/go-${GO_BOOTSTRAP_MIN}"; then + export GOROOT_BOOTSTRAP="${BROOT}/usr/lib/go" + elif has_version -b ">=dev-lang/go-bootstrap-${GO_BOOTSTRAP_MIN}"; then + export GOROOT_BOOTSTRAP="${BROOT}/usr/lib/go-bootstrap" + else + eerror "Go cannot be built without go or go-bootstrap installed" + die "Should not be here, please report a bug" + fi + + # Go's build script does not use BUILD/HOST/TARGET consistently. :( + export GOHOSTARCH=$(go-env_goarch ${CBUILD}) + export GOHOSTOS=$(go-env_goos ${CBUILD}) + export CC=$(tc-getBUILD_CC) + + export GOARCH=$(go-env_goarch) + export GOOS=$(go-env_goos) + export CC_FOR_TARGET=$(tc-getCC) + export CXX_FOR_TARGET=$(tc-getCXX) + use arm && export GOARM=$(go-env_goarm) + use x86 && export GO386=$(go-env_go386) + + cd src + bash -x ./make.bash || die "build failed" +} + +src_test() { + go_cross_compile && return 0 + + cd src + + # https://github.com/golang/go/issues/42005 + rm cmd/link/internal/ld/fallocate_test.go || die + + PATH="${GOBIN}:${PATH}" \ + ./run.bash -no-rebuild -k || die "tests failed" + cd .. + rm -fr pkg/*_race || die + rm -fr pkg/obj/go-build || die +} + +src_install() { + dodir /usr/lib/go + # The use of cp is deliberate in order to retain permissions + cp -R api bin doc lib pkg misc src test "${ED}"/usr/lib/go + einstalldocs + + insinto /usr/lib/go + doins go.env VERSION* + + # testdata directories are not needed on the installed system + rm -fr $(find "${ED}"/usr/lib/go -iname testdata -type d -print) + + local bin_path + if go_cross_compile; then + bin_path="bin/$(go_tuple)" + else + bin_path=bin + fi + local f x + for x in ${bin_path}/*; do + f=${x##*/} + dosym ../lib/go/${bin_path}/${f} /usr/bin/${f} + done + + # install the @golang-rebuild set for Portage + insinto /usr/share/portage/config/sets + newins "${FILESDIR}"/go-sets.conf go.conf +} + +pkg_postinst() { + [[ -z ${REPLACING_VERSIONS} ]] && return + elog "After ${CATEGORY}/${PN} is updated it is recommended to rebuild" + elog "all packages compiled with previous versions of ${CATEGORY}/${PN}" + elog "due to the static linking nature of go." + elog "If this is not done, the packages compiled with the older" + elog "version of the compiler will not be updated until they are" + elog "updated individually, which could mean they will have" + elog "vulnerabilities." + elog "Run 'emerge @golang-rebuild' to rebuild all 'go' packages" + elog "See https://bugs.gentoo.org/752153 for more info" +} diff --git a/dev-lang/go/go-1.24.1.ebuild b/dev-lang/go/go-1.24.1.ebuild new file mode 100644 index 000000000000..733c24241546 --- /dev/null +++ b/dev-lang/go/go-1.24.1.ebuild @@ -0,0 +1,133 @@ +# Copyright 1999-2025 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +export CBUILD=${CBUILD:-${CHOST}} +export CTARGET=${CTARGET:-${CHOST}} + +# See "Bootstrap" in release notes +GO_BOOTSTRAP_MIN=1.22.12 +MY_PV=${PV/_/} + +inherit go-env toolchain-funcs + +case ${PV} in +*9999*) + EGIT_REPO_URI="https://github.com/golang/go.git" + inherit git-r3 + ;; +*) + SRC_URI="https://storage.googleapis.com/golang/go${MY_PV}.src.tar.gz " + S="${WORKDIR}"/go + KEYWORDS="-* ~amd64 ~arm ~arm64 ~loong ~mips ~ppc64 ~riscv ~s390 ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris" + ;; +esac + +DESCRIPTION="A concurrent garbage collected and typesafe programming language" +HOMEPAGE="https://go.dev" + +LICENSE="BSD" +SLOT="0/${PV}" +IUSE="cpu_flags_x86_sse2" + +RDEPEND=" +arm? ( sys-devel/binutils[gold(-)] ) +arm64? ( sys-devel/binutils[gold(-)] )" +BDEPEND="|| ( + >=dev-lang/go-${GO_BOOTSTRAP_MIN} + >=dev-lang/go-bootstrap-${GO_BOOTSTRAP_MIN} )" + +# the *.syso files have writable/executable stacks +QA_EXECSTACK='*.syso' + +# Do not complain about CFLAGS, etc, since Go doesn't use them. +QA_FLAGS_IGNORED='.*' + +# The tools in /usr/lib/go should not cause the multilib-strict check to fail. +QA_MULTILIB_PATHS="usr/lib/go/pkg/tool/.*/.*" + +# This package triggers "unrecognized elf file(s)" notices on riscv. +# https://bugs.gentoo.org/794046 +QA_PREBUILT='.*' + +# Do not strip this package. Stripping is unsupported upstream and may +# fail. +RESTRICT=" strip" + +DOCS=( + CONTRIBUTING.md + PATENTS + README.md + SECURITY.md +) + +go_tuple() { + echo "$(go-env_goos $@)_$(go-env_goarch $@)" +} + +go_cross_compile() { + [[ $(go_tuple ${CBUILD}) != $(go_tuple) ]] +} + +PATCHES=( + "${FILESDIR}"/go-never-download-newer-toolchains.patch +) + +src_compile() { + if has_version -b ">=dev-lang/go-${GO_BOOTSTRAP_MIN}"; then + export GOROOT_BOOTSTRAP="${BROOT}/usr/lib/go" + elif has_version -b ">=dev-lang/go-bootstrap-${GO_BOOTSTRAP_MIN}"; then + export GOROOT_BOOTSTRAP="${BROOT}/usr/lib/go-bootstrap" + else + eerror "Go cannot be built without go or go-bootstrap installed" + die "Should not be here, please report a bug" + fi + + # Go's build script does not use BUILD/HOST/TARGET consistently. :( + export GOHOSTARCH=$(go-env_goarch ${CBUILD}) + export GOHOSTOS=$(go-env_goos ${CBUILD}) + export CC=$(tc-getBUILD_CC) + + export GOARCH=$(go-env_goarch) + export GOOS=$(go-env_goos) + export CC_FOR_TARGET=$(tc-getCC) + export CXX_FOR_TARGET=$(tc-getCXX) + use arm && export GOARM=$(go-env_goarm) + use x86 && export GO386=$(go-env_go386) + + cd src + bash -x ./make.bash || die "build failed" +} + +src_test() { + go_cross_compile && return 0 + cd src + PATH="${GOBIN}:${PATH}" \ + ./run.bash -no-rebuild -k || die "tests failed" +} + +src_install() { + dodir /usr/lib/go + # The use of cp is deliberate in order to retain permissions + cp -R . "${ED}"/usr/lib/go + einstalldocs + + # testdata directories are not needed on the installed system + # The other files we remove are installed by einstalldocs + rm -r $(find "${ED}"/usr/lib/go -iname testdata -type d -print) || die + rm "${ED}"/usr/lib/go/{CONTRIBUTING.md,PATENTS,README.md} || die + rm "${ED}"/usr/lib/go/{SECURITY.md,codereview.cfg,LICENSE} || die + + local bin_path + if go_cross_compile; then + bin_path="bin/$(go_tuple)" + else + bin_path=bin + fi + local f x + for x in ${bin_path}/*; do + f=${x##*/} + dosym ../lib/go/${bin_path}/${f} /usr/bin/${f} + done +} diff --git a/dev-lang/ocaml/Manifest b/dev-lang/ocaml/Manifest index 3818da6d3746..3ba560fc4f81 100644 --- a/dev-lang/ocaml/Manifest +++ b/dev-lang/ocaml/Manifest @@ -23,7 +23,7 @@ EBUILD ocaml-4.12.1.ebuild 2518 BLAKE2B 2ff12f9411da66ba34171a3b925fedc3c56d8ade EBUILD ocaml-4.13.1.ebuild 2481 BLAKE2B 3fb04e2dd03dbabf807ba0620ed494be28b9c4f465f4e52eafde03f3e3e0db6876c7cb73570f3048e6ef6d6f1f4b90447f622d4bb29d9fcbd743ce461c6bb245 SHA512 ea093161ff02e609d4b063b38fa8e29d2dbb471f61c40b1fda63cb733dd5175744449d9b2b1edf758d15adfc0359dfd2cac26042db000ace742edc0eab22eac8 EBUILD ocaml-4.14.1.ebuild 2440 BLAKE2B ea1cb9fba221ff93a3a4f5ae49db23e0b32aaae0c94ae16ebe075564548da2784370a8da70e4e1e332ae95e233c6c0ba034cd7e4a955c65807fe649f043119ad SHA512 55f97a54904be60ced8ff3a15301e8cd338a19722da39dc76da8a5dc3a25baba32497003ac37bb6cf2e20ac9d490f8596738e03304187c011c7a561b104da2d0 EBUILD ocaml-4.14.2.ebuild 2587 BLAKE2B 63fb2de0f2b38754e4a0dfa2669ee0d7aefbfd91ef6ec427ee44cf7c2e68241abe04e079139b5de33aa2b3e4f9dfd2c62657905e1de4b8b1fbc3f3a119ab4631 SHA512 d55c9d057e781ea080c9f211c451ac787f851a80d2100b27645ee912e66c2c863703b3a2d0e14fa7538094e3eedff19d888cfe42fe153ba118e340b338ac7285 -EBUILD ocaml-5.2.0.ebuild 2627 BLAKE2B 4dc6c29849839927544941c263ff33b0d24e3617a466a3ef4cf78fe6ae949fb650da9c9cdcc011adf426ff54f0e837482f969f8ade9b0642bab5940196b6e1e6 SHA512 31fc07c3cca11ca8d53d27ffca92b636bea2c112a2a73d437cf57bdfa175021f61db9d656bca5058c0d86c77457f36e012e6aaf233a9de2b6bd9f22d08f02177 -EBUILD ocaml-5.2.1.ebuild 2627 BLAKE2B 4dc6c29849839927544941c263ff33b0d24e3617a466a3ef4cf78fe6ae949fb650da9c9cdcc011adf426ff54f0e837482f969f8ade9b0642bab5940196b6e1e6 SHA512 31fc07c3cca11ca8d53d27ffca92b636bea2c112a2a73d437cf57bdfa175021f61db9d656bca5058c0d86c77457f36e012e6aaf233a9de2b6bd9f22d08f02177 -EBUILD ocaml-5.3.0.ebuild 2627 BLAKE2B 1dd72c47fc54deb90a968eaec55a56052175c44972cabb7f37a7f011fdbe15d58e0aab278c31df3d76cca5a2d0d4118fd7f2617387dc70f0dc1c5eed7046836f SHA512 4bee61e86ec10a55adac41d6b8e52e09ca4653dd09181b7d499848b897a312793de26dc160d25b3baf3a05c4134947d60fc92ce504e33666d4f73d53a8284590 +EBUILD ocaml-5.2.0-r1.ebuild 2648 BLAKE2B 60f8e4c4beb0fac79b81ea22560da65c5bfedded2eac4f35071099bc014fd3bfe83ae7531a5f17c9fc95daae3a1e79baf0c9ac34b8b2b18fa169fcf0a50f9c6a SHA512 74347ac955f2dd1ef8af28b01fd9701a21ecba5d765952e8e0213321d040ddfaf32c06df75eba2da2907e8a5258b75a08e22506660a6c567ff25fcd5733615a7 +EBUILD ocaml-5.2.1-r1.ebuild 2648 BLAKE2B 60f8e4c4beb0fac79b81ea22560da65c5bfedded2eac4f35071099bc014fd3bfe83ae7531a5f17c9fc95daae3a1e79baf0c9ac34b8b2b18fa169fcf0a50f9c6a SHA512 74347ac955f2dd1ef8af28b01fd9701a21ecba5d765952e8e0213321d040ddfaf32c06df75eba2da2907e8a5258b75a08e22506660a6c567ff25fcd5733615a7 +EBUILD ocaml-5.3.0-r1.ebuild 2648 BLAKE2B 60f8e4c4beb0fac79b81ea22560da65c5bfedded2eac4f35071099bc014fd3bfe83ae7531a5f17c9fc95daae3a1e79baf0c9ac34b8b2b18fa169fcf0a50f9c6a SHA512 74347ac955f2dd1ef8af28b01fd9701a21ecba5d765952e8e0213321d040ddfaf32c06df75eba2da2907e8a5258b75a08e22506660a6c567ff25fcd5733615a7 MISC metadata.xml 671 BLAKE2B 452ea340c8abacedbdb20a344cffa9b91db2251e0174db596e4f96bf2b1c9d308ceb035e0870e738a15c313003fcbf39bb91c5f68b40a185e5e08e3ea7042616 SHA512 1d8248e2b05b145c804cc9cce6aa617bd6466f26326033cee06ed27ceb93ebc88b62f3badbfe13092fbaa89c3a71087491b88c4fc094da8624ab668cdc73b383 diff --git a/dev-lang/ocaml/ocaml-5.3.0.ebuild b/dev-lang/ocaml/ocaml-5.2.0-r1.ebuild index 671831ae1ec3..5e0ea8f304bc 100644 --- a/dev-lang/ocaml/ocaml-5.3.0.ebuild +++ b/dev-lang/ocaml/ocaml-5.2.0-r1.ebuild @@ -14,7 +14,8 @@ SLOT="0/${PV}" KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos" IUSE="emacs flambda latex +ocamlopt test xemacs" -RDEPEND="sys-libs/binutils-libs:=" +RDEPEND="sys-libs/binutils-libs:= + !dev-ml/findlib:0/0" BDEPEND="${RDEPEND} virtual/pkgconfig" PDEPEND="emacs? ( app-emacs/ocaml-mode ) diff --git a/dev-lang/ocaml/ocaml-5.2.0.ebuild b/dev-lang/ocaml/ocaml-5.2.1-r1.ebuild index 803f42a3c4d7..5e0ea8f304bc 100644 --- a/dev-lang/ocaml/ocaml-5.2.0.ebuild +++ b/dev-lang/ocaml/ocaml-5.2.1-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2024 Gentoo Authors +# Copyright 1999-2025 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -14,7 +14,8 @@ SLOT="0/${PV}" KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos" IUSE="emacs flambda latex +ocamlopt test xemacs" -RDEPEND="sys-libs/binutils-libs:=" +RDEPEND="sys-libs/binutils-libs:= + !dev-ml/findlib:0/0" BDEPEND="${RDEPEND} virtual/pkgconfig" PDEPEND="emacs? ( app-emacs/ocaml-mode ) diff --git a/dev-lang/ocaml/ocaml-5.2.1.ebuild b/dev-lang/ocaml/ocaml-5.3.0-r1.ebuild index 803f42a3c4d7..5e0ea8f304bc 100644 --- a/dev-lang/ocaml/ocaml-5.2.1.ebuild +++ b/dev-lang/ocaml/ocaml-5.3.0-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2024 Gentoo Authors +# Copyright 1999-2025 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -14,7 +14,8 @@ SLOT="0/${PV}" KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos" IUSE="emacs flambda latex +ocamlopt test xemacs" -RDEPEND="sys-libs/binutils-libs:=" +RDEPEND="sys-libs/binutils-libs:= + !dev-ml/findlib:0/0" BDEPEND="${RDEPEND} virtual/pkgconfig" PDEPEND="emacs? ( app-emacs/ocaml-mode ) |