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

Conflicts:
	community-testing/virtualbox-modules/PKGBUILD
	community-testing/virtualbox-modules/virtualbox-archlinux-modules.install
	community-testing/virtualbox-modules/virtualbox-modules.install
	community/ircii-pana/PKGBUILD
	extra/nasm/PKGBUILD
	extra/vlc/PKGBUILD
	gnome-unstable/baobab/PKGBUILD
	gnome-unstable/clutter/PKGBUILD
	gnome-unstable/dconf/PKGBUILD
	gnome-unstable/evince/PKGBUILD
	gnome-unstable/evolution-data-server/PKGBUILD
	gnome-unstable/evolution/PKGBUILD
	gnome-unstable/evolution/evolution.install
	gnome-unstable/gcr/PKGBUILD
	gnome-unstable/glib2/PKGBUILD
	gnome-unstable/gnome-control-center/PKGBUILD
	gnome-unstable/gnome-control-center/gnome-control-center.install
	gnome-unstable/gnome-desktop/PKGBUILD
	gnome-unstable/gnome-font-viewer/PKGBUILD
	gnome-unstable/gnome-keyring/PKGBUILD
	gnome-unstable/gnome-online-accounts/PKGBUILD
	gnome-unstable/gnome-panel/PKGBUILD
	gnome-unstable/gnome-power-manager/PKGBUILD
	gnome-unstable/gnome-power-manager/gnome-power-manager.install
	gnome-unstable/gnome-screenshot/PKGBUILD
	gnome-unstable/gnome-session/PKGBUILD
	gnome-unstable/gnome-settings-daemon/PKGBUILD
	gnome-unstable/gnome-settings-daemon/gnome-settings-daemon.install
	gnome-unstable/gnome-system-log/PKGBUILD
	gnome-unstable/gtkhtml4/PKGBUILD
	gnome-unstable/gvfs/PKGBUILD
	gnome-unstable/libgnome-keyring/PKGBUILD
	gnome-unstable/libgxps/PKGBUILD
	gnome-unstable/network-manager-applet/PKGBUILD
	gnome-unstable/networkmanager/PKGBUILD
	gnome-unstable/pygobject/PKGBUILD
	gnome-unstable/seahorse/PKGBUILD
	gnome-unstable/telepathy-glib/PKGBUILD
	gnome-unstable/vte3/PKGBUILD
	gnome-unstable/yelp/PKGBUILD
	gnome-unstable/yelp/yelp.install
	testing/kmod/PKGBUILD
	testing/kmod/depmod-search.conf
	testing/lirc/PKGBUILD
	testing/lirc/lirc.install
	testing/openssh/PKGBUILD
	testing/xf86-video-neomagic/PKGBUILD
	~fauno/notmuch/PKGBUILD

1 files changed, 35 insertions, 27 deletions

diff --git a/community/ircii-pana/PKGBUILD b/community/ircii-pana/PKGBUILD
index 8ff4655cf..e7325cac8 100644
--- a/community/ircii-pana/PKGBUILD
+++ b/community/ircii-pana/PKGBUILD
@@ -1,52 +1,60 @@
-# $Id: PKGBUILD 22406 2010-07-21 18:30:48Z jlichtblau $
+# $Id: PKGBUILD 68217 2012-03-19 12:39:02Z lfleischer $
 # Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
 # Contributor: Jaroslav Lichtblau <dragonlord@seznam.cz>
 # inspired by Gentoo: http://kambing.ui.edu/gentoo-portage/net-irc/bitchx/files/
 
 pkgname=ircii-pana
 pkgver=1.1
-pkgrel=4
-pkgdesc="A console-based IRC client - AKA BitchX."
+pkgrel=5
+pkgdesc='A console-based IRC client - AKA BitchX.'
 arch=('i686' 'x86_64' 'mips64el')
-url="http://www.bitchx.org"
+url='http://www.bitchx.org'
 license=('GPL2')
 depends=('ncurses')
 makedepends=('patch')
