Merge branch 'master' of ssh://projects.parabolagnulinux.org:1863/srv/git/abslibre

7 files changed, 86 insertions, 83 deletions

diff --git a/libre/parabolaweb-utils/PKGBUILD b/libre/parabolaweb-utils/PKGBUILD
index 69ae3fbd3..cd81c83de 100644
--- a/libre/parabolaweb-utils/PKGBUILD
+++ b/libre/parabolaweb-utils/PKGBUILD
@@ -7,10 +7,10 @@ url="https://projects.parabolagnulinux.org/packages/parabolaweb-utils.git/"
 license=('GPL2')
 
 # The commit to get dependency info for
-# Bump pkgrel if updating this is the only change
-_parabolaweb_commit=86f1ed1ecc94a6a298eb3f690155b03bf013ca78
+# Bump pkgrel instead of pkgver if updating this is the only change
+_parabolaweb_commit=724f8c309c97aa9af7f963687342e8f37e682204
 
-pkgrel=1
+pkgrel=2
 epoch=1
 arch=('any')
 
@@ -18,6 +18,8 @@ source=(
   "https://projects.parabolagnulinux.org/packages/$pkgname.git/snapshot/$pkgname-$pkgver.tar.bz2"
   "requirements_prod-${_parabolaweb_commit}.txt::https://projects.parabolagnulinux.org/parabolaweb.git/plain/requirements_prod.txt?id=${_parabolaweb_commit}"
 )
