Re: [PR PATCH] [Updated] bup: update to 0.32, switch to python3.

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

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

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

https://github.com/ericonr/void-packages bup
https://github.com/void-linux/void-packages/pull/28904

bup: update to 0.32, switch to python3.
<!-- Mark items with [x] where applicable -->

@Gottox could you please take a look? I just got it far enough to build :P

#### General
- [ ] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)

#### Have the results of the proposed changes been tested?
- [ ] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [ ] I generally don't use the affected packages but briefly tested this PR

<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
<!-- 
#### Does it build and run successfully? 
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [ ] 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/28904.patch is attached

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

From 981802685dfb0e651a944a3c4f26bb10c9d1e4bb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Sat, 20 Feb 2021 01:12:36 -0300
Subject: [PATCH 1/2] bup: update to 0.32, switch to python3.

---
 srcpkgs/bup/patches/disable-git-call.patch | 13 +++++++------
 srcpkgs/bup/template                       | 10 +++++-----
 2 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/srcpkgs/bup/patches/disable-git-call.patch b/srcpkgs/bup/patches/disable-git-call.patch
index 5468b5992f3..3abedea5aba 100644
--- a/srcpkgs/bup/patches/disable-git-call.patch
+++ b/srcpkgs/bup/patches/disable-git-call.patch
@@ -1,13 +1,14 @@
 --- Makefile.orig	2016-05-25 16:57:27.966465927 +0200
 +++ Makefile	2016-05-25 16:57:32.091465618 +0200
 @@ -39,8 +39,8 @@ else
-   test_tmp := $(CURDIR)/t/tmp
+   test_tmp := $(CURDIR)/test/tmp
  endif
  
--initial_setup := $(shell ./configure-version --update $(isok))
--initial_setup := $(call shout,$(initial_setup),Version configuration failed))
-+#initial_setup := $(shell ./configure-version --update $(isok))
-+#initial_setup := $(call shout,$(initial_setup),Version configuration failed))
+-initial_setup := $(shell dev/update-checkout-info lib/bup/checkout_info.py $(isok))
+-initial_setup := $(call shout,$(initial_setup),update-checkout-info failed))
++#initial_setup := $(shell dev/update-checkout-info lib/bup/checkout_info.py $(isok))
++#initial_setup := $(call shout,$(initial_setup),update-checkout-info failed))
  
- config/config.vars: configure config/configure config/configure.inc \
+ config/config.vars: \
+   configure config/configure config/configure.inc \
    $(wildcard config/*.in)
diff --git a/srcpkgs/bup/template b/srcpkgs/bup/template
index 8bec5f8bdc9..2c28542a074 100644
--- a/srcpkgs/bup/template
+++ b/srcpkgs/bup/template
@@ -1,17 +1,17 @@
 # Template file for 'bup'
 pkgname=bup
-version=0.30
+version=0.32
 revision=1
 build_style=configure
-hostmakedepends="python perl git"
-makedepends="python-devel"
+hostmakedepends="python3 perl git"
+makedepends="python3-devel"
 short_desc="Backup system based on the git packfile format"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="LGPL-2.0-only"
 homepage="https://github.com/bup/bup"
 distfiles="https://github.com/bup/bup/archive/${version}.tar.gz"
-checksum=5238f045c220278a165fff528ea32288f2752db2e1ac15704e849b71cddda0b2
-python_version=2 #unverified
+checksum=a894cfa96c44b9ef48003b2c2104dc5fa6361dd2f4d519261a93178984a51259
+python_version=3
 nocross=yes
 
 pre_configure() {

From 61db0cc4f8b63bd8f142af9c05833c6e5b072c42 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Sun, 21 Feb 2021 21:06:42 +0100
Subject: [PATCH 2/2] bup: fix xbps-src check

---
 srcpkgs/bup/template | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/srcpkgs/bup/template b/srcpkgs/bup/template
index 2c28542a074..b40c3cddbf6 100644
--- a/srcpkgs/bup/template
+++ b/srcpkgs/bup/template
@@ -5,6 +5,7 @@ revision=1
 build_style=configure
 hostmakedepends="python3 perl git"
 makedepends="python3-devel"
+checkdepends="python3-pytest tar rsync"
 short_desc="Backup system based on the git packfile format"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="LGPL-2.0-only"
@@ -17,3 +18,7 @@ nocross=yes
 pre_configure() {
 	sed -i 's#^PREFIX=.*#PREFIX=/usr#' Makefile
 }
+
+do_check() {
+	./pytest -x --ignore-glob='test/ext/test-ls*'
+}