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

Conflicts:
	community/fotoxx/PKGBUILD
	community/gtkdialog/PKGBUILD
	community/hubbub/PKGBUILD
	community/libgdamm/PKGBUILD
	community/libparserutils/PKGBUILD
	community/mingw32-binutils/PKGBUILD
	community/mingw32-gcc-base/PKGBUILD
	community/mingw32-gcc/PKGBUILD
	community/mtpaint/PKGBUILD
	community/netsurf/PKGBUILD
	community/patchage/PKGBUILD
	community/qgo/PKGBUILD
	community/tomoyo-tools/PKGBUILD
	community/tre/PKGBUILD
	community/virtualbox/PKGBUILD
	core/net-tools/PKGBUILD
	core/openldap/PKGBUILD
	extra/epiphany/PKGBUILD
	extra/evince/PKGBUILD
	extra/evolution-data-server/PKGBUILD
	extra/evolution/PKGBUILD
	extra/exiv2/PKGBUILD
	extra/folks/PKGBUILD
	extra/gimp-ufraw/PKGBUILD
	extra/gnome-control-center/PKGBUILD
	extra/gnome-power-manager/PKGBUILD
	extra/gnome-python-desktop/PKGBUILD
	extra/gnome-python-extras/PKGBUILD
	extra/gvfs/PKGBUILD
	extra/jack/PKGBUILD
	extra/kdelibs/PKGBUILD
	extra/kdepim/PKGBUILD
	extra/koffice/PKGBUILD
	extra/libreoffice/PKGBUILD
	extra/libwebkit/PKGBUILD
	extra/mutter/PKGBUILD
	extra/nautilus/PKGBUILD
	extra/openmpi/PKGBUILD
	extra/pavucontrol/PKGBUILD
	extra/php/PKGBUILD
	extra/pidgin/PKGBUILD
	extra/postgresql/PKGBUILD
	extra/pulseaudio/PKGBUILD
	extra/pygobject2/PKGBUILD
	extra/swt/PKGBUILD
	extra/tomcat/PKGBUILD
	extra/totem/PKGBUILD
	extra/vigra/PKGBUILD
	extra/vte/PKGBUILD
	extra/xulrunner/PKGBUILD
	kde-unstable/calligra/PKGBUILD
	kde-unstable/kdebase-workspace/PKGBUILD
	multilib/lib32-atk/PKGBUILD
	multilib/lib32-gdk-pixbuf2/PKGBUILD
	multilib/lib32-glew/PKGBUILD
	multilib/lib32-glib2/PKGBUILD
	multilib/lib32-jack/PKGBUILD
	multilib/lib32-libpulse/PKGBUILD
	multilib/lib32-pango/PKGBUILD
	multilib/wine/PKGBUILD
	social/miniupnpc/PKGBUILD
	testing/icedtea-web-java7/PKGBUILD
	testing/sqlite3/PKGBUILD
	~xihh/abiword/PKGBUILD

1 files changed, 21 insertions, 19 deletions

diff --git a/community/mingw32-gcc-base/PKGBUILD b/community/mingw32-gcc-base/PKGBUILD
index 8a4b2dcb8..c25c58f3c 100644
--- a/community/mingw32-gcc-base/PKGBUILD
+++ b/community/mingw32-gcc-base/PKGBUILD
@@ -1,40 +1,43 @@
-# $Id: PKGBUILD 23584 2010-08-13 11:57:37Z spupykin $
+# $Id: PKGBUILD 56196 2011-10-03 10:57:31Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Maintainer: Ondrej Jirman <megous@megous.com>
 
 pkgname=mingw32-gcc-base
-pkgver=4.5.0
-_w32apiver=3.14
-_runtimever=3.18
-pkgrel=3
+pkgver=4.6.1
+_w32apiver=3.17
+_runtimever=3.20
+_uprel=2
+_upw32rel=1
+pkgrel=1
 arch=(i686 x86_64 'mips64el')
 pkgdesc="A C cross-compiler for building Windows executables on Linux"
 depends=(mingw32-binutils)
 makedepends=(p7zip mingw32-runtime mingw32-w32api)
 conflicts=(mingw32-gcc)
-options=(!strip force)
+options=(!strip)
 license=(GPL LGPL)
 url="http://mingw.sf.net"
-source=(gcc-$pkgver-1-mingw32-src.tar.xz::http://downloads.sourceforge.net/project/mingw/MinGW/BaseSystem/GCC/Version4/gcc-$pkgver-1/gcc-$pkgver-1-mingw32-src.tar.lzma
-	http://switch.dl.sf.net/sourceforge/mingw/w32api-${_w32apiver}-mingw32-src.tar.gz
-	http://switch.dl.sf.net/sourceforge/mingw/mingwrt-${_runtimever}-mingw32-src.tar.gz)
-md5sums=('f279430018dc379b8184c0a18b280298'
-         'c31baedaf2a8d38874e056a112a4fbc8'
-         '34b54cb3379f871f0dcd5c20b69b0350')
+source=(gcc-$pkgver-${_uprel}-mingw32-src.tar.lzma::http://downloads.sourceforge.net/project/mingw/MinGW/BaseSystem/GCC/Version4/gcc-$pkgver-${_uprel}/gcc-$pkgver-${_uprel}-mingw32-src.tar.lzma
+	http://downloads.sourceforge.net/project/mingw/MinGW/BaseSystem/RuntimeLibrary/Win32-API/w32api-${_w32apiver}/w32api-${_w32apiver}-${_upw32rel}-mingw32-src.tar.lzma
+	http://downloads.sourceforge.net/project/mingw/MinGW/BaseSystem/RuntimeLibrary/MinGW-RT/mingwrt-${_runtimever}/mingwrt-${_runtimever}-mingw32-src.tar.gz)
+md5sums=('f8b09b7e51223e1ae1c1e466af3ac82e'
+         '89e5800096aa334009f98e7c1743d825'
+         '26c0886cc60729b94956cc6d81cd076c')
 
 build()
 {
   if [ $NOEXTRACT -ne 1 ]; then
   # prepare headers
   mkdir -p $srcdir/mingw/include/
-  cp -r $srcdir/w32api-${_w32apiver}-mingw32/include/* \
+  cp -r $srcdir/w32api-${_w32apiver}-${_upw32rel}-mingw32/include/* \
     $srcdir/mingwrt-${_runtimever}-mingw32/include/* \
     $srcdir/mingw/include/
 
   unset CFLAGS CXXFLAGS
 
-  tar xJf gcc-$pkgver-1-mingw32-src.tar.xz
-  tar xjf gcc-$pkgver.tar.bz2
+#  tar xJf gcc-$pkgver-${_uprel}-mingw32-src.tar.xz
+  cd $srcdir
+  tar xjf gcc-$pkgver-${_uprel}-mingw32-src/gcc-$pkgver.tar.bz2
 
   mkdir -p $srcdir/build
   cd $srcdir/build
@@ -55,14 +58,13 @@ build()
     --disable-libssp \
     --disable-libgomp \
     --with-build-sysroot=$srcdir \
-    --with-headers=$srcdir/include \
-    || return 1
+    --with-headers=$srcdir/include
   else
     cd $srcdir/build
   fi
 
-  make || return 1
-  make install DESTDIR=$pkgdir || return 1
+  make
+  make install DESTDIR=$pkgdir
 
   cd $pkgdir
   rm -rf usr/bin/i486-mingw32-{gcov,gccbug,gcc-*} \