[PR PATCH] exa: use create_wrksrc

[PR PATCH] exa: use create_wrksrc

[tranzystorek-io]

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

There is a new pull request by tranzystorek-io against master on the void-packages repository

https://github.com/tranzystorek-io/void-packages exa-create-wrksrc
https://github.com/void-linux/void-packages/pull/40082

exa: use create_wrksrc
<!-- Uncomment relevant sections and delete options which are not applicable -->

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

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

<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
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/40082.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-exa-create-wrksrc-40082.patch --]
[-- Type: text/x-diff, Size: 1058 bytes --]

From a01c813959e15942a9d2de6d260ecd75dc64175b Mon Sep 17 00:00:00 2001
From: Marcin Puc <tranzystorek.io@protonmail.com>
Date: Fri, 21 Oct 2022 16:34:16 +0200
Subject: [PATCH] exa: use create_wrksrc

---
 srcpkgs/exa/template | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/exa/template b/srcpkgs/exa/template
index 3efe7851bbdd..105c67ac65a3 100644
--- a/srcpkgs/exa/template
+++ b/srcpkgs/exa/template
@@ -2,6 +2,8 @@
 pkgname=exa
 version=0.10.1
 revision=2
+create_wrksrc=yes
+build_wrksrc="${pkgname}-${version}"
 build_style=cargo
 hostmakedepends="pkg-config"
 makedepends="libgit2-devel"
@@ -15,9 +17,9 @@ checksum="ff0fa0bfc4edef8bdbbb3cabe6fdbd5481a71abbbcc2159f402dea515353ae7c
  531596a1ef2a757c7728087529528150e6eb52bb8224fe575aa00a5f1b762849"
 
 post_extract() {
-	mkdir -p accoutrements
-	mv ../man accoutrements/
-	mv ../completions accoutrements/
+	mkdir -p "${build_wrksrc}/accoutrements"
+	mv man "${build_wrksrc}/accoutrements/"
+	mv completions "${build_wrksrc}/accoutrements/"
 }
 
 post_install() {

Re: [PR REVIEW] exa: use create_wrksrc

[paper42]

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

New review comment by paper42 on void-packages repository

https://github.com/void-linux/void-packages/pull/40082#discussion_r1001898032

Comment:
```suggestion
	mkdir "${build_wrksrc}/accoutrements"
```
post_extract is guaranteed to only run once, so -p is not required

Re: [PR PATCH] [Updated] exa: use create_wrksrc

[tranzystorek-io]

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

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

https://github.com/tranzystorek-io/void-packages exa-create-wrksrc
https://github.com/void-linux/void-packages/pull/40082

exa: use create_wrksrc
<!-- Uncomment relevant sections and delete options which are not applicable -->

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

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

<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
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/40082.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-exa-create-wrksrc-40082.patch --]
[-- Type: text/x-diff, Size: 1055 bytes --]

From d90f9575c816c24d0b39d6eff9f2054071e3e711 Mon Sep 17 00:00:00 2001
From: Marcin Puc <tranzystorek.io@protonmail.com>
Date: Fri, 21 Oct 2022 16:34:16 +0200
Subject: [PATCH] exa: use create_wrksrc

---
 srcpkgs/exa/template | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/exa/template b/srcpkgs/exa/template
index 3efe7851bbdd..dbacc613ce3e 100644
--- a/srcpkgs/exa/template
+++ b/srcpkgs/exa/template
@@ -2,6 +2,8 @@
 pkgname=exa
 version=0.10.1
 revision=2
+create_wrksrc=yes
+build_wrksrc="${pkgname}-${version}"
 build_style=cargo
 hostmakedepends="pkg-config"
 makedepends="libgit2-devel"
