Merge branch 'testing' of knoppmyth.net:linhes_pkgbuild into testing

4 files changed, 32 insertions, 24 deletions

diff --git a/abs/core/python_modules/mysql-python/PKGBUILD b/abs/core/python_modules/mysql-python/PKGBUILD
index 590c2db..f9fcd0d 100644
--- a/abs/core/python_modules/mysql-python/PKGBUILD
+++ b/abs/core/python_modules/mysql-python/PKGBUILD
@@ -2,19 +2,27 @@
 # Contributor: damir <damir@archlinux.org>
 
 pkgname=mysql-python
-pkgver=1.2.3c1
-pkgrel=4
+pkgver=1.2.3
+pkgrel=5
 pkgdesc="MySQL support for Python"
 arch=("i686" "x86_64")
 url="http://sourceforge.net/projects/mysql-python"
 license=('GPL2')
-depends=('python2' 'libmysqlclient>=5.1.41-2')
-makedepends=('mysql>=5.1.41-2' 'setuptools')
+depends=('python2>=2.3' 'python2<2.7' 'libmysqlclient>=5.1.59')
+makedepends=('mysql>=5.1.59' 'setuptools')
 source=("http://downloads.sourceforge.net/${pkgname}/MySQL-python-${pkgver}.tar.gz")
-md5sums=('310dd856e439d070b59ece6dd7a0734d')
 
 build() {
+
+  /bin/true
+
+}
+
+package() {
+
   cd ${srcdir}/MySQL-python-${pkgver}
   python2 setup.py install --root=${pkgdir} || return 1
+
 }
 
+md5sums=('215eddb6d853f6f4be5b4afc4154292f')
diff --git a/abs/extra/libgda/PKGBUILD b/abs/extra/libgda/PKGBUILD
index 0b46cb6..72c9404 100644
--- a/abs/extra/libgda/PKGBUILD
+++ b/abs/extra/libgda/PKGBUILD
@@ -4,11 +4,11 @@
 
 pkgname=libgda
 pkgver=4.2.1
-pkgrel=1
+pkgrel=2
 pkgdesc="data abstraction layer; with mysql, pgsql, xml, sqlite providers"
-arch=(i686 x86_64)
+arch=('i686' 'x86_64')
 license=('GPL')
-depends=('glib2>=2.26.0' 'libxslt' 'db>=5.1.19' 'ncurses>=5.7' 'libsoup>=2.32.0' 'libmysqlclient>=5.1.51' 'postgresql-libs>=9.0.1')
+depends=('glib2>=2.26.0' 'libxslt' 'db>=5.1.19' 'ncurses>=5.7' 'libsoup>=2.32.0' 'libmysqlclient>=5.1.59' 'postgresql-libs>=9.0.1')
 makedepends=('intltool')
 options=('!libtool')
 url="http://www.gnome-db.org"
diff --git a/abs/extra/libproxy/PKGBUILD b/abs/extra/libproxy/PKGBUILD
index 2f2010e..3312aba 100644
--- a/abs/extra/libproxy/PKGBUILD
+++ b/abs/extra/libproxy/PKGBUILD
@@ -2,41 +2,39 @@
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=libproxy
-pkgver=0.4.6
-pkgrel=2
+pkgver=0.4.7
+pkgrel=1
 pkgdesc="A library that provides automatic proxy configuration management"
-arch=(i686 x86_64)
+arch=('i686' 'x86_64')
 license=('LGPL')
 depends=('gcc-libs')
-optdepends=('gconf: GNOME configuration module'
-            'kdelibs: KDE configuration module'
-            'networkmanager: NetworkManager configuration module'
-            'libwebkit: WPAD/PAC parsing via WebKit JavaScript engine'
-            'xulrunner: WPAD/PAC parsing via Mozilla JavaScript engine'
+optdepends=('kdelibs3: KDE configuration module'
             'perl: Perl bindings'
             'python2: Python bindings')
-makedepends=('xulrunner' 'gconf' 'cmake' 'networkmanager' 'libwebkit' 'automoc4' 'python2' 'kdelibs' 'perl')
+makedepends=('cmake' 'automoc4' 'python2' 'kdelibs3' 'perl')
 url="http://libproxy.googlecode.com"
 source=(http://libproxy.googlecode.com/files/${pkgname}-${pkgver}.tar.gz)
 options=('!libtool')
-md5sums=('199c6b120baf1f7258a55f38d5ec74f5')
+md5sums=('509e03a488a61cd62bfbaf3ab6a2a7a5')
 
 build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
+  cd "${srcdir}"
   mkdir build
   cd build
-  cmake -DCMAKE_INSTALL_PREFIX=/usr \
+  cmake ../${pkgname}-${pkgver} \
+    -DCMAKE_INSTALL_PREFIX=/usr \
     -DLIBEXEC_INSTALL_DIR=/usr/lib/libproxy \
     -DCMAKE_SKIP_RPATH=ON \
     -DPERL_VENDORINSTALL=yes \
-    -DCMAKE_BUILD_TYPE=None \
+    -DCMAKE_BUILD_TYPE=Release \
+    -DWITH_WEBKIT=OFF \
     -DCMAKE_CXX_FLAGS="${CXXFLAGS}" \
-    -DCMAKE_C_FLAGS="${CFLAGS}" \
-    ..
+    -DCMAKE_C_FLAGS="${CFLAGS}"
   make
 }
 
 package() {
-  cd "${srcdir}/${pkgname}-${pkgver}/build"
+  cd "${srcdir}/build"
   make DESTDIR="${pkgdir}" install
 }
+
diff --git a/abs/extra/libproxy/__changelog b/abs/extra/libproxy/__changelog
new file mode 100644
index 0000000..b61a183
--- /dev/null
+++ b/abs/extra/libproxy/__changelog
@@ -0,0 +1,2 @@
+- remove 'networkmanager' and as makedep and optdep.  MH
+- change 'kdelibs' dep and optdep to 'kdelibs3' MH