From 1ba34f0e020019beb4f649a296352b4b72978ddf Mon Sep 17 00:00:00 2001
From: Timothy Redaelli <tredaelli@archlinux.info>
Date: Mon, 23 Jan 2012 08:00:43 +0000
Subject: [PATCH] updated on Mon Jan 23 08:00:43 UTC 2012

---
 cloud9-git/PKGBUILD                  |  6 +++---
 eclipse-egit/PKGBUILD                | 34 +++++++++++++++++++++++++---------
 firefox-extension-scriptish/PKGBUILD | 16 ++++++++--------
 lightdm-unity-greeter/PKGBUILD       |  2 +-
 ntfs-3g-fuse/PKGBUILD                |  9 ++++++---
 ntfs-3g-fuse/ntfs-3g-fuse.install    |  4 ++--
 nvidia-pae/PKGBUILD                  |  8 ++++----
 nvidia-pae/nvidia.install            |  6 +++---
 qooxdoo-sdk-git/PKGBUILD             |  4 ++--
 utserver/PKGBUILD                    | 22 ++++++++--------------
 utserver/utserver                    |  2 +-
 utserver/utserver.conf.d             |  1 +
 utserver/utserver.install            | 20 +++++++++++++-------
 utserver/utserver.rc.d               |  2 +-
 zotero/PKGBUILD                      |  6 +++---
 15 files changed, 81 insertions(+), 61 deletions(-)

diff --git a/cloud9-git/PKGBUILD b/cloud9-git/PKGBUILD
index d1d1855c4..ef3741415 100644
--- a/cloud9-git/PKGBUILD
+++ b/cloud9-git/PKGBUILD
@@ -3,7 +3,7 @@
 
 # Maintainer: Leo von Klenze <leo@devel.von-klenze.de>
 pkgname=cloud9-git
-pkgver=20111219
+pkgver=20120120
 pkgrel=1
 pkgdesc="Cloud9 IDE - Your code anywhere, anytime. Open Source Javascript Cloud9 IDE"
 arch=('i686' 'x86_64')
@@ -16,11 +16,11 @@ conflicts=(cloud9)
 source=(runcloud9 middleware.patch)
 noextract=()
 md5sums=(c9013ed5f0dd6b7b5852118a72f88856 6c6664ccb741a5152771556add84d115)
-install=(cloud9.install)
+install=cloud9.install
 
 _gitname="cloud9"
 _gitroot="https://github.com/ajaxorg/${_gitname}"
