Sat Dec 1 01:48:48 PST 2012

4 files changed, 69 insertions, 23 deletions

diff --git a/community/filezilla/PKGBUILD b/community/filezilla/PKGBUILD
index 7f1af6b30..b09b1b38d 100644
--- a/community/filezilla/PKGBUILD
+++ b/community/filezilla/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 80261 2012-11-18 19:11:09Z jelle $
+# $Id: PKGBUILD 80712 2012-11-30 12:16:29Z bluewind $
 # Contributor: Alexander Fehr <pizzapunk gmail com>
 # Maintainer: Daniel J Griffiths <ghost1227@archlinux.us>
 
 pkgname=filezilla
-pkgver=3.6.0.1
+pkgver=3.6.0.2
 pkgrel=1
 pkgdesc="Fast and reliable FTP, FTPS and SFTP client"
 arch=('i686' 'x86_64')
@@ -31,4 +31,4 @@ package() {
 
   make DESTDIR="${pkgdir}" install
 }
-md5sums=('90839d05bf52e27e8f4a33adceb3ae5c')
+md5sums=('d56773feafb85c216813bbda87838db0')
diff --git a/community/mariadb/PKGBUILD b/community/mariadb/PKGBUILD
index c17fc8fbb..91b606f4c 100644
--- a/community/mariadb/PKGBUILD
+++ b/community/mariadb/PKGBUILD
@@ -1,18 +1,19 @@
-# $Id: PKGBUILD 78669 2012-10-22 14:43:04Z bpiotrowski $
+# $Id: PKGBUILD 80718 2012-11-30 22:24:36Z bpiotrowski $
 # Maintainer: Bartłomiej Piotrowski <nospam@bpiotrowski.pl>
 
 pkgbase=mariadb
 pkgname=('libmariadbclient' 'mariadb-clients' 'mariadb')
-pkgver=5.5.28
+pkgver=5.5.28.a
+_pkgver=${pkgver/.a/a}
 pkgrel=1
 arch=('i686' 'x86_64')
 license=('GPL')
 url="http://mariadb.org/"
 makedepends=('cmake' 'openssl' 'zlib')
 options=('!libtool')
