refine rust ebuild

Signed-off-by: Chen, Chih-Chia <pigfoot@gmail.com>

4 files changed, 36 insertions, 20 deletions

diff --git a/app-misc/jnv/Manifest b/app-misc/jnv/Manifest
index f1b6bfd..2293c0d 100644
--- a/app-misc/jnv/Manifest
+++ b/app-misc/jnv/Manifest
@@ -37,7 +37,7 @@ DIST itertools-0.12.1.crate 137761 BLAKE2B d7db67feb7418d6a779dc17d8a2f33481114c
 DIST itoa-1.0.10.crate 10534 BLAKE2B 8ffcb345d07070cc01651fd44c19f3e0659185eda733c407fd4be0955a301879ae1272dae7f425279dae8dcb7f7dc954465c9a09b5c521938a503d34fecfe2a7 SHA512 fc496be0873e31afa6ddf7f2958030f8fcb517cadb86a48280a0c50ce50460afda189af1e6c26e5ff6f85c750d772c21503864c32b526c4fe4bcdb5b07918538
 DIST j9-0.1.2.crate 5984 BLAKE2B b76f48c51037b9a3910f7f7365cd167334210eb30a3232a0860b3b8ad11307d80cab3fc2fac8f019ee7c3b884c9a60621ac9ecc10ebb926d6fd12191e87d6bed SHA512 ece6c9482aeb2dad582538fb8181752e331bd3b4c68d5377010f1f8856638965d4b28bed3cf3e935be3789aaf405f5a61ae9a43c9473dbf681fc0f53e0f2e3f2
 DIST j9-sys-0.1.2.crate 1935280 BLAKE2B 17aa83c725a38694f729f9538167ec964fe1b4602a19bc15a6e8a1077e1eb756d5ed7e83eb2b43624a48f4e80ce7851964a1b7b0738ac1c34f394cb958deb3f8 SHA512 e4cef83331b2881e4a47694abceedab2780db030453113aab7ff437a187d81e315fe94370f41851ab8fb913054aca9e9277a152484fd8b4c6b60452f0ab4d14e
-DIST jnv-0.1.1.tar.gz 16764 BLAKE2B 7c6e4d7a87ab75d0ff413e05ca42e694121eb87e148c1e6ac1a34fa72672b866ed29e93f1c0eac71c53786c229c4c42c69e2259c4b6648e8abe83daa5b4d812d SHA512 7f5da39cca660411f2f41d85d1b46b80e2c5c9acae21801c5ad7a7c5550e83f76d41207bfedff400156a3ba82964f55f144d0c78aa38e9de514f7d210052cefb
+DIST jnv-0.1.3.tar.gz 23904 BLAKE2B 3b228293413a0a45752f8e9b378cc1b7257df098954a6b0a79e90c03343ba5fe9279c0fca44db810db0ca468c43aff4e780fc302f8809f101fa423e9169f7c13 SHA512 2cfb4661dd453f616f84ebab50a059fff9d67d6d898872fe131c9186698942ded496dc7a0b093860698bdc51bd60df4d40923e6fcc2fe9d3054851e40d8f673d
 DIST lazy_static-1.4.0.crate 10443 BLAKE2B 25b2e61bbac48f0dcbc79c81d7bf01f2403d8269ecb6be3ea6147bd00f7a588df15a91f44dfc18ada19b21faa71de4637c7d493a8628cbecd0e547d74e616a23 SHA512 e124c0521ec7c950f3c4a066821918da7a9c6e711115d98009ae7c351928fdddead852e7596fea5937a9c30e4e4ce8eee7099b20248b5d6e3b2494b6a6d88cb8
 DIST lazycell-1.3.0.crate 12502 BLAKE2B dca2d3f46823a52dcf87b7d6103fc4f1f83bc5247ce361946ac2d9df239fb43ce4b418104503698dff0242480cd014996e77da4ae0a88f3cedbce4eb9d3c9ef8 SHA512 f9d627afc28b61e9687a3f72260eb013401fd64057647641ff2e763770d7380ab1d2d8cbb4a3c8818d53d504c618a3b46aaf701f72f4d7b25d226042824c2f8d
 DIST libc-0.2.153.crate 740614 BLAKE2B 523a41bc8cff4ebcba0edbbe9e6a2286ec7cb3ba5e90ca5926c972b68e4b34188bc077d20c22376238c3cd91b7455898a95c505ace4ededea88cc496edb4c5a7 SHA512 3f99e3a192974fffdc053ef21e9ad5fb54b7cdbd4755df176704a95dba38047138ccab76763e89c6b565f37f98fd549fe368749f84f6d1638b3209cb07eae9b4
