Fix LICENSE, bug 449796.

(Portage version: 2.1.11.40/cvs/Linux x86_64, signed Manifest commit with key E7BE08CA7DC6EA25)

8 files changed, 50 insertions, 51 deletions

diff --git a/sys-freebsd/freebsd-contrib/ChangeLog b/sys-freebsd/freebsd-contrib/ChangeLog
index 4ce483738508..7e0763150946 100644
--- a/sys-freebsd/freebsd-contrib/ChangeLog
+++ b/sys-freebsd/freebsd-contrib/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sys-freebsd/freebsd-contrib
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-contrib/ChangeLog,v 1.39 2012/11/06 12:54:03 aballier Exp $
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-contrib/ChangeLog,v 1.40 2013/01/12 10:16:23 ulm Exp $
+
+  12 Jan 2013; Ulrich Müller <ulm@gentoo.org> freebsd-contrib-7.2.ebuild,
+  freebsd-contrib-8.0.ebuild, freebsd-contrib-8.2.ebuild,
+  freebsd-contrib-9.0.ebuild, freebsd-contrib-9.1_rc1.ebuild,
+  freebsd-contrib-9.1_rc2.ebuild, freebsd-contrib-9.1_rc3.ebuild:
+  Fix LICENSE, bug 449796.
 
 *freebsd-contrib-9.1_rc3 (06 Nov 2012)
 
diff --git a/sys-freebsd/freebsd-contrib/freebsd-contrib-7.2.ebuild b/sys-freebsd/freebsd-contrib/freebsd-contrib-7.2.ebuild
index 3446fd7674f4..4f607604a2e3 100644
--- a/sys-freebsd/freebsd-contrib/freebsd-contrib-7.2.ebuild
+++ b/sys-freebsd/freebsd-contrib/freebsd-contrib-7.2.ebuild
@@ -1,19 +1,18 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-contrib/freebsd-contrib-7.2.ebuild,v 1.1 2009/05/22 11:14:47 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-contrib/freebsd-contrib-7.2.ebuild,v 1.2 2013/01/12 10:16:23 ulm Exp $
 
 inherit bsdmk freebsd flag-o-matic
 
 DESCRIPTION="Contributed sources for FreeBSD."
+SRC_URI="mirror://gentoo/${GNU}.tar.bz2
+	mirror://gentoo/${P}.tar.bz2"
+
+LICENSE="BSD GPL-2+ libodialog"
 SLOT="0"
 KEYWORDS="~sparc-fbsd ~x86-fbsd"
-LICENSE="BSD GPL-2 as-is"
-
 IUSE=""
 
-SRC_URI="mirror://gentoo/${GNU}.tar.bz2
-	mirror://gentoo/${P}.tar.bz2"
-
 RDEPEND=""
 DEPEND="=sys-freebsd/freebsd-sources-${RV}*
 	=sys-freebsd/freebsd-mk-defs-${RV}*"
diff --git a/sys-freebsd/freebsd-contrib/freebsd-contrib-8.0.ebuild b/sys-freebsd/freebsd-contrib/freebsd-contrib-8.0.ebuild
index f00ca025d3a2..49fd02d4b02d 100644
--- a/sys-freebsd/freebsd-contrib/freebsd-contrib-8.0.ebuild
+++ b/sys-freebsd/freebsd-contrib/freebsd-contrib-8.0.ebuild
@@ -1,19 +1,18 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-contrib/freebsd-contrib-8.0.ebuild,v 1.2 2011/12/10 02:39:01 naota Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-contrib/freebsd-contrib-8.0.ebuild,v 1.3 2013/01/12 10:16:23 ulm Exp $
 
 inherit bsdmk freebsd flag-o-matic
 
 DESCRIPTION="Contributed sources for FreeBSD."
+SRC_URI="mirror://gentoo/${GNU}.tar.bz2
+	mirror://gentoo/${P}.tar.bz2"
+
+LICENSE="BSD GPL-2+ libodialog"
 SLOT="0"
 KEYWORDS="~sparc-fbsd ~x86-fbsd"
