Merge branch 'master' of ssh://parabolagnulinux.org:1863/home/parabola/abslibre-pre-mips64el

Conflicts:
	community-staging/mplayer2/PKGBUILD
	community/pcmanfm/PKGBUILD
	extra/liblrdf/PKGBUILD
	extra/php-apc/PKGBUILD
	extra/sqlite/PKGBUILD
	kde-unstable/libkgapi/PKGBUILD
	kde-unstable/soprano/PKGBUILD
	multilib/lib32-libphobos-ldc/PKGBUILD
	multilib/lib32-pixman/PKGBUILD
	multilib/lib32-sqlite3/PKGBUILD

13 files changed, 72 insertions, 67 deletions

diff --git a/community/awesome/PKGBUILD b/community/awesome/PKGBUILD
index ee6427335..27db062b5 100644
--- a/community/awesome/PKGBUILD
+++ b/community/awesome/PKGBUILD
@@ -1,12 +1,12 @@
-# $Id: PKGBUILD 71885 2012-06-02 21:17:08Z heftig $
+# $Id: PKGBUILD 72334 2012-06-12 00:36:49Z seblu $
 # Maintainer: Sébastien Luttringer <seblu@aur.archlinux.org>
 # Contributor: xduugu
 # Contributor: Ronald van Haren <ronald.archlinux.org>
 # Contributor: Vesa Kaihlavirta
 
 pkgname=awesome
-pkgver=3.4.11
-pkgrel=5
+pkgver=3.4.12
+pkgrel=1
 pkgdesc='Highly configurable framework window manager'
 arch=('i686' 'x86_64')
 url='http://awesome.naquadah.org/'
@@ -41,16 +41,12 @@ optdepends=(
 )
 provides=('notification-daemon')
 source=("$url/download/$pkgname-$pkgver.tar.xz"
-        "$pkgname.desktop"
-        '01-fix_glib2_build.patch')
-md5sums=('d6aa71334b5cd4ef63ce69d6c612ecf2'
-         '0fdbeec43d211c6750041d7e37611a6a'
-         'baa179074c36e26ef156ebb2060bfd5c')
+        "$pkgname.desktop")
+md5sums=('2c3490b820a19c044290027e6f2eb6c8'
+         '0fdbeec43d211c6750041d7e37611a6a')
 
 build() {
   cd $pkgname-$pkgver
-  # to remove in 3.4.12
-  patch -N -p1 -i ../01-fix_glib2_build.patch
   make CMAKE_ARGS=' -DPREFIX=/usr -DSYSCONFDIR=/etc -DCMAKE_BUILD_TYPE=RELEASE'
 }
 
diff --git a/community/bsd-games/PKGBUILD b/community/bsd-games/PKGBUILD
index c6ff48f86..47f8ea801 100644
--- a/community/bsd-games/PKGBUILD
+++ b/community/bsd-games/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 65659 2012-02-21 19:55:34Z cbrannon $
+# $Id: PKGBUILD 72260 2012-06-11 12:32:05Z cbrannon $
 # Maintainer: Chris Brannon <cmbrannon79@gmail.com>
 # Contributor: Abhishek Dasgupta <abhidg@gmail.com>
 # Contributor: SmackleFunky <smacklefunky@optusnet.com.au>
 
 pkgname=bsd-games
 pkgver=2.17
-pkgrel=11
+pkgrel=12
 pkgdesc="A linux port for a collection of BSD command line games."
 url="ftp://ftp.ibiblio.org/pub/Linux/games/"
 arch=('i686' 'x86_64' 'mips64el')
