Move Creative Commons licenses to shorter names.

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

5 files changed, 18 insertions, 14 deletions

diff --git a/app-crypt/mit-krb5/ChangeLog b/app-crypt/mit-krb5/ChangeLog
index f9ddec784fd0..ff8007926e4a 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.348 2012/12/28 07:29:59 eras Exp $
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/mit-krb5/ChangeLog,v 1.349 2013/02/07 21:20:16 ulm Exp $
+
+  07 Feb 2013; Ulrich Müller <ulm@gentoo.org> mit-krb5-1.10.2-r1.ebuild,
+  mit-krb5-1.10.3.ebuild, mit-krb5-1.11.ebuild, mit-krb5-1.11-r1.ebuild:
+  Move Creative Commons licenses to shorter names.
 
 *mit-krb5-1.11-r1 (28 Dec 2012)
 
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 8695cb7c6f3a..daec246d258f 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
+# Copyright 1999-2013 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.3 2012/12/16 19:38:25 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/mit-krb5/mit-krb5-1.10.2-r1.ebuild,v 1.4 2013/02/07 21:20:16 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="openafs-krb5-a BSD MIT OPENLDAP BSD-2 HPND BSD-4 ISC RSA CCPL-Attribution-ShareAlike-3.0 || ( BSD-2 GPL-2+ )"
+LICENSE="openafs-krb5-a BSD MIT OPENLDAP BSD-2 HPND BSD-4 ISC RSA CC-BY-SA-3.0 || ( BSD-2 GPL-2+ )"
 SLOT="0"
 KEYWORDS="~amd64 ~arm ~hppa ~ppc ~x86"
 IUSE="doc +keyutils openldap +pkinit +threads test xinetd"
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 79048dd91651..1ec187b4fb49 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
+# Copyright 1999-2013 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.4 2012/12/19 16:51:08 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/mit-krb5/mit-krb5-1.10.3.ebuild,v 1.5 2013/02/07 21:20:16 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="openafs-krb5-a BSD MIT OPENLDAP BSD-2 HPND BSD-4 ISC RSA CCPL-Attribution-ShareAlike-3.0 || ( BSD-2 GPL-2+ )"
+LICENSE="openafs-krb5-a BSD MIT OPENLDAP BSD-2 HPND BSD-4 ISC RSA CC-BY-SA-3.0 || ( BSD-2 GPL-2+ )"
 SLOT="0"
 KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~ppc ~x86"
 IUSE="doc +keyutils openldap +pkinit +threads test xinetd"
diff --git a/app-crypt/mit-krb5/mit-krb5-1.11-r1.ebuild b/app-crypt/mit-krb5/mit-krb5-1.11-r1.ebuild
index 994a6f165178..414b354525ba 100644
--- a/app-crypt/mit-krb5/mit-krb5-1.11-r1.ebuild
+++ b/app-crypt/mit-krb5/mit-krb5-1.11-r1.ebuild
@@ -1,6 +1,6 @@
-# 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/app-crypt/mit-krb5/mit-krb5-1.11-r1.ebuild,v 1.1 2012/12/28 07:29:59 eras Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/mit-krb5/mit-krb5-1.11-r1.ebuild,v 1.2 2013/02/07 21:20:16 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="openafs-krb5-a BSD MIT OPENLDAP BSD-2 HPND BSD-4 ISC RSA CCPL-Attribution-ShareAlike-3.0 || ( BSD-2 GPL-2+ )"
+LICENSE="openafs-krb5-a BSD MIT OPENLDAP BSD-2 HPND BSD-4 ISC RSA CC-BY-SA-3.0 || ( BSD-2 GPL-2+ )"
 SLOT="0"
 KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~ppc ~x86"
 IUSE="doc +keyutils openldap +pkinit +threads test xinetd"
diff --git a/app-crypt/mit-krb5/mit-krb5-1.11.ebuild b/app-crypt/mit-krb5/mit-krb5-1.11.ebuild
index 0532655f3b36..24a1494bfa8f 100644
--- a/app-crypt/mit-krb5/mit-krb5-1.11.ebuild
+++ b/app-crypt/mit-krb5/mit-krb5-1.11.ebuild
@@ -1,6 +1,6 @@
-# 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/app-crypt/mit-krb5/mit-krb5-1.11.ebuild,v 1.1 2012/12/19 19:11:25 eras Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/mit-krb5/mit-krb5-1.11.ebuild,v 1.2 2013/02/07 21:20:16 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="openafs-krb5-a BSD MIT OPENLDAP BSD-2 HPND BSD-4 ISC RSA CCPL-Attribution-ShareAlike-3.0 || ( BSD-2 GPL-2+ )"
+LICENSE="openafs-krb5-a BSD MIT OPENLDAP BSD-2 HPND BSD-4 ISC RSA CC-BY-SA-3.0 || ( BSD-2 GPL-2+ )"
 SLOT="0"
 KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~ppc ~x86"
 IUSE="doc +keyutils openldap +pkinit +threads test xinetd"