Fix license - bug #447272

(Portage version: 2.2.0_alpha149/cvs/Linux x86_64, signed Manifest commit with key 0x77F1F175586A3B1F)

7 files changed, 19 insertions, 13 deletions

diff --git a/dev-libs/cyrus-sasl/ChangeLog b/dev-libs/cyrus-sasl/ChangeLog
index c5e3a72b1c99..602318e37ebd 100644
--- a/dev-libs/cyrus-sasl/ChangeLog
+++ b/dev-libs/cyrus-sasl/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-libs/cyrus-sasl
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/cyrus-sasl/ChangeLog,v 1.255 2012/12/18 19:59:52 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/cyrus-sasl/ChangeLog,v 1.256 2012/12/21 13:27:37 eras Exp $
+
+  21 Dec 2012; Eray Aslan <eras@gentoo.org> cyrus-sasl-2.1.23-r6.ebuild,
+  cyrus-sasl-2.1.25-r1.ebuild, cyrus-sasl-2.1.25-r2.ebuild,
+  cyrus-sasl-2.1.25-r3.ebuild, cyrus-sasl-2.1.25-r4.ebuild,
+  cyrus-sasl-2.1.25.ebuild:
+  Fix license - bug #447272
 
   18 Dec 2012; Agostino Sarubbo <ago@gentoo.org> cyrus-sasl-2.1.25-r3.ebuild:
   Stable for ia64, wrt bug #445208
diff --git a/dev-libs/cyrus-sasl/cyrus-sasl-2.1.23-r6.ebuild b/dev-libs/cyrus-sasl/cyrus-sasl-2.1.23-r6.ebuild
index 1993c86d4b82..392c19269e04 100644
--- a/dev-libs/cyrus-sasl/cyrus-sasl-2.1.23-r6.ebuild
+++ b/dev-libs/cyrus-sasl/cyrus-sasl-2.1.23-r6.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/dev-libs/cyrus-sasl/cyrus-sasl-2.1.23-r6.ebuild,v 1.9 2012/11/05 21:56:02 eras Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/cyrus-sasl/cyrus-sasl-2.1.23-r6.ebuild,v 1.10 2012/12/21 13:27:37 eras Exp $
 
 EAPI=2
 
