6 files changed, 44 insertions, 99 deletions
diff --git a/app-admin/entr/Manifest b/app-admin/entr/Manifest
index 6e6fa8cbb045..4d3e78c93ae2 100644
--- a/app-admin/entr/Manifest
+++ b/app-admin/entr/Manifest
@@ -1,3 +1 @@
-DIST entr-4.3.tar.gz 23756 BLAKE2B 0272b0185932d7c388818df0cc615e991c9545473a823c478ad9f0b6a23c97c0f4b2727b109a7bb18e2b0792f18d94d188d4a5d3fc90c479628ea078b1288f96 SHA512 f65dfc3f106e25ec4ff39eaec94222d8a547eb35390c654f6a741f92541c1b86d7d303a795308fcbfced44ac8eca6ad67e70393802ac9d46153e037dc1eab902
-DIST entr-4.4.tar.gz 24125 BLAKE2B c77b4a862c0b4a2861d7e2784fbaa3f60899a9934314a5cf3abb01d70df946e3786957cbaa9ed58cea7171390d115157f0d9a48093f6e7a8c05bcabf34da9792 SHA512 355bc19cfee9a9b5a460b136d8db014a1d129b6e4c95d905c1c4557cf7d845a076d260798ae8b84221563c049a9bd6d81974f00eea681abaf2eac2f2f5e6d087
-DIST entr-4.5.tar.gz 24674 BLAKE2B ee9ce841c5b3adb2bddb5742c73311b6924e914b896297d56ca3397812e8d528a25276b2b6882e2391f649106e4bf1ebc81bc1cec837b8ce1056e2575eae20da SHA512 db9499d78385df5056a30a4e3262fb436090acc5410ddfc529a7cfe4e10e304e13787abfc31dd38dbf8b9f01fa3369ef32d20c9fb903fa35763f41791bdda9c7
+DIST entr-5.5.tar.gz 21225 BLAKE2B 8a160894220b63c510fe432a033ba7770e8811da4c5d642391a61a11ca1865293675bc3adbb505b70da9d01b258c27770bc07fad18de7a993e172b2b1214df9b SHA512 5150744142cf1639289c2d845cf8cd3cbc0ef57fce8285bc0e2908c430d8344659ff064810e175e69bd8a6f06144734b2efa4d733e0fba7fec83a1f48d053a0d
diff --git a/app-admin/entr/entr-4.3.ebuild b/app-admin/entr/entr-4.3.ebuild
deleted file mode 100644
index c2fb5be80105..000000000000
--- a/app-admin/entr/entr-4.3.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2019 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 ~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.4.ebuild b/app-admin/entr/entr-4.4.ebuild
deleted file mode 100644
index b86dea0ffd94..000000000000
--- a/app-admin/entr/entr-4.4.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2020 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 ~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.5.ebuild b/app-admin/entr/entr-4.5.ebuild
deleted file mode 100644
index b86dea0ffd94..000000000000
--- a/app-admin/entr/entr-4.5.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2020 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 ~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>