@@ -15,9 +17,9 @@ checksum="ff0fa0bfc4edef8bdbbb3cabe6fdbd5481a71abbbcc2159f402dea515353ae7c
  531596a1ef2a757c7728087529528150e6eb52bb8224fe575aa00a5f1b762849"
 
 post_extract() {
-	mkdir -p accoutrements
-	mv ../man accoutrements/
-	mv ../completions accoutrements/
+	mkdir "${build_wrksrc}/accoutrements"
+	mv man "${build_wrksrc}/accoutrements/"
+	mv completions "${build_wrksrc}/accoutrements/"
 }
 
 post_install() {

Re: [PR REVIEW] exa: use create_wrksrc

[tranzystorek-io]

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

New review comment by tranzystorek-io on void-packages repository

https://github.com/void-linux/void-packages/pull/40082#discussion_r1001912973

Comment:
Done

Re: exa: use create_wrksrc

[tranzystorek-io]

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

New comment by tranzystorek-io on void-packages repository

https://github.com/void-linux/void-packages/pull/40082#issuecomment-1287289717

Comment:
Please hold off on merging, I realised the second distfile delivers manpages and completions that are already present in the source tarball 😆

Re: [PR PATCH] [Updated] exa: use create_wrksrc

[tranzystorek-io]

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

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

https://github.com/tranzystorek-io/void-packages exa-create-wrksrc
https://github.com/void-linux/void-packages/pull/40082

exa: use create_wrksrc
<!-- Uncomment relevant sections and delete options which are not applicable -->

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

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

<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
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/40082.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-exa-create-wrksrc-40082.patch --]
[-- Type: text/x-diff, Size: 2113 bytes --]

From 3827850c7f1ab67c563b3442d5dbb38f8365b5f9 Mon Sep 17 00:00:00 2001
From: Marcin Puc <tranzystorek.io@protonmail.com>
Date: Fri, 21 Oct 2022 16:34:16 +0200
Subject: [PATCH] exa: drop aux distfile, build manpages manually

---
 srcpkgs/exa/template | 29 +++++++++++++++++------------
 1 file changed, 17 insertions(+), 12 deletions(-)

diff --git a/srcpkgs/exa/template b/srcpkgs/exa/template
index 3efe7851bbdd..b395d65a7464 100644
--- a/srcpkgs/exa/template
+++ b/srcpkgs/exa/template
@@ -3,28 +3,33 @@ pkgname=exa
 version=0.10.1
 revision=2
 build_style=cargo
-hostmakedepends="pkg-config"
+hostmakedepends="pkg-config $(vopt_if man pandoc)"
 makedepends="libgit2-devel"
 short_desc="Modern replacement for ls"
 maintainer="Marcin Puc <tranzystorek.io@protonmail.com>"
 license="MIT"
 homepage="https://the.exa.website/"
-distfiles="https://github.com/ogham/exa/archive/refs/tags/v${version}.tar.gz
- https://github.com/ogham/exa/releases/download/v${version}/exa-accoutrements-v${version}.zip"
-checksum="ff0fa0bfc4edef8bdbbb3cabe6fdbd5481a71abbbcc2159f402dea515353ae7c
- 531596a1ef2a757c7728087529528150e6eb52bb8224fe575aa00a5f1b762849"
+distfiles="https://github.com/ogham/exa/archive/refs/tags/v${version}.tar.gz"
+checksum="ff0fa0bfc4edef8bdbbb3cabe6fdbd5481a71abbbcc2159f402dea515353ae7c"
 
-post_extract() {
-	mkdir -p accoutrements
-	mv ../man accoutrements/
-	mv ../completions accoutrements/
-}
+build_options="man"
+desc_option_man="Use pandoc for manpages"
+
+case "$XBPS_MACHINE" in
+	x86_64*|i686|ppc64le*|ppc64) build_options_default="man" ;;
+esac
 
 post_install() {
 	vcompletion completions/completions.bash bash
 	vcompletion completions/completions.fish fish
 	vcompletion completions/completions.zsh zsh
 	vlicense LICENCE
-	vman accoutrements/man/exa.1
-	vman accoutrements/man/exa_colors.5
+
+	if [ -n "$build_option_man" ]; then
+		# https://github.com/ogham/exa/issues/1036#issuecomment-1052543212
+		pandoc --standalone -f markdown -t man man/exa.1.md > exa.1
+		pandoc --standalone -f markdown -t man man/exa_colors.5.md > exa_colors.5
+		vman exa.1
+		vman exa_colors.5
+	fi
 }

