subject:"\[gentoo\-commits\] repo\/gentoo\:master commit in\: sys\-apps\/diffutils\/"

[gentoo-commits] repo/gentoo:master commit in: sys-apps/diffutils/, sys-apps/diffutils/files/

2023-12-27 Thread Sam James

commit: fc55f9cb332fe733d08aebd431e8bbb88763b48b
Author: Sam James  gentoo  org>
AuthorDate: Thu Dec 28 04:02:07 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Thu Dec 28 04:02:07 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fc55f9cb

sys-apps/diffutils: drop 3.8, 3.9, 3.9-r1

Signed-off-by: Sam James  gentoo.org>

 sys-apps/diffutils/Manifest|  4 --
 sys-apps/diffutils/diffutils-3.8.ebuild| 57 
 sys-apps/diffutils/diffutils-3.9-r1.ebuild | 63 --
 sys-apps/diffutils/diffutils-3.9.ebuild| 57 
 .../diffutils-3.9-diff-D-option-regression.patch   | 27 --
 .../files/diffutils-3.9-make-4.4-test-color.patch  | 30 ---
 sys-apps/diffutils/files/loong-fix-build.patch | 30 ---
 sys-apps/diffutils/files/ppc-musl.patch| 19 ---
 8 files changed, 287 deletions(-)

diff --git a/sys-apps/diffutils/Manifest b/sys-apps/diffutils/Manifest
index ac73eb757f6a..cae233d525be 100644
--- a/sys-apps/diffutils/Manifest
+++ b/sys-apps/diffutils/Manifest
@@ -1,6 +1,2 @@
 DIST diffutils-3.10.tar.xz 1624240 BLAKE2B 
24a90162b3d876e6378243f19a85a1f1bb4cdfe98d130dee684740a902f2987509d5830dd32df4e26678b468b96960f6f9785ffb922e828cb8b4acce0d8587f6
 SHA512 
219d2c815a120690c6589846271e43aee5c96c61a7ee4abbef97dfcdb3d6416652ed494b417de0ab6688c4322540d48be63b5e617beb6d20530b5d55d723ccbb
 DIST diffutils-3.10.tar.xz.sig 833 BLAKE2B 
06650838d6a3327fda6b2ab09693170ec18b730b1f5981c8f3e2180b2c8a553307ae93199e4be0532a534a8a3f95e4a7b4fccbbd9e5f8d1b1cedd0816b0aac90
 SHA512 
91aa1fcfca224454e292540ea7813f4a0eb348f06a4374017326d524949775359fc833de597cc201c97f357eb6c675800828a6e3332572376f3554f1f2e1aca1
-DIST diffutils-3.8.tar.xz 1585120 BLAKE2B 
573abbfba55c62ba30d2084ca68860e9681cfe92648407f7fb04e1aaed2e4719e2fb5a29cf25bd125d762f4dfd52f85ee91f2ec19b099365bada7fe27a0394af
 SHA512 
279441270987e70d5ecfaf84b6285a4866929c43ec877e50f154a788858d548a8a316f2fc26ad62f7348c8d289cb29a09d06dfadce1806e3d8b4ea88c8b1aa7c
-DIST diffutils-3.8.tar.xz.sig 833 BLAKE2B 
439d331d9839d8b434b7192c52628bc9e8e1c11cada28170f85c9390abc3e5e9ea86aee696a4f9260552133053194680ff54b960ed539fabec85fdff54dee3a2
 SHA512 
0464ac89209411993800666b45ff90243d22fbda53bf1d71c6870d565b39cc8d9c54c141b9d297a181ce74ad8fb5313953f416bced179ff7728a52a3e9a4f5a5
-DIST diffutils-3.9.tar.xz 1587916 BLAKE2B 
d43ed9f1643ac46b69083755974fc9611ad00c3b98b08332c681223d17d762567562233b51342a16f7dad8f28dfc5536999143594e33a64e6624001a71787c8f
 SHA512 
d43280cb1cb2615a8867d971467eb9a3fa037fe9a411028068036f733dab42b10d42767093cea4de71e62b2659a3ec73bd7d1a8f251befd49587e32802682d0f
-DIST diffutils-3.9.tar.xz.sig 833 BLAKE2B 
3bc4aa2b5c73da03dbcfab6edc10f8d5062d5564a6fa2d3a1e0e791d29e189285ff69a3c618685e4471a4c5e37c4f921fe6a12594d7a4b7d7085f9af3ed885d5
 SHA512 
38e90b7b5708f65f9f3bd04c69d718facbe5109ce3ba55a9bd6aa6becbc69d4b3a8a4e1579ce7ad84514d55ec45fb520b9b22c0cc4a286e6e28714a5c633e9ed

diff --git a/sys-apps/diffutils/diffutils-3.8.ebuild 
b/sys-apps/diffutils/diffutils-3.8.ebuild
deleted file mode 100644
index a6c1cf0cee51..
--- a/sys-apps/diffutils/diffutils-3.8.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/diffutils.asc
-inherit flag-o-matic verify-sig
-
-DESCRIPTION="Tools to make diffs and compare files"
-HOMEPAGE="https://www.gnu.org/software/diffutils/;
-SRC_URI="mirror://gnu/diffutils/${P}.tar.xz
-   https://alpha.gnu.org/gnu/diffutils/${P}.tar.xz
-   verify-sig? (
-   mirror://gnu/diffutils/${P}.tar.xz.sig
-   https://alpha.gnu.org/gnu/diffutils/${P}.tar.xz.sig
-   )"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 
~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos 
~x64-macos ~x64-solaris"
-IUSE="nls static"
-
-BDEPEND="nls? ( sys-devel/gettext )
-   verify-sig? ( sec-keys/openpgp-keys-diffutils )"
-
-PATCHES=(
-   "${FILESDIR}/ppc-musl.patch"
-   "${FILESDIR}/loong-fix-build.patch"
-)
-
-src_prepare() {
-   default
-
-   # touch generated files after patching m4, to avoid activating 
maintainer
-   # mode
-   # remove when loong-fix-build.patch is no longer necessary
-   touch ./aclocal.m4 lib/config.hin ./configure || die
-   find . -name Makefile.in -exec touch {} + || die
-}
-
-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}"
-

[gentoo-commits] repo/gentoo:master commit in: sys-apps/diffutils/

2023-07-15 Thread Arthur Zamarin

commit: a1b1f046f4c6d584d496cebb49822fd07078012a
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Sat Jul 15 11:50:34 2023 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Sat Jul 15 11:50:34 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a1b1f046

sys-apps/diffutils: Stabilize 3.10 ppc, #908099

Signed-off-by: Arthur Zamarin  gentoo.org>

 sys-apps/diffutils/diffutils-3.10.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-apps/diffutils/diffutils-3.10.ebuild 
b/sys-apps/diffutils/diffutils-3.10.ebuild
index 2cb9c5205911..6916747216af 100644
--- a/sys-apps/diffutils/diffutils-3.10.ebuild
+++ b/sys-apps/diffutils/diffutils-3.10.ebuild
@@ -20,7 +20,7 @@ if [[ ${PV} == *_p* ]] ; then
 else
SRC_URI="mirror://gnu/${PN}/${P}.tar.xz"
SRC_URI+=" verify-sig? ( mirror://gnu/${PN}/${P}.tar.xz.sig )"
-   KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ~ppc 
ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos 
~x64-macos ~x64-solaris"
+   KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc 
ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos 
~x64-macos ~x64-solaris"
 fi
 
 LICENSE="GPL-2"

[gentoo-commits] repo/gentoo:master commit in: sys-apps/diffutils/

2023-06-09 Thread Arthur Zamarin

commit: 1a95d8994bc6485f3e519905bc8ec6601f745bb2
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Fri Jun  9 12:51:00 2023 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Fri Jun  9 12:51:00 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1a95d899

sys-apps/diffutils: Stabilize 3.10 hppa, #908099

Signed-off-by: Arthur Zamarin  gentoo.org>

 sys-apps/diffutils/diffutils-3.10.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-apps/diffutils/diffutils-3.10.ebuild 
b/sys-apps/diffutils/diffutils-3.10.ebuild
index 2548afa10e87..2cb9c5205911 100644
--- a/sys-apps/diffutils/diffutils-3.10.ebuild
+++ b/sys-apps/diffutils/diffutils-3.10.ebuild
@@ -20,7 +20,7 @@ if [[ ${PV} == *_p* ]] ; then
 else
SRC_URI="mirror://gnu/${PN}/${P}.tar.xz"
SRC_URI+=" verify-sig? ( mirror://gnu/${PN}/${P}.tar.xz.sig )"
-   KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc 
ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos 
~x64-macos ~x64-solaris"
+   KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ~ppc 
ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos 
~x64-macos ~x64-solaris"
 fi
 
 LICENSE="GPL-2"

[gentoo-commits] repo/gentoo:master commit in: sys-apps/diffutils/

2023-06-09 Thread Arthur Zamarin

commit: 09e89cdaea06958d6262b1580a69b6801068e928
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Fri Jun  9 12:21:17 2023 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Fri Jun  9 12:21:17 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=09e89cda

sys-apps/diffutils: Stabilize 3.10 arm, #908099

Signed-off-by: Arthur Zamarin  gentoo.org>

 sys-apps/diffutils/diffutils-3.10.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-apps/diffutils/diffutils-3.10.ebuild 
b/sys-apps/diffutils/diffutils-3.10.ebuild
index f19adf46e9ab..2548afa10e87 100644
--- a/sys-apps/diffutils/diffutils-3.10.ebuild
+++ b/sys-apps/diffutils/diffutils-3.10.ebuild
@@ -20,7 +20,7 @@ if [[ ${PV} == *_p* ]] ; then
 else
SRC_URI="mirror://gnu/${PN}/${P}.tar.xz"
SRC_URI+=" verify-sig? ( mirror://gnu/${PN}/${P}.tar.xz.sig )"
-   KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc 
ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos 
~x64-macos ~x64-solaris"
+   KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc 
ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos 
~x64-macos ~x64-solaris"
 fi
 
 LICENSE="GPL-2"

[gentoo-commits] repo/gentoo:master commit in: sys-apps/diffutils/

2023-06-09 Thread Arthur Zamarin

commit: 6248fa4c8c3b6aa377053188b45423db5384eabb
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Fri Jun  9 12:21:14 2023 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Fri Jun  9 12:21:14 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6248fa4c

sys-apps/diffutils: Stabilize 3.10 sparc, #908099

Signed-off-by: Arthur Zamarin  gentoo.org>

 sys-apps/diffutils/diffutils-3.10.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-apps/diffutils/diffutils-3.10.ebuild 
b/sys-apps/diffutils/diffutils-3.10.ebuild
index 36bf30e459e3..a16e6ab66bae 100644
--- a/sys-apps/diffutils/diffutils-3.10.ebuild
+++ b/sys-apps/diffutils/diffutils-3.10.ebuild
@@ -20,7 +20,7 @@ if [[ ${PV} == *_p* ]] ; then
 else
SRC_URI="mirror://gnu/${PN}/${P}.tar.xz"
SRC_URI+=" verify-sig? ( mirror://gnu/${PN}/${P}.tar.xz.sig )"
-   KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc 
ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos 
~x64-macos ~x64-solaris"
+   KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc 
ppc64 ~riscv ~s390 sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos 
~x64-macos ~x64-solaris"
 fi
 
 LICENSE="GPL-2"

[gentoo-commits] repo/gentoo:master commit in: sys-apps/diffutils/

2023-06-09 Thread Arthur Zamarin

commit: c9bab3f1b509bc40e2aeee1569c3bbb89d1e3ebc
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Fri Jun  9 12:21:16 2023 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Fri Jun  9 12:21:16 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c9bab3f1

sys-apps/diffutils: Stabilize 3.10 x86, #908099

Signed-off-by: Arthur Zamarin  gentoo.org>

 sys-apps/diffutils/diffutils-3.10.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-apps/diffutils/diffutils-3.10.ebuild 
b/sys-apps/diffutils/diffutils-3.10.ebuild
index eab40ce19527..5f1f317bfb90 100644
--- a/sys-apps/diffutils/diffutils-3.10.ebuild
+++ b/sys-apps/diffutils/diffutils-3.10.ebuild
@@ -20,7 +20,7 @@ if [[ ${PV} == *_p* ]] ; then
 else
SRC_URI="mirror://gnu/${PN}/${P}.tar.xz"
SRC_URI+=" verify-sig? ( mirror://gnu/${PN}/${P}.tar.xz.sig )"
-   KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc 
ppc64 ~riscv ~s390 sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos 
~x64-macos ~x64-solaris"
+   KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc 
ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos 
~x64-macos ~x64-solaris"
 fi
 
 LICENSE="GPL-2"

[gentoo-commits] repo/gentoo:master commit in: sys-apps/diffutils/

2023-06-09 Thread Arthur Zamarin

commit: 6eb672e4eabad8459b1dc45a59772deaad394515
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Fri Jun  9 12:21:15 2023 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Fri Jun  9 12:21:15 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6eb672e4

sys-apps/diffutils: Stabilize 3.10 amd64, #908099

Signed-off-by: Arthur Zamarin  gentoo.org>

 sys-apps/diffutils/diffutils-3.10.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-apps/diffutils/diffutils-3.10.ebuild 
b/sys-apps/diffutils/diffutils-3.10.ebuild
index a16e6ab66bae..eab40ce19527 100644
--- a/sys-apps/diffutils/diffutils-3.10.ebuild
+++ b/sys-apps/diffutils/diffutils-3.10.ebuild
@@ -20,7 +20,7 @@ if [[ ${PV} == *_p* ]] ; then
 else
SRC_URI="mirror://gnu/${PN}/${P}.tar.xz"
SRC_URI+=" verify-sig? ( mirror://gnu/${PN}/${P}.tar.xz.sig )"
-   KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc 
ppc64 ~riscv ~s390 sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos 
~x64-macos ~x64-solaris"
+   KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc 
ppc64 ~riscv ~s390 sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos 
~x64-macos ~x64-solaris"
 fi
 
 LICENSE="GPL-2"

[gentoo-commits] repo/gentoo:master commit in: sys-apps/diffutils/

2023-06-09 Thread Arthur Zamarin

commit: 2b0f412a4ee0c2b68d5d33bc37e212015ba00281
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Fri Jun  9 12:21:16 2023 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Fri Jun  9 12:21:16 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2b0f412a

sys-apps/diffutils: Stabilize 3.10 arm64, #908099

Signed-off-by: Arthur Zamarin  gentoo.org>

 sys-apps/diffutils/diffutils-3.10.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-apps/diffutils/diffutils-3.10.ebuild 
b/sys-apps/diffutils/diffutils-3.10.ebuild
index 5f1f317bfb90..f19adf46e9ab 100644
--- a/sys-apps/diffutils/diffutils-3.10.ebuild
+++ b/sys-apps/diffutils/diffutils-3.10.ebuild
@@ -20,7 +20,7 @@ if [[ ${PV} == *_p* ]] ; then
 else
SRC_URI="mirror://gnu/${PN}/${P}.tar.xz"
SRC_URI+=" verify-sig? ( mirror://gnu/${PN}/${P}.tar.xz.sig )"
-   KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc 
ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos 
~x64-macos ~x64-solaris"
+   KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc 
ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos 
~x64-macos ~x64-solaris"
 fi
 
 LICENSE="GPL-2"

[gentoo-commits] repo/gentoo:master commit in: sys-apps/diffutils/

2023-06-09 Thread Sam James

commit: 5c3347caa39767cce63223d947bb2115f66ca568
Author: Sam James  gentoo  org>
AuthorDate: Fri Jun  9 11:02:23 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Fri Jun  9 11:02:23 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5c3347ca

sys-apps/diffutils: Stabilize 3.10 ppc64, #908099

Signed-off-by: Sam James  gentoo.org>

 sys-apps/diffutils/diffutils-3.10.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-apps/diffutils/diffutils-3.10.ebuild 
b/sys-apps/diffutils/diffutils-3.10.ebuild
index 7dc0044edd42..36bf30e459e3 100644
--- a/sys-apps/diffutils/diffutils-3.10.ebuild
+++ b/sys-apps/diffutils/diffutils-3.10.ebuild
@@ -20,7 +20,7 @@ if [[ ${PV} == *_p* ]] ; then
 else
SRC_URI="mirror://gnu/${PN}/${P}.tar.xz"
SRC_URI+=" verify-sig? ( mirror://gnu/${PN}/${P}.tar.xz.sig )"
-   KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc 
~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos 
~x64-macos ~x64-solaris"
+   KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc 
ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos 
~x64-macos ~x64-solaris"
 fi
 
 LICENSE="GPL-2"

[gentoo-commits] repo/gentoo:master commit in: sys-apps/diffutils/

2023-05-21 Thread Sam James

commit: 3a8e599b9f5eed2409fec161241b7b7e310ac866
Author: Sam James  gentoo  org>
AuthorDate: Sun May 21 09:26:03 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Sun May 21 09:26:03 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3a8e599b

sys-apps/diffutils: add 3.10, drop 3.9_p20230514

Signed-off-by: Sam James  gentoo.org>

 sys-apps/diffutils/Manifest   | 4 ++--
 .../{diffutils-3.9_p20230514.ebuild => diffutils-3.10.ebuild} | 0
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/sys-apps/diffutils/Manifest b/sys-apps/diffutils/Manifest
index c4ea2ee61b4a..ac73eb757f6a 100644
--- a/sys-apps/diffutils/Manifest
+++ b/sys-apps/diffutils/Manifest
@@ -1,6 +1,6 @@
+DIST diffutils-3.10.tar.xz 1624240 BLAKE2B 
24a90162b3d876e6378243f19a85a1f1bb4cdfe98d130dee684740a902f2987509d5830dd32df4e26678b468b96960f6f9785ffb922e828cb8b4acce0d8587f6
 SHA512 
219d2c815a120690c6589846271e43aee5c96c61a7ee4abbef97dfcdb3d6416652ed494b417de0ab6688c4322540d48be63b5e617beb6d20530b5d55d723ccbb
+DIST diffutils-3.10.tar.xz.sig 833 BLAKE2B 
06650838d6a3327fda6b2ab09693170ec18b730b1f5981c8f3e2180b2c8a553307ae93199e4be0532a534a8a3f95e4a7b4fccbbd9e5f8d1b1cedd0816b0aac90
 SHA512 
91aa1fcfca224454e292540ea7813f4a0eb348f06a4374017326d524949775359fc833de597cc201c97f357eb6c675800828a6e3332572376f3554f1f2e1aca1
 DIST diffutils-3.8.tar.xz 1585120 BLAKE2B 
573abbfba55c62ba30d2084ca68860e9681cfe92648407f7fb04e1aaed2e4719e2fb5a29cf25bd125d762f4dfd52f85ee91f2ec19b099365bada7fe27a0394af
 SHA512 
279441270987e70d5ecfaf84b6285a4866929c43ec877e50f154a788858d548a8a316f2fc26ad62f7348c8d289cb29a09d06dfadce1806e3d8b4ea88c8b1aa7c
 DIST diffutils-3.8.tar.xz.sig 833 BLAKE2B 
439d331d9839d8b434b7192c52628bc9e8e1c11cada28170f85c9390abc3e5e9ea86aee696a4f9260552133053194680ff54b960ed539fabec85fdff54dee3a2
 SHA512 
0464ac89209411993800666b45ff90243d22fbda53bf1d71c6870d565b39cc8d9c54c141b9d297a181ce74ad8fb5313953f416bced179ff7728a52a3e9a4f5a5
-DIST diffutils-3.9.17-cc36.tar.xz 1621272 BLAKE2B 
cf4056c425031bfb5f40c1730f69c2b22601fcbdb60fe2286943d9b0aabfa7e253239b60be0aa04cae7f5b398da408e9fafd1e69e373bd6e4ceb5b398e2af21e
 SHA512 
686273402568c754fdd41f76b8bc6e0d99273ec379ef6b444ea82c0955350d5fcae949250b4b94af5b2f4ad0f5959a0ebcc2d72190f163281fc08e3baa954bc5
-DIST diffutils-3.9.17-cc36.tar.xz.sig 833 BLAKE2B 
e9fcdecafe5cf1d69932338456ed2d20ab70b4dec781d1811896ed014b6acc15ef1d6c3849e56b0db31c53fd84dbbe6d96af508bb4f035362cc42d1b32e3
 SHA512 
79f9d62722d15b8efaf7edb04a40d636bcb10104450d7f396d0dc3a2a5048cdf5f685ea00132c62677564ca15f9a06845f8d060162b9097c79f3ba8da4e129dd
 DIST diffutils-3.9.tar.xz 1587916 BLAKE2B 
d43ed9f1643ac46b69083755974fc9611ad00c3b98b08332c681223d17d762567562233b51342a16f7dad8f28dfc5536999143594e33a64e6624001a71787c8f
 SHA512 
d43280cb1cb2615a8867d971467eb9a3fa037fe9a411028068036f733dab42b10d42767093cea4de71e62b2659a3ec73bd7d1a8f251befd49587e32802682d0f
 DIST diffutils-3.9.tar.xz.sig 833 BLAKE2B 
3bc4aa2b5c73da03dbcfab6edc10f8d5062d5564a6fa2d3a1e0e791d29e189285ff69a3c618685e4471a4c5e37c4f921fe6a12594d7a4b7d7085f9af3ed885d5
 SHA512 
38e90b7b5708f65f9f3bd04c69d718facbe5109ce3ba55a9bd6aa6becbc69d4b3a8a4e1579ce7ad84514d55ec45fb520b9b22c0cc4a286e6e28714a5c633e9ed

diff --git a/sys-apps/diffutils/diffutils-3.9_p20230514.ebuild 
b/sys-apps/diffutils/diffutils-3.10.ebuild
similarity index 100%
rename from sys-apps/diffutils/diffutils-3.9_p20230514.ebuild
rename to sys-apps/diffutils/diffutils-3.10.ebuild

[gentoo-commits] repo/gentoo:master commit in: sys-apps/diffutils/

2023-05-14 Thread Sam James

commit: 90277877e04790b8a30eebfc213aab5c59ce141a
Author: Sam James  gentoo  org>
AuthorDate: Sun May 14 07:32:10 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Sun May 14 07:32:10 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=90277877

sys-apps/diffutils: add 3.9_p20230514 (unkeyworded)

Signed-off-by: Sam James  gentoo.org>

 sys-apps/diffutils/Manifest   |  2 +
 sys-apps/diffutils/diffutils-3.9_p20230514.ebuild | 58 +++
 2 files changed, 60 insertions(+)

diff --git a/sys-apps/diffutils/Manifest b/sys-apps/diffutils/Manifest
index eda49eac05c5..c4ea2ee61b4a 100644
--- a/sys-apps/diffutils/Manifest
+++ b/sys-apps/diffutils/Manifest
@@ -1,4 +1,6 @@
 DIST diffutils-3.8.tar.xz 1585120 BLAKE2B 
573abbfba55c62ba30d2084ca68860e9681cfe92648407f7fb04e1aaed2e4719e2fb5a29cf25bd125d762f4dfd52f85ee91f2ec19b099365bada7fe27a0394af
 SHA512 
279441270987e70d5ecfaf84b6285a4866929c43ec877e50f154a788858d548a8a316f2fc26ad62f7348c8d289cb29a09d06dfadce1806e3d8b4ea88c8b1aa7c
 DIST diffutils-3.8.tar.xz.sig 833 BLAKE2B 
439d331d9839d8b434b7192c52628bc9e8e1c11cada28170f85c9390abc3e5e9ea86aee696a4f9260552133053194680ff54b960ed539fabec85fdff54dee3a2
 SHA512 
