10 files changed, 35 insertions, 29 deletions
diff --git a/sys-devel/gcc/ChangeLog b/sys-devel/gcc/ChangeLog
index 6ce3f0674627..91441e04b8f2 100644
--- a/sys-devel/gcc/ChangeLog
+++ b/sys-devel/gcc/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sys-devel/gcc
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc/ChangeLog,v 1.740 2009/12/03 17:57:53 armin76 Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc/ChangeLog,v 1.741 2010/01/09 12:58:57 ulm Exp $
+
+  09 Jan 2010; Ulrich Mueller <ulm@gentoo.org> gcc-4.0.4.ebuild,
+  gcc-4.1.2.ebuild, gcc-4.2.4-r1.ebuild, gcc-4.3.2-r3.ebuild,
+  gcc-4.3.2-r4.ebuild, gcc-4.3.3-r2.ebuild, gcc-4.3.4.ebuild,
+  gcc-4.4.1.ebuild, gcc-4.4.2.ebuild:
+  Make GPL exceptions optional and add FDL-1.2 to LICENSE. Fixes bug 299996.
 
   03 Dec 2009; Raúl Porcel <armin76@gentoo.org> gcc-4.3.4.ebuild:
   sh stable wrt #288621
diff --git a/sys-devel/gcc/gcc-4.0.4.ebuild b/sys-devel/gcc/gcc-4.0.4.ebuild
index 26eb1f28ccc2..bc9fc032f9b4 100644
--- a/sys-devel/gcc/gcc-4.0.4.ebuild
+++ b/sys-devel/gcc/gcc-4.0.4.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc/gcc-4.0.4.ebuild,v 1.5 2009/05/03 00:21:52 halcy0n Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc/gcc-4.0.4.ebuild,v 1.6 2010/01/09 12:58:57 ulm Exp $
 
 PATCH_VER="1.1"
 UCLIBC_VER="1.0"
@@ -21,7 +21,7 @@ inherit toolchain
 
 DESCRIPTION="The GNU Compiler Collection.  Includes C/C++, java compilers, pie+ssp extensions, Haj Ten Brugge runtime bounds checking"
 
-LICENSE="GPL-2 LGPL-2.1"
+LICENSE="GPL-2 LGPL-2.1 FDL-1.2"
 KEYWORDS="-* ~ia64"
 
 RDEPEND=">=sys-libs/zlib-1.1.4
diff --git a/sys-devel/gcc/gcc-4.1.2.ebuild b/sys-devel/gcc/gcc-4.1.2.ebuild
index b9c899487e30..c69869f6b49e 100644
--- a/sys-devel/gcc/gcc-4.1.2.ebuild
+++ b/sys-devel/gcc/gcc-4.1.2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc/gcc-4.1.2.ebuild,v 1.23 2009/05/03 00:21:52 halcy0n Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc/gcc-4.1.2.ebuild,v 1.24 2010/01/09 12:58:57 ulm Exp $
 
 PATCH_VER="1.3"
 UCLIBC_VER="1.0"
@@ -16,7 +16,7 @@ inherit toolchain
 
 DESCRIPTION="The GNU Compiler Collection.  Includes C/C++, java compilers, pie+ssp extensions, Haj Ten Brugge runtime bounds checking"
 
-LICENSE="GPL-2 LGPL-2.1"
+LICENSE="GPL-2 LGPL-2.1 FDL-1.2"
 KEYWORDS="-* alpha amd64 arm hppa ia64 mips ppc ppc64 s390 sh sparc ~sparc-fbsd x86 ~x86-fbsd"
 
 RDEPEND=">=sys-libs/zlib-1.1.4
diff --git a/sys-devel/gcc/gcc-4.2.4-r1.ebuild b/sys-devel/gcc/gcc-4.2.4-r1.ebuild
index cb4af9d2cbec..93a2701e6f2d 100644
--- a/sys-devel/gcc/gcc-4.2.4-r1.ebuild
+++ b/sys-devel/gcc/gcc-4.2.4-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc/gcc-4.2.4-r1.ebuild,v 1.4 2009/05/09 21:26:13 halcy0n Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc/gcc-4.2.4-r1.ebuild,v 1.5 2010/01/09 12:58:57 ulm Exp $
 
 PATCH_VER="1.1"
 UCLIBC_VER="1.0"
