Fri Dec 23 23:14:44 UTC 2011

7 files changed, 79 insertions, 40 deletions

diff --git a/extra/live-media/PKGBUILD b/extra/live-media/PKGBUILD
index 8860ea752..4c7532cfb 100644
--- a/extra/live-media/PKGBUILD
+++ b/extra/live-media/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 144603 2011-12-07 21:23:41Z giovanni $
+# $Id: PKGBUILD 145447 2011-12-22 13:02:48Z giovanni $
 # Maintainer: Giovanni Scafora <giovanni@archlinux.org>
 # Contributor: Gilles CHAUVIN <gcnweb@gmail.com>
 
 pkgname=live-media
-pkgver=2011.12.02
+pkgver=2011.12.20
 pkgrel=1
 pkgdesc="A set of C++ libraries for multimedia streaming"
 arch=('i686' 'x86_64')
@@ -11,7 +11,7 @@ license=('LGPL')
 url="http://live555.com/liveMedia"
 depends=('gcc-libs')
 source=("http://live555.com/liveMedia/public/live.${pkgver}.tar.gz")
-md5sums=('4f10d93d33f6714a980fd1655ead69cd')
+md5sums=('1bcbd2e45149c0d918c63df8f6d7d0e0')
 
 build() {
   cd ${srcdir}/live
diff --git a/extra/phonon/PKGBUILD b/extra/phonon/PKGBUILD
index e2099cc99..ac5f39602 100644
--- a/extra/phonon/PKGBUILD
+++ b/extra/phonon/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 145248 2011-12-20 07:59:43Z andrea $
+# $Id: PKGBUILD 145472 2011-12-22 22:17:38Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=phonon
@@ -11,7 +11,7 @@ license=('LGPL')
 pkgdesc="The multimedia framework for KDE"
 depends=('qt' 'phonon-backend' 'libpulse' 'libqzeitgeist')
 optdepends=('pulseaudio: PulseAudio support')
-makedepends=('cmake' 'automoc4' 'pulseaudio')
+makedepends=('cmake' 'automoc4' 'pulseaudio' 'qtwebkit')
 source=("http://download.kde.org/stable/${pkgname}/${pkgver}/src/${pkgname}-${pkgver}.tar.xz")
 md5sums=('bbe0c1c62ed14c31479c4c1a6cf1e173')
 
@@ -22,7 +22,7 @@ build() {
   cmake ../${pkgname}-${pkgver} \
     -DCMAKE_BUILD_TYPE=Release \
     -DCMAKE_SKIP_RPATH=ON \
-    -DCMAKE_INSTALL_PREFIX=/usr \
+    -DCMAKE_INSTALL_PREFIX=/usr
     -DPHONON_QT_MKSPECS_INSTALL_DIR=/usr/share/qt/mkspecs/modules \
     -DPHONON_QT_PLUGIN_INSTALL_DIR=/usr/lib/qt/plugins/designer
   make
diff --git a/extra/python-markupsafe/PKGBUILD b/extra/python-markupsafe/PKGBUILD
index 4fba8e363..68dbabc7e 100644
--- a/extra/python-markupsafe/PKGBUILD
+++ b/extra/python-markupsafe/PKGBUILD
@@ -1,22 +1,41 @@
-# $Id: PKGBUILD 113450 2011-03-08 17:36:15Z ibiru $
+# $Id: PKGBUILD 145461 2011-12-22 18:14:12Z ibiru $
 # Maintainer : Ionut Biru <ibiru@archlinux.org>
 # Contributor: Alex Anthony <alex.anthony28991@gmail.com>
 
-pkgname=python-markupsafe
-pkgver=0.12
-pkgrel=0
+pkgname=('python-markupsafe' 'python2-markupsafe')
+pkgver=0.15
+pkgrel=1
 pkgdesc="Implements a XML/HTML/XHTML Markup safe string for Python"
 arch=('i686' 'x86_64')
 url="http://pypi.python.org/pypi/MarkupSafe"
 license=('custom')
-depends=('python2')
-makedepends=('setuptools')
-source=(http://pypi.python.org/packages/source/M/MarkupSafe/MarkupSafe-${pkgver}.tar.gz)
-md5sums=('edd4b6950f6d4ddc6e23fa322f8f0f53')
+makedepends=('python-distribute' 'python2-distribute')
+source=("http://pypi.python.org/packages/source/M/MarkupSafe/MarkupSafe-${pkgver}.tar.gz")
+md5sums=('4e7c4d965fe5e033fa2d7bb7746bb186')
 
 build() {
+  cp -r MarkupSafe-${pkgver} python2-MarkupSafe-${pkgver}
   cd ${srcdir}/MarkupSafe-${pkgver}
+  python setup.py build
+
+  cd ${srcdir}/python2-MarkupSafe-${pkgver}
+  python2 setup.py build
+}
+
+package_python-markupsafe() {
+  depends=('python')
+
+  cd ${srcdir}/MarkupSafe-${pkgver}
+  python setup.py install --root=${pkgdir} --optimize=1
+
+  install -D -m644 LICENSE ${pkgdir}/usr/share/licenses/python-markupsafe/LICENSE
+}
+
+package_python2-markupsafe() {
+  depends=('python2')
+
+  cd ${srcdir}/python2-MarkupSafe-${pkgver}
   python2 setup.py install --root=${pkgdir} --optimize=1
 
-  install -D -m644 LICENSE ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE
+  install -D -m644 LICENSE ${pkgdir}/usr/share/licenses/python2-markupsafe/LICENSE
 }
diff --git a/extra/python-urwid/PKGBUILD b/extra/python-urwid/PKGBUILD
index c15be07c8..62d10dd84 100644
--- a/extra/python-urwid/PKGBUILD
+++ b/extra/python-urwid/PKGBUILD
@@ -3,21 +3,40 @@
 # Maintainer: Sergej Pupykin <sergej@aur.archlinux.org>
 # Maintainer: Douglas Soares de Andrade <dsandrade@gmail.com>
 
-pkgname=python-urwid
-pkgver=0.9.9.2
+pkgname=('python-urwid' 'python2-urwid')
+pkgver=1.0.1
 pkgrel=1
 pkgdesc="Urwid is a curses-based user interface library."
 license=('GPL')
 arch=('i686' 'x86_64')
-depends=('python2')
+makedepends=('python2-distribute' 'python-distribute')
 url="http://excess.org/urwid/"
 source=(http://excess.org/urwid/urwid-$pkgver.tar.gz)
-md5sums=('e58b86a983fe5474a07749501748b728')
+md5sums=('828f7144b94920205e755c249d2e297f')
 
 build() {
-  cd $startdir/src/urwid-$pkgver
+  cp -r urwid-$pkgver python2-urwid-$pkgver
+
+  cd $srcdir/urwid-$pkgver
+  python setup.py build
+
+  cd $srcdir/python2-urwid-$pkgver
   sed -i 's#bin/python#bin/python2#' urwid/*.py
-  python2 setup.py install --prefix=/usr --root=$startdir/pkg || return 1
+  
+  python2 setup.py build
+}
+
+package_python-urwid() {
+  depends=('python')
 
-  rm -rf $startdir/src/$_hgname-build
+  cd $srcdir/urwid-$pkgver
+  python setup.py install --prefix=/usr --root=$pkgdir --optimize=1
 }
+
+package_python2-urwid() {
+  depends=('python2')
+ 
+  cd $srcdir/python2-urwid-$pkgver
+  python2 setup.py install --prefix=/usr --root=$pkgdir --optimize=1
+}
+
diff --git a/extra/qtwebkit/PKGBUILD b/extra/qtwebkit/PKGBUILD
index 6bc242b15..84a006909 100644
--- a/extra/qtwebkit/PKGBUILD
+++ b/extra/qtwebkit/PKGBUILD
@@ -1,19 +1,20 @@
-# $Id: PKGBUILD 145321 2011-12-21 20:46:56Z andrea $
+# $Id: PKGBUILD 145469 2011-12-22 22:02:51Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=qtwebkit
-pkgver=2.2.0
-pkgrel=3
+pkgver=2.2.1
+pkgrel=1
 arch=('i686' 'x86_64')
 url='http://trac.webkit.org/wiki/QtWebKit'
 pkgdesc='An open source web browser engine (Qt port)'
 license=('LGPL2.1' 'GPL3')
-depends=('qt' 'gperf' 'bison' 'phonon' 'gstreamer0.10-base')
+depends=('qt' 'gperf' 'bison' 'gstreamer0.10-base')
 makedepends=('python2' 'mesa' 'chrpath')
 conflicts=('qt<4.8')
-source=("http://get.qt.nokia.com/${pkgname}/QtWebKit-${pkgver}.tar.gz"
+#source=("http://get.qt.nokia.com/${pkgname}/QtWebKit-${pkgver}.tar.gz"
+source=("ftp://ftp.archlinux.org/other/${pkgname}/QtWebKit-${pkgver}.tar.gz"
         'python2-path.patch')
-sha1sums=('3582f3a8b593140af004a19479f5ec19693b3df7'
+sha1sums=('283fc116882157df0474af496be73bb9b34cb001'
           'b0ef3d5596171e3900a685df9bcfac3068ad6330')
 
 build() {
diff --git a/extra/rhythmbox/PKGBUILD b/extra/rhythmbox/PKGBUILD
index e7e91d452..d97e0dd38 100644
--- a/extra/rhythmbox/PKGBUILD
+++ b/extra/rhythmbox/PKGBUILD
@@ -1,16 +1,16 @@
-# $Id: PKGBUILD 139425 2011-10-01 19:01:11Z ibiru $
+# $Id: PKGBUILD 145457 2011-12-22 17:55:49Z ibiru $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 # Contributor: Giovanni Scafora <giovanni@archlinux.org>
 
 pkgname=rhythmbox
-pkgver=2.90.1.git20110928
+pkgver=2.90.1.git20111222
 pkgrel=1
-pkgdesc="An iTunes-like music player/libary"
+pkgdesc="An iTunes-like music playback and management application"
 arch=('i686' 'x86_64')
 license=('GPL')
 url="http://www.rhythmbox.org"
 depends=('libgpod' 'gvfs-afc' 'totem-plparser' 'libmusicbrainz3' 'libmtp' 'lirc-utils' 'libwebkit3' 'libdmapsharing' 'media-player-info' 'python2-gobject'
-         'python-gnomekeyring' 'gstreamer0.10-base-plugins' 'gstreamer0.10-good-plugins' 'json-glib' 'desktop-file-utils' 'libpeas' 'python-mako' 'grilo' 'dconf')
+         'python-gnomekeyring' 'gstreamer0.10-base-plugins' 'gstreamer0.10-good-plugins' 'json-glib' 'desktop-file-utils' 'libpeas' 'python2-mako' 'grilo' 'dconf' 'libnotify')
 makedepends=('pkgconfig' 'gnome-doc-utils>=0.20.1' 'intltool' 'brasero' 'gnome-common' 'gtk-doc' 'gobject-introspection')
 optdepends=('gstreamer0.10-ugly-plugins: Extra media codecs'
             'gstreamer0.10-bad-plugins: Extra media codecs'
@@ -19,11 +19,11 @@ optdepends=('gstreamer0.10-ugly-plugins: Extra media codecs'
 options=('!libtool' '!emptydirs' '!strip')
 install=rhythmbox.install
 #source=(http://ftp.gnome.org/pub/GNOME/sources/${pkgname}/0.13/${pkgname}-${pkgver}.tar.bz2)
-source=(ftp://ftp.archlinux.org/other/${pkgname}/${pkgname}-${pkgver}.tar.xz)
-sha256sums=('b95b2aed0cd485198fbefdcb8dbf2a1ca3d4eb7d31b1e02d610fb16384191e8a')
+source=(ftp://ftp.archlinux.org/other/$pkgname/$pkgname-$pkgver.tar.xz)
+sha256sums=('06cb3dda1871060c192e32c7f8237c046d120946a3647ebe2041695bce90a839')
 
 build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
+  cd "$srcdir/$pkgname-$pkgver"
   export CFLAGS="$CFLAGS -g -O1"
   export CXXFLAGS="$CXXFLAGS -g -O1"
   PYTHON=/usr/bin/python2 ./autogen.sh
@@ -36,7 +36,7 @@ build() {
 }
 
 package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
+  cd "$srcdir/$pkgname-$pkgver"
 
-  make DESTDIR="${pkgdir}" install
+  make DESTDIR="$pkgdir" install
 }
diff --git a/extra/xulrunner/PKGBUILD b/extra/xulrunner/PKGBUILD
index 616bba0aa..d0448db77 100644
--- a/extra/xulrunner/PKGBUILD
+++ b/extra/xulrunner/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 145292 2011-12-21 10:20:13Z ibiru $
+# $Id: PKGBUILD 145467 2011-12-22 20:32:10Z ibiru $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 # Contributor: Alexander Baldeck <alexander@archlinux.org>
 pkgname=xulrunner
-pkgver=9.0
+pkgver=9.0.1
 pkgrel=1
 pkgdesc="Mozilla Runtime Environment"
 arch=('i686' 'x86_64')
@@ -15,7 +15,7 @@ source=(ftp://ftp.mozilla.org/pub/mozilla.org/firefox/releases//$pkgver/source/f
         mozilla-pkgconfig.patch)
 options=('!emptydirs')
 replaces=('xulrunner-oss')
-md5sums=('d8d0c8c79660752b02d9e9ab69a68f94'
+md5sums=('7cf2bd379792a9b232267c6a79680566'
          '8dfb78c5bd0581c8cf4753813132bf0b'
          '27271ce647a83906ef7a24605e840d61')