6 files changed, 45 insertions, 84 deletions
diff --git a/app-containers/Manifest.gz b/app-containers/Manifest.gz
index fbaa09135314..da65563d13eb 100644
--- a/app-containers/Manifest.gz
+++ b/app-containers/Manifest.gz
diff --git a/app-containers/distrobox/Manifest b/app-containers/distrobox/Manifest
index 4f6702c7eb40..4e3d3207e6ea 100644
--- a/app-containers/distrobox/Manifest
+++ b/app-containers/distrobox/Manifest
@@ -1,6 +1,8 @@
 DIST distrobox-1.6.0.1.tar.gz 6751373 BLAKE2B 9d82f33e15be8a2c17b7716ddbecf4fc533f971924c36ba8fa009dac7a87fbc26075ca98d6c58c5974fa1a02657419f26b415925d71f6577a8897a9e199950fc SHA512 cc7bd42b1c7e198eb255b6bdd90a76fa25700edc274b14379ffe3199c8a8cadc9ab27c94f43ee4a92d270b65df7b04e6c11441eb68456fe7ec3d56b2879534f2
+DIST distrobox-1.7.0.1.tar.gz 6756031 BLAKE2B 320dde2bdf005c5bd66954f212547adb6bbd6d06611272c6a1b1859eef7ad47dbbbf300baaef555e2bf9a750def117ec69418affb75514652aa0e366314fbaf2 SHA512 971a3f15216d2dfa2829a1ea085c7579c4f0bf0e57678474f83df05ae8c897db8a8cd477a429d0126cad11ac0379029b9c759944cea8649971e67f20a3e18328
 DIST distrobox-1.7.0.tar.gz 6755733 BLAKE2B 27bd75046d0b221543c4870bc49305c62da03343f4a602a87a50fac9a1d5b428a040099fbea8730fe2eba0b96eb90b966bc15d5ad46d62d79157047a2048f23c SHA512 5e29a5bb4a9fca4e54df979b304c2c23af93a5326383245183fee9bc7fbf6265128e1690c653410cb3063fabc522cf38bfa041dba7b921146010f7e43630613c
 EBUILD distrobox-1.6.0.1.ebuild 741 BLAKE2B 25aa6f441a2134f6e2a83f2ead6083c328a4f167e8a2efe7ee4e93f35d6babb1dce8aa4b8dfdace9e681d0e0efa01f2a2fa46513fd93562f2385e0822a85013c SHA512 2a891b624fd3c6ba7e802a81d0b400ab3b00147ea62509997a0678ae6e5b52e467a33eb5a08ce0c12a376ab4be84a6ed2aabb6da8254f0ee1cb899e7bdebee34
+EBUILD distrobox-1.7.0.1.ebuild 747 BLAKE2B c0e47c0cd8b825792647ae6bc12f9771eb2527d62b1e779e652b0580103e5668f191ffa2fd9db3ccabdb078c48d68ce3054390ced200112202f9ee9c2c3c6bcd SHA512 8e7673d428025cf9515f8f93169464afeaec9d2cd9050774dcd8d09f47e933e69a6b0787b7ac9b56842a9e1490149a6ac51f5ffe6915aa345407c8ef5a948b2a
 EBUILD distrobox-1.7.0.ebuild 747 BLAKE2B c0e47c0cd8b825792647ae6bc12f9771eb2527d62b1e779e652b0580103e5668f191ffa2fd9db3ccabdb078c48d68ce3054390ced200112202f9ee9c2c3c6bcd SHA512 8e7673d428025cf9515f8f93169464afeaec9d2cd9050774dcd8d09f47e933e69a6b0787b7ac9b56842a9e1490149a6ac51f5ffe6915aa345407c8ef5a948b2a
 EBUILD distrobox-9999.ebuild 747 BLAKE2B c0e47c0cd8b825792647ae6bc12f9771eb2527d62b1e779e652b0580103e5668f191ffa2fd9db3ccabdb078c48d68ce3054390ced200112202f9ee9c2c3c6bcd SHA512 8e7673d428025cf9515f8f93169464afeaec9d2cd9050774dcd8d09f47e933e69a6b0787b7ac9b56842a9e1490149a6ac51f5ffe6915aa345407c8ef5a948b2a
 MISC metadata.xml 957 BLAKE2B a02f57f2c65a9241edbc6a1e99170712ceca000977c2271ba51c5311e7718471585ea791ed8c978a86a961d02450623c05b5f9006d4386be2130df08341b0e49 SHA512 65f455bcfd246a8de0084e1534dc85f09435f1fad2590ba87dda0bed90d8fa976d3fad2142b2006a596e713d3d91f0d3d3156017cebacf9dc7883596edb0740f
