upgpkg: mercurial-hg r46486.d7685105e504-1

2 files changed, 10 insertions, 18 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 6667e45b75f3..21bd44c4f5ec 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = mercurial-hg
 	pkgdesc = Distributed source control management tool
-	pkgver = r42137.d086ba387ae8
+	pkgver = r46486.d7685105e504
 	pkgrel = 1
 	url = https://www.mercurial-scm.org/
 	arch = i686
@@ -8,6 +8,7 @@ pkgbase = mercurial-hg
 	license = GPL2
 	makedepends = mercurial
 	makedepends = python-docutils
+	makedepends = rust
 	depends = glibc
 	depends = python
 	optdepends = tk: for the hgk GUI
diff --git a/PKGBUILD b/PKGBUILD
index fe51446db9e1..60dbd6e0e7b2 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,15 +1,15 @@
 # Maintainer: Chocobo1 <chocobo1 AT archlinux DOT net>
 
 pkgname=mercurial-hg
-pkgver=r42137.d086ba387ae8
+pkgver=r46486.d7685105e504
 pkgrel=1
 pkgdesc="Distributed source control management tool"
 arch=('i686' 'x86_64')
 url="https://www.mercurial-scm.org/"
 license=('GPL2')
 depends=('glibc' 'python')
+makedepends=('mercurial' 'python-docutils' 'rust')
 optdepends=('tk: for the hgk GUI')
-makedepends=('mercurial' 'python-docutils')
 provides=('mercurial')
 conflicts=('mercurial')
 backup=('etc/mercurial/hgrc')
@@ -28,7 +28,7 @@ pkgver() {
 build() {
   cd "hg"
 
-  make all
+  make PURE="--rust" all
   make -C "contrib/chg"
 }
 
@@ -41,28 +41,19 @@ check() {
 package() {
   cd "hg"
 
-  python "setup.py" install \
-    --optimize 1 \
-    --root "$pkgdir"
-
+  make DESTDIR="$pkgdir" PREFIX="/usr" PURE="--rust" install
   make DESTDIR="$pkgdir" PREFIX="/usr" -C "contrib/chg" install
 
-  install -d "$pkgdir/usr/share/man"/{man1,man5}
-  install -m644 "doc/hg.1" "$pkgdir/usr/share/man/man1"
-  install -m644 doc/{hgrc.5,hgignore.5} "$pkgdir/usr/share/man/man5"
-
-  install -m755 contrib/{hgk,hg-ssh} "$pkgdir/usr/bin"
+  install -Dm755 contrib/{hgk,hg-ssh} -t "$pkgdir/usr/bin"
   install -Dm644 "contrib/bash_completion" "$pkgdir/usr/share/bash-completion/completions/hg"
   install -Dm644 "contrib/zsh_completion" "$pkgdir/usr/share/zsh/site-functions/_hg"
 
-  install -d "$pkgdir/usr/share/emacs/site-lisp"
-  install -m644 contrib/{mq.el,mercurial.el} "$pkgdir/usr/share/emacs/site-lisp"
-
-  install -Dm644 "contrib/vim/HGAnnotate.vim" "$pkgdir/usr/share/vim/vimfiles/syntax/HGAnnotate.vim"
+  install -Dm644 contrib/{mq.el,mercurial.el} -t "$pkgdir/usr/share/emacs/site-lisp"
+  install -Dm644 "contrib/vim/HGAnnotate.vim" -t "$pkgdir/usr/share/vim/vimfiles/syntax"
 
   install -Dm755 "$srcdir/mercurial.profile" "$pkgdir/etc/profile.d/mercurial.sh"
 
   # FS#38825 - Add certs config to package
   install -dm755 "$pkgdir/etc/mercurial"
-  printf "\n[web]\ncacerts = /etc/ssl/certs/ca-certificates.crt\n" >> "$pkgdir/etc/mercurial/hgrc"
+  printf "[web]\ncacerts = /etc/ssl/certs/ca-certificates.crt\n" >> "$pkgdir/etc/mercurial/hgrc"
 }