[arch-commits] Commit in khal/trunk (PKGBUILD)

Daniel M. Capella polyzen at gemini.archlinux.org
Sat Sep 3 10:25:59 UTC 2022


    Date: Saturday, September 3, 2022 @ 10:25:59
  Author: polyzen
Revision: 1291471

upgpkg: khal 0.10.5-3

Modified:
  khal/trunk/PKGBUILD

----------+
 PKGBUILD |   22 ++++++++++++----------
 1 file changed, 12 insertions(+), 10 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2022-09-03 10:25:20 UTC (rev 1291470)
+++ PKGBUILD	2022-09-03 10:25:59 UTC (rev 1291471)
@@ -8,19 +8,20 @@
 
 pkgname=khal
 pkgver=0.10.5
-pkgrel=2
+pkgrel=3
 pkgdesc='CLI calendar application build around CalDAV'
 arch=('any')
 url="https://lostpackets.de/khal/"
 license=('MIT')
-makedepends=('python-setuptools-scm' 'python-sphinxcontrib-newsfeed')
 depends=('python-atomicwrites' 'python-click' 'python-click-log'
          'python-configobj' 'python-dateutil' 'python-icalendar' 'python-pytz'
          'python-pyxdg' 'python-urwid' 'python-tzlocal')
+makedepends=('python-build' 'python-installer' 'python-setuptools-scm'
+             'python-sphinxcontrib-newsfeed' 'python-wheel')
+checkdepends=('python-pytest' 'python-freezegun' 'vdirsyncer')
 optdepends=('gawk: for mutt2khal'
             'python-setproctitle: to set process name'
             'vdirsyncer: to synchronize CalDAV calendars')
-checkdepends=('python-pytest' 'python-freezegun' 'vdirsyncer')
 source=("https://files.pythonhosted.org/packages/source/${pkgname::1}/${pkgname}/${pkgname}-${pkgver}.tar.gz")
 sha256sums=('4eefb7ac302a26d8606db392817587a4ed94c27a15bf2ea211614a464fcf0c76')
 b2sums=('195e61fcff7cff1308f2819ec54c5733acebb5ace18f88afa8fc561926857dab3e0e0b82d1f7e3e0235e69ed9ad56544d6eeb95a9e9829dc078d49ebf96c0485')
@@ -27,7 +28,7 @@
 
 build() {
   cd "${pkgname}-${pkgver}"
-  python setup.py build
+  python -m build --wheel --skip-dependency-check --no-isolation
   make -C doc man PYTHONPATH="${PWD}"
 }
 
@@ -41,11 +42,9 @@
 
 package() {
   cd "${pkgname}-${pkgver}"
-  python setup.py install --skip-build \
-    --optimize=1 \
-    --root="${pkgdir}"
+  python -m installer --destdir="${pkgdir}" dist/*.whl
   # executables
-  install -vDm 755 bin/{i,}"${pkgname}" misc/mutt2khal -t "$pkgdir/usr/bin/"
+  install -vDm 755 bin/{i,}"${pkgname}" misc/mutt2khal -t "${pkgdir}/usr/bin/"
   # configuration
   install -vDm 644 "${pkgname}.conf.sample" \
     "${pkgdir}/usr/share/doc/${pkgname}/examples/${pkgname}.conf"
@@ -64,9 +63,12 @@
   # desktop file
   install -vDm 644 misc/khal.desktop \
     -t "${pkgdir}/usr/share/applications/"
-  # license
-  install -vDm 644 COPYING -t "${pkgdir}/usr/share/licenses/${pkgname}"
   # docs
   install -vDm 644 {AUTHORS.txt,{CHANGELOG,CONTRIBUTING,README}.rst} \
     -t "${pkgdir}/usr/share/doc/${pkgname}"
+  # symlink license file
+  local site_packages=$(python -c "import site; print(site.getsitepackages()[0])")
+  install -d "${pkgdir}"/usr/share/licenses/${pkgname}
+  ln -s "${site_packages}"/${pkgname}-${pkgver}.dist-info/COPYING \
+    "${pkgdir}"/usr/share/licenses/${pkgname}/COPYING
 }



More information about the arch-commits mailing list