diff options
Diffstat (limited to 'dev-vcs')
| -rw-r--r-- | dev-vcs/Manifest.gz | bin | 12019 -> 12018 bytes | |||
| -rw-r--r-- | dev-vcs/git-absorb/Manifest | 3 | ||||
| -rw-r--r-- | dev-vcs/git-absorb/files/git-absorb-0.7.0-doc.patch | 58 | ||||
| -rw-r--r-- | dev-vcs/git-absorb/git-absorb-0.7.0.ebuild | 4 |
4 files changed, 64 insertions, 1 deletions
diff --git a/dev-vcs/Manifest.gz b/dev-vcs/Manifest.gz Binary files differindex cb6b0362dba4..d56dd3643251 100644 --- a/dev-vcs/Manifest.gz +++ b/dev-vcs/Manifest.gz diff --git a/dev-vcs/git-absorb/Manifest b/dev-vcs/git-absorb/Manifest index 71931cdccf9c..57d119519594 100644 --- a/dev-vcs/git-absorb/Manifest +++ b/dev-vcs/git-absorb/Manifest @@ -1,3 +1,4 @@ +AUX git-absorb-0.7.0-doc.patch 2417 BLAKE2B 6db1b77086d54b0230bffa2301f1ce1a15026445b73209edb52ae65ddebc9374030cea6f4b718eed01267cbfee21390824a691a4f664a6c45fd3718f69e0c15a SHA512 ea0d17843db6cfe54ad3561ebdc998bff2b76ba42d0d87a2193f4892fa48c7bbbe184df716f5c8e81fba05ac6d913dcef29d1df0905b345897c608d2bdc708f6 DIST anstream-0.6.13.crate 30928 BLAKE2B 0c6d0932dc486ccbe8d7e6f97bd8aae03fb84d4db90d0488070b7109de673e0af845a70a39e546af87f71f4c7f7bb159ab8ed68ac0f03a0297457062d9d69dc0 SHA512 4f9ccfd135de9be22a01230f39d571c8d8ccf7c3eba837fbf0868c9660693b60ee0c1c2f9490a587d5307e892ed45cb946da7a0690a9f972619c94fb050bde09 DIST anstyle-1.0.6.crate 14604 BLAKE2B 0716d0dbb62bf05c63c2bfe1c689896660073a423d26965ce2570f11e1925752a61209d78c2f2fe65ec4eb64ea4ffbb39669e789c0ba5d1b71e75de929153b20 SHA512 dc0e505465be54799b9faad70d0c6f7f0dcf9f5e1aaa43177b826c85dae626b054910244da0499862f066f6723a1560ad12100aec523f28c6198f1ea0d1b78fa DIST anstyle-parse-0.2.3.crate 24699 BLAKE2B 17e8638187ccc1ca0174a8cec7f7daeee7e0d8b8c430f7e74f9b10d8de4b49fd1c6facfdafde305b7a3e55b1ebf2b4e8ec4975a0cce691514ddae9eb5b5e711e SHA512 4a6d0f706d75c9b3c5144f34efdef3ef8fcd075962c594a23a6209ed56112563a34b3c01e05a08a0868d59204272d06211b2585cb9d06ce075ea875bedb2f399 @@ -103,5 +104,5 @@ DIST windows_x86_64_msvc-0.48.5.crate 798412 BLAKE2B 8abc0721e2fb337fe17c91d2789 DIST windows_x86_64_msvc-0.52.4.crate 828019 BLAKE2B 08163b63d934114457cd64b1c372f8a0cfc1ebf48a2efb41d79031c58ea64e023acd32d2f5075b8b78536998188138562e584ece95f2021b4bc71087ac45f026 SHA512 0671fa3c0463c6d65b525ece8bc91eab2f75cb534de86ba2b1e854d4136fcb439717441881206dba7cfb602493bc24d2aefa96abf8977f5a0fe38d41eadc90f1 EBUILD git-absorb-0.6.16-r1.ebuild 3175 BLAKE2B a4985ba35f4cec6b49c69899d7027cc1a59415fe9bad5c9321eb385a9014b159ea6e71048389c3f8a1721bbbff1180779fc5d56f36b42076219fa9479f3d555b SHA512 f5563c18139476beba2143f7f17adb130a0883b30ec0fa8759d7eeab541e6204ba36ec61b608d4094f0297df5a33e7139b95de4cce56beed2af660c0bd77599f EBUILD git-absorb-0.6.17-r2.ebuild 3087 BLAKE2B 4ca5dd439f148aa425180f6a6d4d584fc68db3ddadf080b1695b937542de24e50744b749897170fa4ba242dba20f5982324100f004dd87c969695c653a52f05c SHA512 0ab8503a5835e65d7a2673c904c511491a8b918ced64c69186f1f2485fd18e7cb3dbd80e925fe66cf2df22d708f1fb8c02edad1d5a096734c631e1b84390c11b -EBUILD git-absorb-0.7.0.ebuild 3132 BLAKE2B 91be3d1c915cd6b2886c91313de83164c82d396b862112c39bf2f8774de613ba2fa2be39901bd4b03b9da0714a486b5ae8c3d19da05514a8f02e2bb1702d3019 SHA512 f70e99112909a4b9f6efb5b313de542858bf9a958abbd1beb32e7ec6979076175b963251f14b5104b7074fa5298c47185fceee31314e65ac3f9fec75d4755b7b +EBUILD git-absorb-0.7.0.ebuild 3239 BLAKE2B 99cbaca5a4c51468e3b5f2d25e0776e87897a370201c2ccbc183f238e1f2d14b6d2ebb0f24fe81a7df61f0ab57e547e9b293f79c6dedf5734713b73c6f2d6559 SHA512 6c00614b6225ab66aee347b2980cb2abb6ea8b8c0d562be633cdb899e1e2d9a1d6b603c81bad63867b55530dbedb62dba7d973b5208fa5b316fdcea5375e17cf MISC metadata.xml 326 BLAKE2B 1ce61af807d0db7a5decbffc79fc653d7213c40b44fc1fe7441a0e787034e408ee167d5d2c4adc3f004b90c6ec520952504d66add287bbd540b3418c36f47de4 SHA512 9e288f04912600a55bbf5464eed414de2ea8911ce5bef9fe92d99e5d2a872652b3638d00235fea858151eebbf46905ed9108003297276202d4a1bd80ac0fc720 diff --git a/dev-vcs/git-absorb/files/git-absorb-0.7.0-doc.patch b/dev-vcs/git-absorb/files/git-absorb-0.7.0-doc.patch new file mode 100644 index 000000000000..563ed91ea789 --- /dev/null +++ b/dev-vcs/git-absorb/files/git-absorb-0.7.0-doc.patch @@ -0,0 +1,58 @@ +From 8e78376cd4b725a029dbc98e1ed6eb100cedf14a Mon Sep 17 00:00:00 2001 +From: Eli Schwartz <eschwartz@gentoo.org> +Date: Wed, 12 Mar 2025 09:30:38 -0400 +Subject: [PATCH] build: fix building manpages on systems where asciidoc is + already installed + +It doesn't really make sense to run one command that isn't installed, to +see if another command is installed. Even though I have a2x installed, +the build fails with: + +``` +make: Entering directory '/var/tmp/portage/dev-vcs/git-absorb-0.7.0/work/git-absorb-0.7.0/Documentation' +make: which: No such file or directory +Makefile:4: *** "No a2x in PATH; install asciidoc.". Stop. +``` + +The "which" utility is not guaranteed to be installed either, and if it +is, its behavior is not portable either. This means that when various +programs are installed, the `which` check will report a fatal error +because the which tool did not exist and the shell returned a nonzero +status when attempting to fork+exec. If it did exist, it might not be an +implementation of `which` that returns nonzero when commands do not +exist. + +The general scripting suggestion is to use the "command -v" shell +builtin; this is required to exist in all POSIX 2008 compliant shells, +and is thus guaranteed to work everywhere. + +For some in-depth discussions on the topic, see: +- https://mywiki.wooledge.org/BashFAQ/081 +- https://unix.stackexchange.com/questions/85249/why-not-use-which-what-to-use-then/85250#85250 + +Examples of open-source shells likely to be installed as /bin/sh on +Linux, which implement the 15-year-old standard: ash, bash, busybox, +dash, ksh, mksh and zsh. + +Several Linux distros which *do* currently ship a (decent quality) +`which` utility in their default install are looking to get rid of it: + +- Gentoo: https://bugs.gentoo.org/646588 +- Debian: https://lwn.net/Articles/874049/ +--- + Documentation/Makefile | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/Documentation/Makefile b/Documentation/Makefile +index 3056326..b642af1 100644 +--- a/Documentation/Makefile ++++ b/Documentation/Makefile +@@ -1,7 +1,7 @@ + build-manpage: git-absorb.1 + + git-absorb.1: git-absorb.adoc +- $(if $(shell which a2x),,$(error "No a2x in PATH; install asciidoc.")) ++ $(if $(shell command -v a2x),,$(error "No a2x in PATH; install asciidoc.")) + $(info Building manpage. This may take a few moments...) + a2x -L -d manpage -f manpage git-absorb.adoc --attribute man-version=${GA_VERSION} + diff --git a/dev-vcs/git-absorb/git-absorb-0.7.0.ebuild b/dev-vcs/git-absorb/git-absorb-0.7.0.ebuild index 12d660c41aec..7a01c1086fa0 100644 --- a/dev-vcs/git-absorb/git-absorb-0.7.0.ebuild +++ b/dev-vcs/git-absorb/git-absorb-0.7.0.ebuild @@ -127,6 +127,10 @@ DOCS=( README.md ) QA_FLAGS_IGNORED="usr/bin/${PN}" +# bug #951208 +# https://github.com/tummychow/git-absorb/pull/169 +PATCHES=( "${FILESDIR}"/${P}-doc.patch ) + src_compile() { export LIBGIT2_NO_VENDOR=1 |