Merge branch 'lukeshu/wip-parabolaweb'

6 files changed, 247 insertions, 12 deletions

diff --git a/libre/django17/PKGBUILD b/libre/django1.8/PKGBUILD
index 492701817..ff96740b3 100644
--- a/libre/django17/PKGBUILD
+++ b/libre/django1.8/PKGBUILD
@@ -1,18 +1,24 @@
-# Maintainer: Luke Shumaker <lukeshu@sbcglobal.net>
+# Maintainer: Luke Shumaker <lukeshu@lukeshu.com>
 # 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
+# Rational for inclusion in [libre]:
+#  - Used by libre/parabolaweb-utils
+
+pkgbase=django
+pkgname=('python-django' 'python2-django')
+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')
 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')
+md5sums=('ffc3767f5a06c346fd2d07a18c0ebc54')
+sha256sums=('c7611cdd5e2539a443b7960c7cafd867d986c2720a1b44808deaa60ce3da50c7')
 
 prepare() {
   cp -a "$srcdir/Django-$pkgver" "$srcdir/Django-$pkgver-python2"
@@ -29,7 +35,7 @@ build() {
   python2 setup.py build
 }
 
-package_python-django17() {
+package_python-django1.8() {
   depends=('python' 'python-setuptools')
   optdepends=('python-psycopg2: for PostgreSQL backend')
   provides=("python-django=$pkgver")
@@ -49,13 +55,14 @@ package_python-django17() {
   install -Dm644 LICENSE "$pkgdir"/usr/share/licenses/$pkgname/LICENSE
 }
 
-package_python2-django17() {
+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=('django' 'python2-django')
+  conflicts+=('python2-django')
   cd "$srcdir/Django-$pkgver-python2"
   python2 setup.py install --root="$pkgdir" --optimize=1
 
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
new file mode 100644
index 000000000..beebc60e3
--- /dev/null
+++ b/libre/python-markdown2/PKGBUILD
@@ -0,0 +1,66 @@
+# $Id$
+# 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'
+license=('BSD')
+depends=('python')
+makedepends=('python' 'python2' 'python-setuptools' 'python2-setuptools')
+source=("https://files.pythonhosted.org/packages/source/M/$_pkgbasename/$_pkgbasename-$pkgver.tar.gz")
+md5sums=('a67c1b2914f7d74eeede2ebe0fdae470')
+
+build() {
+  # bug in 2.4, some DOS line endings slipped in
+  find "$_pkgbasename-$pkgver/" -name '*py' | xargs sed -i 's|\r||g'
+
+  cp -r $_pkgbasename-$pkgver "$srcdir/python2-markdown"
+  cd "$srcdir/python2-markdown"
+  find "$srcdir/python2-markdown" -name '*py' | xargs sed -i 's|#!/usr/bin/env python$|&2|'
+}
+
+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/$pkgname/LICENSE"
+}
+
+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/$pkgname/LICENSE"
+}
+
+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-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
new file mode 100644
index 000000000..0f1a75293
--- /dev/null
+++ b/libre/python-markupsafe0/PKGBUILD
@@ -0,0 +1,64 @@
+# $Id$
+# 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')
+arch+=('armv7h')
+url="http://pypi.python.org/pypi/MarkupSafe"
+license=('custom')
+makedepends=('python-setuptools' 'python2-setuptools')
+source=("https://files.pythonhosted.org/packages/source/M/MarkupSafe/MarkupSafe-${pkgver}.tar.gz")
+sha512sums=('4f1fd91ced5e7119584b56cf7b69cfe6fdd9613bd77412368a38e9ef5d1011ba5c76d1d3a0da3d60f9f474627e6c8c8b613a80a668b32d212f09072f8b1f5b28')
+
+prepare() {
+  cp -a MarkupSafe-${pkgver} python2-MarkupSafe-${pkgver}
+}
+
+build() {
+  cd "${srcdir}/MarkupSafe-${pkgver}"
+  python setup.py build
+
+  cd "${srcdir}/python2-MarkupSafe-${pkgver}"
+  python2 setup.py build
+}
+
+check() {
+  cd "${srcdir}/MarkupSafe-${pkgver}"
+  python setup.py test
+
+  cd "${srcdir}/python2-MarkupSafe-${pkgver}"
+  python2 setup.py test
+}
+
+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/$pkgname/LICENSE"
+}
+
+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/$pkgname/LICENSE"
+}
diff --git a/libre/python-psycopg2.6/PKGBUILD b/libre/python-psycopg2.6/PKGBUILD
new file mode 100644
index 000000000..b196121fc
--- /dev/null
+++ b/libre/python-psycopg2.6/PKGBUILD
@@ -0,0 +1,53 @@
+# $Id$
+# 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')
+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')
+arch+=('armv7h')
+url="http://initd.org/psycopg/"
+license=('LGPL3')
+makedepends=('python2' 'python' 'postgresql-libs>=8.4.1')
+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.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.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
new file mode 100644
index 000000000..c7e80a58f
--- /dev/null
+++ b/libre/python2-memcached1.54/PKGBUILD
@@ -0,0 +1,45 @@
+# 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')
+depends=('python2-six')
+makedepends=('python2-setuptools' 'git' 'python2-six')
+source=("git://github.com/linsomniac/python-memcached#tag=release-$pkgver")
+md5sums=('SKIP')
+
+prepare() {
+  cd 'python-memcached'
+
+  sed -i 's:/env python:/python2:' memcache.py
+}
+
+package() {
+  cd 'python-memcached'
+  provides=("python2-memcached=$pkgver")
+  conflicts=('python2-memcached')
+
+  python2 setup.py install --root=$pkgdir --optimize=1
+}
+
+check() {
+  cd 'python-memcached'
+
+  python2 setup.py check
+}
+
+# getver: -u 2 github.com/linsomniac/python-memcached/blob/master/ChangeLog
+# vim:set ts=2 sw=2 et: