Fix LICENSE, see NOTICE file, bug 447292.

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

4 files changed, 17 insertions, 13 deletions

diff --git a/app-crypt/mit-krb5/ChangeLog b/app-crypt/mit-krb5/ChangeLog
index bf78499e688a..11b32d488356 100644
--- a/app-crypt/mit-krb5/ChangeLog
+++ b/app-crypt/mit-krb5/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-crypt/mit-krb5
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/mit-krb5/ChangeLog,v 1.341 2012/09/25 09:25:29 eras Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/mit-krb5/ChangeLog,v 1.342 2012/12/16 19:38:25 ulm Exp $
+
+  16 Dec 2012; Ulrich Müller <ulm@gentoo.org> mit-krb5-1.9.4-r1.ebuild,
+  mit-krb5-1.10.2-r1.ebuild, mit-krb5-1.10.3.ebuild:
+  Fix LICENSE, see NOTICE file, bug 447292.
 
   25 Sep 2012; Eray Aslan <eras@gentoo.org> -mit-krb5-1.10.1-r2.ebuild,
   -mit-krb5-1.8.3-r6.ebuild, -mit-krb5-1.9.2-r2.ebuild, -mit-krb5-1.9.4.ebuild:
diff --git a/app-crypt/mit-krb5/mit-krb5-1.10.2-r1.ebuild b/app-crypt/mit-krb5/mit-krb5-1.10.2-r1.ebuild
index d032862ba9c8..8695cb7c6f3a 100644
--- a/app-crypt/mit-krb5/mit-krb5-1.10.2-r1.ebuild
+++ b/app-crypt/mit-krb5/mit-krb5-1.10.2-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/mit-krb5/mit-krb5-1.10.2-r1.ebuild,v 1.2 2012/08/18 09:16:11 eras Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/mit-krb5/mit-krb5-1.10.2-r1.ebuild,v 1.3 2012/12/16 19:38:25 ulm Exp $
 
 EAPI=4
 inherit eutils flag-o-matic versionator
@@ -11,7 +11,7 @@ DESCRIPTION="MIT Kerberos V"
 HOMEPAGE="http://web.mit.edu/kerberos/www/"
 SRC_URI="http://web.mit.edu/kerberos/dist/krb5/${P_DIR}/${MY_P}-signed.tar"
 
-LICENSE="as-is"
+LICENSE="openafs-krb5-a BSD MIT OPENLDAP BSD-2 HPND BSD-4 ISC RSA CCPL-Attribution-ShareAlike-3.0 || ( BSD-2 GPL-2+ )"
 SLOT="0"
 KEYWORDS="~amd64 ~arm ~hppa ~ppc ~x86"
 IUSE="doc +keyutils openldap +pkinit +threads test xinetd"
@@ -27,7 +27,7 @@ DEPEND="${RDEPEND}
 	virtual/yacc
 	doc? ( virtual/latex-base )
 	test? ( dev-lang/tcl
-	        dev-lang/python
+			dev-lang/python
 			dev-util/dejagnu )"
 
 S=${WORKDIR}/${MY_P}/src
@@ -95,7 +95,7 @@ src_install() {
 	dohtml -r doc/*.html
 
 	if use doc ; then
-	    dodoc doc/{api,implement}/*.ps
+		dodoc doc/{api,implement}/*.ps
 	fi
 
 	newinitd "${FILESDIR}"/mit-krb5kadmind.initd mit-krb5kadmind
diff --git a/app-crypt/mit-krb5/mit-krb5-1.10.3.ebuild b/app-crypt/mit-krb5/mit-krb5-1.10.3.ebuild
index bf9484b668f2..206f454dd2cc 100644
--- a/app-crypt/mit-krb5/mit-krb5-1.10.3.ebuild
+++ b/app-crypt/mit-krb5/mit-krb5-1.10.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/mit-krb5/mit-krb5-1.10.3.ebuild,v 1.2 2012/08/18 09:16:11 eras Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/mit-krb5/mit-krb5-1.10.3.ebuild,v 1.3 2012/12/16 19:38:25 ulm Exp $
 
 EAPI="4"
 inherit eutils flag-o-matic versionator
@@ -11,7 +11,7 @@ DESCRIPTION="MIT Kerberos V"
 HOMEPAGE="http://web.mit.edu/kerberos/www/"
 SRC_URI="http://web.mit.edu/kerberos/dist/krb5/${P_DIR}/${MY_P}-signed.tar"
 
-LICENSE="as-is"
+LICENSE="openafs-krb5-a BSD MIT OPENLDAP BSD-2 HPND BSD-4 ISC RSA CCPL-Attribution-ShareAlike-3.0 || ( BSD-2 GPL-2+ )"
 SLOT="0"
 KEYWORDS="~amd64 ~arm ~hppa ~ppc ~x86"
 IUSE="doc +keyutils openldap +pkinit +threads test xinetd"
@@ -27,7 +27,7 @@ DEPEND="${RDEPEND}
 	virtual/yacc
 	doc? ( virtual/latex-base )
 	test? ( dev-lang/tcl
-	        dev-lang/python
+			dev-lang/python
 			dev-util/dejagnu )"
 
 S=${WORKDIR}/${MY_P}/src
@@ -93,7 +93,7 @@ src_install() {
 	dohtml -r doc/*.html
 
 	if use doc ; then
-	    dodoc doc/{api,implement}/*.ps
+		dodoc doc/{api,implement}/*.ps
 	fi
 
 	newinitd "${FILESDIR}"/mit-krb5kadmind.initd mit-krb5kadmind
diff --git a/app-crypt/mit-krb5/mit-krb5-1.9.4-r1.ebuild b/app-crypt/mit-krb5/mit-krb5-1.9.4-r1.ebuild
index 75e2521e705e..5bbee0ae56c8 100644
--- a/app-crypt/mit-krb5/mit-krb5-1.9.4-r1.ebuild
+++ b/app-crypt/mit-krb5/mit-krb5-1.9.4-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/mit-krb5/mit-krb5-1.9.4-r1.ebuild,v 1.8 2012/09/22 07:47:25 xarthisius Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/mit-krb5/mit-krb5-1.9.4-r1.ebuild,v 1.9 2012/12/16 19:38:25 ulm Exp $
 
 EAPI=4
 inherit eutils flag-o-matic versionator
@@ -11,7 +11,7 @@ DESCRIPTION="MIT Kerberos V"
 HOMEPAGE="http://web.mit.edu/kerberos/www/"
 SRC_URI="http://web.mit.edu/kerberos/dist/krb5/${P_DIR}/${MY_P}-signed.tar"
 
-LICENSE="as-is"
+LICENSE="openafs-krb5-a BSD MIT OPENLDAP BSD-2 HPND BSD-4 ISC RSA"
 SLOT="0"
 KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
 IUSE="doc +keyutils openldap +pkinit +threads test xinetd"
@@ -26,7 +26,7 @@ DEPEND="${RDEPEND}
 	virtual/yacc
 	doc? ( virtual/latex-base )
 	test? ( dev-lang/tcl
-	        dev-lang/python
+			dev-lang/python
 			dev-util/dejagnu )"
 
 S=${WORKDIR}/${MY_P}/src
@@ -87,7 +87,7 @@ src_install() {
 
 	# die if we cannot respect a USE flag
 	if use doc ; then
-	    dodoc doc/{api,implement}/*.ps
+		dodoc doc/{api,implement}/*.ps
 	fi
 
 	newinitd "${FILESDIR}"/mit-krb5kadmind.initd mit-krb5kadmind