pcr/pypolicyd-spf: Build for newer Python, clean up

1 files changed, 14 insertions, 63 deletions

diff --git a/pcr/pypolicyd-spf/PKGBUILD b/pcr/pypolicyd-spf/PKGBUILD
index 6e37f716f..72d333af2 100644
--- a/pcr/pypolicyd-spf/PKGBUILD
+++ b/pcr/pypolicyd-spf/PKGBUILD
@@ -6,87 +6,38 @@
 pkgname=pypolicyd-spf
 pkgver=2.0.2
 _pkgver=${pkgver%.*}
-pkgrel=4
+pkgrel=5
 pkgdesc="Python Postfix Sender Policy Framework (SPF) filter daemon"
 arch=('any')
 url="https://launchpad.net/${pkgname}/"
 license=('GPL')
 
 makedepends=('python-setuptools')
-depends=('postfix' 'python-pyspf' 'python')
+depends=('postfix' 'python-pyspf')
 optdepends=('python-authres: RFC 7001 Authentication-Results header support')
 
 options=(!emptydirs)
 backup=(etc/python-policyd-spf/policyd-spf.conf)
 
-source=(https://launchpad.net/$pkgname/${_pkgver}/$pkgver/+download/$pkgname-$pkgver.tar.gz{,.asc})
+source=("https://launchpad.net/$pkgname/${_pkgver}/$pkgver/+download/$pkgname-$pkgver.tar.gz"{,.asc})
 md5sums=('cc50281cc13a8984de058ddc5ae8dcaf'
          'SKIP')
 validpgpkeys=('E7729BFFBE85400FEEEE23B178D7DEFB9AD59AF1') # Donald Scott Kitterman
 
-
-_version_constraint() # (dep_pkgname [precision])
-{
-  Log() { [[ "${FUNCNAME[2]}" == package ]] && echo "$@" >&2 || : ; }
-
-
-  local dep_pkgname=$1
-  declare -i req_precision=$2
-  local full_version=$(pacman -S --print-format='%v' ${dep_pkgname} 2> /dev/null | tail -n 1)
-  local n_dots=$(tmp=${full_version%-*} ; tmp=${tmp//[^\.]} ; echo "${#tmp}" ;)
-  local def_precision=$(( n_dots + 1 ))
-  local is_prec_valid=$(( req_precision > 0 && req_precision <= def_precision ))
-  local precision=$((( is_prec_valid )) && echo ${req_precision} || echo ${def_precision})
-  local pkgver_rx='[0-9A-Za-z_]+'
-  pkgver_rx=$(sed 's|\]|\+]|' <<<${pkgver_rx}) # according to the wiki, '+' is not allowed,
-                                               # but some pkgver have it (eg: 5.15.10+kde+r130)
-  local subver_rx='\.'${pkgver_rx}
-  local pkgrel_rx='[0-9]+'
-  local garbage_rx='[^0-9].*'
-  local capture_rx=${pkgver_rx}
-  for (( n_dots=1 ; n_dots < precision ; ++n_dots )) ; do capture_rx+=${subver_rx} ; done ;
-  local version pkgrel has_dot_char version_min version_max constraint_string
-  declare -i subver subver_inc pkgrel_inc
-
-  if   [[ "${full_version}" =~ ^(${capture_rx})(${subver_rx})*-(${pkgrel_rx}).*$ ]]
-  then version=${BASH_REMATCH[1]} # pkgver cut to the requested precision
-       #unused=${BASH_REMATCH[2]} # discarded pkgver segments
-       pkgrel=${BASH_REMATCH[3]}  # pkgrel with non-numerics right-trimmed
-       has_dot_char=$([[ "${version}" =~ \. ]] ; echo $(( ! $? )) ; )
-       subver=$(sed "s|${garbage_rx}||" <<<${version##*.}) # right-trim from any non-numeric
-       version=$( (( has_dot_char )) && echo ${version%.*}.${subver} || echo ${subver} )
-       subver_inc=$(( subver + 1 ))
-       pkgrel_inc=$(( pkgrel + 1 ))
-       version_min=$(   (( ! is_prec_valid    )) && echo ${full_version%-*}-${pkgrel} || \
-                                                    echo ${version}                      )
-       version_max=$( ( (( ! is_prec_valid    )) && echo ${full_version%-*}-${pkgrel_inc} ) || \
-                      ( [[ "${version}" =~ \. ]] && echo ${version%.*}.${subver_inc}      ) || \
-                                                    echo ${subver_inc}                         )
-       constraint_string="${dep_pkgname}>=${version_min} ${dep_pkgname}<${version_max}"
-
-       Log "Applied version constraint: '${constraint_string}'"
-  else Log "ERROR: in _version_constraint() parsing: dep_pkgname='${dep_pkgname}' full_version='${full_version}'"
-       exit 1
-  fi
-
-  unset -f Log
-
-  echo -n "${constraint_string}"
-}
-
-
 build() {
-  cd "$srcdir"/$pkgname-$pkgver
-
-  python setup.py build || return 1
+  cd "$pkgname-$pkgver"
+  # Don't use build a modern 'wheel' instead of 'egg' (and so don't
+  # use modern 'python-builder' and 'python-installer').  The way
+  # setup.py is written, the 'wheel' will be broken and won't
+  # correctly install files in '/etc'.
+  python setup.py build
 }
 
 package() {
-  # pin to strongly-coupled dependency versions
-  depends=( ${depends[*]/python/} $(_version_constraint python 2) )
-
-  cd "$srcdir"/$pkgname-$pkgver
+  _python_version=$(pacman -S --print-format='%v' python|cut -d- -f1|cut -d. -f1,2)
+  depends+=("python>=${_python_version}" "python<${_python_version%.*}.$(( ${_python_version##*.} + 1 ))")
 
-  python setup.py install --root="$pkgdir/" --optimize=1 || return 1
-  install -m644 policyd-spf.conf.commented "$pkgdir"/etc/python-policyd-spf || return 1
+  cd "$pkgname-$pkgver"
+  python setup.py install --root="$pkgdir/" --optimize=1
+  install -m644 policyd-spf.conf.commented "$pkgdir"/etc/python-policyd-spf
 }