From 1704afca8e6d43ed57dd342f3c851ade6262baf9 Mon Sep 17 00:00:00 2001
From: "Haelwenn (lanodan) Monnier" <contact@hacktivis.me>
Date: Tue, 4 Aug 2026 06:10:21 +0200
Subject: [PATCH] dev-util/xcd-rgb: add 1.1.1, drop 1.1.0

Signed-off-by: Haelwenn (lanodan) Monnier <contact@hacktivis.me>
---
 dev-util/xcd-rgb/Manifest                     |  4 +--
 ...-rgb-1.1.0.ebuild => xcd-rgb-1.1.1.ebuild} | 28 ++++++++++---------
 dev-util/xcd-rgb/xcd-rgb-9999.ebuild          | 28 ++++++++++---------
 3 files changed, 32 insertions(+), 28 deletions(-)
 rename dev-util/xcd-rgb/{xcd-rgb-1.1.0.ebuild => xcd-rgb-1.1.1.ebuild} (83%)

diff --git a/dev-util/xcd-rgb/Manifest b/dev-util/xcd-rgb/Manifest
index b509fbfb01..6c6cbe8a96 100644
--- a/dev-util/xcd-rgb/Manifest
+++ b/dev-util/xcd-rgb/Manifest
@@ -1,2 +1,2 @@
-DIST xcd-rgb-1.1.0.tar.gz 12586 BLAKE2B e9eff84b4149f375a05205c617fd8d85d35678f1e3972eaf45a6d6afc53c88bba9487e8c23e72f63923ade6021bab19316d62368e63b9587b1b1eb405321682a SHA512 8bcee292e08125a02f119b340c336004de435b086b7a92a24fda22d28eb0db70965c02433db68037c6a32c6258e5b9da9c5d5355ba9141436cfa05488c2465e1
-DIST xcd-rgb-1.1.0.tar.gz.sign 141 BLAKE2B 266ae1f0034c378dbe1e01d600469845b8c253908653cb01dc149b0004472f2965ed1783087f3b9a7bf5142e1c42fbe103cfdc4d0437c45cd1f62d72611f62dd SHA512 5a48a872d14ed0967ce83dafdbb6df5d57013feb2fe4e97eea67ae178a232be77cab226e31b562567cf0f901ba563ce5d6cefaa299e204154ce65f02ab6b7951
+DIST xcd-rgb-1.1.1.tar.gz 13436 BLAKE2B 2c67d0517e4973e758bfd5b00e541446d2d9a633f58080846bd7a64e8c07f4ac517cbbd5f92a488cecee6608f08f4dfec324e03dd21b31993293602860016f3a SHA512 8a7b202c77a6fb78b102453669dcbaa9dad80b92add67b71f1feb19c1c893436ac86bf747a306be5b74740f6e777416481f012ff642f0f47c266bfc4818d5676
+DIST xcd-rgb-1.1.1.tar.gz.sign 141 BLAKE2B a61239372f3a671e4a8178d264f7ca78f75ac7aa131f523485461807f5d9b322e436c58d7657aa071eb021e8d836c8d55ca2c2d4c8647e711e12a46a3650c0dc SHA512 3d52e2f8917a3dbc8947b049239649f51473c17c9fecb948d21fe6a1711ed44a900f98d39b0b7acd0855933d29384652a8784b2b25e6f59e02913e32e65abe77
diff --git a/dev-util/xcd-rgb/xcd-rgb-1.1.0.ebuild b/dev-util/xcd-rgb/xcd-rgb-1.1.1.ebuild
similarity index 83%
rename from dev-util/xcd-rgb/xcd-rgb-1.1.0.ebuild
rename to dev-util/xcd-rgb/xcd-rgb-1.1.1.ebuild
index 089785105b..747ca8a49c 100644
--- a/dev-util/xcd-rgb/xcd-rgb-1.1.0.ebuild
+++ b/dev-util/xcd-rgb/xcd-rgb-1.1.1.ebuild
@@ -5,7 +5,10 @@ EAPI=8
 
 inherit toolchain-funcs
 
-if [ "${PV}" != "9999" ]; then
+DESCRIPTION="colorful hex dump (RGB edition)"
+HOMEPAGE="https://hacktivis.me/git/xcd-rgb/"
+
+if [[ "${PV}" != "9999" ]]; then
 	VERIFY_SIG_METHOD=signify
 	inherit verify-sig
 
