[gentoo-commits] repo/gentoo:master commit in: sys-fs/ncdu/, sys-fs/ncdu/files/

[Jakov Smolić]

commit: 94e90c179d45fe163e01b50987610feee013bab4
Author: Eric Joldasov  getgoogleoff  me>
AuthorDate: Mon Dec 18 17:24:02 2023 +
Commit: Jakov Smolić  gentoo  org>
CommitDate: Sat Dec 23 18:45:14 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=94e90c17

sys-fs/ncdu: drop 1.18, 1.18.1, 2.2.2-r1

Signed-off-by: Eric Joldasov  getgoogleoff.me>
Signed-off-by: Jakov Smolić  gentoo.org>

 sys-fs/ncdu/Manifest   |   6 -
 .../ncdu-2.2.2-makefile-add-zig-variable.patch |  48 
 sys-fs/ncdu/ncdu-1.18.1.ebuild |  27 -
 sys-fs/ncdu/ncdu-1.18.ebuild   |  27 -
 sys-fs/ncdu/ncdu-2.2.2-r1.ebuild   | 133 -
 5 files changed, 241 deletions(-)

diff --git a/sys-fs/ncdu/Manifest b/sys-fs/ncdu/Manifest
index 0fc43c4acf78..5b8655517bde 100644
--- a/sys-fs/ncdu/Manifest
+++ b/sys-fs/ncdu/Manifest
@@ -1,10 +1,4 @@
-DIST ncdu-1.18.1.tar.gz 159731 BLAKE2B 
fc64ea50cbc7bd2f5b0026ea1e87f18a25693f8ac8eb01468dcbf4d1185f71c472074217ed3088d9a029239547ce9dffe0fbf4b2d4cd8e0904657bd1e2bf6f84
 SHA512 
19ceca2ab6f50c8d1e40fa6a2f2a7a6ba8c47e65447ee39217c3708cf65ad172b5425900aea8747eb533bd671fcb80e058efc7c8f170cdaadd62fc152ccd2209
-DIST ncdu-1.18.1.tar.gz.asc 833 BLAKE2B 
b886ef18a9d9a7259445aa3b62adc345bf0935177699e5690db73b292379720f4b5eb6a68be92130c647a5fdda494b016a342e0c2b7c5854c46c266943e4b859
 SHA512 
a5c4edb2f84a8b0844743a58c2a158c076b762c0bb824862750d44b6fcc0117ac3fe7b633554d2410a3d2928a1b788dfde17fbf02f2e5848bc4d50d63b48c143
-DIST ncdu-1.18.tar.gz 159781 BLAKE2B 
c590424ed6d18b898d88fa405459f5d8988317d336fdd568ca259248c1598ba780703da9ed643c9685aacc4ce2b26bbfb66e84a99514bc979fe2b9df420d1cd3
 SHA512 
959ca90ad35055467346c196d7d6e5afc1e57d87c83855dfb92dd8e370bce10c1a1633064854abb3ed581e0ea7b6451474472acd9e4ad3ae91b90311b07cc7d7
-DIST ncdu-1.18.tar.gz.asc 833 BLAKE2B 
2695e3f2a26026f5fc56db3d2e0f15288fdff118e12275333f1db3e85d9d7b0290477670153dbd752e14fbeecc4207410fe55ad39fc7b2daa5d697920ac406c3
 SHA512 
35f0f3f7f61a49cd2ea020b6207551a953c23bb47f5f6483017fc961f857ef0283932386826707137d857377d0ae5e26ed4a4da26d47042977999e95fe389d38
 DIST ncdu-1.19.tar.gz 159917 BLAKE2B 
0f2022c031b4e00129525c0f4f800ed8feb8d3de3ae2c4baf06050886fb16ad4381c5439b64868abfdb66907d36e38a87ec3c8ddcd16f756da75439dc08ae6e6
 SHA512 
2bbfe2bab101f92674e13bef5260a39b32c127a310ae59c045f3684aaa8dab6f767c0162dc8f868d8adfaa17d597d0b3d2c134fe97bbaf205da0f8272e96c5d6
 DIST ncdu-1.19.tar.gz.asc 833 BLAKE2B 
ede22114375b31deb9a00de55982f145a1d1eaa911ef205e3c1a61a6382a9ea9d42977b5c1c41e3aafbfaec29e473d0ed428bb50f2e3cf799e204415b0ad2bf7
 SHA512 
