Merge branch 'testing' of ssh://cesman@linhes.org/mount/repository/linhes_pkgbuild into testing

Conflicts:
	abs/core/tzdata/PKGBUILD

3 files changed, 15 insertions, 30 deletions

diff --git a/abs/core/python_modules/python-geoip/PKGBUILD b/abs/core/python_modules/python-geoip/PKGBUILD
index 7d69154..cd095c6 100644
--- a/abs/core/python_modules/python-geoip/PKGBUILD
+++ b/abs/core/python_modules/python-geoip/PKGBUILD
@@ -3,7 +3,7 @@
 
 pkgname=python-geoip
 pkgver=1.2.4
-pkgrel=3
+pkgrel=4
 pkgdesc="Python bindings for the GeoIP IP-to-country resolver library."
 arch=(i686 x86_64)
 url="http://www.maxmind.com/app/python"
@@ -15,7 +15,7 @@ provides=('geoip-python')
 
 build() {
   cd ${startdir}/src/GeoIP-Python-${pkgver}
-  python2 setup.py build install --root=${startdir}/pkg
+  python2 setup.py build install --root=${pkgdir}/
 }
 md5sums=('50f820d854476efaf3b7af733ffe4236')
 
diff --git a/abs/core/python_modules/python-lxml/PKGBUILD b/abs/core/python_modules/python-lxml/PKGBUILD
index 606ec54..df85c69 100644
--- a/abs/core/python_modules/python-lxml/PKGBUILD
+++ b/abs/core/python_modules/python-lxml/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: $
+# $Id$
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
 # Contributor: Angel 'angvp' Velasquez <angvp[at]archlinux.com.ve>
@@ -6,8 +6,8 @@
 # Contributor: Guillem Rieu <guillemr@gmx.net>
 
 pkgname=python-lxml
-pkgver=2.2.6
-pkgrel=4
+pkgver=2.3
+pkgrel=1
 pkgdesc="Python binding for the libxml2 and libxslt libraries"
 arch=('i686' 'x86_64')
 license=('BSD' 'GPL' 'custom')
@@ -16,19 +16,15 @@ depends=('python2' 'libxslt')
 optdepends=("beautiful-soup: support for parsing not well formed HTML")
 conflicts=('lxml')
 replaces=('lxml')
-source=(http://codespeak.net/lxml/lxml-$pkgver.tgz)
-md5sums=('b1f700fb22d7ee9b977ee3eceb65b20c')
-
-build() {
-  /bin/true
-}
+source=("http://codespeak.net/lxml/lxml-${pkgver}.tgz")
+md5sums=('a245a015fd59b63e220005f263e1682a')
 
 package() {
   cd ${srcdir}/lxml-$pkgver
 
-  python2 setup.py install --root=${pkgdir} || return 1
+  python2 setup.py install --root="${pkgdir}" --optimize=1
 
-  install -D -m644 LICENSES.txt ${pkgdir}/usr/share/licenses/$pkgname/LICENSE || return 1
-  install -D -m644 doc/licenses/BSD.txt ${pkgdir}/usr/share/licenses/$pkgname/BSD.txt || return 1
-  install -D -m644 doc/licenses/elementtree.txt ${pkgdir}/usr/share/licenses/$pkgname/elementtree.txt || return 1
+  install -D -m644 LICENSES.txt ${pkgdir}/usr/share/licenses/$pkgname/LICENSE
+  install -D -m644 doc/licenses/BSD.txt ${pkgdir}/usr/share/licenses/$pkgname/BSD.txt
+  install -D -m644 doc/licenses/elementtree.txt ${pkgdir}/usr/share/licenses/$pkgname/elementtree.txt
 }
diff --git a/abs/core/python_modules/python-parted/PKGBUILD b/abs/core/python_modules/python-parted/PKGBUILD
index 862405c..e00fa93 100644
--- a/abs/core/python_modules/python-parted/PKGBUILD
+++ b/abs/core/python_modules/python-parted/PKGBUILD
@@ -1,28 +1,17 @@
 pkgname=python-parted
 __pkgname=pyparted
-pkgver=2.0.12
-pkgver=3.4
+pkgver=3.8
 pkgrel=4
 pkgdesc="Python bindings for libparted"
 arch=('i686' 'x86_64')
 license=('LGPL' 'MPL')
-depends=('python2' 'parted' 'python-decorator')
+depends=('python2' 'parted=>3.0' 'python-decorator')
 options=('!libtool')
 source=(https://fedorahosted.org/releases/p/y/pyparted/pyparted-${pkgver}.tar.gz)
 url="https://fedorahosted.org/pyparted/"
 
 build() {
   cd "${srcdir}/${__pkgname}-${pkgver}"
-  ./configure --prefix=/usr || return 1
-  make || return 1
+  python2 setup.py install --prefix=/usr --root="${pkgdir}"
 }
-package(){
-  cd "${srcdir}/${__pkgname}-${pkgver}"
-  make DESTDIR="${pkgdir}" install || return 1
-}
-md5sums=('8fc485db0b88e59bbdfc4be8ba4068fa')
-md5sums=('cc064f12110a6f0d0c236ee7b18fee88')
-md5sums=('f244958142c9fd3ff5ee95f578e2f76d')
-md5sums=('7f5d06bd6336f3a699840d8639ab8a0d')
-md5sums=('f244958142c9fd3ff5ee95f578e2f76d')
-md5sums=('cc064f12110a6f0d0c236ee7b18fee88')
+md5sums=('e9cd0c94c71ac17755f71a8e1561eac2')