From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-1718545-garchives=archives.gentoo.org@lists.gentoo.org>
Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183])
	(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
	 key-exchange X25519 server-signature RSA-PSS (4096 bits))
	(No client certificate requested)
	by finch.gentoo.org (Postfix) with ESMTPS id 2A5A21582EF
	for <garchives@archives.gentoo.org>; Sun, 16 Feb 2025 16:29:31 +0000 (UTC)
Received: from lists.gentoo.org (bobolink.gentoo.org [140.211.166.189])
	(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
	 key-exchange X25519 server-signature RSA-PSS (4096 bits))
	(No client certificate requested)
	(Authenticated sender: relay-lists.gentoo.org@gentoo.org)
	by smtp.gentoo.org (Postfix) with ESMTPSA id 0DB83342FF7
	for <garchives@archives.gentoo.org>; Sun, 16 Feb 2025 16:29:31 +0000 (UTC)
Received: from bobolink.gentoo.org (localhost [127.0.0.1])
	by bobolink.gentoo.org (Postfix) with ESMTP id 824EB1102CD;
	Sun, 16 Feb 2025 16:29:29 +0000 (UTC)
Received: from smtp.gentoo.org (dev.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))
	(No client certificate requested)
	by bobolink.gentoo.org (Postfix) with ESMTPS id 77BF11102CD
	for <gentoo-commits@lists.gentoo.org>; Sun, 16 Feb 2025 16:29:29 +0000 (UTC)
Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52])
	(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
	 key-exchange X25519 server-signature RSA-PSS (4096 bits))
	(No client certificate requested)
	by smtp.gentoo.org (Postfix) with ESMTPS id 244593412DE
	for <gentoo-commits@lists.gentoo.org>; Sun, 16 Feb 2025 16:29:29 +0000 (UTC)
Received: from localhost.localdomain (localhost [IPv6:::1])
	by oystercatcher.gentoo.org (Postfix) with ESMTP id B40622637
	for <gentoo-commits@lists.gentoo.org>; Sun, 16 Feb 2025 16:29:27 +0000 (UTC)
From: "Sam James" <sam@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Content-Transfer-Encoding: 8bit
Content-type: text/plain; charset=UTF-8
Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" <sam@gentoo.org>
Message-ID: <1739723290.7cdd301e55b3bf954e95b9c49ba830b3164df22e.sam@gentoo>
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-lang/zig/, dev-lang/zig/files/
X-VCS-Repository: repo/gentoo
X-VCS-Files: dev-lang/zig/files/zig-0.13.0-test-fmt-no-doc.patch dev-lang/zig/zig-0.13.0-r1.ebuild
X-VCS-Directories: dev-lang/zig/files/ dev-lang/zig/
X-VCS-Committer: sam
X-VCS-Committer-Name: Sam James
X-VCS-Revision: 7cdd301e55b3bf954e95b9c49ba830b3164df22e
X-VCS-Branch: master
Date: Sun, 16 Feb 2025 16:29:27 +0000 (UTC)
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply
X-Archives-Salt: 6fecad33-604f-4b5b-899d-13acc8f36ad3
X-Archives-Hash: ade51bbc383f15095eeb946b49acaf86

commit:     7cdd301e55b3bf954e95b9c49ba830b3164df22e
Author:     Eric Joldasov <bratishkaerik <AT> landless-city <DOT> net>
AuthorDate: Sun Jan 19 20:09:39 2025 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sun Feb 16 16:28:10 2025 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7cdd301e

dev-lang/zig: drop 0.13.0-r1

Signed-off-by: Eric Joldasov <bratishkaerik <AT> landless-city.net>
Signed-off-by: Sam James <sam <AT> gentoo.org>

 .../zig/files/zig-0.13.0-test-fmt-no-doc.patch     |  17 --
 dev-lang/zig/zig-0.13.0-r1.ebuild                  | 227 ---------------------
 2 files changed, 244 deletions(-)

