Merge branch 'master' of ssh://parabolagnulinux.org:1863/home/parabola/abslibre-pre-mips64el

Conflicts:
	community/bird/PKGBUILD
	community/drbd/PKGBUILD
	community/etherape/PKGBUILD
	community/ext4magic/PKGBUILD
	community/fcron/PKGBUILD
	community/fcron/systab.orig
	community/gnome-panel/PKGBUILD
	community/libident/PKGBUILD
	community/libtorrent/PKGBUILD
	community/linux-tools/PKGBUILD
	community/linux-tools/usbipd.service
	community/makedev/PKGBUILD
	community/minbif/PKGBUILD
	community/noip/PKGBUILD
	community/notmuch/PKGBUILD
	community/pam_pwcheck/PKGBUILD
	community/pound/PKGBUILD
	community/preload/PKGBUILD
	community/python-cchardet/PKGBUILD
	community/rtorrent/PKGBUILD
	community/tor/PKGBUILD
	community/ude/PKGBUILD
	core/openldap/PKGBUILD
	core/sysvinit/PKGBUILD
	extra/cd-discid/PKGBUILD
	extra/cvs/PKGBUILD
	extra/epiphany-extensions/PKGBUILD
	extra/fbset/PKGBUILD
	extra/fluidsynth/PKGBUILD
	extra/gtkmm/PKGBUILD
	extra/gvfs/PKGBUILD
	extra/kdepim/PKGBUILD
	extra/libical/PKGBUILD
	extra/mutt/PKGBUILD
	extra/netkit-bsd-finger/PKGBUILD
	extra/ossp/PKGBUILD
	extra/php/PKGBUILD
	extra/pidgin/PKGBUILD
	extra/rtkit/PKGBUILD
	extra/samba/PKGBUILD
	extra/totem/PKGBUILD
	extra/webkitgtk/PKGBUILD
	libre/liferea-libre/PKGBUILD
	libre/mplayer-vaapi-libre/PKGBUILD

1 files changed, 34 insertions, 10 deletions

diff --git a/community/python-cchardet/PKGBUILD b/community/python-cchardet/PKGBUILD
index 0b6bb965c..37d6b426a 100644
--- a/community/python-cchardet/PKGBUILD
+++ b/community/python-cchardet/PKGBUILD
@@ -1,27 +1,51 @@
-# $Id: PKGBUILD 80436 2012-11-21 15:45:04Z mtorromeo $
+# $Id: PKGBUILD 90632 2013-05-13 12:37:47Z mtorromeo $
 # Maintainer: Massimiliano Torromeo <massimiliano.torromeo@gmail.com>
 
 pkgname=python-cchardet
-pkgver=0.3.2
+pkgname=(python-cchardet python2-cchardet)
+pkgver=0.3.3
 pkgrel=1
-_libname=${pkgname/python-/}
 pkgdesc="Universal encoding detector faster than chardet."
 url="http://pypi.python.org/pypi/cchardet/"
-depends=('python')
-makedepends=('cython' 'python-distribute')
+makedepends=('cython' 'cython2' 'python-distribute' 'python2-distribute')
 license=('MIT')
 arch=('i686' 'x86_64' 'mips64el')
-source=(http://pypi.python.org/packages/source/${_libname:0:1}/$_libname/$_libname-$pkgver.tar.gz)
+source=(http://pypi.python.org/packages/source/c/cchardet/cchardet-$pkgver.tar.gz)
 
 build() {
-    cd "$srcdir/$_libname-$pkgver"
-    python setup.py build
+    cd "$srcdir/cchardet-$pkgver"
+
+    rm -rf ../buildpy3; mkdir ../buildpy3
+    python setup.py build -b ../buildpy3
+
+    rm -rf ../buildpy2; mkdir ../buildpy2
+    python2 setup.py build -b ../buildpy2
+    find ../buildpy2 -name \*.py -exec sed -r 's|^#!(.*)python$|#!\1python2|' -i {} +
 }
 
 package() {
-    cd "$srcdir/$_libname-$pkgver"
+    cd "$srcdir/cchardet-$pkgver"
     python setup.py install --root="$pkgdir"
 	install -m0644 -D "README.rst" "$pkgdir/usr/share/licenses/$pkgname/README.rst"
 }
 
-sha256sums=('a3e92811d5a8aacd9ecfdb4ea9637ba801b9b18b7c779dbdf41d07bb48235a23')
+package_python-cchardet() {
+    depends=(python)
+
+
+    cd "$srcdir/cchardet-$pkgver"
+    rm -rf build; ln -s ../buildpy3 build
+    python setup.py install --skip-build -O1 --root="$pkgdir"
+	install -m0644 -D "README.rst" "$pkgdir/usr/share/licenses/$pkgname/README.rst"
+}
+
+package_python2-cchardet() {
+    depends=(python2)
+
+    cd "$srcdir/cchardet-$pkgver"
+    rm -rf build; ln -s ../buildpy2 build
+    python2 setup.py install --skip-build -O1 --root="$pkgdir"
+	install -m0644 -D "README.rst" "$pkgdir/usr/share/licenses/$pkgname/README.rst"
+}
+
+sha256sums=('f326245fa9dc1541a3251cbae66ce2fa8d94969a6f6dfb2800e3beb3636cd2b8')