[gentoo-commits] repo/gentoo:master commit in: dev-lang/zig/files/, dev-lang/zig/

[Michał Górny]

commit:     fe45fe353d86f7b7990f38998cd176ca6dec9d1d
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Wed Jul 29 11:41:17 2020 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Thu Jul 30 22:09:49 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fe45fe35

dev-lang/zig: Remove old (LLVM 8)

Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>

 dev-lang/zig/Manifest                              |  1 -
 .../zig/files/zig-0.4.0-r1-build-artifacts.patch   | 61 ----------------------
 .../zig/files/zig-0.4.0-r1-suppress-warnings.patch | 31 -----------
 dev-lang/zig/zig-0.4.0-r1.ebuild                   | 49 -----------------
 4 files changed, 142 deletions(-)

diff --git a/dev-lang/zig/Manifest b/dev-lang/zig/Manifest
index a3f8c62566b..681529cf54a 100644
--- a/dev-lang/zig/Manifest
+++ b/dev-lang/zig/Manifest
@@ -1,2 +1 @@
-DIST zig-0.4.0.tar.gz 8924757 BLAKE2B 5ca3377f205694ff02360900b49eee7347cdf1cdaef90f1be071eff2610425ed453dfb35928fbe65b25f151b7153ab838c887d362ed3cd746f07833ae42510fd SHA512 423915730bc4ae9a67db3731a96471467826d16e59b87b3541f3e8ed2436f941939f22ccbebdb9a958a195b05360eb65f5be1658b32a01cc8db55c6e581eb039
 DIST zig-0.5.0.tar.gz 15743912 BLAKE2B 1a28dffebc24200cf51e1d94ff7203c8de5641e1a299eff58e808a5a8f3257fc8ff771699a0f90733702b90e5536990adc5bf41b973b4ea642081ef788f7a83d SHA512 9fc2ef827421e54e8db98ce3474ba3bbe9119b0b9aa30b4edd78d73277d2384067b5c78f4ebbca350a97ac230131e7f71e6d54c1e75fc74e1833ce6c51c402df

