From 407dffe2eee8f0cbee3eef884697b784628b1e21 Mon Sep 17 00:00:00 2001
From: "Haelwenn (lanodan) Monnier" <contact@hacktivis.me>
Date: Sun, 10 Mar 2024 22:12:25 +0100
Subject: [PATCH] gui-apps/hiprompt-gtk-py: drop 0_pre20220624-r1, add
 0_pre20221221

Signed-off-by: Haelwenn (lanodan) Monnier <contact@hacktivis.me>
---
 gui-apps/hiprompt-gtk-py/Manifest             |  2 +-
 ...d => hiprompt-gtk-py-0_pre20221221.ebuild} | 22 ++++++++++++++-----
 .../hiprompt-gtk-py-9999.ebuild               | 21 ++++++++++++++----
 3 files changed, 34 insertions(+), 11 deletions(-)
 rename gui-apps/hiprompt-gtk-py/{hiprompt-gtk-py-0_pre20220624-r1.ebuild => hiprompt-gtk-py-0_pre20221221.ebuild} (53%)

diff --git a/gui-apps/hiprompt-gtk-py/Manifest b/gui-apps/hiprompt-gtk-py/Manifest
index 685b4d782d..fd662a99ed 100644
--- a/gui-apps/hiprompt-gtk-py/Manifest
+++ b/gui-apps/hiprompt-gtk-py/Manifest
@@ -1 +1 @@
-DIST hiprompt-gtk-py-0_pre20220624.tar.gz 17669 BLAKE2B 90ec17475a058f1eb1fcac59c9994e99a2b80fa34ac185f3b05f579c30cec3b4f98f60dcc121df457af5ea0569614d5d16a14f197a26e7601889c95965930cf4 SHA512 e5ea9ee81ec524764549ed15b64df17b607e7d1ef7f6b0d59980d94bf1dfd079a32a5b8d9de7b6e562e304e3a905e1a6bea7eb94c84d06dd1125e04f2b0c2c37
+DIST hiprompt-gtk-py-8d6ef1d042ec2731f84245164094e622f4be3f2d.tar.gz 18110 BLAKE2B 46a132b36ac347d01fd7b2b810278ca4a1fdaa034cd34d990b66eef7a4363b87df88b7999261421b8e54497d16275ace5afd8aa677351ee5f8fe86c7a17776b3 SHA512 cac43582ae8de7cb0c68cf28309644a10b6e797d8477ff6af06fc18fd14c3a3a86ae6f17e1f549b39dd263cd43482219a2fb10c7e77e5863da5c72f28c66993c
diff --git a/gui-apps/hiprompt-gtk-py/hiprompt-gtk-py-0_pre20220624-r1.ebuild b/gui-apps/hiprompt-gtk-py/hiprompt-gtk-py-0_pre20221221.ebuild
similarity index 53%
rename from gui-apps/hiprompt-gtk-py/hiprompt-gtk-py-0_pre20220624-r1.ebuild
rename to gui-apps/hiprompt-gtk-py/hiprompt-gtk-py-0_pre20221221.ebuild
index a6fae08788..3831234a39 100644
--- a/gui-apps/hiprompt-gtk-py/hiprompt-gtk-py-0_pre20220624-r1.ebuild
+++ b/gui-apps/hiprompt-gtk-py/hiprompt-gtk-py-0_pre20221221.ebuild
@@ -1,19 +1,28 @@
-# Copyright 2022 Gentoo Authors
+# Copyright 2022-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
 
-PYTHON_COMPAT=( python3_{10..11} )
+PYTHON_COMPAT=( python3_{10..12} )
 inherit meson python-single-r1 xdg
 
+if [[ "${PV}" == "9999" ]]
+then
+	inherit git-r3
+	EGIT_REPO_URI="https://git.sr.ht/~sircmpwn/hiprompt-gtk-py"
+else
+	EGIT_COMMIT="8d6ef1d042ec2731f84245164094e622f4be3f2d"
+	MY_P="${PN}-${EGIT_COMMIT}"
+
+	SRC_URI="https://git.sr.ht/~sircmpwn/hiprompt-gtk-py/archive/${EGIT_COMMIT}.tar.gz -> ${MY_P}.tar.gz"
+	S="${WORKDIR}/${MY_P}"
+	KEYWORDS="~amd64 ~arm64 ~riscv"
+fi
+
 DESCRIPTION="GTK+ Himitsu prompter for Wayland"
 HOMEPAGE="https://git.sr.ht/~sircmpwn/hiprompt-gtk-py"
-EGIT_COMMIT="f74499302bdd6558d4644c25e15c9b5c482270ea"
-SRC_URI="https://git.sr.ht/~sircmpwn/hiprompt-gtk-py/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}/${PN}-${EGIT_COMMIT}"
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~riscv"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
 RDEPEND="
@@ -27,5 +36,6 @@ DEPEND="${RDEPEND}"
 src_prepare() {
 	default
 
+	# Otherwise you get the fake "python" symlink present in $WORKDIR
 	sed -i "s;@PYTHON@;/usr/bin/${EPYTHON};g" hiprompt_gtk/hiprompt-gtk.in || die
 }
diff --git a/gui-apps/hiprompt-gtk-py/hiprompt-gtk-py-9999.ebuild b/gui-apps/hiprompt-gtk-py/hiprompt-gtk-py-9999.ebuild
index 26205d1966..3831234a39 100644
--- a/gui-apps/hiprompt-gtk-py/hiprompt-gtk-py-9999.ebuild
+++ b/gui-apps/hiprompt-gtk-py/hiprompt-gtk-py-9999.ebuild
@@ -1,14 +1,26 @@
-# Copyright 2022 Gentoo Authors
+# Copyright 2022-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
 
-PYTHON_COMPAT=( python3_{10..11} )
-inherit git-r3 meson python-single-r1 xdg
+PYTHON_COMPAT=( python3_{10..12} )
+inherit meson python-single-r1 xdg
+
+if [[ "${PV}" == "9999" ]]
+then
+	inherit git-r3
+	EGIT_REPO_URI="https://git.sr.ht/~sircmpwn/hiprompt-gtk-py"
+else
+	EGIT_COMMIT="8d6ef1d042ec2731f84245164094e622f4be3f2d"
+	MY_P="${PN}-${EGIT_COMMIT}"
+
+	SRC_URI="https://git.sr.ht/~sircmpwn/hiprompt-gtk-py/archive/${EGIT_COMMIT}.tar.gz -> ${MY_P}.tar.gz"
+	S="${WORKDIR}/${MY_P}"
+	KEYWORDS="~amd64 ~arm64 ~riscv"
+fi
 
 DESCRIPTION="GTK+ Himitsu prompter for Wayland"
 HOMEPAGE="https://git.sr.ht/~sircmpwn/hiprompt-gtk-py"
-EGIT_REPO_URI="https://git.sr.ht/~sircmpwn/hiprompt-gtk-py"
 LICENSE="GPL-3"
 SLOT="0"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
@@ -24,5 +36,6 @@ DEPEND="${RDEPEND}"
 src_prepare() {
 	default
 
+	# Otherwise you get the fake "python" symlink present in $WORKDIR
 	sed -i "s;@PYTHON@;/usr/bin/${EPYTHON};g" hiprompt_gtk/hiprompt-gtk.in || die
 }