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

Conflicts:
	community/emesene/PKGBUILD
	community/minidlna/PKGBUILD
	community/uzbl/PKGBUILD
	community/virtualbox/PKGBUILD
	extra/lirc/PKGBUILD
	libre/pacman/PKGBUILD
	multilib-testing/lib32-mesa/PKGBUILD
	testing/mesa/PKGBUILD
	testing/subversion/PKGBUILD

7 files changed, 31 insertions, 16 deletions

diff --git a/libre/icecat/PKGBUILD b/libre/icecat/PKGBUILD
index b2af0eaf1..89f6755fb 100644
--- a/libre/icecat/PKGBUILD
+++ b/libre/icecat/PKGBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Figue <ffigue at gmail>
 # Contributor: Figue <ffigue at gmail>
 # Contributor (Parabola): fauno <fauno@kiwwwi.com.ar>
-# Contrubutor (Parabola): vando <facundo@esdebian.org>
+# Contributor (Parabola): vando <facundo@esdebian.org>
 # Thank you very much to the older contributors:
 # Contributor: evr <evanroman at gmail>
 # Contributor: Muhammad 'MJ' Jassim <UnbreakableMJ@gmail.com> 
@@ -20,7 +20,7 @@
 
 pkgname=icecat
 pkgver=4.0.1
-pkgrel=1
+pkgrel=2
 _xulver=2.0.1
 pkgdesc="GNU version of the Firefox browser. SafeBrowsing and other Google services disabled!"
 arch=('i686' 'x86_64' 'mips64el')
@@ -28,9 +28,9 @@ url="http://www.gnu.org/software/gnuzilla/"
 license=('GPL2' 'MPL' 'LGPL')
 depends=("xulrunner=${_xulver}" 'desktop-file-utils')
 makedepends=('zip' 'pkg-config' 'diffutils' 'python2' 'wireless_tools' 'yasm' 'mesa')
-provides=('firefox')
+provides=("firefox=${pkgver}")
 conflicts=('firefox')
