From 3f415407d23c5c0b664a603f033d3ead446a3c48 Mon Sep 17 00:00:00 2001
From: Juan RP <xtraeme@gmail.com>
Date: Sun, 3 Jun 2012 09:58:27 +0200
Subject: [PATCH] gcc: don't hardcode required majorver in depends.

---
 srcpkgs/gcc/gcc-c++-multilib.template  | 2 +-
 srcpkgs/gcc/gcc-c++.template           | 2 +-
 srcpkgs/gcc/gcc-fortran.template       | 2 +-
 srcpkgs/gcc/gcc-go.template            | 2 +-
 srcpkgs/gcc/gcc-multilib.template      | 2 +-
 srcpkgs/gcc/gcc-objc++.template        | 2 +-
 srcpkgs/gcc/gcc-objc-multilib.template | 2 +-
 srcpkgs/gcc/gcc-objc.template          | 2 +-
 srcpkgs/gcc/libgfortran-devel.template | 2 +-
 srcpkgs/gcc/libgo-devel.template       | 2 +-
 srcpkgs/gcc/libgomp-devel.template     | 2 +-
 srcpkgs/gcc/libmudflap-devel.template  | 2 +-
 srcpkgs/gcc/libobjc-devel.template     | 2 +-
 srcpkgs/gcc/libquadmath-devel.template | 2 +-
 srcpkgs/gcc/libssp-devel.template      | 2 +-
 srcpkgs/gcc/libstdc++-devel.template   | 2 +-
 srcpkgs/gcc/template                   | 2 +-
 17 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/srcpkgs/gcc/gcc-c++-multilib.template b/srcpkgs/gcc/gcc-c++-multilib.template
index e356f5c612f..d9e8b89737f 100644
--- a/srcpkgs/gcc/gcc-c++-multilib.template
+++ b/srcpkgs/gcc/gcc-c++-multilib.template
@@ -1,6 +1,6 @@
 # Template file for 'gcc-c++-multilib'.
 #
-depends="gcc-c++>=4.7 gcc-multilib>=4.7 libstdc++32-devel>=4.7"
+depends="gcc-c++>=${_majorver} gcc-multilib>=${_majorver} libstdc++32-devel>=${_majorver}"
 short_desc="GCC C++ compiler (multilib files)"
 long_desc="
  This is the GNU C++ compiler, a fairly portable optimizing compiler for C++.
diff --git a/srcpkgs/gcc/gcc-c++.template b/srcpkgs/gcc/gcc-c++.template
index aa68c3a4eaf..853e5f4337f 100644
--- a/srcpkgs/gcc/gcc-c++.template
+++ b/srcpkgs/gcc/gcc-c++.template
@@ -1,6 +1,6 @@
 # Template file for 'gcc-c++'.
 #
-depends="libelf gcc>=4.7 libstdc++-devel>=4.7"
+depends="libelf gcc>=${_majorver} libstdc++-devel>=${_majorver}"
 short_desc="GCC C++ support"
 long_desc="${long_desc}
 
diff --git a/srcpkgs/gcc/gcc-fortran.template b/srcpkgs/gcc/gcc-fortran.template
index a8413472816..0a32934ac59 100644
--- a/srcpkgs/gcc/gcc-fortran.template
+++ b/srcpkgs/gcc/gcc-fortran.template
@@ -1,6 +1,6 @@
 # Template file for 'gcc-fortran'.
 #
-depends="gcc>=4.7 libgfortran-devel>=4.7"
+depends="gcc>=${_majorver} libgfortran-devel>=${_majorver}"
 short_desc="GCC Fortran compiler frontend"
 long_desc="${long_desc}
 
diff --git a/srcpkgs/gcc/gcc-go.template b/srcpkgs/gcc/gcc-go.template
index ef8bf39469e..e4194069fa6 100644
--- a/srcpkgs/gcc/gcc-go.template
+++ b/srcpkgs/gcc/gcc-go.template
@@ -1,6 +1,6 @@
 # Template file for 'gcc-go'.
 #
-depends="gcc>=4.7 libgo-devel>=4.7"
+depends="gcc>=${_majorver} libgo-devel>=${_majorver}"
 short_desc="GCC Go compiler frontend"
 long_desc="${long_desc}
 
