diff options
| author | V3n3RiX <venerix@redcorelinux.org> | 2021-06-17 17:57:35 +0100 |
|---|---|---|
| committer | V3n3RiX <venerix@redcorelinux.org> | 2021-06-17 17:57:35 +0100 |
| commit | 7932d472a02d4c016ff7dff4b7a5479ab9d1883d (patch) | |
| tree | d07709230f82777cae6ba7dab35aee31896060fb /dev-util/unifdef | |
| parent | d18bf1e01b65ee4bf0c804e2843b282d3d4e5d7c (diff) | |
gentoo resync : 17.06.2021
Diffstat (limited to 'dev-util/unifdef')
| -rw-r--r-- | dev-util/unifdef/Manifest | 5 | ||||
| -rw-r--r-- | dev-util/unifdef/files/unifdef-2.12-tests.patch | 24 | ||||
| -rw-r--r-- | dev-util/unifdef/metadata.xml | 11 | ||||
| -rw-r--r-- | dev-util/unifdef/unifdef-2.12.ebuild | 2 |
4 files changed, 36 insertions, 6 deletions
diff --git a/dev-util/unifdef/Manifest b/dev-util/unifdef/Manifest index 56050d94fcb2..dde250ebde80 100644 --- a/dev-util/unifdef/Manifest +++ b/dev-util/unifdef/Manifest @@ -1,3 +1,4 @@ +AUX unifdef-2.12-tests.patch 677 BLAKE2B 67ea52814b0a993df4f639262332b462f62f38b257a28a97c2a0cc8cd115c41638cfec27ebe0ffab98e99787c8ee3700da33f4d5bed3fb8a3234a6741092a8b5 SHA512 ab8b6dbab6c4122a15551b881e715bd33dff9d500dfffee065851da983bc43331c2cdea56bee6a2b7b45f0b0847cf9c807430f497b1d83f5fb90e1dce83d09f5 DIST unifdef-2.12.tar.gz 87091 BLAKE2B d14072f79b9d8b17a033c7068a3c6a423c2e66570aac6d232e387ffd256bc66ad3c4c1467b6f101124bf494f2c12c7b8d37c64104623b0022e435a7e5aa78d5a SHA512 9a00f69309578817af5b3a6cf45f293506e8326b520bed7c0ab2f66661e32a115b7f5aa9b0572cfbee5887044e5f0d70967904ec137172e67a1aab5abe09d3b5 -EBUILD unifdef-2.12.ebuild 563 BLAKE2B 50b7570343f050aa44dc88a9a6e895d6361b034fa320b689adf752b51abfe67d29fd7ecff5abb6483f49c04f6df76de8626174fa50cd93cf14762d6dedccefcc SHA512 d42ac038ae89def0a64d2278d3851d7b36de0dba63f50afd84ccc76fcdebdb0fd2d0aead71c1cc21bc58e3fc67c420ae1dcfd11fbb89ace0bb41c36eefec81f3 -MISC metadata.xml 253 BLAKE2B 295e9d6d93aaa12af413972e1590c67087801cc09c9aa6b59d4606c0f4106d1dacf2baa9858559083b4c6d91beeef218d0729e8593a33788958da6d2897e8ce2 SHA512 54a9069aeb4165d2dff3d473c8001bc51613aac9dff3f7f5e9971a9891a737a31511ffa11cbd523febe581ac1d9de2bdf2f40410f0c4239138f2ccca3ef15555 +EBUILD unifdef-2.12.ebuild 605 BLAKE2B debe1238d39aa80eeb4f167ac911e74d65eb4668a20920b438b53c56d92b7015e3523bcc1f043442d8edf77d0a5c9b618458b3b806989ab46b916c53f706148d SHA512 dcf2db7b060234cacb53323f3456c10b1b528cf7d66dee7ee80f915b7ae45d14424c7cf19d1dec078bc0733f7af8f9ce5216429a0f7f9d9e30c6223a9536aa7d +MISC metadata.xml 329 BLAKE2B 3ae4c297a4b6e28d4a79a0f8c0aa65b5dd7888440753103507a3325ac39586d2dea786a34cc41a67cbeddc00a4fb2efacff0cf070bd71b1d6f41f7d77fa32f7f SHA512 5c97ac70928d4e9ef2c4d7a69a26b3e2fe243cdbc1a6dc0ca3401ffe7fb33ed86b02d98524fe30c06fe3daaa6bf6c26de12a0fb10c4d1ee1d70e865488007a2f diff --git a/dev-util/unifdef/files/unifdef-2.12-tests.patch b/dev-util/unifdef/files/unifdef-2.12-tests.patch new file mode 100644 index 000000000000..2f7d151250c2 --- /dev/null +++ b/dev-util/unifdef/files/unifdef-2.12-tests.patch @@ -0,0 +1,24 @@ +https://github.com/fanf2/unifdef/pull/13 + +--- a/tests/multi-generic-sh ++++ b/tests/multi-generic-sh +@@ -9,7 +9,7 @@ unifdef -M~ $opts $mfiles + e=$? + for f in $mfiles + do +- diff -u $f~ $f | sed '/^[+-]\{3\} /s/ .*//' ++ LANG=C diff -u $f~ $f | sed '/^[+-]\{3\} /s/ .*//' + rm -f $f~ $f + done + exit $e +--- a/unifdefall.sh ++++ b/unifdefall.sh +@@ -48,7 +48,7 @@ export LC_ALL=C + # list of all controlling macros; assume these are undefined + "$unifdef" $debug -s "$@" | sort -u | sed 's/^/#undef /' >"$tmp/undefs" + # list of all macro definitions +-cc -E -dM "$@" | sort >"$tmp/defs" ++${CC-cc} -E -dM "$@" | sort >"$tmp/defs" + + case $debug in + -d) cat "$tmp/undefs" "$tmp/defs" 1>&2 diff --git a/dev-util/unifdef/metadata.xml b/dev-util/unifdef/metadata.xml index 56c124413057..56b39065e340 100644 --- a/dev-util/unifdef/metadata.xml +++ b/dev-util/unifdef/metadata.xml @@ -1,8 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> -<maintainer type="project"> - <email>base-system@gentoo.org</email> - <name>Gentoo Base System</name> -</maintainer> + <maintainer type="person"> + <email>slyfox@gentoo.org</email> + <name>Sergei Trofimovich</name> + </maintainer> + <upstream> + <remote-id type="github">fanf2/unifdef</remote-id> + </upstream> </pkgmetadata> diff --git a/dev-util/unifdef/unifdef-2.12.ebuild b/dev-util/unifdef/unifdef-2.12.ebuild index cf3ba7f64167..d936e5d6a08b 100644 --- a/dev-util/unifdef/unifdef-2.12.ebuild +++ b/dev-util/unifdef/unifdef-2.12.ebuild @@ -13,6 +13,8 @@ LICENSE="BSD" SLOT="0" KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux" +PATCHES=("${FILESDIR}"/${P}-tests.patch) + DOCS=( README ) src_prepare() { |