+md5sums=('4543e360c0f5ecbfa3a4a51b2bd9131d'
+         '8bf17af4e66f552864bfdc0fd1d472f1')
 
 build() {
 	cd "$srcdir/$pkgname-$pkgver"
@@ -36,6 +38,3 @@ package_parabolaweb-dev() {
 	pkgdesc="Depends on packages needed to develop parabolaweb"
 	depends=($(sed -r -e 's/\s*#.*//' depends_make.txt))
 }
-
-md5sums=('4543e360c0f5ecbfa3a4a51b2bd9131d'
-         '4ed35e37e52f6b8607733c692702d319')
diff --git a/libre/python-django-countries/PKGBUILD b/libre/python-django-countries/PKGBUILD
new file mode 100644
index 000000000..93e7c8a31
--- /dev/null
+++ b/libre/python-django-countries/PKGBUILD
@@ -0,0 +1,33 @@
+# Maintainer: Luke Shumaker <lukeshu@sbcglobal.net>
+
+_pkgname=django-countries
+pkgname=(python-$_pkgname python2-$_pkgname)
+pkgver=2.1.2
+pkgdesc="Provides a country field for Django models"
+url="http://bitbucket.org/smileychris/$_pkgname/"
+license=('custom:MIT')
+
+conflicts=($_pkgname)
+
+pkgrel=3
+arch=(any)
+makedepends=(python{,2}-{django,setuptools})
+source=(http://pypi.python.org/packages/source/${_pkgname:0:1}/${_pkgname}/${_pkgname}-${pkgver}.tar.gz)
+md5sums=('15e19fd70be1e8939f1bffcfe008e878')
+
+package_python-django-countries() {
+  depends=('python-django')
+
+  cd "$srcdir/$_pkgname-$pkgver"
+  LC_ALL=en_US.UTF-8 python setup.py install --root="$pkgdir/" --optimize=1
+  install -Dm644 LICENSE "$pkgdir"/usr/share/licenses/$pkgname/LICENSE
+}
+
+package_python2-django-countries() {
+  depends=('python2-django')
+  replaces=($_pkgname)
+
+  cd "$srcdir/$_pkgname-$pkgver"
+  python2 setup.py install --root="$pkgdir/" --optimize=1
+  install -Dm644 LICENSE "$pkgdir"/usr/share/licenses/$pkgname/LICENSE
+}
diff --git a/libre/python-jsmin/PKGBUILD b/libre/python-jsmin/PKGBUILD
new file mode 100644
index 000000000..08d7b1a0d
--- /dev/null
+++ b/libre/python-jsmin/PKGBUILD
@@ -0,0 +1,32 @@
+# Maintainer: Luke Shumaker <lukeshu@sbcglobal.net>
+
+_pkgname=jsmin
+pkgname=(python-jsmin python2-jsmin)
+pkgver=2.0.9
+pkgdesc="JavaScript minifier"
+url="https://bitbucket.org/dcs/jsmin"
+license=('MIT')
+
+pkgrel=2
+arch=('any')
+makedepends=(python{,2}-setuptools)
+source=(http://pypi.python.org/packages/source/${_pkgname:0:1}/${_pkgname}/${_pkgname}-${pkgver}.tar.gz)
+md5sums=('1075751bb9499dc508cc5ff90c5088dc')
+
+package_python-jsmin() {
+	depends=('python')
+
+	cd "$srcdir/$_pkgname-$pkgver"
+	rm -rf build
+	python setup.py install --root="$pkgdir" --optimize=1
+	install -Dm644 LICENSE.txt "$pkgdir"/usr/share/licenses/$pkgname/LICENSE.txt
+}
+
+package_python2-jsmin() {
+	depends=('python2')
+
+	cd "$srcdir/$_pkgname-$pkgver"
+	rm -rf build
+	python2 setup.py install --root="$pkgdir" --optimize=1
+	install -Dm644 LICENSE.txt "$pkgdir"/usr/share/licenses/$pkgname/LICENSE.txt
+}
diff --git a/libre/python-pgpdump/PKGBUILD b/libre/python-pgpdump/PKGBUILD
index e65f60dfa..90b55c197 100644
--- a/libre/python-pgpdump/PKGBUILD
+++ b/libre/python-pgpdump/PKGBUILD
@@ -2,26 +2,29 @@
 
 _pkgname=pgpdump
 pkgname=(python-pgpdump python2-pgpdump)
-pkgver=1.4
+pkgver=1.5
 pkgdesc=" a Python library for parsing PGP packets"
 url="https://github.com/toofishes/python-pgpdump"
 license=('custom:BSD3')
 
-pkgrel=1
+pkgrel=2
 arch=(any)
-makedepends=(python python2)
-provides=(python2-pgpdump)
-source=(http://pypi.python.org/packages/source/p/$_pkgname/$_pkgname-$pkgver.tar.gz)
-md5sums=(b437c28ff9d6a6257a0062c0bbe2a9ec)
+makedepends=('python' 'python2')
+source=(http://pypi.python.org/packages/source/${_pkgname:0:1}/${_pkgname}/${_pkgname}-${pkgver}.tar.gz)
+md5sums=('040a451c8e63de3e61fc5b66efa7fca5')
 
 package_python-pgpdump() {
+  depends=('python')
+
   cd "$srcdir/$_pkgname-$pkgver"
   python setup.py install --root="$pkgdir/" --optimize=1
-  install -Dm644 COPYRIGHT "$pkgdir/usr/share/licenses/$pkgname/COPYING"
+  install -Dm644 COPYRIGHT "$pkgdir"/usr/share/licenses/$pkgname/COPYRIGHT
 }
 
 package_python2-pgpdump() {
+  depends=('python2')
+
   cd "$srcdir/$_pkgname-$pkgver"
   python2 setup.py install --root="$pkgdir/" --optimize=1
-  install -Dm644 COPYRIGHT "$pkgdir/usr/share/licenses/$pkgname/COPYING"
+  install -Dm644 COPYRIGHT "$pkgdir"/usr/share/licenses/$pkgname/COPYRIGHT
 }
diff --git a/libre/python2-django-countries/PKGBUILD b/libre/python2-django-countries/PKGBUILD
deleted file mode 100644
index 36bc6a580..000000000
--- a/libre/python2-django-countries/PKGBUILD
+++ /dev/null
@@ -1,32 +0,0 @@
-# Maintainer: Luke Shumaker <lukeshu@sbcglobal.net>
-
-_pkgname=django-countries
-pkgname=python2-$_pkgname
-pkgver=1.5
-pkgdesc="Provides a country field for Django models"
-url="http://bitbucket.org/smileychris/$_pkgname/"
-license=('custom:MIT')
-
-replaces=($_pkgname)
-conflicts=($_pkgname)
-
-pkgrel=3
-arch=(any)
-depends=('python2-django')
-makedepends=('python2-distribute')
-source=(http://pypi.python.org/packages/source/${_pkgname:0:1}/${_pkgname}/${_pkgname}-${pkgver}.tar.gz)
-md5sums=(6c65fcc3aa7de065a54cdb619397626d)
-
-build() {
-  cd "$srcdir/$_pkgname-$pkgver"
-  sed -i 's|#!/usr/bin/env python\s*$|#!/usr/bin/env python2|' setup.py */bin/*.py
-  # fix help message: (python2, typo)
-  # "python regenenerate.py" -> "python2 regenerate.py"
-  sed -i 's|python regen[a-z]*\.py|python2 regenerate.py|' */bin/regenerate.py
-}
-
-package() {
-  cd "$srcdir/$_pkgname-$pkgver"
-  ./setup.py install --root="$pkgdir/" --optimize=1
-  install -Dm644 LICENSE "$pkgdir"/usr/share/licenses/$pkgname/LICENSE
-}
diff --git a/libre/python2-jsmin/PKGBUILD b/libre/python2-jsmin/PKGBUILD
deleted file mode 100644
index 00c158324..000000000
--- a/libre/python2-jsmin/PKGBUILD
+++ /dev/null
@@ -1,27 +0,0 @@
-# Maintainer: Luke Shumaker <lukeshu@sbcglobal.net>
-
-_pkgname=jsmin
-pkgname=python2-jsmin
-pkgver=2.0.8
-pkgdesc="JavaScript minifier"
-url="https://bitbucket.org/dcs/jsmin"
-license=('MIT')
-
-pkgrel=1
-arch=('any')
-depends=('python2')
-makedepends=('python2-distribute')
-source=(http://pypi.python.org/packages/source/${_pkgname:0:1}/${_pkgname}/${_pkgname}-${pkgver}.tar.gz)
-
-build() {
-	cd "$srcdir/$_pkgname-$pkgver"
-	sed -rn 's/^#\s?//p' jsmin/__init__.py > license.txt
-}
-
-package() {
-	cd "$srcdir/$_pkgname-$pkgver"
-	python2 setup.py install --root="$pkgdir" --optimize=1
-	install -Dm644 license.txt "$pkgdir"/usr/share/licenses/$pkgname/LICENSE
-}
-
-md5sums=('d830a979d63bfa0bc23e11fdbc816e7d')
diff --git a/libre/sh-roundup/PKGBUILD b/libre/sh-roundup/PKGBUILD
index 7c17669d3..b8d1ef2e8 100644
--- a/libre/sh-roundup/PKGBUILD
+++ b/libre/sh-roundup/PKGBUILD
@@ -1,4 +1,4 @@
-# Maintainer: Luke Shumaker <lukeshu@sbcglobal.net
+# Maintainer: Luke Shumaker <lukeshu@sbcglobal.net>
 
 pkgname=sh-roundup
 pkgver=0.0.5.git17
@@ -8,22 +8,17 @@ pkgdesc='A unit testing framework for POSIX shell'
 license=("custom:MIT")
 url="http://bmizerany.github.io/roundup/"
 
-pkgrel=1
+pkgrel=2
 arch=('any')
 depends=(sh)
 makedepends=(ronn)
 
-source=("libre://$pkgname-$pkgver.tar.gz" 'makefile-fix.patch')
-md5sums=('8b1f85316d178eb9e809e168f52d0f2d'
+source=("https://repo.parabolagnulinux.org/other/$pkgname/$pkgname-$pkgver.tar.gz" 'makefile-fix.patch')
+md5sums=('053754e0a450288710bde0b9e5deb67e'
          '9efcd83d666c1e84302fe611610c60fa')
 
-mksource=("git://github.com/bmizerany/roundup.git#${_gitver}")
+mksource=("$pkgname-$pkgver::git://github.com/bmizerany/roundup.git#${_gitver}")
 mkmd5sums=('SKIP')
-mksource() {
-  cd "$srcdir"
-  rm -rf $pkgname-*
-  mv roundup $pkgname-$pkgver
-}
 
 prepare() {
   cd "$srcdir/$pkgname-$pkgver"