@@ -74,7 +74,7 @@ DIST shlex-1.3.0.crate 18713 BLAKE2B 18800c364d3a628f1a3125097ea82fe6286550c2997
 DIST signal-hook-0.3.17.crate 50296 BLAKE2B 5469a11485362b4a76f99c06071c69f6cc083bf4cceea93fce0b43385163ac3621b7a3c98d18ea1fb9e1439460ea37f470a29bfde9dea199e60a12b248be5d25 SHA512 045ac6268e504c5561d3884610a48c930dfd936086f793839f42602e92e4a8cef289955776e8eba8a5ca1a91b5f27ccb3724f49b32091f8f06c8bde984d82298
 DIST signal-hook-mio-0.2.3.crate 9064 BLAKE2B 2bd11d0fad02fab92871e0129fc4ea3a609a43cee5d33737d82a624018eaa90077f2c92fec88f7b19d3ada619b8618f9d33fbd2cf6b7c63d3175dc57fb0341a7 SHA512 98429330c109dacbeca5f0788d993d1ec2830b6f95886a433592b2096508dfef2027d62a99b985654dfcd927f7f3f93fbfc19361f8efaef5efe84cbacfc1ab08
 DIST signal-hook-registry-1.4.1.crate 17987 BLAKE2B f1df8bba55c72a506b9210347f9dcac4d158948e73f6d1e60f43340ddfae368aff1bbb6a109af326af47246d9738d49f76d380c52208efc3c6f79ea0acd31f0b SHA512 e83acec2b0083967555f6c659dfaacc32d851a9485c9f6f4b4cf257742ae3ffba8c14708c75f1a5520e9d132ea9e21d6eb65aba492eec481e8492af8b798c5d1
-DIST smallvec-1.13.1.crate 34952 BLAKE2B e0dcf1d26883564cd4f5d20a588562404e193075b1ae011f7f7542009a9466e5df3ade7768e1a8feb8806774b2cee5f15d31779928f83714e7d4b6ed46af9ab9 SHA512 1259ef947400470b8c9e74c5582dbc1a49753aa46420883c1f7d66f320f67bebe733a15a23cd57ba461020fad4ff337a5b298de82754602a78f5e6cec969652d
+DIST smallvec-1.13.2.crate 35216 BLAKE2B 31a268aad595c06cdb078577a97b089dbea156a0df307a3e6aaaf4861bd9a680c5b11921da9dbdb1bcfe17d58c0cbede1ffe6bba3aef59b384fb1b9703c62d27 SHA512 a97c758b668e40ad9eb572e65feeae4954e09200a04ab92e26a13b48894381cd3a3d2571070c4b7a5e181182e1ede9688f990650342ec69ecfe1a264d234c679
 DIST strsim-0.11.0.crate 13710 BLAKE2B bdc748ffab302c8e1d3412663e300c399ba13bfc0e15b07101a680394204af2df8897ba784dbe57b95c4fa9e732439d0f5aabb090b1b1c81f066bfa125919419 SHA512 ef4165dabaf8cbdd6c58420043cff9c0d1f4bc3ed53de5973b654bd71ac7d462fecaa6e1b750fbcbb8e19b35f6e6b73641a17656b20f5562b6ba7d84e69de226
 DIST syn-2.0.53.crate 254828 BLAKE2B 4bbff9a430e12baae231eec35dca4a3130e9977c6272dcad4a25266441959461e6e2b69832492a6895948fada9152abf8630c1d011c93912356397360bfb7b8e SHA512 0c3e40e1af47910b59877246700dd695e2bf03c35e036adb99e9756f8e055c8b3421020fc43f71954aa7adfdc56712d58968f3f39ca2e93c0daedfebd8862b9b
 DIST tempfile-3.10.1.crate 33653 BLAKE2B 819b183e7840f70270883ee8b6a91fa09861c3112eaadc65007199885abe099bd593e1cdc4d9ab48c23490a6d484cad9bf0e80cf4e718c369cc2418b72eaf09c SHA512 bac7515b85b0d01ea914b527f0fadd3a4d8e77c9eabe786977d2625d8a3e91decaec502dd15bab4d49a43597fa7cf7660fff4be1b043112d13b542a72443bf39