-source=(http://mirrors.supportex.net/$pkgbase/$pkgbase-$pkgver/kvm-tarbake-jaunty-x86/$pkgbase-$pkgver.tar.gz
+source=(http://mirrors.supportex.net/$pkgbase/$pkgbase-$_pkgver/kvm-tarbake-jaunty-x86/$pkgbase-$_pkgver.tar.gz
         service rc.d tmpfiles.conf)
-md5sums=('9a4055300ccadf7990167ebd1ce875fa'
+md5sums=('a2d20a040ef1e49944a4ffe65ed7fefa'
          '9e7aa0fa646f48662df569259061fcef'
          '3bb5a9a96340feb0184bc057ee6e330b'
          '32f30449d3111714fe190931d08fdb8c')
@@ -26,7 +27,7 @@ build() {
   CFLAGS="-fPIC ${CFLAGS} -fno-strict-aliasing -DBIG_JOINS=1 -fomit-frame-pointer" \
   CXXFLAGS="-fPIC ${CXXFLAGS} -fno-strict-aliasing -DBIG_JOINS=1 -felide-constructors -fno-rtti" \
 
-  cmake ../${pkgbase}-${pkgver} \
+  cmake ../${pkgbase}-${_pkgver} \
     -DCMAKE_BUILD_TYPE=Release \
     -DCMAKE_INSTALL_PREFIX=/usr \
     -DSYSCONFDIR=/etc/mysql \
@@ -67,7 +68,7 @@ package_libmariadbclient(){
   pkgdesc="MariaDB client libraries"
   depends=('openssl')
   conflicts=('libmysqlclient')
-  provides=("libmysqlclient=${pkgver}")
+  provides=("libmysqlclient=${_pkgver}")
   
   cd "${srcdir}"/build
   for dir in include libmysql libmysqld libservices; do
@@ -78,7 +79,7 @@ package_libmariadbclient(){
   install -m755 scripts/mysql_config "${pkgdir}"/usr/bin/
   install -d "${pkgdir}"/usr/share/man/man1
   for man in mysql_config mysql_client_test_embedded mysqltest_embedded; do
-    install -m644 "${srcdir}"/${pkgbase}-${pkgver}/man/$man.1 "${pkgdir}"/usr/share/man/man1/$man.1
+    install -m644 "${srcdir}"/${pkgbase}-${_pkgver}/man/$man.1 "${pkgdir}"/usr/share/man/man1/$man.1
   done
 }
 
@@ -86,7 +87,7 @@ package_mariadb-clients() {
   pkgdesc="MariaDB client tools"
   depends=('libmariadbclient')
   conflicts=('mysql-clients')
-  provides=("mysql-clients=${pkgver}")
+  provides=("mysql-clients=${_pkgver}")
   
   cd "${srcdir}"/build
   make -C client DESTDIR="${pkgdir}" install
@@ -94,7 +95,7 @@ package_mariadb-clients() {
   # install man pages
   install -d "${pkgdir}"/usr/share/man/man1
   for man in mysql mysqladmin mysqlcheck mysqldump mysqlimport mysqlshow mysqlslap; do
-    install -m644 "${srcdir}"/${pkgbase}-${pkgver}/man/$man.1 "${pkgdir}"/usr/share/man/man1/$man.1
+    install -m644 "${srcdir}"/${pkgbase}-${_pkgver}/man/$man.1 "${pkgdir}"/usr/share/man/man1/$man.1
   done
 
   # provided by mariadb
@@ -107,7 +108,7 @@ package_mariadb() {
   install=mariadb.install
   depends=('mariadb-clients')
   conflicts=('mysql')
-  provides=("mysql=${pkgver}")
+  provides=("mysql=${_pkgver}")
   optdepends=('perl-dbi' 'perl-dbd-mysql')
   options=('emptydirs')
 
diff --git a/community/python-matplotlib/PKGBUILD b/community/python-matplotlib/PKGBUILD
index 7e90764c9..d47ac8e7a 100644
--- a/community/python-matplotlib/PKGBUILD
+++ b/community/python-matplotlib/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 80031 2012-11-15 15:02:41Z stephane $
+# $Id: PKGBUILD 80710 2012-11-30 12:11:12Z stephane $
 # Maintainer: Stéphane Gaudreault <stephane@archlinux.org>
 # Contributor: Stefan Husmann <stefan-husmann@t-online.de>
 # Contributor: Angel 'angvp' Velasquez <angvp[at]archlinux.com.ve>
@@ -7,25 +7,35 @@
 pkgbase=python-matplotlib
 pkgname=('python2-matplotlib' 'python-matplotlib')
 pkgver=1.2.0
-pkgrel=3
+pkgrel=6
 pkgdesc="A python plotting library, making publication quality plots"
 arch=('i686' 'x86_64')
-url="http://matplotlib.sourceforge.net/"
+url='http://matplotlib.org'
 license=('custom')
-makedepends=('python2-pytz' 'python2-numpy' 'python2-pyqt'
-             'python-pytz' 'python-numpy' 'pyqt')
+makedepends=('python2-pytz' 'python2-numpy' 'python2-pyqt' 'python-pytz' 'python-numpy' 'pyqt'
+             'tk' 'python-cairo' 'python2-cairo' 'python-dateutil' 'python2-dateutil'
+             'python-gobject' 'python2-gobject' 'python-pyparsing' 'python2-pyparsing'
+             'pygtk' 'python-six' 'ghostscript' 'texlive-bin')
+optdepends=('pygtk: for use with the GTK or GTKAgg backend'
+            'tk: used by the TkAgg backend'
+            'ghostscript: usetex dependencies' 
+            'texlive-bin: usetex dependencies')
 source=("https://github.com/downloads/matplotlib/matplotlib/matplotlib-${pkgver}.tar.gz"
-         setup.cfg)
+         python-matplotlib-tk.patch)
 sha1sums=('1d0c319b2bc545f1a7002f56768e5730fe573518'
-          '370a08120bcb3046f590c527b3d29d18ae874818')
+          '6f27ff74a7752700758d081d3235a61a89b8ea95')
 
 build() {
    cd "${srcdir}"/matplotlib-${pkgver}
 
+   patch -Np1 -i ../python-matplotlib-tk.patch
+
    # use system python-six
    rm lib/six.py
 
-   cp ../setup.cfg .
+   # remove internal copies of pyparsing
+   rm -r lib/matplotlib/pyparsing_py{2,3}.py
+   sed -i -e 's/matplotlib.pyparsing_py[23]/pyparsing/g' lib/matplotlib/{mathtext,fontconfig_pattern}.py
 
    # For numpy 1.7
    sed -i '/include/s/numpy\/arrayobject.h/numpy\/oldnumeric.h/g' \
@@ -54,7 +64,7 @@ build() {
 }
 
 package_python2-matplotlib() {
-   depends=('python2-pytz' 'python2-numpy' 'python2-pyqt' 'python2-dateutil')
+   depends=('python2-pytz' 'python2-numpy' 'python2-cairo' 'python2-pyqt' 'python2-dateutil' 'python2-pyparsing')
 
    cd "${srcdir}"/matplotlib-${pkgver}
    python2 setup.py install -O1 --skip-build --root "${pkgdir}" --prefix=/usr
@@ -64,7 +74,7 @@ package_python2-matplotlib() {
 }
 
 package_python-matplotlib() {
-   depends=('python-pytz' 'python-numpy' 'pyqt' 'python-dateutil')
+   depends=('python-pytz' 'python-numpy' 'python-cairo' 'pyqt' 'python-dateutil' 'python-pyparsing')
    cd "${srcdir}"/matplotlib-${pkgver}-py3
    python3 setup.py install -O1 --skip-build --root "${pkgdir}" --prefix=/usr
 
diff --git a/community/python-matplotlib/python-matplotlib-tk.patch b/community/python-matplotlib/python-matplotlib-tk.patch
new file mode 100644
index 000000000..10480195a
--- /dev/null
+++ b/community/python-matplotlib/python-matplotlib-tk.patch
@@ -0,0 +1,35 @@
+diff -up matplotlib-1.2.0/setupext.py.orig matplotlib-1.2.0/setupext.py
+--- matplotlib-1.2.0/setupext.py.orig	2012-11-23 14:50:48.954715965 -0200
++++ matplotlib-1.2.0/setupext.py	2012-11-23 14:55:53.731727636 -0200
+@@ -898,12 +898,12 @@ def parse_tcl_config(tcl_lib_dir, tk_lib
+ 
+     tcl_poss = [tcl_lib_dir,
+                 os.path.normpath(os.path.join(tcl_lib_dir, '..')),
+-                "/usr/lib/tcl"+str(Tkinter.TclVersion),
+-                "/usr/lib"]
++                "@@libdir@@/tcl"+str(Tkinter.TclVersion),
++                "@@lib@@"]
+     tk_poss = [tk_lib_dir,
+                 os.path.normpath(os.path.join(tk_lib_dir, '..')),
+-               "/usr/lib/tk"+str(Tkinter.TkVersion),
+-               "/usr/lib"]
++               "@@libdir@@/tk"+str(Tkinter.TkVersion),
++               "@@libdir@@"]
+     for ptcl, ptk in zip(tcl_poss, tk_poss):
+         tcl_config = os.path.join(ptcl, "tclConfig.sh")
+         tk_config = os.path.join(ptk, "tkConfig.sh")
+@@ -974,10 +974,10 @@ def guess_tcl_config(tcl_lib_dir, tk_lib
+     return tcl_lib, tcl_inc, 'tcl' + tk_ver, tk_lib, tk_inc, 'tk' + tk_ver
+ 
+ def hardcoded_tcl_config():
+-    tcl_inc = "/usr/local/include"
+-    tk_inc = "/usr/local/include"
+-    tcl_lib = "/usr/local/lib"
+-    tk_lib = "/usr/local/lib"
++    tcl_inc = "/usr/include"
++    tk_inc = "/usr/include"
++    tcl_lib = "@@libdir@@"
++    tk_lib = "@@libdir@@"
+     return tcl_lib, tcl_inc, 'tcl', tk_lib, tk_inc, 'tk'
+ 
+ def add_tk_flags(module):