@@ -87,7 +87,7 @@ package() {
 }
 
 md5sums=('238a38a3a017ca9b216fc42bde405639'
-         '4425fdde12bd5edf97cd92e472a9531f'
+         '9916baef5cb8aa09361f67de12ca7bef'
          '784f68c796b9e099ac008aecef1af998'
          '9c0fa6e2345bd0a7945c9a41d5ba68aa'
          '5356bd6999ae53dd27cb2a0f837a3e70'
diff --git a/community/bsd-games/config.params b/community/bsd-games/config.params
index 30d021e99..6afa0e43f 100644
--- a/community/bsd-games/config.params
+++ b/community/bsd-games/config.params
@@ -13,4 +13,3 @@ bsd_games_cfg_do_chown=n
 bsd_games_cfg_sail_dir=/tmp
 bsd_games_cfg_sail_dir_perms=0777
 bsd_games_cfg_hack_dir_perms=0777
-bsd_games_cfg_pager=/bin/less
diff --git a/community/emacs-nox/PKGBUILD b/community/emacs-nox/PKGBUILD
index 1ec9cf40f..85a888af8 100644
--- a/community/emacs-nox/PKGBUILD
+++ b/community/emacs-nox/PKGBUILD
@@ -1,15 +1,14 @@
-# $Id: PKGBUILD 67599 2012-03-13 13:43:30Z lcarlier $
+# $Id: PKGBUILD 72353 2012-06-12 21:10:00Z jlichtblau $
 # Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
 # Contributor: Chris Brannon <cmbrannon@cox.net>
 
 pkgname=emacs-nox
-pkgver=23.4
+pkgver=24.1
 pkgrel=1
 pkgdesc="The Emacs Editor, without X11 support"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.gnu.org/software/emacs/emacs.html"
 license=('GPL')
-replaces=('cedet')
 depends=('dbus-core' 'ncurses' 'perl')
 provides=('emacs')
 conflicts=('emacs' 'emacs-cvs')
@@ -17,43 +16,33 @@ options=('docs')
 changelog=$pkgname.changelog
 install=$pkgname.install
 source=(ftp://ftp.gnu.org/gnu/emacs/emacs-${pkgver}.tar.gz)
-sha256sums=('b9a2b8434052771f797d2032772eba862ff9aa143029efc72295170607289c18')
+sha256sums=('60d26dd1d9c0b955543ae83a2f4dd7c8b6af59e16a06822cfb175f1bf97c8bab')
 
 build() {
   cd ${srcdir}/emacs-$pkgver
 
-  # gcc 4.5 Workaround: http://gcc.gnu.org/bugzilla/show_bug.cgi?id=43904
-  CFLAGS="${CFLAGS} -fno-optimize-sibling-calls"\
- ./configure --prefix=/usr --without-x --without-sound
-
-  # we don't want to use /usr/libexec
-  sed -i "s|\"/usr/libexec/emacs.*$|\"/usr/lib/emacs/$pkgver\"|g" src/epaths.h
-  #  mv newepaths.h src/epaths.h
-
-  make libexecdir=/usr/lib archlibdir=/usr/lib/emacs/${pkgver}
+  ./configure --prefix=/usr --sysconfdir=/etc --libexecdir=/usr/lib \
+    --localstatedir=/var --without-x --without-sound
+  make
 }
 
 package() {
   cd ${srcdir}/emacs-$pkgver
-
-  make prefix=${pkgdir}/usr libexecdir=${pkgdir}/usr/lib \
-    archlibdir=${pkgdir}/usr/lib/emacs/${pkgver} install
-
+  make DESTDIR=${pkgdir} install
+  
   # remove conflict with ctags package
   mv ${pkgdir}/usr/bin/{ctags,ctags.emacs}
-  mv ${pkgdir}/usr/bin/{etags,etags.emacs}
-  mv ${pkgdir}/usr/share/man/man1/{etags.1,etags.emacs.1}
-  mv ${pkgdir}/usr/share/man/man1/{ctags.1,ctags.emacs.1}
+  mv ${pkgdir}/usr/share/man/man1/{ctags.1.gz,ctags.emacs.1}
+
   # fix all the 777 perms on directories
   find ${pkgdir}/usr/share/emacs/$pkgver -type d -exec chmod 755 {} \;
   # fix user/root permissions on usr/share files
   find ${pkgdir}/usr/share/emacs/$pkgver -exec chown root.root {} \;
-  # remove empty files
-  rm -rf ${pkgdir}/usr/var
   # remove .desktop file and icons
   rm -rf ${pkgdir}/usr/share/{applications,icons}
-
-  # get rid of the package's info directory, install-info adds entries for us at install-time
-  rm ${pkgdir}/usr/share/info/dir
-  gzip -9nf ${pkgdir}/usr/share/info/*
+  # fix perms on /var/games
+  chmod 775 ${pkgdir}/var/games
+  chmod 775 ${pkgdir}/var/games/emacs
+  chmod 664 ${pkgdir}/var/games/emacs/*
+  chown -R root:games ${pkgdir}/var/games
 }
diff --git a/community/emacs-nox/emacs-nox.changelog b/community/emacs-nox/emacs-nox.changelog
index 1ed424b05..5e4d8f206 100644
--- a/community/emacs-nox/emacs-nox.changelog
+++ b/community/emacs-nox/emacs-nox.changelog
@@ -1,3 +1,6 @@
+2012-06-12 Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
+	* emacs-nox 24.1-1
+
 2011-03-13 Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
 	* emacs-nox 23.3-1
 
diff --git a/community/emacs-nox/emacs-nox.install b/community/emacs-nox/emacs-nox.install
index ea8630090..740640994 100644
--- a/community/emacs-nox/emacs-nox.install
+++ b/community/emacs-nox/emacs-nox.install
@@ -1,12 +1,15 @@
-info_dir=/usr/share/info
-info_files=(ada-mode autotype calc ccmode cl dired-x ebrowse
-ediff efaq eintr elisp emacs emacs-mime erc eshell eudc flymake forms
-gnus idlwave info message mh-e newsticker org pcl-cvs pgg rcirc reftex
-sc ses sieve smtpmail speedbar tramp url vip viper widget woman)
+INFO_DIR=usr/share/info
+
+INFO_FILES=(ada-mode auth autotype calc ccmode cl dbus dired-x ebrowse
+ede ediff edt efaq eieio eintr elisp emacs emacs-mime epa erc eshell eudc flymake
+forms gnus idlwave info mairix-el message mh-e newsticker nxml-mode
+org pcl-cvs pgg rcirc reftex remember sasl sc semantic ses sieve smtpmail
+speedbar tramp url vip viper widget woman)
 
 post_install() {
-  for f in ${info_files[@]}; do
-    install-info ${info_dir}/$f.gz ${info_dir}/dir 2> /dev/null
+  [[ -x usr/bin/install-info ]] || return 0
+  for f in ${INFO_FILES[@]}; do
+    install-info ${INFO_DIR}/$f.gz ${INFO_DIR}/dir 2> /dev/null
   done
 }
 
@@ -15,7 +18,8 @@ post_upgrade() {
 }
 
 pre_remove() {
-  for f in ${info_files[@]}; do
-    install-info --delete ${info_dir}/$f.gz ${info_dir}/dir 2> /dev/null
+  [[ -x usr/bin/install-info ]] || return 0
+  for f in ${INFO_FILES[@]}; do
+    install-info --delete ${INFO_DIR}/$f.gz ${INFO_DIR}/dir 2> /dev/null
   done
 }
diff --git a/community/gtkwave/PKGBUILD b/community/gtkwave/PKGBUILD
index 358789e62..f1c8cc0a7 100644
--- a/community/gtkwave/PKGBUILD
+++ b/community/gtkwave/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 70580 2012-05-12 02:21:28Z kkeen $
+# $Id: PKGBUILD 72340 2012-06-12 09:32:15Z kkeen $
 # Maintainer: Kyle Keen <keenerd@gmail.com>
 # Contributor: Thomas Dziedzic < gostrc at gmail >
 # Contributor: Jared Casper <jaredcasper@gmail.com>
 
 pkgname=gtkwave
-pkgver=3.3.36
+pkgver=3.3.37
 pkgrel=1
 pkgdesc='A wave viewer which reads LXT, LXT2, VZT, GHW and VCD/EVCD files'
 arch=('i686' 'x86_64' 'mips64el')
@@ -14,7 +14,7 @@ depends=('bzip2' 'xz' 'gtk2')
 makedepends=('gperf')
 install='gtkwave.install'
 source=("http://gtkwave.sourceforge.net/gtkwave-${pkgver}.tar.gz")
-md5sums=('a4275363369b0b7011afbaa7ec1667e6')
+md5sums=('8747205c6cf1abb34b5a8b2f157f37e0')
 
 build() {
   cd "${srcdir}/gtkwave-${pkgver}"
diff --git a/community/ldc/PKGBUILD b/community/ldc/PKGBUILD
index 444a91412..f293c971b 100644
--- a/community/ldc/PKGBUILD
+++ b/community/ldc/PKGBUILD
@@ -1,7 +1,7 @@
-# $Id: PKGBUILD 72051 2012-06-07 08:44:48Z svenstaro $
+# $Id: PKGBUILD 72264 2012-06-11 13:28:25Z svenstaro $
 # Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com>
 pkgname=ldc
-pkgver=20120607
+pkgver=20120611
 pkgrel=1
 pkgdesc="A D Compiler based on the LLVM Compiler Infrastructure including D runtime and libphobos2"
 arch=('i686' 'x86_64')
diff --git a/community/lxpanel/PKGBUILD b/community/lxpanel/PKGBUILD
index a945f315b..7e37715c5 100644
--- a/community/lxpanel/PKGBUILD
+++ b/community/lxpanel/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 69844 2012-04-24 15:37:58Z bpiotrowski $
+# $Id: PKGBUILD 72336 2012-06-12 05:13:20Z bpiotrowski $
 # Maintainer:  Bartłomiej Piotrowski <barthalion@gmail.com>
 # Contributor: Angel Velasquez <angvp@archlinux.org>
 # Contributor: Juergen Hoetzel <juergen@archlinux.org>
 
 pkgname=lxpanel
-pkgver=0.5.9
+pkgver=0.5.10
 pkgrel=1
 pkgdesc="Panel of the LXDE Desktop"
 arch=('i686' 'x86_64' 'mips64el')
@@ -15,7 +15,7 @@ depends=('gtk2' 'alsa-lib' 'menu-cache' 'lxmenu-data' 'libwnck')
 makedepends=('wireless_tools')
 optdepends=('wireless_tools: netstat plugin')
 source=(http://ftp.de.debian.org/debian/pool/main/l/$pkgname/${pkgname}_${pkgver}.orig.tar.xz)
-md5sums=('c0b5864ea53113f4b1d4b8a46e9fb8ee')
+md5sums=('86a87723ec15274d4c0fe191e8a2fa52')
 
 build() {
 	cd "$srcdir/$pkgname-$pkgver"
diff --git a/community/mosh/PKGBUILD b/community/mosh/PKGBUILD
index 4d9aa7fbd..3a9a34262 100644
--- a/community/mosh/PKGBUILD
+++ b/community/mosh/PKGBUILD
@@ -5,7 +5,7 @@
 
 pkgname=mosh
 pkgver=1.2.1
-pkgrel=2
+pkgrel=3
 pkgdesc='Mobile shell, surviving disconnects with local echo and line editing'
 arch=('x86_64' 'i686')
 url="http://mosh.mit.edu/"
@@ -29,7 +29,7 @@ package() {
 
   make DESTDIR="$pkgdir/" install
   install -Dm644 "conf/bash_completion.d/$pkgname" \
-    "$pkgdir/etc/bash_completion.d/$pkgname"
+    "$pkgdir/usr/share/bash-completion/completions/$pkgname"
   install -Dm644 "conf/ufw/applications.d/$pkgname" \
     "$pkgdir/etc/ufw/applications.d/ufw-$pkgname"
 }
diff --git a/community/nodejs/PKGBUILD b/community/nodejs/PKGBUILD
index f8a6ba84f..d78c6feb1 100644
--- a/community/nodejs/PKGBUILD
+++ b/community/nodejs/PKGBUILD
@@ -1,5 +1,5 @@
-# $Id: PKGBUILD 70788 2012-05-16 16:52:49Z bpiotrowski $
-# Maintainer:  Nartłomiej Piotrowski <nospam@bpiotrowski.pl>
+# $Id: PKGBUILD 72338 2012-06-12 05:36:21Z bpiotrowski $
+# Maintainer:  Bartłomiej Piotrowski <nospam@bpiotrowski.pl>
 # Contributor: Thomas Dziedzic < gostrc at gmail >
 # Contributor: James Campos <james.r.campos@gmail.com>
 # Contributor: BlackEagle < ike DOT devolder AT gmail DOT com >
@@ -8,7 +8,7 @@
 # Contributor: TIanyi Cui <tianyicui@gmail.com>
 
 pkgname=nodejs
-pkgver=0.6.18
+pkgver=0.6.19
 pkgrel=1
 pkgdesc='Evented I/O for V8 javascript'
 arch=('i686' 'x86_64' 'mips64el')
@@ -19,7 +19,7 @@ checkdepends=('curl') # curl used for check()
 optdepends=('openssl: TLS support')
 options=('!emptydirs')
 source=("http://nodejs.org/dist/v${pkgver}/node-v${pkgver}.tar.gz")
-md5sums=('4a3d3123ccc7b9b21c1990fe074e3d14')
+md5sums=('f5669a9717422b811c6bad1cc961b1e5')
 
 build() {
   cd node-v${pkgver}
@@ -55,7 +55,7 @@ package() {
 
   # install docs as per user request
   install -d ${pkgdir}/usr/share/doc/nodejs
-  cp -r doc/api/api/* \
+  cp -r doc/api/*.html \
     ${pkgdir}/usr/share/doc/nodejs
 
   install -D -m644 LICENSE \
diff --git a/community/pcmanfm/PKGBUILD b/community/pcmanfm/PKGBUILD
index 2b507cd72..57d3b90d4 100644
--- a/community/pcmanfm/PKGBUILD
+++ b/community/pcmanfm/PKGBUILD
@@ -1,23 +1,26 @@
+# $Id: PKGBUILD 72347 2012-06-12 17:01:09Z bpiotrowski $
+# Maintainer:  Bartłomiej Piotrowski <barthalion@gmail.com>
 # Contributor: Unknown47 <unknown47r@gmail.com>
 # Contributor: Angel Velasquez <angvp@archlinux.org>
 # Contributor: Juergen Hoetzel <juergen@archlinux.org>
 
 pkgname=pcmanfm
 pkgver=0.9.10
-pkgrel=1.1
-pkgdesc="File manager of the LXDE Desktop"
+pkgrel=2
+pkgdesc="An extremely fast and lightweight file manager"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://pcmanfm.sourceforge.net/"
 license=('GPL')
 groups=('lxde')
 depends=('gtk2' 'desktop-file-utils' 'libfm' 'lxmenu-data')
 makedepends=('intltool' 'pkgconfig')
+install=$pkgname.install
 source=(http://downloads.sourceforge.net/${pkgname}/${pkgname}-$pkgver.tar.gz)
 md5sums=('d34a3530a6c5dcd674d23021d71c3e95')
 
 build() {
   cd "$srcdir/$pkgname-$pkgver"
-  sed -ri 's/^(pcmanfm_LDADD = )/\1 -lm/' src/Makefile.in
+  LDFLAGS+=' -lm'
   ./configure --sysconfdir=/etc --prefix=/usr 
   make 
 }
diff --git a/community/pcmanfm/pcmanfm.install b/community/pcmanfm/pcmanfm.install
new file mode 100644
index 000000000..8f20cf484
--- /dev/null
+++ b/community/pcmanfm/pcmanfm.install
@@ -0,0 +1,11 @@
+post_install() {
+    update-desktop-database -q
+}
+
+post_upgrade() {
+    update-desktop-database -q
+}
+
+post_remove() {
+    update-desktop-database -q
+}