From 23650861e24563ddcf10919ab5b1912676c3ff0c Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sat, 11 Mar 2023 18:08:11 +0000 Subject: gentoo auto-resync : 11:03:2023 - 18:08:11 --- sys-fs/Manifest.gz | Bin 22543 -> 22540 bytes sys-fs/ncdu/Manifest | 3 +- .../ncdu-2.2.2-makefile-add-zig-variable.patch | 48 +++++++++++++++++++++ sys-fs/ncdu/ncdu-2.2.2-r1.ebuild | 10 +++-- 4 files changed, 57 insertions(+), 4 deletions(-) create mode 100644 sys-fs/ncdu/files/ncdu-2.2.2-makefile-add-zig-variable.patch (limited to 'sys-fs') diff --git a/sys-fs/Manifest.gz b/sys-fs/Manifest.gz index 5d89000457ca..3046483eaf05 100644 Binary files a/sys-fs/Manifest.gz and b/sys-fs/Manifest.gz differ diff --git a/sys-fs/ncdu/Manifest b/sys-fs/ncdu/Manifest index 53bab1caad77..be3257f18284 100644 --- a/sys-fs/ncdu/Manifest +++ b/sys-fs/ncdu/Manifest @@ -1,3 +1,4 @@ +AUX ncdu-2.2.2-makefile-add-zig-variable.patch 1326 BLAKE2B 0372f075e5c322fb018f8b68a3d60e15725f041c400ab4a1c446843865c08c37b4a121276783ab494385c48559f59946252e231fca273f5dce9ac72778f0a644 SHA512 03793390671bc2dbca038b3d1fe0f165ac0c4b58a3c5a9fb6ad305e360fc6faacd3cac4bfeae6479ddc7da5dabe02b591e82b6bed40d1c5d375b87efb3462fcc DIST ncdu-1.17.tar.gz 157187 BLAKE2B 7d36a648b8fb0a26d3b6bcc533ed8f510e7f37b3084cb585a0c785d73fd82f537e0f2f9493c3b56173eae1324255e7acf7617a1cd1614c92a3b7bf0d53b7d77f SHA512 aa2366797760f0c0b2bea866f0ae0446b8113e3ff6460192a4a42d4d888d473d7f37bc4acff6220fa86003bd96d71761168a2ae0ded36456072176a69564c775 DIST ncdu-1.17.tar.gz.asc 833 BLAKE2B 8e285bc92351bcd5d3ae83e97772df96f98149e1f7a2aca882518b37448412756ecc24e89fd471b42dc960727dc272b17e05e3a602672e6712711d3bc342afac SHA512 7386901449a5bd98f2d7344dd8147a9facc274b59ec3676be2b3f78797f03b51154b3a6d85f657860e8260c5423140b561ca7e8067863face3320ca5a4951132 DIST ncdu-1.18.tar.gz 159781 BLAKE2B c590424ed6d18b898d88fa405459f5d8988317d336fdd568ca259248c1598ba780703da9ed643c9685aacc4ce2b26bbfb66e84a99514bc979fe2b9df420d1cd3 SHA512 959ca90ad35055467346c196d7d6e5afc1e57d87c83855dfb92dd8e370bce10c1a1633064854abb3ed581e0ea7b6451474472acd9e4ad3ae91b90311b07cc7d7 @@ -10,6 +11,6 @@ DIST ncdu-2.2.2.tar.gz.asc 833 BLAKE2B 5c6e886853aefec7615774b0c10e4a873d4e51da6 EBUILD ncdu-1.17.ebuild 683 BLAKE2B c5566d9059a9ee0d9466a5e6f9605402b25a8e3e7e09fd951ccd0ed75c839bee71492ea50118b633cd3b1332280178296d9cf31e055409ea26d845961e297e9c SHA512 0ebac8ef306b017c515340b127ee98df3ab67f27f6fa2fff441ccf161dc1970aa432e37d9e74a1c6220ff303a7e54362df8c6a13065e20306523227fe7e49fbf EBUILD ncdu-1.18.ebuild 683 BLAKE2B 5a8eecd8b29af30456f750b4ceaa245bc80d6c9557a05f7932c6e8d5c509258fcf8516e993579ca4a70d4708282529930b0ac34fce4158b801b7f5140b890d39 SHA512 5cc81a788760ee2d41c88b41a50371721f5abae91381fad55bc0ec6458f264b1f309ebf69beb80168570795747411007b243e640116e7f9543caf8b30134691b EBUILD ncdu-2.2.1.ebuild 1209 BLAKE2B 31a2f4a4fda0a307acd74696e099fddde1e20d4dcf29d52322122d7bf133295d01511d392233070bb22722127619de19234e96c6bda2b9fd16a5101e4fe88a75 SHA512 2fc2b8a905169b13f8a826d60992a4f9e2f64f4210c0fd907bf0c23fd5a2e3a8fd7519b4b0542c1e10421d4755f082748ccd62f60304d2c57528dee67c19c1cb -EBUILD ncdu-2.2.2-r1.ebuild 3149 BLAKE2B 88f0288298863ef5948bb15ace501bbce0ceea92b914fceafc219e3a80f46970fe49b7b2223ab94b5ec42b9431e665ee234468685d8100f54caac10976f69839 SHA512 79588363b7f5acb58ed7f8c87e0c43af9ad196f0ddaa6cae3b77114efde95053cf3995556a93971008785361431a358d63a4c51a18ca000a90f3a4991bbc603a +EBUILD ncdu-2.2.2-r1.ebuild 3147 BLAKE2B 742dd09ee8afa30eefd451c4e477c92d230262053c899221cfc915d89b76b7eb12aa4eaa4a40cca4c7502d2c5f20d620b37077508c4d693cfeae3f576715b2ad SHA512 c876fa71eb6af9286118418942efb685c660b70d15f3e97113d13026794e0abc1b130efe63c14b61adf3dbb882661e461f05ef57bd65ce704c9f225d24ded189 EBUILD ncdu-2.2.2.ebuild 1023 BLAKE2B 72b0501d2e38704d87eed6b28dc8d90eca7e07993a7be4cf2850020023e13126be68fccca242cf8b3c9692c0a515fb9131cd8616a63931a78e57c6f2683ad0be SHA512 2d5d135a1f3be2c26bbaf113a4d35bef16589e4cba97506a6b3769e9fb7627342acd42d170b28f6505141162cd25d1814823c10b2ecab7348ce47adccd8ae147 MISC metadata.xml 862 BLAKE2B aecbc2cfec9351b2be9087d297016826f9bea5f81ea690e480cbe0dce5c627f554875fb9db5b19f21373391ef4fb28c7cea3129d911e80b7be007a9a0a79ac0a SHA512 2c722040961b930791780f704edddd4cdf010df05e462a0d333f2fbf4966c0ecac08eef3b1e05baf34013c95a91cc79dc38ef5616e07ffcb4e386b8760f89683 diff --git a/sys-fs/ncdu/files/ncdu-2.2.2-makefile-add-zig-variable.patch b/sys-fs/ncdu/files/ncdu-2.2.2-makefile-add-zig-variable.patch new file mode 100644 index 000000000000..9a118508641b --- /dev/null +++ b/sys-fs/ncdu/files/ncdu-2.2.2-makefile-add-zig-variable.patch @@ -0,0 +1,48 @@ +From 74be2772499b4eb065a11477c6632146ed647dc8 Mon Sep 17 00:00:00 2001 +From: Florian Schmaus +Date: Thu, 9 Mar 2023 16:01:40 +0100 +Subject: [PATCH] Makefile: Add ZIG variable and build target + +The ZIG variable helps to test ncdu with different zig installations, +and it allows Gentoo to inject the zig version that should be used to +build zig into the Makefile. + +Also add a phony 'build' target as first target to the Makefile so +that it becomes the default target. This allows the Gentoo package to +use the default src_compile() function. + +See also https://bugs.gentoo.org/900547 +--- + Makefile | 9 +++++++-- + 1 file changed, 7 insertions(+), 2 deletions(-) + +diff --git a/Makefile b/Makefile +index 7cdbca3..eb854c6 100644 +--- a/Makefile ++++ b/Makefile +@@ -4,6 +4,8 @@ + # Optional semi-standard Makefile with some handy tools. + # Ncdu itself can be built with just the zig build system. + ++ZIG ?= zig ++ + PREFIX ?= /usr/local + BINDIR ?= ${PREFIX}/bin + MANDIR ?= ${PREFIX}/share/man/man1 +@@ -11,11 +13,14 @@ ZIG_FLAGS ?= -Drelease-fast + + NCDU_VERSION=$(shell grep 'program_version = "' src/main.zig | sed -e 's/^.*"\(.\+\)".*$$/\1/') + ++.PHONY: build ++build: release doc ++ + release: +- zig build ${ZIG_FLAGS} ++ $(ZIG) build ${ZIG_FLAGS} + + debug: +- zig build ++ $(ZIG) build + + clean: + rm -rf zig-cache zig-out diff --git a/sys-fs/ncdu/ncdu-2.2.2-r1.ebuild b/sys-fs/ncdu/ncdu-2.2.2-r1.ebuild index b8f45c71bf2c..74c745fa8f11 100644 --- a/sys-fs/ncdu/ncdu-2.2.2-r1.ebuild +++ b/sys-fs/ncdu/ncdu-2.2.2-r1.ebuild @@ -30,6 +30,10 @@ BDEPEND=" VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/yoranheling.asc +PATCHES=( + "${FILESDIR}/${P}-makefile-add-zig-variable.patch" +) + # see https://github.com/ziglang/zig/issues/3382 # For now, Zig doesn't support CFLAGS/LDFLAGS/etc. QA_FLAGS_IGNORED="usr/bin/ncdu" @@ -120,9 +124,9 @@ src_unpack() { default } -src_compile() { - ezig build -Drelease-fast - edo pod2man --center "ncdu manual" --release "ncdu-${PV}" ncdu.pod >ncdu.1 +src_configure() { + zig-set_EZIG + export ZIG=${EZIG} } src_test() { -- cgit v1.2.3