diff options
Diffstat (limited to 'dev-util')
| -rw-r--r-- | dev-util/autoproject/metadata.xml | 4 | ||||
| -rw-r--r-- | dev-util/unifdef/files/unifdef-2.12-tests.patch | 24 | ||||
| -rw-r--r-- | dev-util/unifdef/metadata.xml | 10 | ||||
| -rw-r--r-- | dev-util/unifdef/unifdef-2.12.ebuild | 2 |
4 files changed, 32 insertions, 8 deletions
diff --git a/dev-util/autoproject/metadata.xml b/dev-util/autoproject/metadata.xml index 8e20998bf65e..83d00b14c8d4 100644 --- a/dev-util/autoproject/metadata.xml +++ b/dev-util/autoproject/metadata.xml @@ -1,10 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd"> <pkgmetadata> - <maintainer type="project"> - <email>base-system@gentoo.org</email> - <name>Gentoo Base System</name> - </maintainer> <origin>gentoo-staging</origin> </pkgmetadata>
\ No newline at end of file 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 8e20998bf65e..a3cd9c427d42 100644 --- a/dev-util/unifdef/metadata.xml +++ b/dev-util/unifdef/metadata.xml @@ -1,10 +1,12 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd"> <pkgmetadata> - <maintainer type="project"> - <email>base-system@gentoo.org</email> - <name>Gentoo Base System</name> + <maintainer type="person"> + <email>slyfox@gentoo.org</email> + <name>Sergei Trofimovich</name> </maintainer> - + <upstream> + <remote-id type="github">fanf2/unifdef</remote-id> + </upstream> <origin>gentoo-staging</origin> </pkgmetadata>
\ No newline at end of file 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() { |