@@ -15,7 +15,7 @@ inherit toolchain
 
 DESCRIPTION="The GNU Compiler Collection.  Includes C/C++, java compilers, pie+ssp extensions, Haj Ten Brugge runtime bounds checking"
 
-LICENSE="GPL-3 LGPL-2.1 libgcc libstdc++"
+LICENSE="GPL-3 LGPL-2.1 || ( GPL-3 libgcc libstdc++ ) FDL-1.2"
 KEYWORDS="~alpha ~amd64 ~arm hppa ~ia64 ~ppc ~ppc64 ~sparc ~sparc-fbsd ~x86 ~x86-fbsd"
 
 RDEPEND=">=sys-libs/zlib-1.1.4
diff --git a/sys-devel/gcc/gcc-4.3.2-r3.ebuild b/sys-devel/gcc/gcc-4.3.2-r3.ebuild
index d3982148e4d7..2d08d62de3d7 100644
--- a/sys-devel/gcc/gcc-4.3.2-r3.ebuild
+++ b/sys-devel/gcc/gcc-4.3.2-r3.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc/gcc-4.3.2-r3.ebuild,v 1.15 2009/09/25 13:31:36 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc/gcc-4.3.2-r3.ebuild,v 1.16 2010/01/09 12:58:57 ulm Exp $
 
 PATCH_VER="1.6"
 UCLIBC_VER="1.0"
@@ -27,7 +27,7 @@ inherit toolchain
 
 DESCRIPTION="The GNU Compiler Collection.  Includes C/C++, java compilers, pie+ssp extensions, Haj Ten Brugge runtime bounds checking"
 
-LICENSE="GPL-3 LGPL-3 libgcc libstdc++"
+LICENSE="GPL-3 LGPL-3 || ( GPL-3 libgcc libstdc++ ) FDL-1.2"
 KEYWORDS="alpha amd64 ~arm -hppa ia64 ~mips ppc ppc64 ~s390 -sh sparc x86 ~x86-fbsd"
 
 RDEPEND=">=sys-libs/zlib-1.1.4
diff --git a/sys-devel/gcc/gcc-4.3.2-r4.ebuild b/sys-devel/gcc/gcc-4.3.2-r4.ebuild
index 7145c292ab73..414d127e7b1e 100644
--- a/sys-devel/gcc/gcc-4.3.2-r4.ebuild
+++ b/sys-devel/gcc/gcc-4.3.2-r4.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc/gcc-4.3.2-r4.ebuild,v 1.8 2009/10/01 13:51:23 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc/gcc-4.3.2-r4.ebuild,v 1.9 2010/01/09 12:58:57 ulm Exp $
 
 PATCH_VER="1.8"
 UCLIBC_VER="1.0"
@@ -27,7 +27,7 @@ inherit toolchain
 
 DESCRIPTION="The GNU Compiler Collection.  Includes C/C++, java compilers, pie+ssp extensions, Haj Ten Brugge runtime bounds checking"
 
-LICENSE="GPL-3 LGPL-3 libgcc libstdc++"
+LICENSE="GPL-3 LGPL-3 || ( GPL-3 libgcc libstdc++ ) FDL-1.2"
 KEYWORDS="~alpha ~amd64 arm -hppa ~ia64 ~mips ~ppc ~ppc64 s390 sh ~sparc ~x86 ~x86-fbsd"
 
 RDEPEND=">=sys-libs/zlib-1.1.4
diff --git a/sys-devel/gcc/gcc-4.3.3-r2.ebuild b/sys-devel/gcc/gcc-4.3.3-r2.ebuild
index 0fdbef3474e4..7779d74fb021 100644
--- a/sys-devel/gcc/gcc-4.3.3-r2.ebuild
+++ b/sys-devel/gcc/gcc-4.3.3-r2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc/gcc-4.3.3-r2.ebuild,v 1.7 2009/09/20 04:49:22 dirtyepic Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc/gcc-4.3.3-r2.ebuild,v 1.8 2010/01/09 12:58:57 ulm Exp $
 
 GENTOO_PATCH_EXCLUDE="69_all_gcc43-pr39013.patch" #262567
 
@@ -27,7 +27,7 @@ inherit toolchain
 
 DESCRIPTION="The GNU Compiler Collection.  Includes C/C++, java compilers, pie+ssp extensions, Haj Ten Brugge runtime bounds checking"
 
