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

Balló György bgyorgy at archlinux.org
Mon Mar 16 21:06:57 UTC 2020


    Date: Monday, March 16, 2020 @ 21:06:57
  Author: bgyorgy
Revision: 599868

upgpkg: python-xapian 1:1.4.15-2: Remove python2 support

Modified:
  python-xapian/trunk/PKGBUILD

----------+
 PKGBUILD |   39 ++++++++-------------------------------
 1 file changed, 8 insertions(+), 31 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2020-03-16 21:01:02 UTC (rev 599867)
+++ PKGBUILD	2020-03-16 21:06:57 UTC (rev 599868)
@@ -3,17 +3,17 @@
 # Contributor: DonVla <donvla/users.sourceforge/net>
 # Contributor: Hervé Cauwelier <herve/oursours/net>
 
-pkgbase=python-xapian
-pkgname=('python-xapian' 'python2-xapian')
+pkgname=python-xapian
 _realname=xapian-bindings
 pkgver=1.4.15
 epoch=1
-pkgrel=1
+pkgrel=2
 pkgdesc="Python bindings for Xapian"
 arch=('x86_64')
 url="https://xapian.org/docs/bindings/python/"
 license=('GPL2')
-makedepends=('python-sphinx' 'python2-sphinx' "xapian-core=$epoch:$pkgver")
+depends=('python' "xapian-core=$epoch:$pkgver")
+makedepends=('python-sphinx')
 source=("https://oligarchy.co.uk/xapian/${pkgver}/${_realname}-${pkgver}.tar.xz"{,.asc})
 sha512sums=('dec8a0431c9070fc70d79b67bddc2e0adb10ef5366c4b9d7a135365ea6c6680d2e7682dbfd60c29eca51da48eaa0715509e30b13d5482d5a38bfd0d0156c43f9'
             'SKIP')
@@ -22,43 +22,20 @@
 prepare() {
   cd "${_realname}-${pkgver}"
   autoreconf -vfi
-  cd ..
-  mv -v "${_realname}-$pkgver" "${pkgname[0]}-${pkgver}"
-  cp -av "${pkgname[0]}-$pkgver" "${pkgname[1]}-${pkgver}"
-  cd "${pkgname[1]}-${pkgver}"
-  # fix shebang of examples
-  sed -i '1s/python/python2/' python/docs/examples/*.py
   export XAPIAN_CONFIG=/usr/bin/xapian-config
 }
 
 build() {
-  cd "${pkgname[0]}-${pkgver}"
+  cd "${_realname}-${pkgver}"
   ./configure --prefix=/usr \
               --with-python3
   make
-  cd ../"${pkgname[1]}-${pkgver}"
-  PYTHON2=/usr/bin/python2
-  ./configure --prefix=/usr \
-              --with-python
-  make
 }
 
-package_python-xapian() {
-  pkgdesc="Python 3.x bindings for Xapian"
-  depends=('python' "xapian-core=$epoch:$pkgver")
-  cd "${pkgname[0]}-${pkgver}"
+package() {
+  cd "${_realname}-${pkgver}"
   make DESTDIR="${pkgdir}" install
-  install -t "${pkgdir}/usr/share/doc/${pkgname[0]}" \
+  install -t "${pkgdir}/usr/share/doc/${_realname}" \
     -vDm644 {AUTHORS,ChangeLog,HACKING,NEWS,README,TODO}
 }
-
-package_python2-xapian() {
-  pkgdesc="Python 2.x bindings for Xapian"
-  depends=('python2' "xapian-core=$epoch:$pkgver")
-  cd "${pkgname[1]}-${pkgver}"
-  make DESTDIR="$pkgdir" install
-  install -t "${pkgdir}/usr/share/doc/${pkgname[1]}" \
-    -vDm644 {AUTHORS,ChangeLog,HACKING,NEWS,README,TODO}
-}
-
 # vim:set ts=2 sw=2 et:



More information about the arch-commits mailing list