Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el

Conflicts:
	community/obconf/PKGBUILD
	community/obconf/obconf.install
	community/qstardict/PKGBUILD
	core/binutils/PKGBUILD
	core/gcc/PKGBUILD.mips64el
	extra/cups/PKGBUILD
	extra/eject/PKGBUILD
	extra/emacs/PKGBUILD
	extra/evilwm/PKGBUILD
	extra/fbset/PKGBUILD
	extra/gmpc/PKGBUILD
	extra/gnome-alsamixer/PKGBUILD
	extra/gtkpod/PKGBUILD
	extra/kdepim/PKGBUILD
	extra/kile/PKGBUILD
	extra/libvpx/PKGBUILD
	extra/php-apc/PKGBUILD
	extra/php-suhosin/PKGBUILD
	extra/php/PKGBUILD
	extra/pidgin/PKGBUILD
	extra/potrace/PKGBUILD
	extra/racket/PKGBUILD
	extra/soundtouch/PKGBUILD
	extra/wireshark/PKGBUILD
	extra/xpdf/PKGBUILD
	multilib/binutils-multilib/PKGBUILD
	multilib/lib32-acl/PKGBUILD
	multilib/lib32-attr/PKGBUILD
	multilib/lib32-glibc/PKGBUILD
	multilib/lib32-udev/PKGBUILD
	~xihh/abiword/PKGBUILD

2 files changed, 36 insertions, 75 deletions

diff --git a/community/openbox/PKGBUILD b/community/openbox/PKGBUILD
index 85f3a34d6..d08978805 100644
--- a/community/openbox/PKGBUILD
+++ b/community/openbox/PKGBUILD
@@ -1,47 +1,50 @@
-# $Id: PKGBUILD 49029 2011-06-09 21:05:36Z andrea $
+# $Id: PKGBUILD 54399 2011-08-18 05:37:17Z bfanella $
 # Maintainer:
 # Contributor: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: tobias <tobias@archlinux.org>
 
 pkgname=openbox
-pkgver=3.4.11.2
-pkgrel=2
+pkgver=3.5.0
+pkgrel=3
 pkgdesc="A window manager for the X11 windowing system"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://openbox.org"
 license=('GPL')
 depends=('startup-notification' 'libxml2' 'libxinerama' 'libxrandr'
-	'libxcursor' 'pango')
+         'libxcursor' 'pango' 'imlib2')
 optdepends=('pyxdg: for the xdg-autostart script')
 groups=('lxde')
 install=${pkgname}.install
 options=('!libtool')
 backup=('etc/xdg/openbox/menu.xml' 'etc/xdg/openbox/rc.xml')