diff --git a/app-containers/distrobox/distrobox-1.7.0.1.ebuild b/app-containers/distrobox/distrobox-1.7.0.1.ebuild
new file mode 100644
index 000000000000..ddd8a782dfb3
--- /dev/null
+++ b/app-containers/distrobox/distrobox-1.7.0.1.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DESCRIPTION="Use any Linux distribution inside your terminal (powered by docker/podman)"
+HOMEPAGE="https://distrobox.privatedns.org/
+	https://github.com/89luca89/distrobox/"
+
+if [[ "${PV}" == *9999* ]] ; then
+	inherit git-r3
+
+	EGIT_REPO_URI="https://github.com/89luca89/${PN}.git"
+else
+	SRC_URI="https://github.com/89luca89/${PN}/archive/${PV}.tar.gz
+		-> ${P}.tar.gz"
+
+	KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86"
+fi
+
+LICENSE="GPL-3"  # GPL-3.0-only !
+SLOT="0"
+
+RDEPEND="
+	|| (
+		app-containers/docker
+		app-containers/podman
+	)
+"
+
+src_install() {
+	sh ./install --prefix "${ED}/usr" || die "${PN} install script failed"
+
+	dodoc *.md
+}
diff --git a/app-containers/earthly/Manifest b/app-containers/earthly/Manifest
index f625c3bd6c0a..6c52dd628907 100644
--- a/app-containers/earthly/Manifest
+++ b/app-containers/earthly/Manifest
@@ -1,13 +1,10 @@
-DIST earthly-0.7.23-deps.tar.xz 157140928 BLAKE2B 493c7dce3e79f94659e99501020c07232a2d6ff78a055209b1b42be8615e38e01dacef4ceb50a80ed26e597de4dbb892fee2d54f6721fd5af62c86a0a9197d45 SHA512 a278077be794a1085105271fc3e031c02079e2b4f45c7220b3114df72ba26758758d5c0f1171ff861feb1c305765952494bf1afe95dcc469d2b9c6aad13fe7b9
-DIST earthly-0.7.23.tar.gz 8023353 BLAKE2B 458850b26a2730eb10ae3912f249d6ba9fdf81ed0c734f568ebf2cbaf5da005d258d38a089d452d42628d071d0b07f73e4f73cb29e7a02c406c1ea394d22ae97 SHA512 be524a6ab86ad3cff307d990f3645007cde673383cbaf132ebc6ab9e7052e8d13e163e958353041151d9fe6dc987ab75372dbf061a8413a932408a844cfe1007
-DIST earthly-0.8.0-deps.tar.xz 158417236 BLAKE2B 998240c6065dd46eebc311975fa98e657a9568b6e26f0113d00e2f55b1cea8b017425fb6cafa7a7a5d7dd2ccdbaf711cee62b5a98d92322f9ff8a6458bb31a02 SHA512 1fd31f82acb7862a4deff611f088b73fd15e04a2bf56d91dff955ffb4c3c54425f6011b7a2bcf94fbb721ea820cc3728f8038870eb073c6d12d435406167dc8b
-DIST earthly-0.8.0.tar.gz 8029214 BLAKE2B 1ca0afa4e92a05fca47ada6a6b74d789fb9571b0e92cc7bbb0ccc88930a128db76382b3e5137073ebd82f74fb8d43b81f8e6d056a08e6fa73978f23b680b36e2 SHA512 661c1e15cf8943dfcd8d55c36191f4f9da6dc705bb894194ff0a31733038f7b74d2b187a066c6a6cc329a9a89f362299f1de3b370f273ce87e2e3cdd2b4c8163
 DIST earthly-0.8.3-deps.tar.xz 158480860 BLAKE2B 4b875ef1ab7a244e2b92f13bc3dc55772c8e74af77b8a9814b2e964da4547a84fd7fe94ce96f77d4793a41039857e45ed133e61b8798d03c94d9546668dbaccd SHA512 e0071fbb9d5e85a81322c1e8fa36d393916031b99ca8783ab70c15084e5dd60cedbed24b9e7fe1e7c7b2e79c6b5f554b0518524b63b4c5e6d25aa99e56bec404
 DIST earthly-0.8.3.tar.gz 8034636 BLAKE2B f61133eda18d81588d35a1b4916bdc72e3a037007d4872e093be035dc25f502a8947e2610af49f8339835cc2fd607ee2bc813ad19124625f0fa55aa3e183bed8 SHA512 a2880e0b1c8d2646b70ae21557f5e05f00b31667ae10fcd124d9519b1e9a75386b7f7be3867a2ac96b3381cefa6ea1ff560844df0ae098e7ae5acc11eaa93f97
 DIST earthly-0.8.4-deps.tar.xz 158470344 BLAKE2B c3ec6369f8b397abd9b76dc77461c628e14ecc5866c8b66d094c3fe3194b18330be78454b57f211a717785210da40dc3c83e7d9769c62d621ca42a9d70f7be7f SHA512 d9b0960e02cf288b933a8da954e597957b2e8dc0920e2dca208a17d41c84bc1bcff789ee1c02fa930d5d0a816cb03437b091375168e0f46f3d3cf330a643b308
 DIST earthly-0.8.4.tar.gz 8041021 BLAKE2B 66057e29d4b287a220d8799efb4a1c5c43ea7641029e3af59bf8556125df28f9eafddc20d515fd20fab8c09bbb6278af4ea525f4bbe38d0e24ee031fc65c7336 SHA512 b663a10feb255329dfca30d5d70cb5c36ad5f96ed2b0cd30c46dd1b4ad087ab15b941fe6d3be3e32b1eee8199b5ee8ae50d61739c290b8967b6fcfd4126327db