Re: exa: drop aux distfile, build manpages manually

[tranzystorek-io]

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

New comment by tranzystorek-io on void-packages repository

https://github.com/void-linux/void-packages/pull/40082#issuecomment-1287335777

Comment:
Should be good to merge now 👍

Re: [PR REVIEW] exa: drop aux distfile, build manpages manually

[paper42]

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

New review comment by paper42 on void-packages repository

https://github.com/void-linux/void-packages/pull/40082#discussion_r1002168110

Comment:
because of this restriction, aren't pre-generated manpages better?

Re: [PR REVIEW] exa: drop aux distfile, build manpages manually

[tranzystorek-io]

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

New review comment by tranzystorek-io on void-packages repository

https://github.com/void-linux/void-packages/pull/40082#discussion_r1002169940

Comment:
I can take it back, but is that such a big deal?

Re: [PR REVIEW] exa: drop aux distfile, build manpages manually

[tranzystorek-io]

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

New review comment by tranzystorek-io on void-packages repository

https://github.com/void-linux/void-packages/pull/40082#discussion_r1002169940

Comment:
I can take it back, but is that such a big deal?

EDIT: I guess all the arms etc...

Re: [PR REVIEW] exa: drop aux distfile, build manpages manually

[paper42]

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

New review comment by paper42 on void-packages repository

https://github.com/void-linux/void-packages/pull/40082#discussion_r1002217709

Comment:
All cross compiled architectures don't have pandoc actually, this condition isn't exactly correct.

Re: [PR PATCH] [Updated] exa: drop aux distfile, build manpages manually

[tranzystorek-io]

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

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

https://github.com/tranzystorek-io/void-packages exa-create-wrksrc
https://github.com/void-linux/void-packages/pull/40082

exa: drop aux distfile, build manpages manually
<!-- Uncomment relevant sections and delete options which are not applicable -->

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

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

<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
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/40082.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-exa-create-wrksrc-40082.patch --]
[-- Type: text/x-diff, Size: 1004 bytes --]

From 24affe4dc3bff46f4f982cd55c4dc709250bcc4b Mon Sep 17 00:00:00 2001
From: Marcin Puc <tranzystorek.io@protonmail.com>
Date: Sat, 22 Oct 2022 00:31:16 +0200
Subject: [PATCH] exa: use create_wrksrc

---
 srcpkgs/exa/template | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/exa/template b/srcpkgs/exa/template
index 3efe7851bbdd..248fda1e8188 100644
--- a/srcpkgs/exa/template
+++ b/srcpkgs/exa/template
@@ -2,6 +2,8 @@
 pkgname=exa
 version=0.10.1
 revision=2
+create_wrksrc=yes
+build_wrksrc="${pkgname}-${version}"
 build_style=cargo
 hostmakedepends="pkg-config"
 makedepends="libgit2-devel"
@@ -15,9 +17,8 @@ checksum="ff0fa0bfc4edef8bdbbb3cabe6fdbd5481a71abbbcc2159f402dea515353ae7c
  531596a1ef2a757c7728087529528150e6eb52bb8224fe575aa00a5f1b762849"
 
 post_extract() {
-	mkdir -p accoutrements
-	mv ../man accoutrements/
-	mv ../completions accoutrements/
+	mkdir "${build_wrksrc}/accoutrements"
+	mv man "${build_wrksrc}/accoutrements/"
 }
 
 post_install() {

Re: [PR REVIEW] exa: use create_wrksrc

[tranzystorek-io]

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

New review comment by tranzystorek-io on void-packages repository

https://github.com/void-linux/void-packages/pull/40082#discussion_r1002225449

Comment:
Reverted to previous solution, sorry for the commotion

Re: [PR PATCH] [Merged]: exa: use create_wrksrc

[classabbyamp]

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

There's a merged pull request on the void-packages repository

exa: use create_wrksrc
https://github.com/void-linux/void-packages/pull/40082

Description:
<!-- Uncomment relevant sections and delete options which are not applicable -->

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

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

<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
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
-->