6 files changed, 25 insertions, 80 deletions
diff --git a/dev-util/patchutils/Manifest b/dev-util/patchutils/Manifest
index 985c07efb10e..b895d9da037d 100644
--- a/dev-util/patchutils/Manifest
+++ b/dev-util/patchutils/Manifest
@@ -1,2 +1 @@
-DIST patchutils-0.3.3.tar.xz 156328 BLAKE2B e7da090e1fc7f95f5c2e4c02828702b485dc92fa22a4f45d69f5d9f610fb5a5e3267794fa572cf3aa73be45a86a5c889776eeadf5cca98237d97e53cb1b9be91 SHA512 4ec085078e9ae2e878dc10fbfea5974d9772716aef5d8e130a0023ceaa26640bccfaf1022c8153923b38230b36c8d4dddf4aaa674076c733bb1277895b63a268
-DIST patchutils-0.3.4.tar.xz 166400 BLAKE2B 382be328bfd1ab848f38126ad7a41a4c953844956c181265953a7496c8de3df5d90d071a823b226ceeddd7321bd4ecae1e06c8583155b08826c97177efa9b68b SHA512 ede006122fad180b78feaf69294f1c40c0a764981fa581f1893abeeb0421f9d586fc33f79d065690a6bc6187a31f11311b086669879dde12c6e49c7c8a2aa440
+DIST patchutils-0.4.2.tar.xz 159504 BLAKE2B 3ffcda8497b010a88e8601005871fb691ea8cac6158276862ba8e4192c333a335965288f9b5451c2fbc0a873ef95eb4a485d265387b43b0cec31b6c18d38f88e SHA512 20970d52fd43c09dc7799297b9a9eb6f60ba29ecc750d49381a2dc52273dfe484a47696cddd541f623394fa3486734cf337297cbeab6b1b244511c7740f46897
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/metadata.xml b/dev-util/patchutils/metadata.xml
index 3cf14bf74636..ca0e4494a3c6 100644
--- a/dev-util/patchutils/metadata.xml
+++ b/dev-util/patchutils/metadata.xml
@@ -1,8 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
 		<email>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 fd460136c17b..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 ~ppc-aix ~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
deleted file mode 100644
index fae95d7d4131..000000000000
--- a/dev-util/patchutils/patchutils-0.3.4.ebuild
+++ /dev/null
@@ -1,27 +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 ~ppc-aix ~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 )"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-0.3.3-format-security.patch"
-)
-
-src_test() {
-	# See bug 605952.
-	make check || die
-}
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..cac227160398
--- /dev/null
+++ b/dev-util/patchutils/patchutils-0.4.2.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2023 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 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
+IUSE="pcre"
+
+RDEPEND="pcre? ( dev-libs/libpcre2:= )"
+DEPEND="${RDEPEND}"
+
+src_configure() {
+	econf $(use_with pcre pcre2)
+}