From a19d2bdf1ab4d078b7d467e7dc1c515e2a80b7bf Mon Sep 17 00:00:00 2001
From: Juan RP <xtraeme@gmail.com>
Date: Thu, 21 Oct 2010 20:30:08 +0200
Subject: [PATCH] Backed out changeset a850a857fb8a. Human error...

---
 srcpkgs/gcc-multilib/gcc-c++-multilib.template   |  2 +-
 srcpkgs/gcc-multilib/gcc-objc-multilib.template  |  2 +-
 srcpkgs/gcc-multilib/libgcc32.template           |  2 +-
 srcpkgs/gcc-multilib/libgomp32.template          |  2 +-
 srcpkgs/gcc-multilib/libmudflap32-devel.template |  2 +-
 srcpkgs/gcc-multilib/libmudflap32.template       |  2 +-
 srcpkgs/gcc-multilib/libobjc32.template          |  2 +-
 srcpkgs/gcc-multilib/libssp32.template           |  2 +-
 srcpkgs/gcc-multilib/libstdc++32.template        |  2 +-
 srcpkgs/gcc-multilib/template                    | 13 +++++++------
 srcpkgs/gcc/gcc-c++.template                     |  2 ++
 srcpkgs/gcc/gcc-objc++.template                  |  2 ++
 srcpkgs/gcc/gcc-objc.template                    |  2 ++
 srcpkgs/gcc/template                             |  9 +++++----
 srcpkgs/kernel/common-vars                       |  8 ++++----
 srcpkgs/kernel/template                          |  2 +-
 srcpkgs/mpc/template                             |  1 -
 17 files changed, 32 insertions(+), 25 deletions(-)

diff --git a/srcpkgs/gcc-multilib/gcc-c++-multilib.template b/srcpkgs/gcc-multilib/gcc-c++-multilib.template
index 4e0d835397f..7724e0ed152 100644
--- a/srcpkgs/gcc-multilib/gcc-c++-multilib.template
+++ b/srcpkgs/gcc-multilib/gcc-c++-multilib.template
@@ -7,7 +7,7 @@ long_desc="
  On architectures with multilib support, the package contains files and
  dependencies for the non-default multilib architecture(s)."
 
-#revision=1
+revision=1
 
 Add_dependency run gcc-c++		">=${version}"
 Add_dependency run gcc-multilib		">=${version}"
diff --git a/srcpkgs/gcc-multilib/gcc-objc-multilib.template b/srcpkgs/gcc-multilib/gcc-objc-multilib.template
index e64c9aa8466..74691533b78 100644
--- a/srcpkgs/gcc-multilib/gcc-objc-multilib.template
+++ b/srcpkgs/gcc-multilib/gcc-objc-multilib.template
@@ -8,7 +8,7 @@ long_desc="
  On architectures with multilib support, the package contains files and
  dependencies for the non-default multilib architecture(s)."
 
-#revision=1
+revision=1
 
 Add_dependency run gcc		">=${version}"
 Add_dependency run gcc-multilib	">=${version}"
diff --git a/srcpkgs/gcc-multilib/libgcc32.template b/srcpkgs/gcc-multilib/libgcc32.template
index 8edb0f97792..e174ed675c5 100644
--- a/srcpkgs/gcc-multilib/libgcc32.template
+++ b/srcpkgs/gcc-multilib/libgcc32.template
@@ -5,7 +5,7 @@ long_desc="${long_desc}
 
  This package contains the 32bit GCC shared library for x86_64 systems."
 