diff --git a/srcpkgs/gcc/gcc-multilib.template b/srcpkgs/gcc/gcc-multilib.template
index 407f203d7ea..3ff24e00782 100644
--- a/srcpkgs/gcc/gcc-multilib.template
+++ b/srcpkgs/gcc/gcc-multilib.template
@@ -1,6 +1,6 @@
 # Template file for 'gcc-c-multilib'.
 #
-depends="gcc>=4.7 libgcc32>=4.7 libgomp32>=4.7 libitm32>=4.7 zlib32 glibc32-devel"
+depends="gcc>=${_majorver} libgcc32>=${_majorver} libgomp32>=${_majorver} libitm32>=${_majorver} zlib32 glibc32-devel"
 short_desc="GCC C compiler (multilib files)"
 long_desc="
  This is the GNU C compiler, a fairly portable optimizing compiler for C.
diff --git a/srcpkgs/gcc/gcc-objc++.template b/srcpkgs/gcc/gcc-objc++.template
index 43a0e00d379..6bbf625ab8d 100644
--- a/srcpkgs/gcc/gcc-objc++.template
+++ b/srcpkgs/gcc/gcc-objc++.template
@@ -1,6 +1,6 @@
 # Template file for 'gcc-objc++'.
 #
-depends="libelf gcc-c++>=4.7 gcc-objc>=4.7"
+depends="libelf gcc-c++>=${_majorver} gcc-objc>=${_majorver}"
 short_desc="GCC Objective-C++ support"
 long_desc="${long_desc}
 
diff --git a/srcpkgs/gcc/gcc-objc-multilib.template b/srcpkgs/gcc/gcc-objc-multilib.template
index e9ed6e0c740..365c27bf3ee 100644
--- a/srcpkgs/gcc/gcc-objc-multilib.template
+++ b/srcpkgs/gcc/gcc-objc-multilib.template
@@ -1,6 +1,6 @@
 # Template file for 'gcc-objc-multilib'.
 #
-depends="gcc-multilib>=4.7 gcc-objc>=4.7 libobjc32>=4.7"
+depends="gcc-multilib>=${_majorver} gcc-objc>=${_majorver} libobjc32>=${_majorver}"
 short_desc="The GNU Objective-C compiler (multilib files)"
 long_desc="
  This is the GNU Objective-C compiler, which compiles Objective-C on
diff --git a/srcpkgs/gcc/gcc-objc.template b/srcpkgs/gcc/gcc-objc.template
index 87c9471c6be..c72b6a8b31b 100644
--- a/srcpkgs/gcc/gcc-objc.template
+++ b/srcpkgs/gcc/gcc-objc.template
@@ -1,6 +1,6 @@
 # Template file for 'gcc-objc'.
 #
-depends="libelf gcc>=4.7 libobjc>=4.7"
+depends="libelf gcc>=${_majorver} libobjc>=${_majorver}"
 short_desc="GCC Objective-C support"
 long_desc="${long_desc}
 
diff --git a/srcpkgs/gcc/libgfortran-devel.template b/srcpkgs/gcc/libgfortran-devel.template
index 1d0749c5bb6..196c29304ba 100644
--- a/srcpkgs/gcc/libgfortran-devel.template
+++ b/srcpkgs/gcc/libgfortran-devel.template
@@ -1,6 +1,6 @@
 # Template file for 'libgfortran-devel'.
 #
-depends="libgfortran>=4.7"
+depends="libgfortran>=${_majorver}"
 short_desc="GCC Fortran library ${version} - development files"
 long_desc="${long_desc}
 
diff --git a/srcpkgs/gcc/libgo-devel.template b/srcpkgs/gcc/libgo-devel.template
index b6633af3668..b540a857d05 100644
--- a/srcpkgs/gcc/libgo-devel.template
+++ b/srcpkgs/gcc/libgo-devel.template
@@ -1,6 +1,6 @@
 # Template file for 'libgo-devel'.
 #
-depends="libgo>=4.7"
+depends="libgo>=${_majorver}"
 short_desc="GCC Go library ${version} shared library support - development files"
 long_desc="${long_desc}
 