diff --git a/app-misc/jnv/jnv-0.1.1.ebuild b/app-misc/jnv/jnv-0.1.3.ebuild
index 9b18965..0b0a9cf 100644
--- a/app-misc/jnv/jnv-0.1.1.ebuild
+++ b/app-misc/jnv/jnv-0.1.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2023 Gentoo Authors
+# Copyright 2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -80,7 +80,7 @@ if [[ ${PV} != *9999 ]]; then
 	signal-hook@0.3.17
 	signal-hook-mio@0.2.3
 	signal-hook-registry@1.4.1
-	smallvec@1.13.1
+	smallvec@1.13.2
 	strsim@0.11.0
 	syn@2.0.53
 	tempfile@3.10.1
@@ -121,14 +121,16 @@ inherit cargo
 
 DESCRIPTION="interactive JSON filter using jq"
 HOMEPAGE="https://github.com/ynqa/jnv"
+GITHUB_USER=ynqa
+GITHUB_REPO=${PN}
 
 if [[ ${PV} == *9999 ]]; then
-    EGIT_REPO_URI="https://github.com/ynqa/${PN}"
+    EGIT_REPO_URI="https://github.com/${GITHUB_USER}/${GITHUB_REPO}"
     inherit git-r3
 else
     [[ ${PV} == *_pre???????? ]] && COMMIT=""
 
-    SRC_URI="https://github.com/ynqa/${PN}/archive/${COMMIT:-v${PV}}.tar.gz -> ${P}.tar.gz
+    SRC_URI="https://github.com/${GITHUB_USER}/${GITHUB_REPO}/archive/${COMMIT:-v${PV}}.tar.gz -> ${P}.tar.gz
         ${CARGO_CRATE_URIS}"
     S="${WORKDIR}/${PN}-${COMMIT:-${PV}}"
     KEYWORDS="amd64 x86 arm arm64 ~ppc64 ~riscv"
@@ -151,8 +153,10 @@ src_unpack() {
     fi
 }
 
