Merge branch 'master' of ssh://vparabola/srv/git/projects/abslibre-mips64el

Conflicts:
	community/distcc/PKGBUILD
	community/haskell-x11-xft/PKGBUILD
	community/ushare/PKGBUILD
	core/binutils/PKGBUILD
	core/gcc/PKGBUILD
	core/glibc/PKGBUILD
	core/linux-api-headers/PKGBUILD
	extra/catdoc/PKGBUILD
	extra/cups/PKGBUILD
	extra/curl/PKGBUILD
	extra/ethstatus/PKGBUILD
	extra/ffcall/PKGBUILD
	extra/gimp-dbp/PKGBUILD
	extra/gimp-refocus/PKGBUILD
	extra/gnome-utils/PKGBUILD
	extra/gstreamer0.10-ugly/PKGBUILD
	extra/haskell-cgi/PKGBUILD
	extra/haskell-deepseq/PKGBUILD
	extra/haskell-haskell-src/PKGBUILD
	extra/haskell-html/PKGBUILD
	extra/haskell-http/PKGBUILD
	extra/haskell-hunit/PKGBUILD
	extra/haskell-mtl/PKGBUILD
	extra/haskell-network/PKGBUILD
	extra/haskell-opengl/PKGBUILD
	extra/haskell-parallel/PKGBUILD
	extra/krusader/PKGBUILD
	extra/libmodplug/PKGBUILD
	extra/metacity/PKGBUILD
	extra/mkvtoolnix/PKGBUILD
	extra/openal/PKGBUILD
	extra/pulseaudio/PKGBUILD
	extra/rox/PKGBUILD
	extra/x2x/PKGBUILD
	libre/kernel26-libre/PKGBUILD
	libre/libretools/PKGBUILD
	multilib-testing/binutils-multilib/PKGBUILD
	multilib-testing/gcc-multilib/PKGBUILD

4 files changed, 19 insertions, 51 deletions