-source=(http://www.icculus.org/openbox/releases/${pkgname}-${pkgver}.tar.gz
+source=("http://www.icculus.org/openbox/releases/${pkgname}-${pkgver}.tar.gz"
         'which-2.20.patch')
-md5sums=('30e669134fa81df810fe7d1dc59cd931'
-         'ec5e3d4d74779b0ca576a053ae54124d')
+md5sums=('00441b53cf14c03566c8e82643544ff9'
+         '7ca3b5244bb092d46f5bcf1e2bdf4a18')
 
 build() {
-  cd ${srcdir}/${pkgname}-${pkgver}
+  	cd "${srcdir}"/${pkgname}-${pkgver}
 
-  # FS#11455
-  patch -Np1 -i ${srcdir}/which-2.20.patch
-  sed -i 's#python#python2#' tools/xdg-autostart/xdg-autostart
-  ./configure --prefix=/usr \
-    --with-x \
-    --enable-startup-notification \
-    --sysconfdir=/etc
-  make
+  	# FS#11455
+  	patch -p1 -i "${srcdir}"/which-2.20.patch
+  	sed -i 's|/usr/bin/env python|/usr/bin/env python2|' \
+  		data/autostart/openbox-xdg-autostart
+  
+	./configure --prefix=/usr \
+    		--with-x \
+    		--enable-startup-notification \
+    		--sysconfdir=/etc \
+		--libexecdir=/usr/lib/openbox
+  
+	make
 }
 
 package() {
-  cd ${srcdir}/${pkgname}-${pkgver}
+  	cd "${srcdir}"/${pkgname}-${pkgver}
+  	make DESTDIR="${pkgdir}" install
 
-  make DESTDIR=${pkgdir} install
-
-  sed -i "s:startkde:/usr/bin/\0:" \
-    ${pkgdir}/usr/share/xsessions/openbox-kde.desktop
-  sed -i "s:=gnome-session:=/usr/bin/gnome-session:" \
-    ${pkgdir}/usr/share/xsessions/openbox-gnome.desktop
+  	sed -i "s:startkde:/usr/bin/\0:" \
+  		"${pkgdir}"/usr/share/xsessions/openbox-kde.desktop
+  	sed -i "s:=gnome-session:=/usr/bin/gnome-session:" \
+    		"${pkgdir}"/usr/share/xsessions/openbox-gnome.desktop
 }
diff --git a/community/openbox/which-2.20.patch b/community/openbox/which-2.20.patch
index 7f663ae49..f947d6a98 100644
--- a/community/openbox/which-2.20.patch
+++ b/community/openbox/which-2.20.patch
@@ -1,53 +1,11 @@
---- openbox-3.4.11.1/data/autostart.sh.in	2010-03-14 09:40:37.000000000 -0500
-+++ openbox-3.4.11.1/data/autostart.sh.in	2010-03-26 14:44:36.000000000 -0500
-@@ -3,13 +3,13 @@
+--- openbox-3.5.0/data/autostart/autostart.in~	2011-08-02 15:50:01.963531310 +0000
++++ openbox-3.5.0/data/autostart/autostart.in	2011-08-02 15:51:57.277879458 +0000
+@@ -8,7 +8,7 @@
+ #
+ #if test -x @libexecdir@/gnome-settings-daemon >/dev/null; then
+ #  @libexecdir@/gnome-settings-daemon &
+-#elif which gnome-settings-daemon >/dev/null; then
++#elif which gnome-settings-daemon >/dev/null 2>&1; then
+ #  gnome-settings-daemon &
+ #fi
  
- # Set a background color
- BG=""
--if which hsetroot >/dev/null; then
-+if which hsetroot >/dev/null 2>&1; then
-     BG=hsetroot
- else
--    if which esetroot >/dev/null; then
-+    if which esetroot >/dev/null 2>&1; then
- 	BG=esetroot
-     else
--	if which xsetroot >/dev/null; then
-+	if which xsetroot >/dev/null 2>&1; then
- 	    BG=xsetroot
- 	fi
-     fi
-@@ -17,28 +17,28 @@
- test -z $BG || $BG -solid "#303030"
- 
- # D-bus
--if which dbus-launch >/dev/null && test -z "$DBUS_SESSION_BUS_ADDRESS"; then
-+if which dbus-launch >/dev/null 2>&1 && test -z "$DBUS_SESSION_BUS_ADDRESS"; then
-        eval `dbus-launch --sh-syntax --exit-with-session`
- fi
- 
- # Make GTK apps look and behave how they were set up in the gnome config tools
- if test -x @libexecdir@/gnome-settings-daemon >/dev/null; then
-   @libexecdir@/gnome-settings-daemon &
--elif which gnome-settings-daemon >/dev/null; then
-+elif which gnome-settings-daemon >/dev/null 2>&1; then
-   gnome-settings-daemon &
- # Make GTK apps look and behave how they were set up in the XFCE config tools
--elif which xfce-mcs-manager >/dev/null; then
-+elif which xfce-mcs-manager >/dev/null 2>&1; then
-   xfce-mcs-manager n &
- fi
- 
- # Preload stuff for KDE apps
--if which start_kdeinit >/dev/null; then
-+if which start_kdeinit >/dev/null 2>&1; then
-   LD_BIND_NOW=true start_kdeinit --new-startup +kcminit_startup &
- fi
- 
- # Run XDG autostart things.  By default don't run anything desktop-specific
- # See xdg-autostart --help more info
- DESKTOP_ENV="OPENBOX"
--if which @secretbindir@/xdg-autostart >/dev/null; then
-+if which @secretbindir@/xdg-autostart >/dev/null 2>&1; then
-   @secretbindir@/xdg-autostart $DESKTOP_ENV
- fi