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, 55 insertions, 12 deletions

diff --git a/extra/evilwm/LICENSE b/extra/evilwm/LICENSE
new file mode 100644
index 000000000..6778ede8c
--- /dev/null
+++ b/extra/evilwm/LICENSE
@@ -0,0 +1,40 @@
+LICENCE
+
+evilwm 1.1
+Copyright (C) 1999-2011 Ciaran Anscomb <evilwm@6809.org.uk>
+
+This is free software.  You can do what you want to it, but if it
+breaks something, you get to pay for the counselling.  The code was
+originally based on aewm, so this is distributed under the same terms,
+which follow.
+
+
+AEWM LICENCE
+
+Copyright (c) 1998-2000 Decklin Foster.
+
+THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS", WITHOUT ANY EXPRESS
+OR IMPLIED WARRANTIES OF ANY KIND. IN NO EVENT SHALL THE AUTHOR BE
+HELD LIABLE FOR ANY DAMAGES CONNECTED WITH THE USE OF THIS PROGRAM.
+
+You are granted permission to copy, publish, distribute, and/or sell
+copies of this program and any modified versions or derived works,
+provided that this copyright and notice are not removed or altered.
+
+Portions of the code were based on 9wm, which contains this license:
+
+> 9wm is free software, and is Copyright (c) 1994 by David Hogan.
+> Permission is granted to all sentient beings to use this software,
+> to make copies of it, and to distribute those copies, provided
+> that:
+>
+>     (1) the copyright and licence notices are left intact
+>     (2) the recipients are aware that it is free software
+>     (3) any unapproved changes in functionality are either
+>           (i) only distributed as patches
+>       or (ii) distributed as a new program which is not called 9wm
+>               and whose documentation gives credit where it is due
+>     (4) the author is not held responsible for any defects
+>         or shortcomings in the software, or damages caused by it.
+>
+> There is no warranty for this software.  Have a nice day.
diff --git a/extra/evilwm/PKGBUILD b/extra/evilwm/PKGBUILD
index 0e36f70db..d86cabd4b 100644
--- a/extra/evilwm/PKGBUILD
+++ b/extra/evilwm/PKGBUILD
@@ -1,23 +1,26 @@
-# $Id: PKGBUILD 45303 2009-07-09 17:59:42Z giovanni $
+# $Id: PKGBUILD 136041 2011-08-22 00:36:55Z eric $
 # Maintainer: Kevin Piche <kevin@archlinux.org>
 # Contributor: Jochem Kossen <j.kossen@home.nl>
 
 pkgname=evilwm
-pkgver=1.0.1
+pkgver=1.1.0
 pkgrel=1
 pkgdesc="A minimalist but usable window manager for the X Window System."
 arch=('i686' 'x86_64' 'mips64el')
-depends=('libxrandr')
 url="http://evilwm.sourceforge.net"
-source=(http://www.6809.org.uk/evilwm/$pkgname-$pkgver.tar.gz evilwm.desktop)
-license=(custom)
-md5sums=('8fd9256c635cce2289b648a01d54202c' 'fd404c0f0787fbf99b8b3270f639128c')
+license=('custom')
+depends=('libxrandr')
+source=(http://www.6809.org.uk/evilwm/$pkgname-$pkgver.tar.gz LICENSE)
+md5sums=('5f14cc3019320860c85bb07c60a76bd7'
+         '0941ad3e96597ef75c6310f43a0342a0')
 
 build() {
-  cd $startdir/src/$pkgname-$pkgver
-  /usr/bin/make || return 1
-  /usr/bin/make DESTDIR=$startdir/pkg install
-  install -D -m644 $startdir/evilwm.desktop \
-      $startdir/pkg/etc/X11/sessions/evilwm.desktop
-  install -D -m644 README $startdir/pkg/usr/share/licenses/$pkgname/README
+  cd "$srcdir"/$pkgname-$pkgver
+  make
+}
+
+package() {
+  cd "$srcdir"/$pkgname-$pkgver
+  make DESTDIR="$pkgdir" desktopfilesdir=/usr/share/xsessions install
+  install -D -m644 "$srcdir"/LICENSE "$pkgdir"/usr/share/licenses/$pkgname/LICENSE
 }