[gentoo-commits] repo/proj/guru:dev commit in: app-editors/vscodium-bin/

[Maciej Barć]

commit:     39b1c873d2ca2d2c781f92d7e1fbc790a04e3313
Author:     Maciej Barć <xgqt <AT> protonmail <DOT> com>
AuthorDate: Tue Jan 19 17:31:52 2021 +0000
Commit:     Maciej Barć <xgqt <AT> protonmail <DOT> com>
CommitDate: Tue Jan 19 17:31:56 2021 +0000
URL:        https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=39b1c873

app-editors/vscodium-bin: unbundle ripgrep only on not arm

Package-Manager: Portage-3.0.12, Repoman-3.0.2
Signed-off-by: Maciej Barć <xgqt <AT> protonmail.com>

 app-editors/vscodium-bin/Manifest                   |  1 +
 app-editors/vscodium-bin/vscodium-bin-1.52.1.ebuild | 19 ++++++++++++++-----
 2 files changed, 15 insertions(+), 5 deletions(-)

diff --git a/app-editors/vscodium-bin/Manifest 
b/app-editors/vscodium-bin/Manifest
index 5d1f6190..cbf5b35c 100644
--- a/app-editors/vscodium-bin/Manifest
+++ b/app-editors/vscodium-bin/Manifest
@@ -1,2 +1,3 @@
 DIST VSCodium-linux-arm64-1.52.1.tar.gz 99006948 BLAKE2B 
933e5b283e011873b7da60a838e7778d8ff1cf69006e5bf370fdeba7aa6709c2b8ea427936d353c75c0331d1a78defb7c0983d73d59c71163cde6ca32cf1ac32
 SHA512 
e96c79b1176a07f6cbd1a1d30d4a4d0d66d519d854bc0aa0e24e9baa4b0f6fe959e12b4888330188210957763febc644601f958b635deaa7e900f55f0eb5550f
+DIST VSCodium-linux-armhf-1.52.1.tar.gz 85288104 BLAKE2B 
3df56d4708f44e5029a9cfed05185957951ead696885f16e8d3da8587f812f9e088e37e2b355157989a0e272661f367a1bd2d70cfbc7953a1f07f166b7b8292d
 SHA512 
ffd5b2b476896d4aed67ed0bd157ca14819f493534c9e15eba247998becb06042c6c0caa88ee2db7e76529da252dac57c43c86371430b57a5819ce392cdcdcb5
 DIST VSCodium-linux-x64-1.52.1.tar.gz 96026417 BLAKE2B 
0d06ddef0de3af3d22de4757bd5b81742cdfb6605192c61374857fdacfd8df374adf180aaa1f31f0397ead97e7f668320125ef1f806c71689348ac4a3c8bab8d
 SHA512 
9a60f6821e7a796eaca842817fd3853c8099d74418ccabeacabed01c4f7b46b49c52bb11a032c317c27e3cef7ef2c49d2cf967ca2d2d79013790994a6aa9159f

diff --git a/app-editors/vscodium-bin/vscodium-bin-1.52.1.ebuild 
b/app-editors/vscodium-bin/vscodium-bin-1.52.1.ebuild
index e05dd8ce..862b3ce5 100644
--- a/app-editors/vscodium-bin/vscodium-bin-1.52.1.ebuild
+++ b/app-editors/vscodium-bin/vscodium-bin-1.52.1.ebuild
@@ -13,6 +13,9 @@ SRC_URI="
        amd64? (
                
https://github.com/VSCodium/${MY_PN}/releases/download/${PV}/VSCodium-linux-x64-${PV}.tar.gz
        )
+       arm? (
+               
https://github.com/VSCodium/${MY_PN}/releases/download/${PV}/VSCodium-linux-armhf-${PV}.tar.gz
+       )
        arm64? (
                
https://github.com/VSCodium/${MY_PN}/releases/download/${PV}/VSCodium-linux-arm64-${PV}.tar.gz
        )
@@ -21,14 +24,13 @@ SRC_URI="
 RESTRICT="bindist strip test"
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="-* ~amd64 ~arm64"
+KEYWORDS="-* ~amd64 ~arm ~arm64"
 IUSE="libsecret"
 
 RDEPEND="
        app-accessibility/at-spi2-atk
        dev-libs/nss
        media-libs/libpng:0/16
-       sys-apps/ripgrep
        x11-libs/cairo
        x11-libs/gtk+:3
        x11-libs/libXScrnSaver
@@ -36,6 +38,8 @@ RDEPEND="
        x11-libs/libnotify
        x11-libs/pango
        libsecret? ( app-crypt/libsecret[crypt] )
+       amd64? ( sys-apps/ripgrep )
+       arm64? ( sys-apps/ripgrep )
 "
 
 S="${WORKDIR}"
@@ -43,8 +47,10 @@ S="${WORKDIR}"
 src_prepare() {
        default
 
-       # Unbundle ripgrep
-       rm "resources/app/node_modules.asar.unpacked/vscode-ripgrep/bin/rg" || 
die
+       # Unbundle ripgrep on amd64 & arm64
+       if use amd64 || use arm64; then
+               rm 
"resources/app/node_modules.asar.unpacked/vscode-ripgrep/bin/rg" || die
+       fi
 }
 
 src_install() {
@@ -60,7 +66,10 @@ src_install() {
        fperms +x /opt/${MY_PN}/chrome-sandbox
        fperms -R +x /opt/${MY_PN}/resources/app/out/vs/base/node
 
-       dosym "../../../../../../../usr/bin/rg" 
"${EPREFIX}/opt/${MY_PN}/resources/app/node_modules.asar.unpacked/vscode-ripgrep/bin/rg"
+       if use amd64 || use arm64; then
+               dosym "../../../../../../../usr/bin/rg" 
"${EPREFIX}/opt/${MY_PN}/resources/app/node_modules.asar.unpacked/vscode-ripgrep/bin/rg"
+       fi
+
        dodoc resources/app/LICENSE.txt resources/app/ThirdPartyNotices.txt
        newicon resources/app/resources/linux/code.png ${MY_PN}.png
 }