From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id B3BD815808E for ; Sun, 24 Apr 2022 14:41:33 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 2FC7CE07FE; Sun, 24 Apr 2022 14:41:17 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 4BA5DE07FE for ; Sun, 24 Apr 2022 14:41:12 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 31C313407E0 for ; Sun, 24 Apr 2022 14:41:05 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 4C9363F0 for ; Sun, 24 Apr 2022 14:41:03 +0000 (UTC) From: "Michał Górny" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Michał Górny" Message-ID: <1650811246.545d07c5a64b7e67867dc7cb42140609fa2b231b.mgorny@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-lang/crystal/files/, dev-lang/crystal/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-lang/crystal/Manifest dev-lang/crystal/crystal-1.1.0.ebuild dev-lang/crystal/crystal-1.1.1.ebuild dev-lang/crystal/files/crystal-0.22.0-blocking-stdio-hack.patch dev-lang/crystal/files/crystal-0.27.0-max-age-0-test.patch dev-lang/crystal/metadata.xml X-VCS-Directories: dev-lang/crystal/ dev-lang/crystal/files/ X-VCS-Committer: mgorny X-VCS-Committer-Name: Michał Górny X-VCS-Revision: 545d07c5a64b7e67867dc7cb42140609fa2b231b X-VCS-Branch: master Date: Sun, 24 Apr 2022 14:41:03 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 825010c9-1b65-4ec0-a85e-6520bcec5619 X-Archives-Hash: eff64b6bfd66fbd6b78b9d5c8aed3f8d commit: 545d07c5a64b7e67867dc7cb42140609fa2b231b Author: Michał Górny gentoo org> AuthorDate: Sun Apr 24 13:45:44 2022 +0000 Commit: Michał Górny gentoo org> CommitDate: Sun Apr 24 14:40:46 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=545d07c5 dev-lang/crystal: Remove old Signed-off-by: Michał Górny gentoo.org> dev-lang/crystal/Manifest | 6 - dev-lang/crystal/crystal-1.1.0.ebuild | 123 --------------------- dev-lang/crystal/crystal-1.1.1.ebuild | 107 ------------------ .../files/crystal-0.22.0-blocking-stdio-hack.patch | 20 ---- .../files/crystal-0.27.0-max-age-0-test.patch | 14 --- dev-lang/crystal/metadata.xml | 11 -- 6 files changed, 281 deletions(-) diff --git a/dev-lang/crystal/Manifest b/dev-lang/crystal/Manifest index 318e44303475..18941e5a07b9 100644 --- a/dev-lang/crystal/Manifest +++ b/dev-lang/crystal/Manifest @@ -1,9 +1,3 @@ -DIST crystal-1.1.0-1-linux-i686.tar.gz 30747190 BLAKE2B 7fe29248ae69c81cb0c79419488c5b544bb55810894ac1d7f276ccdf2d2d98c7c2bc4f8c007214e5ffd18ee39bdf6983f33b13c08f012105fce714eeaa18fac9 SHA512 df267250971c11d1e2f4f869a14f7b2f1e5a32cf15c407a0ee9291aeb4ddc21241c3f21c7706ee2305dfbf4ac645681a06bb70a6ee9246968a30f59b7595ea8a -DIST crystal-1.1.0-1-linux-x86_64.tar.gz 27998777 BLAKE2B 06be8a51b28266b25f1a3629b1a1ac6f3878aacdd4ca4019ac201369ca0507f3ed27bfea46ea7d8d4dfa67888268a8e027586bb32e9964d4754661f43e36ac12 SHA512 8c4542ce0623e459b61591b7bd13f416ee30c89913ce827830e570225c72ec79ad5466d414b05f520d384f04363f11964ff8bf158f0ae798da3864208655319e -DIST crystal-1.1.0.tar.gz 2476748 BLAKE2B 2874da651a8b4454c6a34b00ac4ef93be6beaabe01ff66aaac86583a9d9c1baccde9473358d70d78490b367db3a307af3b5219af6751c1d83cb5084e74955197 SHA512 fcd14338c4c6cb9189cfb9d4d93af7feab806a49e10b9c83399f9252f0c5f3488605141f09adef82d48343eab5653b754b9196fb659590df8d4deb2c4b6499f4 -DIST crystal-1.1.1-1-linux-i686.tar.gz 30749110 BLAKE2B d79113bc616685b30a80bb8632593c1b0a24d770ee9fa50810e771996f9ca95cdb5cdab64a7c445bc461e27e77e457b8334877e3a62281a3f9cbe59975518eae SHA512 eecd485fe06642a534aee2f837ac9ad6eeb5b52fa5fb4ab0f36bcf167535b784b5e306c0bb578a3198b58552efd3f0afc356b2711b0b7dc00f25fb1a2f4fe43f -DIST crystal-1.1.1-1-linux-x86_64.tar.gz 27999355 BLAKE2B 115d9002973d9e0e1ad2edac55a10d4275176f95352634eee00f29d6ebeef2e3538f30a26904a1c6b68fa5b42e70b4cf54bb50ed4aa1097bb2d2dc716ff83427 SHA512 f27277af810f295c8ee4f5fedc3b7f1ffb06d166970fcc25d2de43e1c41e0af01de2a508292b44aac48a1583ac9892058f54fa3a7c361fc56dd483265f8bc36c -DIST crystal-1.1.1.tar.gz 2477825 BLAKE2B 4e1b06c831a22447a4d1f065be64b12642ee4b4a75f24b0b73b990944afe6e2a6fca95189b46ea0656b8d13bd7c6a83a23452779b494822803a0264e02b9d4ce SHA512 6e9e977792c863d17ae94aa285a65a453da581a71c3fd9c57cc606ae20813504d675faffa74f78e7c4cf863b6334c4a63ab5356c04fb11d3267dd516e060fe74 DIST crystal-1.2.1-1-linux-x86_64.tar.gz 28586682 BLAKE2B 4d7847cdc6263c369de0926055569986cece1302d2251e4b2d25308609e45c0aa3afe7cdfecba3b7909d7568b1e81aafe69f9976a90c8980684a92231cc3857c SHA512 23cfb2389c65202dc70ebadb85cf0390ba2366520fbfd4b7bb0683c5194cd2b5c87b6b4142dd251471ec4146a5c1046ec86bcafa50c66389a41c9cb394ee6f5d DIST crystal-1.2.1.tar.gz 2618956 BLAKE2B e9ffd8b9114af419ee433093066dcf69f86e2f3293a6eeafee20f00c982dcd78774b3faf64d1e2568ba3141e24ef751cb2b5e0b2a2c57dac92d0039e6e224971 SHA512 a6acfac36a8a0d93e39947f2e35238f9cfc43485994fd6caf102f1d62ebc4d71d13d96801e998dbbff9541b76a8eb4fade7b998b179807ed49c1c338207a4720 DIST crystal-1.2.2-1-linux-x86_64.tar.gz 28611412 BLAKE2B 95593120b00b09b0a250917cbfd0841a77ead5e768ad483a900452678be5b231408017c4ac668df4de675612a008a385ed0dbf6ea216aec0343f8b5e8ede3e98 SHA512 7fdb247074723f52f8dfb9d2e18eef1ceb6fcf595bd12ec7304eb292716c4462ee34d2d87eac56302053dd4d8cd2beccde3dc5bfa3c75e6e832813afecfadcde diff --git a/dev-lang/crystal/crystal-1.1.0.ebuild b/dev-lang/crystal/crystal-1.1.0.ebuild deleted file mode 100644 index a435a4600025..000000000000 --- a/dev-lang/crystal/crystal-1.1.0.ebuild +++ /dev/null @@ -1,123 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit bash-completion-r1 llvm multiprocessing toolchain-funcs - -BV=${PV}-1 -BV_AMD64=${BV}-linux-x86_64 -BV_X86=${BV}-linux-i686 - -DESCRIPTION="The Crystal Programming Language" -HOMEPAGE="https://crystal-lang.org" -SRC_URI="https://github.com/crystal-lang/crystal/archive/${PV}.tar.gz -> ${P}.tar.gz - amd64? ( https://github.com/crystal-lang/crystal/releases/download/${BV/-*}/crystal-${BV_AMD64}.tar.gz ) - x86? ( https://github.com/crystal-lang/crystal/releases/download/${BV/-*}/crystal-${BV_X86}.tar.gz )" - -LICENSE="Apache-2.0" -SLOT="0" -KEYWORDS="~amd64" -IUSE="doc debug examples blocking-stdio-hack +xml +yaml" - -RESTRICT=test # not stable for day-to-day runs - -LLVM_MAX_SLOT=11 - -DEPEND=" - sys-devel/llvm:${LLVM_MAX_SLOT} - dev-libs/boehm-gc[static-libs,threads] - dev-libs/libatomic_ops - dev-libs/libevent - dev-libs/libpcre - sys-libs/libunwind - dev-libs/pcl - dev-libs/gmp:0 -" -RDEPEND="${DEPEND} - xml? ( dev-libs/libxml2 ) - yaml? ( dev-libs/libyaml ) -" - -PATCHES=( - "${FILESDIR}"/${PN}-1.1.0-verbose.patch - "${FILESDIR}"/${PN}-0.26.1-gentoo-tests-sandbox.patch - "${FILESDIR}"/${PN}-0.27.0-extra-spec-flags.patch - #"${FILESDIR}"/${PN}-0.27.0-max-age-0-test.patch - "${FILESDIR}"/${PN}-0.27.0-gentoo-tests-long-unix.patch - "${FILESDIR}"/${PN}-0.27.0-gentoo-tests-long-unix-2.patch -) - -src_prepare() { - default - - use blocking-stdio-hack && eapply "${FILESDIR}"/"${PN}"-0.22.0-blocking-stdio-hack.patch -} - -src_compile() { - 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 - emake \ - $(usex debug "" release=1) \ - progress=true \ - stats=1 \ - threads=$(makeopts_jobs) \ - verbose=1 \ - \ - CC="$(tc-getCC)" \ - CXX="$(tc-getCXX)" \ - AR="$(tc-getAR)" \ - LLVM_CONFIG="$(get_llvm_prefix "${LLVM_MAX_SLOT}")/bin/llvm-config" \ - \ - PATH="${bootstrap_path}:${PATH}" \ - CRYSTAL_PATH=src \ - CRYSTAL_CONFIG_VERSION=${PV} \ - CRYSTAL_CONFIG_PATH="lib:${EPREFIX}/usr/$(get_libdir)/crystal" - use doc && emake docs -} - -src_test() { - # EXTRA_SPEC_FLAGS is useful to debug individual tests - # as part of full build: - # USE=debug EXTRA_SPEC_FLAGS='-e parse_set_cookie' emerge -1 crystal - emake spec \ - $(usex debug "" release=1) \ - progress=true \ - stats=1 \ - threads=$(makeopts_jobs) \ - verbose=1 \ - \ - CC=$(tc-getCC) \ - CXX=$(tc-getCXX) \ - AR=$(tc-getAR) \ - LLVM_CONFIG="$(get_llvm_prefix "${LLVM_MAX_SLOT}")/bin/llvm-config" \ - \ - CRYSTAL_PATH=src \ - CRYSTAL_CONFIG_VERSION=${PV} \ - \ - "EXTRA_SPEC_FLAGS=${EXTRA_SPEC_FLAGS}" -} - -src_install() { - insinto /usr/$(get_libdir)/crystal - doins -r src/. - dobin .build/crystal - - insinto /usr/share/zsh/site-functions - newins etc/completion.zsh _crystal - - use examples && dodoc -r samples - - if use doc ; then - docinto api - dodoc -r docs/. - fi - - newbashcomp etc/completion.bash ${PN} -} diff --git a/dev-lang/crystal/crystal-1.1.1.ebuild b/dev-lang/crystal/crystal-1.1.1.ebuild deleted file mode 100644 index f21d7749e7a5..000000000000 --- a/dev-lang/crystal/crystal-1.1.1.ebuild +++ /dev/null @@ -1,107 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit bash-completion-r1 llvm multiprocessing toolchain-funcs - -BV=${PV}-1 -BV_AMD64=${BV}-linux-x86_64 -BV_X86=${BV}-linux-i686 - -DESCRIPTION="The Crystal Programming Language" -HOMEPAGE="https://crystal-lang.org" -SRC_URI="https://github.com/crystal-lang/crystal/archive/${PV}.tar.gz -> ${P}.tar.gz - amd64? ( https://github.com/crystal-lang/crystal/releases/download/${BV/-*}/crystal-${BV_AMD64}.tar.gz ) - x86? ( https://github.com/crystal-lang/crystal/releases/download/${BV/-*}/crystal-${BV_X86}.tar.gz )" - -LICENSE="Apache-2.0" -SLOT="0" -KEYWORDS="~amd64" -IUSE="doc debug" - -# Upstream test suite not reliable -RESTRICT=test - -# See https://github.com/crystal-lang/crystal/issues/10434 -LLVM_MAX_SLOT=11 - -DEPEND=" - dev-libs/boehm-gc[static-libs,threads] - dev-libs/gmp:= - dev-libs/libatomic_ops - dev-libs/libevent - dev-libs/libpcre - dev-libs/pcl:= - sys-devel/llvm:${LLVM_MAX_SLOT} - sys-libs/libunwind:= -" -RDEPEND="${DEPEND} - dev-libs/libxml2 - dev-libs/libyaml -" - -PATCHES=( - "${FILESDIR}"/${PN}-1.1.0-verbose.patch - "${FILESDIR}"/${PN}-0.26.1-gentoo-tests-sandbox.patch - "${FILESDIR}"/${PN}-0.27.0-extra-spec-flags.patch - "${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 - - MY_EMAKE_COMMON_ARGS=( - $(usex debug "" release=1) - progress=true - stats=1 - threads=$(makeopts_jobs) - verbose=1 - CC="$(tc-getCC)" - CXX="$(tc-getCXX)" - AR="$(tc-getAR)" - LLVM_CONFIG="$(get_llvm_prefix "${LLVM_MAX_SLOT}")/bin/llvm-config" - PATH="${bootstrap_path}:${PATH}" - CRYSTAL_PATH=src - CRYSTAL_CONFIG_VERSION=${PV} - CRYSTAL_CONFIG_PATH="lib:${EPREFIX}/usr/$(get_libdir)/crystal" - ) - - # crystal uses 'LLVM_TARGETS' to override default list of targets - unset LLVM_TARGETS -} - -src_compile() { - emake "${MY_EMAKE_COMMON_ARGS[@]}" - use doc && emake docs -} - -src_test() { - # EXTRA_SPEC_FLAGS is useful to debug individual tests - # as part of full build: - # USE=debug EXTRA_SPEC_FLAGS='-e parse_set_cookie' emerge -1 crystal - emake std_spec "${MY_EMAKE_COMMON_ARGS[@]}" "EXTRA_SPEC_FLAGS=${EXTRA_SPEC_FLAGS}" -} - -src_install() { - insinto /usr/$(get_libdir)/crystal - doins -r src/. - dobin .build/crystal - - insinto /usr/share/zsh/site-functions - newins etc/completion.zsh _crystal - - dodoc -r samples - - if use doc ; then - docinto api - dodoc -r docs/. - fi - - newbashcomp etc/completion.bash ${PN} -} diff --git a/dev-lang/crystal/files/crystal-0.22.0-blocking-stdio-hack.patch b/dev-lang/crystal/files/crystal-0.22.0-blocking-stdio-hack.patch deleted file mode 100644 index 07b7dba7be65..000000000000 --- a/dev-lang/crystal/files/crystal-0.22.0-blocking-stdio-hack.patch +++ /dev/null @@ -1,20 +0,0 @@ -Workaround tty corruption in crystal. - -Patch restores blocking mode of file desriptors -in exchange of potential runtime deadlocks -when dealing with stdio. - -Reported-by: Renich Bon Ciric -Bug: https://github.com/crystal-lang/crystal/issues/2065 -Bug: https://bugs.gentoo.org/616256 -diff --git a/src/compiler/crystal/stdio.cr b/src/compiler/crystal/stdio.cr -new file mode 100644 -index 000000000..e65f65089 ---- /dev/null -+++ b/src/compiler/crystal/stdio.cr -@@ -0,0 +1,5 @@ -+module Crystal -+ STDIN.blocking = true -+ STDOUT.blocking=true -+ STDERR.blocking = true -+end diff --git a/dev-lang/crystal/files/crystal-0.27.0-max-age-0-test.patch b/dev-lang/crystal/files/crystal-0.27.0-max-age-0-test.patch deleted file mode 100644 index d78927ab3eef..000000000000 --- a/dev-lang/crystal/files/crystal-0.27.0-max-age-0-test.patch +++ /dev/null @@ -1,14 +0,0 @@ ---- a/spec/std/http/cookie_spec.cr -+++ b/spec/std/http/cookie_spec.cr -@@ -150,7 +150,10 @@ module HTTP - parse_set_cookie("a=1; domain=127.0.0.1; path=/; HttpOnly").domain.should eq "127.0.0.1" - end - -- it "parse max-age as seconds from Time.now" do -+ # unstable test: sometimes 'now - max-age=0' == 0.0: -+ # Failure/Error: delta.should be > 0.seconds -+ # Expected 00:00:00 to be > 00:00:00 -+ pending "parse max-age as seconds from Time.now" do - cookie = parse_set_cookie("a=1; max-age=10") - delta = cookie.expires.not_nil! - Time.now - delta.should be > 9.seconds diff --git a/dev-lang/crystal/metadata.xml b/dev-lang/crystal/metadata.xml index 233928bcc797..456e61401b3b 100644 --- a/dev-lang/crystal/metadata.xml +++ b/dev-lang/crystal/metadata.xml @@ -18,17 +18,6 @@ Build each module as a separate object file. Speeds build up. - - Keep STDIO file descriptors in blocking mode. - - - Use the dev-libs/libyaml library to enable Crystal yaml - module - - - Use the dev-libs/libxml2 library to enable Crystal xml - module - crystal-lang/crystal