-LICENSE="GPL-3 LGPL-3 libgcc libstdc++"
+LICENSE="GPL-3 LGPL-3 || ( GPL-3 libgcc libstdc++ ) FDL-1.2"
 KEYWORDS="~alpha ~amd64 ~arm -hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
 
 RDEPEND=">=sys-libs/zlib-1.1.4
diff --git a/sys-devel/gcc/gcc-4.3.4.ebuild b/sys-devel/gcc/gcc-4.3.4.ebuild
index 67d496da188e..7c9709fe9dbf 100644
--- a/sys-devel/gcc/gcc-4.3.4.ebuild
+++ b/sys-devel/gcc/gcc-4.3.4.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc/gcc-4.3.4.ebuild,v 1.10 2009/12/03 17:57:53 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc/gcc-4.3.4.ebuild,v 1.11 2010/01/09 12:58:57 ulm Exp $
 
 GENTOO_PATCH_EXCLUDE="69_all_gcc43-pr39013.patch" #262567
 
@@ -27,7 +27,7 @@ inherit toolchain
 
 DESCRIPTION="The GNU Compiler Collection.  Includes C/C++, java compilers, pie+ssp extensions, Haj Ten Brugge runtime bounds checking"
 
-LICENSE="GPL-3 LGPL-3 libgcc libstdc++"
+LICENSE="GPL-3 LGPL-3 || ( GPL-3 libgcc libstdc++ ) FDL-1.2"
 KEYWORDS="alpha amd64 arm -hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd"
 
 RDEPEND=">=sys-libs/zlib-1.1.4
diff --git a/sys-devel/gcc/gcc-4.4.1.ebuild b/sys-devel/gcc/gcc-4.4.1.ebuild
index 4d6ead71384c..477681f4686d 100644
--- a/sys-devel/gcc/gcc-4.4.1.ebuild
+++ b/sys-devel/gcc/gcc-4.4.1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc/gcc-4.4.1.ebuild,v 1.12 2009/10/26 22:03:29 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc/gcc-4.4.1.ebuild,v 1.13 2010/01/09 12:58:57 ulm Exp $
 
 PATCH_VER="1.0"
 UCLIBC_VER="1.1"
@@ -25,7 +25,7 @@ inherit toolchain
 
 DESCRIPTION="The GNU Compiler Collection.  Includes C/C++, java compilers, pie+ssp extensions, Haj Ten Brugge runtime bounds checking"
 
-LICENSE="GPL-3 LGPL-3 libgcc libstdc++ gcc-runtime-library-exception-3.1"
+LICENSE="GPL-3 LGPL-3 || ( GPL-3 libgcc libstdc++ gcc-runtime-library-exception-3.1 ) FDL-1.2"
 KEYWORDS="~alpha ~amd64 -arm -hppa ~ia64 ~mips ~ppc ~ppc64 -sparc ~x86 ~x86-fbsd"
 
 RDEPEND=">=sys-libs/zlib-1.1.4
diff --git a/sys-devel/gcc/gcc-4.4.2.ebuild b/sys-devel/gcc/gcc-4.4.2.ebuild
index 917d71d3b964..53d88e68ee78 100644
--- a/sys-devel/gcc/gcc-4.4.2.ebuild
+++ b/sys-devel/gcc/gcc-4.4.2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc/gcc-4.4.2.ebuild,v 1.4 2009/11/10 15:04:12 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc/gcc-4.4.2.ebuild,v 1.5 2010/01/09 12:58:57 ulm Exp $
 
 PATCH_VER="1.0"
 UCLIBC_VER="1.0"
@@ -25,7 +25,7 @@ inherit toolchain
 
 DESCRIPTION="The GNU Compiler Collection.  Includes C/C++, java compilers, pie+ssp extensions, Haj Ten Brugge runtime bounds checking"
 
-LICENSE="GPL-3 LGPL-3 libgcc libstdc++ gcc-runtime-library-exception-3.1"
+LICENSE="GPL-3 LGPL-3 || ( GPL-3 libgcc libstdc++ gcc-runtime-library-exception-3.1 ) FDL-1.2"
 KEYWORDS="~alpha ~amd64 ~arm -hppa ~ia64 ~mips ~ppc ~ppc64 -sparc ~x86 ~x86-fbsd"
 
 RDEPEND=">=sys-libs/zlib-1.1.4