diff --git a/dev-lang/zig/files/zig-0.13.0-test-fmt-no-doc.patch b/dev-lang/zig/files/zig-0.13.0-test-fmt-no-doc.patch
deleted file mode 100644
index 7bbda741dc6f..000000000000
--- a/dev-lang/zig/files/zig-0.13.0-test-fmt-no-doc.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-# Docs contain examples of badly formatted code,
-# so they should be excluded for test-fmt to pass.
-# In the upstream, the "doc" directory
-# was removed from fmt_include_paths in
-# https://github.com/ziglang/zig/commit/cb1d1bdf
-
---- a/build.zig
-+++ b/build.zig
-@@ -428,7 +428,7 @@
-     }
-     const optimization_modes = chosen_opt_modes_buf[0..chosen_mode_index];
- 
--    const fmt_include_paths = &.{ "doc", "lib", "src", "test", "tools", "build.zig" };
-+    const fmt_include_paths = &.{ "lib", "src", "test", "tools", "build.zig" };
-     const fmt_exclude_paths = &.{"test/cases"};
-     const do_fmt = b.addFmt(.{
-         .paths = fmt_include_paths,

diff --git a/dev-lang/zig/zig-0.13.0-r1.ebuild b/dev-lang/zig/zig-0.13.0-r1.ebuild
deleted file mode 100644
index 867fa84f3b19..000000000000
--- a/dev-lang/zig/zig-0.13.0-r1.ebuild
+++ /dev/null
@@ -1,227 +0,0 @@
-# Copyright 2019-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-LLVM_MAX_SLOT=18
-inherit edo check-reqs cmake llvm multiprocessing toolchain-funcs
-
-DESCRIPTION="A robust, optimal, and maintainable programming language"
-HOMEPAGE="https://ziglang.org https://github.com/ziglang/zig"
-
-BDEPEND="test? ( !!<sys-apps/sandbox-2.39 )"
-if [[ ${PV} == 9999 ]]; then
-	EGIT_REPO_URI="https://github.com/ziglang/zig.git"
-	inherit git-r3
-else
-	VERIFY_SIG_METHOD=minisig
-	VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/minisig-keys/zig-software-foundation.pub
-	inherit verify-sig
-
-	SRC_URI="
-		https://ziglang.org/download/${PV}/${P}.tar.xz
-		verify-sig? ( https://ziglang.org/download/${PV}/${P}.tar.xz.minisig )
-		https://codeberg.org/BratishkaErik/distfiles/releases/download/dev-lang%2Fzig-${PV}/${P}-llvm-18.1.8-r6-fix.patch
-	"
-	KEYWORDS="~amd64 ~arm ~arm64"
-
-	BDEPEND+=" verify-sig? ( sec-keys/minisig-keys-zig-software-foundation )"
-fi
-
-# project itself: MIT
-# There are bunch of projects under "lib/" folder that are needed for cross-compilation.
-# Files that are unnecessary for cross-compilation are removed by upstream
-# and therefore their licenses (if any special) are not included.
-# lib/libunwind: Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )
-# lib/libcxxabi: Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )
-# lib/libcxx: Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )
-# lib/libc/wasi: || ( Apache-2.0-with-LLVM-exceptions Apache-2.0 MIT BSD-2 ) public-domain
-# lib/libc/musl: MIT BSD-2
-# lib/libc/mingw: ZPL public-domain BSD-2 ISC HPND
-# lib/libc/glibc: BSD HPND ISC inner-net LGPL-2.1+
-LICENSE="MIT Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT ) || ( Apache-2.0-with-LLVM-exceptions Apache-2.0 MIT BSD-2 ) public-domain BSD-2 ZPL ISC HPND BSD inner-net LGPL-2.1+"
-SLOT="$(ver_cut 1-2)"
-IUSE="doc test"
-RESTRICT="!test? ( test )"
-
-BUILD_DIR="${S}/build"
-
-# Zig requires zstd and zlib compression support in LLVM, if using LLVM backend.
-# (non-LLVM backends don't require these)
-# They are not required "on their own", so please don't add them here.
-# You can check https://github.com/ziglang/zig-bootstrap in future, to see
-# options that are passed to LLVM CMake building (excluding "static" ofc).
-DEPEND="
-	llvm-core/clang:${LLVM_MAX_SLOT}=
-	llvm-core/lld:${LLVM_MAX_SLOT}=
-	llvm-core/llvm:${LLVM_MAX_SLOT}=[zstd]
-"
-
-RDEPEND="
-	${DEPEND}
-"
-
-IDEPEND="app-eselect/eselect-zig"
-
-# see https://github.com/ziglang/zig/issues/3382
-# For now, Zig Build System doesn't support enviromental CFLAGS/LDFLAGS/etc.
-QA_FLAGS_IGNORED="usr/.*/zig/${PV}/bin/zig"
-
-# Since commit https://github.com/ziglang/zig/commit/e7d28344fa3ee81d6ad7ca5ce1f83d50d8502118
-# Zig uses self-hosted compiler only
-CHECKREQS_MEMORY="4G"
-
-PATCHES=(
-	"${FILESDIR}/${P}-test-fmt-no-doc.patch"
-	"${FILESDIR}/${P}-test-std-kernel-version.patch"
-	"${DISTDIR}/${P}-llvm-18.1.8-r6-fix.patch"
-)
-
-llvm_check_deps() {
-	has_version "llvm-core/clang:${LLVM_SLOT}"
-}
-
-ctarget_to_zigtarget() {
-	# Zig's Target Format: arch-os-abi
-	local CTARGET="${CTARGET:-${CHOST}}"
-
-	local ZIG_ARCH
-	case "${CTARGET%%-*}" in
-		i?86)		ZIG_ARCH=x86;;
-		sparcv9)	ZIG_ARCH=sparc64;;
-		*)		ZIG_ARCH="${CTARGET%%-*}";; # Same as in CHOST
-	esac
-
-	local ZIG_OS
-	case "${CTARGET}" in
-		*linux*)	ZIG_OS=linux;;
-		*apple*)	ZIG_OS=macos;;
-	esac
-
-	local ZIG_ABI
-	case "${CTARGET##*-}" in
-		gnu)		ZIG_ABI=gnu;;
-		solaris*)	ZIG_OS=solaris ZIG_ABI=none;;
-		darwin*)	ZIG_ABI=none;;
-		*)		ZIG_ABI="${CTARGET##*-}";; # Same as in CHOST
-	esac
-
-	echo "${ZIG_ARCH}-${ZIG_OS}-${ZIG_ABI}"
-}
-
-get_zig_mcpu() {
-	local ZIG_DEFAULT_MCPU=native
-	tc-is-cross-compiler && ZIG_DEFAULT_MCPU=baseline
-	echo "${ZIG_MCPU:-${ZIG_DEFAULT_MCPU}}"
-}
-
-get_zig_target() {
-	local ZIG_DEFAULT_TARGET=native
-	tc-is-cross-compiler && ZIG_DEFAULT_TARGET="$(ctarget_to_zigtarget)"
-	echo "${ZIG_TARGET:-${ZIG_DEFAULT_TARGET}}"
-}
-
-pkg_setup() {
-	llvm_pkg_setup
-	check-reqs_pkg_setup
-}
-
-src_unpack() {
-	if use verify-sig; then
-		verify-sig_verify_detached "${DISTDIR}"/${P}.tar.xz{,.minisig}
-	fi
-	default
-}
-
-src_configure() {
-	# Useful for debugging and a little bit more deterministic.
-	export ZIG_LOCAL_CACHE_DIR="${T}/zig-local-cache"
-	export ZIG_GLOBAL_CACHE_DIR="${T}/zig-global-cache"
-
-	local mycmakeargs=(
-		-DZIG_SHARED_LLVM=ON
-		-DZIG_TARGET_TRIPLE="$(get_zig_target)"
-		-DZIG_TARGET_MCPU="$(get_zig_mcpu)"
-		-DZIG_USE_LLVM_CONFIG=ON
-		-DCMAKE_PREFIX_PATH="$(get_llvm_prefix ${LLVM_MAX_SLOT})"
-		-DCMAKE_INSTALL_PREFIX="${EPREFIX}/usr/$(get_libdir)/zig/${PV}"
-	)
-
-	cmake_src_configure
-}
-
-src_compile() {
-	# Remove "limit memory usage" flags, it's already verified by
-	# CHECKREQS_MEMORY and causes unneccessary errors. Upstream set them
-	# according to CI OOM failures, which are higher than during Gentoo build.
-	sed -i -e '/\.max_rss = .*,/d' build.zig || die
-
-	cmake_src_compile
-
-	"${BUILD_DIR}/stage3/bin/zig" env || die "Zig compilation failed"
-
-	if use doc; then
-		cd "${BUILD_DIR}" || die
-		edo ./stage3/bin/zig build std-docs --prefix "${S}/docgen/"
-		edo ./stage3/bin/zig build langref --prefix "${S}/docgen/"
-	fi
-}
-
-src_test() {
-	cd "${BUILD_DIR}" || die
-	local ZIG_TEST_ARGS=(
-		-j$(makeopts_jobs)
-		--color on
-		--summary all
-		--verbose
-		-Dstatic-llvm=false
-		-Denable-llvm
-		-Dskip-non-native
-		-Doptimize=Debug
-		-Dtarget="$(get_zig_target)"
-		-Dcpu="$(get_zig_mcpu)"
-	)
-	local ZIG_TEST_STEPS=(
-		test-asm-link
-		test-behavior
-		test-c-abi
-		test-c-import
-		test-cases
-		test-cli
-		test-compare-output
-		test-compiler-rt
-		test-fmt
-		test-link
-		test-run-translated-c
-		test-stack-traces
-		test-standalone
-		test-std
-		test-translate-c
-		test-universal-libc
-	)
-
-	local step
-	for step in "${ZIG_TEST_STEPS[@]}" ; do
-		# to keep the verbosity, don't use edob here
-		./stage3/bin/zig build ${step} ${ZIG_TEST_ARGS[@]} || die
-	done
-}
-
-src_install() {
-	use doc && local HTML_DOCS=( "docgen/doc/langref.html" "docgen/doc/std" )
-	cmake_src_install
-
-	cd "${ED}/usr/$(get_libdir)/zig/${PV}/" || die
-	mv lib/zig/ lib2/ || die
-	rm -rf lib/ || die
-	mv lib2/ lib/ || die
-	dosym -r "/usr/$(get_libdir)/zig/${PV}/bin/zig" "/usr/bin/zig-${PV}"
-}
-
-pkg_postinst() {
-	eselect zig update ifunset || die
-}
-
-pkg_postrm() {
-	eselect zig update ifunset || die
-}