2fb0d23c59b4f98b0080617792853de08380f769de13398f7649c082de330a4c917b6bbd846e3175f20eadbc9e4acf03d959ab828e3707ef1a9992be40b2b4ce
-DIST ncdu-2.2.2.tar.gz 56096 BLAKE2B 
fca41e74e4eb2509496276aa964ecf6a20db860d0b1d6bab9a169d8d6c5c7c2d41f088241cf57c92d7cf51bb5d84642c2a3a6db99410e6332061e6d35efa94e6
 SHA512 
5742b4abca1168256b6a7afa24d25e709bc3b490181d85fc070ddce4aad9d41fa3acb5c5a63676d804d082918fdf2bf0c98a27d8d07a56abeef0574c1b598da6
-DIST ncdu-2.2.2.tar.gz.asc 833 BLAKE2B 
5c6e886853aefec7615774b0c10e4a873d4e51da6d4d66ebd78318a40e7ce1a1d98c948ffd30eaa473cf50f9529dfe150d5831744e62f6762ae471b1abcbc4bb
 SHA512 
494b8e08e2b8a87b31db08c5dcbb922c181fcef188974def2ad5550de16b16b281bbd5d8e401327276a07af8bd5979bdc46f84fde10a7e8601f9559cf452a77c
 DIST ncdu-2.3.tar.gz 56608 BLAKE2B 
9fd73fba83c57195f8ffbad5b954140a776d1cd1d7b3e458f832255ee9c07eb8af9888a23ed3c671f508d6ba3795e2361f79e64b4b24630d744470efc5bfaded
 SHA512 
283f78761b225883e090c4d0d1325bffc70049477087df3e8d1afcebc3136930c2636b2bba4aa6e43d53626668519c26a1528ba5c75489d3b5924e8974184e47
 DIST ncdu-2.3.tar.gz.asc 833 BLAKE2B 
fd5b6b4b6e14b8bf66f5053c637598c3a0a9ad16d29c20805d62418fb69a22fa1155c8591dac35514d088c57853043c7d6c8b94abdff793a3f7b0a53cb41fd65
 SHA512 
698d8f1c0a7e0267fdfcfc7823803012ab7faae6eee75af406ecc9a73244463521de851c3f2b116ae7f6d7e567ea17a7ef6aae75e135a8efbb02333525455b20

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
deleted file mode 100644
index 9a118508641b..
--- a/sys-fs/ncdu/files/ncdu-2.2.2-makefile-add-zig-variable.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-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 

[gentoo-commits] repo/gentoo:master commit in: sys-fs/ncdu/, sys-fs/ncdu/files/

[Sam James]

commit: e4707343c9b2c5c1bfc27d09a6025b191fc7093a
Author: Eric Joldasov  getgoogleoff  me>
AuthorDate: Thu Mar  9 17:01:20 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Sat Mar 11 17:15:10 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e4707343

sys-fs/ncdu: create and use zig variable in makefile

Big thanks to Florian Schmaus  gentoo.org> for creating and
upstreaming this patch! I guess I contributed too much entropy and
problems to testing branch today :%

