7 files changed, 46 insertions, 40 deletions
diff --git a/extra/audacity/PKGBUILD b/extra/audacity/PKGBUILD
index 95d7de472..d4415aee5 100644
--- a/extra/audacity/PKGBUILD
+++ b/extra/audacity/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 143650 2011-11-28 02:34:27Z eric $
+# $Id: PKGBUILD 144994 2011-12-13 19:14:03Z eric $
 # Maintainer: Eric Bélanger <eric@archlinux.org>
 
 pkgname=audacity
-pkgver=1.3.13
-pkgrel=2
+pkgver=1.3.14
+pkgrel=1
 pkgdesc="A program that lets you manipulate digital audio waveforms"
 arch=('i686' 'x86_64')
 url="http://audacity.sourceforge.net/"
@@ -14,7 +14,7 @@ options=('!makeflags')
 install=audacity.install
 source=(http://audacity.googlecode.com/files/${pkgname}-minsrc-${pkgver}-beta.tar.bz2 \
         audacity-1.3.13-ffmpeg.patch)
-sha1sums=('47a1340699958c8e1804f374209835be865d7027'
+sha1sums=('a0fb22a0cfbb8a72abac8bbc01b3ad8b0bb7e11e'
           '26c2ad8e611705b2762a318e66312169f59cc218')
 
 build() {
diff --git a/extra/blender/PKGBUILD b/extra/blender/PKGBUILD
index 4e4bb6b1c..fcd0f5da2 100644
--- a/extra/blender/PKGBUILD
+++ b/extra/blender/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 142616 2011-11-12 17:15:07Z ibiru $
+# $Id: PKGBUILD 145008 2011-12-14 03:12:03Z eric $
 # Contributor: John Sowiak <john@archlinux.org>
 # Maintainer: tobias <tobias@archlinux.org>
 
@@ -12,8 +12,8 @@
 _svn=false
 
 pkgname=blender
-pkgver=2.60a
-pkgrel=2
+pkgver=2.61
+pkgrel=1
 epoch=3
 pkgdesc="A fully integrated 3D graphics creation suite"
 arch=('i686' 'x86_64')
@@ -21,12 +21,12 @@ license=('GPL')
 url="http://www.blender.org"
 depends=('libpng' 'libtiff' 'openexr' 'python' 'desktop-file-utils' \
          'shared-mime-info' 'hicolor-icon-theme' 'xdg-utils' 'glew' \
-         'freetype2' 'openal' 'libsndfile' 'ffmpeg')
+         'freetype2' 'openal' 'ffmpeg')
 makedepends=('cmake')
 install=blender.install
 if [ $_svn = false ]; then
   source=(http://download.blender.org/source/$pkgname-$pkgver.tar.gz)
-  md5sums=('cc7e4a56c9f7941c33c958ff0338f9a6')
+  md5sums=('11a4721ff92286f678bb2e05e5f29c97')
 else
   source=(ftp://ftp.archlinux.org/other/${pkgname}/$pkgname-$pkgver.tar.xz)
   md5sums=('7579d1139d0d6025df8afcfca64a65c4')
diff --git a/extra/ettercap/PKGBUILD b/extra/ettercap/PKGBUILD
index 5924d10c7..903b506ab 100644
--- a/extra/ettercap/PKGBUILD
+++ b/extra/ettercap/PKGBUILD
@@ -1,25 +1,24 @@
-# $Id: PKGBUILD 137345 2011-09-07 13:18:49Z andrea $
+# $Id: PKGBUILD 144996 2011-12-13 22:16:57Z eric $
 # Maintainer:
 # Contributor: Tom Newsom <Jeepster@gmx.co.uk>
 
 pkgbase=ettercap
 pkgname=('ettercap' 'ettercap-gtk')
-pkgver=NG_0.7.4.1
+pkgver=NG_0.7.4.2
 _origver=${pkgver/_/-}
-pkgrel=2
+pkgrel=1
 arch=('i686' 'x86_64')
 url="http://ettercap.sourceforge.net/"
 license=('GPL')
-depends=('ncurses' 'openssl' 'libpcap' 'zlib' 'pcre' 'libtool' 'libnet'
-         'pkgconfig' 'gtk2')
-source=("http://drizztbsd.github.com/${pkgbase}/dist/${pkgbase}-${_origver}.tar.gz"
-        'ettercap.desktop')
-md5sums=('c6ae5f86361a85a8e193051f594a74fa'
-         '2fb9c1fa838f33aab427865ae4fc93ac')
+makedepends=('libpcap' 'libltdl' 'libnet' 'gtk2' 'hicolor-icon-theme')
+options=('!libtool' '!makeflags' '!emptydirs')
+source=("http://drizztbsd.github.com/${pkgbase}/dist/${pkgbase}-${_origver}.tar.gz")
+md5sums=('ab2354bf9c91195f06ad0b5d058565a4')
 
 build() {
   cd "${srcdir}"
-  
+  sed -i 's/su-to-root -c/gksu/' ${pkgbase}-${_origver}/desktop/ettercap.desktop
+
   cp -r ${pkgbase}-${_origver} ${pkgbase}-${_origver}-gtk
 
   cd ${pkgbase}-${_origver}
@@ -45,9 +44,8 @@ build() {
 
 package_ettercap() {
   pkgdesc="A network sniffer/interceptor/logger for ethernet LANs - console"
-  depends=('ncurses' 'openssl' 'libpcap' 'zlib' 'pcre' 'libtool' 'libnet')
+  depends=('openssl' 'libpcap' 'pcre' 'libltdl' 'libnet')
   backup=('etc/etter.conf')
-  options=('!libtool')
 
   cd "${srcdir}"/${pkgbase}-${_origver}
   make DESTDIR="${pkgdir}" install
@@ -55,16 +53,18 @@ package_ettercap() {
 
 package_ettercap-gtk() {
   pkgdesc="A network sniffer/interceptor/logger for ethernet LANs - GTK"
-  depends=('ettercap' 'gtk2')
+  depends=('ettercap' 'gtk2' 'hicolor-icon-theme')
   optdepends=('gksu: to run ettercap from the menu')
   install=ettercap-gtk.install
 
   cd "${srcdir}"/${pkgbase}-${_origver}-gtk
   install -Dm755 src/ettercap "${pkgdir}"/usr/bin/ettercap-gtk
-  install -Dm644 "${srcdir}"/ettercap.desktop \
+  install -Dm644 desktop/ettercap.desktop \
     "${pkgdir}"/usr/share/applications/ettercap.desktop
   install -Dm644 share/ettercap.png \
     "${pkgdir}"/usr/share/ettercap/ettercap.png
   install -Dm644 desktop/ettercap.xpm \
-    "${pkgdir}"/usr/share/pixmaps/ettercap.xpm
+    "${pkgdir}"/usr/share/icons/hicolor/32x32/apps/ettercap.xpm
+  install -Dm644 desktop/ettercap.svg \
+    "${pkgdir}"/usr/share/icons/hicolor/scalable/apps/ettercap.svg
 }
diff --git a/extra/imagemagick/PKGBUILD b/extra/imagemagick/PKGBUILD
index 9eba812e0..47c3ccdac 100644
--- a/extra/imagemagick/PKGBUILD
+++ b/extra/imagemagick/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 143601 2011-11-27 03:03:13Z eric $
+# $Id: PKGBUILD 144992 2011-12-13 18:04:12Z eric $
 # Maintainer: Eric Bélanger <eric@archlinux.org>
 
 pkgbase=imagemagick
 pkgname=('imagemagick' 'imagemagick-doc')
-pkgver=6.7.3.8
+pkgver=6.7.4.0
 pkgrel=1
 arch=('i686' 'x86_64')
 url="http://www.imagemagick.org/"
@@ -12,7 +12,7 @@ depends=('libltdl' 'lcms2' 'libxt' 'xz' 'fontconfig' 'libxext' 'libjpeg-turbo')
 makedepends=('ghostscript' 'openexr' 'libwmf' 'librsvg' 'libxml2' 'jasper' 'libpng')
 source=(ftp://ftp.imagemagick.org/pub/ImageMagick/ImageMagick-${pkgver%.*}-${pkgver##*.}.tar.xz \
         perlmagick.rpath.patch)
-sha1sums=('0414771506d69efd6f3ba3c20ab3320e46656f39'
+sha1sums=('f0310885972341b74670925b503ad8a8b05ad75d'
           '23405f80904b1de94ebd7bd6fe2a332471b8c283')
 
 build() {
diff --git a/extra/python-lxml/PKGBUILD b/extra/python-lxml/PKGBUILD
index 86b22a859..24a1c2dac 100644
--- a/extra/python-lxml/PKGBUILD
+++ b/extra/python-lxml/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 140122 2011-10-07 10:35:34Z eric $
+# $Id: PKGBUILD 145002 2011-12-13 23:35:31Z eric $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
 # Contributor: Angel 'angvp' Velasquez <angvp[at]archlinux.com.ve>
@@ -6,7 +6,7 @@
 # Contributor: Guillem Rieu <guillemr@gmx.net>
 
 pkgname=python-lxml
-pkgver=2.3.1
+pkgver=2.3.2
 pkgrel=1
 pkgdesc="Python binding for the libxml2 and libxslt libraries"
 arch=('i686' 'x86_64')
@@ -17,7 +17,12 @@ optdepends=('python-beautifulsoup: support for parsing not well formed HTML')
 conflicts=('lxml')
 replaces=('lxml')
 source=("http://codespeak.net/lxml/lxml-${pkgver}.tgz")
-md5sums=('87931fbf35df60cd71cfe7484b4b36ed')
+md5sums=('50ed3706da4665c40600fd6e2a7d1159')
+
+check() {
+  cd "${srcdir}"/lxml-$pkgver
+  make PYTHON=python2 test
+}
 
 package() {
   cd "${srcdir}"/lxml-$pkgver
diff --git a/extra/wxgtk/PKGBUILD b/extra/wxgtk/PKGBUILD
index f56cd59ec..8ecf8e479 100644
--- a/extra/wxgtk/PKGBUILD
+++ b/extra/wxgtk/PKGBUILD
@@ -1,26 +1,26 @@
-# $Id: PKGBUILD 134643 2011-08-07 02:49:25Z eric $
+# $Id: PKGBUILD 144988 2011-12-13 14:41:40Z eric $
 # Maintainer: Eric Bélanger <eric@archlinux.org>
 
 pkgname=wxgtk
 pkgver=2.8.12.1
-pkgrel=1
+pkgrel=2
 pkgdesc="GTK+ implementation of wxWidgets API for GUI"
 arch=('i686' 'x86_64')
 url="http://wxwidgets.org"
 license=('custom:wxWindows')
 depends=('gtk2' 'gstreamer0.10-base' 'libgl' 'libxxf86vm' 'libsm')
-makedepends=('libgnomeprintui' 'gstreamer0.10-base-plugins' 'gconf' 'mesa')
+makedepends=('gstreamer0.10-base-plugins' 'gconf' 'mesa')
 #source=(http://downloads.sourceforge.net/wxwindows/wxGTK-${pkgver}.tar.bz2)
 source=(http://downloads.sourceforge.net/wxpython/wxPython-src-${pkgver}.tar.bz2)
-md5sums=('8c06c5941477beee213b4f2fa78be620')
 sha1sums=('05688dc03d61631750f5904273122bb40a2115f5')
 
 build() {
   cd "${srcdir}/wxPython-src-${pkgver}"
 #  cd "${srcdir}/wxGTK-${pkgver}"
   ./configure --prefix=/usr --libdir=/usr/lib --with-gtk=2 --with-opengl --enable-unicode \
-    --enable-graphics_ctx --with-gnomeprint --disable-optimize --enable-mediactrl \
-    --with-libpng=sys --with-libxpm=sys --with-libjpeg=sys --with-libtiff=sys
+    --enable-graphics_ctx  --disable-optimize --enable-mediactrl --with-regex=sys \
+    --with-libpng=sys --with-libxpm=sys --with-libjpeg=sys --with-libtiff=sys \
+    --disable-precomp-headers
   make
   make -C locale allmo
   cd contrib/src
diff --git a/extra/wxpython/PKGBUILD b/extra/wxpython/PKGBUILD
index 2a983d1a3..6ce4fcba5 100644
--- a/extra/wxpython/PKGBUILD
+++ b/extra/wxpython/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 142236 2011-11-07 00:38:07Z eric $
+# $Id: PKGBUILD 144998 2011-12-13 22:53:53Z eric $
 # Maintainer: Eric Bélanger <eric@archlinux.org>
 
 pkgname=wxpython
 pkgver=2.8.12.1
-pkgrel=2
+pkgrel=3
 pkgdesc="A wxWidgets GUI toolkit for Python"
 arch=('i686' 'x86_64')
 license=('custom:wxWindows')
@@ -19,8 +19,9 @@ build() {
   find . -type f -exec sed -i 's/env python/env python2/' {} \;
   mv wxPython/wx/tools/Editra/editra wxPython/wx/tools/Editra/Editra
   ./configure --prefix=/usr --libdir=/usr/lib --with-gtk=2 --with-opengl --enable-unicode \
-    --enable-graphics_ctx --with-gnomeprint --disable-optimize --enable-mediactrl \
-    --with-libpng=sys --with-libxpm=sys --with-libjpeg=sys --with-libtiff=sys
+    --enable-graphics_ctx --disable-optimize --enable-mediactrl \
+    --with-regex=sys --with-libpng=sys --with-libxpm=sys --with-libjpeg=sys --with-libtiff=sys \
+    --disable-precomp-headers
   cd "${srcdir}/wxPython-src-${pkgver}/wxPython"
   patch -p2 -i "${srcdir}/wxpython-cairo.patch"
   python2 setup.py WXPORT=gtk2 UNICODE=1 build