diff --git a/mercurial/PKGBUILD b/mercurial/PKGBUILD index e02c05a024..2295a717e1 100644 --- a/mercurial/PKGBUILD +++ b/mercurial/PKGBUILD @@ -4,14 +4,16 @@ # Contributor: Douglas Soares de Andrade pkgname=mercurial -pkgver=6.6.1 +pkgver=6.6.2 pkgrel=1 pkgdesc='A scalable distributed SCM tool' arch=(x86_64 powerpc64le powerpc64 powerpc riscv64) url="https://www.mercurial-scm.org/" license=(GPL) depends=(python) -makedepends=(python-docutils) +makedepends=(python-{build,installer,wheel} + python-setuptools + python-docutils) optdepends=('tk: for the hgk GUI') #checkdepends=('breezy' 'cvs' 'git' 'git-lfs' 'python-docutils' 'subversion' 'unzip') @@ -28,13 +30,13 @@ validpgpkeys=(2BCCE14F5C6725AA2EA8AEB7B9C9DC824AA5BDD5 1F66F8CDF654E905C11DA061A11E01CD0E05D956) # Raphaël Gomès source=(https://www.mercurial-scm.org/release/${pkgname}-${pkgver}.tar.gz{,.asc} mercurial.profile) -sha512sums=('f16240f06a98a088e0229aa6584daa540eee92476a0a7934617c065c9f1012288cf3d6fb2d20fc7b247122bc360201f2e2c1c139c261a834f483bd09bef74d0c' +sha512sums=('cf45c7c43555bd64d95ec6de2af7952bb50c2fba9ec59ce1afd9437b1fb53e399bd1e6f1b6e17cc5699f598cca4e087f82b3097d2d772219dd0337bbbde2d16b' 'SKIP' '710dcddb24d928efc97370e869d9caa083107929ed9a1086dd2a3ae0caaf2c71e2f29060597e29315b6b15b1616251c42412e268ce737109c48ae4d7aa1b9555') build() { cd $pkgname-$pkgver - python setup.py build + python -m build -wn make -C contrib/chg } @@ -46,29 +48,29 @@ check() { package() { cd $pkgname-$pkgver - python setup.py install --root="$pkgdir" --skip-build --optimize=1 - make DESTDIR="${pkgdir}" PREFIX=/usr install + python -m installer -d "$pkgdir" dist/*.whl - install -m644 -D contrib/zsh_completion "$pkgdir/usr/share/zsh/site-functions/_hg" - install -m644 -D contrib/bash_completion "$pkgdir/usr/share/bash-completion/completions/hg" + # Do not invoke install target because it invokes a soon to be deprecated + # `setup.py install` and screws with shebang handling in PEP517 install above + make DESTDIR="$pkgdir" PREFIX=/usr install-doc + + install -Dm644 contrib/zsh_completion "$pkgdir/usr/share/zsh/site-functions/_hg" + install -Dm644 contrib/bash_completion "$pkgdir/usr/share/bash-completion/completions/hg" make -C contrib/chg DESTDIR="$pkgdir" PREFIX=/usr install - install -m755 contrib/hg-ssh "$pkgdir/usr/bin" - install -m755 contrib/hgk "$pkgdir/usr/bin" - install -d "$pkgdir/usr/share/emacs/site-lisp" - install -m644 contrib/{mq.el,mercurial.el} "$pkgdir/usr/share/emacs/site-lisp" + install -Dm755 contrib/hg-ssh "$pkgdir/usr/bin" + install -Dm755 contrib/hgk "$pkgdir/usr/bin" - install -Dm644 contrib/vim/HGAnnotate.vim \ - "$pkgdir/usr/share/vim/vimfiles/syntax/HGAnnotate.vim" + install -Dm644 -t "$pkgdir/usr/share/emacs/site-lisp/" contrib/{mq.el,mercurial.el} + + install -Dm644 -t "$pkgdir/usr/share/vim/vimfiles/syntax/" contrib/vim/HGAnnotate.vim # set some variables - install -m755 -d "$pkgdir/etc/profile.d" - install -m644 "$srcdir/mercurial.profile" "$pkgdir/etc/profile.d/mercurial.sh" + install -Dm644 "$srcdir/mercurial.profile" "$pkgdir/etc/profile.d/mercurial.sh" # FS#38825 - Add certs config to package - install -m755 -d "$pkgdir/etc/mercurial" - cat <<-EOF > "$pkgdir/etc/mercurial/hgrc" + cat <<-EOF | install -Dm755 /dev/stdin "$pkgdir/etc/mercurial/hgrc" [web] cacerts = /etc/ssl/certs/ca-certificates.crt EOF