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

Conflicts:
	community-testing/vhba-module/60-vhba.rules
	community-testing/vhba-module/PKGBUILD
	community-testing/vhba-module/vhba-module.install
	core/gcc/PKGBUILD
	core/gzip/PKGBUILD
	core/logrotate/PKGBUILD
	extra/bluez/PKGBUILD
	extra/kdeplasma-addons/PKGBUILD
	kde-unstable/kdebase-runtime/PKGBUILD
	kde-unstable/kdebindings-smokekde/PKGBUILD
	kde-unstable/kdeplasma-addons/PKGBUILD
	multilib/gcc-multilib/PKGBUILD
	multilib/libtool-multilib/PKGBUILD

3 files changed, 43 insertions, 14 deletions

diff --git a/core/gcc/PKGBUILD b/core/gcc/PKGBUILD
index 94d280a9b..d5ecf392e 100644
--- a/core/gcc/PKGBUILD
+++ b/core/gcc/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 158746 2012-05-09 01:14:02Z allan $
+# $Id: PKGBUILD 162069 2012-06-19 12:27:55Z allan $
 # Maintainer: Allan McRae <allan@archlinux.org>
 
 # toolchain build order: linux-api-headers->glibc->binutils->gcc->binutils->glibc
@@ -9,10 +9,10 @@ if [ "${CARCH}" != "mips64el" ]; then
 else
     pkgname=('gcc' 'gcc-libs' 'gcc-fortran' 'gcc-objc')
 fi
-pkgver=4.7.0
-pkgrel=6
-_snapshot=4.7-20120505
-_libstdcppmanver=20120307		# Note: check source directory name when updating this
+pkgver=4.7.1
+pkgrel=1
+#_snapshot=4.7-20120505
+_libstdcppmanver=20120605		# Note: check source directory name when updating this
 pkgdesc="The GNU Compiler Collection"
 arch=('i686' 'x86_64' 'mips64el')
 license=('GPL' 'LGPL' 'FDL' 'custom')
@@ -24,17 +24,14 @@ else
 fi
 checkdepends=('dejagnu')
 options=('!libtool' '!emptydirs')
-source=(#ftp://gcc.gnu.org/pub/gcc/releases/gcc-${pkgver}/gcc-${pkgver}.tar.bz2
-	ftp://gcc.gnu.org/pub/gcc/snapshots/${_snapshot}/gcc-${_snapshot}.tar.bz2
+source=(ftp://gcc.gnu.org/pub/gcc/releases/gcc-${pkgver}/gcc-${pkgver}.tar.bz2
+	#ftp://gcc.gnu.org/pub/gcc/snapshots/${_snapshot}/gcc-${_snapshot}.tar.bz2
 	ftp://gcc.gnu.org/pub/gcc/libstdc++/doxygen/libstdc++-api.${_libstdcppmanver}.man.tar.bz2
 	gcc_pure64.patch
     gcc_mips64el_lib.patch
-	gcc-4.7.0-cloog-0.17.patch)
-md5sums=('8e2df3b9a755c9262db0df019cc3542e'
-         '489d2f5311535800a120efd8d18db719'
-         'ced48436c1b3c981d721a829f1094de1'
-         '474b8f5a7dee6ddd96b95a7240bfb961'
-         '575f7d17b022e609447a590e481b18b5')
+	gcc-4.7.0-cloog-0.17.patch
+	gcc-4.7.1-libada-pic.patch
+	gcc-4.7.1-libgo-write.patch)
 
 if [ -n "${_snapshot}" ]; then
   _basedir="${srcdir}/gcc-${_snapshot}"
@@ -60,6 +57,12 @@ build() {
   # compatibility with latest cloog
   patch -p1 -i ${srcdir}/gcc-4.7.0-cloog-0.17.patch
 
+  # http://gcc.gnu.org/bugzilla/show_bug.cgi?id=53679
+  patch -p1 -i ${srcdir}/gcc-4.7.1-libgo-write.patch
+  
+  # bug to file...
+  patch -p1 -i ${srcdir}/gcc-4.7.1-libada-pic.patch
+
   echo ${pkgver} > gcc/BASE-VER
 
   cd ${srcdir}
@@ -219,7 +222,8 @@ EOF
 
   # install the libstdc++ man pages
   install -dm755 ${pkgdir}/usr/share/man/man3
-  install -m644 ${srcdir}/man/man3/* ${pkgdir}/usr/share/man/man3/
+  install -m644 ${srcdir}/libstdc++-api.${_libstdcppmanver}.man/man3/* \
+    ${pkgdir}/usr/share/man/man3/
 
   # Install Runtime Library Exception
   install -Dm644 ${_basedir}/COPYING.RUNTIME \
diff --git a/core/gcc/gcc-4.7.1-libada-pic.patch b/core/gcc/gcc-4.7.1-libada-pic.patch
new file mode 100644
index 000000000..591da1e4a
--- /dev/null
+++ b/core/gcc/gcc-4.7.1-libada-pic.patch
@@ -0,0 +1,12 @@
+diff -Naur gcc-4.7.1-orig/libada/Makefile.in gcc-4.7.1/libada/Makefile.in
+--- gcc-4.7.1-orig/libada/Makefile.in	2012-06-13 01:12:37.000000000 +1000
++++ gcc-4.7.1/libada/Makefile.in	2012-06-16 15:04:32.179911023 +1000
+@@ -54,7 +54,7 @@
+ PICFLAG = @PICFLAG@
+ GNATLIBFLAGS= -W -Wall -gnatpg -nostdinc
+ GNATLIBCFLAGS= -g -O2
+-GNATLIBCFLAGS_FOR_C = -W -Wall $(GNATLIBCFLAGS) \
++GNATLIBCFLAGS_FOR_C = -W -Wall $(GNATLIBCFLAGS) $(PICFLAG) \
+ 	-fexceptions -DIN_RTS @have_getipinfo@
+ 
+ host_subdir = @host_subdir@
diff --git a/core/gcc/gcc-4.7.1-libgo-write.patch b/core/gcc/gcc-4.7.1-libgo-write.patch
new file mode 100644
index 000000000..a7be83fda
--- /dev/null
+++ b/core/gcc/gcc-4.7.1-libgo-write.patch
@@ -0,0 +1,13 @@
+diff -Naur gcc-4.7.1-orig/libgo/runtime/print.c gcc-4.7.1/libgo/runtime/print.c
+--- gcc-4.7.1-orig/libgo/runtime/print.c	2012-05-26 04:22:14.000000000 +1000
++++ gcc-4.7.1/libgo/runtime/print.c	2012-06-16 15:06:28.553138502 +1000
+@@ -17,7 +17,8 @@
+ 	G* g = runtime_g();
+ 
+ 	if(g == nil || g->writebuf == nil) {
+-		runtime_write(2, v, n);
++		ssize_t bytesWritten = runtime_write(2, v, n);
++		(void)bytesWritten;
+ 		return;
+ 	}
+