diffutils: upgraded package to upstream
Upgraded sys-apps/diffutils to version 3.6-r1 on amd64, arm, arm64
BUG=none
TEST=build_packages, build_image, deploy to lars, test binaries
on sdk and lars
Change-Id: I7b9245a6e88d4317592510ccae5f2e2f64cfa01c
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/overlays/portage-stable/+/1903027
Reviewed-by: Chris McDonald <cjmcdonald@chromium.org>
Tested-by: Evan Benn <evanbenn@chromium.org>
Commit-Queue: Evan Benn <evanbenn@chromium.org>
diff --git a/metadata/md5-cache/sys-apps/diffutils-3.3 b/metadata/md5-cache/sys-apps/diffutils-3.3
deleted file mode 100644
index b972864..0000000
--- a/metadata/md5-cache/sys-apps/diffutils-3.3
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure prepare test
-DEPEND=app-arch/xz-utils nls? ( sys-devel/gettext )
-DESCRIPTION=Tools to make diffs and compare files
-EAPI=4
-HOMEPAGE=http://www.gnu.org/software/diffutils/
-IUSE=nls static
-KEYWORDS=*
-LICENSE=GPL-2
-RESTRICT=test
-SLOT=0
-SRC_URI=mirror://gnu-alpha/diffutils/diffutils-3.3.tar.xz mirror://gnu/diffutils/diffutils-3.3.tar.xz
-_eclasses_=eutils 06133990e861be0fe60c2b428fd025d9 flag-o-matic 5d5921a298e95441da2f85be419894c0 multilib b2f01ad412baf81650c23fcf0975fa33 toolchain-funcs 209edad4a5c4812e7b2f8021650974f0
-_md5_=33509f4623b154724dc93053fbc03c72
diff --git a/metadata/md5-cache/sys-apps/diffutils-3.6-r1 b/metadata/md5-cache/sys-apps/diffutils-3.6-r1
new file mode 100644
index 0000000..cf8b582
--- /dev/null
+++ b/metadata/md5-cache/sys-apps/diffutils-3.6-r1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=configure test
+DEPEND=app-arch/xz-utils nls? ( sys-devel/gettext )
+DESCRIPTION=Tools to make diffs and compare files
+EAPI=6
+HOMEPAGE=https://www.gnu.org/software/diffutils/
+IUSE=nls static
+KEYWORDS=*
+LICENSE=GPL-2
+RESTRICT=test
+SLOT=0
+SRC_URI=mirror://gnu/diffutils/diffutils-3.6.tar.xz mirror://gnu-alpha/diffutils/diffutils-3.6.tar.xz
+_eclasses_=eutils 06133990e861be0fe60c2b428fd025d9 flag-o-matic 5d5921a298e95441da2f85be419894c0 multilib b2f01ad412baf81650c23fcf0975fa33 toolchain-funcs 209edad4a5c4812e7b2f8021650974f0
+_md5_=731a5808f049aafd90deb3a4e44b55a4
diff --git a/sys-apps/diffutils/Manifest b/sys-apps/diffutils/Manifest
index 49003a7..4089a05 100644
--- a/sys-apps/diffutils/Manifest
+++ b/sys-apps/diffutils/Manifest
@@ -1 +1 @@
-DIST diffutils-3.3.tar.xz 1197832 SHA256 a25e89a8ab65fded1731e4186be1bb25cda967834b6df973599cdcd5abdfc19c SHA512 b04b998717e45e8fd1ba675957dad1909beeed68ffc41c0d9bbaddaf78965f9e63af5a8d8811bb94f33a3cddcad2fe1ad794e52e545def9ce96c092999a74a83 WHIRLPOOL 8fd3b179afdc3fd127cee8829535b0fc6d949443645e8df80fa45c2fa44a732ea652259b644d81a9be14d4c7f7c3b5bad7b8861934a6bc691cd02a34c0200ed3
+DIST diffutils-3.6.tar.xz 1398296 BLAKE2B 1b0a1443f676a1c09d25ad0be4c2d936156da8e690fade9d39d94be3850c502db24c3f508178a51e817437069db2d110fb4577cd67b2cf645c11a1f26a043e3d SHA512 3c159ff1cb7c901b0a57518483566b5740ca3c45aeb8d3004089f052975481db52994cc18592c502c68b0d2a1e22f1f7830f0d8dd9a9ed86de96e28cce9f70c1
diff --git a/sys-apps/diffutils/diffutils-3.3.ebuild b/sys-apps/diffutils/diffutils-3.3.ebuild
deleted file mode 100644
index 1cb5b20..0000000
--- a/sys-apps/diffutils/diffutils-3.3.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/diffutils/diffutils-3.3.ebuild,v 1.14 2014/01/18 05:12:18 vapier Exp $
-
-EAPI=4
-
-inherit flag-o-matic
-
-DESCRIPTION="Tools to make diffs and compare files"
-HOMEPAGE="http://www.gnu.org/software/diffutils/"
-SRC_URI="mirror://gnu-alpha/diffutils/${P}.tar.xz
- mirror://gnu/diffutils/${P}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="*"
-IUSE="nls static"
-RESTRICT="test"
-
-DEPEND="app-arch/xz-utils
- nls? ( sys-devel/gettext )"
-
-DOCS=( AUTHORS ChangeLog NEWS README THANKS TODO )
-
-src_prepare() {
- sed -i 's:@mkdir_p@:@MKDIR_P@:g' po/Makefile.in.in || die #464604
-}
-
-src_configure() {
- use static && append-ldflags -static
-
- # Disable automagic dependency over libsigsegv; see bug #312351.
- export ac_cv_libsigsegv=no
-
- econf \
- --with-packager="Gentoo" \
- --with-packager-version="${PVR}" \
- --with-packager-bug-reports="http://bugs.gentoo.org/" \
- $(use_enable nls)
-}
-
-src_test() {
- # explicitly allow parallel testing
- emake check
-}
diff --git a/sys-apps/diffutils/diffutils-3.6-r1.ebuild b/sys-apps/diffutils/diffutils-3.6-r1.ebuild
new file mode 100644
index 0000000..1672e11
--- /dev/null
+++ b/sys-apps/diffutils/diffutils-3.6-r1.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit flag-o-matic
+
+DESCRIPTION="Tools to make diffs and compare files"
+HOMEPAGE="https://www.gnu.org/software/diffutils/"
+SRC_URI="mirror://gnu/diffutils/${P}.tar.xz
+ mirror://gnu-alpha/diffutils/${P}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="*"
+IUSE="nls static"
+RESTRICT="test"
+
+DEPEND="app-arch/xz-utils
+ nls? ( sys-devel/gettext )"
+
+DOCS=( AUTHORS ChangeLog NEWS README THANKS TODO )
+
+src_configure() {
+ use static && append-ldflags -static
+
+ # Disable automagic dependency over libsigsegv; see bug #312351.
+ export ac_cv_libsigsegv=no
+
+ # required for >=glibc-2.26, bug #653914
+ use elibc_glibc && export gl_cv_func_getopt_gnu=yes
+
+ local myeconfargs=(
+ --with-packager="Gentoo"
+ --with-packager-version="${PVR}"
+ --with-packager-bug-reports="https://bugs.gentoo.org/"
+ $(use_enable nls)
+ )
+ econf "${myeconfargs[@]}"
+}
+
+src_test() {
+ # explicitly allow parallel testing
+ emake check
+}
diff --git a/sys-apps/diffutils/metadata.xml b/sys-apps/diffutils/metadata.xml
index 96a2d58..56c1244 100644
--- a/sys-apps/diffutils/metadata.xml
+++ b/sys-apps/diffutils/metadata.xml
@@ -1,5 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>base-system</herd>
+<maintainer type="project">
+ <email>base-system@gentoo.org</email>
+ <name>Gentoo Base System</name>
+</maintainer>
</pkgmetadata>
