gentoo auto-resync : 25:08:2024 - 14:56:25

3 files changed, 9 insertions, 130 deletions

diff --git a/dev-lang/crystal/Manifest b/dev-lang/crystal/Manifest
index 13a8f5ed89d7..bece08ad68b0 100644
--- a/dev-lang/crystal/Manifest
+++ b/dev-lang/crystal/Manifest
@@ -1,13 +1,10 @@
 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.7.2-extra-spec-flags.patch 1080 BLAKE2B 3054e38d4e7d114f1b0a08b367f9a5b366bbe269c75b9195abf9dc39231b32428a108c4254abd0bdb29b2ac6a94d6d256eccc68ca69f80a273cd17e0c0115fc7 SHA512 3c3fd6a42b291a42f76ec76101d669011eb02d4d17f35c8ad31c5a49aa3655a2315999e2401af7f3bc26445f74f432430a44b021846238d345d9c14b1009fdc5
-DIST crystal-1.12.2-1-linux-x86_64.tar.gz 47042270 BLAKE2B 17c29658fba1e32eafc0716f34d96f080b8500ef81d573719a3944873fbd16521ef2e3c0b6f3ea2753f67e96fe6cbf361df03233aa9e3eea19b87850b8d38089 SHA512 33d40b003481f56c1a3dcefb586e45326629455faad0adc6fce60f4fe91b586f01f997665aa535286b6909b5a4e0c05db3577b3eb8b36f6864f80d576ddd1d39
-DIST crystal-1.12.2.tar.gz 3655994 BLAKE2B d5de81445e3e81352ae821cdf91863464f70466674f541e2b9e499610e0d68b4aac3af6e2688870be8b2ccd84c9da78734e0e8f5f8be070192bd7d7342d77853 SHA512 b972015fa17da19bcb649a4e0387e709b4a792c8e9279898e48fb82f8840e92f35492df9cce1ec2487724ee460d3ab9099144f6bd25a091a725578ec3fb0fbd6
-DIST crystal-1.13.0-1-linux-x86_64.tar.gz 51652465 BLAKE2B 21f390f19b53249c9d5dfce5fb754ba2f45f0ddabf191098146f6eb89c7bee6432a4c9b127585eb924864dea78c6f90463baff806ecbe544b35677fe9aee1acb SHA512 4754e3b41eeea073e406e40636aa97146f3227cd6538b9080b4190b6ddacf98eeb9b877fb1e367630a208e8fe66d9d458bc8d03f8916bf521ca546ae1ed98337
-DIST crystal-1.13.0.tar.gz 3687491 BLAKE2B 7ced8216f1777cd5b1fa831ccb1591a0f06b9451476eb70ff5f389600a4f85a24b7eb8730eda4726f0d61e72581817f0b946a5483175f2fe4193a0d186baeed5 SHA512 7b6cb45f78bf3827a23fb4a3299873848ee2548fe7887c84832fe4735bf5e39c41980731e92e89170774f8d632f77124cdd814edd0be9a36ef5b85a05bc13454
 DIST crystal-1.13.1-1-linux-x86_64.tar.gz 51651920 BLAKE2B 304203d7f46653c7c687e0d96ab8ff63798cc1e8f43ffcb9d3fd12c04e5ac35d058d6964e8d6e8f407b579e1bc80daa88dc0d9463cc7dc558055b36e96f75799 SHA512 d79555b3f79b0e9ad48ae08b1566c0ac2c1097ae28c434af43d869916b5a4b81383491492f548fec2bd662ff29231c83c14f10bacbb85bc9741a1903e3f331f2
 DIST crystal-1.13.1.tar.gz 3686680 BLAKE2B 8032895933d98bc8e3168a9ef1749e0b8c45e5f6501e70a4680a400d842999c2861e3d8064e457a81050f6c4dedc4ca5c968dca0ce593ff38e4091d5a45b7d40 SHA512 62e8d12d8b6fff4a8602e7b04a57b49dd17350585fa13fd015e649cae28affc134a38ec2852b07172c682affb50210df2bc26f707795a4c3483d9522272990db
-EBUILD crystal-1.12.2.ebuild 2629 BLAKE2B f3f307224f2c46fd96ed84663102894fa340db5976fbf2eecaa9a2f6dae13aaa2b866fff42fe8c3a7790c5672422894d79da78565742ab309bb5936bed537f0f SHA512 eb084e916cddcf5c8f4d555ab5a9f4efc236247d6824a892da68567f3869f092e1db72bcc43703e285d4a64f7ea07818dfb5d2c26dfed3a955067dbddbb712e2
-EBUILD crystal-1.13.0.ebuild 2630 BLAKE2B a940cead1eedbe0926149c7d5daa3e34ab61a98bc8fe4f07df56e66759e2bb107fca49e1e28c0038cb1e7d05e8d6323b427c30fbdd8ed5d41345ccd79aa0b447 SHA512 155a50c6af61b0ab13affaf29d02f2e7fbf81ebfae900e622a777133020452f8d9356688fe7e7bb11eaac946b05a2a0cbad25cf4662f63d3f29e6f53dc67c63e
+DIST crystal-1.13.2-1-linux-x86_64.tar.gz 51650862 BLAKE2B d8812a0a3e327c9aabfea982b36b7ece906ac8f5ceafccdfdebae0ea41c7e8b8989009d30f6535f069711ef0bbfb47430dbeb12fc246e1bf00663c43e54df85b SHA512 694aec1ad5b2bb89dc4adb9f6a78e73e4e2c7ff68c77fda61cc6d1efa2a309932f0634986d4da2db3e05f3f4f1991610c2f6961df0d657376b8343a0c4e2ea30
+DIST crystal-1.13.2.tar.gz 3687101 BLAKE2B 31375ea3648433e88a4813b39f25f72221c4a6d3d9346324467e79d84f43794ce3b0dfe49ec8478d6d96f9971dd8373abd4297b3310c072694be395a04042f91 SHA512 5f4add6066d22d38e59587c32c43c7a3c4bc4615f80f991af75277780efa95f359c40e6da5fe7e3f8ac7eda21f75982e3eb08cbff0702f58cc14c3b432ad7019
 EBUILD crystal-1.13.1.ebuild 2629 BLAKE2B f3f307224f2c46fd96ed84663102894fa340db5976fbf2eecaa9a2f6dae13aaa2b866fff42fe8c3a7790c5672422894d79da78565742ab309bb5936bed537f0f SHA512 eb084e916cddcf5c8f4d555ab5a9f4efc236247d6824a892da68567f3869f092e1db72bcc43703e285d4a64f7ea07818dfb5d2c26dfed3a955067dbddbb712e2