-LICENSE="BSD GPL-2 as-is"
-
 IUSE=""
 
-SRC_URI="mirror://gentoo/${GNU}.tar.bz2
-	mirror://gentoo/${P}.tar.bz2"
-
 RDEPEND=""
 DEPEND="=sys-freebsd/freebsd-sources-${RV}*
 	=sys-freebsd/freebsd-mk-defs-${RV}*
diff --git a/sys-freebsd/freebsd-contrib/freebsd-contrib-8.2.ebuild b/sys-freebsd/freebsd-contrib/freebsd-contrib-8.2.ebuild
index eeb3d58e4315..2cf4618cab90 100644
--- a/sys-freebsd/freebsd-contrib/freebsd-contrib-8.2.ebuild
+++ b/sys-freebsd/freebsd-contrib/freebsd-contrib-8.2.ebuild
@@ -1,19 +1,18 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-contrib/freebsd-contrib-8.2.ebuild,v 1.2 2011/12/10 02:39:01 naota Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-contrib/freebsd-contrib-8.2.ebuild,v 1.3 2013/01/12 10:16:23 ulm Exp $
 
 inherit bsdmk freebsd flag-o-matic
 
 DESCRIPTION="Contributed sources for FreeBSD."
+SRC_URI="mirror://gentoo/${GNU}.tar.bz2
+	mirror://gentoo/${P}.tar.bz2"
+
+LICENSE="BSD GPL-2+ libodialog"
 SLOT="0"
 KEYWORDS="~sparc-fbsd ~x86-fbsd"
-LICENSE="BSD GPL-2 as-is"
-
 IUSE=""
 
-SRC_URI="mirror://gentoo/${GNU}.tar.bz2
-	mirror://gentoo/${P}.tar.bz2"
-
 RDEPEND=""
 DEPEND="=sys-freebsd/freebsd-sources-${RV}*
 	=sys-freebsd/freebsd-mk-defs-${RV}*
diff --git a/sys-freebsd/freebsd-contrib/freebsd-contrib-9.0.ebuild b/sys-freebsd/freebsd-contrib/freebsd-contrib-9.0.ebuild
index 881be303af6c..9615d1b30f04 100644
--- a/sys-freebsd/freebsd-contrib/freebsd-contrib-9.0.ebuild
+++ b/sys-freebsd/freebsd-contrib/freebsd-contrib-9.0.ebuild
@@ -1,19 +1,18 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-contrib/freebsd-contrib-9.0.ebuild,v 1.3 2012/05/04 11:36:46 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-contrib/freebsd-contrib-9.0.ebuild,v 1.4 2013/01/12 10:16:23 ulm Exp $
 
 inherit bsdmk freebsd flag-o-matic multilib
 
 DESCRIPTION="Contributed sources for FreeBSD."
+SRC_URI="mirror://gentoo/${GNU}.tar.bz2
+	mirror://gentoo/${P}.tar.bz2"
+
+LICENSE="BSD GPL-2+ libodialog"
 SLOT="0"
 KEYWORDS="~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
-LICENSE="BSD GPL-2 as-is"
-
 IUSE=""
 
-SRC_URI="mirror://gentoo/${GNU}.tar.bz2
-	mirror://gentoo/${P}.tar.bz2"
-
 RDEPEND=""
 DEPEND="=sys-freebsd/freebsd-sources-${RV}*
 	=sys-freebsd/freebsd-mk-defs-${RV}*"
diff --git a/sys-freebsd/freebsd-contrib/freebsd-contrib-9.1_rc1.ebuild b/sys-freebsd/freebsd-contrib/freebsd-contrib-9.1_rc1.ebuild
index 5f23c3875812..f86a803106b7 100644
--- a/sys-freebsd/freebsd-contrib/freebsd-contrib-9.1_rc1.ebuild
+++ b/sys-freebsd/freebsd-contrib/freebsd-contrib-9.1_rc1.ebuild
@@ -1,19 +1,18 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-contrib/freebsd-contrib-9.1_rc1.ebuild,v 1.1 2012/09/11 17:02:43 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-contrib/freebsd-contrib-9.1_rc1.ebuild,v 1.2 2013/01/12 10:16:23 ulm Exp $
 
 inherit bsdmk freebsd flag-o-matic multilib
 
 DESCRIPTION="Contributed sources for FreeBSD."