-EBUILD earthly-0.7.23.ebuild 1813 BLAKE2B f467ed655eb54b39dc41f50f95f293898779a5efd30892ffa243e48e5524e6e90ef76825906745541d5ca1e6f43dec46cf30c734deee64f2f2eb79e81641a098 SHA512 35c1754664cd08dd6c582909aec2a23e73d404d0d9bc003eba5c63b6e1ed230c1674cc71c64809182236a558481c7e05b224fe541a8b6eb4e9d81532037349b2
-EBUILD earthly-0.8.0.ebuild 1800 BLAKE2B c06dcd832279d384bce9223b065f5edf89c0344464a6e903a41613849f8ec00f8fc88989fd780f63b89a75b821836dcb21551b498959da0a62f18071248ad4b7 SHA512 da7534851b3d8e7eef39ba09ebc90dc4f785661879e7fa2cbfd7e65ab3ba9cb35ad753088e4e390bb3d93ab3003740c92403177e5f7dd9e40b83d2c47c3d9b26
+DIST earthly-0.8.5-deps.tar.xz 157843872 BLAKE2B aade314abdcd8aaf18737908df1a90d71c907f286df463c9f8ce9654d5e212387b7107070225bf85f54d6e4688a741b7838b5c70d9f1a09ac15e904b83d4d2b8 SHA512 557b3477c1773c27934429677a53efbdc104230fcbd536cb73e8cd631ccf2af488731acc5555484298fc579e08b8e52031191b49ef0610595b2b67cc987232e3
+DIST earthly-0.8.5.tar.gz 8051712 BLAKE2B b9310a28d79bec7a59525a541cdd51960762b0695ccf15fd33be8a9917a7e52b2251a4ebf202c4f02036b3c178b8d26fc9bc4802b9d6a73a5bfc39623c5075d7 SHA512 206dc95c2ef4b89ea7dd65b2b04f4ac7606d63891cea708f7d7dcdff8f3e9ed113b090b65c0285175412cd76fca18852bf77eeddc2e0f2782f390e5bce1f8b86
 EBUILD earthly-0.8.3.ebuild 1805 BLAKE2B 393b8ab9d4dbef4448f16b672dd83b99e20681ab2c3a6496ec208d88cda0282b9874e149a3ee125b4b85a4c288c7af5f479cc7f38576cacb13bb516d0c75a1e9 SHA512 9dc024fa2326ac983b0e18329f62c1a4d68dc03448485157b32facca57d4327650cbfb05e9304e36f077800439eb313804ed78a348cf5aaf93521cbb89ede887
 EBUILD earthly-0.8.4.ebuild 1806 BLAKE2B 76b450d95330496cc88850d080993a09fdfec4b3c9ddea23cfb0e11e376058d782e67adf713e6a042f939951cb40fcf9c5b6b97e47f3042ac90730079005b207 SHA512 08f376f6f2b2aca415881f4e34fd4b058020de98168bbf1341a245d36b9a5100487ca51fc1d1e2a297547817c6435196e2656b83f5ef2b8910502b19adaa977d
+EBUILD earthly-0.8.5.ebuild 1806 BLAKE2B 07a436cabd245f99cec1f90182f37810af90599383f59982cb8e6860b823f4dfd3287fa5b7cd2b8e8a3668609f903b94416b46f96555636b5708fc49c927a547 SHA512 3ba66ec7966dd1a73df700f97f7af3dfe9e5805ca3de2fd0318361bab702f2c3610d4c2f20ac48da56916f8736194c635694f617f670dd8c359dda5661c0018c
 MISC metadata.xml 927 BLAKE2B b7d5184df16f39603bf6df8b503e701d737fec188d1d97673e4ca59babd990c1b872784c91db04c74d9a08dbffa76f4e7530d8b021cbbe9ae51fd9966f709522 SHA512 f7f49eb583b2b5a9939c26e9eaff3917392525c3a94e5f8274c89b69e172547ad02fa4ed1b078e7d778f765659e1b9a7cf99d88042034cfbfbef54e685c8b6dd
