6 files changed, 44 insertions, 99 deletions
diff --git a/app-admin/entr/Manifest b/app-admin/entr/Manifest
index 2ea2784d6b2b..4d3e78c93ae2 100644
--- a/app-admin/entr/Manifest
+++ b/app-admin/entr/Manifest
@@ -1,3 +1 @@
-DIST entr-4.6.tar.gz 24909 BLAKE2B e6c1eb5da1a3b94d593297f9975c36ea98d88c5b6ac17c34934c8d4678fb1c247699b8ff3d481a3972a67fd0abba75687b11489258be98990713e2041a12c2d0 SHA512 41e8c2311c7833a778193b13d1e0b1bb18ece54f5e20b8b5b0b4a2308ba1cc1a8b8378700dbac83ee68822b5f847a3fa9c47822d22a22d45da792d2408f48378
-DIST entr-4.8.tar.gz 25408 BLAKE2B 82367e2d7c933d881ed35147656f9b3c521103a636eecc603ed7d3e17eb59929e872ecb865f8d733f867383a3e1021fd3564f8e5fd27d094dfac9789d6651251 SHA512 fc99a257fe9a30a9b08f0b6283f9ee3b65c38362744842dd976a4ac7749df7f6ff630235443af17f664f9cbf2a197dbb8c1114fe491e675921745294b4fa4d8f
-DIST entr-4.9.tar.gz 25501 BLAKE2B 2d4690636585ee64c7273402c2a87516614d8b08547606198947677a26c8966b3f8784da880e1fc4608df7170801e4f21a33717d13c3bf7ad169f909e41d867b SHA512 b05595be5ae1c6fbd39ea886331b9b77563460d03eae8889c7ad0cc156a44c6f50477dc3448eefe715e124a79ab08b9baf7c53a9059dcf137e5782bf7b499751
+DIST entr-5.5.tar.gz 21225 BLAKE2B 8a160894220b63c510fe432a033ba7770e8811da4c5d642391a61a11ca1865293675bc3adbb505b70da9d01b258c27770bc07fad18de7a993e172b2b1214df9b SHA512 5150744142cf1639289c2d845cf8cd3cbc0ef57fce8285bc0e2908c430d8344659ff064810e175e69bd8a6f06144734b2efa4d733e0fba7fec83a1f48d053a0d
diff --git a/app-admin/entr/entr-4.6.ebuild b/app-admin/entr/entr-4.6.ebuild
deleted file mode 100644
index d0aef7b7af8e..000000000000
--- a/app-admin/entr/entr-4.6.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit toolchain-funcs
-
-DESCRIPTION="Run arbitrary commands when files change"
-HOMEPAGE="http://entrproject.org"
-SRC_URI="http://entrproject.org/code/${P}.tar.gz"
-
-LICENSE="ISC"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ppc ppc64 x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-src_configure() {
-	sh configure || die
-	sed -i -e 's#\(^PREFIX \).*#\1\?= /usr#' Makefile.bsd || die
-}
-
-src_compile() {
-	export CC=$(tc-getCC)
-	default
-}
-
-src_test() {
-	export CC=$(tc-getCC)
-	default
-}
diff --git a/app-admin/entr/entr-4.8.ebuild b/app-admin/entr/entr-4.8.ebuild
deleted file mode 100644
index d0aef7b7af8e..000000000000
--- a/app-admin/entr/entr-4.8.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit toolchain-funcs
-
-DESCRIPTION="Run arbitrary commands when files change"
-HOMEPAGE="http://entrproject.org"
-SRC_URI="http://entrproject.org/code/${P}.tar.gz"
-
-LICENSE="ISC"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ppc ppc64 x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-src_configure() {
-	sh configure || die
-	sed -i -e 's#\(^PREFIX \).*#\1\?= /usr#' Makefile.bsd || die
-}
-
-src_compile() {
-	export CC=$(tc-getCC)
-	default
-}
-
-src_test() {
-	export CC=$(tc-getCC)
-	default
-}
diff --git a/app-admin/entr/entr-4.9.ebuild b/app-admin/entr/entr-4.9.ebuild
deleted file mode 100644
index 911c1fa07d09..000000000000
--- a/app-admin/entr/entr-4.9.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit toolchain-funcs
-
-DESCRIPTION="Run arbitrary commands when files change"
-HOMEPAGE="http://entrproject.org"
-SRC_URI="http://entrproject.org/code/${P}.tar.gz"
-
-LICENSE="ISC"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 ppc ppc64 x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-src_configure() {
-	sh configure || die
-	sed -i -e 's#\(^PREFIX \).*#\1\?= /usr#' Makefile.bsd || die
-}
-
-src_compile() {
-	export CC=$(tc-getCC)
-	default
-}
-
-src_test() {
-	export CC=$(tc-getCC)
-	default
-}
diff --git a/app-admin/entr/entr-5.5.ebuild b/app-admin/entr/entr-5.5.ebuild
new file mode 100644
index 000000000000..a894b25423a4
--- /dev/null
+++ b/app-admin/entr/entr-5.5.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit edo toolchain-funcs
+
+DESCRIPTION="Run arbitrary commands when files change"
+HOMEPAGE="
+	https://eradman.com/entrproject/
+	https://github.com/eradman/entr
+"
+SRC_URI="https://eradman.com/entrproject/code/${P}.tar.gz"
+
+LICENSE="ISC"
+SLOT="0"
+KEYWORDS="amd64 arm arm64 ppc ppc64 ~riscv x86"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+BDEPEND="
+	test? (
+		app-editors/vim
+		app-misc/tmux
+		dev-vcs/git
+		sys-apps/file
+	)
+"
+
+src_configure() {
+	tc-export CC
+	export PREFIX="${EPREFIX}/usr"
+	export SHELL="${BROOT}/bin/bash"
+	export TMUX_TMPDIR="${T}"
+
+	edo ./configure
+}
diff --git a/app-admin/entr/metadata.xml b/app-admin/entr/metadata.xml
index 94248608af4d..82225571628c 100644
--- a/app-admin/entr/metadata.xml
+++ b/app-admin/entr/metadata.xml
@@ -1,12 +1,15 @@
 <?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="person">
-		<email>monsieurp@gentoo.org</email>
-		<name>Patrice Clement</name>
+		<email>arkamar@gentoo.org</email>
+		<name>Petr Vaněk</name>
 	</maintainer>
 	<maintainer type="project">
 		<email>shell-tools@gentoo.org</email>
 		<name>Gentoo Shell Tools Project</name>
 	</maintainer>
+	<upstream>
+		<remote-id type="github">eradman/entr</remote-id>
+	</upstream>
 </pkgmetadata>