-source=(http://downloads.sourceforge.net/bitchx/${pkgname}-${pkgver}-final.tar.gz \
-        bitchx-${pkgver}-gcc43.diff \
-        bitchx-${pkgver}-inline.diff \
-        bitchx-${pkgver}-freenode.diff \
-        bitchx-${pkgver}-latin1.diff \
-        bitchx-${pkgver}-64bit.diff)
+source=("http://downloads.sourceforge.net/bitchx/${pkgname}-${pkgver}-final.tar.gz" \
+        "bitchx-${pkgver}-gcc43.diff" \
+        "bitchx-${pkgver}-inline.diff" \
+        "bitchx-${pkgver}-freenode.diff" \
+        "bitchx-${pkgver}-latin1.diff" \
+        "bitchx-${pkgver}-64bit.diff"
+        "bitchx-${pkgver}-open_missing_mode.patch")
 
 md5sums=('611d2dda222f00c10140236f4c331572'
          'e1efc5e52658e6651918e07a116bce18'
          '4824ffd55d51099dd9ee035f4b78d6bf'
          '741e91dd6267d3436c43756429342217'
          '9316105f23a67a9bb7ecfc7485dcd098'
-         'c86f7758db7f438d726fd447dd4a83b0')
+         'c86f7758db7f438d726fd447dd4a83b0'
+         'a80f431488bf3e0e9f0d650d23a08aba')
 
 build() {
-  cd ${srcdir}/BitchX
+  cd "${srcdir}/BitchX"
 
-  patch -Np1 -i ${srcdir}/bitchx-${pkgver}-gcc43.diff || return 1
-  patch -Np1 -i ${srcdir}/bitchx-${pkgver}-inline.diff || return 1
-  patch -Np1 -i ${srcdir}/bitchx-${pkgver}-freenode.diff || return 1
-  patch -Np1 -i ${srcdir}/bitchx-${pkgver}-latin1.diff || return 1
+  patch -Np1 -i "${srcdir}/bitchx-${pkgver}-gcc43.diff"
+  patch -Np1 -i "${srcdir}/bitchx-${pkgver}-inline.diff"
+  patch -Np1 -i "${srcdir}/bitchx-${pkgver}-freenode.diff"
+  patch -Np1 -i "${srcdir}/bitchx-${pkgver}-latin1.diff"
 
-  if [ "$CARCH" == "x86_64" ] ; then
-	  patch -Np1 -i ${srcdir}/bitchx-${pkgver}-64bit.diff || return 1
-  fi
+  # add build fix (needed when building with "-D_FORTIFY_SOURCE=2")
+  patch -Np0 -i "${srcdir}/bitchx-${pkgver}-open_missing_mode.patch"
+
+  [ "$CARCH" == "x86_64" ] && patch -Np1 -i "${srcdir}/bitchx-${pkgver}-64bit.diff"
 
   ./configure --prefix=/usr
-  make || return 1
-  make prefix=${pkgdir}/usr install
+  make
+}
+
+package() {
+  cd "${srcdir}/BitchX"
+
+  make prefix="${pkgdir}/usr" install
 
-#we don't want to link to ${pkgdir}, correcting it then
-  cd ${pkgdir}/usr/bin || return 1
-  rm -f BitchX && ln -s BitchX-${pkgver}-final BitchX || return 1
+  # we don't want to link to ${pkgdir}, correcting it then
+  cd "${pkgdir}/usr/bin"
+  rm -f BitchX && ln -s "BitchX-${pkgver}-final" BitchX
 
-#correcting man page
-  rm -rf ${pkgdir}/usr/man || return 1
-  install -D -m644 ${srcdir}/BitchX/doc/BitchX.1 ${pkgdir}/usr/share/man/man1/BitchX.1 || return 1
+  # correcting man page
+  rm -rf "${pkgdir}/usr/man"
+  install -Dm644 "${srcdir}/BitchX/doc/BitchX.1" "${pkgdir}/usr/share/man/man1/BitchX.1"
 }