diff --git a/app-containers/earthly/earthly-0.7.23.ebuild b/app-containers/earthly/earthly-0.7.23.ebuild
deleted file mode 100644
index ee5e1f88b953..000000000000
--- a/app-containers/earthly/earthly-0.7.23.ebuild
+++ /dev/null
@@ -1,73 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-# Git commit SHA is needed at runtime by earthly to pull and bootstrap images.
-if [[ "${PV}" == 0.7.23 ]] ; then
-	GIT_COMMIT_SHA=e77372274b09b5e5f8a42f1b6ac264f7149c4924
-else
-	die 'Could not detect "GIT_COMMIT_SHA", please update the ebuild.'
-fi
-
-inherit go-module
-
-DESCRIPTION="Build automation tool that executes in containers"
-HOMEPAGE="https://earthly.dev/
-	https://github.com/earthly/earthly/"
-SRC_URI="
-	https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz
-		-> ${P}.tar.gz
-	https://dev.gentoo.org/~xgqt/distfiles/deps/${P}-deps.tar.xz
-"
-
-LICENSE="MPL-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~x86"
-
-RDEPEND="
-	|| (
-		app-containers/docker
-		app-containers/podman
-	)
-"
-
-DOCS=( CHANGELOG.md CONTRIBUTING.md README.md )
-
-src_compile() {
-	mkdir -p bin || die
-
-	local go_tags="dfrunmount,dfrunsecurity,dfsecrets,dfssh,dfrunnetwork,dfheredoc,forceposix"
-	local go_ldflags="
-		-X main.DefaultBuildkitdImage=docker.io/earthly/buildkitd:v${PV}
-		-X main.GitSha=${GIT_COMMIT_SHA}
-		-X main.Version=v${PV}
-	"
-	local -a go_buildargs=(
-		-tags "${go_tags}"
-		-ldflags "${go_ldflags}"
-		-o bin
-	)
-	ego build "${go_buildargs[@]}" ./cmd/...
-}
-
-src_install() {
-	exeinto /usr/bin
-	doexe bin/earthly
-	newexe bin/debugger earthly-debugger
-
-	einstalldocs
-}
-
-pkg_postinst() {
-	if has_version "app-containers/podman" ; then
-		ewarn "Podman is supported but not recommended."
-		ewarn "If issues arise, then please try running earthly with docker."
-	fi
-
-	if has_version "app-containers/podman[rootless]" ; then
-		ewarn "Running podman in rootless mode is not supported because"
-		ewarn "earthly/dind and earthly/buildkit require privileged access."
-		ewarn "For more info see: https://docs.earthly.dev/docs/guides/podman/"
-	fi
-}
diff --git a/app-containers/earthly/earthly-0.8.0.ebuild b/app-containers/earthly/earthly-0.8.5.ebuild
index f36efb1e95ed..5b4f4944a279 100644
--- a/app-containers/earthly/earthly-0.8.0.ebuild
+++ b/app-containers/earthly/earthly-0.8.5.ebuild
@@ -4,8 +4,8 @@
 EAPI=8
 
 # Git commit SHA is needed at runtime by earthly to pull and bootstrap images.
-if [[ "${PV}" == 0.8.0 ]] ; then
-	COMMIT_SHA=c23e2735fdceeb3f17bae3746a05cbc8e98fafe3
+if [[ "${PV}" == 0.8.5 ]] ; then
+	COMMIT_SHA=a6b5b8dca64fdae64f089ac48cefa60ab39974c4
 else
 	die 'Could not detect "COMMIT_SHA", please update the ebuild.'
 fi
@@ -23,7 +23,7 @@ SRC_URI="
 
 LICENSE="MPL-2.0"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="~amd64 ~x86"
 
 RDEPEND="
 	|| (
@@ -35,7 +35,7 @@ RDEPEND="
 DOCS=( CHANGELOG.md CONTRIBUTING.md README.md )
 
 src_compile() {
-	mkdir -p bin || die
+	# mkdir -p bin || die
 
 	local go_tags="dfrunmount,dfrunsecurity,dfsecrets,dfssh,dfrunnetwork,dfheredoc,forceposix"
 	local go_ldflags="
@@ -46,7 +46,7 @@ src_compile() {
 	local -a go_buildargs=(
 		-tags "${go_tags}"
 		-ldflags "${go_ldflags}"
-		-o bin
+		-o ./bin/
 	)
 	ego build "${go_buildargs[@]}" ./cmd/...
 }