Sun Jun 12 22:59:55 UTC 2011

12 files changed, 222 insertions, 34 deletions

diff --git a/community/calibre/PKGBUILD b/community/calibre/PKGBUILD
index 5ad10d94b..14ae58ba1 100644
--- a/community/calibre/PKGBUILD
+++ b/community/calibre/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 48634 2011-06-03 16:47:30Z stephane $
+# $Id: PKGBUILD 49119 2011-06-11 10:20:21Z giovanni $
 # Maintainer: Giovanni Scafora <giovanni@archlinux.org>
 # Contributor: Petrov Roman <nwhisper@gmail.com>
 # Contributor: Andrea Fagiani <andfagiani _at_ gmail dot com>
 
 pkgname=calibre
-pkgver=0.8.3
-pkgrel=2
+pkgver=0.8.5
+pkgrel=1
 pkgdesc="Ebook management application"
 arch=('i686' 'x86_64') 
 url="http://calibre-ebook.com/"
@@ -20,7 +20,7 @@ optdepends=('ipython: to use calibre-debug')
 install=calibre.install
 source=(http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.gz
         desktop_integration.patch)
-md5sums=('aee05cac444f68491f2a3d68b22da53e'
+md5sums=('b6b07a35afe4dbf188f42e932536cca3'
          'f4b80e3b34e34bce68b3f052ff52dee8')
 
 build() {
diff --git a/community/mldonkey/PKGBUILD b/community/mldonkey/PKGBUILD
index 5cd449c3f..c05548fba 100644
--- a/community/mldonkey/PKGBUILD
+++ b/community/mldonkey/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 40262 2011-02-22 17:18:28Z cbrannon $
+# $Id: PKGBUILD 49135 2011-06-11 15:20:48Z cbrannon $
 # Maintainer: Chris Brannon <cmbrannon79@gmail.com>
 # Contributor: Corrado Primier <bardo@aur.archlinux.org>
 # Contributor: Alessio 'mOLOk' Bolognino <themolok@gmail.com>   
 
 pkgname=mldonkey
 pkgver=3.0.7
-pkgrel=2
+pkgrel=3
 pkgdesc="A multi-network P2P client"
 arch=('i686' 'x86_64')
 url="http://mldonkey.sourceforge.net/"
@@ -17,11 +17,16 @@ optdepends=('librsvg: GUI support'
 backup=('etc/conf.d/mldonkey')
 install=mldonkey.install
 source=(http://downloads.sourceforge.net/sourceforge/mldonkey/$pkgname-$pkgver.tar.bz2
-        mldonkeyd mldonkey.conf mldonkey.desktop)
+        mldonkey-gcc46.patch
+        mldonkeyd
+        mldonkey.conf
+        mldonkey.desktop)
 
 build() {
   cd "$srcdir/$pkgname-$pkgver"
 
+  # Patch comes from upstream; will go away in later versions.
+  patch -p1 < "$srcdir/mldonkey-gcc46.patch"
   ./configure --prefix=/usr --enable-gui=newgui2
   make
 }
@@ -39,6 +44,7 @@ package() {
   install -Dm644 "$srcdir/mldonkey.conf" "$pkgdir/etc/conf.d/mldonkey"
 }
 md5sums=('162b78fc4e20335a8fe31d91e1656db2'
-         'c42526cb7ff703b313728dfdd92dfb1e'
-         '190cbbc30b510981e0d8b0ed8bae87a4'
+         'c2bd99420ba5d48629b6823aae6bf127'
+         '75e4b6c7fb282f7de15a8d5478f3bd70'
+         '1f86d92db51c62cded0e6f3833057dee'
          '1de3266caa49f82bee73ba891eea12cf')
diff --git a/community/mldonkey/mldonkey-gcc46.patch b/community/mldonkey/mldonkey-gcc46.patch
new file mode 100644
index 000000000..656d72f85
--- /dev/null
+++ b/community/mldonkey/mldonkey-gcc46.patch
@@ -0,0 +1,12 @@
+diff --git a/src/utils/lib/CryptoPP.h b/src/utils/lib/CryptoPP.h
+index 775a898..af1621b 100644
+--- a/src/utils/lib/CryptoPP.h
++++ b/src/utils/lib/CryptoPP.h
+@@ -695,6 +695,7 @@ class CRYPTOPP_DLL NullNameValuePairs : public NameValuePairs
+ {
+ public:
+ 	bool GetVoidValue(const char* /* name */, const std::type_info& /* valueType */, void* /* pValue */) const {return false;}
++	NullNameValuePairs() {}
+ };
+ 
+ //! _
diff --git a/community/mldonkey/mldonkey.conf b/community/mldonkey/mldonkey.conf
index 7aa683f1a..24a25af74 100644
--- a/community/mldonkey/mldonkey.conf
+++ b/community/mldonkey/mldonkey.conf
@@ -3,6 +3,3 @@ MLDUSER=""
 
 # Parameters to be passed to the daemon (default is empty)
 PARAMS=""
-
-# PID file location (defaults to "/var/lock" if empty)
-PIDDIR=""
diff --git a/community/mldonkey/mldonkeyd b/community/mldonkey/mldonkeyd
index bbd6954c2..6a458d68e 100644
--- a/community/mldonkey/mldonkeyd
+++ b/community/mldonkey/mldonkeyd
@@ -9,6 +9,15 @@ if [ -z $MLDUSER ] ; then
 	exit 2
 fi
 
+if [ -z "$(getent passwd "$MLDUSER")" ]; then
+	# Perhaps we should create the account for the user?
+	echo "You must create the account $MLDUSER in order to run mldonkey."
+	echo "Please create the account manually, and try again."
+	exit 2
+fi
+
+MLDGROUPID=$(getent passwd "$MLDUSER" |cut -d':' -f4)
+MLDGROUP=$(getent group $MLDGROUPID |cut -d':' -f1)
 USERDIR=$(getent passwd $MLDUSER | cut -d: -f6)
 
 if [ ! -d $USERDIR ]; then
@@ -16,12 +25,20 @@ if [ ! -d $USERDIR ]; then
 	exit 2
 fi
 
-PID=$(cat $USERDIR/.mldonkey/mlnet.pid 2>/dev/null)
+PIDDIR="/var/run/mldonkey"
+PIDFILE="$PIDDIR/mlnet.pid"
+PID=$(cat $PIDFILE 2>/dev/null)
 
 case "$1" in
     	start)
         	stat_busy "Starting MLDonkey"
-		[ -z $PID ] && su $MLDUSER -s /bin/sh -c "/usr/bin/mlnet $PARAMS -log_to_syslog true &> /tmp/mldonkey.log &"
+		if [ ! -d $PIDDIR ]; then
+			install -d -m755 -o "$MLDUSER" -g "$MLDGROUP" $PIDDIR
+		fi
+		if [ "$(stat -c %U $PIDDIR)" != "$MLDUSER" ]; then
+			chown -R "$MLDUSER:$MLDGROUP" $PIDDIR
+		fi
+		[ -z $PID ] && su $MLDUSER -s /bin/sh -c "/usr/bin/mlnet -pid $PIDDIR  $PARAMS -log_to_syslog true &> /tmp/mldonkey.log &"
 		if [ $? -gt 0 ]; then
 			stat_fail
 		else
diff --git a/community/open-vm-tools-modules/PKGBUILD b/community/open-vm-tools-modules/PKGBUILD
index 7c9125ade..127bf5c92 100644
--- a/community/open-vm-tools-modules/PKGBUILD
+++ b/community/open-vm-tools-modules/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 44312 2011-04-05 15:06:23Z spupykin $
+# $Id: PKGBUILD 49143 2011-06-11 22:40:49Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: Krzysztof Raczkowski <raczkow@gmail.com>
 
 pkgname=open-vm-tools-modules
-pkgver=2011.03.28
-_pkgsubver=387002
+pkgver=2011.05.27
+_pkgsubver=420096
 pkgrel=1
 pkgdesc="The Open Virtual Machine Tools (open-vm-tools) are the open source implementation of VMware Tools."
 arch=('i686' 'x86_64')
@@ -13,13 +13,13 @@ license=('GPL')
 makedepends=('libdnet' 'icu' 'uriparser' 'kernel26-headers')
 depends=("kernel26")
 install=$pkgname.install
-source=(http://easynews.dl.sourceforge.net/sourceforge/open-vm-tools/open-vm-tools-$pkgver-${_pkgsubver}.tar.gz)
-md5sums=('a9c72ab0b8f7778d444e69e9d3b95527')
+source=(http://kent.dl.sourceforge.net/sourceforge/open-vm-tools/open-vm-tools-$pkgver-${_pkgsubver}.tar.gz)
+md5sums=('3e43d4857d412d02115e69db193830b5')
 
 build() {
   cd "$srcdir/open-vm-tools-${pkgver}-${_pkgsubver}"
   sed -i 's#-lproc-3.2.7#-lproc-3.2.8#' configure
-  [ $NOEXTRACT -eq 1 ] || ./configure --prefix=/usr
+  [ $NOEXTRACT -eq 1 ] || ./configure --prefix=/usr --without-x
   (cd modules && make modules)
 }
 
diff --git a/community/open-vm-tools/PKGBUILD b/community/open-vm-tools/PKGBUILD
index 9a97df2e4..447d3dedd 100644
--- a/community/open-vm-tools/PKGBUILD
+++ b/community/open-vm-tools/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 48659 2011-06-03 19:34:11Z stephane $
+# $Id: PKGBUILD 49148 2011-06-11 22:48:15Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: Krzysztof Raczkowski <raczkow@gmail.com>
 
 pkgname=open-vm-tools
-pkgver=2011.03.28
-_pkgsubver=387002
-pkgrel=4
+pkgver=2011.05.27
+_pkgsubver=420096
+pkgrel=1
 pkgdesc="The Open Virtual Machine Tools (open-vm-tools) are the open source implementation of VMware Tools."
 arch=('i686' 'x86_64')
 url="http://open-vm-tools.sourceforge.net/"
@@ -24,7 +24,7 @@ source=(http://switch.dl.sourceforge.net/$pkgname/$pkgname-$pkgver-${_pkgsubver}
 	tools.conf
 	vmware-guestd
 	xautostart.conf)
-md5sums=('a9c72ab0b8f7778d444e69e9d3b95527'
+md5sums=('3e43d4857d412d02115e69db193830b5'
          '06f7448e274db2a911f582e276088fc9'
          'b183ec265200d68431a5e4eb1b0c8cf5'
          '8c333a979578bdc0c3134c1dd6bb7353'
diff --git a/community/rawtherapee/PKGBUILD b/community/rawtherapee/PKGBUILD
index 1de4c8f15..331f5b011 100644
--- a/community/rawtherapee/PKGBUILD
+++ b/community/rawtherapee/PKGBUILD
@@ -1,17 +1,17 @@
-# $Id: PKGBUILD 48519 2011-06-01 11:08:54Z stativ $
+# $Id: PKGBUILD 49124 2011-06-11 10:51:22Z stativ $
 # Maintainer: Lukas Jirkovsky <l.jirkovsky AT gmail.com>
 # Contributor: Bogdan Szczurek <thebodzio(at)gmail.com>
 # Contributor: Vaclav Kramar <vaclav.kramar@tiscali.cz>
 # Contributor: Archie <mymaud@gmail.com>
 
 pkgname=rawtherapee
-pkgver=3.1m5
+pkgver=3.1m6
 pkgrel=1
 pkgdesc="RAW photo editor"
 arch=('i686' 'x86_64')
 url="http://www.rawtherapee.com/"
 license=('GPL')
-depends=('bzip2' 'libsigc++' 'gtkmm' 'libiptcdata' 'lcms2' 'desktop-file-utils')
+depends=('bzip2' 'gtkmm' 'libiptcdata' 'lcms2' 'desktop-file-utils')
 makedepends=('mercurial' 'cmake')
 install=rawtherapee.install
 source=(rawtherapee.desktop rawtherapee.png)
@@ -47,7 +47,6 @@ build() {
 
   cmake -DCMAKE_INSTALL_PREFIX=/usr \
     -DCMAKE_BUILD_TYPE=Release \
-    -DWITH_MYFILE_MMAP=OFF \
      ../$_repo
   make
 }
diff --git a/community/virtualbox/PKGBUILD b/community/virtualbox/PKGBUILD
index 99ccde3a0..ca6bff6ee 100644
--- a/community/virtualbox/PKGBUILD
+++ b/community/virtualbox/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 47286 2011-05-20 18:13:22Z ibiru $
+# $Id: PKGBUILD 49114 2011-06-11 08:28:49Z ibiru $
 #Maintainer: Ionut Biru <ibiru@archlinux.org>
 pkgbase=virtualbox
 pkgname=('virtualbox' 'virtualbox-guest-additions' 'virtualbox-guest-modules' 'virtualbox-sdk')
 pkgver=4.0.8
-pkgrel=2
+pkgrel=4
 arch=('i686' 'x86_64')
 url='http://virtualbox.org'
 license=('GPL' 'custom')
@@ -17,7 +17,7 @@ source=(http://download.virtualbox.org/virtualbox/${pkgver}/VirtualBox-${pkgver}
         10-vboxdrv.rules 60-vboxguest.rules vboxdrv-reference.patch LocalConfig.kmk vboxdrv.sh
         18-system-xorg.patch
         change_default_driver_dir.patch)
-_kernver=2.6.38-ARCH
+_kernver=2.6.39-ARCH
 
 build() {
     cd "$srcdir/VirtualBox-${pkgver}_OSE"
@@ -179,7 +179,7 @@ package_virtualbox-guest-modules(){
     pkgdesc="VirtualBox kernel modules for Linux guests"
     license=('GPL')
     install=virtualbox-guest-modules.install
-    depends=('kernel26>=2.6.38' 'kernel26<2.6.39')
+    depends=('kernel26>=2.6.39' 'kernel26<2.6.40')
     replaces=('virtualbox-ose-additions-modules')
     conflicts=('virtualbox-ose-additions-modules')
 
diff --git a/community/virtualbox/virtualbox-guest-modules.install b/community/virtualbox/virtualbox-guest-modules.install
index 3681c28e3..ae05bd1ba 100644
--- a/community/virtualbox/virtualbox-guest-modules.install
+++ b/community/virtualbox/virtualbox-guest-modules.install
@@ -1,4 +1,4 @@
-KERNEL_VERSION='2.6.38-ARCH'
+KERNEL_VERSION='2.6.39-ARCH'
 
 post_install() {
   cat << EOM
diff --git a/community/wine/PKGBUILD b/community/wine/PKGBUILD
new file mode 100644
index 000000000..b71a1557d
--- /dev/null
+++ b/community/wine/PKGBUILD
@@ -0,0 +1,145 @@
+# $Id: PKGBUILD 49102 2011-06-11 03:15:30Z svenstaro $
+# Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com>
+# Contributor: Jan "heftig" Steffens <jan.steffens@gmail.com>
+# Contributor: Eduardo Romero <eduardo@archlinux.org>
+# Contributor: Giovanni Scafora <giovanni@archlinux.org>
+
+pkgname=wine
+pkgver=1.3.22
+pkgrel=1
+
+_pkgbasever=${pkgver/rc/-rc}
+
+source=(http://ibiblio.org/pub/linux/system/emulators/$pkgname/$pkgname-$_pkgbasever.tar.bz2)
+md5sums=('46f313013644d31ad37b8fc5c2c16467')
+
+pkgdesc="A compatibility layer for running Windows programs"
+url="http://www.winehq.com"
+arch=(i686 x86_64)
+license=(LGPL)
+install=wine.install
+
+depends=(
+  fontconfig      lib32-fontconfig
+  mesa            lib32-mesa 
+  libxcursor      lib32-libxcursor
+  libxrandr       lib32-libxrandr
+  libxdamage      lib32-libxdamage
+  libxxf86dga     lib32-libxxf86dga
+  libxi           lib32-libxi
+  alsa-lib        lib32-alsa-lib
+  desktop-file-utils
+)
+
+makedepends=(autoconf ncurses bison perl fontforge flex prelink
+  'gcc>=4.5.0-2'  'gcc-multilib>=4.5.0-2'
+  giflib          lib32-giflib
+  libxpm          lib32-libxpm
+  libpng          lib32-libpng
+  libxinerama     lib32-libxinerama
+  libxcomposite   lib32-libxcomposite
+  libxmu          lib32-libxmu
+  libxxf86vm      lib32-libxxf86vm
+  libxml2         lib32-libxml2
+  libxslt         lib32-libxslt
+  libldap         lib32-libldap
+  lcms            lib32-lcms
+  mpg123          lib32-mpg123
+  openal          lib32-openal
+  jack            lib32-jack
+  libcups         lib32-libcups
+  gnutls          lib32-gnutls
+  v4l-utils       lib32-v4l-utils
+  oss
+)
+  
+optdepends=(
+  giflib          lib32-giflib
+  libpng          lib32-libpng
+  libldap         lib32-libldap
+  lcms            lib32-lcms
+  libxml2         lib32-libxml2
+  mpg123          lib32-mpg123
+  openal          lib32-openal
+  jack            lib32-jack
+  libcups         lib32-libcups
+  gnutls          lib32-gnutls
+  v4l-utils       lib32-v4l-utils
+  oss
+)
+
+if [[ $CARCH == i686 ]]; then
+  # Strip lib32 etc. on i686
+  depends=(${depends[@]/*32-*/})
+  makedepends=(${makedepends[@]/*32-*/})
+  makedepends=(${makedepends[@]/*-multilib*/})
+  optdepends=(${optdepends[@]/*32-*/})
+else
+  provides=("bin32-wine=$pkgver" "wine-wow64=$pkgver")
+  conflicts=('bin32-wine' 'wine-wow64')
+  replaces=('bin32-wine')
+fi
+
+build() {
+  cd "$srcdir"
+
+  # Allow ccache to work
+  mv $pkgname-$_pkgbasever $pkgname
+
+  # Get rid of old build dirs
+  rm -rf $pkgname-{32,64}-build
+  mkdir $pkgname-32-build
+
+  if [[ $CARCH == x86_64 ]]; then
+    msg2 "Building Wine-64..."
+
+    mkdir $pkgname-64-build
+    cd "$srcdir/$pkgname-64-build"
+    ../$pkgname/configure \
+      --prefix=/usr \
+      --sysconfdir=/etc \
+      --libdir=/usr/lib \
+      --with-x \
+      --enable-win64
+
+    make
+
+    _wine32opts=(
+      --libdir=/usr/lib32
+      --with-wine64="$srcdir/$pkgname-64-build"
+    )
+
+    export PKG_CONFIG_PATH="/usr/lib32/pkgconfig"
+  fi
+
+  msg2 "Building Wine-32..."
+  cd "$srcdir/$pkgname-32-build"
+  ../$pkgname/configure \
+    --prefix=/usr \
+    --sysconfdir=/etc \
+    --with-x \
+    "${_wine32opts[@]}"
+
+  make
+}
+
+package() {
+  msg2 "Packaging Wine-32..."
+  cd "$srcdir/$pkgname-32-build"
+
+  if [[ $CARCH == i686 ]]; then
+    make prefix="$pkgdir/usr" install
+  else
+    make prefix="$pkgdir/usr" \
+      libdir="$pkgdir/usr/lib32" \
+      dlldir="$pkgdir/usr/lib32/wine" install
+
+    msg2 "Packaging Wine-64..."
+    cd "$srcdir/$pkgname-64-build"
+    make prefix="$pkgdir/usr" \
+      libdir="$pkgdir/usr/lib" \
+      dlldir="$pkgdir/usr/lib/wine" install
+  fi
+}
+
+# vim:set ts=8 sts=2 sw=2 et:
diff --git a/community/wine/wine.install b/community/wine/wine.install
new file mode 100644
index 000000000..f71262186
--- /dev/null
+++ b/community/wine/wine.install
@@ -0,0 +1,12 @@
+post_install() {
+	update-desktop-database -q
+	echo "This wine package is wow64 enabled. This means it can run 32bit/64bit Windows apps on x86_64."
+	echo "If you are on x86_64, the default WINEARCH will be win64."
+	echo "This will cause a lot of Windows applications to malfunction even if they usually work in wine."
+	echo "Please create your ~/.wine with 'WINEARCH=win32 winecfg' if you are unsure and on x86_64."
+	echo "See the Arch wiki on wine for more information."
+}
+
+post_remove() {
+	update-desktop-database -q
+}