From 19a10140592052698d68be11db5a59bc88fcf528 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Fri, 19 Aug 2022 08:36:10 +0100 Subject: gentoo auto-resync : 19:08:2022 - 08:36:10 --- dev-vcs/git/Manifest | 11 ++++++----- .../files/git-2.37.2-darwin-prefix-gettext.patch | 22 ++++++++++++++++++++++ dev-vcs/git/git-2.37.2.ebuild | 2 +- dev-vcs/git/git-9999-r1.ebuild | 2 +- dev-vcs/git/git-9999-r2.ebuild | 2 +- dev-vcs/git/git-9999-r3.ebuild | 2 +- dev-vcs/git/git-9999.ebuild | 2 +- 7 files changed, 33 insertions(+), 10 deletions(-) create mode 100644 dev-vcs/git/files/git-2.37.2-darwin-prefix-gettext.patch (limited to 'dev-vcs/git') diff --git a/dev-vcs/git/Manifest b/dev-vcs/git/Manifest index ffa34176531c..d4c707ea0c06 100644 --- a/dev-vcs/git/Manifest +++ b/dev-vcs/git/Manifest @@ -4,6 +4,7 @@ AUX git-2.31.0_rc0-optional-cvs.patch 14184 BLAKE2B 6f4d56487fda1e9b9f20a77b0c6b AUX git-2.32.0-r1-test-t5582.patch 754 BLAKE2B 6bd9fc93cea8f565ef7b5bd7d45770c5bdfae297b596a8a34451677c06cff24ddaa5b8a6f632849b3816e07d070efb6fdc0e9629ff98671fcbcba7897bca5430 SHA512 fb6a41d51bdbad862426cf5bbb70c08c722da807a462dfb0f2b069fc10801b53478bbcd8253b3ca3631737b448b3eeecffd1b523df3fabfe9ddf08db2a1a187b AUX git-2.33.0_rc0-optional-cvs.patch 14216 BLAKE2B a4179e0269917dd75b3e5b63fc70e931e42da3e6e170b5950efc20df89ac90eba1a18793eaa431150c8d8acb3fe1e3967a90075e9c940eae22f8b9a4fe158723 SHA512 ffdce5cca99b9c3196855316799470431e1ab064b7a8c739e7fc5b38029fd2bbceb415533d4b0000278eba3252f89e1fb2cdb52ae140668701d28bb88c07541b AUX git-2.37.0_rc1-optional-cvs.patch 14373 BLAKE2B b835715468cff979fdefcc42aeb7a48986c4ebba95f3e7ab033bc1b9c29eee9ded0b47a2c6d6831d4ece0662dd244f41a670d0805e1a5c8bd8c25531fcfb3493 SHA512 3c076c2865e930cfe2f0c9d01fb8e272037aeed99b46063e88942b89b1191e8149fd87ecbcbdb2d23ea37d556a971434938d7f4e4e2eef0e26e1b250534cc0e2 +AUX git-2.37.2-darwin-prefix-gettext.patch 922 BLAKE2B 172c5be167cf865a137f60fb0ffb022c3ffe54fb865f495bd10a160920a5448c842ee74a64d385730595cf329be0aeff56dd104b3da636feb1ce3f21f30206fd SHA512 2c5ad30d69e6333288231b2eff5219d815dfab3149119adcf799eff57030c2000061cc57add97992ac228225d40e97f4da86c46794c654334f667996efe325c1 AUX git-2.37.2-unsafe-directory.patch 367 BLAKE2B 433c4b39777d1f24fbebb0b08dc09672c059c01bbd8930b3a235d66d2990dcc5e3f17e758ff7860ce3d37d778db1a8792fd847ad110fef730095e52430fb0c19 SHA512 f23b0c29977e33596daa4eab60fcc1f64522dac93f6baa39aea9c627740363073176aabf29fe680a9802be34d9c3948713e17ce798000895cec787ccb40f56a7 AUX git-2.7.0-mediawiki-500pages.patch 1317 BLAKE2B fa90ac6f90b7b5b948dc1f9b8f300419df7b2b957aad9c15121f0b8df873d854cd74def68cd80788f085635cbbef65502b40e3eea2b3d8fb35fb02b4a4a1afa5 SHA512 efe580f288c6fdb6d55b742a3e4335ac32ed96cb12c10b959a5f283e505ab0aeed039d0d19d9dbf148a07ac6c7aec075ecea0c0be68456fdbe23dcad77ca01be AUX git-2.7.0-mediawiki-namespaces.patch 3188 BLAKE2B a5949c317f01244d7344bd0f5088e4bf77f723bf32734b85aa7d0abad274999733b7b33568aab5009b07fccc0f3f16ede633965fe351eb552d018a7eadfd9e83 SHA512 f1597fcb8e771917561d92bf428825e28477ed792be7494e34754434c73422dc52fdf99d981656b291f7eb91a199abe54038ae87e9b5229c9a382a4ea88e9d4f @@ -58,9 +59,9 @@ EBUILD git-2.36.0.ebuild 17351 BLAKE2B c53d5280e677a26a03b0088bd556e57934c6c469a EBUILD git-2.36.1.ebuild 17351 BLAKE2B c53d5280e677a26a03b0088bd556e57934c6c469ad6ae93c012b24b4c4c898d518c11f254743fa46419325cabda81037391da7fa8fbd31a7fcf7385ac16f8eee SHA512 8f8a26b123116af16ff9e145c07d531da2ac968437f815296a826d5750c74c615123af3865e0a37695bab5c7ec214e788d176c4b69ebd4e7aa1f00b2ae867298 EBUILD git-2.37.0.ebuild 17351 BLAKE2B 9cfc8cc03cce0e26ca7ec3ef1a72270a18602b2a102f993b95e119da1e330f3044f50fa314874dad5e84b0d01e8fae63e62f69380c3932c2842e2d4e9f4a05dc SHA512 d3541fb2ffd4e9fd5869b9c7f47b48fd26c968a11d5b385125abbdb2212abe7720754ce2b0f537714390f71f892c40265ef030328e6ae84de0b235aa1d9ab56a EBUILD git-2.37.1.ebuild 17351 BLAKE2B 9cfc8cc03cce0e26ca7ec3ef1a72270a18602b2a102f993b95e119da1e330f3044f50fa314874dad5e84b0d01e8fae63e62f69380c3932c2842e2d4e9f4a05dc SHA512 d3541fb2ffd4e9fd5869b9c7f47b48fd26c968a11d5b385125abbdb2212abe7720754ce2b0f537714390f71f892c40265ef030328e6ae84de0b235aa1d9ab56a -EBUILD git-2.37.2.ebuild 17552 BLAKE2B 113a4c66dfe0f3dbb689c48882c29a2aaa0d4cf2855744ba7510e631d0ad8d815bc6440c10d88dd28577cb5c80efd2387efde3a57564545f814ebb43f9105656 SHA512 26591d1736c5899e393d0661b692c0b3f5bf67448c2dc2b4a57ed24bf4563bd46f5655a46df644fd7e7fc90ec11596b81cc68db3e514eb6817b409098a44d2dc -EBUILD git-9999-r1.ebuild 17351 BLAKE2B c53d5280e677a26a03b0088bd556e57934c6c469ad6ae93c012b24b4c4c898d518c11f254743fa46419325cabda81037391da7fa8fbd31a7fcf7385ac16f8eee SHA512 8f8a26b123116af16ff9e145c07d531da2ac968437f815296a826d5750c74c615123af3865e0a37695bab5c7ec214e788d176c4b69ebd4e7aa1f00b2ae867298 -EBUILD git-9999-r2.ebuild 17351 BLAKE2B c53d5280e677a26a03b0088bd556e57934c6c469ad6ae93c012b24b4c4c898d518c11f254743fa46419325cabda81037391da7fa8fbd31a7fcf7385ac16f8eee SHA512 8f8a26b123116af16ff9e145c07d531da2ac968437f815296a826d5750c74c615123af3865e0a37695bab5c7ec214e788d176c4b69ebd4e7aa1f00b2ae867298 -EBUILD git-9999-r3.ebuild 17351 BLAKE2B c53d5280e677a26a03b0088bd556e57934c6c469ad6ae93c012b24b4c4c898d518c11f254743fa46419325cabda81037391da7fa8fbd31a7fcf7385ac16f8eee SHA512 8f8a26b123116af16ff9e145c07d531da2ac968437f815296a826d5750c74c615123af3865e0a37695bab5c7ec214e788d176c4b69ebd4e7aa1f00b2ae867298 -EBUILD git-9999.ebuild 17351 BLAKE2B c53d5280e677a26a03b0088bd556e57934c6c469ad6ae93c012b24b4c4c898d518c11f254743fa46419325cabda81037391da7fa8fbd31a7fcf7385ac16f8eee SHA512 8f8a26b123116af16ff9e145c07d531da2ac968437f815296a826d5750c74c615123af3865e0a37695bab5c7ec214e788d176c4b69ebd4e7aa1f00b2ae867298 +EBUILD git-2.37.2.ebuild 17552 BLAKE2B 6d20d60a54286e2fd0353aa5c9e9cdaa5f39818f62ec53a35c0b69b7a9077d67e02ce41e2bb64aac2c2efb70f260a291320d8505ddadd5ab3c95c9151a0c33e9 SHA512 58549c0905bc8aed5549cd0edf491224e47ff5e5fac6bc11fc74503f6e39efb383e2ac6cf6957e92791965f577d33b9d15d9a0e897729c58fbc304557819c86f +EBUILD git-9999-r1.ebuild 17351 BLAKE2B c5b377be6ee563a3312e701ec8fc64ab3201d9ae8784f44b866782ca893aeeee3053fce4ad42f3628b21807bf685678dca6b8ece1b280a80b4502161bb2e686f SHA512 d5b7cb7d6a5e889b13f6897624e8768ee0d14b0c527a9dbc2cf1bda53ca72272cb85173f57edb43937534b7fe67968cba5de9c6fbd519aa8acf4a9934ef3d5ce +EBUILD git-9999-r2.ebuild 17351 BLAKE2B c5b377be6ee563a3312e701ec8fc64ab3201d9ae8784f44b866782ca893aeeee3053fce4ad42f3628b21807bf685678dca6b8ece1b280a80b4502161bb2e686f SHA512 d5b7cb7d6a5e889b13f6897624e8768ee0d14b0c527a9dbc2cf1bda53ca72272cb85173f57edb43937534b7fe67968cba5de9c6fbd519aa8acf4a9934ef3d5ce +EBUILD git-9999-r3.ebuild 17351 BLAKE2B c5b377be6ee563a3312e701ec8fc64ab3201d9ae8784f44b866782ca893aeeee3053fce4ad42f3628b21807bf685678dca6b8ece1b280a80b4502161bb2e686f SHA512 d5b7cb7d6a5e889b13f6897624e8768ee0d14b0c527a9dbc2cf1bda53ca72272cb85173f57edb43937534b7fe67968cba5de9c6fbd519aa8acf4a9934ef3d5ce +EBUILD git-9999.ebuild 17351 BLAKE2B c5b377be6ee563a3312e701ec8fc64ab3201d9ae8784f44b866782ca893aeeee3053fce4ad42f3628b21807bf685678dca6b8ece1b280a80b4502161bb2e686f SHA512 d5b7cb7d6a5e889b13f6897624e8768ee0d14b0c527a9dbc2cf1bda53ca72272cb85173f57edb43937534b7fe67968cba5de9c6fbd519aa8acf4a9934ef3d5ce MISC metadata.xml 2230 BLAKE2B 0e4c17cf8ddb998784705e2ecb65ea4163360bc6ea8d54e1d114ce0c698a445418ff822e274b226a8f43a47221326e4e2f0a7fe3440e97c880d85482e90ec09e SHA512 edf8ea87dea06bd5c034f975431ceab72653b75183ac2d3161003e8a6154c96f9cb64cc8d95526dc31b2ecbbe91cd5bd35e665c97fcf4ce6831988c2923dc921 diff --git a/dev-vcs/git/files/git-2.37.2-darwin-prefix-gettext.patch b/dev-vcs/git/files/git-2.37.2-darwin-prefix-gettext.patch new file mode 100644 index 000000000000..af267347e65e --- /dev/null +++ b/dev-vcs/git/files/git-2.37.2-darwin-prefix-gettext.patch @@ -0,0 +1,22 @@ +Don't examine outside of the prefix for gettext on macOS/Darwin. +https://bugs.gentoo.org/757309 +--- a/config.mak.uname ++++ b/config.mak.uname +@@ -148,17 +148,6 @@ ifeq ($(uname_S),Darwin) + HAVE_NS_GET_EXECUTABLE_PATH = YesPlease + CSPRNG_METHOD = arc4random + +- # Workaround for `gettext` being keg-only and not even being linked via +- # `brew link --force gettext`, should be obsolete as of +- # https://github.com/Homebrew/homebrew-core/pull/53489 +- ifeq ($(shell test -d /usr/local/opt/gettext/ && echo y),y) +- BASIC_CFLAGS += -I/usr/local/include -I/usr/local/opt/gettext/include +- BASIC_LDFLAGS += -L/usr/local/lib -L/usr/local/opt/gettext/lib +- ifeq ($(shell test -x /usr/local/opt/gettext/bin/msgfmt && echo y),y) +- MSGFMT = /usr/local/opt/gettext/bin/msgfmt +- endif +- endif +- + # The builtin FSMonitor on MacOS builds upon Simple-IPC. Both require + # Unix domain sockets and PThreads. + ifndef NO_PTHREADS diff --git a/dev-vcs/git/git-2.37.2.ebuild b/dev-vcs/git/git-2.37.2.ebuild index 70bd35f67fb0..cdfdd0b66a85 100644 --- a/dev-vcs/git/git-2.37.2.ebuild +++ b/dev-vcs/git/git-2.37.2.ebuild @@ -265,7 +265,7 @@ src_prepare() { if use prefix ; then # bug #757309 - eapply "${FILESDIR}"/git-2.31.0-darwin-prefix-gettext.patch + eapply "${FILESDIR}"/git-2.37.2-darwin-prefix-gettext.patch fi sed -i \ diff --git a/dev-vcs/git/git-9999-r1.ebuild b/dev-vcs/git/git-9999-r1.ebuild index cf66a5432c9c..a3a70228f500 100644 --- a/dev-vcs/git/git-9999-r1.ebuild +++ b/dev-vcs/git/git-9999-r1.ebuild @@ -258,7 +258,7 @@ src_prepare() { if use prefix ; then # bug #757309 - eapply "${FILESDIR}"/git-2.31.0-darwin-prefix-gettext.patch + eapply "${FILESDIR}"/git-2.37.2-darwin-prefix-gettext.patch fi sed -i \ diff --git a/dev-vcs/git/git-9999-r2.ebuild b/dev-vcs/git/git-9999-r2.ebuild index cf66a5432c9c..a3a70228f500 100644 --- a/dev-vcs/git/git-9999-r2.ebuild +++ b/dev-vcs/git/git-9999-r2.ebuild @@ -258,7 +258,7 @@ src_prepare() { if use prefix ; then # bug #757309 - eapply "${FILESDIR}"/git-2.31.0-darwin-prefix-gettext.patch + eapply "${FILESDIR}"/git-2.37.2-darwin-prefix-gettext.patch fi sed -i \ diff --git a/dev-vcs/git/git-9999-r3.ebuild b/dev-vcs/git/git-9999-r3.ebuild index cf66a5432c9c..a3a70228f500 100644 --- a/dev-vcs/git/git-9999-r3.ebuild +++ b/dev-vcs/git/git-9999-r3.ebuild @@ -258,7 +258,7 @@ src_prepare() { if use prefix ; then # bug #757309 - eapply "${FILESDIR}"/git-2.31.0-darwin-prefix-gettext.patch + eapply "${FILESDIR}"/git-2.37.2-darwin-prefix-gettext.patch fi sed -i \ diff --git a/dev-vcs/git/git-9999.ebuild b/dev-vcs/git/git-9999.ebuild index cf66a5432c9c..a3a70228f500 100644 --- a/dev-vcs/git/git-9999.ebuild +++ b/dev-vcs/git/git-9999.ebuild @@ -258,7 +258,7 @@ src_prepare() { if use prefix ; then # bug #757309 - eapply "${FILESDIR}"/git-2.31.0-darwin-prefix-gettext.patch + eapply "${FILESDIR}"/git-2.37.2-darwin-prefix-gettext.patch fi sed -i \ -- cgit v1.2.3