-src_install() {
-    cargo_src_install
+src_compile() {
+    cargo_src_compile --bin=${PN}
+}
 
-    dosym /usr/bin/"${PN}" /usr/bin/"${PN}s"
+src_install() {
+    cargo_src_install --bin=${PN}
 }
diff --git a/net-misc/xh/xh-0.21.0.ebuild b/net-misc/xh/xh-0.21.0.ebuild
index c684e67..a9b01f8 100644
--- a/net-misc/xh/xh-0.21.0.ebuild
+++ b/net-misc/xh/xh-0.21.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2023 Gentoo Authors
+# Copyright 2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -266,14 +266,16 @@ inherit cargo
 
 DESCRIPTION="Friendly and fast tool for sending HTTP requests"
 HOMEPAGE="https://github.com/ducaale/xh"
+GITHUB_USER=ducaale
+GITHUB_REPO=${PN}
 
 if [[ ${PV} == *9999 ]]; then
-    EGIT_REPO_URI="https://github.com/ducaale/${PN}"
+    EGIT_REPO_URI="https://github.com/${GITHUB_USER}/${GITHUB_REPO}"
     inherit git-r3
 else
-    [[ ${PV} == *_pre???????? ]] && COMMIT="0e4a87baf18652bb982df3fd2362fad0596ad12d"
+    [[ ${PV} == *_pre???????? ]] && COMMIT=""
 
-    SRC_URI="https://github.com/ducaale/${PN}/archive/${COMMIT:-v${PV}}.tar.gz -> ${P}.tar.gz
+    SRC_URI="https://github.com/${GITHUB_USER}/${GITHUB_REPO}/archive/${COMMIT:-v${PV}}.tar.gz -> ${P}.tar.gz
         ${CARGO_CRATE_URIS}"
     S="${WORKDIR}/${PN}-${COMMIT:-${PV}}"
     KEYWORDS="amd64 x86 arm arm64 ~ppc64 ~riscv"
@@ -305,8 +307,12 @@ src_configure() {
     cargo_src_configure --no-default-features
 }
 
+src_compile() {
+    cargo_src_compile --bin=${PN}
+}
+
 src_install() {
-    cargo_src_install
+    cargo_src_install --bin=${PN}
 
     dosym /usr/bin/"${PN}" /usr/bin/"${PN}s"
 }
diff --git a/net-misc/xh/xh-9999.ebuild b/net-misc/xh/xh-9999.ebuild
index c274591..e530ce6 100644
--- a/net-misc/xh/xh-9999.ebuild
+++ b/net-misc/xh/xh-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2023 Gentoo Authors
+# Copyright 2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -11,14 +11,16 @@ inherit cargo
 
 DESCRIPTION="Friendly and fast tool for sending HTTP requests"
 HOMEPAGE="https://github.com/ducaale/xh"
+GITHUB_USER=ducaale
+GITHUB_REPO=${PN}
 
 if [[ ${PV} == *9999 ]]; then
-    EGIT_REPO_URI="https://github.com/ducaale/${PN}"
+    EGIT_REPO_URI="https://github.com/${GITHUB_USER}/${GITHUB_REPO}"
     inherit git-r3
 else
-    [[ ${PV} == *_pre???????? ]] && COMMIT="0e4a87baf18652bb982df3fd2362fad0596ad12d"
+    [[ ${PV} == *_pre???????? ]] && COMMIT=""
 
-    SRC_URI="https://github.com/ducaale/${PN}/archive/${COMMIT:-v${PV}}.tar.gz -> ${P}.tar.gz
+    SRC_URI="https://github.com/${GITHUB_USER}/${GITHUB_REPO}/archive/${COMMIT:-v${PV}}.tar.gz -> ${P}.tar.gz
         ${CARGO_CRATE_URIS}"
     S="${WORKDIR}/${PN}-${COMMIT:-${PV}}"
     KEYWORDS="amd64 x86 arm arm64 ~ppc64 ~riscv"
@@ -26,7 +28,7 @@ fi
 
 LICENSE="MIT"
 # Dependent crate licenses
-LICENSE+=" Apache-2.0 BSD ISC MIT MPL-2.0 Unicode-DFS-2016"
+LICENSE+=" 0BSD Apache-2.0 Apache-2.0-with-LLVM-exceptions BSD Boost-1.0 ISC MPL-2.0 Unicode-DFS-2016 Unlicense ZLIB"
 SLOT="0"
 RESTRICT="mirror"
 IUSE="+rustls"
@@ -50,8 +52,12 @@ src_configure() {
     cargo_src_configure --no-default-features
 }
 
+src_compile() {
+    cargo_src_compile --bin=${PN}
+}
+
 src_install() {
-    cargo_src_install
+    cargo_src_install --bin=${PN}
 
     dosym /usr/bin/"${PN}" /usr/bin/"${PN}s"
 }