0464ac89209411993800666b45ff90243d22fbda53bf1d71c6870d565b39cc8d9c54c141b9d297a181ce74ad8fb5313953f416bced179ff7728a52a3e9a4f5a5
+DIST diffutils-3.9.17-cc36.tar.xz 1621272 BLAKE2B 
cf4056c425031bfb5f40c1730f69c2b22601fcbdb60fe2286943d9b0aabfa7e253239b60be0aa04cae7f5b398da408e9fafd1e69e373bd6e4ceb5b398e2af21e
 SHA512 
686273402568c754fdd41f76b8bc6e0d99273ec379ef6b444ea82c0955350d5fcae949250b4b94af5b2f4ad0f5959a0ebcc2d72190f163281fc08e3baa954bc5
+DIST diffutils-3.9.17-cc36.tar.xz.sig 833 BLAKE2B 
e9fcdecafe5cf1d69932338456ed2d20ab70b4dec781d1811896ed014b6acc15ef1d6c3849e56b0db31c53fd84dbbe6d96af508bb4f035362cc42d1b32e3
 SHA512 
79f9d62722d15b8efaf7edb04a40d636bcb10104450d7f396d0dc3a2a5048cdf5f685ea00132c62677564ca15f9a06845f8d060162b9097c79f3ba8da4e129dd
 DIST diffutils-3.9.tar.xz 1587916 BLAKE2B 
d43ed9f1643ac46b69083755974fc9611ad00c3b98b08332c681223d17d762567562233b51342a16f7dad8f28dfc5536999143594e33a64e6624001a71787c8f
 SHA512 
d43280cb1cb2615a8867d971467eb9a3fa037fe9a411028068036f733dab42b10d42767093cea4de71e62b2659a3ec73bd7d1a8f251befd49587e32802682d0f
 DIST diffutils-3.9.tar.xz.sig 833 BLAKE2B 
3bc4aa2b5c73da03dbcfab6edc10f8d5062d5564a6fa2d3a1e0e791d29e189285ff69a3c618685e4471a4c5e37c4f921fe6a12594d7a4b7d7085f9af3ed885d5
 SHA512 
38e90b7b5708f65f9f3bd04c69d718facbe5109ce3ba55a9bd6aa6becbc69d4b3a8a4e1579ce7ad84514d55ec45fb520b9b22c0cc4a286e6e28714a5c633e9ed

diff --git a/sys-apps/diffutils/diffutils-3.9_p20230514.ebuild 
b/sys-apps/diffutils/diffutils-3.9_p20230514.ebuild
new file mode 100644
index ..afcdb4c15edf
--- /dev/null
+++ b/sys-apps/diffutils/diffutils-3.9_p20230514.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/diffutils.asc
+inherit verify-sig
+
+DESCRIPTION="Tools to make diffs and compare files"
+HOMEPAGE="https://www.gnu.org/software/diffutils/;
+
+if [[ ${PV} == *_p* ]] ; then
+   # Subscribe to the 'platform-testers' ML to find these.
+   # Useful to test on our especially more niche arches and report issues 
upstream.
+   MY_COMMIT="17-cc36"
+   MY_P=${PN}-$(ver_cut 1-2).${MY_COMMIT}
+   SRC_URI="https://meyering.net/diff/${MY_P}.tar.xz;
+   SRC_URI+=" verify-sig? ( https://meyering.net/diff/${MY_P}.tar.xz.sig )"
+   S="${WORKDIR}"/${MY_P}
+else
+   SRC_URI="mirror://gnu/${PN}/${P}.tar.xz"
+   SRC_URI+=" verify-sig? ( mirror://gnu/${PN}/${P}.tar.xz.sig )"
+   KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc 
~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux 
~arm64-macos ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris 
~x86-solaris"
+fi
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="nls"
+
+BDEPEND="
+   nls? ( sys-devel/gettext )
+   verify-sig? ( sec-keys/openpgp-keys-diffutils )
+"
+
+src_prepare() {
+   default
+
+   # Needed because of ${P}-diff-D-option-regression.patch
+   #touch man/diff.1 || die
+}
+
+src_configure() {
+   # 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=(
+   # Interferes with F_S (sets F_S=2)
+   --disable-gcc-warnings
+   --with-packager="Gentoo"
+   --with-packager-version="${PVR}"
+   --with-packager-bug-reports="https://bugs.gentoo.org/;
+   $(use_enable nls)
+   )
+   econf "${myeconfargs[@]}"
+}

[gentoo-commits] repo/gentoo:master commit in: sys-apps/diffutils/

2023-04-29 Thread Arthur Zamarin

commit: b63f40fd86aebaab0e66fc28a21b897e2b0d7abf
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Sat Apr 29 08:45:10 2023 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Sat Apr 29 08:45:10 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b63f40fd

sys-apps/diffutils: Stabilize 3.9-r1 sparc, #899322

Signed-off-by: Arthur Zamarin  gentoo.org>

 sys-apps/diffutils/diffutils-3.9-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-apps/diffutils/diffutils-3.9-r1.ebuild 
b/sys-apps/diffutils/diffutils-3.9-r1.ebuild
index 44589c84053d..c7ed3f50d233 100644
--- a/sys-apps/diffutils/diffutils-3.9-r1.ebuild
+++ b/sys-apps/diffutils/diffutils-3.9-r1.ebuild
@@ -20,7 +20,7 @@ if [[ ${PV} == *_p* ]] ; then
 else
SRC_URI="mirror://gnu/${PN}/${P}.tar.xz"
SRC_URI+=" verify-sig? ( mirror://gnu/${PN}/${P}.tar.xz.sig )"
-   KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc 
ppc64 ~riscv ~s390 ~sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~arm64-macos 
~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+   KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc 
ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~arm64-macos 
~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 fi
 
 LICENSE="GPL-2"

[gentoo-commits] repo/gentoo:master commit in: sys-apps/diffutils/

2023-04-10 Thread Mike Gilbert

commit: f833da19cac0473a6799fdfe68a827a29e1aae95
Author: Mike Gilbert  gentoo  org>
AuthorDate: Mon Apr 10 19:19:01 2023 +
Commit: Mike Gilbert  gentoo  org>
CommitDate: Mon Apr 10 19:22:25 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f833da19

sys-apps/diffutils: drop 'static' USE flag

It's unclear why this was added in the first place.

Closes: https://bugs.gentoo.org/903972
Signed-off-by: Mike Gilbert  gentoo.org>

 sys-apps/diffutils/diffutils-3.9-r1.ebuild | 6 ++
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/sys-apps/diffutils/diffutils-3.9-r1.ebuild 
b/sys-apps/diffutils/diffutils-3.9-r1.ebuild
index 87c7e4f06f53..44589c84053d 100644
--- a/sys-apps/diffutils/diffutils-3.9-r1.ebuild
+++ b/sys-apps/diffutils/diffutils-3.9-r1.ebuild
@@ -4,7 +4,7 @@
 EAPI=8
 
 VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/diffutils.asc
-inherit flag-o-matic verify-sig
+inherit verify-sig
 
 DESCRIPTION="Tools to make diffs and compare files"
 HOMEPAGE="https://www.gnu.org/software/diffutils/;
@@ -25,7 +25,7 @@ fi
 
 LICENSE="GPL-2"
 SLOT="0"
-IUSE="nls static"
+IUSE="nls"
 
 BDEPEND="
