7 files changed, 98 insertions, 118 deletions
diff --git a/libre/django1.8/PKGBUILD b/libre/django1.8/PKGBUILD
index a90272910..ff96740b3 100644
--- a/libre/django1.8/PKGBUILD
+++ b/libre/django1.8/PKGBUILD
@@ -1,10 +1,15 @@
-# $Id$
-# Maintainer: Dan McGee <dan@archlinux.org>
-# Contributor: Shahar Weiss <sweiss4@gmx.net>
+# Maintainer: Luke Shumaker <lukeshu@lukeshu.com>
+# Maintainer (Arch:django): Dan McGee <dan@archlinux.org>
+# Contributor (Arch:django): Shahar Weiss <sweiss4@gmx.net>
+
+# Rational for inclusion in [libre]:
+#  - Used by libre/parabolaweb-utils
 
 pkgbase=django
 pkgname=('python-django' 'python2-django')
-pkgver=1.8.7
+pkgbase=${pkgbase}1.8
+pkgname=("${pkgname[@]/%/1.8}")
+pkgver=1.8.18
 pkgrel=1
 pkgdesc="A high-level Python Web framework that encourages rapid development and clean design"
 arch=('any')
@@ -12,8 +17,8 @@ license=('BSD')
 url="http://www.djangoproject.com/"
 makedepends=('python2' 'python2-setuptools' 'python' 'python-setuptools')
 source=("https://www.djangoproject.com/m/releases/${pkgver:0:3}/Django-$pkgver.tar.gz")
