Sat Oct 27 01:51:01 PDT 2012

7 files changed, 29 insertions, 43 deletions

diff --git a/extra/cabal-install/PKGBUILD b/extra/cabal-install/PKGBUILD
index 13bbc4a74..2a091f21f 100644
--- a/extra/cabal-install/PKGBUILD
+++ b/extra/cabal-install/PKGBUILD
@@ -3,24 +3,20 @@
 # Contributor: Arch Haskell Team <arch-haskell@haskell.org>
 
 pkgname=cabal-install
-pkgver=1.16.0
-pkgrel=2
+pkgver=1.16.0.1
+pkgrel=1
 pkgdesc="The command-line interface for Cabal and Hackage."
 url="http://hackage.haskell.org/package/cabal-install"
 license=('custom:BSD3')
 arch=('i686' 'x86_64')
 makedepends=('haskell-http=4000.2.4-1' 'haskell-zlib=0.5.3.3-5' 'haskell-mtl=2.1.2-1' 'haskell-network=2.3.1.0-1' 'haskell-random=1.0.1.1-3')
 depends=('ghc' 'gmp' 'zlib')
-source=("http://hackage.haskell.org/packages/archive/cabal-install/${pkgver}/cabal-install-${pkgver}.tar.gz"
-        '0001-disable-setting-jobs-due-to-cabal-1.16.0-bug-shipped.patch')
-md5sums=('da046116eee7664158411fa9e2cf6b14'
-         'd4705a398588efe6dbbcf6f4c3185a7d')
+source=("http://hackage.haskell.org/packages/archive/cabal-install/${pkgver}/cabal-install-${pkgver}.tar.gz")
+md5sums=('fdd184a8e097dd4dda8a8d9083b82280')
 
 build() {
   cd cabal-install-${pkgver}
 
-  patch -Np1 -i ${srcdir}/0001-disable-setting-jobs-due-to-cabal-1.16.0-bug-shipped.patch
-
   runhaskell Setup configure \
     --enable-shared \
     --enable-split-objs \
diff --git a/extra/kdesdk/PKGBUILD b/extra/kdesdk/PKGBUILD
index 5fdc3e240..8844f309a 100644
--- a/extra/kdesdk/PKGBUILD
+++ b/extra/kdesdk/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 167846 2012-10-03 14:47:10Z andrea $
+# $Id: PKGBUILD 169699 2012-10-26 08:57:54Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: Pierre Schmitz <pierre@archlinux.de>
 
@@ -21,7 +21,7 @@ pkgname=('kdesdk-cervisia'
          'kdesdk-strigi-analyzer'
          'kdesdk-umbrello')
 pkgver=4.9.2
-pkgrel=1
+pkgrel=2
 arch=('i686' 'x86_64')
 url='http://www.kde.org'
 license=('GPL' 'LGPL' 'FDL')
@@ -167,7 +167,7 @@ package_kdesdk-kuiviewer() {
 
 package_kdesdk-lokalize() {
 	pkgdesc='Computer-Aided Translation System'
-	depends=('kdebase-runtime' 'kdebindings-python2')
+	depends=('kdebase-runtime' 'kdebindings-python2' 'kdesdk-strigi-analyzer')
 	url="http://kde.org/applications/development/lokalize/"
 	optdepends=('translate-toolkit: enable extra python script')
 	install='kdesdk-lokalize.install'
diff --git a/extra/kdevelop-pg-qt/PKGBUILD b/extra/kdevelop-pg-qt/PKGBUILD
index 496b2d67a..0a65a0113 100644
--- a/extra/kdevelop-pg-qt/PKGBUILD
+++ b/extra/kdevelop-pg-qt/PKGBUILD
@@ -1,20 +1,19 @@
-# $Id: PKGBUILD 151356 2012-02-25 16:59:11Z andrea $
+# $Id: PKGBUILD 169711 2012-10-27 00:50:02Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdevelop-pg-qt
 pkgver=1.0.0
-pkgrel=1
+pkgrel=2
 pkgdesc="KDevelop Parser Generator, a LL(1) parser generator used by KDevelop language plugins"
 arch=('i686' 'x86_64')
 url="http://www.kdevelop.org/"
 license=('GPL')
-depends=('kdevelop')
+depends=('kdelibs')
 makedepends=('cmake' 'automoc4')
 source=("http://download.kde.org/stable/${pkgname}/${pkgver}/src/${pkgname}-${pkgver}.tar.bz2")
 sha1sums=('468bc91c5be16061dc265e9471f75462b32b73d5')
 
 build() {
-  cd ${srcdir}
   mkdir build
   cd build 
   cmake ../${pkgname}-${pkgver} \
@@ -24,6 +23,6 @@ build() {
 }
 
 package() {
-  cd ${srcdir}/build
-  make DESTDIR=${pkgdir} install
+  cd build
+  make DESTDIR="${pkgdir}" install
 }
diff --git a/extra/kdevelop-php/PKGBUILD b/extra/kdevelop-php/PKGBUILD
index 2be8a6b1e..246fb010b 100644
--- a/extra/kdevelop-php/PKGBUILD
+++ b/extra/kdevelop-php/PKGBUILD
@@ -1,16 +1,16 @@
-# $Id: PKGBUILD 169575 2012-10-23 17:21:32Z andrea $
+# $Id: PKGBUILD 169709 2012-10-27 00:39:03Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdevelop-php
 pkgver=1.4.0
 _pkgver=4.4.0
-pkgrel=1
+pkgrel=2
 pkgdesc="PHP language and documentation plugin for KDevelop/Quanta"
 arch=('i686' 'x86_64')
 url="http://www.kdevelop.org/"
 license=('GPL')
-depends=('kdevelop-pg-qt')
-makedepends=('cmake' 'automoc4')
+depends=('kdevelop')
+makedepends=('cmake' 'automoc4' 'kdevelop-pg-qt')
 replaces=('kdevelop-php-docs')
 conflicts=('kdevelop-php-docs')
 source=(http://download.kde.org/stable/kdevelop/${_pkgver}/src/${pkgname}-{,docs-}${pkgver}.tar.bz2)
diff --git a/extra/leveldb/PKGBUILD b/extra/leveldb/PKGBUILD
index 23b59b1da..532c3c98f 100644
--- a/extra/leveldb/PKGBUILD
+++ b/extra/leveldb/PKGBUILD
@@ -1,17 +1,17 @@
-# $Id: PKGBUILD 166942 2012-09-22 20:23:58Z dreisner $
+# $Id: PKGBUILD 169703 2012-10-26 19:01:07Z dreisner $
 # Maintainer: Dave Reisner <dreisner@archlinux.org>
 # Contributor: feydaykyn <feydaykyn@yahoo.fr>
 
 pkgname=leveldb
-pkgver=1.5.0
-pkgrel=4
+pkgver=1.7.0
+pkgrel=1
 pkgdesc="A fast and lightweight key/value database library"
 arch=('i686' 'x86_64')
 url="https://code.google.com/p/leveldb/"
 license=('BSD')
 depends=('gperftools' 'snappy')
 source=("https://leveldb.googlecode.com/files/$pkgname-$pkgver.tar.gz")
-sha1sums=('b5b45ff74065f242c37f465b13dafb925972ca43')
+sha1sums=('82332ac97d48ad5da02aab4785658c06d0351be1')
 
 build() {
   # buildsys doesn't play nicely with -Wl,--as-needed
@@ -32,7 +32,7 @@ package() {
       "$pkgdir"/usr/share/doc/"$pkgname"
 
   # libraries
-  install -m755 -t "$pkgdir/usr/lib" libleveldb.so.1.5 libleveldb.a
+  install -m755 -t "$pkgdir/usr/lib" "libleveldb.so.${pkgver%.?*}" libleveldb.a
   cp -P libleveldb.so{,.1} "$pkgdir/usr/lib"
 
   # headers
diff --git a/extra/oprofile/PKGBUILD b/extra/oprofile/PKGBUILD
index 191577647..7d11b2ff5 100644
--- a/extra/oprofile/PKGBUILD
+++ b/extra/oprofile/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 163607 2012-07-16 23:59:16Z eric $
+# $Id: PKGBUILD 169713 2012-10-27 01:52:54Z stephane $
 # Maintainer : Aaron Griffin <aaron@archlinux.org>
 
 pkgname=oprofile
-pkgver=0.9.7
-pkgrel=4
+pkgver=0.9.8
+pkgrel=1
 pkgdesc="A system-wide profiler for Linux systems, capable of profiling all running code at low overhead"
 arch=('i686' 'x86_64')
 url="http://oprofile.sourceforge.net"
@@ -14,7 +14,7 @@ optdepends=('qt: for oprof_start gui')
 options=('!libtool')
 install=oprofile.install
 source=(http://downloads.sourceforge.net/sourceforge/$pkgname/$pkgname-$pkgver.tar.gz)
-sha1sums=('f5befd8aafc77d449e955f0585216f5d7b967de2')
+sha1sums=('28416b853641f913e5f90954f2e3837efd96f6cd')
 
 build() {
   cd "$srcdir/$pkgname-$pkgver"
diff --git a/extra/wget/PKGBUILD b/extra/wget/PKGBUILD
index 87f617417..9b1244031 100644
--- a/extra/wget/PKGBUILD
+++ b/extra/wget/PKGBUILD
@@ -1,15 +1,15 @@
-# $Id: PKGBUILD 165091 2012-08-10 09:03:30Z allan $
+# $Id: PKGBUILD 169712 2012-10-27 01:52:51Z stephane $
 # Maintainer: Allan McRae <allan@archlinux.org>
 # Contributor: Judd Vinet <jvinet@zeroflux.org>
 
 pkgname=wget
 pkgver=1.14
-pkgrel=1
+pkgrel=2
 pkgdesc="A network utility to retrieve files from the Web"
 arch=('i686' 'x86_64')
 url="http://www.gnu.org/software/wget/wget.html"
 license=('GPL3')
-depends=('glibc' 'openssl')
+depends=('openssl' 'libidn' 'pcre' 'util-linux')
 optdepends=('ca-certificates: HTTPS downloads')
 backup=('etc/wgetrc')
 install=wget.install
@@ -20,12 +20,7 @@ md5sums=('316f6f59292c9098ad81fd54f658c579'
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
 
-  # Note : We do not build with --enable-nls, because there is a bug in wget causing
-  # international domain names to be not properly converted to punycode if
-  # the current locale is a UTF-8 one
-  # See : http://lists.gnu.org/archive/html/bug-wget/2011-02/msg00026.html
-
-  ./configure -with-ssl=openssl --prefix=/usr --sysconfdir=/etc
+  ./configure -with-ssl=openssl --prefix=/usr --sysconfdir=/etc --enable-nls
   make
 }
 
@@ -38,8 +33,4 @@ package() {
 # default root certs location
 ca_certificate=/etc/ssl/certs/ca-certificates.crt
 EOF
-
-  # remove IRI option from wgetrc as it does not work (see above)
-  sed -i '118,120d' $pkgdir/etc/wgetrc
-
 }