diff --git a/dev-lang/zig/files/zig-0.4.0-r1-build-artifacts.patch b/dev-lang/zig/files/zig-0.4.0-r1-build-artifacts.patch
deleted file mode 100644
index 11868e93a8a..00000000000
--- a/dev-lang/zig/files/zig-0.4.0-r1-build-artifacts.patch
+++ /dev/null
@@ -1,61 +0,0 @@
-From 81767a658d07219a402384f98a7553abcbbd2e70 Mon Sep 17 00:00:00 2001
-From: Marc Tiehuis <marctiehuis@×××××.com>
-Date: Thu, 18 Apr 2019 18:58:12 +1200
-Subject: [PATCH] Don't install stage2 artifacts
-
-Fixes #2220.
----
- CMakeLists.txt          | 11 ++++++++++-
- 1 file changed, 11 insertions(+), 1 deletion(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 1b017a881..047d538e8 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -58,6 +58,16 @@ endif()
- 
- set(ZIG_CPP_LIB_DIR "${CMAKE_BINARY_DIR}/zig_cpp")
- 
-+# Handle multi-config builds and place each into a common lib. The VS generator
-+# for example will append a Debug folder by default if not explicitly specified.
-+set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${ZIG_CPP_LIB_DIR})
-+set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${ZIG_CPP_LIB_DIR})
-+foreach(CONFIG_TYPE ${CMAKE_CONFIGURATION_TYPES})
-+    string(TOUPPER ${CONFIG_TYPE} CONFIG_TYPE)
-+    set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY_${CONFIG_TYPE} ${ZIG_CPP_LIB_DIR})
-+    set(CMAKE_LIBRARY_OUTPUT_DIRECTORY_${CONFIG_TYPE} ${ZIG_CPP_LIB_DIR})
-+endforeach(CONFIG_TYPE CMAKE_CONFIGURATION_TYPES)
-+
- if(ZIG_FORCE_EXTERNAL_LLD)
-     find_package(lld)
-     include_directories(${LLVM_INCLUDE_DIRS})
-@@ -253,7 +263,6 @@ else()
-         embedded_lld_wasm
-         embedded_lld_lib
-     )
--    install(TARGETS embedded_lld_elf embedded_lld_coff embedded_lld_mingw embedded_lld_wasm embedded_lld_lib DESTINATION "${ZIG_CPP_LIB_DIR}")
- endif()
- 
- # No patches have been applied to SoftFloat-3e
-
-From 40fe6afdad1a8676b5d3a5dd23d6d50d6ea9f059 Mon Sep 17 00:00:00 2001
-From: Marc Tiehuis <marctiehuis@×××××.com>
-Date: Wed, 1 May 2019 17:39:23 +1200
-Subject: [PATCH] Don't install zig_cpp lib for stage2 target
-
-Missed in last commit. See #2220.
----
- CMakeLists.txt | 1 -
- 1 file changed, 1 deletion(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 047d538e8..9881ce1de 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -6671,6 +6681,5 @@
- endif()
- install(TARGETS zig DESTINATION bin)
--install(TARGETS zig_cpp DESTINATION "${ZIG_CPP_LIB_DIR}")
- 
- foreach(file ${ZIG_C_HEADER_FILES})
-     get_filename_component(file_dir "${C_HEADERS_DEST}/${file}" DIRECTORY)

diff --git a/dev-lang/zig/files/zig-0.4.0-r1-suppress-warnings.patch b/dev-lang/zig/files/zig-0.4.0-r1-suppress-warnings.patch
deleted file mode 100644
index 1dc92f88ecb..00000000000
--- a/dev-lang/zig/files/zig-0.4.0-r1-suppress-warnings.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-Don't attempt to look for static libraries that we're not going to use.
-The warnings are only triggered when building with portage.
-
---- a/cmake/Findllvm.cmake
-+++ b/cmake/Findllvm.cmake
-@@ -50,25 +50,6 @@
-     endif()
- endfunction(NEED_TARGET)
- 
--if(NOT(CMAKE_BUILD_TYPE STREQUAL "Debug") OR ZIG_STATIC)
--  execute_process(
--      COMMAND ${LLVM_CONFIG_EXE} --libfiles --link-static
--      OUTPUT_VARIABLE LLVM_LIBRARIES_SPACES
--      OUTPUT_STRIP_TRAILING_WHITESPACE)
--  string(REPLACE " " ";" LLVM_LIBRARIES "${LLVM_LIBRARIES_SPACES}")
--
--  execute_process(
--      COMMAND ${LLVM_CONFIG_EXE} --system-libs --link-static
--      OUTPUT_VARIABLE LLVM_SYSTEM_LIBS_SPACES
--      OUTPUT_STRIP_TRAILING_WHITESPACE)
--  string(REPLACE " " ";" LLVM_SYSTEM_LIBS "${LLVM_SYSTEM_LIBS_SPACES}")
--
--  execute_process(
--      COMMAND ${LLVM_CONFIG_EXE} --libdir --link-static
--      OUTPUT_VARIABLE LLVM_LIBDIRS_SPACES
--      OUTPUT_STRIP_TRAILING_WHITESPACE)
--  string(REPLACE " " ";" LLVM_LIBDIRS "${LLVM_LIBDIRS_SPACES}")
--endif()
- if(NOT LLVM_LIBRARIES)
-   execute_process(
-       COMMAND ${LLVM_CONFIG_EXE} --libs

diff --git a/dev-lang/zig/zig-0.4.0-r1.ebuild b/dev-lang/zig/zig-0.4.0-r1.ebuild
deleted file mode 100644
index bedd9d7ba9b..00000000000
--- a/dev-lang/zig/zig-0.4.0-r1.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-utils llvm
-
-DESCRIPTION="A robust, optimal, and maintainable programming language"
-HOMEPAGE="https://ziglang.org/"
-LICENSE="MIT"
-SLOT="0"
-IUSE="+experimental"
-
-if [[ ${PV} == 9999 ]]; then
-	EGIT_REPO_URI="https://github.com/ziglang/zig.git"
-	inherit git-r3
-else
-	SRC_URI="https://github.com/ziglang/zig/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64"
-fi
-
-ALL_LLVM_TARGETS=( AArch64 AMDGPU ARM BPF Hexagon Lanai Mips MSP430 NVPTX
-	PowerPC Sparc SystemZ WebAssembly X86 XCore )
-ALL_LLVM_TARGETS=( "${ALL_LLVM_TARGETS[@]/#/llvm_targets_}" )
-# According to zig's author, zig builds that do not support all targets are not
-# supported by the upstream project.
-LLVM_TARGET_USEDEPS=${ALL_LLVM_TARGETS[@]}
-
-RDEPEND="
-	sys-devel/llvm:8
-	!experimental? ( sys-devel/llvm:8[${LLVM_TARGET_USEDEPS// /,}] )
-"
-
-DEPEND="${RDEPEND}"
-
-PATCHES=(
-	"${FILESDIR}/zig-0.4.0-r1-build-artifacts.patch"
-	"${FILESDIR}/zig-0.4.0-r1-suppress-warnings.patch"
-)
-
-LLVM_MAX_SLOT=8
-
-src_prepare() {
-	if use experimental; then
-		sed -i '/^NEED_TARGET(/d' cmake/Findllvm.cmake || die "unable to modify cmake/Findllvm.cmake"
-	fi
-
-	cmake-utils_src_prepare
-}