commit: bab3e468328e5cb4b01cd2d748356a0c251ed61e Author: Paul Zander <negril.nx+gentoo <AT> gmail <DOT> com> AuthorDate: Sat Nov 8 13:07:43 2025 +0000 Commit: Paul Zander <negril.nx+gentoo <AT> gmail <DOT> com> CommitDate: Sat Nov 8 13:07:43 2025 +0000 URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=bab3e468
sci-ml/ollama: add 0.12.10, drop 0.12.9, update 9999, fix sed path Path was changed upstream Closes: https://bugs.gentoo.org/965817 Signed-off-by: Paul Zander <negril.nx+gentoo <AT> gmail.com> sci-ml/ollama/Manifest | 4 ++-- sci-ml/ollama/{ollama-0.12.9.ebuild => ollama-0.12.10.ebuild} | 11 +++++++---- sci-ml/ollama/ollama-9999.ebuild | 11 +++++++---- 3 files changed, 16 insertions(+), 10 deletions(-) diff --git a/sci-ml/ollama/Manifest b/sci-ml/ollama/Manifest index 57707fd7a1..cc08459de8 100644 --- a/sci-ml/ollama/Manifest +++ b/sci-ml/ollama/Manifest @@ -1,4 +1,4 @@ +DIST ollama-0.12.10-deps.tar.xz 49906880 BLAKE2B efd7b64921784b1d68a27d07c1de80836a57f163fc4a17748e52ac0e78480c8811f68149d8f75eff9ba2e19c8be62683c9e75d2b92cfef84100a0de2e7818e3c SHA512 0af9f5fc1d5633b6ac9934e5a7d232aa20c5e2f8d4eaeb0152c6fcf77e1922dc7b67fcc039933562832939553dc3861ca35cf2e604fd310934669227666aee3e +DIST ollama-0.12.10.gh.tar.gz 21103971 BLAKE2B e96cdd8956ae93c93ea12041467692b60a857c9d6d8ee2b18d73523f326a8d01069930ec955d8a38cac635b702caf14ec7951a8a277eaf9481f417b091a453bb SHA512 694d618c1db758bca36f46eba744ebe107ddb98ed3c49eab519b265fa26a6e736b3ec3f7fe8ac7729fc691cedab36dabdd142b46073e1963e1f24a4ff76d2e3a DIST ollama-0.12.6-deps.tar.xz 48057580 BLAKE2B f27521bd7755fe5d7deb57962f305ec17ddbe34b024744152531143eda1128f25a501b5923cee58dc54c832eeaaa50b7135c4a594a1f25f9eec211ac2e55e148 SHA512 cb226f4bbb46c9b76f890f12d7a9671331690a866f74440c10444c6638b2895f3df4036930a98f06401e3a3cfec562e214a4030aca1787600175760f7eaedef8 DIST ollama-0.12.6.gh.tar.gz 11355405 BLAKE2B 4511a5d2cf199333a63bf1b46f86ab8aa90ea6c156b63b16932c0b7356881bf6d4cd93a01c4b0390da96d18574aa272b5ebcab69b8bb5929145f4b72c0e875c7 SHA512 e9c9234914044a9f1ae0512adf1e5404161d2adc04036ef84da44a3c38d2684e883cd9705f986259199218e739dba01a7af845a93f85eecf949f81b1472eca23 -DIST ollama-0.12.9-deps.tar.xz 48057580 BLAKE2B f27521bd7755fe5d7deb57962f305ec17ddbe34b024744152531143eda1128f25a501b5923cee58dc54c832eeaaa50b7135c4a594a1f25f9eec211ac2e55e148 SHA512 cb226f4bbb46c9b76f890f12d7a9671331690a866f74440c10444c6638b2895f3df4036930a98f06401e3a3cfec562e214a4030aca1787600175760f7eaedef8 -DIST ollama-0.12.9.gh.tar.gz 20289755 BLAKE2B ebe3d397341114b2b1a9b24bf3a2816e4f1f6c1a353115575fe846979c17be3bf93ad67116f92ec7420a5986494ab44cff6786fcc4923df26f5eeede25fccd3a SHA512 5951a585b64c1dc3406227d86c71b032223034953d318c71ef3e7c3b629f8fa7729bee8eb30ea984cbb2c46a625af802f9b28ebdc7c71494bd01abe8a5dce6e9 diff --git a/sci-ml/ollama/ollama-0.12.9.ebuild b/sci-ml/ollama/ollama-0.12.10.ebuild similarity index 97% rename from sci-ml/ollama/ollama-0.12.9.ebuild rename to sci-ml/ollama/ollama-0.12.10.ebuild index d53e6630eb..90d23c1390 100644 --- a/sci-ml/ollama/ollama-0.12.9.ebuild +++ b/sci-ml/ollama/ollama-0.12.10.ebuild @@ -137,20 +137,23 @@ src_prepare() { -e "/set(GGML_CCACHE/s/ON/OFF/g" \ -e "/PRE_INCLUDE_REGEXES.*cu/d" \ -e "/PRE_INCLUDE_REGEXES.*hip/d" \ - -i CMakeLists.txt || die sed + -i CMakeLists.txt || die "bundle headers sed failed" # TODO see src_unpack? sed \ -e "s/ -O3//g" \ - -i ml/backend/ggml/ggml/src/ggml-cpu/cpu.go || die sed + -i \ + ml/backend/ggml/ggml/src/ggml-cpu/cpu.go \ + || die "-O3 sed failed" + # grep -Rl -e 'lib/ollama' -e '"..", "lib"' --include '*.go' sed \ -e "s/\"..\", \"lib\"/\"..\", \"$(get_libdir)\"/" \ -e "s#\"lib/ollama\"#\"$(get_libdir)/ollama\"#" \ -i \ ml/backend/ggml/ggml/src/ggml.go \ - discover/path.go \ - || die + ml/path.go \ + || die "libdir sed failed" if use amd64; then if diff --git a/sci-ml/ollama/ollama-9999.ebuild b/sci-ml/ollama/ollama-9999.ebuild index d53e6630eb..90d23c1390 100644 --- a/sci-ml/ollama/ollama-9999.ebuild +++ b/sci-ml/ollama/ollama-9999.ebuild @@ -137,20 +137,23 @@ src_prepare() { -e "/set(GGML_CCACHE/s/ON/OFF/g" \ -e "/PRE_INCLUDE_REGEXES.*cu/d" \ -e "/PRE_INCLUDE_REGEXES.*hip/d" \ - -i CMakeLists.txt || die sed + -i CMakeLists.txt || die "bundle headers sed failed" # TODO see src_unpack? sed \ -e "s/ -O3//g" \ - -i ml/backend/ggml/ggml/src/ggml-cpu/cpu.go || die sed + -i \ + ml/backend/ggml/ggml/src/ggml-cpu/cpu.go \ + || die "-O3 sed failed" + # grep -Rl -e 'lib/ollama' -e '"..", "lib"' --include '*.go' sed \ -e "s/\"..\", \"lib\"/\"..\", \"$(get_libdir)\"/" \ -e "s#\"lib/ollama\"#\"$(get_libdir)/ollama\"#" \ -i \ ml/backend/ggml/ggml/src/ggml.go \ - discover/path.go \ - || die + ml/path.go \ + || die "libdir sed failed" if use amd64; then if
