From 5c1942efa446ed15b1d1eeb7f5a3b3d4d8a453a8 Mon Sep 17 00:00:00 2001
From: Rahil Bhimjiani <me@rahil.rocks>
Date: Mon, 15 Jun 2026 20:38:56 +0530
Subject: [PATCH] app-containers/containers-shortnames: new patch version,add
 blockers

* clean up the code along the way
* as this package just install one config file that can not break
anything, it should always be stabilized in all arches thus adding
stabilize-allarches to metadata.xml

Signed-off-by: Rahil Bhimjiani <me@rahil.rocks>
Part-of: https://github.com/gentoo/gentoo/pull/46533
Signed-off-by: Zac Medico <zmedico@gentoo.org>
---
 app-containers/containers-shortnames/Manifest |  1 +
 ...ers-shortnames-2025.03.19_p20260615.ebuild | 28 +++++++++++++++++++
 .../containers-shortnames-9999.ebuild         | 24 ++++++----------
 .../containers-shortnames/metadata.xml        |  1 +
 4 files changed, 38 insertions(+), 16 deletions(-)
 create mode 100644 app-containers/containers-shortnames/containers-shortnames-2025.03.19_p20260615.ebuild

diff --git a/app-containers/containers-shortnames/Manifest b/app-containers/containers-shortnames/Manifest
index af4583389d78a..9ebfe90efdbd3 100644
--- a/app-containers/containers-shortnames/Manifest
+++ b/app-containers/containers-shortnames/Manifest
@@ -1,2 +1,3 @@
 DIST containers-shortnames-2023.02.20.tar.gz 13527 BLAKE2B 165a4c51bd284078990c94059145bb6b4bd5de4d8595eb2ccd2acc6fe8561e7edc300b7edadc684675ee281d7ada1c3a6d5aa0117c640ec22c2d2ef7e46486b5 SHA512 856dbbeb2acda276e9605bd1ecec0f8d65952c597ee2af61dd8909d7d3c04e5ef06c40b69ec4a98f79e623c536850f614c1b0af3a19637e300e7d3a285933193
 DIST containers-shortnames-2025.03.19.tar.gz 13672 BLAKE2B a72160f65aa13316c33b984173e151f0519720ec9617395980f0d7c5f25dc14b400aafbcb2fa8769eace9c1e51d4f1ddbe783e68fc0e40280743f90fbce30aa9 SHA512 edadadda8920ac4880f2c44f396e5d4c844bf15c964d7ef5d14c68637ac43e0df91f4efd2be747bca74bd0da959ea21cc3200ab14b2b57aba5975cff8f2fbefa
+DIST containers-shortnames-2025.03.19_p20260615.tar.gz 13778 BLAKE2B 4c05fa5276b0389c1fddd40d225749a42edd0a7ead0c98956752c7e77c1679b1a2fada9b50fb97a1e02e04aa8c87533f149b3b8fb9cfb9067c30acc277337ac7 SHA512 b86f4e1db82a1261683f9379b46c998b4b30e6a77a2893837ae4c3bd315186bc5b5d1d4687b58191abb4f60a5e4ff291e85881174820546648b5c3ff042163f1
diff --git a/app-containers/containers-shortnames/containers-shortnames-2025.03.19_p20260615.ebuild b/app-containers/containers-shortnames/containers-shortnames-2025.03.19_p20260615.ebuild
new file mode 100644
index 0000000000000..c2c412a2ce521
--- /dev/null
+++ b/app-containers/containers-shortnames/containers-shortnames-2025.03.19_p20260615.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2026 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DESCRIPTION="Configures default shortnames (aliases) for Containers"
+HOMEPAGE="https://github.com/containers/shortnames"
+GIT_COMMIT="e893043ee00c29ac1083b2151d4fb287d939a9fc"
+
+if [[ ${PV} == 9999* ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/containers/shortnames.git"
+else
+	SRC_URI="https://github.com/containers/shortnames/archive/${GIT_COMMIT}.tar.gz -> ${P}.tar.gz"
+	S="${WORKDIR}/${PN#containers-}-${GIT_COMMIT}"
+	KEYWORDS="~amd64 ~arm64 ~loong ~riscv"
+fi
+
+LICENSE="Apache-2.0"
+SLOT="0"
+RDEPEND="!<app-containers/buildah-1.44.0
+	!<app-containers/podman-6.0.0
+	!<app-containers/skopeo-1.23"
+
+src_install() {
+	insinto /usr/share/containers/registries.conf.d
+	newins shortnames.conf 000-shortnames.conf
+}
diff --git a/app-containers/containers-shortnames/containers-shortnames-9999.ebuild b/app-containers/containers-shortnames/containers-shortnames-9999.ebuild
index 4188ec539c48e..c2c412a2ce521 100644
--- a/app-containers/containers-shortnames/containers-shortnames-9999.ebuild
+++ b/app-containers/containers-shortnames/containers-shortnames-9999.ebuild
@@ -1,36 +1,28 @@
-# Copyright 1999-2025 Gentoo Authors
+# Copyright 1999-2026 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
 
 DESCRIPTION="Configures default shortnames (aliases) for Containers"
 HOMEPAGE="https://github.com/containers/shortnames"
+GIT_COMMIT="e893043ee00c29ac1083b2151d4fb287d939a9fc"
 
 if [[ ${PV} == 9999* ]]; then
 	inherit git-r3
 	EGIT_REPO_URI="https://github.com/containers/shortnames.git"
 else
-	SRC_URI="https://github.com/containers/shortnames/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	S="${WORKDIR}/${P#containers-}"
+	SRC_URI="https://github.com/containers/shortnames/archive/${GIT_COMMIT}.tar.gz -> ${P}.tar.gz"
+	S="${WORKDIR}/${PN#containers-}-${GIT_COMMIT}"
 	KEYWORDS="~amd64 ~arm64 ~loong ~riscv"
 fi
 
 LICENSE="Apache-2.0"
 SLOT="0"
-
-src_configure() {
-	return
-}
-
-src_compile() {
-	return
-}
-
-src_test() {
-	return
-}
+RDEPEND="!<app-containers/buildah-1.44.0
+	!<app-containers/podman-6.0.0
+	!<app-containers/skopeo-1.23"
 
 src_install() {
-	insinto /etc/containers/registries.conf.d
+	insinto /usr/share/containers/registries.conf.d
 	newins shortnames.conf 000-shortnames.conf
 }
diff --git a/app-containers/containers-shortnames/metadata.xml b/app-containers/containers-shortnames/metadata.xml
index 6fbce4b1e2e04..0ef8151648f23 100644
--- a/app-containers/containers-shortnames/metadata.xml
+++ b/app-containers/containers-shortnames/metadata.xml
@@ -13,6 +13,7 @@
     <email>proxy-maint@gentoo.org</email>
     <name>Proxy Maintainers</name>
   </maintainer>
+  <stabilize-allarches/>
   <upstream>
     <remote-id type="github">containers/shortnames</remote-id>
     <bugs-to>https://github.com/containers/shortnames/issues</bugs-to>