[gentoo-commits] repo/proj/guru:dev commit in: dev-util/tinyxxd/

[Saad Abdullah]

commit:     883cd42a303f0e7832f4a1b9bfe61a8a46525518
Author:     ingenarel <ingenarelitems <AT> gmail <DOT> com>
AuthorDate: Tue Jul 22 21:59:47 2025 +0000
Commit:     Saad Abdullah <ingenarelitems <AT> gmail <DOT> com>
CommitDate: Tue Jul 22 21:59:47 2025 +0000
URL:        https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=883cd42a

dev-util/tinyxxd: fix KEYWORDS, symlinking, package collisions

KEYWORDS are now right below SRC_URI inside the else statement, for
both, live ebuild and versioned ebuild (effectively avoiding to diverge
the live ebuild from the versioned ebuild)

`dosym "$(which tinyxxd)" /usr/bin/xxd` required tinyxxd to be installed
which was an oversight on my part, it should be now fixed because i used
/usr/bin/tinyxxd

also added dev-util/xxd as a blocker to avoid file collisions

Signed-off-by: ingenarel <ingenarelitems <AT> gmail.com>

 dev-util/tinyxxd/{tinyxxd-1.3.7.ebuild => tinyxxd-1.3.7-r1.ebuild} | 5 ++++-
 dev-util/tinyxxd/tinyxxd-9999.ebuild                               | 5 ++++-
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/dev-util/tinyxxd/tinyxxd-1.3.7.ebuild 
b/dev-util/tinyxxd/tinyxxd-1.3.7-r1.ebuild
similarity index 85%
rename from dev-util/tinyxxd/tinyxxd-1.3.7.ebuild
rename to dev-util/tinyxxd/tinyxxd-1.3.7-r1.ebuild
index ca38354a6d..fc9f027847 100644
--- a/dev-util/tinyxxd/tinyxxd-1.3.7.ebuild
+++ b/dev-util/tinyxxd/tinyxxd-1.3.7-r1.ebuild
@@ -10,12 +10,15 @@ if [[ ${PV} == *9999* ]]; then
        EGIT_REPO_URI="https://github.com/xyproto/tinyxxd.git";
 else
        
SRC_URI="https://github.com/xyproto/${PN}/archive/refs/tags/v${PV}.tar.gz -> 
${P}.tar.gz"
+       KEYWORDS="~amd64"
 fi
 
+RDEPEND="!dev-util/xxd"
+
 LICENSE="GPL-2"
 SLOT="0"
 
 src_install(){
        default
-       dosym "$(which tinyxxd)" /usr/bin/xxd
+       dosym /usr/bin/tinyxxd /usr/bin/xxd
 }

diff --git a/dev-util/tinyxxd/tinyxxd-9999.ebuild 
b/dev-util/tinyxxd/tinyxxd-9999.ebuild
index ca38354a6d..fc9f027847 100644
--- a/dev-util/tinyxxd/tinyxxd-9999.ebuild
+++ b/dev-util/tinyxxd/tinyxxd-9999.ebuild
@@ -10,12 +10,15 @@ if [[ ${PV} == *9999* ]]; then
        EGIT_REPO_URI="https://github.com/xyproto/tinyxxd.git";
 else
        
SRC_URI="https://github.com/xyproto/${PN}/archive/refs/tags/v${PV}.tar.gz -> 
${P}.tar.gz"
+       KEYWORDS="~amd64"
 fi
 
+RDEPEND="!dev-util/xxd"
+
 LICENSE="GPL-2"
 SLOT="0"
 
 src_install(){
        default
-       dosym "$(which tinyxxd)" /usr/bin/xxd
+       dosym /usr/bin/tinyxxd /usr/bin/xxd
 }