From b5f75d9fd3699214976db3f929b7309883d3d572 Mon Sep 17 00:00:00 2001
From: Ludovic Chabant <ludovic@chabant.com>
Date: Fri, 11 Oct 2019 16:47:40 +0000
Subject: [PATCH] Update mercurial and hg-evolve

Mercurial package is updated with the latest edge upstream to
install mercurial 5.1.2 with py3. Evolve is updated to 9.2.1
and also installs with py3.
---
 sr.ht/hg-evolve/APKBUILD | 14 +++++++-------
 sr.ht/mercurial/APKBUILD | 27 +++++++++++++++------------
 2 files changed, 22 insertions(+), 19 deletions(-)

diff --git a/sr.ht/hg-evolve/APKBUILD b/sr.ht/hg-evolve/APKBUILD
index fa4dc5a..a3826b2 100644
--- a/sr.ht/hg-evolve/APKBUILD
+++ b/sr.ht/hg-evolve/APKBUILD
@@ -1,15 +1,15 @@
 # Contributor: Ludovic Chabant <ludovic@chabant.com>
 # Maintainer: Ludovic Chabant <ludovic@chabant.com>
 pkgname=hg-evolve
-pkgver=8.5.1
+pkgver=9.2.1
 pkgrel=1
 pkgdesc="Flexible evolution of Mercurial history."
 url="https://www.mercurial-scm.org/repo/evolve"
 arch="all"
 license="GPLv2+"
-depends="python2"
-makedepends="python2-dev py-setuptools mercurial"
-source="$pkgname-$pkgver.tar.gz::https://files.pythonhosted.org/packages/e3/ce/6594aa403e3464831d4daf20e45fd2e3ef553d968ac13d2c7fa791d4eedd/${pkgname}-${pkgver}.tar.gz"
+depends="mercurial"
+makedepends="python3-dev py-setuptools"
+source="$pkgname-$pkgver.tar.gz::https://files.pythonhosted.org/packages/18/6c/7ae28f077dc8c9f522570e5be8a86a961bfdd47387afa1a708df034a5353/hg-evolve-9.2.1.tar.gz"
 builddir="${srcdir}/${pkgname}-${pkgver}"
 
 prepare() {
@@ -21,12 +21,12 @@ prepare() {
 
 build() {
 	cd "$builddir"
-	python2 setup.py build
+	HGPYTHON3=1 python3 setup.py build
 }
 
 package() {
 	cd "$builddir"
-	python2 setup.py install --prefix=/usr --root="$pkgdir"
+	HGPYTHON3=1 python3 setup.py install --prefix=/usr --root="$pkgdir"
 }
 
-sha512sums="7c5d9608d03ab81fc7291edb3f0ddb016cd4b267997bf66fcb221c9c917fbd34bfb4637bbb0c60b460a32304ee45fd7e30db929312dfbaa94df17baf7947482e  hg-evolve-8.5.1.tar.gz"
+sha512sums="927ba873c583a4027d8c745ba8eb70e8768cd7c4c9a36f773d33d9a77807345cc9d2029c8cbe0d626984a963700399447f2bee01c6a0820a4a46894719f76869  hg-evolve-9.2.1.tar.gz"
diff --git a/sr.ht/mercurial/APKBUILD b/sr.ht/mercurial/APKBUILD
index 70da706..340c45a 100644
--- a/sr.ht/mercurial/APKBUILD
+++ b/sr.ht/mercurial/APKBUILD
@@ -1,30 +1,33 @@
 # Contributor: Sören Tempel <soeren+alpine@soeren-tempel.net>
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=mercurial
-pkgver=5.1
-pkgrel=1
+pkgver=5.1.2
+pkgrel=0
 pkgdesc="Scalable distributed SCM tool"
 url="https://www.mercurial-scm.org"
 arch="all"
 license="GPL-2.0-or-later"
-depends=""
-makedepends="python2-dev"
+makedepends="python3-dev"
 subpackages="
 	$pkgname-doc
 	$pkgname-vim:vim:noarch
 	$pkgname-zsh-completion:zshcomp:noarch
-	$pkgname-bash-completion:bashcomp:noarch"
-source="https://www.mercurial-scm.org/release/$pkgname-$pkgver.tar.gz"
-builddir="$srcdir"/$pkgname-$pkgver
+	$pkgname-bash-completion:bashcomp:noarch
+	"
+source="https://www.mercurial-scm.org/release/mercurial-$pkgver.tar.gz"
+
+# secfixes:
+#   4.9-r0:
+#   - CVE-2019-3902
 
 build() {
 	cd "$builddir"
-	python2 setup.py build
+	PYTHON=python3 HGPYTHON3=1 python3 setup.py build
 }
 
 package() {
 	cd "$builddir"
-	python2 setup.py install --root="$pkgdir"
+	PYTHON=python3 HGPYTHON3=1 python3 setup.py install --root="$pkgdir"
 	install -m755 contrib/hgk contrib/hg-ssh hgeditor "$pkgdir"/usr/bin
 
 	local man
@@ -51,7 +54,7 @@ zshcomp() {
 	install_if="$pkgname=$pkgver-r$pkgrel zsh"
 
 	install -Dm644 "$builddir"/contrib/zsh_completion \
-		"$subpkgdir"/usr/share/zsh/site-functions/_${pkgname}
+		"$subpkgdir"/usr/share/zsh/site-functions/_$pkgname
 }
 
 bashcomp() {
@@ -60,7 +63,7 @@ bashcomp() {
 	install_if="$pkgname=$pkgver-r$pkgrel bash-completion"
 
 	install -Dm644 "$builddir"/contrib/bash_completion \
-		"$subpkgdir"/usr/share/bash-completion/completions/${pkgname}
+		"$subpkgdir"/usr/share/bash-completion/completions/$pkgname
 }
 
-sha512sums="cf7a64a181eeb3dc8f24067ea032fb17504358a9ed08cb50ac041e66ef20426c060d997cb5d30e7582874135b0a351b3e58d7297aaa4e009aabbf562a1ab9fae  mercurial-5.1.tar.gz"
+sha512sums="a8ce9d9220a5ddf452264801f06e81fe1e699ff700d085e3f82c6877910c6ef0e594203590f198b7b9e31c9a1ed627c8fa2a3a1513d0c5087cf775835a78c408  mercurial-5.1.2.tar.gz"
-- 
2.45.2