@@ -20,38 +23,37 @@ else
 	EGIT_REPO_URI="https://anongit.hacktivis.me/git/xcd-rgb.git"
 fi
 
-DESCRIPTION="colorful hex dump (RGB edition)"
-HOMEPAGE="https://hacktivis.me/git/xcd-rgb/"
 LICENSE="MPL-2.0"
 SLOT="0"
-
 IUSE="static"
 
-if [ "${PV}" != "9999" ]; then
+if [[ "${PV}" != "9999" ]]; then
 	BDEPEND="${BDEPEND} verify-sig? ( sec-keys/signify-keys-lanodan:2026 )"
 
 	VERIFY_SIG_OPENPGP_KEY_PATH="/usr/share/signify-keys/signify-keys-lanodan-2026.pub"
+fi
 
-	src_unpack() {
+src_unpack() {
+	if [[ "${PV}" != "9999" ]]; then
 		if use verify-sig; then
 			# Too many levels of symbolic links
 			cd "${DISTDIR}" || die
 			cp ${A} "${WORKDIR}" || die
 			cd "${WORKDIR}" || die
+
 			verify-sig_verify_detached "${P}.tar.gz" "${P}.tar.gz.sign"
 			unpack "${P}.tar.gz"
-			rm "${P}.tar.gz"
+			rm "${P}.tar.gz" "${P}.tar.gz.sign" || die
 		else
 			default
 		fi
-	}
-fi
+	else
+		git-r3_src_unpack
+	fi
+}
 
 src_configure() {
 	tc-export CC
+	export PREFIX="${EPREFIX}/usr"
 	use static && export LDSTATIC=-static
 }
-
-src_install() {
-	emake install DESTDIR="${D}" PREFIX=/usr
-}
diff --git a/dev-util/xcd-rgb/xcd-rgb-9999.ebuild b/dev-util/xcd-rgb/xcd-rgb-9999.ebuild
index 089785105b..747ca8a49c 100644
--- a/dev-util/xcd-rgb/xcd-rgb-9999.ebuild
+++ b/dev-util/xcd-rgb/xcd-rgb-9999.ebuild
@@ -5,7 +5,10 @@ EAPI=8
 
 inherit toolchain-funcs
 
-if [ "${PV}" != "9999" ]; then
+DESCRIPTION="colorful hex dump (RGB edition)"
+HOMEPAGE="https://hacktivis.me/git/xcd-rgb/"
+
+if [[ "${PV}" != "9999" ]]; then
 	VERIFY_SIG_METHOD=signify
 	inherit verify-sig
 
@@ -20,38 +23,37 @@ else
 	EGIT_REPO_URI="https://anongit.hacktivis.me/git/xcd-rgb.git"
 fi
 
-DESCRIPTION="colorful hex dump (RGB edition)"
-HOMEPAGE="https://hacktivis.me/git/xcd-rgb/"
 LICENSE="MPL-2.0"
 SLOT="0"
-
 IUSE="static"
 
-if [ "${PV}" != "9999" ]; then
+if [[ "${PV}" != "9999" ]]; then
 	BDEPEND="${BDEPEND} verify-sig? ( sec-keys/signify-keys-lanodan:2026 )"
 
 	VERIFY_SIG_OPENPGP_KEY_PATH="/usr/share/signify-keys/signify-keys-lanodan-2026.pub"
+fi
 
-	src_unpack() {
+src_unpack() {
+	if [[ "${PV}" != "9999" ]]; then
 		if use verify-sig; then
 			# Too many levels of symbolic links
 			cd "${DISTDIR}" || die
 			cp ${A} "${WORKDIR}" || die
 			cd "${WORKDIR}" || die
+
 			verify-sig_verify_detached "${P}.tar.gz" "${P}.tar.gz.sign"
 			unpack "${P}.tar.gz"
-			rm "${P}.tar.gz"
+			rm "${P}.tar.gz" "${P}.tar.gz.sign" || die
 		else
 			default
 		fi
-	}
-fi
+	else
+		git-r3_src_unpack
+	fi
+}
 
 src_configure() {
 	tc-export CC
+	export PREFIX="${EPREFIX}/usr"
 	use static && export LDSTATIC=-static
 }
-
-src_install() {
-	emake install DESTDIR="${D}" PREFIX=/usr
-}