From bb193021838ecf582c23b0ba20706b7959eff8b2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Fri, 25 Sep 2020 08:40:51 +0700
Subject: [PATCH] python3-dkimpy: drop noarch, python 2 dummy

---
 srcpkgs/hg-git/template         | 36 +++++++++++++++++----------------
 srcpkgs/python-dkimpy           |  1 -
 srcpkgs/python3-dkimpy/template | 11 +---------
 3 files changed, 20 insertions(+), 28 deletions(-)
 delete mode 120000 srcpkgs/python-dkimpy

diff --git a/srcpkgs/hg-git/template b/srcpkgs/hg-git/template
index 15f981d8563..d88cb0f3bca 100644
--- a/srcpkgs/hg-git/template
+++ b/srcpkgs/hg-git/template
@@ -1,26 +1,28 @@
 # Template file for 'hg-git'
 pkgname=hg-git
-version=0.8.12
+version=0.9.0
 revision=1
-wrksrc="durin42-hg-git-c651bb6fcf33"
-archs=noarch
-build_style=python2-module
-hostmakedepends="python"
-makedepends="python python-dulwich"
-depends="${makedepends}"
-checkdepends="mercurial git"
-pycompile_module="hggit"
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+depends="python3-dulwich mercurial"
+checkdepends="$depends git unzip openssh"
 short_desc="Mercurial plugin adding the ability to push and pull to/from Git"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-only"
-homepage="https://bitbucket.org/durin42/hg-git"
-distfiles="https://bitbucket.org/durin42/hg-git/get/${version}.tar.bz2"
-checksum=5ca4aac0b526e8fb6c31a3d67d09f6bdd4c1ad94075a3e25bd28307d6fd84158
+# https://www.mercurial-scm.org/wiki/HgGit
+homepage="https://foss.heptapod.net/mercurial/hg-git"
+distfiles="$PYPI_SITE/h/hg-git/hg-git-$version.tar.gz"
+checksum=77acbd8c322847ec109046d931e0731a91fcf13e10cfe9c183812706ec867671
 
 do_check() {
-	# broken connecting to fake ssh server
-	rm tests/test-pull.t
-	rm tests/test-push.t
-	rm tests/test-git-clone.t
-	make tests
+	cd tests
+	rm -f test-branch-bookmark-suffix.t
+	# Git 2.28 appends merge into master, Git 2.29 reverts that change
+	rm -f test-merge.t test-octopus.t test-pull.t
+	# test hg serve, bind to localhost instead *
+	rm -f test-http.t
+	# Differ in warning, which is new in Git 2.28
+	rm -f test-subrepos.t
+
+	python3 run-tests.py --with-hg=/usr/bin/hg
 }
diff --git a/srcpkgs/python-dkimpy b/srcpkgs/python-dkimpy
deleted file mode 120000
index df6f3fa105e..00000000000
--- a/srcpkgs/python-dkimpy
+++ /dev/null
@@ -1 +0,0 @@
-python3-dkimpy
\ No newline at end of file
diff --git a/srcpkgs/python3-dkimpy/template b/srcpkgs/python3-dkimpy/template
index 836f46d7aec..b6d90ccd804 100644
--- a/srcpkgs/python3-dkimpy/template
+++ b/srcpkgs/python3-dkimpy/template
@@ -1,11 +1,9 @@
 # Template file for 'python3-dkimpy'
 pkgname=python3-dkimpy
 version=1.0.0
-revision=2
-archs=noarch
+revision=3
 wrksrc="dkimpy-${version}"
 build_style=python3-module
-pycompile_module="dkim"
 hostmakedepends="python3-setuptools"
 depends="python3-dnspython python3-authres python3-pynacl python3-aiodns"
 checkdepends="$depends python3-pytest"
@@ -27,10 +25,3 @@ post_install() {
 	rm -f ${DESTDIR}/usr/lib/python3.?/site-packages/dkim/__main__.py
 	vlicense LICENSE
 }
-
-python-dkimpy_package() {
-	build_style=meta
-	archs=noarch
-	depends="python3-dkimpy"
-	short_desc+=" - transitional dummy package"
-}