commit:     48b3bc60df67790512970ba239c2684d829e9bc6
Author:     ingenarel <ingenarelitems <AT> gmail <DOT> com>
AuthorDate: Mon Jul 28 00:18:56 2025 +0000
Commit:     Saad Abdullah <ingenarelitems <AT> gmail <DOT> com>
CommitDate: Mon Jul 28 00:20:28 2025 +0000
URL:        https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=48b3bc60

dev-util/tinyxxd: properly setup xxd replacement

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

 dev-util/tinyxxd/metadata.xml                       | 21 ++++++++++++---------
 ...yxxd-1.3.7-r1.ebuild => tinyxxd-1.3.7-r2.ebuild} | 11 ++++++++---
 dev-util/tinyxxd/tinyxxd-9999.ebuild                | 11 ++++++++---
 3 files changed, 28 insertions(+), 15 deletions(-)

diff --git a/dev-util/tinyxxd/metadata.xml b/dev-util/tinyxxd/metadata.xml
index 97d65d2440..f5d22b49ec 100644
--- a/dev-util/tinyxxd/metadata.xml
+++ b/dev-util/tinyxxd/metadata.xml
@@ -5,13 +5,16 @@
     <email>[email protected]</email>
     <name>ingenarel</name>
   </maintainer>
-<longdescription lang="en">
-tinyxxd is a standalone fork of xxd, a slight modernization of the C code, a 
slight performance increase and a drop-in
-replacement for xxd. It contains the same logic and supports the exact same 
flags. tinyxxd can be useful in connection
-with building and packaging software, since it's a smaller dependency than 
ViM, only requires a C11 compiler and is
-slightly faster.
-</longdescription>
-<upstream>
-  <remote-id type="github">xyproto/tinyxxd</remote-id>
-</upstream>
+  <longdescription lang="en">
+  tinyxxd is a standalone fork of xxd, a slight modernization of the C code, a 
slight performance increase and a drop-in
+  replacement for xxd. It contains the same logic and supports the exact same 
flags. tinyxxd can be useful in connection
+  with building and packaging software, since it's a smaller dependency than 
ViM, only requires a C11 compiler and is
+  slightly faster.
+  </longdescription>
+  <upstream>
+    <remote-id type="github">xyproto/tinyxxd</remote-id>
+  </upstream>
+  <use>
+    <flag name="xxd">use it as a replacement for xxd</flag>
+  </use>
 </pkgmetadata>

diff --git a/dev-util/tinyxxd/tinyxxd-1.3.7-r1.ebuild 
b/dev-util/tinyxxd/tinyxxd-1.3.7-r2.ebuild
similarity index 79%
rename from dev-util/tinyxxd/tinyxxd-1.3.7-r1.ebuild
rename to dev-util/tinyxxd/tinyxxd-1.3.7-r2.ebuild
index fc9f027847..f4b74e9117 100644
--- a/dev-util/tinyxxd/tinyxxd-1.3.7-r1.ebuild
+++ b/dev-util/tinyxxd/tinyxxd-1.3.7-r2.ebuild
@@ -13,12 +13,17 @@ else
        KEYWORDS="~amd64"
 fi
 
-RDEPEND="!dev-util/xxd"
-
 LICENSE="GPL-2"
+
 SLOT="0"
 
+IUSE="xxd"
+
+RDEPEND="xxd? ( !dev-util/xxd !app-editors/vim-core )"
+
 src_install(){
        default
-       dosym /usr/bin/tinyxxd /usr/bin/xxd
+       if use xxd; then
+               dosym -r /usr/bin/tinyxxd /usr/bin/xxd
+       fi
 }

diff --git a/dev-util/tinyxxd/tinyxxd-9999.ebuild 
b/dev-util/tinyxxd/tinyxxd-9999.ebuild
index fc9f027847..f4b74e9117 100644
--- a/dev-util/tinyxxd/tinyxxd-9999.ebuild
+++ b/dev-util/tinyxxd/tinyxxd-9999.ebuild
@@ -13,12 +13,17 @@ else
        KEYWORDS="~amd64"
 fi
 
-RDEPEND="!dev-util/xxd"
-
 LICENSE="GPL-2"
+
 SLOT="0"
 
+IUSE="xxd"
+
+RDEPEND="xxd? ( !dev-util/xxd !app-editors/vim-core )"
+
 src_install(){
        default
-       dosym /usr/bin/tinyxxd /usr/bin/xxd
+       if use xxd; then
+               dosym -r /usr/bin/tinyxxd /usr/bin/xxd
+       fi
 }

Reply via email to