nls? ( sys-devel/gettext )
@@ -45,8 +45,6 @@ src_prepare() {
 }
 
 src_configure() {
-   use static && append-ldflags -static
-
# Disable automagic dependency over libsigsegv; see bug #312351.
export ac_cv_libsigsegv=no

[gentoo-commits] repo/gentoo:master commit in: sys-apps/diffutils/

2023-03-16 Thread Sam James

commit: 9083aec7b4e8c779439f8340423660e16841a2d6
Author: Sam James  gentoo  org>
AuthorDate: Thu Mar 16 22:02:09 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Thu Mar 16 22:02:09 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9083aec7

sys-apps/diffutils: Stabilize 3.9-r1 ppc64, #899322

Signed-off-by: Sam James  gentoo.org>

 sys-apps/diffutils/diffutils-3.9-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-apps/diffutils/diffutils-3.9-r1.ebuild 
b/sys-apps/diffutils/diffutils-3.9-r1.ebuild
index 7f61222e802c..87c7e4f06f53 100644
--- a/sys-apps/diffutils/diffutils-3.9-r1.ebuild
+++ b/sys-apps/diffutils/diffutils-3.9-r1.ebuild
@@ -20,7 +20,7 @@ if [[ ${PV} == *_p* ]] ; then
 else
SRC_URI="mirror://gnu/${PN}/${P}.tar.xz"
SRC_URI+=" verify-sig? ( mirror://gnu/${PN}/${P}.tar.xz.sig )"
-   KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc 
~ppc64 ~riscv ~s390 ~sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~arm64-macos 
~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+   KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc 
ppc64 ~riscv ~s390 ~sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~arm64-macos 
~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 fi
 
 LICENSE="GPL-2"

[gentoo-commits] repo/gentoo:master commit in: sys-apps/diffutils/

2023-03-04 Thread Arthur Zamarin

commit: 58786d62f2d41b03e9f97e0456ab97860cf4b317
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Sat Mar  4 13:49:59 2023 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Sat Mar  4 13:49:59 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=58786d62

sys-apps/diffutils: Stabilize 3.9-r1 ppc, #899322

Signed-off-by: Arthur Zamarin  gentoo.org>

 sys-apps/diffutils/diffutils-3.9-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-apps/diffutils/diffutils-3.9-r1.ebuild 
b/sys-apps/diffutils/diffutils-3.9-r1.ebuild
index ec7b79978b3c..7f61222e802c 100644
--- a/sys-apps/diffutils/diffutils-3.9-r1.ebuild
+++ b/sys-apps/diffutils/diffutils-3.9-r1.ebuild
@@ -20,7 +20,7 @@ if [[ ${PV} == *_p* ]] ; then
 else
SRC_URI="mirror://gnu/${PN}/${P}.tar.xz"
SRC_URI+=" verify-sig? ( mirror://gnu/${PN}/${P}.tar.xz.sig )"
-   KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ~ppc 
~ppc64 ~riscv ~s390 ~sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~arm64-macos 
~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+   KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc 
~ppc64 ~riscv ~s390 ~sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~arm64-macos 
~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 fi
 
 LICENSE="GPL-2"

[gentoo-commits] repo/gentoo:master commit in: sys-apps/diffutils/

2023-03-04 Thread Arthur Zamarin

commit: e458d567ae9c6a0b91cd3fcbb94f3d4d253fecfa
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Sat Mar  4 08:24:22 2023 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Sat Mar  4 08:24:22 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e458d567

sys-apps/diffutils: Stabilize 3.9-r1 amd64, #899322

Signed-off-by: Arthur Zamarin  gentoo.org>

 sys-apps/diffutils/diffutils-3.9-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-apps/diffutils/diffutils-3.9-r1.ebuild 
b/sys-apps/diffutils/diffutils-3.9-r1.ebuild
index 74e945ab2e78..ec7b79978b3c 100644
--- a/sys-apps/diffutils/diffutils-3.9-r1.ebuild
+++ b/sys-apps/diffutils/diffutils-3.9-r1.ebuild
@@ -20,7 +20,7 @@ if [[ ${PV} == *_p* ]] ; then
 else
SRC_URI="mirror://gnu/${PN}/${P}.tar.xz"
SRC_URI+=" verify-sig? ( mirror://gnu/${PN}/${P}.tar.xz.sig )"
-   KEYWORDS="~alpha ~amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ~ppc 
~ppc64 ~riscv ~s390 ~sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~arm64-macos 
~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+   KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ~ppc 
~ppc64 ~riscv ~s390 ~sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~arm64-macos 
~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 fi
 
 LICENSE="GPL-2"

[gentoo-commits] repo/gentoo:master commit in: sys-apps/diffutils/

2023-03-03 Thread Arthur Zamarin

commit: 6ccd992f9a013e68bf27aeb7f48de7b26215a422
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Sat Mar  4 07:53:53 2023 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Sat Mar  4 07:53:53 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6ccd992f

sys-apps/diffutils: Stabilize 3.9-r1 arm64, #899322

Signed-off-by: Arthur Zamarin  gentoo.org>

 sys-apps/diffutils/diffutils-3.9-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-apps/diffutils/diffutils-3.9-r1.ebuild 
b/sys-apps/diffutils/diffutils-3.9-r1.ebuild
index e7e9573ab872..74e945ab2e78 100644
--- a/sys-apps/diffutils/diffutils-3.9-r1.ebuild
+++ b/sys-apps/diffutils/diffutils-3.9-r1.ebuild
@@ -20,7 +20,7 @@ if [[ ${PV} == *_p* ]] ; then
 else
SRC_URI="mirror://gnu/${PN}/${P}.tar.xz"
SRC_URI+=" verify-sig? ( mirror://gnu/${PN}/${P}.tar.xz.sig )"
-   KEYWORDS="~alpha ~amd64 arm ~arm64 hppa ~ia64 ~loong ~m68k ~mips ~ppc 
~ppc64 ~riscv ~s390 ~sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~arm64-macos 
~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+   KEYWORDS="~alpha ~amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ~ppc 
~ppc64 ~riscv ~s390 ~sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~arm64-macos 
~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 fi
 
 LICENSE="GPL-2"

[gentoo-commits] repo/gentoo:master commit in: sys-apps/diffutils/

2023-03-03 Thread Arthur Zamarin

commit: 4b59ea3912c910bed1a5785b696e07472f26b2ae
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Sat Mar  4 07:53:51 2023 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Sat Mar  4 07:53:51 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4b59ea39

sys-apps/diffutils: Stabilize 3.9-r1 hppa, #899322

Signed-off-by: Arthur Zamarin  gentoo.org>

 sys-apps/diffutils/diffutils-3.9-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-apps/diffutils/diffutils-3.9-r1.ebuild 
b/sys-apps/diffutils/diffutils-3.9-r1.ebuild
index aedc68468420..90a9a07ed5c7 100644
--- a/sys-apps/diffutils/diffutils-3.9-r1.ebuild
+++ b/sys-apps/diffutils/diffutils-3.9-r1.ebuild
@@ -20,7 +20,7 @@ if [[ ${PV} == *_p* ]] ; then
 else
SRC_URI="mirror://gnu/${PN}/${P}.tar.xz"
SRC_URI+=" verify-sig? ( mirror://gnu/${PN}/${P}.tar.xz.sig )"
-   KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc 
~ppc64 ~riscv ~s390 ~sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~arm64-macos 
~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+   KEYWORDS="~alpha ~amd64 ~arm ~arm64 hppa ~ia64 ~loong ~m68k ~mips ~ppc 
~ppc64 ~riscv ~s390 ~sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~arm64-macos 
~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 fi
 
 LICENSE="GPL-2"

[gentoo-commits] repo/gentoo:master commit in: sys-apps/diffutils/

2023-03-03 Thread Arthur Zamarin

commit: 868c8512217d05228d42166e91a5c3dfe91ad333
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Sat Mar  4 07:53:52 2023 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Sat Mar  4 07:53:52 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=868c8512

sys-apps/diffutils: Stabilize 3.9-r1 arm, #899322

Signed-off-by: Arthur Zamarin  gentoo.org>

 sys-apps/diffutils/diffutils-3.9-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-apps/diffutils/diffutils-3.9-r1.ebuild 
b/sys-apps/diffutils/diffutils-3.9-r1.ebuild
index 90a9a07ed5c7..e7e9573ab872 100644
--- a/sys-apps/diffutils/diffutils-3.9-r1.ebuild
+++ b/sys-apps/diffutils/diffutils-3.9-r1.ebuild
@@ -20,7 +20,7 @@ if [[ ${PV} == *_p* ]] ; then
 else
SRC_URI="mirror://gnu/${PN}/${P}.tar.xz"
SRC_URI+=" verify-sig? ( mirror://gnu/${PN}/${P}.tar.xz.sig )"
-   KEYWORDS="~alpha ~amd64 ~arm ~arm64 hppa ~ia64 ~loong ~m68k ~mips ~ppc 
~ppc64 ~riscv ~s390 ~sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~arm64-macos 
~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+   KEYWORDS="~alpha ~amd64 arm ~arm64 hppa ~ia64 ~loong ~m68k ~mips ~ppc 
~ppc64 ~riscv ~s390 ~sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~arm64-macos 
~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 fi
 
 LICENSE="GPL-2"

[gentoo-commits] repo/gentoo:master commit in: sys-apps/diffutils/

2023-03-03 Thread Arthur Zamarin

commit: 9b981c4c9c9549a451563dadfa33712d7bf0e5f3
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Sat Mar  4 06:25:35 2023 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Sat Mar  4 06:25:35 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9b981c4c

sys-apps/diffutils: Stabilize 3.9-r1 x86, #899322

Signed-off-by: Arthur Zamarin  gentoo.org>

 sys-apps/diffutils/diffutils-3.9-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-apps/diffutils/diffutils-3.9-r1.ebuild 
b/sys-apps/diffutils/diffutils-3.9-r1.ebuild
index f5712e1bb8c7..aedc68468420 100644
--- a/sys-apps/diffutils/diffutils-3.9-r1.ebuild
+++ b/sys-apps/diffutils/diffutils-3.9-r1.ebuild
@@ -20,7 +20,7 @@ if [[ ${PV} == *_p* ]] ; then
 else
SRC_URI="mirror://gnu/${PN}/${P}.tar.xz"
SRC_URI+=" verify-sig? ( mirror://gnu/${PN}/${P}.tar.xz.sig )"
-   KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc 
~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux 
~arm64-macos ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris 
~x86-solaris"
+   KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc 
~ppc64 ~riscv ~s390 ~sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~arm64-macos 
~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 fi
 
 LICENSE="GPL-2"

[gentoo-commits] repo/gentoo:master commit in: sys-apps/diffutils/

2023-03-03 Thread Arthur Zamarin

commit: d5f1807c9bc92cd6894ecae041e386f63eaf79c5
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Sat Mar  4 06:14:30 2023 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Sat Mar  4 06:14:30 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d5f1807c

sys-apps/diffutils: Stabilize 3.9 arm, #899322

Signed-off-by: Arthur Zamarin  gentoo.org>

 sys-apps/diffutils/diffutils-3.9.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-apps/diffutils/diffutils-3.9.ebuild 
b/sys-apps/diffutils/diffutils-3.9.ebuild
index bfd2d563879f..ec1ec5612f57 100644
--- a/sys-apps/diffutils/diffutils-3.9.ebuild
+++ b/sys-apps/diffutils/diffutils-3.9.ebuild
@@ -20,7 +20,7 @@ if [[ ${PV} == *_p* ]] ; then
 else
SRC_URI="mirror://gnu/${PN}/${P}.tar.xz"
SRC_URI+=" verify-sig? ( mirror://gnu/${PN}/${P}.tar.xz.sig )"
-   KEYWORDS="~alpha ~amd64 ~arm arm64 hppa ~ia64 ~loong ~m68k ~mips ~ppc 
~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux 
~arm64-macos ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris 
~x86-solaris"
+   KEYWORDS="~alpha ~amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ~ppc 
~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux 
~arm64-macos ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris 
~x86-solaris"
 fi
 
 LICENSE="GPL-2"

[gentoo-commits] repo/gentoo:master commit in: sys-apps/diffutils/

2023-03-03 Thread Arthur Zamarin

commit: bd7467140e2d8b48cfca578570b3fd06a64958f4
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Sat Mar  4 06:03:13 2023 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Sat Mar  4 06:03:13 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bd746714

sys-apps/diffutils: Stabilize 3.9 arm64, #899322

Signed-off-by: Arthur Zamarin  gentoo.org>

 sys-apps/diffutils/diffutils-3.9.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-apps/diffutils/diffutils-3.9.ebuild 
b/sys-apps/diffutils/diffutils-3.9.ebuild
index 51521500b92c..bfd2d563879f 100644
--- a/sys-apps/diffutils/diffutils-3.9.ebuild
+++ b/sys-apps/diffutils/diffutils-3.9.ebuild
@@ -20,7 +20,7 @@ if [[ ${PV} == *_p* ]] ; then
 else
SRC_URI="mirror://gnu/${PN}/${P}.tar.xz"
SRC_URI+=" verify-sig? ( mirror://gnu/${PN}/${P}.tar.xz.sig )"
-   KEYWORDS="~alpha ~amd64 ~arm ~arm64 hppa ~ia64 ~loong ~m68k ~mips ~ppc 
~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux 
~arm64-macos ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris 
~x86-solaris"
+   KEYWORDS="~alpha ~amd64 ~arm arm64 hppa ~ia64 ~loong ~m68k ~mips ~ppc 
~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux 
~arm64-macos ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris 
~x86-solaris"
 fi
 
 LICENSE="GPL-2"

[gentoo-commits] repo/gentoo:master commit in: sys-apps/diffutils/

2023-03-03 Thread Arthur Zamarin

commit: a55f8515336014472be9a8895384abcffe835ff2
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Sat Mar  4 05:59:59 2023 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Sat Mar  4 05:59:59 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a55f8515

sys-apps/diffutils: Stabilize 3.9 hppa, #899322

Signed-off-by: Arthur Zamarin  gentoo.org>

 sys-apps/diffutils/diffutils-3.9.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-apps/diffutils/diffutils-3.9.ebuild 
b/sys-apps/diffutils/diffutils-3.9.ebuild
index 5b4d12ed0b7f..51521500b92c 100644
--- a/sys-apps/diffutils/diffutils-3.9.ebuild
+++ b/sys-apps/diffutils/diffutils-3.9.ebuild
@@ -20,7 +20,7 @@ if [[ ${PV} == *_p* ]] ; then
 else
SRC_URI="mirror://gnu/${PN}/${P}.tar.xz"
SRC_URI+=" verify-sig? ( mirror://gnu/${PN}/${P}.tar.xz.sig )"
-   KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc 
~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux 
~arm64-macos ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris 
~x86-solaris"
+   KEYWORDS="~alpha ~amd64 ~arm ~arm64 hppa ~ia64 ~loong ~m68k ~mips ~ppc 
~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux 
~arm64-macos ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris 
~x86-solaris"
 fi
 
 LICENSE="GPL-2"

[gentoo-commits] repo/gentoo:master commit in: sys-apps/diffutils/

2023-02-24 Thread Sam James

commit: 73ef85b71ec2ad54dca85bca7730fb2acafba1e3
Author: Sam James  gentoo  org>
AuthorDate: Fri Feb 24 18:34:31 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Fri Feb 24 18:36:00 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=73ef85b7

sys-apps/diffutils: keyword for ~arm64-macos

Signed-off-by: Sam James  gentoo.org>

 sys-apps/diffutils/diffutils-3.8.ebuild| 4 ++--
 sys-apps/diffutils/diffutils-3.9-r1.ebuild | 2 +-
 sys-apps/diffutils/diffutils-3.9.ebuild| 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/sys-apps/diffutils/diffutils-3.8.ebuild 
b/sys-apps/diffutils/diffutils-3.8.ebuild
index 1591a6a87921..5d894b8165fa 100644
--- a/sys-apps/diffutils/diffutils-3.8.ebuild
+++ b/sys-apps/diffutils/diffutils-3.8.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -17,7 +17,7 @@ SRC_URI="mirror://gnu/diffutils/${P}.tar.xz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 
~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos 
~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 
~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~arm64-macos 
~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="nls static"
 
 BDEPEND="nls? ( sys-devel/gettext )

diff --git a/sys-apps/diffutils/diffutils-3.9-r1.ebuild 
b/sys-apps/diffutils/diffutils-3.9-r1.ebuild
index 7aebfc8cbfa7..f5712e1bb8c7 100644
--- a/sys-apps/diffutils/diffutils-3.9-r1.ebuild
+++ b/sys-apps/diffutils/diffutils-3.9-r1.ebuild
@@ -20,7 +20,7 @@ if [[ ${PV} == *_p* ]] ; then
 else
SRC_URI="mirror://gnu/${PN}/${P}.tar.xz"
SRC_URI+=" verify-sig? ( mirror://gnu/${PN}/${P}.tar.xz.sig )"
-   KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc 
~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos 
~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+   KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc 
~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux 
~arm64-macos ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris 
~x86-solaris"
 fi
 
 LICENSE="GPL-2"

diff --git a/sys-apps/diffutils/diffutils-3.9.ebuild 
b/sys-apps/diffutils/diffutils-3.9.ebuild
index acce50bad293..5b4d12ed0b7f 100644
--- a/sys-apps/diffutils/diffutils-3.9.ebuild
+++ b/sys-apps/diffutils/diffutils-3.9.ebuild
@@ -20,7 +20,7 @@ if [[ ${PV} == *_p* ]] ; then
 else
SRC_URI="mirror://gnu/${PN}/${P}.tar.xz"
SRC_URI+=" verify-sig? ( mirror://gnu/${PN}/${P}.tar.xz.sig )"
-   KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc 
~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos 
~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+   KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc 
~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux 
~arm64-macos ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris 
~x86-solaris"
 fi
 
 LICENSE="GPL-2"

[gentoo-commits] repo/gentoo:master commit in: sys-apps/diffutils/

2023-02-19 Thread Sam James

commit: 0a39c6c2555aebbe9e8574f3595e5af89701e12b
Author: Sam James  gentoo  org>
AuthorDate: Mon Feb 20 06:28:03 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Mon Feb 20 06:28:14 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0a39c6c2

sys-apps/diffutils: avoid help2man

It tries to regenerate the man page because of the diff patch.

Closes: https://bugs.gentoo.org/895500
Signed-off-by: Sam James  gentoo.org>

 sys-apps/diffutils/diffutils-3.9-r1.ebuild | 7 +++
 1 file changed, 7 insertions(+)

diff --git a/sys-apps/diffutils/diffutils-3.9-r1.ebuild 
b/sys-apps/diffutils/diffutils-3.9-r1.ebuild
index b33f99dcdb75..7aebfc8cbfa7 100644
--- a/sys-apps/diffutils/diffutils-3.9-r1.ebuild
+++ b/sys-apps/diffutils/diffutils-3.9-r1.ebuild
@@ -37,6 +37,13 @@ PATCHES=(
"${FILESDIR}"/${P}-diff-D-option-regression.patch
 )
 
+src_prepare() {
+   default
+
+   # Needed because of ${P}-diff-D-option-regression.patch
+   touch man/diff.1 || die
+}
+
 src_configure() {
use static && append-ldflags -static

[gentoo-commits] repo/gentoo:master commit in: sys-apps/diffutils/files/, sys-apps/diffutils/

2023-02-11 Thread Sam James

commit: 675f20bce1d8ec148072e6447dc4a365d2c9936a
Author: Sam James  gentoo  org>
AuthorDate: Sun Feb 12 06:18:03 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Sun Feb 12 06:18:03 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=675f20bc

sys-apps/diffutils: backport regression fix for -D

This also fixes the groff tests.

Signed-off-by: Sam James  gentoo.org>

 sys-apps/diffutils/diffutils-3.9-r1.ebuild | 58 ++
 .../diffutils-3.9-diff-D-option-regression.patch   | 27 ++
 2 files changed, 85 insertions(+)

diff --git a/sys-apps/diffutils/diffutils-3.9-r1.ebuild 
b/sys-apps/diffutils/diffutils-3.9-r1.ebuild
new file mode 100644
index ..b33f99dcdb75
--- /dev/null
+++ b/sys-apps/diffutils/diffutils-3.9-r1.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/diffutils.asc
+inherit flag-o-matic verify-sig
+
+DESCRIPTION="Tools to make diffs and compare files"
+HOMEPAGE="https://www.gnu.org/software/diffutils/;
+
+if [[ ${PV} == *_p* ]] ; then
+   # Subscribe to the 'platform-testers' ML to find these.
+   # Useful to test on our especially more niche arches and report issues 
upstream.
+   MY_COMMIT="43-2d50"
+   MY_P=${PN}-$(ver_cut 1-2).${MY_COMMIT}
+   SRC_URI="https://meyering.net/diff/${MY_P}.tar.xz;
+   SRC_URI+=" verify-sig? ( https://meyering.net/diff/${MY_P}.tar.xz.sig )"
+   S="${WORKDIR}"/${MY_P}
+else
+   SRC_URI="mirror://gnu/${PN}/${P}.tar.xz"
+   SRC_URI+=" verify-sig? ( mirror://gnu/${PN}/${P}.tar.xz.sig )"
+   KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc 
~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos 
~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+fi
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="nls static"
+
+BDEPEND="
+   nls? ( sys-devel/gettext )
+   verify-sig? ( sec-keys/openpgp-keys-diffutils )
+"
+
+PATCHES=(
+   "${FILESDIR}"/${P}-make-4.4-test-color.patch
+   "${FILESDIR}"/${P}-diff-D-option-regression.patch
+)
+
+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=(
+   # Interferes with F_S (sets F_S=2)
+   --disable-gcc-warnings
+   --with-packager="Gentoo"
+   --with-packager-version="${PVR}"
+   --with-packager-bug-reports="https://bugs.gentoo.org/;
+   $(use_enable nls)
+   )
+   econf "${myeconfargs[@]}"
+}

diff --git 
a/sys-apps/diffutils/files/diffutils-3.9-diff-D-option-regression.patch 
b/sys-apps/diffutils/files/diffutils-3.9-diff-D-option-regression.patch
new file mode 100644
index ..a12e1bc673a0
--- /dev/null
+++ b/sys-apps/diffutils/files/diffutils-3.9-diff-D-option-regression.patch
@@ -0,0 +1,27 @@
+https://debbugs.gnu.org/cgi/bugreport.cgi?bug=61193
+https://git.savannah.gnu.org/cgit/groff.git/commit/?id=10274fb69e517b2c4b10fcd0ba3347e5bd0eefd7
+https://git.savannah.gnu.org/cgit/diffutils.git/commit/?id=ba08fbbb0ca5da455bf695236c57bc50e7faed50
+
+From ba08fbbb0ca5da455bf695236c57bc50e7faed50 Mon Sep 17 00:00:00 2001
+From: Paul Eggert 
+Date: Fri, 10 Feb 2023 15:33:40 -0800
+Subject: diff: fix bug where -D does not work
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Problem reported by Robert Webb (bug#61193).
+* src/diff.c (main): Omit stray ‘sizeof’.
+* tests/ifdef: New test.
+* tests/Makefile.am (TESTS): Add it.
+--- a/src/diff.c
 b/src/diff.c
+@@ -416,7 +416,7 @@ main (int argc, char **argv)
+   char *base = b;
+   int changes = 0;
+ 
+-  for (i = 0; i < sizeof sizeof C_ifdef_group_formats; i++)
++  for (i = 0; i < sizeof C_ifdef_group_formats; i++)
+ {
+   char ch = C_ifdef_group_formats[i];
+   switch (ch)

[gentoo-commits] repo/gentoo:master commit in: sys-apps/diffutils/files/, sys-apps/diffutils/

2023-01-28 Thread Sam James

commit: cc023c47f0a30174d43fb940109fce5781edda95
Author: Sam James  gentoo  org>
AuthorDate: Sun Jan 29 07:32:40 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Sun Jan 29 07:33:13 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cc023c47

sys-apps/diffutils: fix tests w/ make 4.4

Closes: https://bugs.gentoo.org/879891
Signed-off-by: Sam James  gentoo.org>

 sys-apps/diffutils/diffutils-3.9.ebuild| 10 ++--
 .../files/diffutils-3.9-make-4.4-test-color.patch  | 30 ++
 2 files changed, 38 insertions(+), 2 deletions(-)

diff --git a/sys-apps/diffutils/diffutils-3.9.ebuild 
b/sys-apps/diffutils/diffutils-3.9.ebuild
index ebbd0424d186..acce50bad293 100644
--- a/sys-apps/diffutils/diffutils-3.9.ebuild
+++ b/sys-apps/diffutils/diffutils-3.9.ebuild
@@ -27,8 +27,14 @@ LICENSE="GPL-2"
 SLOT="0"
 IUSE="nls static"
 
-BDEPEND="nls? ( sys-devel/gettext )
-   verify-sig? ( sec-keys/openpgp-keys-diffutils )"
+BDEPEND="
+   nls? ( sys-devel/gettext )
+   verify-sig? ( sec-keys/openpgp-keys-diffutils )
+"
+
+PATCHES=(
+   "${FILESDIR}"/${P}-make-4.4-test-color.patch
+)
 
 src_configure() {
use static && append-ldflags -static

diff --git a/sys-apps/diffutils/files/diffutils-3.9-make-4.4-test-color.patch 
b/sys-apps/diffutils/files/diffutils-3.9-make-4.4-test-color.patch
new file mode 100644
index ..01f6aeedc956
--- /dev/null
+++ b/sys-apps/diffutils/files/diffutils-3.9-make-4.4-test-color.patch
@@ -0,0 +1,30 @@
+https://bugs.gentoo.org/879891
+https://debbugs.gnu.org/cgi/bugreport.cgi?bug=59905
+https://git.savannah.gnu.org/cgit/diffutils.git/commit/?id=89f3daeaaf021a77177daec8666bcd80ec476833
+
+From 89f3daeaaf021a77177daec8666bcd80ec476833 Mon Sep 17 00:00:00 2001
+From: Jim Meyering 
+Date: Mon, 16 Jan 2023 15:48:10 -0800
+Subject: tests: accommodate newer GNU make's SIGPIPE-ignore
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+* tests/colors: Allow an exit code of not just 141 (SIGPIPE),
+but also "error": 2.
+Reported by Tomasz Kłoczko in http://bugs.gnu.org/59905.
+--- a/tests/colors
 b/tests/colors
+@@ -128,6 +128,9 @@ printf '%100s-a' > a
+ printf '%100s-b' > b
+ head -c 10 < fifo > /dev/null &
+ diff --color=always ---presume-output-tty a b > fifo
+-test $? = 141 || fail=1
++
++# Depending on version of GNU make (4.3.92-4.4 set SIGPIPE to "ignore"),
++# either of these is acceptable.
++case $? in 2|141) ;; *) fail=1 ;; esac
+ 
+ Exit $fail
+-- 
+cgit v1.1

[gentoo-commits] repo/gentoo:master commit in: sys-apps/diffutils/

2023-01-16 Thread Sam James

commit: 046af55007df3cfe2f317e4076bddc0ead4c
Author: Sam James  gentoo  org>
AuthorDate: Mon Jan 16 15:10:35 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Mon Jan 16 15:10:35 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=046af5dd

sys-apps/diffutils: add 3.9, drop 3.8_p20221230

Signed-off-by: Sam James  gentoo.org>

 sys-apps/diffutils/Manifest   | 4 ++--
 .../{diffutils-3.8_p20221230.ebuild => diffutils-3.9.ebuild}  | 4 +++-
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/sys-apps/diffutils/Manifest b/sys-apps/diffutils/Manifest
index 126881702d53..eda49eac05c5 100644
--- a/sys-apps/diffutils/Manifest
+++ b/sys-apps/diffutils/Manifest
@@ -1,4 +1,4 @@
-DIST diffutils-3.8.43-2d50.tar.xz 1585696 BLAKE2B 
c4b8534ec167721cde4fc33778b69740fa55dc566cf1a1b8b489ad047e67f748290fff617bd44f024fd2995cd83c5d1019bf074ded863b8fb4397208152bf400
 SHA512 
f348d3588eed7e471851edcf488d32936af1261b0991e8699e056e8696c235444a8a70a8a26f5be52c4406bd3d210106e58e6446a8ce71dc025172a13ab69096
-DIST diffutils-3.8.43-2d50.tar.xz.sig 833 BLAKE2B 
a300a957da2377ff9c5372789bd57a77f3adcc4f8cea272f4c06395e78b176880ca1e933f3253c4d680d9624798ac0fd21c7cfe31fe56f8ee042f4f527c21cc7
 SHA512 
0a56ece94f06b6e0f57213f7c311cd5f9eebde65e5664a75b7d7d69772ac06024f1486a1a133f040ecf2af39caa3bca35855fc66bb776a273f663e12cfb00432
 DIST diffutils-3.8.tar.xz 1585120 BLAKE2B 
573abbfba55c62ba30d2084ca68860e9681cfe92648407f7fb04e1aaed2e4719e2fb5a29cf25bd125d762f4dfd52f85ee91f2ec19b099365bada7fe27a0394af
 SHA512 
279441270987e70d5ecfaf84b6285a4866929c43ec877e50f154a788858d548a8a316f2fc26ad62f7348c8d289cb29a09d06dfadce1806e3d8b4ea88c8b1aa7c
 DIST diffutils-3.8.tar.xz.sig 833 BLAKE2B 
439d331d9839d8b434b7192c52628bc9e8e1c11cada28170f85c9390abc3e5e9ea86aee696a4f9260552133053194680ff54b960ed539fabec85fdff54dee3a2
 SHA512 
0464ac89209411993800666b45ff90243d22fbda53bf1d71c6870d565b39cc8d9c54c141b9d297a181ce74ad8fb5313953f416bced179ff7728a52a3e9a4f5a5
+DIST diffutils-3.9.tar.xz 1587916 BLAKE2B 
d43ed9f1643ac46b69083755974fc9611ad00c3b98b08332c681223d17d762567562233b51342a16f7dad8f28dfc5536999143594e33a64e6624001a71787c8f
 SHA512 
d43280cb1cb2615a8867d971467eb9a3fa037fe9a411028068036f733dab42b10d42767093cea4de71e62b2659a3ec73bd7d1a8f251befd49587e32802682d0f
+DIST diffutils-3.9.tar.xz.sig 833 BLAKE2B 
3bc4aa2b5c73da03dbcfab6edc10f8d5062d5564a6fa2d3a1e0e791d29e189285ff69a3c618685e4471a4c5e37c4f921fe6a12594d7a4b7d7085f9af3ed885d5
 SHA512 
38e90b7b5708f65f9f3bd04c69d718facbe5109ce3ba55a9bd6aa6becbc69d4b3a8a4e1579ce7ad84514d55ec45fb520b9b22c0cc4a286e6e28714a5c633e9ed

diff --git a/sys-apps/diffutils/diffutils-3.8_p20221230.ebuild 
b/sys-apps/diffutils/diffutils-3.9.ebuild
similarity index 94%
rename from sys-apps/diffutils/diffutils-3.8_p20221230.ebuild
rename to sys-apps/diffutils/diffutils-3.9.ebuild
index f895d84c9b6e..ebbd0424d186 100644
--- a/sys-apps/diffutils/diffutils-3.8_p20221230.ebuild
+++ b/sys-apps/diffutils/diffutils-3.9.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -40,6 +40,8 @@ src_configure() {
use elibc_glibc && export gl_cv_func_getopt_gnu=yes
 
local myeconfargs=(
+   # Interferes with F_S (sets F_S=2)
+   --disable-gcc-warnings
--with-packager="Gentoo"
--with-packager-version="${PVR}"
--with-packager-bug-reports="https://bugs.gentoo.org/;

[gentoo-commits] repo/gentoo:master commit in: sys-apps/diffutils/

2022-12-30 Thread Sam James

commit: f99b695c6e03826324d8946b47c9da221d591a66
Author: Sam James  gentoo  org>
AuthorDate: Fri Dec 30 23:38:15 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Fri Dec 30 23:40:35 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f99b695c

sys-apps/diffutils: add 3.8_p20221230 (RC, unkeyworded)

Signed-off-by: Sam James  gentoo.org>

 sys-apps/diffutils/Manifest   |  2 +
 sys-apps/diffutils/diffutils-3.8_p20221230.ebuild | 49 +++
 2 files changed, 51 insertions(+)

diff --git a/sys-apps/diffutils/Manifest b/sys-apps/diffutils/Manifest
index acf8f16cb654..126881702d53 100644
--- a/sys-apps/diffutils/Manifest
+++ b/sys-apps/diffutils/Manifest
@@ -1,2 +1,4 @@
+DIST diffutils-3.8.43-2d50.tar.xz 1585696 BLAKE2B 
c4b8534ec167721cde4fc33778b69740fa55dc566cf1a1b8b489ad047e67f748290fff617bd44f024fd2995cd83c5d1019bf074ded863b8fb4397208152bf400
 SHA512 
f348d3588eed7e471851edcf488d32936af1261b0991e8699e056e8696c235444a8a70a8a26f5be52c4406bd3d210106e58e6446a8ce71dc025172a13ab69096
+DIST diffutils-3.8.43-2d50.tar.xz.sig 833 BLAKE2B 
a300a957da2377ff9c5372789bd57a77f3adcc4f8cea272f4c06395e78b176880ca1e933f3253c4d680d9624798ac0fd21c7cfe31fe56f8ee042f4f527c21cc7
 SHA512 
0a56ece94f06b6e0f57213f7c311cd5f9eebde65e5664a75b7d7d69772ac06024f1486a1a133f040ecf2af39caa3bca35855fc66bb776a273f663e12cfb00432
 DIST diffutils-3.8.tar.xz 1585120 BLAKE2B 
573abbfba55c62ba30d2084ca68860e9681cfe92648407f7fb04e1aaed2e4719e2fb5a29cf25bd125d762f4dfd52f85ee91f2ec19b099365bada7fe27a0394af
 SHA512 
279441270987e70d5ecfaf84b6285a4866929c43ec877e50f154a788858d548a8a316f2fc26ad62f7348c8d289cb29a09d06dfadce1806e3d8b4ea88c8b1aa7c
 DIST diffutils-3.8.tar.xz.sig 833 BLAKE2B 
439d331d9839d8b434b7192c52628bc9e8e1c11cada28170f85c9390abc3e5e9ea86aee696a4f9260552133053194680ff54b960ed539fabec85fdff54dee3a2
 SHA512 
0464ac89209411993800666b45ff90243d22fbda53bf1d71c6870d565b39cc8d9c54c141b9d297a181ce74ad8fb5313953f416bced179ff7728a52a3e9a4f5a5

diff --git a/sys-apps/diffutils/diffutils-3.8_p20221230.ebuild 
b/sys-apps/diffutils/diffutils-3.8_p20221230.ebuild
new file mode 100644
index ..f895d84c9b6e
--- /dev/null
+++ b/sys-apps/diffutils/diffutils-3.8_p20221230.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/diffutils.asc
+inherit flag-o-matic verify-sig
+
+DESCRIPTION="Tools to make diffs and compare files"
+HOMEPAGE="https://www.gnu.org/software/diffutils/;
+
+if [[ ${PV} == *_p* ]] ; then
+   # Subscribe to the 'platform-testers' ML to find these.
+   # Useful to test on our especially more niche arches and report issues 
upstream.
+   MY_COMMIT="43-2d50"
+   MY_P=${PN}-$(ver_cut 1-2).${MY_COMMIT}
+   SRC_URI="https://meyering.net/diff/${MY_P}.tar.xz;
+   SRC_URI+=" verify-sig? ( https://meyering.net/diff/${MY_P}.tar.xz.sig )"
+   S="${WORKDIR}"/${MY_P}
+else
+   SRC_URI="mirror://gnu/${PN}/${P}.tar.xz"
+   SRC_URI+=" verify-sig? ( mirror://gnu/${PN}/${P}.tar.xz.sig )"
+   KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc 
~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos 
~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+fi
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="nls static"
+
+BDEPEND="nls? ( sys-devel/gettext )
+   verify-sig? ( sec-keys/openpgp-keys-diffutils )"
+
+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[@]}"
+}

[gentoo-commits] repo/gentoo:master commit in: sys-apps/diffutils/

2022-10-19 Thread Sam James

commit: de0cb1948b5e2bf8bdd73e4e9142696da31f432e
Author: kochera  google  com>
AuthorDate: Wed Oct 19 19:37:18 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Thu Oct 20 03:50:41 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=de0cb194

sys-apps/diffutils: Add cpe_uri for diffutils package.

Signed-off-by: Michael Kochera  google.com>
Signed-off-by: Sam James  gentoo.org>

 sys-apps/diffutils/metadata.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/sys-apps/diffutils/metadata.xml b/sys-apps/diffutils/metadata.xml
index b532b7342d14..8963b14ac40d 100644
--- a/sys-apps/diffutils/metadata.xml
+++ b/sys-apps/diffutils/metadata.xml
@@ -6,6 +6,7 @@
 Gentoo Base System
   
   
+cpe:/a:gnu:diffutils
 diffutils

[gentoo-commits] repo/gentoo:master commit in: sys-apps/diffutils/

2022-10-17 Thread Sam James

commit: b735b055d4a7974ed211d87b8bd8769d55a7e9ba
Author: Sam James  gentoo  org>
AuthorDate: Tue Oct 18 01:47:07 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Tue Oct 18 02:17:23 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b735b055

sys-apps/diffutils: add savannah upstream metadata

Signed-off-by: Sam James  gentoo.org>

 sys-apps/diffutils/metadata.xml | 11 +++
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/sys-apps/diffutils/metadata.xml b/sys-apps/diffutils/metadata.xml
index 73dda144f9ac..b532b7342d14 100644
--- a/sys-apps/diffutils/metadata.xml
+++ b/sys-apps/diffutils/metadata.xml
@@ -1,8 +1,11 @@
 
 https://www.gentoo.org/dtd/metadata.dtd;>
 
-
-   base-sys...@gentoo.org
-   Gentoo Base System
-
+  
+base-sys...@gentoo.org
+Gentoo Base System
+  
+  
+diffutils
+

[gentoo-commits] repo/gentoo:master commit in: sys-apps/diffutils/, sys-apps/diffutils/files/

2022-04-25 Thread Sam James

commit: 3a193fa7dd4c98a4004a87aac61ce46414efa237
Author: WANG Xuerui  gentoo  org>
AuthorDate: Tue Apr 26 02:57:35 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Tue Apr 26 04:03:06 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3a193fa7

sys-apps/diffutils: avoid invoking autoconf

Normally we'd just eautoreconf, but this is base-system and we cannot
depend on autoconf, so we have to patch the generated files ourselves.
This can go away once the loong fix patch is no longer necessary.

Fixes: 1bff2846eaa ("sys-apps/diffutils: fix build on loong")
Signed-off-by: WANG Xuerui  gentoo.org>
Signed-off-by: Sam James  gentoo.org>

 sys-apps/diffutils/diffutils-3.8.ebuild| 10 ++
 sys-apps/diffutils/files/loong-fix-build.patch | 18 +++---
 2 files changed, 21 insertions(+), 7 deletions(-)

diff --git a/sys-apps/diffutils/diffutils-3.8.ebuild 
b/sys-apps/diffutils/diffutils-3.8.ebuild
index 53a9433ee899..fe16ee36331a 100644
--- a/sys-apps/diffutils/diffutils-3.8.ebuild
+++ b/sys-apps/diffutils/diffutils-3.8.ebuild
@@ -28,6 +28,16 @@ PATCHES=(
"${FILESDIR}/loong-fix-build.patch"
 )
 
+src_prepare() {
+   default
+
+   # touch generated files after patching m4, to avoid activating 
maintainer
+   # mode
+   # remove when loong-fix-build.patch is no longer necessary
+   touch ./aclocal.m4 lib/config.hin ./configure || die
+   find . -name Makefile.in -exec touch {} + || die
+}
+
 src_configure() {
use static && append-ldflags -static
 

diff --git a/sys-apps/diffutils/files/loong-fix-build.patch 
b/sys-apps/diffutils/files/loong-fix-build.patch
index cd06fa8df5e4..2b16b47b7ee7 100644
--- a/sys-apps/diffutils/files/loong-fix-build.patch
+++ b/sys-apps/diffutils/files/loong-fix-build.patch
@@ -1,16 +1,10 @@
-From 34add045fd2ec3f1031dee961c4d9cc4285486a7 Mon Sep 17 00:00:00 2001
+[xen0n: this is 
https://github.com/sunhaiyong1978/CLFS-for-LoongArch/blob/1.0/patches/stack-direction-add-loongarch.patch
 with change to generated file added as well.]
 From: Sun Haiyong 
 Date: Tue, 31 Aug 2021 11:11:52 +0800
 Subject: [PATCH] stack-direction: Add support for loongarch CPU
 
 * m4/stack-direction.m4 (SV_STACK_DIRECTION): When the CPU is loongarch,
 set "sv_cv_stack_direction" to "-1" .

- m4/stack-direction.m4 | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/m4/stack-direction.m4 b/m4/stack-direction.m4
-index 93287254b..e6c3284ce 100644
 --- a/m4/stack-direction.m4
 +++ b/m4/stack-direction.m4
 @@ -32,6 +32,7 @@ AC_DEFUN([SV_STACK_DIRECTION],
@@ -21,6 +15,16 @@ index 93287254b..e6c3284ce 100644
m32r | \
m68* | \
m88k | \
+--- a/configure
 b/configure
+@@ -34088,6 +34088,7 @@ else $as_nop
+   i?86 | x86_64 | \
+   i860 | \
+   ia64 | \
++  loongarch* | \
+   m32r | \
+   m68* | \
+   m88k | \
 -- 
 2.17.2

[gentoo-commits] repo/gentoo:master commit in: sys-apps/diffutils/files/, sys-apps/diffutils/

2022-04-25 Thread WANG Xuerui

commit: 1bff2846eaa16d29f9c023508d855931a727eebd
Author: WANG Xuerui  gentoo  org>
AuthorDate: Mon Apr 25 04:10:31 2022 +
Commit: WANG Xuerui  gentoo  org>
CommitDate: Mon Apr 25 10:10:46 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1bff2846

sys-apps/diffutils: fix build on loong

Upstream has updated gnulib but hasn't tagged a new release yet, so only
add the bare minimum to fix build on loong.

This has been inside loongson-overlay for a while, and is tested on real
loong hardware.

See: https://github.com/gentoo/gentoo/pull/25189
Acked-by: Andreas K. Hüttel  gentoo.org>
Signed-off-by: WANG Xuerui  gentoo.org>

 sys-apps/diffutils/diffutils-3.8.ebuild|  5 -
 sys-apps/diffutils/files/loong-fix-build.patch | 26 ++
 2 files changed, 30 insertions(+), 1 deletion(-)

diff --git a/sys-apps/diffutils/diffutils-3.8.ebuild 
b/sys-apps/diffutils/diffutils-3.8.ebuild
index df2a985392fb..53a9433ee899 100644
--- a/sys-apps/diffutils/diffutils-3.8.ebuild
+++ b/sys-apps/diffutils/diffutils-3.8.ebuild
@@ -23,7 +23,10 @@ IUSE="nls static"
 BDEPEND="nls? ( sys-devel/gettext )
verify-sig? ( sec-keys/openpgp-keys-diffutils )"
 
-PATCHES=( "${FILESDIR}/ppc-musl.patch" )
+PATCHES=(
+   "${FILESDIR}/ppc-musl.patch"
+   "${FILESDIR}/loong-fix-build.patch"
+)
 
 src_configure() {
use static && append-ldflags -static

diff --git a/sys-apps/diffutils/files/loong-fix-build.patch 
b/sys-apps/diffutils/files/loong-fix-build.patch
new file mode 100644
index ..cd06fa8df5e4
--- /dev/null
+++ b/sys-apps/diffutils/files/loong-fix-build.patch
@@ -0,0 +1,26 @@
+From 34add045fd2ec3f1031dee961c4d9cc4285486a7 Mon Sep 17 00:00:00 2001
+From: Sun Haiyong 
+Date: Tue, 31 Aug 2021 11:11:52 +0800
+Subject: [PATCH] stack-direction: Add support for loongarch CPU
+
+* m4/stack-direction.m4 (SV_STACK_DIRECTION): When the CPU is loongarch,
+set "sv_cv_stack_direction" to "-1" .
+---
+ m4/stack-direction.m4 | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/m4/stack-direction.m4 b/m4/stack-direction.m4
+index 93287254b..e6c3284ce 100644
+--- a/m4/stack-direction.m4
 b/m4/stack-direction.m4
+@@ -32,6 +32,7 @@ AC_DEFUN([SV_STACK_DIRECTION],
+   i?86 | x86_64 | \
+   i860 | \
+   ia64 | \
++  loongarch* | \
+   m32r | \
+   m68* | \
+   m88k | \
+-- 
+2.17.2
+

[gentoo-commits] repo/gentoo:master commit in: sys-apps/diffutils/

2022-04-06 Thread Sam James

commit: dfb053477f7cd2065b75970e6ea5dfb79f435a4e
Author: Sam James  gentoo  org>
AuthorDate: Thu Apr  7 03:41:37 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Thu Apr  7 03:57:12 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dfb05347

sys-apps/diffutils: add verify-sig

Signed-off-by: Sam James  gentoo.org>

 sys-apps/diffutils/Manifest |  1 +
 sys-apps/diffutils/diffutils-3.8.ebuild | 14 ++
 2 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/sys-apps/diffutils/Manifest b/sys-apps/diffutils/Manifest
index 60bb7af2dc63..acf8f16cb654 100644
--- a/sys-apps/diffutils/Manifest
+++ b/sys-apps/diffutils/Manifest
@@ -1 +1,2 @@
 DIST diffutils-3.8.tar.xz 1585120 BLAKE2B 
573abbfba55c62ba30d2084ca68860e9681cfe92648407f7fb04e1aaed2e4719e2fb5a29cf25bd125d762f4dfd52f85ee91f2ec19b099365bada7fe27a0394af
 SHA512 
279441270987e70d5ecfaf84b6285a4866929c43ec877e50f154a788858d548a8a316f2fc26ad62f7348c8d289cb29a09d06dfadce1806e3d8b4ea88c8b1aa7c
+DIST diffutils-3.8.tar.xz.sig 833 BLAKE2B 
439d331d9839d8b434b7192c52628bc9e8e1c11cada28170f85c9390abc3e5e9ea86aee696a4f9260552133053194680ff54b960ed539fabec85fdff54dee3a2
 SHA512 
0464ac89209411993800666b45ff90243d22fbda53bf1d71c6870d565b39cc8d9c54c141b9d297a181ce74ad8fb5313953f416bced179ff7728a52a3e9a4f5a5

diff --git a/sys-apps/diffutils/diffutils-3.8.ebuild 
b/sys-apps/diffutils/diffutils-3.8.ebuild
index 4cae3d13edc4..df2a985392fb 100644
--- a/sys-apps/diffutils/diffutils-3.8.ebuild
+++ b/sys-apps/diffutils/diffutils-3.8.ebuild
@@ -1,21 +1,27 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-inherit flag-o-matic
+VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/diffutils.asc
+inherit flag-o-matic verify-sig
 
 DESCRIPTION="Tools to make diffs and compare files"
 HOMEPAGE="https://www.gnu.org/software/diffutils/;
 SRC_URI="mirror://gnu/diffutils/${P}.tar.xz
-   https://alpha.gnu.org/gnu/diffutils/${P}.tar.xz;
+   https://alpha.gnu.org/gnu/diffutils/${P}.tar.xz
+   verify-sig? (
+   mirror://gnu/diffutils/${P}.tar.xz.sig
+   https://alpha.gnu.org/gnu/diffutils/${P}.tar.xz.sig
+   )"
 
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 
sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos 
~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="nls static"
 
-BDEPEND="nls? ( sys-devel/gettext )"
+BDEPEND="nls? ( sys-devel/gettext )
+   verify-sig? ( sec-keys/openpgp-keys-diffutils )"
 
 PATCHES=( "${FILESDIR}/ppc-musl.patch" )

[gentoo-commits] repo/gentoo:master commit in: sys-apps/diffutils/files/

2022-03-13 Thread Sam James

commit: 9712b59e08cf0e003059846b82c88e6bd3404bfb
Author: Sam James  gentoo  org>
AuthorDate: Sun Mar 13 22:23:00 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Sun Mar 13 22:23:26 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9712b59e

sys-apps/diffutils: add link to upstream gnulib/musl/ppc patch

Signed-off-by: Sam James  gentoo.org>

 sys-apps/diffutils/files/ppc-musl.patch | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/sys-apps/diffutils/files/ppc-musl.patch 
b/sys-apps/diffutils/files/ppc-musl.patch
index d7d8255a444a..4aff0ba1cf5c 100644
--- a/sys-apps/diffutils/files/ppc-musl.patch
+++ b/sys-apps/diffutils/files/ppc-musl.patch
@@ -1,7 +1,8 @@
-Needed to fix build on ppc + musl. Doesn't seem to yet be in upstream gnulib.
+Needed to fix build on ppc + musl. Should pop up in next gnulib sync in 
release (different patch).
 
 https://www.openwall.com/lists/musl/2017/11/05/2
 
https://github.com/void-linux/void-packages/blob/master/srcpkgs/grep/patches/ppc-musl.patch
+https://git.savannah.gnu.org/cgit/gnulib.git/commit/?id=2d830e4a792fcd9f614ed08a7f18584b8b21d23b
 --- a/lib/sigsegv.c
 +++ b/lib/sigsegv.c
 @@ -221,8 +221,10 @@ int libsigsegv_version = LIBSIGSEGV_VERSION;

[gentoo-commits] repo/gentoo:master commit in: sys-apps/diffutils/

2022-02-12 Thread Andreas K. Hüttel

commit: c4db33039b4fdda473d568ebc82f68c50bb0cfbb
Author: Andreas K. Hüttel  gentoo  org>
AuthorDate: Sat Feb 12 18:49:37 2022 +
Commit: Andreas K. Hüttel  gentoo  org>
CommitDate: Sat Feb 12 19:17:23 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c4db3303

sys-apps/diffutils: Remove old

Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Andreas K. Hüttel  gentoo.org>

 sys-apps/diffutils/Manifest|  1 -
 sys-apps/diffutils/diffutils-3.7-r1.ebuild | 43 --
 2 files changed, 44 deletions(-)

diff --git a/sys-apps/diffutils/Manifest b/sys-apps/diffutils/Manifest
index d8cc926d9574..60bb7af2dc63 100644
--- a/sys-apps/diffutils/Manifest
+++ b/sys-apps/diffutils/Manifest
@@ -1,2 +1 @@
-DIST diffutils-3.7.tar.xz 1448828 BLAKE2B 
d9f115e0ec9b2499545a3bef4e469fb7786d4a95e0a1c8459c885c53e8b1dc797027979e42c53c2a7df4e1e224942bd9ce5214813977af2bcc67f0698ea0c647
 SHA512 
7b12cf8aea1b9844773748f72272d9c6a38adae9c3c3a8c62048f91fb56c60b76035fa5f51665dceaf2cfbf1d1f4a3efdcc24bf47a5a16ff4350543314b12c9c
 DIST diffutils-3.8.tar.xz 1585120 BLAKE2B 
573abbfba55c62ba30d2084ca68860e9681cfe92648407f7fb04e1aaed2e4719e2fb5a29cf25bd125d762f4dfd52f85ee91f2ec19b099365bada7fe27a0394af
 SHA512 
279441270987e70d5ecfaf84b6285a4866929c43ec877e50f154a788858d548a8a316f2fc26ad62f7348c8d289cb29a09d06dfadce1806e3d8b4ea88c8b1aa7c

diff --git a/sys-apps/diffutils/diffutils-3.7-r1.ebuild 
b/sys-apps/diffutils/diffutils-3.7-r1.ebuild
deleted file mode 100644
index bf54a0da3b24..
--- a/sys-apps/diffutils/diffutils-3.7-r1.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-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
-   https://alpha.gnu.org/gnu/diffutils/${P}.tar.xz;
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 
sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos 
~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="nls static"
-
-BDEPEND="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
-}

[gentoo-commits] repo/gentoo:master commit in: sys-apps/diffutils/files/

2021-11-16 Thread Sam James

commit: 31d29b0723e754bf792a078f799a1bd8ddc5078c
Author: Sam James  gentoo  org>
AuthorDate: Wed Nov 17 04:33:33 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Wed Nov 17 04:34:03 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=31d29b07

sys-apps/diffutils: add links to musl patch

Signed-off-by: Sam James  gentoo.org>

 sys-apps/diffutils/files/ppc-musl.patch | 4 
 1 file changed, 4 insertions(+)

diff --git a/sys-apps/diffutils/files/ppc-musl.patch 
b/sys-apps/diffutils/files/ppc-musl.patch
index 6ba37f233591..d7d8255a444a 100644
--- a/sys-apps/diffutils/files/ppc-musl.patch
+++ b/sys-apps/diffutils/files/ppc-musl.patch
@@ -1,3 +1,7 @@
+Needed to fix build on ppc + musl. Doesn't seem to yet be in upstream gnulib.
+
+https://www.openwall.com/lists/musl/2017/11/05/2
+https://github.com/void-linux/void-packages/blob/master/srcpkgs/grep/patches/ppc-musl.patch
 --- a/lib/sigsegv.c
 +++ b/lib/sigsegv.c
 @@ -221,8 +221,10 @@ int libsigsegv_version = LIBSIGSEGV_VERSION;

[gentoo-commits] repo/gentoo:master commit in: sys-apps/diffutils/files/, sys-apps/diffutils/

2021-11-16 Thread Georgy Yakovlev

commit: 03757f59d10a55b3b97676aeb02ab9e1f1365aec
Author: Georgy Yakovlev  gentoo  org>
AuthorDate: Wed Nov 17 02:38:47 2021 +
Commit: Georgy Yakovlev  gentoo  org>
CommitDate: Wed Nov 17 02:39:07 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=03757f59

sys-apps/diffutils: add ppc32 musl patch

Signed-off-by: Georgy Yakovlev  gentoo.org>

 sys-apps/diffutils/diffutils-3.8.ebuild |  2 ++
 sys-apps/diffutils/files/ppc-musl.patch | 14 ++
 2 files changed, 16 insertions(+)

diff --git a/sys-apps/diffutils/diffutils-3.8.ebuild 
b/sys-apps/diffutils/diffutils-3.8.ebuild
index fc7ab80b4a3b..4cae3d13edc4 100644
--- a/sys-apps/diffutils/diffutils-3.8.ebuild
+++ b/sys-apps/diffutils/diffutils-3.8.ebuild
@@ -17,6 +17,8 @@ IUSE="nls static"
 
 BDEPEND="nls? ( sys-devel/gettext )"
 
+PATCHES=( "${FILESDIR}/ppc-musl.patch" )
+
 src_configure() {
use static && append-ldflags -static
 

diff --git a/sys-apps/diffutils/files/ppc-musl.patch 
b/sys-apps/diffutils/files/ppc-musl.patch
new file mode 100644
index ..6ba37f233591
--- /dev/null
+++ b/sys-apps/diffutils/files/ppc-musl.patch
@@ -0,0 +1,14 @@
+--- a/lib/sigsegv.c
 b/lib/sigsegv.c
+@@ -221,8 +221,10 @@ int libsigsegv_version = LIBSIGSEGV_VERSION;
+ /* both should be equivalent */
+ #   if 0
+ #define SIGSEGV_FAULT_STACKPOINTER  ((ucontext_t *) 
ucp)->uc_mcontext.regs->gpr[1]
+-#   else
++#   elif defined(__GLIBC__)
+ #define SIGSEGV_FAULT_STACKPOINTER  ((ucontext_t *) 
ucp)->uc_mcontext.uc_regs->gregs[1]
++#   else
++#define SIGSEGV_FAULT_STACKPOINTER  ((ucontext_t *) 
ucp)->uc_mcontext.gregs[1]
+ #   endif
+ #  endif
+

[gentoo-commits] repo/gentoo:master commit in: sys-apps/diffutils/

2021-11-07 Thread Sam James

commit: 3b0dba58d4a1f9d2fa260a2334a4b5abfaf98511
Author: Rolf Eike Beer  sf-mail  de>
AuthorDate: Sun Nov  7 07:46:00 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Sun Nov  7 07:51:44 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3b0dba58

sys-apps/diffutils: stable 3.8 for hppa, bug #813141

Package-Manager: Portage-3.0.28, Repoman-3.0.3
RepoMan-Options: --include-arches="hppa"
Signed-off-by: Rolf Eike Beer  sf-mail.de>
Signed-off-by: Sam James  gentoo.org>

 sys-apps/diffutils/diffutils-3.8.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-apps/diffutils/diffutils-3.8.ebuild 
b/sys-apps/diffutils/diffutils-3.8.ebuild
index 1ff5957c29c..fc7ab80b4a3 100644
--- a/sys-apps/diffutils/diffutils-3.8.ebuild
+++ b/sys-apps/diffutils/diffutils-3.8.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://gnu/diffutils/${P}.tar.xz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv 
~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos 
~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 
sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos 
~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="nls static"
 
 BDEPEND="nls? ( sys-devel/gettext )"

[gentoo-commits] repo/gentoo:master commit in: sys-apps/diffutils/

2021-10-02 Thread Sam James

commit: bfa1151a00e5215535574cb763477792da37065e
Author: Sam James  gentoo  org>
AuthorDate: Sat Oct  2 17:20:09 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Sat Oct  2 17:20:09 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bfa1151a

sys-apps/diffutils: Stabilize 3.8 arm64, #813141

Signed-off-by: Sam James  gentoo.org>

 sys-apps/diffutils/diffutils-3.8.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-apps/diffutils/diffutils-3.8.ebuild 
b/sys-apps/diffutils/diffutils-3.8.ebuild
index 4c2d48e864e..1ff5957c29c 100644
--- a/sys-apps/diffutils/diffutils-3.8.ebuild
+++ b/sys-apps/diffutils/diffutils-3.8.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://gnu/diffutils/${P}.tar.xz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv 
~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos 
~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv 
~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos 
~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="nls static"
 
 BDEPEND="nls? ( sys-devel/gettext )"

[gentoo-commits] repo/gentoo:master commit in: sys-apps/diffutils/

2021-09-18 Thread Sam James

commit: 7e9a5ab451fbf42a6342cd467c9bb26a2625c245
Author: Sam James  gentoo  org>
AuthorDate: Sat Sep 18 19:45:28 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Sat Sep 18 19:45:28 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7e9a5ab4

sys-apps/diffutils: Stabilize 3.8 arm, #813141

Signed-off-by: Sam James  gentoo.org>

 sys-apps/diffutils/diffutils-3.8.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-apps/diffutils/diffutils-3.8.ebuild 
b/sys-apps/diffutils/diffutils-3.8.ebuild
index 256a6a97ce7..6258ea3a2bc 100644
--- a/sys-apps/diffutils/diffutils-3.8.ebuild
+++ b/sys-apps/diffutils/diffutils-3.8.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://gnu/diffutils/${P}.tar.xz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ppc64 ~riscv 
~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos 
~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ppc64 ~riscv 
~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos 
~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="nls static"
 
 BDEPEND="nls? ( sys-devel/gettext )"

[gentoo-commits] repo/gentoo:master commit in: sys-apps/diffutils/

2021-09-18 Thread Agostino Sarubbo

commit: 04a78d1650a39d5aed2aeea405222b2dc8977856
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Sat Sep 18 12:29:41 2021 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Sat Sep 18 12:30:42 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=04a78d16

sys-apps/diffutils: x86 stable wrt bug #813141

Package-Manager: Portage-3.0.20, Repoman-3.0.3
RepoMan-Options: --include-arches="x86"
Signed-off-by: Agostino Sarubbo  gentoo.org>

 sys-apps/diffutils/diffutils-3.8.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-apps/diffutils/diffutils-3.8.ebuild 
b/sys-apps/diffutils/diffutils-3.8.ebuild
index 6f7a87fd228..256a6a97ce7 100644
--- a/sys-apps/diffutils/diffutils-3.8.ebuild
+++ b/sys-apps/diffutils/diffutils-3.8.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://gnu/diffutils/${P}.tar.xz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ppc64 ~riscv 
~s390 sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos 
~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ppc64 ~riscv 
~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos 
~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="nls static"
 
 BDEPEND="nls? ( sys-devel/gettext )"

[gentoo-commits] repo/gentoo:master commit in: sys-apps/diffutils/

2021-09-16 Thread Agostino Sarubbo

commit: de672cc743c5b03bc1fe4500a499c9e38fe3e11d
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Thu Sep 16 08:04:28 2021 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Thu Sep 16 08:04:28 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=de672cc7

sys-apps/diffutils: sparc stable wrt bug #813141

Package-Manager: Portage-3.0.20, Repoman-3.0.3
RepoMan-Options: --include-arches="sparc"
Signed-off-by: Agostino Sarubbo  gentoo.org>

 sys-apps/diffutils/diffutils-3.8.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-apps/diffutils/diffutils-3.8.ebuild 
b/sys-apps/diffutils/diffutils-3.8.ebuild
index 125f06cd9a8..6f7a87fd228 100644
--- a/sys-apps/diffutils/diffutils-3.8.ebuild
+++ b/sys-apps/diffutils/diffutils-3.8.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://gnu/diffutils/${P}.tar.xz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ppc64 ~riscv 
~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos 
~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ppc64 ~riscv 
~s390 sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos 
~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="nls static"
 
 BDEPEND="nls? ( sys-devel/gettext )"

[gentoo-commits] repo/gentoo:master commit in: sys-apps/diffutils/

2021-09-16 Thread Agostino Sarubbo

commit: db8c770d66d4cd58e8ddf40f6d1c66d8a7d6d6e4
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Thu Sep 16 08:02:50 2021 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Thu Sep 16 08:02:50 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=db8c770d

sys-apps/diffutils: ppc64 stable wrt bug #813141

Package-Manager: Portage-3.0.20, Repoman-3.0.3
RepoMan-Options: --include-arches="ppc64"
Signed-off-by: Agostino Sarubbo  gentoo.org>

 sys-apps/diffutils/diffutils-3.8.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-apps/diffutils/diffutils-3.8.ebuild 
b/sys-apps/diffutils/diffutils-3.8.ebuild
index d2c781ab668..125f06cd9a8 100644
--- a/sys-apps/diffutils/diffutils-3.8.ebuild
+++ b/sys-apps/diffutils/diffutils-3.8.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://gnu/diffutils/${P}.tar.xz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv 
~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos 
~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ppc64 ~riscv 
~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos 
~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="nls static"
 
 BDEPEND="nls? ( sys-devel/gettext )"

[gentoo-commits] repo/gentoo:master commit in: sys-apps/diffutils/

2021-09-16 Thread Agostino Sarubbo

commit: a7ccd5f7a03c5e3dd70891cf37762ea947e060d3
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Thu Sep 16 08:01:34 2021 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Thu Sep 16 08:01:58 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a7ccd5f7

sys-apps/diffutils: amd64 stable wrt bug #813141

Package-Manager: Portage-3.0.20, Repoman-3.0.3
RepoMan-Options: --include-arches="amd64"
Signed-off-by: Agostino Sarubbo  gentoo.org>

 sys-apps/diffutils/diffutils-3.8.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-apps/diffutils/diffutils-3.8.ebuild 
b/sys-apps/diffutils/diffutils-3.8.ebuild
index 48330a99311..d2c781ab668 100644
--- a/sys-apps/diffutils/diffutils-3.8.ebuild
+++ b/sys-apps/diffutils/diffutils-3.8.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://gnu/diffutils/${P}.tar.xz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv 
~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos 
~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv 
~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos 
~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="nls static"
 
 BDEPEND="nls? ( sys-devel/gettext )"

[gentoo-commits] repo/gentoo:master commit in: sys-apps/diffutils/

2021-08-02 Thread David Seifert

commit: 7f11b742ca55d75d914a58735b9d2807b3f4c13a
Author: David Seifert  gentoo  org>
AuthorDate: Mon Aug  2 09:16:02 2021 +
Commit: David Seifert  gentoo  org>
CommitDate: Mon Aug  2 09:16:02 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7f11b742

sys-apps/diffutils: Remove modern EAPI defaults

* `src_test` has been parallel since EAPI 5
* `DOCS` lists the standard einstalldocs ones

Signed-off-by: David Seifert  gentoo.org>

 sys-apps/diffutils/diffutils-3.8.ebuild | 7 ---
 1 file changed, 7 deletions(-)

diff --git a/sys-apps/diffutils/diffutils-3.8.ebuild 
b/sys-apps/diffutils/diffutils-3.8.ebuild
index 0a85ac0bf2e..48330a99311 100644
--- a/sys-apps/diffutils/diffutils-3.8.ebuild
+++ b/sys-apps/diffutils/diffutils-3.8.ebuild
@@ -17,8 +17,6 @@ IUSE="nls static"
 
 BDEPEND="nls? ( sys-devel/gettext )"
 
-DOCS=( AUTHORS ChangeLog NEWS README THANKS TODO )
-
 src_configure() {
use static && append-ldflags -static
 
@@ -36,8 +34,3 @@ src_configure() {
)
econf "${myeconfargs[@]}"
 }
-
-src_test() {
-   # explicitly allow parallel testing
-   emake check
-}

[gentoo-commits] repo/gentoo:master commit in: sys-apps/diffutils/

2021-08-01 Thread Lars Wendler

commit: 1ef6bd6c58494558d6fbd82f960b6c0fe5cba7c4
Author: Lars Wendler  gentoo  org>
AuthorDate: Mon Aug  2 05:16:14 2021 +
Commit: Lars Wendler  gentoo  org>
CommitDate: Mon Aug  2 05:16:14 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1ef6bd6c

sys-apps/diffutils: Bump to version 3.8

Signed-off-by: Lars Wendler  gentoo.org>

 sys-apps/diffutils/Manifest |  1 +
 sys-apps/diffutils/diffutils-3.8.ebuild | 43 +
 2 files changed, 44 insertions(+)

diff --git a/sys-apps/diffutils/Manifest b/sys-apps/diffutils/Manifest
index 98d0d4dbed4..d8cc926d957 100644
--- a/sys-apps/diffutils/Manifest
+++ b/sys-apps/diffutils/Manifest
@@ -1 +1,2 @@
 DIST diffutils-3.7.tar.xz 1448828 BLAKE2B 
d9f115e0ec9b2499545a3bef4e469fb7786d4a95e0a1c8459c885c53e8b1dc797027979e42c53c2a7df4e1e224942bd9ce5214813977af2bcc67f0698ea0c647
 SHA512 
7b12cf8aea1b9844773748f72272d9c6a38adae9c3c3a8c62048f91fb56c60b76035fa5f51665dceaf2cfbf1d1f4a3efdcc24bf47a5a16ff4350543314b12c9c
+DIST diffutils-3.8.tar.xz 1585120 BLAKE2B 
573abbfba55c62ba30d2084ca68860e9681cfe92648407f7fb04e1aaed2e4719e2fb5a29cf25bd125d762f4dfd52f85ee91f2ec19b099365bada7fe27a0394af
 SHA512 
279441270987e70d5ecfaf84b6285a4866929c43ec877e50f154a788858d548a8a316f2fc26ad62f7348c8d289cb29a09d06dfadce1806e3d8b4ea88c8b1aa7c

diff --git a/sys-apps/diffutils/diffutils-3.8.ebuild 
b/sys-apps/diffutils/diffutils-3.8.ebuild
new file mode 100644
index 000..0a85ac0bf2e
--- /dev/null
+++ b/sys-apps/diffutils/diffutils-3.8.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+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
+   https://alpha.gnu.org/gnu/diffutils/${P}.tar.xz;
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv 
~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos 
~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="nls static"
+
+BDEPEND="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
+}

[gentoo-commits] repo/gentoo:master commit in: sys-apps/diffutils/

2021-01-06 Thread Fabian Groffen

commit: 471ff11532b0cfdf526975b8536649fc46268710
Author: Fabian Groffen  gentoo  org>
AuthorDate: Wed Jan  6 15:21:31 2021 +
Commit: Fabian Groffen  gentoo  org>
CommitDate: Wed Jan  6 15:21:31 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=471ff115

sys-apps/diffutils: drop x86-macos

Package-Manager: Portage-3.0.12, Repoman-3.0.2
Signed-off-by: Fabian Groffen  gentoo.org>

 sys-apps/diffutils/diffutils-3.7-r1.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/sys-apps/diffutils/diffutils-3.7-r1.ebuild 
b/sys-apps/diffutils/diffutils-3.7-r1.ebuild
index 25aef108f0b..79eb1d1d0f5 100644
--- a/sys-apps/diffutils/diffutils-3.7-r1.ebuild
+++ b/sys-apps/diffutils/diffutils-3.7-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -12,7 +12,7 @@ SRC_URI="mirror://gnu/diffutils/${P}.tar.xz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 
sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos 
~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 
sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos 
~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="nls static"
 
 BDEPEND="nls? ( sys-devel/gettext )"

[gentoo-commits] repo/gentoo:master commit in: sys-apps/diffutils/

2020-12-27 Thread Fabian Groffen

commit: 5ce8b679c2dd19fa607b7316c8298b79df6be228
Author: Fabian Groffen  gentoo  org>
AuthorDate: Sun Dec 27 18:10:37 2020 +
Commit: Fabian Groffen  gentoo  org>
CommitDate: Sun Dec 27 18:13:44 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5ce8b679

sys-apps/diffutils: drop ppc-aix m68k-mint

Package-Manager: Portage-3.0.9, Repoman-3.0.2
Signed-off-by: Fabian Groffen  gentoo.org>

 sys-apps/diffutils/diffutils-3.7-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-apps/diffutils/diffutils-3.7-r1.ebuild 
b/sys-apps/diffutils/diffutils-3.7-r1.ebuild
index 4a5fcb88c02..25aef108f0b 100644
--- a/sys-apps/diffutils/diffutils-3.7-r1.ebuild
+++ b/sys-apps/diffutils/diffutils-3.7-r1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://gnu/diffutils/${P}.tar.xz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 
sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos 
~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 
sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos 
~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="nls static"
 
 BDEPEND="nls? ( sys-devel/gettext )"

[gentoo-commits] repo/gentoo:master commit in: sys-apps/diffutils/

2020-09-04 Thread Lars Wendler

commit: 55112f0f0443901d076c70387af96c840c47e1a1
Author: Lars Wendler  gentoo  org>
AuthorDate: Fri Sep  4 11:47:00 2020 +
Commit: Lars Wendler  gentoo  org>
CommitDate: Fri Sep  4 11:47:00 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=55112f0f

sys-apps/diffutils: Removed old

Package-Manager: Portage-3.0.5, Repoman-3.0.1
Signed-off-by: Lars Wendler  gentoo.org>

 sys-apps/diffutils/Manifest|  1 -
 sys-apps/diffutils/diffutils-3.6-r1.ebuild | 44 --
 sys-apps/diffutils/diffutils-3.7.ebuild| 44 --
 3 files changed, 89 deletions(-)

diff --git a/sys-apps/diffutils/Manifest b/sys-apps/diffutils/Manifest
index b45b5a00b92..98d0d4dbed4 100644
--- a/sys-apps/diffutils/Manifest
+++ b/sys-apps/diffutils/Manifest
@@ -1,2 +1 @@
-DIST diffutils-3.6.tar.xz 1398296 BLAKE2B 
1b0a1443f676a1c09d25ad0be4c2d936156da8e690fade9d39d94be3850c502db24c3f508178a51e817437069db2d110fb4577cd67b2cf645c11a1f26a043e3d
 SHA512 
3c159ff1cb7c901b0a57518483566b5740ca3c45aeb8d3004089f052975481db52994cc18592c502c68b0d2a1e22f1f7830f0d8dd9a9ed86de96e28cce9f70c1
 DIST diffutils-3.7.tar.xz 1448828 BLAKE2B 
d9f115e0ec9b2499545a3bef4e469fb7786d4a95e0a1c8459c885c53e8b1dc797027979e42c53c2a7df4e1e224942bd9ce5214813977af2bcc67f0698ea0c647
 SHA512 
7b12cf8aea1b9844773748f72272d9c6a38adae9c3c3a8c62048f91fb56c60b76035fa5f51665dceaf2cfbf1d1f4a3efdcc24bf47a5a16ff4350543314b12c9c

diff --git a/sys-apps/diffutils/diffutils-3.6-r1.ebuild 
b/sys-apps/diffutils/diffutils-3.6-r1.ebuild
deleted file mode 100644
index ad6055ecdcc..000
--- a/sys-apps/diffutils/diffutils-3.6-r1.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2020 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="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 
sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos 
~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="nls static"
-
-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/diffutils-3.7.ebuild 
b/sys-apps/diffutils/diffutils-3.7.ebuild
deleted file mode 100644
index ad6055ecdcc..000
--- a/sys-apps/diffutils/diffutils-3.7.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2020 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="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 
sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos 
~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="nls static"
-
-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
-}

[gentoo-commits] repo/gentoo:master commit in: sys-apps/diffutils/

2020-09-04 Thread Sergei Trofimovich

commit: 4a3647890c124dfae887a27c631fb36d1ee82770
Author: Sergei Trofimovich  gentoo  org>
AuthorDate: Fri Sep  4 11:41:13 2020 +
Commit: Sergei Trofimovich  gentoo  org>
CommitDate: Fri Sep  4 11:41:18 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4a364789

sys-apps/diffutils: stable 3.7-r1 for ppc64

stable wrt bug #
Tested-by: ernsteiswuerfel
Package-Manager: Portage-3.0.5, Repoman-3.0.1
RepoMan-Options: --include-arches="ppc64"
Signed-off-by: Sergei Trofimovich  gentoo.org>

 sys-apps/diffutils/diffutils-3.7-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-apps/diffutils/diffutils-3.7-r1.ebuild 
b/sys-apps/diffutils/diffutils-3.7-r1.ebuild
index 1cd06831e37..4a5fcb88c02 100644
--- a/sys-apps/diffutils/diffutils-3.7-r1.ebuild
+++ b/sys-apps/diffutils/diffutils-3.7-r1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://gnu/diffutils/${P}.tar.xz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ~ppc64 ~riscv s390 
sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos 
~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 
sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos 
~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="nls static"
 
 BDEPEND="nls? ( sys-devel/gettext )"

[gentoo-commits] repo/gentoo:master commit in: sys-apps/diffutils/

2020-08-31 Thread Sam James

commit: 181208bdc4a46a65e9e2a249da975ef9f22e2168
Author: Sam James  gentoo  org>
AuthorDate: Mon Aug 31 23:14:02 2020 +
Commit: Sam James  gentoo  org>
CommitDate: Mon Aug 31 23:14:43 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=181208bd

sys-apps/diffutils: Stabilize 3.7-r1 ppc, #737502

Signed-off-by: Sam James  gentoo.org>

 sys-apps/diffutils/diffutils-3.7-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-apps/diffutils/diffutils-3.7-r1.ebuild 
b/sys-apps/diffutils/diffutils-3.7-r1.ebuild
index 21da40ee701..1cd06831e37 100644
--- a/sys-apps/diffutils/diffutils-3.7-r1.ebuild
+++ b/sys-apps/diffutils/diffutils-3.7-r1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://gnu/diffutils/${P}.tar.xz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv 
s390 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos 
~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris 
~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ~ppc64 ~riscv s390 
sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos 
~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="nls static"
 
 BDEPEND="nls? ( sys-devel/gettext )"

[gentoo-commits] repo/gentoo:master commit in: sys-apps/diffutils/

2020-08-19 Thread Sergei Trofimovich

commit: 16f2a8afaa75618c3f8a69aa1e1e5abf7d545c37
Author: Rolf Eike Beer  sf-mail  de>
AuthorDate: Wed Aug 19 07:24:49 2020 +
Commit: Sergei Trofimovich  gentoo  org>
CommitDate: Wed Aug 19 08:31:18 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=16f2a8af

sys-apps/diffutils: stable 3.7-r1 for hppa, bug #737502

Package-Manager: Portage-2.3.103, Repoman-2.3.23
RepoMan-Options: --include-arches="hppa"
Signed-off-by: Rolf Eike Beer  sf-mail.de>
Signed-off-by: Sergei Trofimovich  gentoo.org>

 sys-apps/diffutils/diffutils-3.7-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-apps/diffutils/diffutils-3.7-r1.ebuild 
b/sys-apps/diffutils/diffutils-3.7-r1.ebuild
index f14491e8496..21da40ee701 100644
--- a/sys-apps/diffutils/diffutils-3.7-r1.ebuild
+++ b/sys-apps/diffutils/diffutils-3.7-r1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://gnu/diffutils/${P}.tar.xz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv 
s390 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos 
~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris 
~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv 
s390 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos 
~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris 
~x86-solaris"
 IUSE="nls static"
 
 BDEPEND="nls? ( sys-devel/gettext )"

[gentoo-commits] repo/gentoo:master commit in: sys-apps/diffutils/

2020-08-18 Thread Sam James

commit: a5a787f3c399a0391d7e88bb347df5550841d164
Author: Sam James  gentoo  org>
AuthorDate: Tue Aug 18 13:21:49 2020 +
Commit: Sam James  gentoo  org>
CommitDate: Tue Aug 18 13:21:50 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a5a787f3

sys-apps/diffutils: Stabilize 3.7-r1 arm64, #737502

Signed-off-by: Sam James  gentoo.org>

 sys-apps/diffutils/diffutils-3.7-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-apps/diffutils/diffutils-3.7-r1.ebuild 
b/sys-apps/diffutils/diffutils-3.7-r1.ebuild
index ead84eab4b2..f14491e8496 100644
--- a/sys-apps/diffutils/diffutils-3.7-r1.ebuild
+++ b/sys-apps/diffutils/diffutils-3.7-r1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://gnu/diffutils/${P}.tar.xz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv 
s390 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos 
~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris 
~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv 
s390 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos 
~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris 
~x86-solaris"
 IUSE="nls static"
 
 BDEPEND="nls? ( sys-devel/gettext )"

[gentoo-commits] repo/gentoo:master commit in: sys-apps/diffutils/

2020-08-17 Thread Agostino Sarubbo

commit: 327e9ae8345c1aea12b2f10ec880ec949af292d7
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Mon Aug 17 10:00:41 2020 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Mon Aug 17 10:00:41 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=327e9ae8

sys-apps/diffutils: x86 stable wrt bug #737502

Package-Manager: Portage-2.3.103, Repoman-2.3.23
RepoMan-Options: --include-arches="x86"
Signed-off-by: Agostino Sarubbo  gentoo.org>

 sys-apps/diffutils/diffutils-3.7-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-apps/diffutils/diffutils-3.7-r1.ebuild 
b/sys-apps/diffutils/diffutils-3.7-r1.ebuild
index d58eb77899f..ead84eab4b2 100644
--- a/sys-apps/diffutils/diffutils-3.7-r1.ebuild
+++ b/sys-apps/diffutils/diffutils-3.7-r1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://gnu/diffutils/${P}.tar.xz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv 
s390 sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos 
~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris 
~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv 
s390 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos 
~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris 
~x86-solaris"
 IUSE="nls static"
 
 BDEPEND="nls? ( sys-devel/gettext )"

[gentoo-commits] repo/gentoo:master commit in: sys-apps/diffutils/

2020-08-17 Thread Agostino Sarubbo

commit: f1dd1c3cf3ad261e3e79627ecd169d40d37e5f70
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Mon Aug 17 09:59:28 2020 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Mon Aug 17 09:59:28 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f1dd1c3c

sys-apps/diffutils: sparc stable wrt bug #737502

Package-Manager: Portage-2.3.103, Repoman-2.3.23
RepoMan-Options: --include-arches="sparc"
Signed-off-by: Agostino Sarubbo  gentoo.org>

 sys-apps/diffutils/diffutils-3.7-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-apps/diffutils/diffutils-3.7-r1.ebuild 
b/sys-apps/diffutils/diffutils-3.7-r1.ebuild
index 26e1df148cb..d58eb77899f 100644
--- a/sys-apps/diffutils/diffutils-3.7-r1.ebuild
+++ b/sys-apps/diffutils/diffutils-3.7-r1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://gnu/diffutils/${P}.tar.xz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv 
s390 ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos 
~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris 
~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv 
s390 sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos 
~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris 
~x86-solaris"
 IUSE="nls static"
 
 BDEPEND="nls? ( sys-devel/gettext )"

[gentoo-commits] repo/gentoo:master commit in: sys-apps/diffutils/

2020-08-17 Thread Agostino Sarubbo

commit: 52eac2b7b1cfe5762c7afc06ee259278b94fa0f0
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Mon Aug 17 09:58:23 2020 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Mon Aug 17 09:58:23 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=52eac2b7

sys-apps/diffutils: s390 stable wrt bug #737502

Package-Manager: Portage-2.3.103, Repoman-2.3.23
RepoMan-Options: --include-arches="s390"
Signed-off-by: Agostino Sarubbo  gentoo.org>

 sys-apps/diffutils/diffutils-3.7-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-apps/diffutils/diffutils-3.7-r1.ebuild 
b/sys-apps/diffutils/diffutils-3.7-r1.ebuild
index 7cc3760a5f6..26e1df148cb 100644
--- a/sys-apps/diffutils/diffutils-3.7-r1.ebuild
+++ b/sys-apps/diffutils/diffutils-3.7-r1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://gnu/diffutils/${P}.tar.xz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv 
~s390 ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos 
~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris 
~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv 
s390 ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos 
~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris 
~x86-solaris"
 IUSE="nls static"
 
 BDEPEND="nls? ( sys-devel/gettext )"

[gentoo-commits] repo/gentoo:master commit in: sys-apps/diffutils/

2020-08-17 Thread Agostino Sarubbo

commit: 183bdfdba200d4533f2adf7efcfe74b52cc1d36f
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Mon Aug 17 09:56:57 2020 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Mon Aug 17 09:56:57 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=183bdfdb

sys-apps/diffutils: arm stable wrt bug #737502

Package-Manager: Portage-2.3.103, Repoman-2.3.23
RepoMan-Options: --include-arches="arm"
Signed-off-by: Agostino Sarubbo  gentoo.org>

 sys-apps/diffutils/diffutils-3.7-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-apps/diffutils/diffutils-3.7-r1.ebuild 
b/sys-apps/diffutils/diffutils-3.7-r1.ebuild
index 4e001e03c13..7cc3760a5f6 100644
--- a/sys-apps/diffutils/diffutils-3.7-r1.ebuild
+++ b/sys-apps/diffutils/diffutils-3.7-r1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://gnu/diffutils/${P}.tar.xz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv 
~s390 ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos 
~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris 
~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv 
~s390 ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos 
~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris 
~x86-solaris"
 IUSE="nls static"
 
 BDEPEND="nls? ( sys-devel/gettext )"

[gentoo-commits] repo/gentoo:master commit in: sys-apps/diffutils/

2020-08-17 Thread Agostino Sarubbo

commit: 17af405d1396e2be7775d694e2d4be7b6fdb650b
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Mon Aug 17 09:54:46 2020 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Mon Aug 17 09:54:46 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=17af405d

sys-apps/diffutils: amd64 stable wrt bug #737502

Package-Manager: Portage-2.3.103, Repoman-2.3.23
RepoMan-Options: --include-arches="amd64"
Signed-off-by: Agostino Sarubbo  gentoo.org>

 sys-apps/diffutils/diffutils-3.7-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-apps/diffutils/diffutils-3.7-r1.ebuild 
b/sys-apps/diffutils/diffutils-3.7-r1.ebuild
index 692b8fd3cc7..4e001e03c13 100644
--- a/sys-apps/diffutils/diffutils-3.7-r1.ebuild
+++ b/sys-apps/diffutils/diffutils-3.7-r1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://gnu/diffutils/${P}.tar.xz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv 
~s390 ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos 
~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris 
~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv 
~s390 ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos 
~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris 
~x86-solaris"
 IUSE="nls static"
 
 BDEPEND="nls? ( sys-devel/gettext )"

[gentoo-commits] repo/gentoo:master commit in: sys-apps/diffutils/

2020-07-16 Thread Sam James

commit: 9c640947f37b0dc6ee56d8d9938f01b77db78dfc
Author: Sam James  gentoo  org>
AuthorDate: Thu Jul 16 15:21:47 2020 +
Commit: Sam James  gentoo  org>
CommitDate: Thu Jul 16 15:21:47 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9c640947

sys-apps/diffutils: arm64 stable (bug #730486)

Package-Manager: Portage-2.3.103, Repoman-2.3.23
Signed-off-by: Sam James  gentoo.org>

 sys-apps/diffutils/diffutils-3.7.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-apps/diffutils/diffutils-3.7.ebuild 
b/sys-apps/diffutils/diffutils-3.7.ebuild
index 2c136e1b9e9..ad6055ecdcc 100644
--- a/sys-apps/diffutils/diffutils-3.7.ebuild
+++ b/sys-apps/diffutils/diffutils-3.7.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://gnu/diffutils/${P}.tar.xz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 
sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos 
~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 
sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos 
~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="nls static"
 
 DEPEND="app-arch/xz-utils

[gentoo-commits] repo/gentoo:master commit in: sys-apps/diffutils/

2020-07-16 Thread Sam James

commit: c09381ec84e23b8859b3495bb1f479058eaa8867
Author: Sam James  gentoo  org>
AuthorDate: Thu Jul 16 15:15:07 2020 +
Commit: Sam James  gentoo  org>
CommitDate: Thu Jul 16 15:15:07 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c09381ec

sys-apps/diffutils: arm stable (bug #730486)

Package-Manager: Portage-2.3.103, Repoman-2.3.23
Signed-off-by: Sam James  gentoo.org>

 sys-apps/diffutils/diffutils-3.7.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-apps/diffutils/diffutils-3.7.ebuild 
b/sys-apps/diffutils/diffutils-3.7.ebuild
index 714221e2a38..2c136e1b9e9 100644
--- a/sys-apps/diffutils/diffutils-3.7.ebuild
+++ b/sys-apps/diffutils/diffutils-3.7.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://gnu/diffutils/${P}.tar.xz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv 
s390 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos 
~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris 
~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 
sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos 
~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="nls static"
 
 DEPEND="app-arch/xz-utils

[gentoo-commits] repo/gentoo:master commit in: sys-apps/diffutils/

2020-07-11 Thread Mike Gilbert

commit: aa159e51bb9c563de948887ab9311af1627db519
Author: David Michael  gmail  com>
AuthorDate: Fri Jul 10 20:31:57 2020 +
Commit: Mike Gilbert  gentoo  org>
CommitDate: Sat Jul 11 23:00:16 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=aa159e51

sys-apps/diffutils: EAPI 7 bump

Closes: https://bugs.gentoo.org/732114
Package-Manager: Portage-2.3.99, Repoman-2.3.23
Signed-off-by: David Michael  gmail.com>
Signed-off-by: Mike Gilbert  gentoo.org>

 sys-apps/diffutils/diffutils-3.7-r1.ebuild | 43 ++
 1 file changed, 43 insertions(+)

diff --git a/sys-apps/diffutils/diffutils-3.7-r1.ebuild 
b/sys-apps/diffutils/diffutils-3.7-r1.ebuild
new file mode 100644
index 000..692b8fd3cc7
--- /dev/null
+++ b/sys-apps/diffutils/diffutils-3.7-r1.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+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="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv 
~s390 ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos 
~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris 
~x86-solaris"
+IUSE="nls static"
+
+BDEPEND="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
+}

[gentoo-commits] repo/gentoo:master commit in: sys-apps/diffutils/

2020-07-09 Thread Agostino Sarubbo

commit: 57fac3cd8a84934f7fa62e8c0a63dcaef5b57b4b
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Thu Jul  9 08:58:20 2020 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Thu Jul  9 08:59:41 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=57fac3cd

sys-apps/diffutils: x86 stable wrt bug #730486

Package-Manager: Portage-2.3.99, Repoman-2.3.22
RepoMan-Options: --include-arches="x86"
Signed-off-by: Agostino Sarubbo  gentoo.org>

 sys-apps/diffutils/diffutils-3.7.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-apps/diffutils/diffutils-3.7.ebuild 
b/sys-apps/diffutils/diffutils-3.7.ebuild
index 1b743c3ddab..714221e2a38 100644
--- a/sys-apps/diffutils/diffutils-3.7.ebuild
+++ b/sys-apps/diffutils/diffutils-3.7.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://gnu/diffutils/${P}.tar.xz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv 
s390 sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos 
~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris 
~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv 
s390 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos 
~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris 
~x86-solaris"
 IUSE="nls static"
 
 DEPEND="app-arch/xz-utils

[gentoo-commits] repo/gentoo:master commit in: sys-apps/diffutils/

2020-07-09 Thread Agostino Sarubbo

commit: 74b5d1dc2551ee6a2dd4891ed56e139662039286
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Thu Jul  9 08:34:22 2020 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Thu Jul  9 08:34:22 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=74b5d1dc

sys-apps/diffutils: s390 stable wrt bug #730486

Package-Manager: Portage-2.3.99, Repoman-2.3.22
RepoMan-Options: --include-arches="s390"
Signed-off-by: Agostino Sarubbo  gentoo.org>

 sys-apps/diffutils/diffutils-3.7.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-apps/diffutils/diffutils-3.7.ebuild 
b/sys-apps/diffutils/diffutils-3.7.ebuild
index acf5169ebe7..1b743c3ddab 100644
--- a/sys-apps/diffutils/diffutils-3.7.ebuild
+++ b/sys-apps/diffutils/diffutils-3.7.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://gnu/diffutils/${P}.tar.xz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv 
~s390 sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos 
~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris 
~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv 
s390 sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos 
~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris 
~x86-solaris"
 IUSE="nls static"
 
 DEPEND="app-arch/xz-utils

[gentoo-commits] repo/gentoo:master commit in: sys-apps/diffutils/

2020-07-08 Thread Michał Górny

commit: 18a4aa1a9e55f7d5cc7a48ebbab25f140f81d778
Author: Michał Górny  gentoo  org>
AuthorDate: Wed Jul  8 12:22:28 2020 +
Commit: Michał Górny  gentoo  org>
CommitDate: Wed Jul  8 12:23:03 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=18a4aa1a

sys-apps/diffutils: Stabilize 3.7 amd64, #730486

Signed-off-by: Michał Górny  gentoo.org>

 sys-apps/diffutils/diffutils-3.7.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-apps/diffutils/diffutils-3.7.ebuild 
b/sys-apps/diffutils/diffutils-3.7.ebuild
index 81f6c962a97..acf5169ebe7 100644
--- a/sys-apps/diffutils/diffutils-3.7.ebuild
+++ b/sys-apps/diffutils/diffutils-3.7.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://gnu/diffutils/${P}.tar.xz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv 
~s390 sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos 
~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris 
~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv 
~s390 sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos 
~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris 
~x86-solaris"
 IUSE="nls static"
 
 DEPEND="app-arch/xz-utils

[gentoo-commits] repo/gentoo:master commit in: sys-apps/diffutils/

2020-07-07 Thread Sergei Trofimovich

commit: a9638617aff3fa5152b91d5f844a31ea3f5514e3
Author: Rolf Eike Beer  sf-mail  de>
AuthorDate: Tue Jul  7 05:10:30 2020 +
Commit: Sergei Trofimovich  gentoo  org>
CommitDate: Tue Jul  7 06:57:44 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a9638617

sys-apps/diffutils: stable 3.7 for hppa, bug #730486

Package-Manager: Portage-2.3.99, Repoman-2.3.23
RepoMan-Options: --include-arches="hppa"
Signed-off-by: Rolf Eike Beer  sf-mail.de>
Signed-off-by: Sergei Trofimovich  gentoo.org>

 sys-apps/diffutils/diffutils-3.7.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-apps/diffutils/diffutils-3.7.ebuild 
b/sys-apps/diffutils/diffutils-3.7.ebuild
index 56ce9341c87..81f6c962a97 100644
--- a/sys-apps/diffutils/diffutils-3.7.ebuild
+++ b/sys-apps/diffutils/diffutils-3.7.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://gnu/diffutils/${P}.tar.xz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv 
~s390 sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos 
~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris 
~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv 
~s390 sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos 
~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris 
~x86-solaris"
 IUSE="nls static"
 
 DEPEND="app-arch/xz-utils

[gentoo-commits] repo/gentoo:master commit in: sys-apps/diffutils/

2020-07-06 Thread Sergei Trofimovich

commit: 6fc9c4bc5165bf1c78bac1e37435dc546af2ccab
Author: Rolf Eike Beer  sf-mail  de>
AuthorDate: Mon Jul  6 15:07:57 2020 +
Commit: Sergei Trofimovich  gentoo  org>
CommitDate: Mon Jul  6 16:43:36 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6fc9c4bc

sys-apps/diffutils: stable 3.7 for sparc, bug #730486

Package-Manager: Portage-2.3.99, Repoman-2.3.23
RepoMan-Options: --include-arches="sparc"
Signed-off-by: Rolf Eike Beer  sf-mail.de>
Signed-off-by: Sergei Trofimovich  gentoo.org>

 sys-apps/diffutils/diffutils-3.7.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-apps/diffutils/diffutils-3.7.ebuild 
b/sys-apps/diffutils/diffutils-3.7.ebuild
index 7e13c6dcccb..56ce9341c87 100644
--- a/sys-apps/diffutils/diffutils-3.7.ebuild
+++ b/sys-apps/diffutils/diffutils-3.7.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://gnu/diffutils/${P}.tar.xz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv 
~s390 ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos 
~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris 
~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv 
~s390 sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos 
~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris 
~x86-solaris"
 IUSE="nls static"
 
 DEPEND="app-arch/xz-utils

[gentoo-commits] repo/gentoo:master commit in: sys-apps/diffutils/

2020-07-06 Thread Sergei Trofimovich

commit: 9af87bba1cd3ce3ab3a0ba96684597612958a1dc
Author: Sergei Trofimovich  gentoo  org>
AuthorDate: Mon Jul  6 07:17:58 2020 +
Commit: Sergei Trofimovich  gentoo  org>
CommitDate: Mon Jul  6 07:17:58 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9af87bba

sys-apps/diffutils: stable 3.7 for ppc64

stable wrt bug #730486

Package-Manager: Portage-2.3.103, Repoman-2.3.23
RepoMan-Options: --include-arches="ppc64"
Signed-off-by: Sergei Trofimovich  gentoo.org>

 sys-apps/diffutils/diffutils-3.7.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-apps/diffutils/diffutils-3.7.ebuild 
b/sys-apps/diffutils/diffutils-3.7.ebuild
index 5f6bc4f138a..7e13c6dcccb 100644
--- a/sys-apps/diffutils/diffutils-3.7.ebuild
+++ b/sys-apps/diffutils/diffutils-3.7.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://gnu/diffutils/${P}.tar.xz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ~ppc64 ~riscv 
~s390 ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos 
~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris 
~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv 
~s390 ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos 
~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris 
~x86-solaris"
 IUSE="nls static"
 
 DEPEND="app-arch/xz-utils

[gentoo-commits] repo/gentoo:master commit in: sys-apps/diffutils/

2020-07-06 Thread Sergei Trofimovich

commit: 7ba75bf5a422123433de44efe079bd6af8642c20
Author: Sergei Trofimovich  gentoo  org>
AuthorDate: Mon Jul  6 06:59:47 2020 +
Commit: Sergei Trofimovich  gentoo  org>
CommitDate: Mon Jul  6 07:02:37 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7ba75bf5

sys-apps/diffutils: stable 3.7 for ppc

stable wrt bug #730486

Package-Manager: Portage-2.3.103, Repoman-2.3.23
RepoMan-Options: --include-arches="ppc"
Signed-off-by: Sergei Trofimovich  gentoo.org>

 sys-apps/diffutils/diffutils-3.7.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-apps/diffutils/diffutils-3.7.ebuild 
b/sys-apps/diffutils/diffutils-3.7.ebuild
index d67de2ba947..5f6bc4f138a 100644
--- a/sys-apps/diffutils/diffutils-3.7.ebuild
+++ b/sys-apps/diffutils/diffutils-3.7.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://gnu/diffutils/${P}.tar.xz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv 
~s390 ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos 
~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris 
~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ~ppc64 ~riscv 
~s390 ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos 
~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris 
~x86-solaris"
 IUSE="nls static"
 
 DEPEND="app-arch/xz-utils

[gentoo-commits] repo/gentoo:master commit in: sys-apps/diffutils/

2019-05-04 Thread Mikle Kolyada

commit: 123f790dcd102962181ccf3f6e3be11f2e6e7222
Author: Mikle Kolyada  gentoo  org>
AuthorDate: Sat May  4 11:36:44 2019 +
Commit: Mikle Kolyada  gentoo  org>
CommitDate: Sat May  4 11:40:57 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=123f790d

sys-apps/diffutils: Add ~riscv keyword

Signed-off-by: Mikle Kolyada  gentoo.org>
Package-Manager: Portage-2.3.62, Repoman-2.3.11

 sys-apps/diffutils/diffutils-3.6-r1.ebuild | 4 ++--
 sys-apps/diffutils/diffutils-3.7.ebuild| 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/sys-apps/diffutils/diffutils-3.6-r1.ebuild 
b/sys-apps/diffutils/diffutils-3.6-r1.ebuild
index 9b431f55a80..c5ed4ceea9d 100644
--- a/sys-apps/diffutils/diffutils-3.6-r1.ebuild
+++ b/sys-apps/diffutils/diffutils-3.6-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -12,7 +12,7 @@ SRC_URI="mirror://gnu/diffutils/${P}.tar.xz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc 
x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux 
~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris 
~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh 
sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux 
~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris 
~x64-solaris ~x86-solaris"
 IUSE="nls static"
 
 DEPEND="app-arch/xz-utils

diff --git a/sys-apps/diffutils/diffutils-3.7.ebuild 
b/sys-apps/diffutils/diffutils-3.7.ebuild
index 4a57d7cd420..09a1e4a139e 100644
--- a/sys-apps/diffutils/diffutils-3.7.ebuild
+++ b/sys-apps/diffutils/diffutils-3.7.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://gnu/diffutils/${P}.tar.xz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 
~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux 
~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris 
~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv 
~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux 
~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris 
~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="nls static"
 
 DEPEND="app-arch/xz-utils

[gentoo-commits] repo/gentoo:master commit in: sys-apps/diffutils/files/

2019-01-21 Thread Lars Wendler

commit: 2bcf6d23ea329e863c2431f5f0098769f6d144c4
Author: Michael Mair-Keimberger  gmail  com>
AuthorDate: Mon Jan  7 15:09:10 2019 +
Commit: Lars Wendler  gentoo  org>
CommitDate: Mon Jan 21 11:37:42 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2bcf6d23

sys-apps/diffutils: remove unused patch(es)

Signed-off-by: Michael Mair-Keimberger  gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/10763
Signed-off-by: Lars Wendler  gentoo.org>

 .../diffutils/files/diffutils-3.5-fix_macros.patch| 19 ---
 1 file changed, 19 deletions(-)

diff --git a/sys-apps/diffutils/files/diffutils-3.5-fix_macros.patch 
b/sys-apps/diffutils/files/diffutils-3.5-fix_macros.patch
deleted file mode 100644
index ae820fc372c..000
--- a/sys-apps/diffutils/files/diffutils-3.5-fix_macros.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-http://git.savannah.gnu.org/cgit/gnulib.git/commit/lib/intprops.h?id=175b4e22f99e00996b72f822f5ae54dca8243d19
-
 diffutils-3.5/lib/intprops.h
-+++ diffutils-3.5/lib/intprops.h
-@@ -230,11 +230,11 @@
-(e.g., A and B) have the same type as MIN and MAX.  Instead, they assume
-that the result (e.g., A + B) has that type.  */
- #if _GL_HAS_BUILTIN_OVERFLOW_WITH_NULL
--# define _GL_ADD_OVERFLOW(a, b, min, max)
-+# define _GL_ADD_OVERFLOW(a, b, min, max) \
-__builtin_add_overflow (a, b, (__typeof__ ((a) + (b)) *) 0)
--# define _GL_SUBTRACT_OVERFLOW(a, b, min, max)
-+# define _GL_SUBTRACT_OVERFLOW(a, b, min, max) \
-__builtin_sub_overflow (a, b, (__typeof__ ((a) - (b)) *) 0)
--# define _GL_MULTIPLY_OVERFLOW(a, b, min, max)
-+# define _GL_MULTIPLY_OVERFLOW(a, b, min, max) \
-__builtin_mul_overflow (a, b, (__typeof__ ((a) * (b)) *) 0)
- #else
- # define _GL_ADD_OVERFLOW(a, b, min, max)\

[gentoo-commits] repo/gentoo:master commit in: sys-apps/diffutils/

2019-01-01 Thread Lars Wendler

commit: 17737419a478fa91b879d068fb1486f0ee4ce8f7
Author: Lars Wendler  gentoo  org>
AuthorDate: Tue Jan  1 11:14:45 2019 +
Commit: Lars Wendler  gentoo  org>
CommitDate: Tue Jan  1 11:14:45 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=17737419

sys-apps/diffutils: Removed old.

Package-Manager: Portage-2.3.53, Repoman-2.3.12
Signed-off-by: Lars Wendler  gentoo.org>

 sys-apps/diffutils/Manifest |  1 -
 sys-apps/diffutils/diffutils-3.5.ebuild | 49 -
 2 files changed, 50 deletions(-)

diff --git a/sys-apps/diffutils/Manifest b/sys-apps/diffutils/Manifest
index 93aaa2ed134..b45b5a00b92 100644
--- a/sys-apps/diffutils/Manifest
+++ b/sys-apps/diffutils/Manifest
@@ -1,3 +1,2 @@
-DIST diffutils-3.5.tar.xz 1360996 BLAKE2B 
a2348911daff19a73a00985e852306f88be36bc2b2433bbd1a2a4dd37da06845df718c797b571e85b7f7fdaac8cb0514098b4c14dd634d531d12ba034be6
 SHA512 
758229637e3703215adf66c5df04126ae594424abaf2cad8f1fa482bd9759e90838c943ef56e0129beb1396f5932ed9337c8396679da3de32e49bb43d423fd6b
 DIST diffutils-3.6.tar.xz 1398296 BLAKE2B 
1b0a1443f676a1c09d25ad0be4c2d936156da8e690fade9d39d94be3850c502db24c3f508178a51e817437069db2d110fb4577cd67b2cf645c11a1f26a043e3d
 SHA512 
3c159ff1cb7c901b0a57518483566b5740ca3c45aeb8d3004089f052975481db52994cc18592c502c68b0d2a1e22f1f7830f0d8dd9a9ed86de96e28cce9f70c1
 DIST diffutils-3.7.tar.xz 1448828 BLAKE2B 
d9f115e0ec9b2499545a3bef4e469fb7786d4a95e0a1c8459c885c53e8b1dc797027979e42c53c2a7df4e1e224942bd9ce5214813977af2bcc67f0698ea0c647
 SHA512 
7b12cf8aea1b9844773748f72272d9c6a38adae9c3c3a8c62048f91fb56c60b76035fa5f51665dceaf2cfbf1d1f4a3efdcc24bf47a5a16ff4350543314b12c9c

diff --git a/sys-apps/diffutils/diffutils-3.5.ebuild 
b/sys-apps/diffutils/diffutils-3.5.ebuild
deleted file mode 100644
index e8af1814a4b..000
--- a/sys-apps/diffutils/diffutils-3.5.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-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="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc 
x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux 
~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris 
~x64-solaris ~x86-solaris"
-IUSE="nls static"
-
-DEPEND="app-arch/xz-utils
-   nls? ( sys-devel/gettext )"
-
-DOCS=( AUTHORS ChangeLog NEWS README THANKS TODO )
-
-PATCHES=(
-   "${FILESDIR}/${P}-fix_macros.patch"
-)
-
-src_prepare() {
-   epatch "${PATCHES[@]}"
-}
-
-src_configure() {
-   use static && append-ldflags -static
-
-   # Disable automagic dependency over libsigsegv; see bug #312351.
-   export ac_cv_libsigsegv=no
-
-   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
-}

[gentoo-commits] repo/gentoo:master commit in: sys-apps/diffutils/

2019-01-01 Thread Lars Wendler

commit: a0c03c6661fa9946ff4dd3f84346e01461eca651
Author: Lars Wendler  gentoo  org>
AuthorDate: Tue Jan  1 11:14:19 2019 +
Commit: Lars Wendler  gentoo  org>
CommitDate: Tue Jan  1 11:14:19 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a0c03c66

sys-apps/diffutils: Bump to version 3.7

Package-Manager: Portage-2.3.53, Repoman-2.3.12
Signed-off-by: Lars Wendler  gentoo.org>

 sys-apps/diffutils/Manifest |  1 +
 sys-apps/diffutils/diffutils-3.7.ebuild | 44 +
 2 files changed, 45 insertions(+)

diff --git a/sys-apps/diffutils/Manifest b/sys-apps/diffutils/Manifest
index 74fc079beea..93aaa2ed134 100644
--- a/sys-apps/diffutils/Manifest
+++ b/sys-apps/diffutils/Manifest
@@ -1,2 +1,3 @@
 DIST diffutils-3.5.tar.xz 1360996 BLAKE2B 
a2348911daff19a73a00985e852306f88be36bc2b2433bbd1a2a4dd37da06845df718c797b571e85b7f7fdaac8cb0514098b4c14dd634d531d12ba034be6
 SHA512 
758229637e3703215adf66c5df04126ae594424abaf2cad8f1fa482bd9759e90838c943ef56e0129beb1396f5932ed9337c8396679da3de32e49bb43d423fd6b
 DIST diffutils-3.6.tar.xz 1398296 BLAKE2B 
1b0a1443f676a1c09d25ad0be4c2d936156da8e690fade9d39d94be3850c502db24c3f508178a51e817437069db2d110fb4577cd67b2cf645c11a1f26a043e3d
 SHA512 
3c159ff1cb7c901b0a57518483566b5740ca3c45aeb8d3004089f052975481db52994cc18592c502c68b0d2a1e22f1f7830f0d8dd9a9ed86de96e28cce9f70c1
+DIST diffutils-3.7.tar.xz 1448828 BLAKE2B 
d9f115e0ec9b2499545a3bef4e469fb7786d4a95e0a1c8459c885c53e8b1dc797027979e42c53c2a7df4e1e224942bd9ce5214813977af2bcc67f0698ea0c647
 SHA512 
7b12cf8aea1b9844773748f72272d9c6a38adae9c3c3a8c62048f91fb56c60b76035fa5f51665dceaf2cfbf1d1f4a3efdcc24bf47a5a16ff4350543314b12c9c

diff --git a/sys-apps/diffutils/diffutils-3.7.ebuild 
b/sys-apps/diffutils/diffutils-3.7.ebuild
new file mode 100644
index 000..4a57d7cd420
--- /dev/null
+++ b/sys-apps/diffutils/diffutils-3.7.ebuild
@@ -0,0 +1,44 @@
+# 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="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 
~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux 
~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris 
~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="nls static"
+
+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
+}

[gentoo-commits] repo/gentoo:master commit in: sys-apps/diffutils/

2018-08-24 Thread Jeroen Roovers

commit: 4b4fa25f8a08ba2d6543a952886dad5f09533a92
Author: Jeroen Roovers  gentoo  org>
AuthorDate: Fri Aug 24 09:44:31 2018 +
Commit: Jeroen Roovers  gentoo  org>
CommitDate: Fri Aug 24 11:56:55 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4b4fa25f

sys-apps/diffutils: Stable for HPPA too.

Package-Manager: Portage-2.3.48, Repoman-2.3.10
RepoMan-Options: --ignore-arches

 sys-apps/diffutils/diffutils-3.6-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-apps/diffutils/diffutils-3.6-r1.ebuild 
b/sys-apps/diffutils/diffutils-3.6-r1.ebuild
index 7f7c8107db3..b578198425f 100644
--- a/sys-apps/diffutils/diffutils-3.6-r1.ebuild
+++ b/sys-apps/diffutils/diffutils-3.6-r1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://gnu/diffutils/${P}.tar.xz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 ~hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc 
x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux 
~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris 
~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc 
x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux 
~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris 
~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="nls static"
 
 DEPEND="app-arch/xz-utils

[gentoo-commits] repo/gentoo:master commit in: sys-apps/diffutils/

2018-08-24 Thread Mikle Kolyada

commit: 7a44052fadb8d0b4fc4bd881c69677f67c1feb67
Author: Mikle Kolyada  gentoo  org>
AuthorDate: Fri Aug 24 06:18:56 2018 +
Commit: Mikle Kolyada  gentoo  org>
CommitDate: Fri Aug 24 06:18:56 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7a44052f

sys-apps/diffutils: mark stable wrt bug #664186

Package-Manager: Portage-2.3.40, Repoman-2.3.9

 sys-apps/diffutils/diffutils-3.6-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-apps/diffutils/diffutils-3.6-r1.ebuild 
b/sys-apps/diffutils/diffutils-3.6-r1.ebuild
index a09a39c2860..7f7c8107db3 100644
--- a/sys-apps/diffutils/diffutils-3.6-r1.ebuild
+++ b/sys-apps/diffutils/diffutils-3.6-r1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://gnu/diffutils/${P}.tar.xz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 
~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux 
~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint 
~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 ~hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc 
x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux 
~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris 
~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="nls static"
 
 DEPEND="app-arch/xz-utils

[gentoo-commits] repo/gentoo:master commit in: sys-apps/diffutils/

2018-08-23 Thread Sergei Trofimovich

commit: 8b35d7f3a856adb3e45236b1c20675dc8fe4abe6
Author: Rolf Eike Beer  sf-mail  de>
AuthorDate: Wed Aug 22 05:36:16 2018 +
Commit: Sergei Trofimovich  gentoo  org>
CommitDate: Thu Aug 23 08:34:15 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8b35d7f3

sys-apps/diffutils: stable 3.6-r1 for sparc, bug #664186

Package-Manager: Portage-2.3.40, Repoman-2.3.9
RepoMan-Options: --include-arches="sparc"

 sys-apps/diffutils/diffutils-3.6-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-apps/diffutils/diffutils-3.6-r1.ebuild 
b/sys-apps/diffutils/diffutils-3.6-r1.ebuild
index d020e3fb7ea..a09a39c2860 100644
--- a/sys-apps/diffutils/diffutils-3.6-r1.ebuild
+++ b/sys-apps/diffutils/diffutils-3.6-r1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://gnu/diffutils/${P}.tar.xz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 
~sh ~sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux 
~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint 
~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 
~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux 
~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint 
~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="nls static"
 
 DEPEND="app-arch/xz-utils

[gentoo-commits] repo/gentoo:master commit in: sys-apps/diffutils/

2018-08-22 Thread Thomas Deutschmann

commit: 5d36161740a6a239d69b61b60e6ed630fc19bca7
Author: Thomas Deutschmann  gentoo  org>
AuthorDate: Thu Aug 23 01:28:59 2018 +
Commit: Thomas Deutschmann  gentoo  org>
CommitDate: Thu Aug 23 01:28:59 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5d361617

sys-apps/diffutils: x86 stable (bug #664186)

Package-Manager: Portage-2.3.48, Repoman-2.3.10

 sys-apps/diffutils/diffutils-3.6-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-apps/diffutils/diffutils-3.6-r1.ebuild 
b/sys-apps/diffutils/diffutils-3.6-r1.ebuild
index 8c6c04150fd..d020e3fb7ea 100644
--- a/sys-apps/diffutils/diffutils-3.6-r1.ebuild
+++ b/sys-apps/diffutils/diffutils-3.6-r1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://gnu/diffutils/${P}.tar.xz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 
~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux 
~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint 
~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 
~sh ~sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux 
~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint 
~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="nls static"
 
 DEPEND="app-arch/xz-utils

[gentoo-commits] repo/gentoo:master commit in: sys-apps/diffutils/

2018-08-22 Thread Mart Raudsepp

commit: 5ffbcaa1e3d7f889accedcf3d14cfe6396e67559
Author: Mart Raudsepp  gentoo  org>
AuthorDate: Wed Aug 22 22:43:34 2018 +
Commit: Mart Raudsepp  gentoo  org>
CommitDate: Wed Aug 22 22:45:03 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5ffbcaa1

sys-apps/diffutils-3.6-r1: arm64 stable (bug #664186)

Package-Manager: Portage-2.3.48, Repoman-2.3.10

 sys-apps/diffutils/diffutils-3.6-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-apps/diffutils/diffutils-3.6-r1.ebuild 
b/sys-apps/diffutils/diffutils-3.6-r1.ebuild
index ab2624456bf..8c6c04150fd 100644
--- a/sys-apps/diffutils/diffutils-3.6-r1.ebuild
+++ b/sys-apps/diffutils/diffutils-3.6-r1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://gnu/diffutils/${P}.tar.xz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 
~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux 
~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint 
~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 
~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux 
~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint 
~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="nls static"
 
 DEPEND="app-arch/xz-utils

[gentoo-commits] repo/gentoo:master commit in: sys-apps/diffutils/

2018-06-22 Thread Lars Wendler

commit: a80e373609652648b740ad17c320143821bd6ef0
Author: Lars Wendler  gentoo  org>
AuthorDate: Fri Jun 22 10:12:01 2018 +
Commit: Lars Wendler  gentoo  org>
CommitDate: Fri Jun 22 10:12:01 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a80e3736

sys-apps/diffutils: Removed old.

Package-Manager: Portage-2.3.40, Repoman-2.3.9

 sys-apps/diffutils/Manifest |  1 -
 sys-apps/diffutils/diffutils-3.3.ebuild | 48 -
 sys-apps/diffutils/diffutils-3.6.ebuild | 41 
 3 files changed, 90 deletions(-)

diff --git a/sys-apps/diffutils/Manifest b/sys-apps/diffutils/Manifest
index 4fa1a53bfb2..74fc079beea 100644
--- a/sys-apps/diffutils/Manifest
+++ b/sys-apps/diffutils/Manifest
@@ -1,3 +1,2 @@
-DIST diffutils-3.3.tar.xz 1197832 BLAKE2B 
8819e84f6d1d9ae30dccba01934ba506fd9e2033cc7ac8e2dc827868f6b8ce54c76129167d8754215d0637f9e731ca1176ffa83abd80eb95e37a29776e29afa1
 SHA512 
b04b998717e45e8fd1ba675957dad1909beeed68ffc41c0d9bbaddaf78965f9e63af5a8d8811bb94f33a3cddcad2fe1ad794e52e545def9ce96c092999a74a83
 DIST diffutils-3.5.tar.xz 1360996 BLAKE2B 
a2348911daff19a73a00985e852306f88be36bc2b2433bbd1a2a4dd37da06845df718c797b571e85b7f7fdaac8cb0514098b4c14dd634d531d12ba034be6
 SHA512 
758229637e3703215adf66c5df04126ae594424abaf2cad8f1fa482bd9759e90838c943ef56e0129beb1396f5932ed9337c8396679da3de32e49bb43d423fd6b
 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 ebe4d302399..000
--- a/sys-apps/diffutils/diffutils-3.3.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-
-inherit flag-o-matic
-
-DESCRIPTION="Tools to make diffs and compare files"
-HOMEPAGE="https://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="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc 
x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux 
~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris 
~x64-solaris ~x86-solaris"
-IUSE="nls static"
-
-DEPEND="app-arch/xz-utils
-   nls? ( sys-devel/gettext )"
-
-DOCS=( AUTHORS ChangeLog NEWS README THANKS TODO )
-
-src_prepare() {
-   # Disable gnulib build test that has no impact on the source.
-   # Re-enable w/next version bump (and gnulib is updated). #554728
-   [[ ${PV} != "3.3" ]] && die "re-enable test #554728"
-   echo 'exit 0' > gnulib-tests/test-update-copyright.sh || die
-
-   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="https://bugs.gentoo.org/; \
-   $(use_enable nls)
-}
-
-src_test() {
-   # explicitly allow parallel testing
-   emake check
-}

diff --git a/sys-apps/diffutils/diffutils-3.6.ebuild 
b/sys-apps/diffutils/diffutils-3.6.ebuild
deleted file mode 100644
index 58f25710df8..000
--- a/sys-apps/diffutils/diffutils-3.6.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-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="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 
~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux 
~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint 
~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="nls static"
-
-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
-
-   local myeconfargs=(
-   --with-packager="Gentoo"
-   --with-packager-version="${PVR}"
-   --with-packager-bug-reports="https://bugs.gentoo.org/;
-

[gentoo-commits] repo/gentoo:master commit in: sys-apps/diffutils/

2018-06-22 Thread Mikle Kolyada

commit: 736ad254e471def0e25849a8af338eb26e72946c
Author: Mikle Kolyada  gentoo  org>
AuthorDate: Fri Jun 22 09:23:55 2018 +
Commit: Mikle Kolyada  gentoo  org>
CommitDate: Fri Jun 22 09:23:55 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=736ad254

sys-apps/diffutils: ppc stable wrt bug #612794

Package-Manager: Portage-2.3.40, Repoman-2.3.9

 sys-apps/diffutils/diffutils-3.5.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-apps/diffutils/diffutils-3.5.ebuild 
b/sys-apps/diffutils/diffutils-3.5.ebuild
index 5a731d693b2..af38207bd6b 100644
--- a/sys-apps/diffutils/diffutils-3.5.ebuild
+++ b/sys-apps/diffutils/diffutils-3.5.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://gnu/diffutils/${P}.tar.xz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ~ppc ppc64 s390 sh sparc 
x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux 
~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris 
~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc 
x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux 
~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris 
~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="nls static"
 
 DEPEND="app-arch/xz-utils

[gentoo-commits] repo/gentoo:master commit in: sys-apps/diffutils/

2018-06-12 Thread Thomas Deutschmann

commit: 430733d66882ebd89cad7b81783713b02d7f44bb
Author: Thomas Deutschmann  gentoo  org>
AuthorDate: Tue Jun 12 20:47:00 2018 +
Commit: Thomas Deutschmann  gentoo  org>
CommitDate: Tue Jun 12 20:49:18 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=430733d6

sys-apps/diffutils: fix build with glibc 2.26

Aside fix for building with glibc 2.26, ebuild was bumped
to EAPI=6.

Bug: https://bugs.gentoo.org/653914
Package-Manager: Portage-2.3.40, Repoman-2.3.9

 sys-apps/diffutils/diffutils-3.6-r1.ebuild | 44 ++
 1 file changed, 44 insertions(+)

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 000..ab2624456bf
--- /dev/null
+++ b/sys-apps/diffutils/diffutils-3.6-r1.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2018 Gentoo Foundation
+# 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="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 
~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux 
~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint 
~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="nls static"
+
+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
+}

[gentoo-commits] repo/gentoo:master commit in: sys-apps/diffutils/

2018-06-12 Thread Thomas Deutschmann

commit: 73b8a1317a00a8191b87bad24f757f735fb78d0a
Author: Thomas Deutschmann  gentoo  org>
AuthorDate: Tue Jun 12 20:48:59 2018 +
Commit: Thomas Deutschmann  gentoo  org>
CommitDate: Tue Jun 12 20:49:20 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=73b8a131

sys-apps/diffutils: m86k/sh stable (bug #612794)

Package-Manager: Portage-2.3.40, Repoman-2.3.9

 sys-apps/diffutils/diffutils-3.5.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-apps/diffutils/diffutils-3.5.ebuild 
b/sys-apps/diffutils/diffutils-3.5.ebuild
index d04a8dbb40f..5a731d693b2 100644
--- a/sys-apps/diffutils/diffutils-3.5.ebuild
+++ b/sys-apps/diffutils/diffutils-3.5.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://gnu/diffutils/${P}.tar.xz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ~ppc ppc64 s390 ~sh 
sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux 
~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris 
~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ~ppc ppc64 s390 sh sparc 
x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux 
~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris 
~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="nls static"
 
 DEPEND="app-arch/xz-utils

[gentoo-commits] repo/gentoo:master commit in: sys-apps/diffutils/

2018-06-12 Thread Mikle Kolyada

commit: c9f0b7c492b55b6b8dd48b7511449f8360e9df03
Author: Mikle Kolyada  gentoo  org>
AuthorDate: Tue Jun 12 16:11:35 2018 +
Commit: Mikle Kolyada  gentoo  org>
CommitDate: Tue Jun 12 16:11:55 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c9f0b7c4

sys-apps/diffutils: s390 stable wrt bug #612794

Package-Manager: Portage-2.3.40, Repoman-2.3.9

 sys-apps/diffutils/diffutils-3.5.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-apps/diffutils/diffutils-3.5.ebuild 
b/sys-apps/diffutils/diffutils-3.5.ebuild
index 12510de9dd8..d04a8dbb40f 100644
--- a/sys-apps/diffutils/diffutils-3.5.ebuild
+++ b/sys-apps/diffutils/diffutils-3.5.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://gnu/diffutils/${P}.tar.xz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ~ppc ppc64 ~s390 ~sh 
sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux 
~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris 
~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ~ppc ppc64 s390 ~sh 
sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux 
~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris 
~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="nls static"
 
 DEPEND="app-arch/xz-utils

[gentoo-commits] repo/gentoo:master commit in: sys-apps/diffutils/

2017-06-04 Thread Sergei Trofimovich

commit: 8add29f269540341607951808e229b1e7bf0970a
Author: Sergei Trofimovich  gentoo  org>
AuthorDate: Sun Jun  4 20:12:25 2017 +
Commit: Sergei Trofimovich  gentoo  org>
CommitDate: Sun Jun  4 20:12:25 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8add29f2

sys-apps/diffutils: ia64 stable, bug #612794

Package-Manager: Portage-2.3.6, Repoman-2.3.2

 sys-apps/diffutils/diffutils-3.5.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-apps/diffutils/diffutils-3.5.ebuild 
b/sys-apps/diffutils/diffutils-3.5.ebuild
index 426af27f7e9..4f4cc34faea 100644
--- a/sys-apps/diffutils/diffutils-3.5.ebuild
+++ b/sys-apps/diffutils/diffutils-3.5.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://gnu/diffutils/${P}.tar.xz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ~ppc ppc64 ~s390 ~sh 
sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux 
~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint 
~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ~ppc ppc64 ~s390 ~sh 
sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux 
~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint 
~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="nls static"
 
 DEPEND="app-arch/xz-utils

[gentoo-commits] repo/gentoo:master commit in: sys-apps/diffutils/

2017-05-24 Thread Lars Wendler

commit: c1a936560f31a3e42fc14bfc606f5638e58ffd85
Author: Lars Wendler  gentoo  org>
AuthorDate: Wed May 24 15:54:13 2017 +
Commit: Lars Wendler  gentoo  org>
CommitDate: Wed May 24 15:54:43 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c1a93656

sys-apps/diffutils: Bump to version 3.6

Package-Manager: Portage-2.3.6, Repoman-2.3.2

 sys-apps/diffutils/Manifest |  1 +
 sys-apps/diffutils/diffutils-3.6.ebuild | 41 +
 2 files changed, 42 insertions(+)

diff --git a/sys-apps/diffutils/Manifest b/sys-apps/diffutils/Manifest
index 6a6a1963700..587d970ba46 100644
--- a/sys-apps/diffutils/Manifest
+++ b/sys-apps/diffutils/Manifest
@@ -1,2 +1,3 @@
 DIST diffutils-3.3.tar.xz 1197832 SHA256 
a25e89a8ab65fded1731e4186be1bb25cda967834b6df973599cdcd5abdfc19c SHA512 
b04b998717e45e8fd1ba675957dad1909beeed68ffc41c0d9bbaddaf78965f9e63af5a8d8811bb94f33a3cddcad2fe1ad794e52e545def9ce96c092999a74a83
 WHIRLPOOL 
8fd3b179afdc3fd127cee8829535b0fc6d949443645e8df80fa45c2fa44a732ea652259b644d81a9be14d4c7f7c3b5bad7b8861934a6bc691cd02a34c0200ed3
 DIST diffutils-3.5.tar.xz 1360996 SHA256 
dad398ccd5b9faca6b0ab219a036453f62a602a56203ac659b43e889bec35533 SHA512 
758229637e3703215adf66c5df04126ae594424abaf2cad8f1fa482bd9759e90838c943ef56e0129beb1396f5932ed9337c8396679da3de32e49bb43d423fd6b
 WHIRLPOOL 
2f367fc10679bfc1377612bfdc693792f5afdc0969c06d7607370bb626d8eb63868b71d2342133fea6210291f34ad3f53b4af34d457a13fc675fc7dc5f6c2f6e
+DIST diffutils-3.6.tar.xz 1398296 SHA256 
d621e8bdd4b573918c8145f7ae61817d1be9deb4c8d2328a65cea8e11d783bd6 SHA512 
3c159ff1cb7c901b0a57518483566b5740ca3c45aeb8d3004089f052975481db52994cc18592c502c68b0d2a1e22f1f7830f0d8dd9a9ed86de96e28cce9f70c1
 WHIRLPOOL 
8b80d3963f65a62abb49805650a33b00be57f11892a7ce5e5fc7bdd6dc0d347adf959834998e8f9234e20ff1268727978ba9fe667b139ec16d72cb212a6a14bd

diff --git a/sys-apps/diffutils/diffutils-3.6.ebuild 
b/sys-apps/diffutils/diffutils-3.6.ebuild
new file mode 100644
index 000..3a2a7b9e2be
--- /dev/null
+++ b/sys-apps/diffutils/diffutils-3.6.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+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="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 
~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~sparc-fbsd ~x86-fbsd 
~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint 
~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="nls static"
+
+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
+
+   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
+}

[gentoo-commits] repo/gentoo:master commit in: sys-apps/diffutils/, sys-apps/diffutils/files/

2017-05-08 Thread Lars Wendler

commit: 6777c2a8d02373238566c8268c3d3acc5904837b
Author: Lars Wendler  gentoo  org>
AuthorDate: Mon May  8 11:28:01 2017 +
Commit: Lars Wendler  gentoo  org>
CommitDate: Mon May  8 11:29:07 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6777c2a8

sys-apps/diffutils: Added gcc-7 build fix (bug #617538).

Thanks to lekto for providing a patch in GH PR #4553.

Closes: https://github.com/gentoo/gentoo/pull/4553
Package-Manager: Portage-2.3.5, Repoman-2.3.2

 sys-apps/diffutils/diffutils-3.5.ebuild   | 18 ++
 .../diffutils/files/diffutils-3.5-fix_macros.patch| 19 +++
 2 files changed, 33 insertions(+), 4 deletions(-)

diff --git a/sys-apps/diffutils/diffutils-3.5.ebuild 
b/sys-apps/diffutils/diffutils-3.5.ebuild
index da215965bb0..426af27f7e9 100644
--- a/sys-apps/diffutils/diffutils-3.5.ebuild
+++ b/sys-apps/diffutils/diffutils-3.5.ebuild
@@ -20,17 +20,27 @@ DEPEND="app-arch/xz-utils
 
 DOCS=( AUTHORS ChangeLog NEWS README THANKS TODO )
 
+PATCHES=(
+   "${FILESDIR}/${P}-fix_macros.patch"
+)
+
+src_prepare() {
+   epatch "${PATCHES[@]}"
+}
+
 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="https://bugs.gentoo.org/; \
+   local myeconfargs=(
+   --with-packager="Gentoo"
+   --with-packager-version="${PVR}"
+   --with-packager-bug-reports="https://bugs.gentoo.org/;
$(use_enable nls)
+   )
+   econf "${myeconfargs[@]}"
 }
 
 src_test() {

diff --git a/sys-apps/diffutils/files/diffutils-3.5-fix_macros.patch 
b/sys-apps/diffutils/files/diffutils-3.5-fix_macros.patch
new file mode 100644
index 000..ae820fc372c
--- /dev/null
+++ b/sys-apps/diffutils/files/diffutils-3.5-fix_macros.patch
@@ -0,0 +1,19 @@
+http://git.savannah.gnu.org/cgit/gnulib.git/commit/lib/intprops.h?id=175b4e22f99e00996b72f822f5ae54dca8243d19
+
+--- diffutils-3.5/lib/intprops.h
 diffutils-3.5/lib/intprops.h
+@@ -230,11 +230,11 @@
+(e.g., A and B) have the same type as MIN and MAX.  Instead, they assume
+that the result (e.g., A + B) has that type.  */
+ #if _GL_HAS_BUILTIN_OVERFLOW_WITH_NULL
+-# define _GL_ADD_OVERFLOW(a, b, min, max)
++# define _GL_ADD_OVERFLOW(a, b, min, max) \
+__builtin_add_overflow (a, b, (__typeof__ ((a) + (b)) *) 0)
+-# define _GL_SUBTRACT_OVERFLOW(a, b, min, max)
++# define _GL_SUBTRACT_OVERFLOW(a, b, min, max) \
+__builtin_sub_overflow (a, b, (__typeof__ ((a) - (b)) *) 0)
+-# define _GL_MULTIPLY_OVERFLOW(a, b, min, max)
++# define _GL_MULTIPLY_OVERFLOW(a, b, min, max) \
+__builtin_mul_overflow (a, b, (__typeof__ ((a) * (b)) *) 0)
+ #else
+ # define _GL_ADD_OVERFLOW(a, b, min, max)\

[gentoo-commits] repo/gentoo:master commit in: sys-apps/diffutils/, sys-apps/diffutils/files/

2017-05-08 Thread Lars Wendler

commit: 56f4cf1b65b83ac2e625b7c4a7f058bfe05a42b0
Author: Lars Wendler  gentoo  org>
AuthorDate: Mon May  8 11:28:53 2017 +
Commit: Lars Wendler  gentoo  org>
CommitDate: Mon May  8 11:29:09 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=56f4cf1b

sys-apps/diffutils: Removed old.

Package-Manager: Portage-2.3.5, Repoman-2.3.2

 sys-apps/diffutils/Manifest|   1 -
 sys-apps/diffutils/diffutils-3.4-r1.ebuild |  49 
 .../files/diffutils-3.4-diff3_fix_leaks.patch  | 123 -
 .../files/diffutils-3.4-diff3_use_after_free.patch |  26 -
 .../diffutils-3.4-no_color_on_dumb_terms.patch |  49 
 5 files changed, 248 deletions(-)

diff --git a/sys-apps/diffutils/Manifest b/sys-apps/diffutils/Manifest
index 92e1c60bba5..6a6a1963700 100644
--- a/sys-apps/diffutils/Manifest
+++ b/sys-apps/diffutils/Manifest
@@ -1,3 +1,2 @@
 DIST diffutils-3.3.tar.xz 1197832 SHA256 
a25e89a8ab65fded1731e4186be1bb25cda967834b6df973599cdcd5abdfc19c SHA512 
b04b998717e45e8fd1ba675957dad1909beeed68ffc41c0d9bbaddaf78965f9e63af5a8d8811bb94f33a3cddcad2fe1ad794e52e545def9ce96c092999a74a83
 WHIRLPOOL 
8fd3b179afdc3fd127cee8829535b0fc6d949443645e8df80fa45c2fa44a732ea652259b644d81a9be14d4c7f7c3b5bad7b8861934a6bc691cd02a34c0200ed3
-DIST diffutils-3.4.tar.xz 1358392 SHA256 
db53c025f2ac3d217bcf753dad6dee7b410b33d0948495ff015aaf8b91189ce2 SHA512 
0fc273007e35e67e217116e776956c6a24421f298d3e6fe60aa1d4250938a65bb8e685cd815517317b5637f5c412c1550d7c1994a9e0283ebbcae9bde24a260d
 WHIRLPOOL 
cd9460385d618b169b343e5f197937a4abfbf3d64076c609a0cde78372d08225fc2078fa7c028a80963f08f3eadfc2ee8074b03b83730745842da44f7483113f
 DIST diffutils-3.5.tar.xz 1360996 SHA256 
dad398ccd5b9faca6b0ab219a036453f62a602a56203ac659b43e889bec35533 SHA512 
758229637e3703215adf66c5df04126ae594424abaf2cad8f1fa482bd9759e90838c943ef56e0129beb1396f5932ed9337c8396679da3de32e49bb43d423fd6b
 WHIRLPOOL 
2f367fc10679bfc1377612bfdc693792f5afdc0969c06d7607370bb626d8eb63868b71d2342133fea6210291f34ad3f53b4af34d457a13fc675fc7dc5f6c2f6e

diff --git a/sys-apps/diffutils/diffutils-3.4-r1.ebuild 
b/sys-apps/diffutils/diffutils-3.4-r1.ebuild
deleted file mode 100644
index 339b0e97416..000
--- a/sys-apps/diffutils/diffutils-3.4-r1.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-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="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 
~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux 
~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint 
~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="nls static"
-
-DEPEND="app-arch/xz-utils
-   nls? ( sys-devel/gettext )"
-
-DOCS=( AUTHORS ChangeLog NEWS README THANKS TODO )
-
-PATCHES=(
-   "${FILESDIR}/${P}-no_color_on_dumb_terms.patch"
-   "${FILESDIR}/${P}-diff3_use_after_free.patch"
-   "${FILESDIR}/${P}-diff3_fix_leaks.patch"
-)
-
-src_prepare() {
-   epatch "${PATCHES[@]}"
-}
-
-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="https://bugs.gentoo.org/; \
-   $(use_enable nls)
-}
-
-src_test() {
-   # explicitly allow parallel testing
-   emake check
-}

diff --git a/sys-apps/diffutils/files/diffutils-3.4-diff3_fix_leaks.patch 
b/sys-apps/diffutils/files/diffutils-3.4-diff3_fix_leaks.patch
deleted file mode 100644
index fda8319c73c..000
--- a/sys-apps/diffutils/files/diffutils-3.4-diff3_fix_leaks.patch
+++ /dev/null
@@ -1,123 +0,0 @@
-From edd942ca27d570a33d612b12eecaa33a76640e46 Mon Sep 17 00:00:00 2001
-From: Jim Meyering 
-Date: Fri, 12 Aug 2016 21:40:29 -0700
-Subject: diff3: fix leaks, for real
-
-* src/diff3.c (struct diff_block)[lint]: Add member, n2.
-(free_diff_block, next_to_n2): New functions.

-
-diff --git a/src/diff3.c b/src/diff3.c
-index 0eb643e..b80aeb3 100644
 a/src/diff3.c
-+++ b/src/diff3.c
-@@ -78,6 +78,9 @@ struct diff_block {
-   char **lines[2];/* The actual lines (may contain nulls) */
-   size_t *lengths[2]; /* Line lengths (including newlines, if any) */
-   struct diff_block *next;
-+#ifdef lint
-+  struct diff_block *n2;  /* Used only when freeing.  */
-+#endif
- };
- 
- /* Three way diff */
-@@ -176,7 +179,7 @@ static struct diff3_block *create_diff3_block (lin, lin, 
lin, lin, lin, lin);
- static struct

[gentoo-commits] repo/gentoo:master commit in: sys-apps/diffutils/

2017-03-17 Thread Agostino Sarubbo

commit: b3eb01e40dbcf7244ef7485d99a263a4fedd85c9
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Fri Mar 17 10:42:15 2017 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Fri Mar 17 10:42:15 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b3eb01e4

sys-apps/diffutils: sparc stable wrt bug #612794

Package-Manager: Portage-2.3.3, Repoman-2.3.1
RepoMan-Options: --include-arches="sparc"
Signed-off-by: Agostino Sarubbo  gentoo.org>

 sys-apps/diffutils/diffutils-3.5.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-apps/diffutils/diffutils-3.5.ebuild 
b/sys-apps/diffutils/diffutils-3.5.ebuild
index e37fbe1285c..7f84d84f54e 100644
--- a/sys-apps/diffutils/diffutils-3.5.ebuild
+++ b/sys-apps/diffutils/diffutils-3.5.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://gnu/diffutils/${P}.tar.xz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ~ppc ppc64 ~s390 ~sh 
~sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux 
~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint 
~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ~ppc ppc64 ~s390 ~sh 
sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux 
~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint 
~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="nls static"
 
 DEPEND="app-arch/xz-utils

[gentoo-commits] repo/gentoo:master commit in: sys-apps/diffutils/

2017-03-17 Thread Agostino Sarubbo

commit: afeb1ed38fe0eca6d92097141a94795b7b241381
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Fri Mar 17 10:24:59 2017 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Fri Mar 17 10:26:38 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=afeb1ed3

sys-apps/diffutils: x86 stable wrt bug #612794

Package-Manager: Portage-2.3.3, Repoman-2.3.1
RepoMan-Options: --include-arches="x86"
Signed-off-by: Agostino Sarubbo  gentoo.org>

 sys-apps/diffutils/diffutils-3.5.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-apps/diffutils/diffutils-3.5.ebuild 
b/sys-apps/diffutils/diffutils-3.5.ebuild
index 9b3d825d60c..e37fbe1285c 100644
--- a/sys-apps/diffutils/diffutils-3.5.ebuild
+++ b/sys-apps/diffutils/diffutils-3.5.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://gnu/diffutils/${P}.tar.xz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ~ppc ppc64 ~s390 ~sh 
~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux 
~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint 
~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ~ppc ppc64 ~s390 ~sh 
~sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux 
~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint 
~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="nls static"
 
 DEPEND="app-arch/xz-utils

[gentoo-commits] repo/gentoo:master commit in: sys-apps/diffutils/

2017-03-17 Thread Agostino Sarubbo

commit: 16cbaa0c533bdd4484c92fd96cb3061f6168dbc2
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Fri Mar 17 10:14:45 2017 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Fri Mar 17 10:14:45 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=16cbaa0c

sys-apps/diffutils: amd64 stable wrt bug #612794

Package-Manager: Portage-2.3.3, Repoman-2.3.1
RepoMan-Options: --include-arches="amd64"
Signed-off-by: Agostino Sarubbo  gentoo.org>

 sys-apps/diffutils/diffutils-3.5.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-apps/diffutils/diffutils-3.5.ebuild 
b/sys-apps/diffutils/diffutils-3.5.ebuild
index 383832c1659..9b3d825d60c 100644
--- a/sys-apps/diffutils/diffutils-3.5.ebuild
+++ b/sys-apps/diffutils/diffutils-3.5.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://gnu/diffutils/${P}.tar.xz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 arm arm64 hppa ~ia64 ~m68k ~mips ~ppc ppc64 ~s390 ~sh 
~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux 
~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint 
~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ~ppc ppc64 ~s390 ~sh 
~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux 
~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint 
~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="nls static"
 
 DEPEND="app-arch/xz-utils

[gentoo-commits] repo/gentoo:master commit in: sys-apps/diffutils/

2017-03-16 Thread Jeroen Roovers

commit: 7f8f1f63d747561f41022b37328eee6d0b833e71
Author: Jeroen Roovers  gentoo  org>
AuthorDate: Thu Mar 16 18:35:06 2017 +
Commit: Jeroen Roovers  gentoo  org>
CommitDate: Thu Mar 16 18:36:20 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7f8f1f63

sys-apps/diffutils: Stable for HPPA (bug #612794).

Package-Manager: Portage-2.3.4, Repoman-2.3.2
RepoMan-Options: --ignore-arches

 sys-apps/diffutils/diffutils-3.5.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-apps/diffutils/diffutils-3.5.ebuild 
b/sys-apps/diffutils/diffutils-3.5.ebuild
index 27d40b6cffb..383832c1659 100644
--- a/sys-apps/diffutils/diffutils-3.5.ebuild
+++ b/sys-apps/diffutils/diffutils-3.5.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://gnu/diffutils/${P}.tar.xz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ppc64 ~s390 ~sh 
~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux 
~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint 
~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 arm arm64 hppa ~ia64 ~m68k ~mips ~ppc ppc64 ~s390 ~sh 
~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux 
~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint 
~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="nls static"
 
 DEPEND="app-arch/xz-utils

[gentoo-commits] repo/gentoo:master commit in: sys-apps/diffutils/

2017-03-16 Thread Michael Weber

commit: fdb5cf05b511be79221dbe2ec505797a366d3a58
Author: Michael Weber  gentoo  org>
AuthorDate: Thu Mar 16 09:20:32 2017 +
Commit: Michael Weber  gentoo  org>
CommitDate: Thu Mar 16 09:45:14 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fdb5cf05

sys-apps/diffutils: arm arm64 ppc ppc64 stable (bug 612794).

Package-Manager: Portage-2.3.4, Repoman-2.3.2
RepoMan-Options: --include-arches="arm arm64 ppc ppc64"

 sys-apps/diffutils/diffutils-3.5.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-apps/diffutils/diffutils-3.5.ebuild 
b/sys-apps/diffutils/diffutils-3.5.ebuild
index 6f24cb5f91f..27d40b6cffb 100644
--- a/sys-apps/diffutils/diffutils-3.5.ebuild
+++ b/sys-apps/diffutils/diffutils-3.5.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://gnu/diffutils/${P}.tar.xz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 
~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~sparc-fbsd ~x86-fbsd 
~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint 
~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ppc64 ~s390 ~sh 
~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux 
~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint 
~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="nls static"
 
 DEPEND="app-arch/xz-utils

[gentoo-commits] repo/gentoo:master commit in: sys-apps/diffutils/

2016-08-21 Thread Lars Wendler

commit: 8d20cb40b869f8d94f410dad378348cc9873db11
Author: Lars Wendler  gentoo  org>
AuthorDate: Sun Aug 21 08:30:21 2016 +
Commit: Lars Wendler  gentoo  org>
CommitDate: Sun Aug 21 08:30:21 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8d20cb40

sys-apps/diffutils: Bump to version 3.5

Package-Manager: portage-2.3.0
Signed-off-by: Lars Wendler  gentoo.org>

 sys-apps/diffutils/Manifest |  1 +
 sys-apps/diffutils/diffutils-3.5.ebuild | 40 +
 2 files changed, 41 insertions(+)

diff --git a/sys-apps/diffutils/Manifest b/sys-apps/diffutils/Manifest
index c3525cc..92e1c60 100644
--- a/sys-apps/diffutils/Manifest
+++ b/sys-apps/diffutils/Manifest
@@ -1,2 +1,3 @@
 DIST diffutils-3.3.tar.xz 1197832 SHA256 
a25e89a8ab65fded1731e4186be1bb25cda967834b6df973599cdcd5abdfc19c SHA512 
b04b998717e45e8fd1ba675957dad1909beeed68ffc41c0d9bbaddaf78965f9e63af5a8d8811bb94f33a3cddcad2fe1ad794e52e545def9ce96c092999a74a83
 WHIRLPOOL 
8fd3b179afdc3fd127cee8829535b0fc6d949443645e8df80fa45c2fa44a732ea652259b644d81a9be14d4c7f7c3b5bad7b8861934a6bc691cd02a34c0200ed3
 DIST diffutils-3.4.tar.xz 1358392 SHA256 
db53c025f2ac3d217bcf753dad6dee7b410b33d0948495ff015aaf8b91189ce2 SHA512 
0fc273007e35e67e217116e776956c6a24421f298d3e6fe60aa1d4250938a65bb8e685cd815517317b5637f5c412c1550d7c1994a9e0283ebbcae9bde24a260d
 WHIRLPOOL 
cd9460385d618b169b343e5f197937a4abfbf3d64076c609a0cde78372d08225fc2078fa7c028a80963f08f3eadfc2ee8074b03b83730745842da44f7483113f
+DIST diffutils-3.5.tar.xz 1360996 SHA256 
dad398ccd5b9faca6b0ab219a036453f62a602a56203ac659b43e889bec35533 SHA512 
758229637e3703215adf66c5df04126ae594424abaf2cad8f1fa482bd9759e90838c943ef56e0129beb1396f5932ed9337c8396679da3de32e49bb43d423fd6b
 WHIRLPOOL 
2f367fc10679bfc1377612bfdc693792f5afdc0969c06d7607370bb626d8eb63868b71d2342133fea6210291f34ad3f53b4af34d457a13fc675fc7dc5f6c2f6e

diff --git a/sys-apps/diffutils/diffutils-3.5.ebuild 
b/sys-apps/diffutils/diffutils-3.5.ebuild
new file mode 100644
index 000..94ca67d
--- /dev/null
+++ b/sys-apps/diffutils/diffutils-3.5.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+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="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 
~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd 
~x86-freebsd ~hppa-hpux ~ia64-hpux ~amd64-linux ~arm-linux ~ia64-linux 
~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris 
~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="nls static"
+
+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
+
+   econf \
+   --with-packager="Gentoo" \
+   --with-packager-version="${PVR}" \
+   --with-packager-bug-reports="https://bugs.gentoo.org/; \
+   $(use_enable nls)
+}
+
+src_test() {
+   # explicitly allow parallel testing
+   emake check
+}

[gentoo-commits] repo/gentoo:master commit in: sys-apps/diffutils/

2016-08-17 Thread Lars Wendler

commit: 8d4fcaed5f4c8788e8465ce96f9e431ff07656cd
Author: Lars Wendler  gentoo  org>
AuthorDate: Wed Aug 17 12:33:22 2016 +
Commit: Lars Wendler  gentoo  org>
CommitDate: Wed Aug 17 12:33:37 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8d4fcaed

sys-apps/diffutils: Removed broken version (bug #591044).

Package-Manager: portage-2.3.0
Signed-off-by: Lars Wendler  gentoo.org>

 sys-apps/diffutils/diffutils-3.4.ebuild | 44 -
 1 file changed, 44 deletions(-)

diff --git a/sys-apps/diffutils/diffutils-3.4.ebuild 
b/sys-apps/diffutils/diffutils-3.4.ebuild
deleted file mode 100644
index 27eb13b..000
--- a/sys-apps/diffutils/diffutils-3.4.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-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="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 
~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd 
~x86-freebsd ~hppa-hpux ~ia64-hpux ~amd64-linux ~arm-linux ~ia64-linux 
~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris 
~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="nls static"
-
-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="https://bugs.gentoo.org/; \
-   $(use_enable nls)
-}
-
-src_test() {
-   # explicitly allow parallel testing
-   emake check
-}

[gentoo-commits] repo/gentoo:master commit in: sys-apps/diffutils/

2016-08-15 Thread Tim Harder

commit: cd920a783ebd0afe7d659666fc48004614ae975b
Author: Tim Harder  gentoo  org>
AuthorDate: Mon Aug 15 20:33:58 2016 +
Commit: Tim Harder  gentoo  org>
CommitDate: Mon Aug 15 20:37:22 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cd920a78

sys-apps/diffutils: move gnu-alpha mirror after regular gnu mirror

Most recent releases are not found on the gnu-alpha mirrors.

 sys-apps/diffutils/diffutils-3.4-r1.ebuild | 4 ++--
 sys-apps/diffutils/diffutils-3.4.ebuild| 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/sys-apps/diffutils/diffutils-3.4-r1.ebuild 
b/sys-apps/diffutils/diffutils-3.4-r1.ebuild
index 43a9069..bdf1bb1 100644
--- a/sys-apps/diffutils/diffutils-3.4-r1.ebuild
+++ b/sys-apps/diffutils/diffutils-3.4-r1.ebuild
@@ -8,8 +8,8 @@ inherit flag-o-matic
 
 DESCRIPTION="Tools to make diffs and compare files"
 HOMEPAGE="https://www.gnu.org/software/diffutils/;
-SRC_URI="mirror://gnu-alpha/diffutils/${P}.tar.xz
-   mirror://gnu/diffutils/${P}.tar.xz"
+SRC_URI="mirror://gnu/diffutils/${P}.tar.xz
+   mirror://gnu-alpha/diffutils/${P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"

diff --git a/sys-apps/diffutils/diffutils-3.4.ebuild 
b/sys-apps/diffutils/diffutils-3.4.ebuild
index a8e780e..27eb13b 100644
--- a/sys-apps/diffutils/diffutils-3.4.ebuild
+++ b/sys-apps/diffutils/diffutils-3.4.ebuild
@@ -8,8 +8,8 @@ inherit flag-o-matic
 
 DESCRIPTION="Tools to make diffs and compare files"
 HOMEPAGE="https://www.gnu.org/software/diffutils/;
-SRC_URI="mirror://gnu-alpha/diffutils/${P}.tar.xz
-   mirror://gnu/diffutils/${P}.tar.xz"
+SRC_URI="mirror://gnu/diffutils/${P}.tar.xz
+   mirror://gnu-alpha/diffutils/${P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"

[gentoo-commits] repo/gentoo:master commit in: sys-apps/diffutils/files/, sys-apps/diffutils/

2016-08-15 Thread Lars Wendler

commit: 0ac0d1883b2fbb34f8b85995cf2ce651af4ef006
Author: Lars Wendler  gentoo  org>
AuthorDate: Mon Aug 15 19:55:04 2016 +
Commit: Lars Wendler  gentoo  org>
CommitDate: Mon Aug 15 19:55:18 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0ac0d188

sys-apps/diffutils: Revbump to fix use-after-free bug in diff3 (bug #591044).

Package-Manager: portage-2.3.0
Signed-off-by: Lars Wendler  gentoo.org>

 sys-apps/diffutils/diffutils-3.4-r1.ebuild |  50 +
 .../files/diffutils-3.4-diff3_fix_leaks.patch  | 123 +
 .../files/diffutils-3.4-diff3_use_after_free.patch |  26 +
 .../diffutils-3.4-no_color_on_dumb_terms.patch |  49 
 4 files changed, 248 insertions(+)

diff --git a/sys-apps/diffutils/diffutils-3.4-r1.ebuild 
b/sys-apps/diffutils/diffutils-3.4-r1.ebuild
new file mode 100644
index 000..43a9069
--- /dev/null
+++ b/sys-apps/diffutils/diffutils-3.4-r1.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit flag-o-matic
+
+DESCRIPTION="Tools to make diffs and compare files"
+HOMEPAGE="https://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="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 
~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd 
~x86-freebsd ~hppa-hpux ~ia64-hpux ~amd64-linux ~arm-linux ~ia64-linux 
~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris 
~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="nls static"
+
+DEPEND="app-arch/xz-utils
+   nls? ( sys-devel/gettext )"
+
+DOCS=( AUTHORS ChangeLog NEWS README THANKS TODO )
+
+PATCHES=(
+   "${FILESDIR}/${P}-no_color_on_dumb_terms.patch"
+   "${FILESDIR}/${P}-diff3_use_after_free.patch"
+   "${FILESDIR}/${P}-diff3_fix_leaks.patch"
+)
+
+src_prepare() {
+   epatch "${PATCHES[@]}"
+}
+
+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="https://bugs.gentoo.org/; \
+   $(use_enable nls)
+}
+
+src_test() {
+   # explicitly allow parallel testing
+   emake check
+}

diff --git a/sys-apps/diffutils/files/diffutils-3.4-diff3_fix_leaks.patch 
b/sys-apps/diffutils/files/diffutils-3.4-diff3_fix_leaks.patch
new file mode 100644
index 000..fda8319
--- /dev/null
+++ b/sys-apps/diffutils/files/diffutils-3.4-diff3_fix_leaks.patch
@@ -0,0 +1,123 @@
+From edd942ca27d570a33d612b12eecaa33a76640e46 Mon Sep 17 00:00:00 2001
+From: Jim Meyering 
+Date: Fri, 12 Aug 2016 21:40:29 -0700
+Subject: diff3: fix leaks, for real
+
+* src/diff3.c (struct diff_block)[lint]: Add member, n2.
+(free_diff_block, next_to_n2): New functions.
+---
+
+diff --git a/src/diff3.c b/src/diff3.c
+index 0eb643e..b80aeb3 100644
+--- a/src/diff3.c
 b/src/diff3.c
+@@ -78,6 +78,9 @@ struct diff_block {
+   char **lines[2];/* The actual lines (may contain nulls) */
+   size_t *lengths[2]; /* Line lengths (including newlines, if any) */
+   struct diff_block *next;
++#ifdef lint
++  struct diff_block *n2;  /* Used only when freeing.  */
++#endif
+ };
+ 
+ /* Three way diff */
+@@ -176,7 +179,7 @@ static struct diff3_block *create_diff3_block (lin, lin, 
lin, lin, lin, lin);
+ static struct diff3_block *make_3way_diff (struct diff_block *, struct 
diff_block *);
+ static struct diff3_block *reverse_diff3_blocklist (struct diff3_block *);
+ static struct diff3_block *using_to_diff3_block (struct diff_block *[2], 
struct diff_block *[2], int, int, struct diff3_block const *);
+-static struct diff_block *process_diff (char const *, char const *, struct 
diff_block **);
++static struct diff_block *process_diff (char const *, char const *, struct 
diff_block **, char **);
+ static void check_stdout (void);
+ static void fatal (char const *) __attribute__((noreturn));
+ static void output_diff3 (FILE *, struct diff3_block *, int const[3], int 
const[3]);
+@@ -212,6 +215,38 @@ static struct option const longopts[] =
+   {0, 0, 0, 0}
+ };
+ 
++static void
++free_diff_block (struct diff_block *p)
++{
++#ifndef lint
++  (void)p;
++#else
++  while (p)
++{
++  free (p->lines[0]);
++  free (p->lines[1]);
++  free (p->lengths[0]);
++  free (p->lengths[1]);
++  struct diff_block *next = p->n2;
++  free (p);
++  p = next;
++}
++#endif
++}
++
++/* Copy each next pointer to n2, since make_3way_diff would clobber the 
former,
++   yet we will still need something to free these buffers.  */
++static void
++next_to_n2 (struct diff_block *p)
++{

[gentoo-commits] repo/gentoo:master commit in: sys-apps/diffutils/

2016-08-08 Thread Lars Wendler

commit: 570ff939772d66b886b273e3feb56ba1c1a263a3
Author: Lars Wendler  gentoo  org>
AuthorDate: Tue Aug  9 05:24:15 2016 +
Commit: Lars Wendler  gentoo  org>
CommitDate: Tue Aug  9 05:24:29 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=570ff939

sys-apps/diffutils: Bump to version 3.4

Package-Manager: portage-2.3.0
Signed-off-by: Lars Wendler  gentoo.org>

 sys-apps/diffutils/Manifest |  1 +
 sys-apps/diffutils/diffutils-3.4.ebuild | 44 +
 2 files changed, 45 insertions(+)

diff --git a/sys-apps/diffutils/Manifest b/sys-apps/diffutils/Manifest
index 49003a7..c3525cc 100644
--- a/sys-apps/diffutils/Manifest
+++ b/sys-apps/diffutils/Manifest
@@ -1 +1,2 @@
 DIST diffutils-3.3.tar.xz 1197832 SHA256 
a25e89a8ab65fded1731e4186be1bb25cda967834b6df973599cdcd5abdfc19c SHA512 
b04b998717e45e8fd1ba675957dad1909beeed68ffc41c0d9bbaddaf78965f9e63af5a8d8811bb94f33a3cddcad2fe1ad794e52e545def9ce96c092999a74a83
 WHIRLPOOL 
8fd3b179afdc3fd127cee8829535b0fc6d949443645e8df80fa45c2fa44a732ea652259b644d81a9be14d4c7f7c3b5bad7b8861934a6bc691cd02a34c0200ed3
+DIST diffutils-3.4.tar.xz 1358392 SHA256 
db53c025f2ac3d217bcf753dad6dee7b410b33d0948495ff015aaf8b91189ce2 SHA512 
0fc273007e35e67e217116e776956c6a24421f298d3e6fe60aa1d4250938a65bb8e685cd815517317b5637f5c412c1550d7c1994a9e0283ebbcae9bde24a260d
 WHIRLPOOL 
cd9460385d618b169b343e5f197937a4abfbf3d64076c609a0cde78372d08225fc2078fa7c028a80963f08f3eadfc2ee8074b03b83730745842da44f7483113f

diff --git a/sys-apps/diffutils/diffutils-3.4.ebuild 
b/sys-apps/diffutils/diffutils-3.4.ebuild
new file mode 100644
index 000..a8e780e
--- /dev/null
+++ b/sys-apps/diffutils/diffutils-3.4.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit flag-o-matic
+
+DESCRIPTION="Tools to make diffs and compare files"
+HOMEPAGE="https://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="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 
~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd 
~x86-freebsd ~hppa-hpux ~ia64-hpux ~amd64-linux ~arm-linux ~ia64-linux 
~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris 
~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="nls static"
+
+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="https://bugs.gentoo.org/; \
+   $(use_enable nls)
+}
+
+src_test() {
+   # explicitly allow parallel testing
+   emake check
+}

97 matches

Mail list logo