Re: [PR PATCH] [Updated] sbt: update to 1.6.1

[hiljusti <hiljusti@users.noreply.github.com>]

[-- Attachment #1: Type: text/plain, Size: 1549 bytes --]

There is an updated pull request by hiljusti against master on the void-packages repository

https://github.com/hiljusti/void-packages update/sbt
https://github.com/void-linux/void-packages/pull/34882

sbt: update to 1.6.1
<!-- Uncomment relevant sections and delete options which are not applicable -->

This is the latest release of `sbt` and the first to address recent log4j vulnerabilities.

- https://github.com/void-linux/void-packages/issues/34534
- https://github.com/sbt/sbt/releases/tag/v1.6.1

#### Testing the changes
- I tested the changes in this PR: ~~briefly~~ **yes**

~~(Will try to do more testing later. Got some issue with libgomp when I tried updating my xbps-src bootstrap)~~

<!--
#### New package
- This new package conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements): **YES**|**NO**
-->

<!-- Note: If the build is likely to take more than 2 hours, please [skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration)
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!-- 
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - aarch64-musl
  - armv7l
  - armv6l-musl
-->


A patch file from https://github.com/void-linux/void-packages/pull/34882.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-update/sbt-34882.patch --]
[-- Type: text/x-diff, Size: 1603 bytes --]

From d2679d04072a4ffcf9d8a22e046831fd05e8c149 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E2=99=AA=20hiljusti=20=F0=9F=8E=AE?= <hiljusti@pm.me>
Date: Wed, 5 Jan 2022 16:28:09 -0800
Subject: [PATCH] sbt: update to 1.6.1

---
 srcpkgs/sbt/template | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

diff --git a/srcpkgs/sbt/template b/srcpkgs/sbt/template
index 6847c2efefef..cfd4de77c263 100644
--- a/srcpkgs/sbt/template
+++ b/srcpkgs/sbt/template
@@ -1,21 +1,23 @@
 # Template file for 'sbt'
 pkgname=sbt
-version=1.3.10
-revision=2
+version=1.6.1
+revision=1
 wrksrc="$pkgname"
 depends="virtual?java-environment"
 short_desc="Interactive build tool for Scala and Java"
 maintainer="Damian Czaja <trojan295@gmail.com>"
 license="Apache-2.0"
 homepage="https://www.scala-sbt.org"
-distfiles="https://sbt-downloads.cdnedge.bluemix.net/releases/v${version}/${pkgname}-${version}.tgz"
-checksum=3060065764193651aa3fe860a17ff8ea9afc1e90a3f9570f0584f2d516c34380
+distfiles="https://github.com/sbt/sbt/releases/download/v${version}/${pkgname}-${version}.tgz"
+checksum=60286bf1b875b31e2955f8a699888cd2612e9afd94d03cde0a2e71efd7492ffc
 
 do_install() {
-	vmkdir usr/share/sbt
+	vmkdir usr/lib/sbt
 	vmkdir usr/bin
-	vcopy "*" usr/share/sbt
-	ln -rs ${DESTDIR}/usr/share/sbt/bin/sbt ${DESTDIR}/usr/bin/sbt
+	vcopy "*" usr/lib/sbt
+	ln -rs ${DESTDIR}/usr/lib/sbt/bin/sbt ${DESTDIR}/usr/bin/sbt
 
-	rm ${DESTDIR}/usr/share/${pkgname}/bin/*.bat
+	rm ${DESTDIR}/usr/lib/${pkgname}/bin/*.bat
+	rm ${DESTDIR}/usr/lib/${pkgname}/bin/*.exe
+	rm ${DESTDIR}/usr/lib/${pkgname}/bin/*apple-darwin
 }