@@ -14,7 +14,7 @@ HOMEPAGE="http://asg.web.cmu.edu/sasl/"
 SRC_URI="ftp://ftp.andrew.cmu.edu/pub/cyrus-mail/${P}.tar.gz
 	ntlm_unsupported_patch? ( mirror://gentoo/${ntlm_patch} )"
 
-LICENSE="BSD-4"
+LICENSE="BSD-with-attribution"
 SLOT="2"
 KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~sparc-fbsd ~x86-fbsd"
 IUSE="authdaemond berkdb crypt gdbm kerberos openldap mysql ntlm_unsupported_patch pam postgres sample srp ssl urandom"
diff --git a/dev-libs/cyrus-sasl/cyrus-sasl-2.1.25-r1.ebuild b/dev-libs/cyrus-sasl/cyrus-sasl-2.1.25-r1.ebuild
index b2668145102f..d90122470f47 100644
--- a/dev-libs/cyrus-sasl/cyrus-sasl-2.1.25-r1.ebuild
+++ b/dev-libs/cyrus-sasl/cyrus-sasl-2.1.25-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/dev-libs/cyrus-sasl/cyrus-sasl-2.1.25-r1.ebuild,v 1.2 2012/11/05 21:56:02 eras Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/cyrus-sasl/cyrus-sasl-2.1.25-r1.ebuild,v 1.3 2012/12/21 13:27:37 eras Exp $
 
 EAPI=4
 inherit eutils flag-o-matic multilib autotools pam java-pkg-opt-2 db-use
@@ -11,7 +11,7 @@ DESCRIPTION="The Cyrus SASL (Simple Authentication and Security Layer)."
 HOMEPAGE="http://cyrusimap.web.cmu.edu/"
 SRC_URI="ftp://ftp.cyrusimap.org/cyrus-sasl/${P}.tar.gz"
 
-LICENSE="BSD-4"
+LICENSE="BSD-with-attribution"
 SLOT="2"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd"
 IUSE="authdaemond berkdb gdbm kerberos ldapdb openldap mysql pam postgres sample sqlite
diff --git a/dev-libs/cyrus-sasl/cyrus-sasl-2.1.25-r2.ebuild b/dev-libs/cyrus-sasl/cyrus-sasl-2.1.25-r2.ebuild
index def0e9d1c9e1..c99bb62a5714 100644
--- a/dev-libs/cyrus-sasl/cyrus-sasl-2.1.25-r2.ebuild
+++ b/dev-libs/cyrus-sasl/cyrus-sasl-2.1.25-r2.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/dev-libs/cyrus-sasl/cyrus-sasl-2.1.25-r2.ebuild,v 1.3 2012/11/05 21:56:02 eras Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/cyrus-sasl/cyrus-sasl-2.1.25-r2.ebuild,v 1.4 2012/12/21 13:27:37 eras Exp $
 
 EAPI=4
 inherit eutils flag-o-matic multilib autotools pam java-pkg-opt-2 db-use
@@ -11,7 +11,7 @@ DESCRIPTION="The Cyrus SASL (Simple Authentication and Security Layer)."
 HOMEPAGE="http://cyrusimap.web.cmu.edu/"
 SRC_URI="ftp://ftp.cyrusimap.org/cyrus-sasl/${P}.tar.gz"
 
-LICENSE="BSD-4"
+LICENSE="BSD-with-attribution"
 SLOT="2"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
 IUSE="authdaemond berkdb gdbm kerberos ldapdb openldap mysql pam postgres sample sqlite
diff --git a/dev-libs/cyrus-sasl/cyrus-sasl-2.1.25-r3.ebuild b/dev-libs/cyrus-sasl/cyrus-sasl-2.1.25-r3.ebuild
index d536a238cf60..cc11a08cfa14 100644
--- a/dev-libs/cyrus-sasl/cyrus-sasl-2.1.25-r3.ebuild
+++ b/dev-libs/cyrus-sasl/cyrus-sasl-2.1.25-r3.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/dev-libs/cyrus-sasl/cyrus-sasl-2.1.25-r3.ebuild,v 1.9 2012/12/18 19:59:52 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/cyrus-sasl/cyrus-sasl-2.1.25-r3.ebuild,v 1.10 2012/12/21 13:27:37 eras Exp $
 
 EAPI=4
 inherit eutils flag-o-matic multilib autotools pam java-pkg-opt-2 db-use
@@ -11,7 +11,7 @@ DESCRIPTION="The Cyrus SASL (Simple Authentication and Security Layer)."
 HOMEPAGE="http://cyrusimap.web.cmu.edu/"
 SRC_URI="ftp://ftp.cyrusimap.org/cyrus-sasl/${P}.tar.gz"
 
-LICENSE="BSD-4"
+LICENSE="BSD-with-attribution"
 SLOT="2"
 KEYWORDS="~alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
 IUSE="authdaemond berkdb gdbm kerberos ldapdb openldap mysql pam postgres sample sqlite
diff --git a/dev-libs/cyrus-sasl/cyrus-sasl-2.1.25-r4.ebuild b/dev-libs/cyrus-sasl/cyrus-sasl-2.1.25-r4.ebuild
index d8b17b45cd55..935684c480f4 100644
--- a/dev-libs/cyrus-sasl/cyrus-sasl-2.1.25-r4.ebuild
+++ b/dev-libs/cyrus-sasl/cyrus-sasl-2.1.25-r4.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/dev-libs/cyrus-sasl/cyrus-sasl-2.1.25-r4.ebuild,v 1.1 2012/12/05 09:40:37 eras Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/cyrus-sasl/cyrus-sasl-2.1.25-r4.ebuild,v 1.2 2012/12/21 13:27:37 eras Exp $
 
 EAPI=4
 inherit eutils flag-o-matic multilib autotools pam java-pkg-opt-2 db-use
@@ -11,7 +11,7 @@ DESCRIPTION="The Cyrus SASL (Simple Authentication and Security Layer)."
 HOMEPAGE="http://cyrusimap.web.cmu.edu/"
 SRC_URI="ftp://ftp.cyrusimap.org/cyrus-sasl/${P}.tar.gz"
 
-LICENSE="BSD-4"
+LICENSE="BSD-with-attribution"
 SLOT="2"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
 IUSE="authdaemond berkdb gdbm kerberos ldapdb openldap mysql pam postgres sample sqlite
diff --git a/dev-libs/cyrus-sasl/cyrus-sasl-2.1.25.ebuild b/dev-libs/cyrus-sasl/cyrus-sasl-2.1.25.ebuild
index 1ec7a785daab..6ef165aa6010 100644
--- a/dev-libs/cyrus-sasl/cyrus-sasl-2.1.25.ebuild
+++ b/dev-libs/cyrus-sasl/cyrus-sasl-2.1.25.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/dev-libs/cyrus-sasl/cyrus-sasl-2.1.25.ebuild,v 1.3 2012/11/05 21:56:02 eras Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/cyrus-sasl/cyrus-sasl-2.1.25.ebuild,v 1.4 2012/12/21 13:27:37 eras Exp $
 
 EAPI=4
 inherit eutils flag-o-matic multilib autotools pam java-pkg-opt-2 db-use
@@ -11,7 +11,7 @@ DESCRIPTION="The Cyrus SASL (Simple Authentication and Security Layer)."
 HOMEPAGE="http://cyrusimap.web.cmu.edu/"
 SRC_URI="ftp://ftp.cyrusimap.org/cyrus-sasl/${P}.tar.gz"
 
-LICENSE="BSD-4"
+LICENSE="BSD-with-attribution"
 SLOT="2"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd"
 IUSE="authdaemond berkdb gdbm kerberos ldapdb openldap mysql pam postgres sample sqlite