+EBUILD crystal-1.13.2.ebuild 2633 BLAKE2B 57f0ac1367bd2d7b169b638bd59323a09057e4241348b39a645e8388cb475cb09e714d45bf71fe86d99933b8ff91f2a3444aa3b72f7e25db63c1da97bfef8685 SHA512 e34140a906e6a1306a4c718d7e1c1380034d63d9741fd218d4ac13801d558523a290949c436ad5d08a16436089dc911122ae4220547b6732771183e1744bb632
 MISC metadata.xml 762 BLAKE2B 591f38c882318a6564501cc61abe6222264b65adeaffaf3b23d959ee86b83bae33eaf99029229705f92070fa539fd6d63d8242afc38475904483a9a0b997effd SHA512 ea223d568a3c336a43b183efc61bd1f1a9d1e5e0e8d963275e0b23ee879551bc7d8aae797b1e2edba49d119ad306692599eb535c5d164ebee0c6721dfeab78dc
diff --git a/dev-lang/crystal/crystal-1.12.2.ebuild b/dev-lang/crystal/crystal-1.12.2.ebuild
deleted file mode 100644
index 92f5bc42f945..000000000000
--- a/dev-lang/crystal/crystal-1.12.2.ebuild
+++ /dev/null
@@ -1,120 +0,0 @@
-# Copyright 1999-2024 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_MAX_SLOT=17
-
-inherit bash-completion-r1 llvm 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}.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"
-
-# Upstream test suite not reliable
-RESTRICT="test"
-
-DEPEND="
-	<sys-devel/llvm-$((${LLVM_MAX_SLOT} + 1)):=
-	dev-libs/boehm-gc:=[threads]
-	dev-libs/gmp:=
-	dev-libs/libatomic_ops:=
-	dev-libs/libevent:=
-	dev-libs/libpcre2:=[unicode]
-	dev-libs/pcl:=
-	llvm-libunwind? (
-		sys-libs/llvm-libunwind:=
-	)
-	!llvm-libunwind? (
-		sys-libs/libunwind:=
-	)
-"
-RDEPEND="
-	${DEPEND}
-	dev-libs/libxml2
-	dev-libs/libyaml
-"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-1.7.2-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
-
-	# 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 "${LLVM_MAX_SLOT}")/bin/llvm-config"
-	)
-}
-
-src_compile() {
-	emake "${MY_EMAKE_COMMON_ARGS[@]}"
-
-	use doc && emake docs "${MY_EMAKE_COMMON_ARGS[@]}"
-}
-
-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/.
-
-	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/crystal-1.13.0.ebuild b/dev-lang/crystal/crystal-1.13.2.ebuild
index 02631f5f838f..7d2cade29207 100644
--- a/dev-lang/crystal/crystal-1.13.0.ebuild
+++ b/dev-lang/crystal/crystal-1.13.2.ebuild
@@ -6,9 +6,9 @@ EAPI=8
 BV="${PV}-1"
 BV_AMD64="${BV}-linux-x86_64"
 
-LLVM_MAX_SLOT=17
+LLVM_COMPAT=( {16..18} )
 
-inherit bash-completion-r1 llvm multiprocessing toolchain-funcs
+inherit bash-completion-r1 llvm-r1 multiprocessing toolchain-funcs
 
 DESCRIPTION="The Crystal Programming Language"
 HOMEPAGE="https://crystal-lang.org/
@@ -30,13 +30,15 @@ IUSE="doc debug llvm-libunwind"
 RESTRICT="test"
 
 DEPEND="
-	<sys-devel/llvm-$((${LLVM_MAX_SLOT} + 1)):=
 	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 '
+		sys-devel/llvm:${LLVM_SLOT}=
+	')
 	llvm-libunwind? (
 		sys-libs/llvm-libunwind:=
 	)
@@ -81,7 +83,7 @@ src_configure() {
 		AR="$(tc-getAR)"
 		CC="$(tc-getCC)"
 		CXX="$(tc-getCXX)"
-		LLVM_CONFIG="$(get_llvm_prefix "${LLVM_MAX_SLOT}")/bin/llvm-config"
+		LLVM_CONFIG="$(get_llvm_prefix -d)/bin/llvm-config"
 	)
 }