From 4856d9d89d9f533d36c415521ddc9c23be3c6033 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Thu, 30 Jan 2025 22:43:19 +0000 Subject: gentoo auto-resync : 30:01:2025 - 22:43:19 --- dev-lang/crystal/Manifest | 3 +- dev-lang/crystal/crystal-1.15.0-r1.ebuild | 126 +++++++++++++++++++++ dev-lang/crystal/crystal-1.15.0.ebuild | 115 ------------------- ...l-1.15.0-remove-enviroment-clearing-tests.patch | 28 +++++ 4 files changed, 156 insertions(+), 116 deletions(-) create mode 100644 dev-lang/crystal/crystal-1.15.0-r1.ebuild delete mode 100644 dev-lang/crystal/crystal-1.15.0.ebuild create mode 100644 dev-lang/crystal/files/crystal-1.15.0-remove-enviroment-clearing-tests.patch (limited to 'dev-lang/crystal') diff --git a/dev-lang/crystal/Manifest b/dev-lang/crystal/Manifest index 89bb01f53e4f..a107aa8cf01a 100644 --- a/dev-lang/crystal/Manifest +++ b/dev-lang/crystal/Manifest @@ -1,5 +1,6 @@ AUX crystal-0.27.0-gentoo-tests-long-unix-2.patch 469 BLAKE2B 66bcc1d0dd9582cac4ba89a2ccc2c7a2ac3ff4994cd687191470f2d481f9a6e3a91aaaf705f92f7600118a9cda015a9554056520502df7ae6462e111665c7330 SHA512 d840ac343ef566e404dc84e908bead5a020dfd88b8c0432f17bceea8d710d435626dc72b4be6622dbcd683a149bca16e781320cf74fc3f2598f84d169c6f7faa AUX crystal-0.27.0-gentoo-tests-long-unix.patch 3317 BLAKE2B df1040abdb587ac3fffb8129d4f1bafc492e38ad5dcfdea5cfbf4426849b099c4d94dac61c93ae7fcae46b60dea1809f52ad373efcd89796a3c1f119614063c1 SHA512 a9ed819a864465e062b4d6a568f14fbb8adc1db01071c79164dede8b2b8d83e07b785cd8196826097de5119e0bdc7d6e194cf4e10cc677bd2bdf158d124c2ad2 +AUX crystal-1.15.0-remove-enviroment-clearing-tests.patch 936 BLAKE2B e9d3f2384c79eb17a52b71636147ac97aada9a7ddccc619fd0a5ccd2c89d3e7f135d9526931557f4bd15eef5232e0cb469715568d8d07b7e5530947720f67921 SHA512 e0e48d65098d07511238b4be0c1daa8c8d9aec42148a5115526431f1f507425160324e98d2ca647fb135b3a0b534cf0b376ae7563bd6c9046ea1264b860f44ad AUX crystal-1.7.2-extra-spec-flags.patch 1080 BLAKE2B 3054e38d4e7d114f1b0a08b367f9a5b366bbe269c75b9195abf9dc39231b32428a108c4254abd0bdb29b2ac6a94d6d256eccc68ca69f80a273cd17e0c0115fc7 SHA512 3c3fd6a42b291a42f76ec76101d669011eb02d4d17f35c8ad31c5a49aa3655a2315999e2401af7f3bc26445f74f432430a44b021846238d345d9c14b1009fdc5 DIST crystal-1.14.0-1-linux-x86_64.tar.gz 51712092 BLAKE2B 25281d0488ce84b278005e918fd7ae893ec690d50b01c65f06370e24d3ef6548a3ff823c0ce1903fc3d6d0c4108ab8c72365ce51f1ebb64519e0076cc5df9dff SHA512 ff7839166ebe0217149d0185c27fa0d48cd7322ddca3492e3bbbfaf505696994ce04a86eb1f51f6c0633892ebc4b82bac53ec9cb26c0a9c588c5002a984f0038 DIST crystal-1.14.0.tar.gz 3726474 BLAKE2B 97efe777790b4d2330f6891bbe91a709fb0aacf7989a60b70c3d22c2735e83b9315899ad529f4605eed7dc4b4eed14f4d51ccd8a47dfc55057f15acd62c8c10d SHA512 561e14212b8f3e2841739408870e70a79cbc11097070760e75e4013a030082db050f6615453da54adceae3f0de12af43498f33fab9b7f4ecfa6860d582dec095 @@ -9,5 +10,5 @@ DIST crystal-1.15.0-1-linux-x86_64.tar.gz 51497623 BLAKE2B 03059b38b1df3a035c824 DIST crystal-1.15.0.gh.tar.gz 3812860 BLAKE2B a6b52007d6a4975d2011104f65cec932300bb6f84f497bfda138d987e844cb025d4690b0f74335aff42295c5d355ac73371cab86db87ca9819c1885d98f76bd8 SHA512 ea07de4b9c6c46e96f05d816d0504f8b0206e89fe7e4236038dc3b0875e52e89c711cc798b8fc30f66b02dd48cec70e0ea76160f14447577761411a41f1b28fa EBUILD crystal-1.14.0.ebuild 2632 BLAKE2B 6284e97c98096fd14101a4308d2db3eb265d26241f181658ee24615622ef3686c4a79b47d58536b127c035dece0e63f1ae35f6605af7b73f362a166307810f80 SHA512 e27bb51f2dd874cb8633ed0ad594aaa512676d841a9d1fd991169a54595c73ee4ff40f665df0b5d4a012a43f85ad5a90480e59b547ae42a77a204be545716579 EBUILD crystal-1.14.1.ebuild 2633 BLAKE2B 1945457158a0d549f5be113342d47b3919af5bd80030f8ac3b4a0279a1054c11b440aa130e616eb6fde27b9217dc453623d2b1e32f2e0abe0997a15564dd3a6f SHA512 61d9dba45711ccbadf279d53923c6c543d01ca6d2d3c5fa13cf105d16ab9d67e64a44fc9f609106eac0b470dd0ff263ad8eff1b90f30e4de2e7d354ead4ceb20 -EBUILD crystal-1.15.0.ebuild 2389 BLAKE2B 493df7328e2f107412bcc932ef210c3c0899eed1031b44ed7689e92405387a5231637ef0213c9278606664163a6f2bb70b02b60526e3dd3ee72d260e618fc0d3 SHA512 6ed6a62688fb0244d3f41dd225e61e079770af2ea2396bbf1db8e5dd35aa3d867560a00b4c076fbc6bd19d337b6f1dc56ff1c94eb886a2f70a5b6cdeb3a66dae +EBUILD crystal-1.15.0-r1.ebuild 2785 BLAKE2B cf0495de84b1af4d292bd05c153db8a1412dcfed2a4bef00abd4c6b984d368b822f162c09ab0177f0b070e39aae2cbfc3582630c51f6f7bfe4a9c6efa83b406e SHA512 5333b4f5456ab7a58c3df1669627dae50e9a82ab71c77ddf564fba73e3d182c29721a7ac624b3e1ab0584f79097d6ca37f0c313b420d29507aedafb4c1de7b94 MISC metadata.xml 762 BLAKE2B 591f38c882318a6564501cc61abe6222264b65adeaffaf3b23d959ee86b83bae33eaf99029229705f92070fa539fd6d63d8242afc38475904483a9a0b997effd SHA512 ea223d568a3c336a43b183efc61bd1f1a9d1e5e0e8d963275e0b23ee879551bc7d8aae797b1e2edba49d119ad306692599eb535c5d164ebee0c6721dfeab78dc diff --git a/dev-lang/crystal/crystal-1.15.0-r1.ebuild b/dev-lang/crystal/crystal-1.15.0-r1.ebuild new file mode 100644 index 000000000000..573dc999fa39 --- /dev/null +++ b/dev-lang/crystal/crystal-1.15.0-r1.ebuild @@ -0,0 +1,126 @@ +# Copyright 1999-2025 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +BV="${PV}-1" +BV_AMD64="${BV}-linux-x86_64" + +LLVM_COMPAT=( {18..19} ) + +inherit llvm-r1 multiprocessing shell-completion toolchain-funcs + +DESCRIPTION="The Crystal Programming Language" +HOMEPAGE="https://crystal-lang.org/ + https://github.com/crystal-lang/crystal/" +SRC_URI=" + https://github.com/crystal-lang/crystal/archive/${PV}.tar.gz + -> ${P}.gh.tar.gz + amd64? ( + https://github.com/crystal-lang/crystal/releases/download/${BV/-*}/crystal-${BV_AMD64}.tar.gz + ) +" + +LICENSE="Apache-2.0" +SLOT="0" +KEYWORDS="~amd64" +IUSE="doc debug llvm-libunwind" +RESTRICT="test" # Upstream test suite not reliable. + +DEPEND=" + dev-libs/boehm-gc:=[threads] + dev-libs/gmp:= + dev-libs/libatomic_ops:= + dev-libs/libevent:= + dev-libs/libpcre2:=[unicode] + dev-libs/pcl:= + $(llvm_gen_dep ' + llvm-core/llvm:${LLVM_SLOT}= + ') + llvm-libunwind? ( + llvm-runtimes/libunwind:= + ) + !llvm-libunwind? ( + sys-libs/libunwind:= + ) +" +RDEPEND=" + ${DEPEND} + dev-libs/libxml2 + dev-libs/libyaml +" + +PATCHES=( + "${FILESDIR}/${PN}-0.27.0-gentoo-tests-long-unix.patch" + "${FILESDIR}/${PN}-0.27.0-gentoo-tests-long-unix-2.patch" + "${FILESDIR}/${PN}-1.15.0-remove-enviroment-clearing-tests.patch" +) + +src_prepare() { + default + + # Link against system boehm-gc instead of upstream prebuilt static library + # bug #929123, #929989 and #931100 + # https://github.com/crystal-lang/crystal/issues/12035#issuecomment-2522606612 + rm "${WORKDIR}/crystal-${BV}"/lib/crystal/libgc.a || die +} + +src_configure() { + local bootstrap_path="${WORKDIR}/${PN}-${BV}/bin" + if [[ ! -d "${bootstrap_path}" ]] ; then + eerror "Binary tarball does not contain expected directory:" + die "'${bootstrap_path}' path does not exist." + fi + + # crystal uses 'LLVM_TARGETS' to override default list of targets + unset LLVM_TARGETS + + MY_EMAKE_COMMON_ARGS=( + PATH="${bootstrap_path}:${PATH}" + + CRYSTAL_CONFIG_VERSION="${PV}" + CRYSTAL_CONFIG_PATH="lib:${EPREFIX}/usr/$(get_libdir)/crystal" + + $(usex debug "" release=1) + progress=true + stats=1 + threads="$(makeopts_jobs)" + verbose=1 + check_lld= # disable opportunistic lld + + AR="$(tc-getAR)" + CC="$(tc-getCC)" + CXX="$(tc-getCXX)" + LLVM_CONFIG="$(get_llvm_prefix -d)/bin/llvm-config" + ) +} + +src_compile() { + emake "${MY_EMAKE_COMMON_ARGS[@]}" + + use doc && emake docs "${MY_EMAKE_COMMON_ARGS[@]}" +} + +src_test() { + emake std_spec "${MY_EMAKE_COMMON_ARGS[@]}" +} + +src_install() { + insinto "/usr/$(get_libdir)/crystal" + doins -r src/. + + exeinto /usr/bin + doexe .build/crystal + + newzshcomp etc/completion.zsh _crystal + newfishcomp etc/completion.fish crystal.fish + + dodoc -r samples + doman "man/${PN}.1" + newbashcomp etc/completion.bash "${PN}" + + if use doc ; then + docinto api + dodoc -r docs/. + fi +} diff --git a/dev-lang/crystal/crystal-1.15.0.ebuild b/dev-lang/crystal/crystal-1.15.0.ebuild deleted file mode 100644 index 4ceb85f7e207..000000000000 --- a/dev-lang/crystal/crystal-1.15.0.ebuild +++ /dev/null @@ -1,115 +0,0 @@ -# Copyright 1999-2025 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -BV="${PV}-1" -BV_AMD64="${BV}-linux-x86_64" - -LLVM_COMPAT=( {18..19} ) - -inherit bash-completion-r1 llvm-r1 multiprocessing toolchain-funcs - -DESCRIPTION="The Crystal Programming Language" -HOMEPAGE="https://crystal-lang.org/ - https://github.com/crystal-lang/crystal/" -SRC_URI=" - https://github.com/crystal-lang/crystal/archive/${PV}.tar.gz - -> ${P}.gh.tar.gz - amd64? ( - https://github.com/crystal-lang/crystal/releases/download/${BV/-*}/crystal-${BV_AMD64}.tar.gz - ) -" - -LICENSE="Apache-2.0" -SLOT="0" -KEYWORDS="~amd64" -IUSE="doc debug llvm-libunwind" -RESTRICT="test" # Upstream test suite not reliable. - -DEPEND=" - dev-libs/boehm-gc:=[threads] - dev-libs/gmp:= - dev-libs/libatomic_ops:= - dev-libs/libevent:= - dev-libs/libpcre2:=[unicode] - dev-libs/pcl:= - $(llvm_gen_dep ' - llvm-core/llvm:${LLVM_SLOT}= - ') - llvm-libunwind? ( - llvm-runtimes/libunwind:= - ) - !llvm-libunwind? ( - sys-libs/libunwind:= - ) -" -RDEPEND=" - ${DEPEND} - dev-libs/libxml2 - dev-libs/libyaml -" - -PATCHES=( - "${FILESDIR}/${PN}-0.27.0-gentoo-tests-long-unix.patch" - "${FILESDIR}/${PN}-0.27.0-gentoo-tests-long-unix-2.patch" -) - -src_configure() { - local bootstrap_path="${WORKDIR}/${PN}-${BV}/bin" - if [[ ! -d "${bootstrap_path}" ]] ; then - eerror "Binary tarball does not contain expected directory:" - die "'${bootstrap_path}' path does not exist." - fi - - # crystal uses 'LLVM_TARGETS' to override default list of targets - unset LLVM_TARGETS - - MY_EMAKE_COMMON_ARGS=( - PATH="${bootstrap_path}:${PATH}" - - CRYSTAL_CONFIG_VERSION="${PV}" - CRYSTAL_CONFIG_PATH="lib:${EPREFIX}/usr/$(get_libdir)/crystal" - - $(usex debug "" release=1) - progress=true - stats=1 - threads="$(makeopts_jobs)" - verbose=1 - - AR="$(tc-getAR)" - CC="$(tc-getCC)" - CXX="$(tc-getCXX)" - LLVM_CONFIG="$(get_llvm_prefix -d)/bin/llvm-config" - ) -} - -src_compile() { - emake "${MY_EMAKE_COMMON_ARGS[@]}" - - use doc && emake docs "${MY_EMAKE_COMMON_ARGS[@]}" -} - -src_test() { - emake std_spec "${MY_EMAKE_COMMON_ARGS[@]}" -} - -src_install() { - insinto "/usr/$(get_libdir)/crystal" - doins -r src/. - - exeinto /usr/bin - doexe .build/crystal - - insinto /usr/share/zsh/site-functions - newins etc/completion.zsh _crystal - - dodoc -r samples - doman "man/${PN}.1" - newbashcomp etc/completion.bash "${PN}" - - if use doc ; then - docinto api - dodoc -r docs/. - fi -} diff --git a/dev-lang/crystal/files/crystal-1.15.0-remove-enviroment-clearing-tests.patch b/dev-lang/crystal/files/crystal-1.15.0-remove-enviroment-clearing-tests.patch new file mode 100644 index 000000000000..11667b0da28a --- /dev/null +++ b/dev-lang/crystal/files/crystal-1.15.0-remove-enviroment-clearing-tests.patch @@ -0,0 +1,28 @@ +Sandbox won't allow removing sandbox related environment variables. + +diff --git a/spec/std/process_spec.cr b/spec/std/process_spec.cr +index 965ed1431..c32b00537 100644 +--- a/spec/std/process_spec.cr ++++ b/spec/std/process_spec.cr +@@ -281,20 +281,6 @@ describe Process do + end + + describe "environ" do +- it "clears the environment" do +- value = Process.run(*print_env_command, clear_env: true) do |proc| +- proc.output.gets_to_end +- end +- value.should eq("") +- end +- +- it "clears and sets an environment variable" do +- value = Process.run(*print_env_command, clear_env: true, env: {"FOO" => "bar"}) do |proc| +- proc.output.gets_to_end +- end +- value.should eq("FOO=bar#{newline}") +- end +- + it "sets an environment variable" do + value = Process.run(*print_env_command, env: {"FOO" => "bar"}) do |proc| + proc.output.gets_to_end + -- cgit v1.2.3