gentoo resync : 12.03.2021

5 files changed, 22 insertions, 36 deletions

diff --git a/dev-util/patchutils/Manifest b/dev-util/patchutils/Manifest
index 83c42cfeceef..dcb5cbb5d5b7 100644
--- a/dev-util/patchutils/Manifest
+++ b/dev-util/patchutils/Manifest
@@ -1,6 +1,6 @@
 AUX patchutils-0.3.3-format-security.patch 715 BLAKE2B 48be5e5e0376b6520cd0baffca1cc385bf3a267c8443b4ec195d302da6b165604471b919c47104943c1ccdc01d3c9866d93d1d8730e1a8b6889f433f607fb73a SHA512 b98932e5e48dfefb2ef8550c7f212cb0bf7417b0ed42705e3ddd9164d522ebdb47a0610539769a49a19d10e6389eb9e764fc5ef7bdd03af9b29feeb76a51c8fa
-DIST patchutils-0.3.3.tar.xz 156328 BLAKE2B e7da090e1fc7f95f5c2e4c02828702b485dc92fa22a4f45d69f5d9f610fb5a5e3267794fa572cf3aa73be45a86a5c889776eeadf5cca98237d97e53cb1b9be91 SHA512 4ec085078e9ae2e878dc10fbfea5974d9772716aef5d8e130a0023ceaa26640bccfaf1022c8153923b38230b36c8d4dddf4aaa674076c733bb1277895b63a268
 DIST patchutils-0.3.4.tar.xz 166400 BLAKE2B 382be328bfd1ab848f38126ad7a41a4c953844956c181265953a7496c8de3df5d90d071a823b226ceeddd7321bd4ecae1e06c8583155b08826c97177efa9b68b SHA512 ede006122fad180b78feaf69294f1c40c0a764981fa581f1893abeeb0421f9d586fc33f79d065690a6bc6187a31f11311b086669879dde12c6e49c7c8a2aa440
-EBUILD patchutils-0.3.3.ebuild 760 BLAKE2B bb17e8079257a7563714ad8a98be78484f1a597bfeafb27fffa121a461168a7d5005b8137fba1ab24eb595e0167c74fbea92710b04b4fc11b5656d6e900dd1f2 SHA512 0696a77c8cacb731edb1b5860f7035743582024c935750f3f6e88552eab442f6e19742eed997846f59dc5524eaf0326fa78a39037eefe77640f1d93c3343fa11
-EBUILD patchutils-0.3.4.ebuild 796 BLAKE2B 16578df3e37f571861a73a5abde8b3968d235d00e0cc18d541f0ac5aa068406c0a22113a4b0261a821f04052758b2b7e86c38859274a1e38929ad0a211c56368 SHA512 78be52b5b9cb9db328f32fe5c02ce92cbafa89402b3ed98250a7e81bda08ee5a841e6d7d10cc18f6b7b120ce6f3dc2bd7a1aeb4f5e8a1b7fa05c3ac16a94eeb9
-MISC metadata.xml 265 BLAKE2B 75452ad720a31a08fc0dcd02eec704c18b11bc0660686f9a320b85fc879f55a564ce9c3b6a8c710781b74c5e8eb3d0544c02a042fb35a0b62a5e1491f675296a SHA512 176f814d8c555e8726f36e012367b698e8a19a0662982621029a7f9190beecc5e6798e43c51698dc149364966cdeff7061121e54fa9d4cf2a3559a6ce4904e25
+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
+MISC metadata.xml 347 BLAKE2B 1bb5edebc3256dc7f672ac577cd618ca1ba6f50532326df86519e0949a693b24e0c8980e36dd2022662ad19b7bc9a2d9e9493ca63ee428c7dd310c225ad73a50 SHA512 a705f56fe025d34489a293963cdf279fbb310775b82134dcb53586ed22e31991b666f26738e14e2f387dc7f23eea2c0ba10d25a8b52140f67e1ceec27295f5e4
diff --git a/dev-util/patchutils/metadata.xml b/dev-util/patchutils/metadata.xml
index 3cf14bf74636..0e0093592abe 100644
--- a/dev-util/patchutils/metadata.xml
+++ b/dev-util/patchutils/metadata.xml
@@ -5,4 +5,7 @@
 		<email>shell-tools@gentoo.org</email>
 		<name>Gentoo Shell Tools Project</name>
 	</maintainer>
+	<upstream>
+		<remote-id type="github">twaugh/patchutils</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-util/patchutils/patchutils-0.3.3.ebuild b/dev-util/patchutils/patchutils-0.3.3.ebuild
deleted file mode 100644
index c0af0dcaa8ee..000000000000
--- a/dev-util/patchutils/patchutils-0.3.3.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils
-
-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 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND=""
-# The testsuite makes use of gendiff(1) that comes from rpm, thus if
-# the user wants to run tests, it should install that too.
-DEPEND="test? ( app-arch/rpm )"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-format-security.patch
-}
diff --git a/dev-util/patchutils/patchutils-0.3.4.ebuild b/dev-util/patchutils/patchutils-0.3.4.ebuild
index 3aa0b6a0d007..4ae2f9018696 100644
--- a/dev-util/patchutils/patchutils-0.3.4.ebuild
+++ b/dev-util/patchutils/patchutils-0.3.4.ebuild
@@ -10,12 +10,7 @@ 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="test"
-RESTRICT="!test? ( test )"
-
-# testsuite makes use of gendiff(1) that comes from rpm, thus if the user wants
-# to run tests, it should install that package as well.
-DEPEND="test? ( app-arch/rpm )"
+IUSE=""
 
 PATCHES=(
 	"${FILESDIR}/${PN}-0.3.3-format-security.patch"
@@ -23,5 +18,5 @@ PATCHES=(
 
 src_test() {
 	# See bug 605952.
-	make check || die
+	emake -j1 check
 }
diff --git a/dev-util/patchutils/patchutils-0.4.2.ebuild b/dev-util/patchutils/patchutils-0.4.2.ebuild
new file mode 100644
index 000000000000..08b5bae517bd
--- /dev/null
+++ b/dev-util/patchutils/patchutils-0.4.2.ebuild
@@ -0,0 +1,13 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+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=""