-#revision=1
+revision=1
 
 do_install()
 {
diff --git a/srcpkgs/gcc-multilib/libgomp32.template b/srcpkgs/gcc-multilib/libgomp32.template
index ea72d9f1f19..f6e6ff9aa62 100644
--- a/srcpkgs/gcc-multilib/libgomp32.template
+++ b/srcpkgs/gcc-multilib/libgomp32.template
@@ -6,7 +6,7 @@ long_desc="${long_desc}
  This package contains the 32bit GCC shared support library which is needed
  for OpenMP v3.0 support."
 
-#revision=1
+revision=1
 
 Add_dependency run libgcc32
 Add_dependency run glibc32
diff --git a/srcpkgs/gcc-multilib/libmudflap32-devel.template b/srcpkgs/gcc-multilib/libmudflap32-devel.template
index 33093dd36c8..f974716d75c 100644
--- a/srcpkgs/gcc-multilib/libmudflap32-devel.template
+++ b/srcpkgs/gcc-multilib/libmudflap32-devel.template
@@ -7,7 +7,7 @@ long_desc="
 
  This package contains the headers and the static libraries." 
 
-#revision=1
+revision=1
 
 Add_dependency run gcc-multilib
 Add_dependency run glibc32-devel
diff --git a/srcpkgs/gcc-multilib/libmudflap32.template b/srcpkgs/gcc-multilib/libmudflap32.template
index 64e608704ea..58f9646932a 100644
--- a/srcpkgs/gcc-multilib/libmudflap32.template
+++ b/srcpkgs/gcc-multilib/libmudflap32.template
@@ -5,7 +5,7 @@ long_desc="
  The libmudflap libraries are used by GCC for instrumenting pointer
  and array dereferencing operations."
 
-#revision=1
+revision=1
 
 Add_dependency run gcc-multilib
 Add_dependency run glibc32
diff --git a/srcpkgs/gcc-multilib/libobjc32.template b/srcpkgs/gcc-multilib/libobjc32.template
index 78ce6a270d6..8e64cbc5602 100644
--- a/srcpkgs/gcc-multilib/libobjc32.template
+++ b/srcpkgs/gcc-multilib/libobjc32.template
@@ -6,7 +6,7 @@ long_desc="${long_desc}
  This package contains the 32bit GCC Objective-C shared support library
  which is needed to run Objective-C dynamically linked programs."
 
-#revision=1
+revision=1
 
 Add_dependency run libgcc32
 Add_dependency run glibc32
diff --git a/srcpkgs/gcc-multilib/libssp32.template b/srcpkgs/gcc-multilib/libssp32.template
index 4dba2f0754f..1b1e0d99aa2 100644
--- a/srcpkgs/gcc-multilib/libssp32.template
+++ b/srcpkgs/gcc-multilib/libssp32.template
@@ -6,7 +6,7 @@ long_desc="${long_desc}
  This package contains the 32bit Stack Smashing Protection shared library
  provided by GCC."
 
-#revision=1
+revision=1
 
 Add_dependency run glibc32
 
diff --git a/srcpkgs/gcc-multilib/libstdc++32.template b/srcpkgs/gcc-multilib/libstdc++32.template
index 9542d45fb0c..f781e19ed38 100644
--- a/srcpkgs/gcc-multilib/libstdc++32.template
+++ b/srcpkgs/gcc-multilib/libstdc++32.template
@@ -6,7 +6,7 @@ long_desc="${long_desc}
  This package contains a rewritten standard compliant GCC Standard
  C++ library 32bit for x86_64 systems."
 
-#revision=1
+revision=1
 
 Add_dependency run libgcc32
 Add_dependency run glibc32
diff --git a/srcpkgs/gcc-multilib/template b/srcpkgs/gcc-multilib/template
index b84e1408af7..df4729e35c5 100644
--- a/srcpkgs/gcc-multilib/template
+++ b/srcpkgs/gcc-multilib/template
@@ -1,9 +1,10 @@
 # Template build file for 'gcc-multilib'
 pkgname=gcc-multilib
-version=4.5.1
+version=4.5.0
+revision=1
 _gmp_ver=5.0.1
-_mpfr_ver=3.0.0
-_mpc_ver=0.8.2
+_mpfr_ver=2.4.2
+_mpc_ver=0.8.1
 wrksrc="gcc-${version}"
 distfiles="
 http://ftp.gnu.org/pub/gnu/gcc/gcc-${version}/gcc-${version}.tar.bz2
@@ -20,10 +21,10 @@ configure_args="--enable-clocale=gnu --enable-shared --disable-bootstrap
 short_desc="The GNU C Compiler suite (multilib libraries)"
 maintainer="Juan RP <xtraeme@gmail.com>"
 checksum="
-45fa81face89203ccbf3ec73f7a372769d855f3ba7446f50125b613d9c163e2c
+8293e9efa68a8ec0fdd0dae9c9bd128a8e742566acd9c8fbcfe79d98ed3756c8
 a2a610f01fd3298dc08c87bf30498c2402590e1bcb227fc40b15ee6d280939fb
-8f4e5f9c53536cb798a30455ac429b1f9fc75a0f8af32d6e0ac31ebf1024821f
-ae79f8d41d8a86456b68607e9ca398d00f8b7342d1d83bcf4428178ac45380c7"
+c7e75a08a8d49d2082e4caee1591a05d11b9d5627514e678f02d66a124bcf2ba
+e664603757251fd8a352848276497a4c79b7f8b21fd8aedd5cc0598a38fee3e4"
 long_desc="
  The GNU C Compiler suite, with support for C, C++, ObjC and ObjC++.
 
diff --git a/srcpkgs/gcc/gcc-c++.template b/srcpkgs/gcc/gcc-c++.template
index 34b563d589a..531923c36ae 100644
--- a/srcpkgs/gcc/gcc-c++.template
+++ b/srcpkgs/gcc/gcc-c++.template
@@ -5,6 +5,8 @@ long_desc="${long_desc}
 
  This package contains GCC C++ support."
 
+revision=1
+
 Add_dependency run glibc
 Add_dependency run zlib
 Add_dependency run cloog-ppl
diff --git a/srcpkgs/gcc/gcc-objc++.template b/srcpkgs/gcc/gcc-objc++.template
index 473b5b97977..932133dec88 100644
--- a/srcpkgs/gcc/gcc-objc++.template
+++ b/srcpkgs/gcc/gcc-objc++.template
@@ -5,6 +5,8 @@ long_desc="${long_desc}
 
  This package contains GCC Objective-C++ support."
 
+revision=1
+
 Add_dependency run glibc
 Add_dependency run zlib
 Add_dependency run cloog-ppl
diff --git a/srcpkgs/gcc/gcc-objc.template b/srcpkgs/gcc/gcc-objc.template
index 3b64bac90d8..4376c7475c6 100644
--- a/srcpkgs/gcc/gcc-objc.template
+++ b/srcpkgs/gcc/gcc-objc.template
@@ -5,6 +5,8 @@ long_desc="${long_desc}
 
  This package contains GCC Objective-C support."
 
+revision=1
+
 Add_dependency run glibc
 Add_dependency run zlib
 Add_dependency run cloog-ppl
diff --git a/srcpkgs/gcc/template b/srcpkgs/gcc/template
index 4b378bbb728..0942e8a45ac 100644
--- a/srcpkgs/gcc/template
+++ b/srcpkgs/gcc/template
@@ -1,6 +1,7 @@
 # Template build file for 'gcc'
 pkgname=gcc
-version=4.5.1
+version=4.5.0
+revision=1
 distfiles="http://ftp.gnu.org/pub/gnu/gcc/gcc-$version/gcc-$version.tar.bz2"
 build_style=gnu_configure
 configure_args="--enable-clocale=gnu --disable-bootstrap
@@ -12,7 +13,7 @@ configure_args="--enable-clocale=gnu --disable-bootstrap
 --enable-lto --with-libelf=${XBPS_MASTERDIR}/usr"
 short_desc="The GNU C Compiler"
 maintainer="Juan RP <xtraeme@gmail.com>"
-checksum=45fa81face89203ccbf3ec73f7a372769d855f3ba7446f50125b613d9c163e2c
+checksum=8293e9efa68a8ec0fdd0dae9c9bd128a8e742566acd9c8fbcfe79d98ed3756c8
 long_desc="
  The GNU C Compiler, with support for building C code.
  
@@ -53,8 +54,8 @@ pre_configure()
 pre_install()
 {
 	if [ "$xbps_machine" = "x86_64" ]; then
-		mkdir -p ${SRCPKGDESTDIR}/usr/lib
-		cd ${SRCPKGDESTDIR}/usr && ln -s lib lib64 && cd ${wrksrc}
+		mkdir -vp ${SRCPKGDESTDIR}/usr/lib
+		cd ${SRCPKGDESTDIR}/usr && ln -sv lib lib64 && cd ${wrksrc}
 	fi
 }
 
diff --git a/srcpkgs/kernel/common-vars b/srcpkgs/kernel/common-vars
index 87667edc4ad..2a81b11b1ba 100644
--- a/srcpkgs/kernel/common-vars
+++ b/srcpkgs/kernel/common-vars
@@ -1,10 +1,10 @@
 # Common vars shared by the 'kernel' and 'kernel-libc-headers'
 # build templates.
 _kernel_ver=2.6.34
-#version=${_kernel_ver}
-_kernel_patch_ver=2
-version=${_kernel_ver}.${_kernel_patch_ver}
+version=${_kernel_ver}
+#_kernel_patch_ver=4
+#version=${_kernel_ver}.${_kernel_patch_ver}
 wrksrc="linux-$version"
 distfiles="${KERNEL_SITE}/kernel/v2.6/linux-$version.tar.bz2"
 maintainer="Juan RP <xtraeme@gmail.com>"
-checksum=590f0357e80eb8af5d391868aa403234021b7d445496960b744d6fe774193adc
+checksum=fa395fec7de633df1cb85b6248b8f35af98380ed128a8bc465fb48bc4d252633
diff --git a/srcpkgs/kernel/template b/srcpkgs/kernel/template
index df5120c463e..f72a29272af 100644
--- a/srcpkgs/kernel/template
+++ b/srcpkgs/kernel/template
@@ -4,7 +4,7 @@
 # ATTENTION:
 # kernel-headers revision is set here, not on its template!
 #
-#revision=1
+revision=2
 #_kernel_headers_revision=1
 
 pkgname=kernel
diff --git a/srcpkgs/mpc/template b/srcpkgs/mpc/template
index 9aff4ed6c18..fd1436fc77c 100644
--- a/srcpkgs/mpc/template
+++ b/srcpkgs/mpc/template
@@ -1,7 +1,6 @@
 # Template build file for 'mpc'
 pkgname=mpc
 version=0.8.2
-revision=1
 distfiles="http://www.multiprecision.org/mpc/download/mpc-${version}.tar.gz"
 build_style=gnu_configure
 short_desc="C library for the arithmetic of complex numbers"