gentoo resync : 28.04.2021

4 files changed, 2 insertions, 52 deletions

diff --git a/dev-util/patchutils/Manifest b/dev-util/patchutils/Manifest
index dcb5cbb5d5b7..8cca40ba811d 100644
--- a/dev-util/patchutils/Manifest
+++ b/dev-util/patchutils/Manifest
@@ -1,6 +1,3 @@
-AUX patchutils-0.3.3-format-security.patch 715 BLAKE2B 48be5e5e0376b6520cd0baffca1cc385bf3a267c8443b4ec195d302da6b165604471b919c47104943c1ccdc01d3c9866d93d1d8730e1a8b6889f433f607fb73a SHA512 b98932e5e48dfefb2ef8550c7f212cb0bf7417b0ed42705e3ddd9164d522ebdb47a0610539769a49a19d10e6389eb9e764fc5ef7bdd03af9b29feeb76a51c8fa
-DIST patchutils-0.3.4.tar.xz 166400 BLAKE2B 382be328bfd1ab848f38126ad7a41a4c953844956c181265953a7496c8de3df5d90d071a823b226ceeddd7321bd4ecae1e06c8583155b08826c97177efa9b68b SHA512 ede006122fad180b78feaf69294f1c40c0a764981fa581f1893abeeb0421f9d586fc33f79d065690a6bc6187a31f11311b086669879dde12c6e49c7c8a2aa440
 DIST patchutils-0.4.2.tar.xz 159504 BLAKE2B 3ffcda8497b010a88e8601005871fb691ea8cac6158276862ba8e4192c333a335965288f9b5451c2fbc0a873ef95eb4a485d265387b43b0cec31b6c18d38f88e SHA512 20970d52fd43c09dc7799297b9a9eb6f60ba29ecc750d49381a2dc52273dfe484a47696cddd541f623394fa3486734cf337297cbeab6b1b244511c7740f46897
-EBUILD patchutils-0.3.4.ebuild 594 BLAKE2B 007c9cf12734a41d5432feec5f1e66dbe65a6197e208014584dc92a2bd347787e779624f7f52100a6f6bdbe1c13dbec1ee1dfe13109d9110ea7ae01eeee8d9a4 SHA512 46ddce77aa0ab3a6d74a5645dbf00941bbae81feff6db04f7d50c8528c00b3520f9413ca3b7b04d10f9442df856a8ff30058892939268dfe33f3cb1815b46613
-EBUILD patchutils-0.4.2.ebuild 490 BLAKE2B e7e91cc7eff2bf328a476d2d4927deb7da8edb9b933ec2934aba64e18c680c9f97b15669ce474850b47617c0b507d91162361d1476d309cd96c6c7c188d8aa20 SHA512 9c9bbcc908bb041c6906a3cee0e4a696f3425c27df867fba94601a28ae01411ed279a6a5b5d4f9698c723ac5467d6cc0c1f692ceeb626e9a795b47dcaf5c63aa
+EBUILD patchutils-0.4.2.ebuild 483 BLAKE2B eafa077777b2ac0142e4009692ab9ea32684c1d5edd259c6e637eb5965a6257c50e80f2e11b452f66bf0bb7b9c967cc481e4f3c9612aea7b1ae12c2725d2f9f4 SHA512 0b85b46f0e79ca927fe0889c46a5a98016bded15941d5ff6e29c5dbf7605be19626b4c70774d4681b23b09be11c311d7166e7748026b2e961351e995ff287738
 MISC metadata.xml 347 BLAKE2B 1bb5edebc3256dc7f672ac577cd618ca1ba6f50532326df86519e0949a693b24e0c8980e36dd2022662ad19b7bc9a2d9e9493ca63ee428c7dd310c225ad73a50 SHA512 a705f56fe025d34489a293963cdf279fbb310775b82134dcb53586ed22e31991b666f26738e14e2f387dc7f23eea2c0ba10d25a8b52140f67e1ceec27295f5e4
diff --git a/dev-util/patchutils/files/patchutils-0.3.3-format-security.patch b/dev-util/patchutils/files/patchutils-0.3.3-format-security.patch
deleted file mode 100644
index be190b65a734..000000000000
--- a/dev-util/patchutils/files/patchutils-0.3.3-format-security.patch
+++ /dev/null
@@ -1,25 +0,0 @@
- src/filterdiff.c | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/src/filterdiff.c b/src/filterdiff.c
-index eb08d49..0b2b301 100644
---- a/src/filterdiff.c
-+++ b/src/filterdiff.c
-@@ -1263,7 +1263,7 @@ read_regex_file (const char *file)
- 			char errstr[300];
- 			regerror (err, &regex[num_regex - 1], errstr,
- 				  sizeof (errstr));
--			error (EXIT_FAILURE, 0, errstr);
-+			error (EXIT_FAILURE, 0, "%s", errstr);
- 			exit (1);
- 		}
- 	}
-@@ -1509,7 +1509,7 @@ int main (int argc, char *argv[])
- 			char errstr[300];
- 			regerror (err, &regex[num_regex - 1], errstr,
- 				  sizeof (errstr));
--			error (EXIT_FAILURE, 0, errstr);
-+			error (EXIT_FAILURE, 0, "%s", errstr);
- 			exit (1);
- 		}
- 	}
diff --git a/dev-util/patchutils/patchutils-0.3.4.ebuild b/dev-util/patchutils/patchutils-0.3.4.ebuild
deleted file mode 100644
index 4ae2f9018696..000000000000
--- a/dev-util/patchutils/patchutils-0.3.4.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="A collection of tools that operate on patch files"
-HOMEPAGE="http://cyberelk.net/tim/patchutils/"
-SRC_URI="http://cyberelk.net/tim/data/patchutils/stable/${P}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris"
-IUSE=""
-
-PATCHES=(
-	"${FILESDIR}/${PN}-0.3.3-format-security.patch"
-)
-
-src_test() {
-	# See bug 605952.
-	emake -j1 check
-}
diff --git a/dev-util/patchutils/patchutils-0.4.2.ebuild b/dev-util/patchutils/patchutils-0.4.2.ebuild
index 08b5bae517bd..c1491c87fe5c 100644
--- a/dev-util/patchutils/patchutils-0.4.2.ebuild
+++ b/dev-util/patchutils/patchutils-0.4.2.ebuild
@@ -9,5 +9,5 @@ SRC_URI="http://cyberelk.net/tim/data/patchutils/stable/${P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris"
 IUSE=""