diff --git a/srcpkgs/gcc/libgomp-devel.template b/srcpkgs/gcc/libgomp-devel.template
index fd9e23c42b0..b8f19e8c4fa 100644
--- a/srcpkgs/gcc/libgomp-devel.template
+++ b/srcpkgs/gcc/libgomp-devel.template
@@ -1,6 +1,6 @@
 # Template file for 'libgomp-devel'.
 #
-depends="libgomp>=4.7"
+depends="libgomp>=${_majorver}"
 short_desc="GCC OpenMP v3.0 shared support library - development files"
 long_desc="${long_desc}
 
diff --git a/srcpkgs/gcc/libmudflap-devel.template b/srcpkgs/gcc/libmudflap-devel.template
index 6575518f7e4..3a356275b47 100644
--- a/srcpkgs/gcc/libmudflap-devel.template
+++ b/srcpkgs/gcc/libmudflap-devel.template
@@ -1,6 +1,6 @@
 # Template file for 'gcc-libmudflap-devel'.
 #
-depends="libmudflap>=4.7"
+depends="libmudflap>=${_majorver}"
 short_desc="GCC mudflap shared support library (development files)"
 long_desc="${long_desc}
 
diff --git a/srcpkgs/gcc/libobjc-devel.template b/srcpkgs/gcc/libobjc-devel.template
index 76035cf354f..bfd59cbbae9 100644
--- a/srcpkgs/gcc/libobjc-devel.template
+++ b/srcpkgs/gcc/libobjc-devel.template
@@ -1,6 +1,6 @@
 # Template file for 'libobjc-devel'.
 #
-depends="libobjc>=4.7"
+depends="libobjc>=${_majorver}"
 short_desc="GCC Objective-C shared library support (development files)"
 long_desc="${long_desc}
 
diff --git a/srcpkgs/gcc/libquadmath-devel.template b/srcpkgs/gcc/libquadmath-devel.template
index 8dc43a2ac16..c9e7c7bb406 100644
--- a/srcpkgs/gcc/libquadmath-devel.template
+++ b/srcpkgs/gcc/libquadmath-devel.template
@@ -1,6 +1,6 @@
 # Template file for 'libquadmath-devel'.
 #
-depends="libquadmath>=4.7"
+depends="libquadmath>=${_majorver}"
 short_desc="GCC quadmath shared support library (development files)"
 long_desc="${long_desc}
 
diff --git a/srcpkgs/gcc/libssp-devel.template b/srcpkgs/gcc/libssp-devel.template
index fc08e932aef..78a0a16edf4 100644
--- a/srcpkgs/gcc/libssp-devel.template
+++ b/srcpkgs/gcc/libssp-devel.template
@@ -1,6 +1,6 @@
 # Template file for 'libssp'.
 #
-depends="glibc-devel libssp>=4.7"
+depends="glibc-devel libssp>=${_majorver}"
 short_desc="GCC SSP library support"
 long_desc="${long_desc}
 
diff --git a/srcpkgs/gcc/libstdc++-devel.template b/srcpkgs/gcc/libstdc++-devel.template
index 91532848530..9bfbd3b7cca 100644
--- a/srcpkgs/gcc/libstdc++-devel.template
+++ b/srcpkgs/gcc/libstdc++-devel.template
@@ -1,6 +1,6 @@
 # Template file for 'gcc-libstdc++-devel'.
 #
-depends="libstdc++>=4.7"
+depends="libstdc++>=${_majorver}"
 short_desc="GCC Standard C++ Library (development files)"
 long_desc="${long_desc}
 
diff --git a/srcpkgs/gcc/template b/srcpkgs/gcc/template
index 1a2f606bb78..9e239440c0f 100644
--- a/srcpkgs/gcc/template
+++ b/srcpkgs/gcc/template
@@ -3,7 +3,7 @@ pkgname=gcc
 _majorver=4.7
 version=${_majorver}.0
 distfiles="http://ftp.gnu.org/pub/gnu/gcc/gcc-$version/gcc-$version.tar.bz2"
-depends="binutils libelf libgomp>=4.7 libitm>=4.7 libssp-devel>=4.7"
+depends="binutils libelf libgomp>=${_majorver} libitm>=${_majorver} libssp-devel>=${_majorver}"
 makedepends="perl flex zlib-devel gmp-devel mpfr-devel mpc-devel cloog-ppl-devel libelf-devel"
 revision=1
 short_desc="The GNU C Compiler"