-_gitcommit="c888577f4888609c6bd4c2a9c8be5ef1e909d9cc"
+_gitcommit="e87523dbbb8ed9c5c9bf54ec3f63cf6d2d0250cc"
 
 build() {
   cd "$srcdir"
diff --git a/eclipse-egit/PKGBUILD b/eclipse-egit/PKGBUILD
index 4949912a3..6feef5f6b 100644
--- a/eclipse-egit/PKGBUILD
+++ b/eclipse-egit/PKGBUILD
@@ -3,21 +3,37 @@
 
 pkgname=eclipse-egit
 pkgver=1.1.0.201109151100
-pkgrel=1
+pkgrel=2
 pkgdesc="An Eclipse Team provider for the Git version control system"
-arch=('any')
+arch=('i686' 'x86_64')
 url="http://eclipse.org/egit/"
-license=('custom:BSD')
+license=('EPL')
 depends=('eclipse>=3.6' 'eclipse-mylyn>=3.6')
 source=("http://download.eclipse.org/egit/site.zip")
 md5sums=('c7e654d44eb6a132cdff30642296726a')
-noextract=('site.zip')
 
 build() {
-  _dest="$pkgdir/usr/share/eclipse/dropins/$pkgname/eclipse"
-  install -d $_dest
-  cd $srcdir
-  unzip site.zip
+  _dest=${pkgdir}/usr/share/eclipse/dropins/${pkgname/eclipse-}/eclipse
+
+  cd ${srcdir}
   find site -name '*source*' -exec rm {} \;
-  mv site/* $_dest
+  mv site/* ${srcdir}
+  
+  # Features
+  find features -type f | while read _feature ; do
+    echo ${_feature}
+    if [[ ${_feature} =~ (.*\.jar$) ]] ; then
+      install -dm755 ${_dest}/${_feature%*.jar}
+      cd ${_dest}/${_feature/.jar}
+      jar xf ${srcdir}/${_feature} || return 1
+    else
+      install -Dm644 ${_feature} ${_dest}/${_feature}
+    fi
+  done
+
+  # Plugins
+  find plugins -type f | while read _plugin ; do
+    install -Dm644 ${_plugin} ${_dest}/${_plugin}
+  done
 }
+
diff --git a/firefox-extension-scriptish/PKGBUILD b/firefox-extension-scriptish/PKGBUILD
index b311c7b6c..68dd9c6cb 100644
--- a/firefox-extension-scriptish/PKGBUILD
+++ b/firefox-extension-scriptish/PKGBUILD
@@ -1,24 +1,24 @@
-# Contributor: mutantmonkey <mutantmonkey@gmail.com>
+# Contributor: mutantmonkey <mutantmonkey@mutantmonkey.in>
 pkgname=firefox-extension-scriptish
-pkgver=0.1.5
-_ffver=6.0.2
-pkgrel=3
+pkgver=0.1.6
+_ffver=9.0
+pkgrel=1
 pkgdesc="Firefox add-on for user scripts (fork of Greasemonkey)"
 arch=('any')
 url="http://scriptish.org/"
 license=('MIT')
-depends=('firefox>='${_ffver})
+depends=('firefox>='${_ffver} 'firefox<9.99.0')
 conflicts=('scriptish')
 replaces=('scriptish')
 source=("https://addons.mozilla.org/firefox/downloads/latest/231203/addon-231203-latest.xpi")
-md5sums=('ddac20ad35ae4948e8badcf395665773')
-sha256sums=('a317df0597da2f1c17db31a95791d15aebb7eb10a621984d8aaedb364f53f13b')
+md5sums=('140296460d84fbbb56de1468d5599a0e')
+sha256sums=('d570bde5ec394b2750c45c387f46ed60e3c897bacf1c0aef949235d8ca64e375')
 
 package() {
   cd $srcdir
 
   emid=$(sed -n '/.*<em:id>\(.*\)<\/em:id>.*/{s//\1/p;q}' install.rdf) || return 1
-  installdir=$pkgdir/usr/lib/firefox-${_ffver}/extensions/$emid
+  installdir=$pkgdir/usr/lib/firefox/extensions/$emid
 
   install -d ${installdir} || return 1
   cp -a * ${installdir} || return 1
diff --git a/lightdm-unity-greeter/PKGBUILD b/lightdm-unity-greeter/PKGBUILD
index 87656796a..45ca1f9d3 100644
--- a/lightdm-unity-greeter/PKGBUILD
+++ b/lightdm-unity-greeter/PKGBUILD
@@ -13,7 +13,7 @@ source=("https://launchpad.net/ubuntu/+archive/primary/+files/${pkgname#*-}_${pk
         "https://launchpad.net/ubuntu/+archive/primary/+files/${pkgname#*-}_${pkgver%.*}.orig.tar.gz"
         'unity-greeter.install')
 install=unity-greeter.install
-depends=('gnome-doc-utils' 'lightdm' 'gnome-common' 'libindicator' 'cantarell-fonts' 'light-themes' 'ubuntu-wallpapers' 'ttf-ubuntu-font-family')
+depends=('gnome-doc-utils' 'lightdm-ubuntu' 'gnome-common' 'libindicator' 'cantarell-fonts' 'light-themes' 'ubuntu-wallpapers' 'ttf-ubuntu-font-family')
 options=(!libtool)
 makedepends=('gnome-settings-daemon' 'pkg-config' 'bzr' 'vala' 'autoconf')
 sha512sums=('d24c41bdcd920b8c9a25bbfd9c03318773ab3c14dfee69306144fb38a087f314a3dfc5e5d9f1e7d5fb9b8ababe774b61d6e23f162607e85e6a10496ce69ec0eb'
diff --git a/ntfs-3g-fuse/PKGBUILD b/ntfs-3g-fuse/PKGBUILD
index 9be347751..f5316b634 100644
--- a/ntfs-3g-fuse/PKGBUILD
+++ b/ntfs-3g-fuse/PKGBUILD
@@ -1,18 +1,21 @@
+# Maintainer: Trevor Turner <turn3r.tr3v0r@gmail.com>
+# Contributor: Trevor Turner <turn3r.tr3v0r@gmail.com>
+
 pkgname=ntfs-3g-fuse
-pkgver=2011.4.12
+pkgver=2012.1.15
 pkgrel=1
 pkgdesc="Stable read and write NTFS driver and ntfsprogs. This package will allow normal users to mount NTFS Volumes."
 url="http://www.tuxera.com"
 arch=('i686' 'x86_64')
 license=('GPL2')
 depends=('glibc')
+makedepends=('pkgconfig')
 conflicts=('ntfs-3g' 'ntfsprogs')
 provides=('ntfsprogs' 'ntfs-3g')
-makedepends=('pkgconfig')
 options=('!libtool')
 install=ntfs-3g-fuse.install
 source=(http://tuxera.com/opensource/ntfs-3g_ntfsprogs-${pkgver}.tgz)
-sha1sums=('a4340ae611a3f26089f7d5601a86a5847517bff7')
+sha1sums=('8d55cf49afde172fefa369a0a85289e09c4d7bbb ')
 
 build() {
   cd "${srcdir}/ntfs-3g_ntfsprogs-${pkgver}"
diff --git a/ntfs-3g-fuse/ntfs-3g-fuse.install b/ntfs-3g-fuse/ntfs-3g-fuse.install
index 432aa2e39..e4f11b514 100644
--- a/ntfs-3g-fuse/ntfs-3g-fuse.install
+++ b/ntfs-3g-fuse/ntfs-3g-fuse.install
@@ -1,9 +1,9 @@
 post_install() {
 	echo ""
-	echo -e "Updating permissions on ntfs-3g...\c"
+	echo -e "Updating permissions on $(which ntfs-3g)...\c"
 	chown root $(which ntfs-3g)
         chmod 4755 $(which ntfs-3g)
-	echo " done"
+	echo " Done!"
 	echo ""
 }
 
diff --git a/nvidia-pae/PKGBUILD b/nvidia-pae/PKGBUILD
index 5a8b28e18..5ac4bec0c 100644
--- a/nvidia-pae/PKGBUILD
+++ b/nvidia-pae/PKGBUILD
@@ -3,14 +3,14 @@
 
 pkgname=nvidia-pae
 pkgver=290.10
-_extramodules=extramodules-3.1-pae
+_extramodules=extramodules-3.2-pae
 _kernver="$(cat /lib/modules/${_extramodules}/version)"
-pkgrel=1
+pkgrel=2
 pkgdesc="NVIDIA drivers for linux."
 arch=('i686' 'x86_64')
 url="http://www.nvidia.com/"
-depends=('linux-pae>=3.1' 'linux-pae<3.2' "nvidia-utils=${pkgver}")
-makedepends=('linux-pae-headers>=3.1' 'linux-pae-headers<3.2')
+depends=('linux-pae>=3.2' 'linux-pae<3.3' "nvidia-utils=${pkgver}")
+makedepends=('linux-pae-headers>=3.2' 'linux-pae-headers<3.3')
 conflicts=('nvidia-96xx' 'nvidia-173xx')
 license=('custom')
 install=nvidia.install
diff --git a/nvidia-pae/nvidia.install b/nvidia-pae/nvidia.install
index eb9e34595..d48f7cb74 100644
--- a/nvidia-pae/nvidia.install
+++ b/nvidia-pae/nvidia.install
@@ -1,16 +1,16 @@
 post_install() {
-    EXTRAMODULES='extramodules-3.1-pae'
+    EXTRAMODULES='extramodules-3.2-pae'
     depmod $(cat /lib/modules/$EXTRAMODULES/version)
     echo 'In order to use nvidia module, reboot the system.'
 }
 
 post_upgrade() {
-    EXTRAMODULES='extramodules-3.1-pae'
+    EXTRAMODULES='extramodules-3.2-pae'
     depmod $(cat /lib/modules/$EXTRAMODULES/version)
     rmmod nvidia || echo 'In order to use the new nvidia module, exit Xserver and unload it manually.'
 }
 
 post_remove() {
-    EXTRAMODULES='extramodules-3.1-pae'
+    EXTRAMODULES='extramodules-3.2-pae'
     depmod $(cat /lib/modules/$EXTRAMODULES/version)
 }
diff --git a/qooxdoo-sdk-git/PKGBUILD b/qooxdoo-sdk-git/PKGBUILD
index 1047795d0..b1044068a 100644
--- a/qooxdoo-sdk-git/PKGBUILD
+++ b/qooxdoo-sdk-git/PKGBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Leo von Klenze <devel@leo.von-klenze.de> 
 
 pkgname=qooxdoo-sdk-git
-pkgver=20111014
+pkgver=20120120
 pkgrel=1
 pkgdesc="Universal JavaScript Framework"
 url="http://qooxdoo.org"
@@ -45,7 +45,7 @@ build() {
 
 package() {
   mkdir -p $pkgdir/opt/$_gitname
-  cp -R $srcdir/$_gitname/$_gitname/* $pkgdir/opt/$_gitname
+  cp -R $srcdir/$_gitname/* $pkgdir/opt/$_gitname
 
   mkdir -p $pkgdir/opt/qooxdoo/component/library/logpane/source/resource
   
diff --git a/utserver/PKGBUILD b/utserver/PKGBUILD
index 48fb96ab4..d046510ac 100644
--- a/utserver/PKGBUILD
+++ b/utserver/PKGBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Carl Reinke <mindless2112 gmail com>
 pkgname=utserver
 pkgver=25376
-pkgrel=1
+pkgrel=2
 pkgdesc="uTorrent server, BitTorrent client with web UI"
 arch=('i686' 'x86_64')
 url="http://www.utorrent.com/downloads/linux"
@@ -11,8 +11,7 @@ depends=('glibc' 'gcc-libs' 'bash' 'openssl098' 'zlib')
 conflicts=('utorrent-server')
 install=$pkgname.install
 
-
-if [[ $CARCH == i686 ]];
+if [[ $CARCH == i686 ]]
 then
     source=(
         http://download.utorrent.com/linux/utorrent-server-3.0-25053.tar.gz
@@ -20,10 +19,10 @@ then
     )
     md5sums=(
         '49f6376e9df19f773763180464367c2c'
-        'd973342ecc185dab4aa3dd19324f762b'
+        'cc2abac1ce3d0efe475f16b70257bace'
         'ad557d08d6a3a578f546c3b0dd827072'
-        'd73e497dd21e6985dbae91a272afbb2b'
-        '1e5905cf9ef9a1efdbb044c53b635074'
+        'b06944473a02fddfb56b6864aa85e255'
+        '340b37652522a5a76b08ebc262bfc75f'
     )
 else 
     source=(
@@ -32,18 +31,13 @@ else
     )
     md5sums=(
         '5be6a068d42c1b350d69f67f52cc4805'
-        'd973342ecc185dab4aa3dd19324f762b'
+        'cc2abac1ce3d0efe475f16b70257bace'
         'ad557d08d6a3a578f546c3b0dd827072'
-        'd73e497dd21e6985dbae91a272afbb2b'
-        '1e5905cf9ef9a1efdbb044c53b635074'
+        'b06944473a02fddfb56b6864aa85e255'
+        '340b37652522a5a76b08ebc262bfc75f'
     )
 fi
 
-build()
-{
-    true
-}
-
 package()
 {
     install -dm755 $pkgdir/srv/utserver/{downloads,settings,torrents}
diff --git a/utserver/utserver b/utserver/utserver
index d8ab92138..b8780592c 100644
--- a/utserver/utserver
+++ b/utserver/utserver
@@ -1,2 +1,2 @@
 #!/bin/sh
-/usr/share/utserver/utserver -configfile /etc/utserver.conf -settingspath /srv/utserver/settings/ -logfile /var/log/utserver/utserver.log -pidfile /var/run/utserver/utserver.pid -daemon
+/usr/share/utserver/utserver $*
diff --git a/utserver/utserver.conf.d b/utserver/utserver.conf.d
index 84c9ff4b6..0f54ac5e4 100644
--- a/utserver/utserver.conf.d
+++ b/utserver/utserver.conf.d
@@ -1 +1,2 @@
 UTSERVER_USER="utserver"
+UTSERVER_ARGS="-configfile /etc/utserver.conf -settingspath /srv/utserver/settings/ -logfile /var/log/utserver/utserver.log -pidfile /var/run/utserver/utserver.pid -daemon"
diff --git a/utserver/utserver.install b/utserver/utserver.install
index af23dc578..a02a79d76 100644
--- a/utserver/utserver.install
+++ b/utserver/utserver.install
@@ -1,16 +1,16 @@
 post_install()
 {
-    getent group utserver &>/dev/null || usr/sbin/groupadd --system utserver
-    if getent passwd utserver &>/dev/null;
+    getent group utserver &>/dev/null || groupadd --system utserver
+    if getent passwd utserver &>/dev/null
     then
-        usr/sbin/usermod -c 'utorrent-server' -d /srv/utserver -s /bin/false utserver &>/dev/null
+        usermod -c 'utorrent-server' -d /srv/utserver -s /bin/false utserver &>/dev/null
     else
-        usr/sbin/useradd -c 'utorrent-server' --system -g utserver -d /srv/utserver -s /bin/false utserver
+        useradd -c 'utorrent-server' --system -g utserver -d /srv/utserver -s /bin/false utserver &>/dev/null
     fi
-    usr/bin/passwd -l utserver &>/dev/null
+    passwd -l utserver &>/dev/null
 
-    chown utserver:utserver srv/utserver/{.,downloads,settings,torrents}
-    chown utserver:utserver var/{run,log}/utserver
+    chown utserver:utserver /srv/utserver/{.,downloads,settings,torrents}
+    chown utserver:utserver /var/{run,log}/utserver
 
 cat << _EOF
 >>> utserver daemon runs by default as "utserver" user
@@ -20,6 +20,12 @@ cat << _EOF
     If utserver has CPU-usage issues, try enabling 'net.low_cpu' in the
     Advanced Options.
 _EOF
+    true
+}
+
+post_upgrade()
+{
+    post_install $*
 }
 
 post_remove()
diff --git a/utserver/utserver.rc.d b/utserver/utserver.rc.d
index 3689c0975..2e5d7f77c 100644
--- a/utserver/utserver.rc.d
+++ b/utserver/utserver.rc.d
@@ -13,7 +13,7 @@ PIDFILE=/var/run/utserver/utserver.pid
 case "$1" in
     start)
         stat_busy "Starting uTorrent-server"
-        su -l -s /bin/sh -c "/usr/bin/utserver >/dev/null" $UTSERVER_USER
+        su -l -s /bin/sh -c "/usr/bin/utserver $UTSERVER_ARGS >/dev/null 2>&1" $UTSERVER_USER
         if [ $? -gt 0 ]; then
             stat_fail
         else
diff --git a/zotero/PKGBUILD b/zotero/PKGBUILD
index 3a3b50646..9ed81f3e2 100644
--- a/zotero/PKGBUILD
+++ b/zotero/PKGBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Juanma Hernandez <juanmah@gmail.com>
 
 pkgname=zotero
-pkgver=3.0b3.2
+pkgver=3.0rc1.1
 pkgrel=1
 pkgdesc='Zotero Standalone. Is a free, easy-to-use tool to help you collect, organize, cite, and share your research sources.'
 arch=('i686' 'x86_64')
@@ -11,8 +11,8 @@ license=('GPL3')
 _arch=i686
 [ "$CARCH" = "x86_64" ] && _arch=x86_64
 source=(http://download.zotero.org/standalone/$pkgver/Zotero-${pkgver}_linux-${_arch}.tar.bz2)
-md5sums=('4b64afdeee9156157e452a066e6e7f4c')
-[ "$CARCH" = "x86_64" ] && md5sums=('b4596e772088f260679b3cfa0aade085')
+md5sums=('a869c94a9921c7b8caf07b3257636365')
+[ "$CARCH" = "x86_64" ] && md5sums=('9144abdf5e6c855451df07cbffd08cd0')
 
 build() {
 
-- 
2.11.4.GIT