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

6 files changed, 64 insertions, 46 deletions

diff --git a/libre/blender-libre/PKGBUILD b/libre/blender-libre/PKGBUILD
index 2360945ee..e6c684b1e 100755..100644
--- a/libre/blender-libre/PKGBUILD
+++ b/libre/blender-libre/PKGBUILD
@@ -15,9 +15,9 @@ else
   )
   spndesc=''
 fi
-pkgdesc="A fully integrated 3D graphics creation suite, without nonfree cuda-toolkit and redcode image format support$spndesc"
-pkgver=2.64a
-pkgrel=4
+pkgdesc="Fully integrated 3D graphics creation suite, without nonfree cuda-toolkit and redcode image format support$spndesc"
+pkgver=2.65
+pkgrel=1
 pkgaev=5
 arch=(
   i686
@@ -137,7 +137,7 @@ source=(
   "http://download.${pkgbase%$pkgflag}.org/source/${pkgbase%$pkgflag}-$pkgver.tar.gz"
 )
 sha512sums=(
-  77d171a36f1c87a82613ed7601df9cef444069a2a6600e05260607e9a2009c292068a2b4753f3cbd53d820cdc8d9ed88ddd1685f20647b943f75bfbeb905b9b5
+  92488691c25d390eabf35569cb37ec62437dd42f57e096334a6ed804b3265efe6f81871eba15dad67399ff4e6bf4262d4043298a3ceb90e5dc57586eb9f2870f
 )
 
 build() {
@@ -148,7 +148,7 @@ build() {
 
   [[ $CARCH == i686 ]] && DSUPPORT_SSE2_BUILD='-DSUPPORT_SSE2_BUILD=OFF'
 
-  cmake .. \
+  setarch $CARCH cmake .. \
     -DCMAKE_BUILD_TYPE=Release \
     -DCMAKE_INSTALL_PREFIX=/usr \
     -DPYTHON_INCLUDE_DIRS=/usr/include/python3.3m \
@@ -171,13 +171,13 @@ build() {
     -DWITH_PYTHON_INSTALL=OFF \
     -DWITH_SYSTEM_GLEW=ON
 
-  make $MAKEFLAGS
+  setarch $CARCH make $MAKEFLAGS
 
-  make
+  setarch $CARCH make
 }
 
 package() {
   cd $srcdir/${pkgbase%$pkgflag}-$pkgver/build
-  make DESTDIR=$pkgdir install
-  python -m compileall $pkgdir/usr/share/${pkgbase%$pkgflag}
+  setarch $CARCH make DESTDIR=$pkgdir install
+  setarch $CARCH python -m compileall $pkgdir/usr/share/${pkgbase%$pkgflag}
 }
diff --git a/libre/django-countries/PKGBUILD b/libre/django-countries/PKGBUILD
new file mode 100644
index 000000000..24b667a67
--- /dev/null
+++ b/libre/django-countries/PKGBUILD
@@ -0,0 +1,26 @@
+# Maintainer: Luke Shumaker <lukeshu@sbcglobal.net>
+
+pkgname=django-countries
+pkgver=1.5
+pkgdesc="Provides a country field for Django models"
+license=('custom:MIT')
+url="http://bitbucket.org/smileychris/django-countries/"
+
+pkgrel=1
+arch=(any)
+depends=('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 python->python2, and a typo!
+  sed -i 's|python regen[a-z]*\.py|python2 regenerage.py|' */bin/regenerate.py
+}
+
+package() {
+  cd "$srcdir/$pkgname-$pkgver"
+  ./setup.py install --root="$pkgdir/" --optimize=1
+}
diff --git a/libre/luxblend25/PKGBUILD b/libre/luxblend25/PKGBUILD
index 245aba247..26640795f 100644
--- a/libre/luxblend25/PKGBUILD
+++ b/libre/luxblend25/PKGBUILD
@@ -4,12 +4,12 @@
 pkgbase=luxrender
 pkgname=luxblend25
 srcver=3a928b723b29
-pkgver=1.1.v2.64
+pkgver=1.1.v2.65
 _pkgver=${pkgver::3}
 reqname=blender
 reqver=${pkgver:5}
-pkgrel=2
-pkgdesc='A LuxRender exporter for Blender-libre'
+pkgrel=1
+pkgdesc='LuxRender exporter for Blender-libre'
 arch=(
   any
 )
diff --git a/libre/parabolaweb-utils/PKGBUILD b/libre/parabolaweb-utils/PKGBUILD
index 5fdd12bdb..4220394dc 100644
--- a/libre/parabolaweb-utils/PKGBUILD
+++ b/libre/parabolaweb-utils/PKGBUILD
@@ -1,18 +1,19 @@
 # Maintainer: Luke Shumaker <lukeshu@sbcglobal.net>
 
-. helper.sh
+. "${startdir:-.}/helper.sh"
 # provides:
-#  _get_pkgver
 #  _get_depends
 #  _get_depends_nover (no version requirements)
 
 pkgname=parabolaweb-utils
-pkgver=`_get_pkgver`
-pkgrel=8
+pkgver=20120425.0657
 pkgdesc="Utils for the Parabola website"
-arch=('any')
 url="https://projects.parabolagnulinux.org/parabolaweb.git/"
 license=('GPL2')
+
+pkgrel=1
+epoch=1
+arch=('any')
 depends=(
     'python2'      # duh
     'python2-flup' # for fcgi
@@ -20,11 +21,9 @@ depends=(
     'git'          # used in parabolaweb-download
     'libretools'   # used in parabolaweb-{download,update} (libremessages)
     `_get_depends`)
-backup=('etc/conf.d/parabolaweb')
-
-export pkgver
-
+conflicts=('django>=1.5') # hold it at 1.4
 makedepends=(makepkg-git)
+backup=('etc/conf.d/parabolaweb')
 
 source=(git://parabolagnulinux.org/parabolaweb.git
 	parabolaweb-download
@@ -34,6 +33,13 @@ source=(git://parabolagnulinux.org/parabolaweb.git
 	parabolaweb.service
 	parabolaweb.conf)
 
+pkgver() {
+	cd "$srcdir/parabolaweb"
+	# get the date requirements_prod.txt was last modified
+	gitdate="$(git log -n1 --date=iso --format=format:'%cd' ./requirements_prod.txt)"
+	date -u +%Y%m%d.%H%M -d "$gitdate"
+}
+
 build() {
 	:
 }
diff --git a/libre/parabolaweb-utils/helper.sh b/libre/parabolaweb-utils/helper.sh
index 5ce4182b3..ce8638e7e 100644
--- a/libre/parabolaweb-utils/helper.sh
+++ b/libre/parabolaweb-utils/helper.sh
@@ -1,35 +1,21 @@
 _mksource() {
-	if [[ -z _DO_NOT_RUN_MKSOURCE ]]; then
-		_DO_NOT_RUN_MKSOURCE=true makepkg -o
-	fi
-}
-
-_get_pkgver() {
-	if [[ -n $pkgver ]] && [[ $pkgver != 0.bogus ]]; then
-		echo $pkgver
-	else
-		_mksource 1>&2
-		if [[ -f "${srcdir:-src}/parabolaweb/requirements_prod.txt" ]]; then
-			pushd "${srcdir:-src}/parabolaweb" >/dev/null
-			# get the date requirements_prod.txt was last modified 
-			gitdate="$(git log -n1 --date=iso --format=format:'%cd' ./requirements_prod.txt)"
-			date -u +%Y%m%d.%H%M -d "$gitdate"
-			popd >/dev/null
-		else
-			echo 0.bogus
-		fi
+	pushd "${startdir:-.}" >/dev/null
+	if [[ -z $_DO_NOT_RUN_MKSOURCE && $0 =~ ^makepkg ]]; then
+		local flags=(-o)
+		(( EUID )) || flags+=(--asroot)
+		_DO_NOT_RUN_MKSOURCE=true "${0}" "${flags[@]}"
 	fi
+	popd >/dev/null
 }
 
 _get_depends() {
 	_mksource 1>&2
-	if [[ -f "${srcdir:-src}/parabolaweb/requirements_prod.txt" ]]; then
+	if [[ -f "${srcdir:-${startdir:-.}/src}/parabolaweb/requirements_prod.txt" ]]; then
 		pushd "${srcdir:-src}" >/dev/null
-		python2_packages='markdown|psycopg2|pyinotify|pytz|south'
 		< parabolaweb/requirements_prod.txt sed -r \
-			-e 's/.*/\L&/' -e 's/==/=/' \
-			-e 's/^python-memcached/python2-memcached/' \
-			-e "s/^(${python2_packages})/python2-&/"
+			-e 's/.*/\L&/' -e 's/==/>=/' \
+			-e 's/^(python2?-)?/python2-/' \
+			-e 's/python2-django/django/'
 		popd >/dev/null
 	fi
 }
diff --git a/libre/your-freedom/PKGBUILD b/libre/your-freedom/PKGBUILD
index 9c5f6242c..8aad59fe4 100755
--- a/libre/your-freedom/PKGBUILD
+++ b/libre/your-freedom/PKGBUILD
@@ -24,4 +24,4 @@ package() {
         ))
 }
 
-md5sums=('cc8ed9a33d0c58fcecc3323f831f687e')
+md5sums=('b8c939de5aa75a92299f65210e510d61')