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

[Balló György]

    Date: Saturday, January 20, 2018 @ 21:45:48
  Author: bgyorgy
Revision: 284452

upgpkg: python-bsddb 6.2.5-2

Adopt the package, fix license and other things

Modified:
  python-bsddb/trunk/PKGBUILD
Deleted:
  python-bsddb/trunk/LICENSE

----------+
 LICENSE  |   19 -------------------
 PKGBUILD |   56 ++++++++++++++++++++++++++++----------------------------
 2 files changed, 28 insertions(+), 47 deletions(-)

Deleted: LICENSE
===================================================================
--- LICENSE	2018-01-20 20:28:19 UTC (rev 284451)
+++ LICENSE	2018-01-20 21:45:48 UTC (rev 284452)
@@ -1,19 +0,0 @@
-Copyright (c) 2008-2009 Jesus Cea Avion
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-THE SOFTWARE.
\ No newline at end of file

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2018-01-20 20:28:19 UTC (rev 284451)
+++ PKGBUILD	2018-01-20 21:45:48 UTC (rev 284452)
@@ -1,52 +1,52 @@
 # $Id$
-# Maintainer: Kaiting Chen <kaitocracy at gmail.com>
-# Maintainer: Stéphane Gaudreault <stephane at archlinux.org>
+# Maintainer: Balló György <ballogyor+arch at gmail dot com>
+# Contributor: Kaiting Chen <kaitocracy at gmail.com>
+# Contributor: Stéphane Gaudreault <stephane at archlinux.org>
 # Contributor: Douglas Soares de Andrade <dsandrade at gmail.com>
 # Contributor: William Rea <sillywilly at gmail.com>
 
 pkgbase=python-bsddb
-pkgname=('python2-bsddb' 'python-bsddb')
+_pkgbase=bsddb3
+pkgname=(python-bsddb python2-bsddb)
 pkgver=6.2.5
-pkgrel=1
-pkgdesc="Python interface for BerkeleyDB"
-license=('MIT')
+pkgrel=2
+pkgdesc='Python interface for BerkeleyDB'
 arch=('x86_64')
-url="http://www.jcea.es/programacion/pybsddb.htm"
-makedepends=('python2-setuptools' 'python-setuptools')
-source=(https://pypi.python.org/packages/ba/a7/131dfd4e3a5002ef30e20bee679d5e6bcb2fcc6af21bd5079dc1707a132c/bsddb3-$pkgver.tar.gz
-	LICENSE)
-sha256sums=('784bf40ad935258507594a89b32ea11f362cde120751c8b96de163955ced7db8'
-            '84cfc62eb4ecb52241dac8bd422e2b9d760ed56e55bcb3cc13c1ef26a9637aed')
+url='https://www.jcea.es/programacion/pybsddb.htm'
+license=('BSD')
+makedepends=('python2' 'python3')
+source=(https://files.pythonhosted.org/packages/source/b/$_pkgbase/$_pkgbase-$pkgver.tar.gz)
+sha256sums=('784bf40ad935258507594a89b32ea11f362cde120751c8b96de163955ced7db8')
 
 prepare() {
-  cp -r bsddb3-${pkgver}{,-python2}
-  cd bsddb3-${pkgver}-python2
-  sed -i 's|/usr/bin/env python|/usr/bin/env python2|' \
-    Lib{,3}/bsddb/{dbshelve.py,test/test_dbtables.py}
+  cp -a $_pkgbase-$pkgver{,-python2}
+
+  cd $_pkgbase-$pkgver-python2
+  sed -i 's@^#!.*python$@#!/usr/bin/python2@' Lib/bsddb/{dbshelve,test/test_dbtables}.py
 }
 
 build () {
   # Build python 3 module
-  cd bsddb3-${pkgver}
+  cd $_pkgbase-$pkgver
   python3 setup.py --berkeley-db=/usr build
 
   # Build python 2 module
-  cd ../bsddb3-${pkgver}-python2
+  cd ../$_pkgbase-$pkgver-python2
   python2 setup.py --berkeley-db=/usr build
 }
 
-package_python2-bsddb() {
-  depends=('db' 'python2>=2.7')
-  cd bsddb3-${pkgver}-python2
+package_python-bsddb() {
+  depends=('db' 'python')
 
-  python2 setup.py --berkeley-db=/usr install --root="${pkgdir}" --skip-build --optimize=1
-  install -Dm644 "${srcdir}"/LICENSE "${pkgdir}"/usr/share/licenses/${pkgname}/LICENSE
+  cd $_pkgbase-$pkgver
+  python3 setup.py install --root="$pkgdir" --optimize=1
+  install -Dm644 LICENSE.txt "$pkgdir"/usr/share/licenses/$pkgname/LICENSE.txt
 }
 
-package_python-bsddb() {
-  depends=('db' 'python>=3.3')
-  cd bsddb3-${pkgver}
+package_python2-bsddb() {
+  depends=('db' 'python2')
 
-  python3 setup.py --berkeley-db=/usr install --root="${pkgdir}" --skip-build --optimize=1
-  install -Dm644 "${srcdir}"/LICENSE "${pkgdir}"/usr/share/licenses/${pkgname}/LICENSE
+  cd $_pkgbase-$pkgver-python2
+  python2 setup.py install --root="$pkgdir" --optimize=1
+  install -Dm644 LICENSE.txt "$pkgdir"/usr/share/licenses/$pkgname/LICENSE.txt
 }