commit: 94e90c179d45fe163e01b50987610feee013bab4 Author: Eric Joldasov <bratishkaerik <AT> getgoogleoff <DOT> me> AuthorDate: Mon Dec 18 17:24:02 2023 +0000 Commit: Jakov Smolić <jsmolic <AT> gentoo <DOT> org> CommitDate: Sat Dec 23 18:45:14 2023 +0000 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 <bratishkaerik <AT> getgoogleoff.me> Signed-off-by: Jakov Smolić <jsmolic <AT> 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..000000000000 --- 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 <f...@geekplace.eu> -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-1.18.1.ebuild b/sys-fs/ncdu/ncdu-1.18.1.ebuild deleted file mode 100644 index 1a7f64ef51be..000000000000 --- a/sys-fs/ncdu/ncdu-1.18.1.ebuild +++ /dev/null @@ -1,27 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit verify-sig - -DESCRIPTION="NCurses Disk Usage" -HOMEPAGE="https://dev.yorhel.nl/ncdu"; -SRC_URI=" - https://dev.yorhel.nl/download/${P}.tar.gz - verify-sig? ( https://dev.yorhel.nl/download/${P}.tar.gz.asc ) -" - -LICENSE="MIT" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos" - -DEPEND="sys-libs/ncurses:=[unicode(+)]" -RDEPEND="${DEPEND}" -BDEPEND=" - virtual/pkgconfig - dev-lang/perl - verify-sig? ( sec-keys/openpgp-keys-yorhel ) -" - -VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/yoranheling.asc diff --git a/sys-fs/ncdu/ncdu-1.18.ebuild b/sys-fs/ncdu/ncdu-1.18.ebuild deleted file mode 100644 index 1f64c46bbaa6..000000000000 --- a/sys-fs/ncdu/ncdu-1.18.ebuild +++ /dev/null @@ -1,27 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit verify-sig - -DESCRIPTION="NCurses Disk Usage" -HOMEPAGE="https://dev.yorhel.nl/ncdu"; -SRC_URI=" - https://dev.yorhel.nl/download/${P}.tar.gz - verify-sig? ( https://dev.yorhel.nl/download/${P}.tar.gz.asc ) -" - -LICENSE="MIT" -SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 ~ia64 ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos" - -DEPEND="sys-libs/ncurses:=[unicode(+)]" -RDEPEND="${DEPEND}" -BDEPEND=" - virtual/pkgconfig - dev-lang/perl - verify-sig? ( sec-keys/openpgp-keys-yorhel ) -" - -VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/yoranheling.asc diff --git a/sys-fs/ncdu/ncdu-2.2.2-r1.ebuild b/sys-fs/ncdu/ncdu-2.2.2-r1.ebuild deleted file mode 100644 index db528d52eaf7..000000000000 --- a/sys-fs/ncdu/ncdu-2.2.2-r1.ebuild +++ /dev/null @@ -1,133 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit verify-sig edo - -DESCRIPTION="NCurses Disk Usage" -HOMEPAGE="https://dev.yorhel.nl/ncdu"; -SRC_URI=" - https://dev.yorhel.nl/download/${P}.tar.gz - verify-sig? ( https://dev.yorhel.nl/download/${P}.tar.gz.asc ) -" - -LICENSE="MIT" -SLOT="0" -KEYWORDS="~amd64" - -EZIG_MIN="0.10" -EZIG_MAX_EXCLUSIVE="0.11" - -DEPEND="sys-libs/ncurses:=[unicode(+)]" -RDEPEND="${DEPEND}" -BDEPEND=" - || ( dev-lang/zig:${EZIG_MIN} dev-lang/zig-bin:${EZIG_MIN} ) - virtual/pkgconfig - dev-lang/perl - verify-sig? ( sec-keys/openpgp-keys-yorhel ) -" - -VERIFY_SIG_OPENPGP_KEY_PATH=/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" - -# Many thanks to Florian Schmaus (Flowdalic)! -# Adapted from https://github.com/gentoo/gentoo/pull/28986 -# Set the EZIG environment variable. -zig-set_EZIG() { - [[ -n ${EZIG} ]] && return - - if [[ -n ${EZIG_OVERWRITE} ]]; then - export EZIG="${EZIG_OVERWRITE}" - return - fi - - local candidate selected selected_ver ver - - for candidate in "${BROOT}"/usr/bin/zig-*; do - if [[ ! -L ${candidate} || ${candidate} != */zig?(-bin)-+([0-9.]) ]]; then - continue - fi - - ver=${candidate##*-} - - if [[ -n ${EZIG_EXACT_VER} ]]; then - ver_test "${ver}" -ne "${EZIG_EXACT_VER}" && continue - - selected="${candidate}" - selected_ver="${ver}" - break - fi - - if [[ -n ${EZIG_MIN} ]] \ - && ver_test "${ver}" -lt "${EZIG_MIN}"; then - # Candidate does not satisfy EZIG_MIN condition. - continue - fi - - if [[ -n ${EZIG_MAX_EXCLUSIVE} ]] \ - && ver_test "${ver}" -ge "${EZIG_MAX_EXCLUSIVE}"; then - # Candidate does not satisfy EZIG_MAX_EXCLUSIVE condition. - continue - fi - - if [[ -n ${selected_ver} ]] \ - && ver_test "${selected_ver}" -gt "${ver}"; then - # Candidate is older than the currently selected candidate. - continue - fi - - selected="${candidate}" - selected_ver="${ver}" - done - - if [[ -z ${selected} ]]; then - die "Could not find (suitable) zig installation in ${BROOT}/usr/bin" - fi - - export EZIG="${selected}" - export EZIG_VER="${selected_ver}" -} - -# Invoke zig with the optionally provided arguments. -ezig() { - zig-set_EZIG - - # Unfortunately, we cannot add more args here, since syntax is different - # for every subcommands. Yes, even target/cpu :( f.i. : - # -target/-mcpu for zig build-exe vs -Dtarget/-Dcpu for zig build- - # -OReleaseSafe for zig build-exe vs -DReleaseSafe for zig build - # (or even none, if hardcoded by upstream so choice is -Drelease=true/false) - # Ofc we can patch this, but still... - - edo "${EZIG}" "${@}" -} - -src_unpack() { - if use verify-sig; then - verify-sig_verify_detached "${DISTDIR}"/${P}.tar.gz{,.asc} - fi - default -} - -src_configure() { - zig-set_EZIG - export ZIG=${EZIG} -} - -src_test() { - ezig build test -Drelease-fast -} - -src_install() { - emake PREFIX="${ED}"/usr install - - dodoc README.md ChangeLog -}