-md5sums=('44c01355b5efa01938a89b8bd798b1ed')
-sha256sums=('17a66de5cf59b5ee81c3dc57609b145bb45adddc0dc06937b998597d6e7b4523')
+md5sums=('ffc3767f5a06c346fd2d07a18c0ebc54')
+sha256sums=('c7611cdd5e2539a443b7960c7cafd867d986c2720a1b44808deaa60ce3da50c7')
 
 prepare() {
   cp -a "$srcdir/Django-$pkgver" "$srcdir/Django-$pkgver-python2"
@@ -30,9 +35,11 @@ build() {
   python2 setup.py build
 }
 
-package_python-django() {
+package_python-django1.8() {
   depends=('python' 'python-setuptools')
   optdepends=('python-psycopg2: for PostgreSQL backend')
+  provides=("python-django=$pkgver")
+  conflicts=('python-django')
   cd "$srcdir/Django-$pkgver"
   python setup.py install --root="$pkgdir" --optimize=1
 
@@ -48,12 +55,14 @@ package_python-django() {
   install -Dm644 LICENSE "$pkgdir"/usr/share/licenses/$pkgname/LICENSE
 }
 
-package_python2-django() {
+package_python2-django1.8() {
   depends=('python2' 'python2-setuptools')
   optdepends=('mysql-python: for MySQL backend'
               'python2-psycopg2: for PostgreSQL backend')
   replaces=('django')
   conflicts=('django')
+  provides=("python2-django=$pkgver")
+  conflicts+=('python2-django')
   cd "$srcdir/Django-$pkgver-python2"
   python2 setup.py install --root="$pkgdir" --optimize=1
 
diff --git a/libre/django17/PKGBUILD b/libre/django17/PKGBUILD
deleted file mode 100644
index 492701817..000000000
--- a/libre/django17/PKGBUILD
+++ /dev/null
@@ -1,72 +0,0 @@
-# Maintainer: Luke Shumaker <lukeshu@sbcglobal.net>
-# Maintainer (Arch:django): Dan McGee <dan@archlinux.org>
-# Contributor (Arch:django): Shahar Weiss <sweiss4@gmx.net>
-
-pkgbase=django17
-pkgname=('python-django17' 'python2-django17')
-pkgver=1.7.9
-pkgrel=2
-pkgdesc="A high-level Python Web framework that encourages rapid development and clean design"
-arch=('any')
-license=('BSD')
-url="http://www.djangoproject.com/"
-makedepends=('python2' 'python2-setuptools' 'python' 'python-setuptools')
-source=("https://www.djangoproject.com/m/releases/${pkgver:0:3}/Django-$pkgver.tar.gz")
-sha256sums=('4f3f9fe4e5d20ff8ed6a90b5d2f2df2d8fc054e478cdcc3db81c6b29bd217860')
-
-prepare() {
-  cp -a "$srcdir/Django-$pkgver" "$srcdir/Django-$pkgver-python2"
-
-  find "$srcdir/Django-$pkgver-python2" -name '*.py' | \
-    xargs sed -i "s|#!/usr/bin/env python$|#!/usr/bin/env python2|"
-}
-
-build() {
-  cd "$srcdir/Django-$pkgver"
-  python setup.py build
-
-  cd "$srcdir/Django-$pkgver-python2"
-  python2 setup.py build
-}
-
-package_python-django17() {
-  depends=('python' 'python-setuptools')
-  optdepends=('python-psycopg2: for PostgreSQL backend')
-  provides=("python-django=$pkgver")
-  conflicts=('python-django')
-  cd "$srcdir/Django-$pkgver"
-  python setup.py install --root="$pkgdir" --optimize=1
-
-  ln -s django-admin.py "$pkgdir"/usr/bin/django-admin3.py
-  ln -s django-admin "$pkgdir"/usr/bin/django-admin3
-  install -Dm644 extras/django_bash_completion \
-    "$pkgdir"/usr/share/bash-completion/completions/django-admin.py
-  ln -s django-admin.py \
-    "$pkgdir"/usr/share/bash-completion/completions/django-admin
-  ln -s django-admin.py \
-    "$pkgdir"/usr/share/bash-completion/completions/manage.py
-
-  install -Dm644 LICENSE "$pkgdir"/usr/share/licenses/$pkgname/LICENSE
-}
-
-package_python2-django17() {
-  depends=('python2' 'python2-setuptools')
-  optdepends=('mysql-python: for MySQL backend'
-              'python2-psycopg2: for PostgreSQL backend')
-  replaces=('django')
-  provides=("python2-django=$pkgver")
-  conflicts=('django' 'python2-django')
-  cd "$srcdir/Django-$pkgver-python2"
-  python2 setup.py install --root="$pkgdir" --optimize=1
-
-  mv "$pkgdir"/usr/bin/django-admin.py "$pkgdir"/usr/bin/django-admin2.py
-  mv "$pkgdir"/usr/bin/django-admin "$pkgdir"/usr/bin/django-admin2
-  # TODO: this probably won't work due to the `complete` command within not
-  # knowing about modified our exectuable names
-  install -Dm644 extras/django_bash_completion \
-    "$pkgdir"/usr/share/bash-completion/completions/django-admin2.py
-  ln -s django-admin2.py \
-    "$pkgdir"/usr/share/bash-completion/completions/django-admin2
-
-  install -Dm644 LICENSE "$pkgdir"/usr/share/licenses/$pkgname/LICENSE
-}
diff --git a/libre/parabolaweb-utils/PKGBUILD b/libre/parabolaweb-utils/PKGBUILD
index dcb19d410..df4ed531d 100644
--- a/libre/parabolaweb-utils/PKGBUILD
+++ b/libre/parabolaweb-utils/PKGBUILD
@@ -8,9 +8,9 @@ license=('GPL2')
 
 # The commit to get dependency info for
 # Bump pkgrel instead of pkgver if updating this is the only change
-_parabolaweb_commit=2f35bd492629a52f4849c379f02030c1efb2495c
+_parabolaweb_commit=87bd4a32b2eb983a34bf28eaee6e2c6ce5a405ee
 
-pkgrel=1
+pkgrel=3
 epoch=1
 arch=('i686' 'x86_64' 'armv7h')
 
@@ -18,7 +18,7 @@ source=("https://repo.parabola.nu/other/$pkgname/$pkgname-$pkgver.tar.gz"{,.sig}
 	"requirements_prod-${_parabolaweb_commit}.txt::https://projects.parabolagnulinux.org/parabolaweb.git/plain/requirements_prod.txt?id=${_parabolaweb_commit}")
 md5sums=('d1e9470ca82f2473ddd6fbe933bae452'
          'SKIP'
-         '2a282dc52fb6cf3c4907715a2e85dc7b')
+         'c9c3e560f248a9684b0ff8b764da5833')
 validpgpkeys=('99195DD3BB6FE10A2F36ED8445698744D4FFBFC9') # Luke Shumaker
 
 build() {
diff --git a/libre/python-markdown2/PKGBUILD b/libre/python-markdown2/PKGBUILD
index cf326ca5a..beebc60e3 100644
--- a/libre/python-markdown2/PKGBUILD
+++ b/libre/python-markdown2/PKGBUILD
@@ -1,15 +1,22 @@
 # $Id$
-# Maintainer: Kyle Keen <keenerd@gmail.com>
-# Contributor: Angel Velasquez <angvp@archlinux.org>
-# Contributor: Andrew Antle <andrew dot antle at gmail dot com>
-# Contributor: Thomas Dziedzic < gostrc at gmail >
-# Contributor: Chaiwat Suttipongsakul <cwt at bashell dot com>
+# Maintainer: Luke Shumaker <lukeshu@lukeshu.com>
+# Maintainer (Arch:python-markdown): Kyle Keen <keenerd@gmail.com>
+# Contributor (Arch:python-markdown): Angel Velasquez <angvp@archlinux.org>
+# Contributor (Arch:python-markdown): Andrew Antle <andrew dot antle at gmail dot com>
+# Contributor (Arch:python-markdown): Thomas Dziedzic < gostrc at gmail >
+# Contributor (Arch:python-markdown): Chaiwat Suttipongsakul <cwt at bashell dot com>
+
+# Rational for inclusion in [libre]:
+#  - Used by libre/parabolaweb-utils
 
 pkgbase=python-markdown
 pkgname=('python-markdown' 'python2-markdown')
+pkgbase=${pkgbase}2
+pkgname=("${pkgname[@]/%/2}")
 _pkgbasename=Markdown
 pkgver=2.6.11
 pkgrel=2
+pkgrel+=.1
 pkgdesc="Python implementation of John Gruber's Markdown."
 arch=('any')
 url='http://pypi.python.org/pypi/Markdown'
@@ -28,27 +35,31 @@ build() {
   find "$srcdir/python2-markdown" -name '*py' | xargs sed -i 's|#!/usr/bin/env python$|&2|'
 }
 
-package_python-markdown() {
+package_python-markdown2() {
   depends=('python')
+  provides=("python-markdown=$pkgver")
+  conflicts=('python-markdown')
   cd "$srcdir/$_pkgbasename-$pkgver"
   python3 setup.py install --root="$pkgdir" --optimize=0
-  install -Dm644 LICENSE.md "$pkgdir/usr/share/licenses/python-markdown/LICENSE"
+  install -Dm644 LICENSE.md "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
 }
 
-package_python2-markdown() {
+package_python2-markdown2() {
   depends=('python2')
+  provides=("python2-markdown=$pkgver")
+  conflicts=('python2-markdown')
   cd "$srcdir/python2-markdown"
   python2 setup.py install --root="$pkgdir" --optimize=0
   mv "$pkgdir/usr/bin/markdown_py" "$pkgdir/usr/bin/markdown_py2"
-  install -Dm644 LICENSE.md "$pkgdir/usr/share/licenses/python2-markdown/LICENSE"
+  install -Dm644 LICENSE.md "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
 }
 
-check_python-markdown() {
+check_python-markdown2() {
   [[ $(python -c "import markdown; print(markdown.version)") == "$pkgver" ]]
   [[ $(python -c "import markdown; print(markdown.markdown('*test*'))") == "<p><em>test</em></p>" ]]
 }
 
-check_python2-markdown() {
+check_python2-markdown2() {
   [[ $(python2 -c "import markdown; print(markdown.version)") == "$pkgver" ]]
   [[ $(python2 -c "import markdown; print(markdown.markdown('*test*'))") == "<p><em>test</em></p>" ]]
 }
diff --git a/libre/python-markupsafe0/PKGBUILD b/libre/python-markupsafe0/PKGBUILD
index d90ca5272..e9d217d00 100644
--- a/libre/python-markupsafe0/PKGBUILD
+++ b/libre/python-markupsafe0/PKGBUILD
@@ -1,17 +1,23 @@
 # $Id$
-# Maintainer : Felix Yan <felixonmars@archlinux.org>
-# Contributor: Ionut Biru <ibiru@archlinux.org>
-# Contributor: Alex Anthony <alex.anthony28991@gmail.com>
+# Maintainer: Luke Shumaker <lukeshu@lukeshu.com>
+# Maintainer (Arch:python-markupsafe): Felix Yan <felixonmars@archlinux.org>
+# Contributor (Arch:python-markupsafe): Ionut Biru <ibiru@archlinux.org>
+# Contributor (Arch:python-markupsafe): Alex Anthony <alex.anthony28991@gmail.com>
+
+# Rational for inclusion in [libre]:
+#  - Used by libre/parabolaweb-utils
 
 pkgname=('python-markupsafe' 'python2-markupsafe')
+pkgname=("${pkgname[@]/%/0}")
 pkgver=0.23
 pkgrel=4
+pkgrel+=.1
 pkgdesc="Implements a XML/HTML/XHTML Markup safe string for Python"
 arch=('i686' 'x86_64')
 url="http://pypi.python.org/pypi/MarkupSafe"
 license=('custom')
 makedepends=('python-setuptools' 'python2-setuptools')
-source=("http://pypi.python.org/packages/source/M/MarkupSafe/MarkupSafe-${pkgver}.tar.gz")
+source=("https://files.pythonhosted.org/packages/source/M/MarkupSafe/MarkupSafe-${pkgver}.tar.gz")
 sha512sums=('4f1fd91ced5e7119584b56cf7b69cfe6fdd9613bd77412368a38e9ef5d1011ba5c76d1d3a0da3d60f9f474627e6c8c8b613a80a668b32d212f09072f8b1f5b28')
 
 prepare() {
@@ -34,20 +40,24 @@ check() {
   python2 setup.py test
 }
 
-package_python-markupsafe() {
+package_python-markupsafe0() {
   depends=('python')
+  provides=("python-markupsafe=$pkgver")
+  conflicts=('python-markupsafe')
 
   cd MarkupSafe-${pkgver}
   python setup.py install --root="${pkgdir}" --optimize=1
 
-  install -D -m644 LICENSE "${pkgdir}/usr/share/licenses/python-markupsafe/LICENSE"
+  install -D -m644 LICENSE "${pkgdir}/usr/share/licenses/$pkgname/LICENSE"
 }
 
-package_python2-markupsafe() {
+package_python2-markupsafe0() {
   depends=('python2')
+  provides=("python2-markupsafe=$pkgver")
+  conflicts=('python2-markupsafe')
 
   cd python2-MarkupSafe-${pkgver}
   python2 setup.py install --root="${pkgdir}" --optimize=1
 
-  install -D -m644 LICENSE "${pkgdir}/usr/share/licenses/python2-markupsafe/LICENSE"
+  install -D -m644 LICENSE "${pkgdir}/usr/share/licenses/$pkgname/LICENSE"
 }
diff --git a/libre/python-psycopg2.6/PKGBUILD b/libre/python-psycopg2.6/PKGBUILD
index 25b10fb49..abf578d5e 100644
--- a/libre/python-psycopg2.6/PKGBUILD
+++ b/libre/python-psycopg2.6/PKGBUILD
@@ -1,36 +1,51 @@
 # $Id$
-# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
-# Maintainer: Angel 'angvp' Velasquez <angvp[at]archlinux.com.ve>
-# Maintainer: Douglas Soares de Andrade <dsa@aur.archlinux.org>
+# Maintainer: Luke Shumaker <lukeshu@lukeshu.com>
+# Maintainer (Arch:python-psycopg2): Sergej Pupykin <pupykin.s+arch@gmail.com>
+# Maintainer (Arch:python-psycopg2): Angel 'angvp' Velasquez <angvp[at]archlinux.com.ve>
+# Maintainer (Arch:python-psycopg2): Douglas Soares de Andrade <dsa@aur.archlinux.org>
+
+# Rational for inclusion in [libre]:
+#  - Used by libre/parabolaweb-utils
 
 pkgbase=python-psycopg2
 pkgname=('python-psycopg2' 'python2-psycopg2')
-pkgver=2.6.2
-pkgrel=2
+pkgbase=${pkgbase}.6
+pkgname=("${pkgname[@]/%/.6}")
+_gitver=4ae2a366109e6f7258728d46ec34e26cf91d53b7
+pkgver=2.6.3dev0.rev21.git4ae2a366
+pkgrel=1
 pkgdesc="A PostgreSQL database adapter for the Python programming language."
 arch=('i686' 'x86_64')
 url="http://initd.org/psycopg/"
 license=('LGPL3')
 makedepends=('python2' 'python' 'postgresql-libs>=8.4.1')
-validpgpkeys=('8AD609956CF1899418E19A856013BD3AFCF957DE')
-source=(http://initd.org/psycopg/tarballs/PSYCOPG-2-6/psycopg2-$pkgver.tar.gz{,.asc})
-sha256sums=('70490e12ed9c5c818ecd85d185d363335cc8a8cbf7212e3c185431c79ff8c05c'
-            'SKIP')
+makedepends+=('git')
+source=("psycopg2-$pkgver::git+https://github.com/psycopg/psycopg2.git#commit=${_gitver}")
+sha256sums=('SKIP')
+
+pkgver() {
+  cd "$srcdir/psycopg2-$pkgver"
+  echo "$(python setup.py --version|sed -r 's/\.([a-z])/\1/')$(git describe --tags|sed -r -e 's/-g/.git/' -e 's/.*-/.rev/')"
+}
 
 build() {
   cd "$srcdir/psycopg2-$pkgver"
   sed -i 's/,PSYCOPG_DEBUG$//' setup.cfg
 }
 
-package_python-psycopg2() {
+package_python-psycopg2.6() {
   depends=('python' 'postgresql-libs>=8.4.1')
+  provides=("python-psycopg2=$pkgver")
+  conflicts=('python-psycopg2')
 
   cd "$srcdir/psycopg2-$pkgver"
   python setup.py install --root="$pkgdir"
 }
 
-package_python2-psycopg2() {
+package_python2-psycopg2.6() {
   depends=('python2' 'postgresql-libs>=8.4.1')
+  provides=("python2-psycopg2=$pkgver")
+  conflicts=('python2-psycopg2')
 
   cd "$srcdir/psycopg2-$pkgver"
   python2 setup.py install --root="$pkgdir"
diff --git a/libre/python2-memcached1.54/PKGBUILD b/libre/python2-memcached1.54/PKGBUILD
index 1c349d9c8..c7e80a58f 100644
--- a/libre/python2-memcached1.54/PKGBUILD
+++ b/libre/python2-memcached1.54/PKGBUILD
@@ -1,13 +1,18 @@
-# $Id$
-# Maintainer: Alexander Rødseth <rodseth@gmail.com>
-# Contributor: Angel Velasquez <angvp@archlinux.org>
-# Contributor: Geoffroy Carrier <geoffroy.carrier@aur.archlinux.org>
-# Contributor: Nathan Jones <nathanj@insightbb.com>
+# Maintainer: Luke Shumaker <lukeshu@lukeshu.com>
+# Maintainer (Arch:python2-memcached): Alexander Rødseth <rodseth@gmail.com>
+# Contributor (Arch:python2-memcached): Angel Velasquez <angvp@archlinux.org>
+# Contributor (Arch:python2-memcached): Geoffroy Carrier <geoffroy.carrier@aur.archlinux.org>
+# Contributor (Arch:python2-memcached): Nathan Jones <nathanj@insightbb.com>
+
+# Rational for inclusion in [libre]:
+#  - Used by libre/parabolaweb-utils
 
 pkgname=python2-memcached
+pkgname+=1.54
 pkgdesc='Python interface to memcached'
 pkgver=1.54
 pkgrel=2
+pkgrel+=.1
 url='https://github.com/linsomniac/python-memcached'
 arch=('any')
 license=('PSF')
@@ -24,6 +29,8 @@ prepare() {
 
 package() {
   cd 'python-memcached'
+  provides=("python2-memcached=$pkgver")
+  conflicts=('python2-memcached')
 
   python2 setup.py install --root=$pkgdir --optimize=1
 }