-replaces=("firefox=${pkgver}")
+replaces=('firefox')
 install=icecat.install
 source=(http://ftp.gnu.org/gnu/gnuzilla/${pkgver}/${pkgname}-${pkgver}.tar.xz
         mozconfig
diff --git a/libre/initscripts/PKGBUILD b/libre/initscripts/PKGBUILD
index bb255b4aa..a6a3abecb 100644
--- a/libre/initscripts/PKGBUILD
+++ b/libre/initscripts/PKGBUILD
@@ -6,7 +6,7 @@
 
 pkgname=initscripts
 pkgver=2011.06.4
-pkgrel=1.1
+pkgrel=2
 pkgdesc="System initialization/bootup scripts (Parabola branding)"
 arch=('i686' 'x86_64')
 url="http://parabolagnulinux.org"
@@ -22,7 +22,7 @@ optdepends=('bridge-utils: Network bridging support'
 install=initscripts.install
 source=("https://projects.parabolagnulinux.org/initscripts.git/snapshot/initscripts-${pkgver}.tar.bz2"
         'wireless.conf.d')
-md5sums=('de758f8da0552555135f53bd7184966a'
+md5sums=('df73e4c4043d4eaf6502ca6738c549aa'
          '027576534885b8d5dded9be546057b12')
 
 package() {
diff --git a/libre/pacman/PKGBUILD b/libre/pacman/PKGBUILD
index 8548c1e63..123c0f19a 100644
--- a/libre/pacman/PKGBUILD
+++ b/libre/pacman/PKGBUILD
@@ -21,6 +21,7 @@ source=(ftp://ftp.archlinux.org/other/pacman/$pkgname-$pkgver.tar.gz
         pacman.conf.mips64el
         makepkg.conf
         mips64el.patch)
+        makepkg.conf)
 
 # keep an upgrade path for older installations
 PKGEXT='.pkg.tar.gz'
diff --git a/libre/unarchiver/PKGBUILD b/libre/unarchiver/PKGBUILD
index 6faa61c68..89d7a7b09 100644
--- a/libre/unarchiver/PKGBUILD
+++ b/libre/unarchiver/PKGBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Cedric Girard <girard.cedric@gmail.com>
 pkgname=unarchiver
 pkgver=2.7.1
-pkgrel=1
+pkgrel=2
 pkgdesc="An Objective-C application for uncompressing archive files"
 arch=('x86_64' 'i686' 'mips64el')
 url="http://wakaba.c3.cx/s/apps/unarchiver.html"
diff --git a/libre/xchat-libre/PKGBUILD b/libre/xchat-libre/PKGBUILD
index 8262e03be..0c0c0b6b1 100644
--- a/libre/xchat-libre/PKGBUILD
+++ b/libre/xchat-libre/PKGBUILD
@@ -4,7 +4,7 @@
 pkgbasename=xchat
 pkgname=xchat-libre
 pkgver=2.8.8
-pkgrel=3
+pkgrel=3.1
 pkgdesc="A GTK+ based IRC client without non-free browser reference"
 arch=('i686' 'x86_64')
 url="http://www.xchat.org/"
@@ -18,17 +18,14 @@ optdepends=('enchant: for spell checking support' 'tcl: for tcl plugin' \
             'python2: for python plugin')
 options=('!libtool')
 changelog=ChangeLog
-source=(http://www.xchat.org/files/source/${pkgver%.*}/${pkgbasename}-${pkgver}.tar.xz remove-non-free-suggestion.patch)
-md5sums=('9a11f13121ff0af787bba3b014378e58'
-         '47c665961f11a803e9a12007811a04c9')
-sha1sums=('e12305da42d1aacc26c2ca25e239f393d4dd3532'
-          '05e673aa44813ddac8aabb251d5f0124efde91a2')
-
-
+source=(http://www.xchat.org/files/source/${pkgver%.*}/${pkgbasename}-${pkgver}.tar.xz
+        remove-non-free-suggestion.patch
+        no-firefox.patch)
 
 build() {
   cd "${srcdir}/${pkgbasename}-${pkgver}"
   patch -p1 < ../remove-non-free-suggestion.patch
+  patch -p1 < ../no-firefox.patch
   ./configure --prefix=/usr --sysconfdir=/etc --enable-openssl --enable-dbus \
     --disable-textfe --enable-ipv6 --enable-shm --enable-spell=static
   make
@@ -39,3 +36,9 @@ package() {
   make DESTDIR="${pkgdir}" install
 }
 
+md5sums=('9a11f13121ff0af787bba3b014378e58'
+         '47c665961f11a803e9a12007811a04c9'
+         'ba11c3e889509d1b46307d6ebf74509c')
+sha1sums=('e12305da42d1aacc26c2ca25e239f393d4dd3532'
+          '05e673aa44813ddac8aabb251d5f0124efde91a2'
+          '3a1c115c4436bdfb1882bcf93dedbe0d40dad9ae')
diff --git a/libre/xchat-libre/no-firefox.patch b/libre/xchat-libre/no-firefox.patch
new file mode 100644
index 000000000..7fb5190de
--- /dev/null
+++ b/libre/xchat-libre/no-firefox.patch
@@ -0,0 +1,11 @@
+--- xchat-2.8.8/src/fe-gtk/fe-gtk.c_orig	2011-06-02 04:25:03.386077554 +0200
++++ xchat-2.8.8/src/fe-gtk/fe-gtk.c	2011-06-02 04:25:14.959410608 +0200
+@@ -956,7 +956,7 @@
+ 	}
+ 
+ 	/* everything failed, what now? just try firefox */
+-	if (try_browser ("firefox", NULL, url))
++	if (try_browser ("icecat", NULL, url))
+ 		return;
+ 
+ 	/* fresh out of ideas... */
diff --git a/libre/your-freedom/PKGBUILD b/libre/your-freedom/PKGBUILD
index df53ec0cb..a7f25c7bb 100644
--- a/libre/your-freedom/PKGBUILD
+++ b/libre/your-freedom/PKGBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Parabola Project <dev@list.parabolagnulinux.org>
 pkgname=your-freedom
 pkgver=$(LC_ALL=C date -u +%Y%m%d)
-pkgrel=3
+pkgrel=1
 pkgdesc="This package conflicts with every unfree package known to date."
 arch=('any')
 url="https://parabolagnulinux.org"