diff --git a/core/binutils/PKGBUILD b/core/binutils/PKGBUILD
index 29c4f137d..53302b45a 100644
--- a/core/binutils/PKGBUILD
+++ b/core/binutils/PKGBUILD
@@ -31,8 +31,7 @@ mksource() {
 
 build() {
   cd ${srcdir}
-  mkdir binutils-build
-  cd binutils-build
+  mkdir binutils-build && cd binutils-build
 
   [[ $CARCH == "x86_64" ]] && CONFIGFLAG="--enable-64-bit-bfd --disable-multilib"
   [[ $CARCH == "mips64el" ]] && CONFIGFLAG="--disable-multilib --disable-werror"
diff --git a/core/gcc/PKGBUILD b/core/gcc/PKGBUILD
index 4a755b8ec..1f3862e21 100644
--- a/core/gcc/PKGBUILD
+++ b/core/gcc/PKGBUILD
@@ -124,17 +124,17 @@ package_gcc()
   
   # unfortunately it is much, much easier to install the lot and clean-up the mess...
   make -j1 DESTDIR=${pkgdir} install
-  rm $pkgdir/usr/bin/{{$CHOST-,}gfortran}
-  rm $pkgdir/usr/lib/*.so*
-  rm $pkgdir/usr/lib/lib{ffi,gfortran,objc,quadmath}.a
-  rm $pkgdir/usr/lib/libgfortran.spec
+  rm $pkgdir/usr/lib/*.so* # gcc-libs
+  rm $pkgdir/usr/share/locale/{de,fr}/LC_MESSAGES/libstdc++.mo  # gcc-libs
+  rm $pkgdir/usr/share/info/libgomp.info # gcc-libs
+  rm $pkgdir/usr/bin/{$CHOST-,}gfortran # gcc-fortran
+  rm $pkgdir/usr/lib/libgfortran.{spec,a} # gcc-fortran
+  rm $pkgdir/usr/share/info/gfortran.info #gcc-fortran
+  rm $pkgdir/usr/lib/lib{objc,gomp}.a 
   rm -r $pkgdir/usr/lib/gcc/$CHOST/${pkgver}/{finclude,include/objc}
-  rm $pkgdir/usr/lib/gcc/$CHOST/${pkgver}/include/{ffi{,target}.h,quadmath{,_weak}.h}
-  rm $pkgdir/usr/lib/gcc/$CHOST/${pkgver}/{cc1obj{,plus},f951,gnat1,libgfortranbegin.a}
-  rm $pkgdir/usr/share/info/{gfortran,gnat*,libgomp,libquadmath}.info
-  rm $pkgdir/usr/share/locale/{de,fr}/LC_MESSAGES/libstdc++.mo
-  rm $pkgdir/usr/share/man/man1/{gfortran}.1
-  rm $pkgdir/usr/share/man/man3/ffi*
+  rm $pkgdir/usr/lib/gcc/$CHOST/${pkgver}/{cc1obj{,plus},f951,libgfortranbegin.a}
+
+  rm $pkgdir/usr/share/man/man1/gfortran.1
 
   # many packages require these symlinks
   install -dm755 ${pkgdir}/lib
@@ -220,12 +220,7 @@ package_gcc-objc()
     ${pkgdir}/usr/share/licenses/gcc-objc/RUNTIME.LIBRARY.EXCEPTION
 }
 
-md5sums=('2be769db16ac02f30fb62423b4c50145'
-         'a310d230945f4b3093dd3ca72839c649'
-         '361a10c5a5545c80fd271b18036dd00c'
-         'f7db2f6ed34398361de62cb6b8eb53d2'
-         '248e53b461078bf1c89528fb8e4ba051'
-         'e15a01b0d02ff12e975e4c2649e71e55'
+md5sums=('c97d52b2b4e6c8c5cf665ae3eb9e8e49'
          '1e9fd2eaf0ee47ea64e82c48998f1999'
          '4030ee1c08dd1e843c0225b772360e76'
          '67e337993d821d72fccacbed52d48c34'
diff --git a/core/glibc/PKGBUILD b/core/glibc/PKGBUILD
index 13422a5de..0a99d9ff6 100644
--- a/core/glibc/PKGBUILD
+++ b/core/glibc/PKGBUILD
@@ -26,6 +26,7 @@ source=(ftp://ftp.archlinux.org/other/glibc/${pkgname}-${pkgver}_${_glibcdate}.t
         glibc-__i686.patch
         glibc-2.12.1-static-shared-getpagesize.patch
         glibc-2.12.2-ignore-origin-of-privileged-program.patch
+        glibc-2.13-prelink.patch
         glibc-2.13-futex.patch
         glibc-2.14-libdl-crash.patch
         #glibc-2.14-fix-resolver-crash-typo.patch
@@ -35,21 +36,6 @@ source=(ftp://ftp.archlinux.org/other/glibc/${pkgname}-${pkgver}_${_glibcdate}.t
         nscd
         locale.gen.txt
         locale-gen)
-md5sums=('e441d745609d93c907b72548ba646dad'
-         '4dadb9203b69a3210d53514bb46f41c3'
-         '0c5540efc51c0b93996c51b57a8540ae'
-         '40cd342e21f71f5e49e32622b25acc52'
-         'a3ac6f318d680347bb6e2805d42b73b2'
-         'b042647ea7d6f22ad319e12e796bd13e'
-         '7d0154b7e17ea218c9fa953599d24cc4'
-         'cea62cc6b903d222c5f26e05a3c0e0e6'
-         '46e56492cccb1c9172ed3a235cf43c6c'
-         'c5de2a946215d647c8af5432ec4b0da0'
-         '55febbb72139ac7b65757df085024b83'
-         'b587ee3a70c9b3713099295609afde49'
-         '07ac979b6ab5eeb778d55f041529d623'
-         '476e9113489f93b348b21e144b6a8fcf')
-
 
 mksource() {
   git clone git://sourceware.org/git/glibc.git
@@ -80,6 +66,10 @@ build() {
   # http://sourceware.org/git/?p=glibc.git;a=patch;h=d14e6b09 (only fedora branch...)
   patch -Np1 -i ${srcdir}/glibc-2.12.2-ignore-origin-of-privileged-program.patch
 
+  # http://sourceware.org/bugzilla/show_bug.cgi?id=12489
+  # http://sourceware.org/git/?p=glibc.git;a=commit;h=25b3aada (only fedora branch...)
+  patch -Np1 -i ${srcdir}/glibc-2.13-prelink.patch
+
   # http://sourceware.org/bugzilla/show_bug.cgi?id=12403
   patch -Np1 -i ${srcdir}/glibc-2.13-futex.patch
 
@@ -181,7 +171,7 @@ package() {
                         usr/bin/{gencat,getconf,getent,iconv,locale} \
                         usr/bin/{localedef,pcprofiledump,rpcgen,sprof} \
                         usr/lib/getconf/* \
-                        usr/sbin/{iconvconfig,nscd}
+                        usr/sbin/{iconvconfig,nscd,rpcinfo}
   [[ $CARCH = "i686" ]] && strip $STRIP_BINARIES usr/bin/lddlibc4
 
   strip $STRIP_STATIC usr/lib/*.a \
@@ -193,15 +183,3 @@ package() {
                       lib/{libmemusage,libpcprofile,libSegFault}.so \
                       usr/lib/{pt_chown,{audit,gconv}/*.so}
 }
-md5sums=('b7b17d9c6b5b71b5e5322e04ca63c190'
-         '483f37cfdd619e81d8ca9e9d713944b5'
-         '4dadb9203b69a3210d53514bb46f41c3'
-         '0c5540efc51c0b93996c51b57a8540ae'
-         '40cd342e21f71f5e49e32622b25acc52'
-         'a3ac6f318d680347bb6e2805d42b73b2'
-         'b042647ea7d6f22ad319e12e796bd13e'
-         '24dfab6fd244f3773523412588ecc52c'
-         '7d0154b7e17ea218c9fa953599d24cc4'
-         'b587ee3a70c9b3713099295609afde49'
-         '07ac979b6ab5eeb778d55f041529d623'
-         '476e9113489f93b348b21e144b6a8fcf')
diff --git a/core/linux-api-headers/PKGBUILD b/core/linux-api-headers/PKGBUILD
index f384f9c5e..28a8c4c28 100644
--- a/core/linux-api-headers/PKGBUILD
+++ b/core/linux-api-headers/PKGBUILD
@@ -14,10 +14,7 @@ license=('GPL2')
 provides=("kernel-headers=${pkgver}")
 conflicts=('kernel-headers')
 replaces=('kernel-headers')
-source=(http://www.kernel.org/pub/linux/kernel/v2.6/linux-${_basever}.tar.bz2
-	http://www.kernel.org/pub/linux/kernel/v2.6/patch-${pkgver}.bz2)
-md5sums=('1aab7a741abe08d42e8eccf20de61e05'
-         '215f7ebaafe1175dbc5d1e439c9a96d5')
+source=(http://www.fsfla.org/svnwiki/selibre/linux-libre/download/releases/${pkgver}-libre/linux-${pkgver}-libre.tar.bz2)
 
 build() {
   cd ${srcdir}/linux-${pkgver}
@@ -36,4 +33,3 @@ package() {
   # clean-up unnecessary files generated during install
   find ${pkgdir} -name .install -or -name ..install.cmd | xargs rm -f
 }
-md5sums=('343617f67979845d9320b890437af930')