Fri Oct 5 01:33:01 PDT 2012

16 files changed, 170 insertions, 96 deletions

diff --git a/extra/enlightenment/PKGBUILD b/extra/enlightenment/PKGBUILD
index ff784f835..3e41ead74 100644
--- a/extra/enlightenment/PKGBUILD
+++ b/extra/enlightenment/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 149104 2012-02-05 18:10:13Z schiv $
+# $Id: PKGBUILD 167950 2012-10-04 04:38:27Z eric $
 # Maintainer: Eric Bélanger <eric@archlinux.org>
 
 pkgname=enlightenment
-pkgver=1.0.10
+pkgver=1.0.11
 _themever=1.0.1
-pkgrel=2
+pkgrel=1
 pkgdesc="A fast, flexible, and very extensible Window Manager"
 arch=('i686' 'x86_64')
 url="http://www.enlightenment.org"
@@ -14,7 +14,7 @@ depends=('libxinerama' 'imlib2' 'perl' 'pango' 'libxcomposite' \
 options=('!libtool')
 source=(http://downloads.sourceforge.net/sourceforge/${pkgname}/e16-${pkgver}.tar.gz \
         http://downloads.sourceforge.net/enlightenment/e16-themes-${_themever}.tar.gz)
-sha1sums=('20e56c851aeb5279479eb43570b5d58bcc1d6ef9'
+sha1sums=('146028c39b3148fdd3e247dfb29ef8ec6b9cf10d'
           'ae34e2df1294198795736bf953bf695aba93b710')
 
 build() {
diff --git a/extra/epplet-base/PKGBUILD b/extra/epplet-base/PKGBUILD
index 4daecec04..a0a6d48f1 100644
--- a/extra/epplet-base/PKGBUILD
+++ b/extra/epplet-base/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 134351 2011-08-03 02:24:23Z eric $
+# $Id: PKGBUILD 167952 2012-10-04 04:50:04Z eric $
 # Maintainer: Eric Bélanger <eric@archlinux.org>
 
 pkgname=epplet-base
-pkgver=0.13
-pkgrel=2
+pkgver=0.14
+pkgrel=1
 pkgdesc="Addon plugins for the enlightenment windowmanager"
 arch=('i686' 'x86_64')
 url="http://www.enlightenment.org"
@@ -12,8 +12,7 @@ depends=('imlib2' 'libcdaudio' 'libgl')
 makedepends=('mesa')
 options=('!libtool')
 source=(http://downloads.sourceforge.net/sourceforge/enlightenment/epplets-${pkgver}.tar.gz)
-md5sums=('6304130e5741b626c27b6b0cf7ae58e0')
-sha1sums=('8af41829e5993a992c31f6285122edce6b60475a')
+sha1sums=('ddecad7c22771bc50565f76c36ae334f952388aa')
 
 build() {
   cd "${srcdir}/epplets-${pkgver}"
diff --git a/extra/libreoffice/PKGBUILD b/extra/libreoffice/PKGBUILD
index e53c4c31d..2e6c051f7 100644
--- a/extra/libreoffice/PKGBUILD
+++ b/extra/libreoffice/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 166171 2012-09-05 06:03:48Z andyrtr $
+# $Id: PKGBUILD 167978 2012-10-04 14:32:20Z andyrtr $
 # Maintainer: AndyRTR <andyrtr@archlinux.org>
 
 pkgbase="libreoffice"
@@ -23,10 +23,10 @@ pkgname=('libreoffice-common'
 	'libreoffice-scripting-javascript'
 	'libreoffice-extension-scripting-python'
 	'libreoffice-extension-wiki-publisher'
-	'libreoffice-extension-nlpsolver') # svn up -r 142692 (last one with all extensions built
-_LOver=3.6.1.2
-pkgver=3.6.1
-pkgrel=4
+	'libreoffice-extension-nlpsolver') # svn up -r 142692 (last one with all extensions built)
+_LOver=3.6.2.2
+pkgver=3.6.2
+pkgrel=1
 arch=('i686' 'x86_64')
 license=('LGPL3')
 url="http://www.libreoffice.org/"
@@ -35,7 +35,6 @@ makedepends=( # makedepends
              'apache-ant' 'gperf' 'poppler>=0.18.0' 'kdelibs' 'gconf' 'cppunit'
              'beanshell'  'vigra' 'clucene' 'junit' 'libmythes' 'libwpg' 'imagemagick'
              'mesa' 'gstreamer0.10-base' 'java-environment' 'postgresql-libs' 'doxygen' 'clucene'
-              #'saxon' - currently broken 
              # the runtime dependencies
              "curl>=7.20.0" "hunspell>=1.2.8" "python2>=2.7" 'libwpd>=0.9.2' 'libwps' 'libxaw' "neon>=0.28.6"
              'pango' 'nspr' 'libjpeg' 'libxrandr' 'libgl' 'dbus-glib' 'libxslt' 'librsvg' "icu>=49.1" 
@@ -81,8 +80,8 @@ source=(${_mirror}/${pkgbase}-{core,help,translations}-${_LOver}.tar.xz
 	${_additional_source_url}/0d2dcdfbf28d6208751b33057f5361f0-libcmis-0.2.3.tar.gz
 	${_additional_source_url}/ce5a1def34578b75959ac31210f031f6-libcdr-0.0.8.tar.bz2
 	${_additional_source_url2}/185d60944ea767075d27247c3162b3bc-unowinreg.dll
+	make-pyuno-work-with-system-wide-module-install.diff
 	buildfix.diff
-	git_fixes.diff
 	libreoffice-common.sh libreoffice-common.csh)
 noextract=(94e7f271e38c976462558b4278590178-libvisio-0.0.19.tar.bz2
 	18f577b374d60b3c760a3a3350407632-STLport-4.5.tar.gz
@@ -114,9 +113,9 @@ noextract=(94e7f271e38c976462558b4278590178-libvisio-0.0.19.tar.bz2
 	db60e4fde8dd6d6807523deb71ee34dc-liblayout-0.2.10.zip
 	ce5a1def34578b75959ac31210f031f6-libcdr-0.0.8.tar.bz2
 	ba2930200c9f019c2d93a8c88c651a0f-flow-engine-0.9.4.zip)
-md5sums=('3ddcf145b74daa4361e48dafe97e7d21'
-         '7966e66099729d23d9ee594f526a50ed'
-         '2555590c1b4395857fc5c469f7f1bd0c'
+md5sums=('ae171ba4633cc72dba4451b1bdd3385e'
+         'cdad0734d247d91a79cb282fd851d2a7'
+         'e9a7e3d35432b72a4603ce094deb6a67'
          '18f577b374d60b3c760a3a3350407632'
          'f02578f5218f217a9f20e9c30e119c6a'
          '94e7f271e38c976462558b4278590178'
@@ -147,8 +146,8 @@ md5sums=('3ddcf145b74daa4361e48dafe97e7d21'
          '0d2dcdfbf28d6208751b33057f5361f0'
          'ce5a1def34578b75959ac31210f031f6'
          '185d60944ea767075d27247c3162b3bc'
+         '97bf43dda273d79ff90c848ab53b0e3c'
          '234e91ac65945ce1ab1e3839780e90f7'
-         '2445aca137bdbf0cf7526e91f768a1d0'
          'abcb1b0a7deaffe13ab3d7ca70becb49'
          '72790a4103da259a55cadd66db931d00')
 
@@ -171,8 +170,10 @@ build() {
 	ln -s ../libreoffice-translations-$_LOver/translations .
 
 	# buildfixes & bugfixes
-    patch -Np1 -i ${srcdir}/buildfix.diff
-    patch -Np1 -i ${srcdir}/git_fixes.diff
+    patch -Np1 -i ${srcdir}/buildfix.diff	# leaves out a broken pdfimport test
+    
+    # fix not upstreamable pyuno paths - patch taken from Debian
+    patch -Np1 -i ${srcdir}/make-pyuno-work-with-system-wide-module-install.diff
     
 	#use the CFLAGS but remove the LibO overridden ones
 	for i in $CFLAGS; do
@@ -266,7 +267,7 @@ build() {
 	make
 	# fake installation to create split file lists
 	mkdir $srcdir/fakeinstall
-	make DESTDIR=${srcdir}/fakeinstall distro-pack-install
+	make DESTDIR=${srcdir}/fakeinstall distro-pack-install # -o build -o check
 }
 
 #check() {
@@ -281,7 +282,6 @@ package_libreoffice-common() {
  depends=('libreoffice-langpack' "hunspell>=1.2.8" "python2>=2.7" "neon>=0.28.6"
           'nspr' 'libsm' 'redland' 'hyphen' 'graphite' "icu>=49.1" 'clucene' 'lcms2'
           'hicolor-icon-theme' 'desktop-file-utils' 'shared-mime-info' 'xdg-utils' 'orbit2')
-          #'saxon'
  optdepends=('libreoffice-langpack: additional language support'
              'java-runtime:     adds java support'
              'libcups:          adds printing support'
@@ -373,27 +373,22 @@ package_libreoffice-postgresql-connector() {
  groups=('libreoffice')
  replaces=('libreoffice')
 
- # no file-list so far
- install -dm755 ${pkgdir}/usr/lib/libreoffice/program/services
- install -m644 ${srcdir}/fakeinstall/usr/lib/libreoffice/program/postgresql-sdbc.uno.so ${pkgdir}/usr/lib/libreoffice/program
- install -m644 ${srcdir}/fakeinstall/usr/lib/libreoffice/program/postgresql-sdbc-impl.uno.so ${pkgdir}/usr/lib/libreoffice/program
- install -m644 ${srcdir}/fakeinstall/usr/lib/libreoffice/program/postgresql-sdbc.ini ${pkgdir}/usr/lib/libreoffice/program
- install -m644 ${srcdir}/fakeinstall/usr/lib/libreoffice/program/services/postgresql-sdbc.rdb ${pkgdir}/usr/lib/libreoffice/program/services
- install -dm755 ${pkgdir}/usr/lib/libreoffice/share/registry
- install -m644 ${srcdir}/fakeinstall/usr/lib/libreoffice/share/registry/postgresqlsdbc.xcd ${pkgdir}/usr/lib/libreoffice/share/registry
+ # workaround double entries in the file list
+ mv ${srcdir}/libreoffice-core-$_LOver/file-lists/postgresql_list.txt ${srcdir}/libreoffice-core-$_LOver/file-lists/postgresql_list.txt.orig
+ sort ${srcdir}/libreoffice-core-$_LOver/file-lists/postgresql_list.txt.orig | uniq 1>& ${srcdir}/libreoffice-core-$_LOver/file-lists/postgresql_list.txt
  
  # create directories from *list.txt file
-# for directory in `grep ^%dir ${srcdir}/libreoffice-core-$_LOver/file-lists/postgresql_list.txt`; do
-#   install -dm755 ${pkgdir}/${directory/\%dir/}
-# done
+ for directory in `grep ^%dir ${srcdir}/libreoffice-core-$_LOver/file-lists/postgresql_list.txt`; do
+   install -dm755 ${pkgdir}/${directory/\%dir/}
+ done
  # install files into the pkg from fakeinstall dir
-# for file in `grep -v ^%dir $srcdir/libreoffice-core-$_LOver/file-lists/postgresql_list.txt`; do
-#   dirname=`dirname $file`
+ for file in `grep -v ^%dir $srcdir/libreoffice-core-$_LOver/file-lists/postgresql_list.txt`; do
+   dirname=`dirname $file`
    # check if directory has been already been created - some are missing like manpages
-#   [ -d ${pkgdir}/$dirname ] || install -dm755 ${pkgdir}/$dirname
+   [ -d ${pkgdir}/$dirname ] || install -dm755 ${pkgdir}/$dirname
    # mv file from fakeinstall to pkgdir
-#   mv ${srcdir}/fakeinstall${file} ${pkgdir}$file
-# done
+   mv ${srcdir}/fakeinstall${file} ${pkgdir}$file
+ done
 }
 
 package_libreoffice-calc() {
@@ -550,7 +545,6 @@ package_libreoffice-sdk() {
  done
  
   # fix environment path to keep compatibility with openjdk6 and openjdk7
-  #sed -i -e "s:\/usr\/lib\/jvm\/java-7-openjdk:\$J2SDKDIR:"          /usr/lib/libreoffice/sdk/setsdkenv_unix.{sh,csh}
   sed -i -e "s:\/usr\/lib\/jvm\/java-7-openjdk:\$J2SDKDIR:" ${pkgdir}/usr/lib/libreoffice/sdk/setsdkenv_unix.{sh,csh}
 }
 
diff --git a/extra/libreoffice/make-pyuno-work-with-system-wide-module-install.diff b/extra/libreoffice/make-pyuno-work-with-system-wide-module-install.diff
new file mode 100644
index 000000000..e86548136
--- /dev/null
+++ b/extra/libreoffice/make-pyuno-work-with-system-wide-module-install.diff
@@ -0,0 +1,44 @@
+diff --git a/desktop/scripts/soffice.sh b/desktop/scripts/soffice.sh
+index defd7b2..ea2a809 100755
+--- a/desktop/scripts/soffice.sh
++++ b/desktop/scripts/soffice.sh
+@@ -128,6 +128,9 @@ if echo "$checks" | grep -q "cc" ; then
+     exit 1;
+ fi
+ 
++PYTHONPATH=$sd_prog${PYTHONPATH+:$PYTHONPATH}
++export PYTHONPATH
++
+ case "`uname -s`" in
+ NetBSD|OpenBSD|FreeBSD|DragonFly)
+ # this is a temporary hack until we can live with the default search paths
+diff --git a/pyuno/source/module/uno.py b/pyuno/source/module/uno.py
+index f93ac5e..92a2891 100644
+--- a/pyuno/source/module/uno.py
++++ b/pyuno/source/module/uno.py
+@@ -26,8 +26,12 @@
+ # for a copy of the LGPLv3 License.
+ #
+ #*************************************************************************
++import os
+ import sys
+ 
++sys.path.append('/usr/lib/libreoffice/program')
++if getattr(os.environ, 'URE_BOOTSTRAP', None) is None:
++     os.environ['URE_BOOTSTRAP'] = "vnd.sun.star.pathname:/usr/lib/libreoffice/program/fundamentalrc"
+ import pyuno
+ 
+ try:
+diff --git a/scripting/source/pyprov/officehelper.py b/scripting/source/pyprov/officehelper.py
+index 610ac5f..df243d0 100755
+--- a/scripting/source/pyprov/officehelper.py
++++ b/scripting/source/pyprov/officehelper.py
+@@ -53,7 +53,7 @@ def bootstrap():
+         if "UNO_PATH" in os.environ:
+             sOffice = os.environ["UNO_PATH"]
+         else:
+-            sOffice = "" # lets hope for the best
++            sOffice = "/usr/lib/libreoffice/program"
+         sOffice = os.path.join(sOffice, "soffice")
+         if platform.startswith("win"): 
+             sOffice += ".exe"
diff --git a/extra/libwebp/PKGBUILD b/extra/libwebp/PKGBUILD
new file mode 100644
index 000000000..8028b0de5
--- /dev/null
+++ b/extra/libwebp/PKGBUILD
@@ -0,0 +1,31 @@
+# $Id: PKGBUILD 167975 2012-10-04 13:31:03Z heftig $
+# Maintainer: Alexander Rødseth <rodseth@gmail.com>
+# Contributor: Jon Nordby <jononor@gmail.com>
+
+pkgname=libwebp
+pkgver=0.2.0
+pkgrel=1
+pkgdesc="WebP library and conversion tools"
+arch=('x86_64' 'i686')
+url="http://code.google.com/intl/en/speed/webp/"
+license=('BSD')
+depends=('libpng' 'libjpeg')
+options=('!libtool')
+source=("http://webp.googlecode.com/files/$pkgname-$pkgver.tar.gz")
+sha256sums=('aa7d5e162826362c79d7c36d41484042ab7460dc08dc33d4ea6823a0c77d4bfb')
+
+build() {
+  cd "$srcdir/$pkgname-$pkgver"
+
+  ./configure --prefix=/usr
+  make
+}
+
+package() {
+  cd "$srcdir/$pkgname-$pkgver"
+
+  make DESTDIR="$pkgdir/" install
+  install -Dm644 COPYING "$pkgdir/usr/share/licenses/$pkgname/COPYING"
+}
+
+# vim:set ts=2 sw=2 et:
diff --git a/extra/live-media/PKGBUILD b/extra/live-media/PKGBUILD
index 0a69ffbc8..62fbf9936 100644
--- a/extra/live-media/PKGBUILD
+++ b/extra/live-media/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 167205 2012-09-27 23:00:52Z giovanni $
+# $Id: PKGBUILD 167982 2012-10-04 16:26:08Z giovanni $
 # Maintainer: Giovanni Scafora <giovanni@archlinux.org>
 # Contributor: Gilles CHAUVIN <gcnweb@gmail.com>
 
 pkgname=live-media
-pkgver=2012.09.27
+pkgver=2012.10.04
 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=('a587166b7830f1be4b829c2bf84ac195')
+md5sums=('6188132efc675f2f6b298b8f5fae6b2f')
 
 build() {
   cd ${srcdir}/live
diff --git a/extra/metalog/PKGBUILD b/extra/metalog/PKGBUILD
index 8dd618cb8..a513b3c66 100644
--- a/extra/metalog/PKGBUILD
+++ b/extra/metalog/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 156093 2012-04-13 11:44:31Z juergen $
+# $Id: PKGBUILD 167973 2012-10-04 13:24:41Z juergen $
 # Maintainer: juergen <juergen@archlinux.org>
 # Contributor: Tom Newsom <Jeepster@gmx.co.uk>
 
 pkgname=metalog
-pkgver=2.0
-pkgrel=2
+pkgver=3.0
+pkgrel=0
 pkgdesc="Metalog is a modern replacement for syslogd and klogd"
 url="http://metalog.sourceforge.net"
 license=('GPL')
@@ -12,21 +12,25 @@ arch=('i686' 'x86_64')
 depends=('pcre')
 provides=('logger')
 backup=('etc/metalog.conf' 'etc/conf.d/metalog')
-source=("http://sourceforge.net/projects/metalog/files/metalog-2.tar.xz/download" 'metalog' 'metalog.confd')
-md5sums=('e948d10d780205eae17645c89aee1361'
+source=("http://sourceforge.net/projects/metalog/files/metalog-3.tar.xz/download" 'metalog' 'metalog.confd'  'metalog.service')
+md5sums=('6fe404e49764fa24108fd090417bacb5'
          '9e73301a7f0be291749ee30638527cb9'
-         '86bccd5a02996921e29eff8a0394d11f')
+         '86bccd5a02996921e29eff8a0394d11f'
+         'f005e6970c25bfdaf0596791e9135f98')
 
 build() {
-  cd $srcdir/$pkgname-2
+  cd $srcdir/$pkgname-3
   ./configure --prefix=/usr --sysconfdir=/etc
   make
 }
 
 package() {
-  cd $srcdir/$pkgname-2
+  cd $srcdir/$pkgname-3
   make DESTDIR=$pkgdir install
   install -D -m755 $srcdir/metalog $pkgdir/etc/rc.d/metalog
   install -D -m644 $srcdir/metalog.confd $pkgdir/etc/conf.d/metalog
   install -D -m644 metalog.conf $pkgdir/etc/metalog.conf
+
+  install -d "${pkgdir}"/usr/lib/systemd/system
+  install -Dm644 "${srcdir}"/metalog.service "${pkgdir}"/usr/lib/systemd/system/
 }
diff --git a/extra/metalog/metalog.service b/extra/metalog/metalog.service
new file mode 100644
index 000000000..5982c8804
--- /dev/null
+++ b/extra/metalog/metalog.service
@@ -0,0 +1,9 @@
+[Unit]
+Description=System Logger Daemon
+
+[Service]
+ExecStart=/usr/sbin/metalog
+
+[Install]
+WantedBy=multi-user.target
+Alias=syslog.service
diff --git a/extra/oxygen-gtk2/PKGBUILD b/extra/oxygen-gtk2/PKGBUILD
index 78605e7eb..ef3734a86 100644
--- a/extra/oxygen-gtk2/PKGBUILD
+++ b/extra/oxygen-gtk2/PKGBUILD
@@ -1,23 +1,22 @@
-# $Id: PKGBUILD 163736 2012-07-18 10:30:46Z andrea $
+# $Id: PKGBUILD 167990 2012-10-04 19:22:04Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: birdflesh <antkoul at gmail dot com>
 
 pkgname=oxygen-gtk2
-pkgver=1.3.0
+pkgver=1.3.1
 pkgrel=1
 pkgdesc="Port of the default KDE widget theme (Oxygen) to GTK2"
 arch=('i686' 'x86_64')
 url='https://projects.kde.org/projects/playground/artwork/oxygen-gtk/'
 license=('LGPL')
-depends=('gtk2' 'dbus-glib')
+depends=('gtk2')
 conflicts=('oxygen-gtk')
 replaces=('oxygen-gtk')
 makedepends=('cmake')
 source=("http://download.kde.org/stable/${pkgname}/${pkgver}/src/${pkgname}-${pkgver}.tar.bz2")
-md5sums=('9c9d996904db3f4897772788f3bf1599')
+md5sums=('269283e34c5ae547a062da29cab58aa9')
 
 build() {
-  cd "${srcdir}"
   mkdir build
   cd build
   cmake ../${pkgname}-${pkgver} \
@@ -27,6 +26,6 @@ build() {
 }
 
 package() {
-  cd "${srcdir}"/build
+  cd build
   make DESTDIR="${pkgdir}" install
 }
diff --git a/extra/oxygen-gtk3/PKGBUILD b/extra/oxygen-gtk3/PKGBUILD
index d307e84e7..e1fe275e3 100644
--- a/extra/oxygen-gtk3/PKGBUILD
+++ b/extra/oxygen-gtk3/PKGBUILD
@@ -1,20 +1,19 @@
-# $Id: PKGBUILD 163738 2012-07-18 10:31:20Z andrea $
+# $Id: PKGBUILD 167992 2012-10-04 19:24:43Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=oxygen-gtk3
-pkgver=1.1.0
+pkgver=1.1.1
 pkgrel=1
 pkgdesc="Port of the default KDE widget theme (Oxygen) to GTK3"
 arch=('i686' 'x86_64')
 url='https://projects.kde.org/projects/playground/artwork/oxygen-gtk/'
 license=('LGPL')
-depends=('gtk3' 'dbus-glib')
+depends=('gtk3')
 makedepends=('cmake')
 source=("http://download.kde.org/stable/${pkgname}/${pkgver}/src/${pkgname}-${pkgver}.tar.bz2")
-md5sums=('d5c5b5debd3974ea4ea1cc1a7fbe56b9')
+md5sums=('284139caf8a95a94bac1d82900745b4f')
 
 build() {
-  cd "${srcdir}"
   mkdir build
   cd build
   cmake ../${pkgname}-${pkgver} \
@@ -24,6 +23,6 @@ build() {
 }
 
 package() {
-  cd "${srcdir}"/build
+  cd build
   make DESTDIR="${pkgdir}" install
 }
diff --git a/extra/pathological/PKGBUILD b/extra/pathological/PKGBUILD
index f87746608..96d506b20 100644
--- a/extra/pathological/PKGBUILD
+++ b/extra/pathological/PKGBUILD
@@ -1,14 +1,14 @@
-# $Id: PKGBUILD 149371 2012-02-07 09:25:53Z eric $
+# $Id: PKGBUILD 167956 2012-10-04 06:16:36Z eric $
 # Maintainer: Eric Bélanger <eric@archlinux.org>
 
 pkgname=pathological
 pkgver=1.1.3
-pkgrel=7
+pkgrel=8
 pkgdesc="A puzzle game with the same feel as frozen bubble"
 arch=('i686' 'x86_64')
 url="http://pathological.sourceforge.net/"
 license=('GPL')
-depends=('python-pygame')
+depends=('python2-pygame')
 makedepends=('netpbm')
 install=pathological.install
 source=(http://downloads.sourceforge.net/sourceforge/${pkgname}/${pkgname}-${pkgver}.tar.gz
diff --git a/extra/perl-net-ssleay/PKGBUILD b/extra/perl-net-ssleay/PKGBUILD
index 847626556..8d548ad5d 100644
--- a/extra/perl-net-ssleay/PKGBUILD
+++ b/extra/perl-net-ssleay/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 160545 2012-06-02 10:28:03Z bluewind $
+# $Id: PKGBUILD 167980 2012-10-04 16:11:02Z giovanni $
 # Maintainer: Giovanni Scafora <giovanni@archlinux.org>
 # Contributor: Manolis Tzanidakis
 
 pkgname=perl-net-ssleay
 _cpanname=Net-SSLeay
-pkgver=1.48
-pkgrel=2
+pkgver=1.49
+pkgrel=1
 pkgdesc="Perl extension for using OpenSSL"
 arch=('i686' 'x86_64')
 license=('custom:BSD')
@@ -15,7 +15,7 @@ options=(!emptydirs)
 replaces=('net-ssleay')
 provides=('net-ssleay')
 source=("http://www.cpan.org/authors/id/M/MI/MIKEM/${_cpanname}-${pkgver}.tar.gz")
-md5sums=('4e10d9da28f26732e37807820bf72af5')
+md5sums=('9e05acd6773ff5e94c5a1dcd7c0ec4a7')
 
 build() {
   cd ${srcdir}/${_cpanname}-${pkgver}
diff --git a/extra/psi/PKGBUILD b/extra/psi/PKGBUILD
index 36542f8d2..d3bee3fee 100644
--- a/extra/psi/PKGBUILD
+++ b/extra/psi/PKGBUILD
@@ -1,37 +1,30 @@
-# $Id: PKGBUILD 151383 2012-02-25 23:49:47Z pierre $
+# $Id: PKGBUILD 167954 2012-10-04 05:36:54Z pierre $
 # Maintainer: Pierre Schmitz <pierre@archlinux.de>
 
 pkgname=psi
-pkgver=0.14
-pkgrel=6
+pkgver=0.15
+pkgrel=1
 pkgdesc='Instant messaging application designed for the Jabber IM'
 url='http://psi-im.org/'
 license=('GPL')
 arch=('i686' 'x86_64')
 depends=('qca-ossl' 'qca-gnupg' 'enchant' 'libxss' 'xdg-utils')
+makedepends=('icu')
 install='psi.install'
 source=("http://downloads.sourceforge.net/psi/psi-${pkgver}.tar.bz2"
-        'archlinux.patch' 'affiliationlistconfigmuc.patch'
-        'configureroomcrash.patch' 'gcc-47.patch' 'input-validation.patch')
-md5sums=('9d7dcce3bcab53b741a712199bd986be'
-         'a965c6a4ad1028f14a5897c3f5088ae8'
-         '28258c884a0a6f2cbb297435a144ae04'
-         '8291eee7110a8aa8163c2e2e38c6d491'
-         'd7acbb7b81671339d490622c74082d11'
-         '259cf255ca2d2395840a25799056a58b')
+        'archlinux.patch')
+md5sums=('aea15f17cf93e7cea52f305523f761be'
+         '2ed44ef84007b5b7f9a3f0a4f5f6a86d')
 
 build() {
 	cd ${srcdir}/psi-${pkgver}
-	patch -p1 -i ${srcdir}/archlinux.patch
-	patch -p1 -i ${srcdir}/affiliationlistconfigmuc.patch
-	patch -p1 -i ${srcdir}/configureroomcrash.patch
-	patch -p0 -i ${srcdir}/gcc-47.patch
-	patch -p0 -i ${srcdir}/input-validation.patch
-	./configure --prefix=/usr --disable-bundled-qca --release --no-separate-debug-info
+	patch -p0 -i ${srcdir}/archlinux.patch
+	./configure --prefix=/usr --release --no-separate-debug-info
 	make
 }
 
 package() {
 	cd ${srcdir}/psi-${pkgver}
 	make INSTALL_ROOT=${pkgdir} install
+	rm -rf ${pkgdir}/usr/share/psi/certs/
 }
diff --git a/extra/psi/archlinux.patch b/extra/psi/archlinux.patch
index bf89ab4a9..d9cbb454b 100644
--- a/extra/psi/archlinux.patch
+++ b/extra/psi/archlinux.patch
@@ -1,7 +1,6 @@
-diff -aur psi-0.12.old/src/systeminfo.cpp psi-0.12/src/systeminfo.cpp
---- psi-0.12.old/src/systeminfo.cpp	2007-04-08 10:37:46.000000000 +0200
-+++ psi-0.12/src/systeminfo.cpp	2009-05-11 15:09:14.000000000 +0200
-@@ -89,7 +89,7 @@
+--- src/systeminfo.cpp	2012-10-04 02:53:03.000000000 +0200
++++ src/systeminfo.cpp	2012-10-04 07:18:45.111088591 +0200
+@@ -114,7 +114,7 @@
  		{ LinuxSlackware,	OsAppendFile,	"/etc/slackware-version",	"Slackware Linux"	},
  		{ LinuxPLD,		OsUseFile,	"/etc/pld-release",		"PLD Linux"		},
  		{ LinuxAurox,		OsUseName,	"/etc/aurox-release",		"Aurox Linux"		},
diff --git a/extra/psi/psi.install b/extra/psi/psi.install
index e70c054ec..464d2e625 100644
--- a/extra/psi/psi.install
+++ b/extra/psi/psi.install
@@ -1,5 +1,6 @@
 post_install() {
 	xdg-icon-resource forceupdate --theme hicolor &> /dev/null
+	update-desktop-database -q &> /dev/null
 }
 
 post_upgrade() {
diff --git a/extra/python-pygame/PKGBUILD b/extra/python-pygame/PKGBUILD
index 5207303ca..dbe7144a0 100644
--- a/extra/python-pygame/PKGBUILD
+++ b/extra/python-pygame/PKGBUILD
@@ -1,14 +1,16 @@
-# $Id: PKGBUILD 153735 2012-03-19 03:45:07Z eric $
+# $Id: PKGBUILD 167958 2012-10-04 06:29:37Z eric $
 # Maintainer: Eric Bélanger <eric@archlinux.org>
 
-pkgname=python-pygame
+pkgbase=python-pygame
+pkgname=python2-pygame
 pkgver=1.9.1
-pkgrel=5
+pkgrel=7
 pkgdesc="Python game library"
 arch=('i686' 'x86_64')
 url="http://www.pygame.org/"
 license=('LGPL')
 depends=('sdl_mixer' 'sdl_ttf' 'sdl_image' 'python2' 'portmidi')
+conflicts=('python-pygame')
 source=(http://pygame.org/ftp/pygame-${pkgver}release.tar.gz \
         config.patch pygame-v4l.patch)
 sha1sums=('a45aeb0623e36ae7a1707b5f41ee6274f72ca4fa'
@@ -21,7 +23,7 @@ build() {
   patch -Np1 -i "${srcdir}/pygame-v4l.patch"
 }
 
-package() {
+package_python2-pygame() {
   cd "${srcdir}/pygame-${pkgver}release"
   python2 config.py -auto
   python2 setup.py install --root="${pkgdir}" --prefix=/usr