Closes: https://bugs.gentoo.org/900547
Signed-off-by: Eric Joldasov  getgoogleoff.me>
Closes: https://github.com/gentoo/gentoo/pull/30023
Signed-off-by: Sam James  gentoo.org>

 .../ncdu-2.2.2-makefile-add-zig-variable.patch | 48 ++
 sys-fs/ncdu/ncdu-2.2.2-r1.ebuild   | 10 +++--
 2 files changed, 55 insertions(+), 3 deletions(-)

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 ..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() {

[gentoo-commits] repo/gentoo:master commit in: sys-fs/ncdu/, sys-fs/ncdu/files/

[Michael Weber]

commit: 89167ec5588b2b53cd6d7632febcc1bbd39cb1f6
Author: Michael Weber  gentoo  org>
AuthorDate: Thu Mar  9 13:42:46 2017 +
Commit: Michael Weber  gentoo  org>
CommitDate: Thu Mar  9 13:42:46 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=89167ec5

sys-fs/ncdu: Add myself as maintainer. Remove old version.

Package-Manager: Portage-2.3.4, Repoman-2.3.2

 sys-fs/ncdu/Manifest |  1 -
 sys-fs/ncdu/files/ncdu-1.11-missing-header.patch | 22 --
 sys-fs/ncdu/metadata.xml |  4 
 sys-fs/ncdu/ncdu-1.11.ebuild | 22 --
 4 files changed, 4 insertions(+), 45 deletions(-)

diff --git a/sys-fs/ncdu/Manifest b/sys-fs/ncdu/Manifest
index 1000a7bf414..a034f5525b5 100644
--- a/sys-fs/ncdu/Manifest
+++ b/sys-fs/ncdu/Manifest
@@ -1,2 +1 @@
-DIST ncdu-1.11.tar.gz 134093 SHA256 
d0aea772e47463c281007f279a9041252155a2b2349b18adb9055075e141bb7b SHA512 
4b9319900dd11da7c3bd2ba9a478c52b8280e3560b8b5b6610fc145c5d81d726715db69cd21bd400d75339a5bcf140bcafb3b4430075427a51b65763e81d8c48
 WHIRLPOOL 
a0ff88adde70ce7f95f9bf172dc0fd5001d5e909bc0db86258d9d2a5f4dba45e511247c71b784b74b73da3b16f695e2eba4d3e89ce445b241801067dac248608
 DIST ncdu-1.12.tar.gz 140596 SHA256 
820e4e4747a2a2ec7a2e9f06d2f5a353516362c22496a10a9834f871b877499a SHA512 
20620dd79d2af878442769e097f13806f64f23875dcb85ebccd573a3de43aba5663d496049b64015d13f9a79d624298032c008ef61dfb6f61d8b12902b8dca12
 WHIRLPOOL 
1ec3e97a9b0172cc312e5ee1b641c298d0cb1c20af031767ec8f87e387c9b2992c4fe60a02e49e9741133eb1c92daffb23024ccd4bd8124a5f0f472df59ad684

diff --git a/sys-fs/ncdu/files/ncdu-1.11-missing-header.patch 
b/sys-fs/ncdu/files/ncdu-1.11-missing-header.patch
deleted file mode 100644
index 4c79139f7b0..000
--- a/sys-fs/ncdu/files/ncdu-1.11-missing-header.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-From 29f347c19cb7ad17c4b401e1d984fce8eafaaafa Mon Sep 17 00:00:00 2001
-From: Yorhel 
-Date: Tue, 7 Apr 2015 10:39:46 +0200
-Subject: shell.c: Include sys/wait.h
-
-Required for the W* macros on OpenBSD. Reported by Brian Callahan.
-
-diff --git a/src/shell.c b/src/shell.c
-index d601b5a..eb275cd 100644
 a/src/shell.c
-+++ b/src/shell.c
-@@ -32,6 +32,7 @@
- #include 
- #include 
- #include 
-+#include 
- 
- void shell_draw() {
-   char *full_path;
--- 
-cgit v0.10.1
-

diff --git a/sys-fs/ncdu/metadata.xml b/sys-fs/ncdu/metadata.xml
index 3256aaab310..cca812bc0ce 100644
--- a/sys-fs/ncdu/metadata.xml
+++ b/sys-fs/ncdu/metadata.xml
@@ -6,6 +6,10 @@
 Wolfram Schlich
 Primary maintainer
   
+  
+x...@gentoo.org
+Michael Weber
+  
   
 As the name already suggests, ncdu is an NCurses version of the famous old 'du'
 unix command. It provides a fast and easy interface to your harddrive. Where is

diff --git a/sys-fs/ncdu/ncdu-1.11.ebuild b/sys-fs/ncdu/ncdu-1.11.ebuild
deleted file mode 100644
index 5a3191a8c23..000
--- a/sys-fs/ncdu/ncdu-1.11.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils
-
-DESCRIPTION="NCurses Disk Usage"
-HOMEPAGE="http://dev.yorhel.nl/ncdu/;
-SRC_URI="http://dev.yorhel.nl/download/${P}.tar.gz;
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="alpha amd64 arm ppc ppc64 x86 ~amd64-linux ~x86-linux ~x64-macos"
-
-RDEPEND="sys-libs/ncurses:0=[unicode]"
-DEPEND="${RDEPEND}
-   virtual/pkgconfig"
-
-src_prepare() {
-   epatch "${FILESDIR}"/${P}-missing-header.patch
-}