Sat Jul 16 05:34:06 UTC 2011

6 files changed, 55 insertions, 64 deletions

diff --git a/extra/aspell/PKGBUILD b/extra/aspell/PKGBUILD
index 7e224400a..1b88938d3 100644
--- a/extra/aspell/PKGBUILD
+++ b/extra/aspell/PKGBUILD
@@ -1,36 +1,33 @@
-# $Id: PKGBUILD 107951 2011-01-28 03:53:36Z eric $
+# $Id: PKGBUILD 131851 2011-07-16 03:59:19Z eric $
 # Contributor: Jochem Kossen <j.kossen@home.nl>
 # Contributor: dorphell <dorphell@archlinux.org>
 # Contributor: Thayer Williams <thayer@archlinux.org>
 # Maintainer: Daniel J Griffiths <ghost1227@archlinux.us>
 
 pkgname=aspell
-pkgver=0.60.6
+pkgver=0.60.6.1
 _pkgmajorver=0.60
-pkgrel=5
+pkgrel=1
 pkgdesc="A spell checker designed to eventually replace Ispell"
-url="http://aspell.net/"
 arch=('i686' 'x86_64')
+url="http://aspell.net/"
 license=('LGPL')
-depends=('gcc-libs' 'ncurses>=5.6-7')
+depends=('gcc-libs' 'ncurses')
 optdepends=('perl: to import old dictionaries')
 options=('!libtool')
 install=aspell.install
 source=(ftp://ftp.gnu.org/gnu/${pkgname}/${pkgname}-${pkgver}.tar.gz)
-md5sums=('bc80f0198773d5c05086522be67334eb')
-sha1sums=('335bcb560e00f59d89ec9e4c4114c325fb0e65f4')
+md5sums=('e66a9c9af6a60dc46134fdacf6ce97d7')
+sha1sums=('ff1190db8de279f950c242c6f4c5d5cdc2cbdc49')
 
 build() {
-	cd "${srcdir}/${pkgname}-${pkgver}"
-
-	./configure --prefix=/usr --sysconfdir=/etc
-	make
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  ./configure --prefix=/usr --sysconfdir=/etc
+  make
 }
 
 package() {
-	cd "${srcdir}/${pkgname}-${pkgver}"
-	
-	make DESTDIR="${pkgdir}" install
-	ln -s ${pkgname}-${_pkgmajorver} \
-		"${pkgdir}/usr/lib/${pkgname}"
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  make DESTDIR="${pkgdir}" install
+  ln -s ${pkgname}-${_pkgmajorver} "${pkgdir}/usr/lib/${pkgname}"
 }
diff --git a/extra/aspell/aspell.install b/extra/aspell/aspell.install
index 5a128ae41..4bb848e30 100644
--- a/extra/aspell/aspell.install
+++ b/extra/aspell/aspell.install
@@ -1,4 +1,4 @@
-infodir=/usr/share/info
+infodir=usr/share/info
 filelist=(aspell.info aspell-dev.info)
 
 post_install() {
diff --git a/extra/python/PKGBUILD b/extra/python/PKGBUILD
index fc8fce46d..c971f7337 100644
--- a/extra/python/PKGBUILD
+++ b/extra/python/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 119805 2011-04-15 11:51:39Z stephane $
+# $Id: PKGBUILD 131166 2011-07-11 13:06:25Z stephane $
 # Maintainer: Stéphane Gaudreault <stephane@archlinux.org>
 # Maintainer: Allan McRae <allan@archlinux.org>
-# Contributer: Jason Chu <jason@archlinux.org>
+# Contributor: Jason Chu <jason@archlinux.org>
 
 pkgname=python
-pkgver=3.2
-pkgrel=2
+pkgver=3.2.1
+pkgrel=1
 _pybasever=3.2
 pkgdesc="Next generation of the python high-level scripting language"
 arch=('i686' 'x86_64')
@@ -13,27 +13,25 @@ license=('custom')
 url="http://www.python.org/"
 depends=('expat' 'bzip2' 'gdbm' 'openssl' 'libffi' 'zlib')
 makedepends=('tk' 'sqlite3' 'valgrind')
-optdepends=('tk: for tkinter')
+optdepends=('tk: for tkinter' 'sqlite3')
 provides=('python3')
 replaces=('python3')
 options=('!makeflags')
-source=(http://www.python.org/ftp/python/${_pybasever}/Python-${pkgver}.tar.xz
-        CVE-2011-1521.patch)
-sha1sums=('55a3a9d39f31563370d0c494373bb6d38e4d1a00'
-          '561161ce5ae3a91254352c09a33e3e4434444e14')  
+source=(http://www.python.org/ftp/python/${pkgver%rc*}/Python-${pkgver}.tar.xz)
+sha1sums=('ab5cf4a4c21abe590dea87473a1dee6820699d79')
+
 build() {
   cd "${srcdir}/Python-${pkgver}"
 
+  # FS#23997
+  sed -i -e "s|^#.* /usr/local/bin/python|#!/usr/bin/python|" Lib/cgi.py
+
   # Ensure that we are using the system copy of various libraries (expat, zlib and libffi),
   # rather than copies shipped in the tarball
   rm -r Modules/expat
   rm -r Modules/zlib
   rm -r Modules/_ctypes/{darwin,libffi}*
 
-  # urllib Security Vulnerability
-  # http://blog.python.org/2011/04/urllib-security-vulnerability-fixed.html
-  patch -Np1 -i ../CVE-2011-1521.patch
-
   ./configure --prefix=/usr \
               --enable-shared \
               --with-threads \
@@ -69,7 +67,7 @@ package() {
     "${pkgdir}/usr/lib/python${_pybasever}/config-${_pybasever}mu/libpython${_pybasever}mu.so"
 
   # Clean-up reference to build directory
-  sed -i "s#$srcdir/Python-${pkgver}:##" "$pkgdir/usr/lib/python${_pybasever}/config-${_pybasever}mu/Makefile"
+  sed -i "s|$srcdir/Python-${pkgver}:||" "$pkgdir/usr/lib/python${_pybasever}/config-${_pybasever}mu/Makefile"
 
   # License
   install -Dm644 LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
diff --git a/extra/qwtplot3d/PKGBUILD b/extra/qwtplot3d/PKGBUILD
index ec339174d..8bd7c546b 100644
--- a/extra/qwtplot3d/PKGBUILD
+++ b/extra/qwtplot3d/PKGBUILD
@@ -1,42 +1,42 @@
-# $Id: PKGBUILD 64675 2010-01-21 21:29:39Z eric $
+# $Id: PKGBUILD 131790 2011-07-15 09:16:14Z ronald $
 # Maintainer: damir <damir@archlinux.org>
 
 pkgname=qwtplot3d
 pkgver=0.2.7
-origver=0.2.7
-pkgrel=2
+pkgrel=3
 pkgdesc="Qt/OpenGL-based C++ programming library containing 3d-widgets"
 arch=("i686" "x86_64")
 license=('custom:zlib')
 url="http://qwtplot3d.sourceforge.net/"
-depends=('qt>=4.3' 'qwt>=5.0.2')
-source=("http://downloads.sourceforge.net/sourceforge/qwtplot3d/qwtplot3d-$origver.tgz"
+depends=('qt' 'qwt' 'mesa')
+source=("http://downloads.sourceforge.net/sourceforge/qwtplot3d/qwtplot3d-$pkgver.tgz"
         qwtplot3d-gcc44.patch)
-md5sums=('2f14660152e2e26bfeaaeec479ed9f2b' '92ad261ed5344bc773cba05b324cfe74')
 sha1sums=('4463fafb8420a91825e165da7a296aaabd70abea' '52fa169b651a98550f8a8391ddf52e0eaeb2c215')
 
 build() {
-    cd $startdir/src/$pkgname
-    patch -p1 < ../qwtplot3d-gcc44.patch || return 1
-  #  . /etc/profile.d/qt3.sh
+    cd ${srcdir}/${pkgname}
+    patch -p1 < ../qwtplot3d-gcc44.patch
+
     # build qwt:
     qmake qwtplot3d.pro
-    make || return 1
+    make
+}
+
+package() {
+    cd ${srcdir}/${pkgname}
 
     # install qwtplot3d: (by hand, because the Makefile do not provide a "install:")
-    mkdir -p $startdir/pkg/usr/{include/qwtplot3d,lib}
-    # mkdir -p $startdir/pkg/usr/man/man3 .. no manpages yet
+    install -d ${pkgdir}/usr/{include/qwtplot3d,lib}
 
     for n in include/* ; do
-     cp -d $n $startdir/pkg/usr/include/qwtplot3d || return 1
+     cp -d $n ${pkgdir}/usr/include/qwtplot3d
     done
 
     for n in lib/libqwtplot3d.so* ; do
-     cp -d $n $startdir/pkg/usr/lib || return 1
+     cp -d $n ${pkgdir}/usr/lib
     done
 
-    # for n in doc/man/man3/*.3 ; do
-    #  install -m 644 $n $startdir/pkg/usr/man/man3
-    # done
+    # install custom license
+    install -Dm644 ${srcdir}/${pkgname}/COPYING ${pkgdir}/usr/share/licenses/qwtplot3d/LICENSE
 }
 
diff --git a/extra/ruby/PKGBUILD b/extra/ruby/PKGBUILD
index a829449da..0cf2bb88d 100644
--- a/extra/ruby/PKGBUILD
+++ b/extra/ruby/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 127449 2011-06-15 09:33:37Z eric $
+# $Id: PKGBUILD 131846 2011-07-16 03:10:20Z eric $
 # Maintainer:
 # Contributor: Allan McRae <allan@archlinux.org>
 # Contributor: John Proctor <jproctor@prium.net>
@@ -6,25 +6,22 @@
 
 pkgbase=ruby
 pkgname=('ruby' 'ruby-docs')
-pkgver=1.9.2_p180
-pkgrel=3
+pkgver=1.9.2_p290
+pkgrel=1
 pkgdesc="An object-oriented language for quick and easy programming"
 arch=('i686' 'x86_64')
 url="http://www.ruby-lang.org/en/"
 license=('custom')
 makedepends=('openssl' 'tk' 'libffi' 'doxygen' 'graphviz')
 options=('!emptydirs' '!makeflags')
-source=("ftp://ftp.ruby-lang.org/pub/${pkgbase}/1.9/${pkgbase}-${pkgver//_/-}.tar.bz2")
-md5sums=('68510eeb7511c403b91fe5476f250538')
-sha1sums=('10824b44c8060c7b9b5afc0b3519a1e9f02f7fe5')
+source=(ftp://ftp.ruby-lang.org/pub/${pkgbase}/${pkgver%.*}/${pkgbase}-${pkgver//_/-}.tar.bz2)
+md5sums=('096758c3e853b839dc980b183227b182')
+sha1sums=('8f25a74f50a10fdd9724e3c74ccd7bae596e198b')
 
 build() {
   cd "${srcdir}/${pkgbase}-${pkgver//_/-}"
-  ./configure --prefix=/usr \
-      --sysconfdir=/etc \
-      --enable-shared \
-      --enable-pthread \
-      --disable-rpath
+  ./configure --prefix=/usr --sysconfdir=/etc \
+      --enable-shared --enable-pthread --disable-rpath
   make
 }
 
@@ -41,7 +38,6 @@ package_ruby() {
 
 package_ruby-docs() {
   pkgdesc="Documentation files for ruby"
-  depends=('ruby')
 
   cd "${srcdir}/${pkgbase}-${pkgver//_/-}"
   make DESTDIR="${pkgdir}" install-doc install-capi
diff --git a/extra/vino/PKGBUILD b/extra/vino/PKGBUILD
index 50f7af45a..cb1e131ca 100644
--- a/extra/vino/PKGBUILD
+++ b/extra/vino/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 122171 2011-05-02 16:51:49Z ibiru $
+# $Id: PKGBUILD 131782 2011-07-15 06:46:07Z ibiru $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=vino
-pkgver=3.0.2
+pkgver=3.0.3
 pkgrel=1
 pkgdesc="a VNC server for the GNOME desktop"
 arch=('i686' 'x86_64')
@@ -13,8 +13,8 @@ groups=('gnome-extra')
 url="http://www.gnome.org"
 options=(!emptydirs)
 install=vino.install
-source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.bz2)
-sha256sums=('ca2d72f70d2a94e31e63d0267ec41820aab168c6545954c355a609f3c6c31923')
+source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz)
+sha256sums=('0e58027d3c10649da61445cdd5205e31c4d1aa0b63f4911de3db4e7052d7bbfb')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"