Merge branch 'master' of vparabola:~/projects/abslibre-mips64el

Conflicts:
	libre/initscripts/PKGBUILD

10 files changed, 100 insertions, 51 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 dd0d5b045..f476fd0ea 100644
--- a/libre/initscripts/PKGBUILD
+++ b/libre/initscripts/PKGBUILD
@@ -5,8 +5,8 @@
 # Maintainer (Parabola): Nicolas Reynolds <fauno@kiwwwi.com.ar>
 
 pkgname=initscripts
-pkgver=2011.06.3
-pkgrel=1.1
+pkgver=2011.06.4
+pkgrel=2
 pkgdesc="System initialization/bootup scripts (Parabola branding)"
 arch=('i686' 'x86_64')
 url="http://parabolagnulinux.org"
@@ -22,7 +22,6 @@ optdepends=('bridge-utils: Network bridging support'
 install=initscripts.install
 source=("https://projects.parabolagnulinux.org/initscripts.git/snapshot/initscripts-${pkgver}.tar.bz2"
         'wireless.conf.d')
-
 package() {
   cd ${srcdir}/${pkgname}-${pkgver}
   make DESTDIR=${pkgdir} install
diff --git a/libre/pacman/PKGBUILD b/libre/pacman/PKGBUILD
index bccfb3d82..123c0f19a 100644
--- a/libre/pacman/PKGBUILD
+++ b/libre/pacman/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 120035 2011-04-18 16:49:22Z dan $
+# $Id: PKGBUILD 126847 2011-06-07 19:50:19Z dan $
 # Maintainer: Dan McGee <dan@archlinux.org>
 
 pkgname=pacman
-pkgver=3.5.2
-pkgrel=1.1
+pkgver=3.5.3
+pkgrel=1
 pkgdesc="A library-based package manager with dependency support"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.archlinux.org/pacman/"
@@ -20,20 +20,18 @@ source=(ftp://ftp.archlinux.org/other/pacman/$pkgname-$pkgver.tar.gz
         pacman.conf.x86_64
         pacman.conf.mips64el
         makepkg.conf
-	makepkg.conf.mips64el)
-
-md5sums=('b4f1fdbc17100923071ebe8fe9377be5'
-         'c7e6dbee04b7c492febea4366519b91d'
-         '8809642ed398d2b9b98c5974b8b5e348'
-         '3b2e740853e3d1463885675809d4c6ff'
-         'a8684989d3dfad5a6e1bcf95af3e571b'
-         'c1ddddc5cbd1273eafcf1d858c100de0')
+        mips64el.patch)
+        makepkg.conf)
 
 # keep an upgrade path for older installations
 PKGEXT='.pkg.tar.gz'
 
 build() {
   cd $srcdir/$pkgname-$pkgver
+
+# Add the mips64el arch to configure.ac
+  patch -Np0 -i $srcdir/mips64el.patch
+
   ./configure --prefix=/usr --sysconfdir=/etc \
     --localstatedir=/var --enable-doc
   make
@@ -50,30 +48,30 @@ package() {
       install -m644 $srcdir/pacman.conf $pkgdir/etc/pacman.conf
       mycarch="i686"
       mychost="i686-pc-linux-gnu"
-      myflags="-march=i686 "
+      myflags="-march=i686 -mtune=generic -O2 -pipe"
+      myldflags="-Wl,--hash-style=gnu -Wl,--as-needed"
       ;;
     x86_64)
       install -m644 $srcdir/pacman.conf.x86_64 $pkgdir/etc/pacman.conf
       mycarch="x86_64"
       mychost="x86_64-unknown-linux-gnu"
-      myflags="-march=x86-64 "
+      myflags="-march=x86-64 -mtune=generic -O2 -pipe"
+      myldflags="-Wl,--hash-style=gnu -Wl,--as-needed"
       ;;
     mips64el)
       install -m644 $srcdir/pacman.conf.mips64el $pkgdir/etc/pacman.conf
       mycarch="mips64el"
       mychost="mips64el-unknown-linux-gnu"
       myflags="-O2 -march=loongson2f -mabi=n32 -pipe -mplt -Wa,-mfix-loongson2f-nop "
+      myldflags=""
       ;;
   esac
-  if [ $CARCH = mips64el ]; then
-      install -m644 $srcdir/makepkg.conf.mips64el $pkgdir/etc/makepkg.conf
-  else
-      install -m644 $srcdir/makepkg.conf $pkgdir/etc/
-  fi
+  install -m644 $srcdir/makepkg.conf $pkgdir/etc/
   # set things correctly in the default conf file
   sed -i $pkgdir/etc/makepkg.conf \
     -e "s|@CARCH[@]|$mycarch|g" \
     -e "s|@CHOST[@]|$mychost|g" \
+    -e "s|@LDFLAGS[@]|$myldflags|g" \
     -e "s|@CARCHFLAGS[@]|$myflags|g"
 
   # install completion files
@@ -84,3 +82,9 @@ package() {
 }
 
 # vim: set ts=2 sw=2 et:
+md5sums=('c36c18ed4d8ec69c0ecb4f9684266901'
+         'c7e6dbee04b7c492febea4366519b91d'
+         '8809642ed398d2b9b98c5974b8b5e348'
+         '3b2e740853e3d1463885675809d4c6ff'
+         'be10d3d2e533515a0470237761415568'
+         '15d09319fae475f20ba11dd56e832c65')
diff --git a/libre/pacman/makepkg.conf b/libre/pacman/makepkg.conf
index a655e935f..bfa971b7b 100644
--- a/libre/pacman/makepkg.conf
+++ b/libre/pacman/makepkg.conf
@@ -29,9 +29,9 @@ CHOST="@CHOST@"
 #-- Exclusive: will only run on @CARCH@
 # -march (or -mcpu) builds exclusively for an architecture
 # -mtune optimizes for an architecture, but builds for whole processor family
-CFLAGS="@CARCHFLAGS@-mtune=generic -O2 -pipe"
-CXXFLAGS="@CARCHFLAGS@-mtune=generic -O2 -pipe"
-LDFLAGS="-Wl,--hash-style=gnu -Wl,--as-needed"
+CFLAGS="@CARCHFLAGS@"
+CXXFLAGS="@CARCHFLAGS@"
+LDFLAGS="@LDFLAGS@"
 #-- Make Flags: change this for DistCC/SMP systems
 #MAKEFLAGS="-j2"
 
diff --git a/libre/pacman/mips64el.patch b/libre/pacman/mips64el.patch
new file mode 100644
index 000000000..1dac6194f
--- /dev/null
+++ b/libre/pacman/mips64el.patch
@@ -0,0 +1,26 @@
+--- configure.ac.orig	2011-06-10 14:50:19.241750094 -0300
++++ configure.ac	2011-06-10 14:50:35.537678580 -0300
+@@ -271,6 +271,10 @@ case "${host}" in
+ 		CARCH="arm"
+ 		CARCHFLAGS="-march=armv4 "
+ 		;;
++	mips64el-*)
++		CARCH="mips64el"
++		CARCHFLAGS=""
++		;;
+ 	*)
+ 		AC_MSG_WARN([[Your architecture is unknown for makepkg.conf, consider adding it to configure.ac]])
+ 		CARCH="unknown"
+--- configure.orig	2011-06-10 14:57:12.971308117 -0300
++++ configure	2011-06-10 14:56:49.963295618 -0300
+@@ -15673,6 +15673,10 @@ case "${host}" in
+ 		CARCH="arm"
+ 		CARCHFLAGS="-march=armv4 "
+ 		;;
++	mips64el-*)
++		CARCH="mips64el"
++		CARCHFLAGS=""
++		;;
+ 	*)
+ 		{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Your architecture is unknown for makepkg.conf, consider adding it to configure.ac" >&5
+ $as_echo "$as_me: WARNING: Your architecture is unknown for makepkg.conf, consider adding it to configure.ac" >&2;}
diff --git a/libre/pacman/rePKGBUILD b/libre/pacman/rePKGBUILD
index d7378a9f9..af613dc74 100644
--- a/libre/pacman/rePKGBUILD
+++ b/libre/pacman/rePKGBUILD
@@ -1,25 +1,30 @@
-# $Id: PKGBUILD 120035 2011-04-18 16:49:22Z dan $
-# Maintainer: Dan McGee <dan@archlinux.org>
+# Maintainer: Nicolas Reynolds <fauno@kiwwwi.com.ar>
 source PKGBUILD
-unset source
-source=(http://repo.parabolagnulinux.org/core/os/$CARCH/$pkgname-$pkgver-$_pkgrel-$CARCH.pkg.tar.gz
-        pacman.conf
-        pacman.conf.x86_64
-        makepkg.conf)
-
-# keep an upgrade path for older installations
-PKGEXT='.pkg.tar.gz'
+CARCH=x86_64
+unset build package md5sums source
+_repo=core
+source=(PKGBUILD
+	http://mirrors.kernel.org/archlinux/${_repo}/os/${CARCH}/${pkgname%-libre}-$pkgver-$pkgrel-$CARCH$PKGEXT
+	# files for pkg modifications
+  pacman.conf
+  pacman.conf.x86_64
+        )
+options=(!strip)
 
 build() {
   cd "${srcdir}/"
-  rm .{INSTALL,PKGINFO} $pkgname-$pkgver-$_pkgrel-$CARCH.pkg.tar.gz
+  rm .{INSTALL,PKGINFO} ${pkgname%-libre}-$pkgver-$pkgrel-$CARCH$PKGEXT
+  # put actions for package modifications below this line
 
 }
 
 package() {
+  cd ${srcdir}
   cp -a ./* ${pkgdir}
-  rm $pkgdir/etc/pacman.conf $pkgdir/{pacman.conf{,.x86_64},makepkg.conf}
 
+  rm ${pkgdir}/{PKGBUILD,pacman.conf{,.x86_64}}
+
+# No need to repackage for mips64el
   case "$CARCH" in
     i686)
       install -m644 $srcdir/pacman.conf $pkgdir/etc/pacman.conf
@@ -30,4 +35,5 @@ package() {
   esac
 }
 
-# vim: set ts=2 sw=2 et:
+
+# vim:set ts=2 sw=2 et:
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"