+SRC_URI="mirror://gentoo/${GNU}.tar.bz2
+	mirror://gentoo/${P}.tar.bz2"
+
+LICENSE="BSD GPL-2+ libodialog"
 SLOT="0"
 KEYWORDS="~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
-LICENSE="BSD GPL-2 as-is"
-
 IUSE=""
 
-SRC_URI="mirror://gentoo/${GNU}.tar.bz2
-	mirror://gentoo/${P}.tar.bz2"
-
 RDEPEND=""
 DEPEND="=sys-freebsd/freebsd-sources-${RV}*
 	=sys-freebsd/freebsd-mk-defs-${RV}*"
diff --git a/sys-freebsd/freebsd-contrib/freebsd-contrib-9.1_rc2.ebuild b/sys-freebsd/freebsd-contrib/freebsd-contrib-9.1_rc2.ebuild
index 7eaf899e82c3..5f71ad7e0ee1 100644
--- a/sys-freebsd/freebsd-contrib/freebsd-contrib-9.1_rc2.ebuild
+++ b/sys-freebsd/freebsd-contrib/freebsd-contrib-9.1_rc2.ebuild
@@ -1,19 +1,18 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-contrib/freebsd-contrib-9.1_rc2.ebuild,v 1.1 2012/10/14 15:22:51 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-contrib/freebsd-contrib-9.1_rc2.ebuild,v 1.2 2013/01/12 10:16:23 ulm Exp $
 
 inherit bsdmk freebsd flag-o-matic multilib
 
 DESCRIPTION="Contributed sources for FreeBSD."
+SRC_URI="mirror://gentoo/${GNU}.tar.bz2
+	mirror://gentoo/${P}.tar.bz2"
+
+LICENSE="BSD GPL-2+ libodialog"
 SLOT="0"
 KEYWORDS="~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
-LICENSE="BSD GPL-2 as-is"
-
 IUSE=""
 
-SRC_URI="mirror://gentoo/${GNU}.tar.bz2
-	mirror://gentoo/${P}.tar.bz2"
-
 RDEPEND=""
 DEPEND="=sys-freebsd/freebsd-sources-${RV}*
 	=sys-freebsd/freebsd-mk-defs-${RV}*"
diff --git a/sys-freebsd/freebsd-contrib/freebsd-contrib-9.1_rc3.ebuild b/sys-freebsd/freebsd-contrib/freebsd-contrib-9.1_rc3.ebuild
index b499cd4edb7c..bbd04a5b82e5 100644
--- a/sys-freebsd/freebsd-contrib/freebsd-contrib-9.1_rc3.ebuild
+++ b/sys-freebsd/freebsd-contrib/freebsd-contrib-9.1_rc3.ebuild
@@ -1,19 +1,18 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-contrib/freebsd-contrib-9.1_rc3.ebuild,v 1.1 2012/11/06 12:54:03 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-contrib/freebsd-contrib-9.1_rc3.ebuild,v 1.2 2013/01/12 10:16:23 ulm Exp $
 
 inherit bsdmk freebsd flag-o-matic multilib
 
 DESCRIPTION="Contributed sources for FreeBSD."
+SRC_URI="mirror://gentoo/${GNU}.tar.bz2
+	mirror://gentoo/${P}.tar.bz2"
+
+LICENSE="BSD GPL-2+ libodialog"
 SLOT="0"
 KEYWORDS="~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
-LICENSE="BSD GPL-2 as-is"
-
 IUSE=""
 
-SRC_URI="mirror://gentoo/${GNU}.tar.bz2
-	mirror://gentoo/${P}.tar.bz2"
-
 RDEPEND=""
 DEPEND="=sys-freebsd/freebsd-sources-${RV}*
 	=sys-freebsd/freebsd-mk-defs-${RV}*"