unifdef: upgraded package to upstream
Upgraded dev-util/unifdef to version 2.12 on amd64, arm.
Please note dev-util/unifdef is not available on arm64.
BUG=b:218560801
TEST=FEATURES=test emerge-drallion dev-util/unifdef
Change-Id: I3addc675bd74667cf1b5fea268ca6b297f21d686
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/overlays/portage-stable/+/3448051
Tested-by: Henry Yang <yanghenry@google.com>
Reviewed-by: Michael Pishchagin <mblsha@google.com>
Reviewed-by: Gwendal Grignou <gwendal@chromium.org>
Commit-Queue: Gwendal Grignou <gwendal@chromium.org>
diff --git a/dev-util/unifdef/Manifest b/dev-util/unifdef/Manifest
index 7ae8893..44497c7 100644
--- a/dev-util/unifdef/Manifest
+++ b/dev-util/unifdef/Manifest
@@ -1 +1 @@
-DIST unifdef-2.10.tar.gz 73285 BLAKE2B e13b75afc9b8e514559b8a13e3069bfb1cb489d21ce4ac56134921e702666bd9b23dad36d251cb65535e5d6fe02bea0d21a5610c542d727dc5e90d7e1726e4dd SHA512 39d4551f43fa8eccaee8a9fc469b5ddc8ca8eb0e0ce46c17c3a8300f7e6960fbf0960f364a83df20059b4aa623edc7c3c16df1b7162f068332e6c066d7ffe9b3
+DIST unifdef-2.12.tar.gz 87091 BLAKE2B d14072f79b9d8b17a033c7068a3c6a423c2e66570aac6d232e387ffd256bc66ad3c4c1467b6f101124bf494f2c12c7b8d37c64104623b0022e435a7e5aa78d5a SHA512 9a00f69309578817af5b3a6cf45f293506e8326b520bed7c0ab2f66661e32a115b7f5aa9b0572cfbee5887044e5f0d70967904ec137172e67a1aab5abe09d3b5
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 0000000..2f7d151
--- /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 56c1244..b0898b6 100644
--- a/dev-util/unifdef/metadata.xml
+++ b/dev-util/unifdef/metadata.xml
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<maintainer type="project">
- <email>base-system@gentoo.org</email>
- <name>Gentoo Base System</name>
-</maintainer>
+ <!-- maintainer-needed -->
+ <upstream>
+ <remote-id type="github">fanf2/unifdef</remote-id>
+ </upstream>
</pkgmetadata>
diff --git a/dev-util/unifdef/unifdef-2.10.ebuild b/dev-util/unifdef/unifdef-2.10.ebuild
deleted file mode 100644
index 07861c0..0000000
--- a/dev-util/unifdef/unifdef-2.10.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-inherit toolchain-funcs
-
-DESCRIPTION="remove #ifdef'ed lines from a file while otherwise leaving the file alone"
-HOMEPAGE="http://dotat.at/prog/unifdef/"
-SRC_URI="http://dotat.at/prog/unifdef/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="*"
-
-DOCS=( README )
-
-src_prepare() {
- sed -i '/^prefix/s:=.*:=/usr:' Makefile || die
- tc-export CC
-}
diff --git a/dev-util/unifdef/unifdef-2.12.ebuild b/dev-util/unifdef/unifdef-2.12.ebuild
new file mode 100644
index 0000000..7d71081
--- /dev/null
+++ b/dev-util/unifdef/unifdef-2.12.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit toolchain-funcs
+
+DESCRIPTION="remove #ifdef'ed lines from a file while otherwise leaving the file alone"
+HOMEPAGE="https://dotat.at/prog/unifdef/"
+SRC_URI="https://dotat.at/prog/unifdef/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="*"
+
+PATCHES=("${FILESDIR}"/${P}-tests.patch)
+
+DOCS=( README )
+
+src_prepare() {
+ sed -i "/^prefix/s:=.*:=${EPREFIX}/usr:" Makefile || die
+ tc-export CC
+ default
+}
