summaryrefslogtreecommitdiff
path: root/dev-build
diff options
context:
space:
mode:
authorV3n3RiX <venerix@koprulu.sector>2024-03-21 07:00:13 +0000
committerV3n3RiX <venerix@koprulu.sector>2024-03-21 07:00:13 +0000
commit3faa6ebe0068b432ee5a9390c47ceca068ea7fe9 (patch)
treec571245b455a9a5dd80022270c5ac943532620b9 /dev-build
parentee93fbc2bb111cf895ae00cc1877c68f0eafaf2a (diff)
gentoo auto-resync : 21:03:2024 - 07:00:13
Diffstat (limited to 'dev-build')
-rw-r--r--dev-build/Manifest.gzbin6529 -> 6535 bytes
-rw-r--r--dev-build/make/Manifest4
-rw-r--r--dev-build/make/make-4.4.1-r1.ebuild4
-rw-r--r--dev-build/make/make-9999.ebuild4
-rw-r--r--dev-build/samurai/Manifest5
-rw-r--r--dev-build/samurai/files/samurai-1.2-phony_targets_fix.patch30
-rw-r--r--dev-build/samurai/metadata.xml6
-rw-r--r--dev-build/samurai/samurai-1.2-r3.ebuild (renamed from dev-build/samurai/samurai-1.2-r2.ebuild)1
8 files changed, 45 insertions, 9 deletions
diff --git a/dev-build/Manifest.gz b/dev-build/Manifest.gz
index 2f434a4e5fc3..33b39a9f5a94 100644
--- a/dev-build/Manifest.gz
+++ b/dev-build/Manifest.gz
Binary files differ
diff --git a/dev-build/make/Manifest b/dev-build/make/Manifest
index 55edb87ad693..9a9b2c2854d1 100644
--- a/dev-build/make/Manifest
+++ b/dev-build/make/Manifest
@@ -1,6 +1,6 @@
AUX make-4.4-default-cxx.patch 278 BLAKE2B 9b5a0428e37f3abcaa01567302b12e48031b755cd988054464275c5ae255a9c77a507d9772f2124614569a858c820c533a46d859e11813591a6cdea636d74f2a SHA512 f569ebd924d64c95e0d3d7c61daaedb7780cccded83bd73036d56f1ef658497056f95a65c463fe347b14b1d12205507173eaab8cb74205cbcf32bf1a25531f9d
DIST make-4.4.1.tar.gz 2348200 BLAKE2B 09a4ad8060259e36854b525ab610fd317a86f4926e44e3ab8adba75dccc8d4b445df9dd25ccfb4c25a54bc0e98238a9127e36401d74cbc3503a329eadcdf4995 SHA512 145260cbd6a8226cef3dfef0c8baba31847beaebc7e6b65d39d02715fd4f4cab9b139b6c3772e550088d4f9ae80c6d3ed20b9a7664c693644dfb96b4cb60e67c
DIST make-4.4.1.tar.gz.sig 833 BLAKE2B d5f9a33b0262d4a9216f47718f6596884852662a692e708191a7007964007940da1c06549db28ae1d13683c4a949b9ee86da9dedd9a80da8f8b09e71e659e9a1 SHA512 d7a5531c10f216d690ec036f3875c7f314fa53006e138568c60132d506db48d1a59201623e168091dafa4465b005991019e42f81ff1a96a44610b6b18de08b09
-EBUILD make-4.4.1-r1.ebuild 1714 BLAKE2B d010b515fe5419aa7b159955e80100c68c84a7b664165aa752e0487bcaa76dfe8c7208791df65f35b10aa8006c9a1263dbf8156a7874e10cc9d46090a0f5de9b SHA512 bb506c194a84bbb98ad3755605764b9b10549fb07fb335772c61772520ba5ca802fbf9deb1e1790c120f18e60c5eb0af6483fc9c8777c1d02fb5fe9f1a7e0d99
-EBUILD make-9999.ebuild 1722 BLAKE2B d2158bf6ade4e67f4dcee8dbf29204a00a7a850945ff4da79531448244215a642276ccce98dc508ef29b748fb94b5732cfb913ce58c76a9692574c7ad5fa8f7d SHA512 406e5cdb77891197add0f3eb9086f0be0d5a0825abeb58d0c7b5c638583fa2e11cbeec7253defdd0341aa7ecda76e937c6a2ae1638973e4aac67e2026609e147
+EBUILD make-4.4.1-r1.ebuild 1771 BLAKE2B d1241ad99452b8f62857dabae5b10f9cdccd402d2720cf9db381719e5a811a055134743212f9e858622a1ec80cede18ef6fb7069a59020212499d8aa8bc94c69 SHA512 6ae5fe0521b05b348c8fa25c3d4941ff5aa50862b833b41777a8ae3845f6dd3dfa037af934d18edd7f1620273005fdfd1ce148134cc37145edf66cdda26527c9
+EBUILD make-9999.ebuild 1779 BLAKE2B b0e81c5888baf20ef17123bfdc409cc06f7d9bd822fa4856273b0475502c36d5479fc49fbbdae09e832e125e7622365f4ebd5527cbf9bfc15012db55d97667f7 SHA512 9633f903c1c865859954feef8a6044588703d04ba840d633f5c38b1885d5bcaec30312ca38b86830419ce3255f0884965d8f7e48f39bea6d4a9d24ad7b0ed578
MISC metadata.xml 381 BLAKE2B 867fd4a045ef622ccb62c72b7198e205293501d075ec0dca7daf702bacbe2df21ea23aadb4150e42fdc0914a95cab0f48d439c1f7073acf2302bdaf48fa18688 SHA512 66494f08f599035728fa7f87b3f7ca093e3c50dbb694aed8214d1dbbb3d1e03441e6e159b1453709fa8c7da8cc8d73ab2c972517a3506b1fb671533d459c4418
diff --git a/dev-build/make/make-4.4.1-r1.ebuild b/dev-build/make/make-4.4.1-r1.ebuild
index 61fbc91f243f..c2fbdc0dcb2e 100644
--- a/dev-build/make/make-4.4.1-r1.ebuild
+++ b/dev-build/make/make-4.4.1-r1.ebuild
@@ -22,7 +22,8 @@ fi
LICENSE="GPL-3+"
SLOT="0"
-IUSE="guile nls static"
+IUSE="guile nls static test"
+RESTRICT="!test? ( test )"
DEPEND="guile? ( >=dev-scheme/guile-1.8:= )"
RDEPEND="
@@ -32,6 +33,7 @@ RDEPEND="
BDEPEND="
nls? ( sys-devel/gettext )
verify-sig? ( sec-keys/openpgp-keys-make )
+ test? ( dev-lang/perl )
"
PATCHES=(
diff --git a/dev-build/make/make-9999.ebuild b/dev-build/make/make-9999.ebuild
index 2be7d7adb832..b7bd016b9653 100644
--- a/dev-build/make/make-9999.ebuild
+++ b/dev-build/make/make-9999.ebuild
@@ -22,7 +22,8 @@ fi
LICENSE="GPL-3+"
SLOT="0"
-IUSE="guile nls static"
+IUSE="guile nls static test"
+RESTRICT="!test? ( test )"
DEPEND="guile? ( >=dev-scheme/guile-1.8:= )"
RDEPEND="
@@ -32,6 +33,7 @@ RDEPEND="
BDEPEND="
nls? ( sys-devel/gettext )
verify-sig? ( sec-keys/openpgp-keys-make )
+ test? ( dev-lang/perl )
"
PATCHES=(
diff --git a/dev-build/samurai/Manifest b/dev-build/samurai/Manifest
index 1ed454c01d08..8bf9ca362220 100644
--- a/dev-build/samurai/Manifest
+++ b/dev-build/samurai/Manifest
@@ -1,5 +1,6 @@
AUX samurai-1.2-null_pointer_fix.patch 2089 BLAKE2B f721cec4d42b4826ec52d4e88ee86b907956739f30427eeaee047eef8e59f953c1bcb2fda301cf3a8214c707954cbbb0abf0901c63ec557f4d9cc614962894d1 SHA512 5ead4b0aa47fd9c3bc84cf437744a36a9a1ed21b438883d32ab98b598c98a20561ba46954255553befdb9f46efa4f6251f73342de9000415f09bce63064e52eb
+AUX samurai-1.2-phony_targets_fix.patch 1010 BLAKE2B 5371e6ac3ea7f699627638f29e1fbb01f6670584d596c2cc82f15fde871b2e2f5386e1b2f13f9c17f135be71475921b6ff41a41dfe1104deb6f0e66f796ab429 SHA512 61ed28320ffa0bef6d48c1d8e3ebb4efb70326debf4b31bbc9fa5d3bb25319d03bd5bebec3e63d87f81ba03aaa05d9d57170af2ced0d6655e95f535c67b67401
DIST samurai-1.2.tar.gz 32709 BLAKE2B 86ed79f7d6ab492216cf3bf0e19ff8be8c1ca37e5c99de84b457875fa710d720624bd0de53105ed0b1d382c417aeb7397929cb9a35a8d1b36a11e053bf8d7ff5 SHA512 bbe6a582c34b04f1df53b76c1647aa3e03c4698ebf7591a203935f11ffa05971bbcb86dc1a8c06aeb904cdc741abb08918122810fc47216fed0a6d9f87fd1225
-EBUILD samurai-1.2-r2.ebuild 749 BLAKE2B fd215292da69e3afa669e0c51925ea53bd71c81267bde9ac80bd6a55cda1296a3832eae7d59c47ab2ca7472dc7a38948e182abe5e701264bcf5b58a227842dff SHA512 c1d98d5832894a25929e52373dd4596256b283cbd597ea3515f6c4a00c8f17b1fee4e5235e968de122959ecbd63833664d7e89ecf6f08843d9420f048866cad9
+EBUILD samurai-1.2-r3.ebuild 793 BLAKE2B c2eb34fcd66ca3ec44b9d2d9f2ea4be87708403385c80f77d0c9dc0172cd864fd124ecbe80e60eb418b12a69ea427e3c55666cd17b3d3dc625d42cd95129f1c5 SHA512 12e08aefd90b1b3c0a702bd3729c7d734a3a9eac750f6dd6521a9c136d72b1386b055cfcad2a5726499f1843a3c984cbecf25089a57b97ac9604cc7799893a53
EBUILD samurai-9999.ebuild 667 BLAKE2B d7cd61d295ddd710163d362dd208643574b0784fd1ff77ab6010a72a2fc6ba6ddf9b0f8cc0bca94444899401e7c6c07ac377ebce22827787b5682011456b480e SHA512 dc94ed93d609f510f30d0b15d98fab58da752d08301527b239d693c003a33dae86cbbb45ac16b3b41192b259d3b5df9882001fc0371227dc5cd60d95bb4bd44b
-MISC metadata.xml 454 BLAKE2B b3f71bd78021685a69254816df743ace390d3aadeaaf9adb1cdeb5f7c3f567623b863fe87b7b230e45efd65bb74b306e0615081f14d396882197c178eb2f77e7 SHA512 527fa97c53904b68ef8f182d6faf8c18116bf3b60099a1b0152a7326cbb372130bd2de0fda38c7ec66dac6d10dba9af29d50d1b98a12999108eab90cd5ed1b79
+MISC metadata.xml 471 BLAKE2B 1e6eb065b342b217a9713f9bad0d251db286179ed0abed65c96e492cb528eb60d99a67661b4f968902e862bd2089b011b8e7192195f16d535b104f1be2c2293e SHA512 4e8c8854a5afda6a5116caf62876c0b7f3eefde46c1abd102632aae425c9c44a15b7b50e8eda4f78b679ec291c201502c255150d5dee4fe58e2164b24b67ee2a
diff --git a/dev-build/samurai/files/samurai-1.2-phony_targets_fix.patch b/dev-build/samurai/files/samurai-1.2-phony_targets_fix.patch
new file mode 100644
index 000000000000..8794850a7285
--- /dev/null
+++ b/dev-build/samurai/files/samurai-1.2-phony_targets_fix.patch
@@ -0,0 +1,30 @@
+https://github.com/michaelforney/samurai/issues/66
+https://github.com/michaelforney/samurai/issues/81
+https://github.com/michaelforney/samurai/commit/fb61f22c7e690715d309c41812412c4f432ef53a
+
+From fb61f22c7e690715d309c41812412c4f432ef53a Mon Sep 17 00:00:00 2001
+From: Michael Forney <mforney@mforney.org>
+Date: Wed, 31 Mar 2021 14:04:29 -0700
+Subject: [PATCH] build: Don't try to print phony edges during dry-run
+
+This causes a segfault since phony edges have no command. It also
+messes up the nstarted/nfinished counts.
+
+Fixes #66.
+---
+ build.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/build.c b/build.c
+index 368e5f9..1cb736f 100644
+--- a/build.c
++++ b/build.c
+@@ -540,7 +540,7 @@ build(void)
+ while (work && numjobs < buildopts.maxjobs && numfail < buildopts.maxfail) {
+ e = work;
+ work = work->worknext;
+- if (buildopts.dryrun) {
++ if (e->rule != &phonyrule && buildopts.dryrun) {
+ ++nstarted;
+ printstatus(e, edgevar(e, "command", true));
+ ++nfinished;
diff --git a/dev-build/samurai/metadata.xml b/dev-build/samurai/metadata.xml
index f797645e008e..915803b8c390 100644
--- a/dev-build/samurai/metadata.xml
+++ b/dev-build/samurai/metadata.xml
@@ -5,9 +5,9 @@
<email>orbea@riseup.net</email>
<name>orbea</name>
</maintainer>
- <maintainer type="person" proxied="proxy">
- <email>sam@gentoo.org</email>
- <name>Sam James</name>
+ <maintainer type="project" proxied="proxy">
+ <email>proxy-maint@gentoo.org</email>
+ <name>Proxy Maintainers</name>
</maintainer>
<upstream>
<remote-id type="github">michaelforney/samurai</remote-id>
diff --git a/dev-build/samurai/samurai-1.2-r2.ebuild b/dev-build/samurai/samurai-1.2-r3.ebuild
index d6584ed27041..4015659f2356 100644
--- a/dev-build/samurai/samurai-1.2-r2.ebuild
+++ b/dev-build/samurai/samurai-1.2-r3.ebuild
@@ -20,6 +20,7 @@ SLOT="0"
PATCHES=(
"${FILESDIR}/${P}-null_pointer_fix.patch" # 786951
+ "${FILESDIR}/${P}-phony_targets_fix.patch"
)
src_compile() {
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-07 22:20:29 +0000