summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorUlrich Müller <ulm@gentoo.org>2013-02-07 21:32:38 +0000
committerUlrich Müller <ulm@gentoo.org>2013-02-07 21:32:38 +0000
commit6691351a0a3ff0898fa930fa3f1a63b26e8da79f (patch)
treeb3a10e9955f3669aa259b071133550730b55acdf /app-doc
parentFix cross-compiling. (diff)
downloadgentoo-2-6691351a0a3ff0898fa930fa3f1a63b26e8da79f.tar.gz
gentoo-2-6691351a0a3ff0898fa930fa3f1a63b26e8da79f.tar.bz2
gentoo-2-6691351a0a3ff0898fa930fa3f1a63b26e8da79f.zip
Move Creative Commons licenses to shorter names.
(Portage version: 2.1.11.50/cvs/Linux x86_64, signed Manifest commit with key E7BE08CA7DC6EA25)
Diffstat (limited to 'app-doc')
-rw-r--r--app-doc/linuxfromscratch/ChangeLog6
-rw-r--r--app-doc/linuxfromscratch/linuxfromscratch-7.1.ebuild6
-rw-r--r--app-doc/linuxfromscratch/linuxfromscratch-7.2.ebuild6
3 files changed, 11 insertions, 7 deletions
diff --git a/app-doc/linuxfromscratch/ChangeLog b/app-doc/linuxfromscratch/ChangeLog
index 0e2f07448176..32ddc692bfa9 100644
--- a/app-doc/linuxfromscratch/ChangeLog
+++ b/app-doc/linuxfromscratch/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for app-doc/linuxfromscratch
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-doc/linuxfromscratch/ChangeLog,v 1.22 2013/01/27 22:32:36 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-doc/linuxfromscratch/ChangeLog,v 1.23 2013/02/07 21:32:38 ulm Exp $
+
+ 07 Feb 2013; Ulrich Müller <ulm@gentoo.org> linuxfromscratch-7.1.ebuild,
+ linuxfromscratch-7.2.ebuild:
+ Move Creative Commons licenses to shorter names.
27 Jan 2013; Tim Harder <radhermit@gentoo.org> metadata.xml:
Remove redundant maintainer from metadata.
diff --git a/app-doc/linuxfromscratch/linuxfromscratch-7.1.ebuild b/app-doc/linuxfromscratch/linuxfromscratch-7.1.ebuild
index 1098a0c2a9a9..4c7e14f4d9d5 100644
--- a/app-doc/linuxfromscratch/linuxfromscratch-7.1.ebuild
+++ b/app-doc/linuxfromscratch/linuxfromscratch-7.1.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-doc/linuxfromscratch/linuxfromscratch-7.1.ebuild,v 1.2 2012/08/01 03:08:16 dirtyepic Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-doc/linuxfromscratch/linuxfromscratch-7.1.ebuild,v 1.3 2013/02/07 21:32:38 ulm Exp $
EAPI="4"
@@ -17,7 +17,7 @@ SRC_URI="${MY_SRC}/LFS-BOOK-${PV}.tar.bz2
htmlsingle? ( ${MY_SRC}/LFS-BOOK-${PV}-NOCHUNKS.html.bz2 )
pdf? ( ${MY_SRC}/LFS-BOOK-${PV}.pdf )"
-LICENSE="CCPL-Attribution-ShareAlike-NonCommercial-2.5 MIT"
+LICENSE="CC-BY-NC-SA-2.5 MIT"
SLOT="0"
KEYWORDS="alpha amd64 arm hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86"
IUSE="htmlsingle pdf"
diff --git a/app-doc/linuxfromscratch/linuxfromscratch-7.2.ebuild b/app-doc/linuxfromscratch/linuxfromscratch-7.2.ebuild
index b608b04d52c2..f633312e48ba 100644
--- a/app-doc/linuxfromscratch/linuxfromscratch-7.2.ebuild
+++ b/app-doc/linuxfromscratch/linuxfromscratch-7.2.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-doc/linuxfromscratch/linuxfromscratch-7.2.ebuild,v 1.2 2012/11/03 06:00:54 dirtyepic Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-doc/linuxfromscratch/linuxfromscratch-7.2.ebuild,v 1.3 2013/02/07 21:32:38 ulm Exp $
EAPI="4"
@@ -15,7 +15,7 @@ SRC_URI="${MY_SRC}/LFS-BOOK-${PV}.tar.bz2
htmlsingle? ( ${MY_SRC}/LFS-BOOK-${PV}-NOCHUNKS.html.bz2 )
pdf? ( ${MY_SRC}/LFS-BOOK-${PV}.pdf )"
-LICENSE="CCPL-Attribution-ShareAlike-NonCommercial-2.5 MIT"
+LICENSE="CC-BY-NC-SA-2.5 MIT"
SLOT="0"
KEYWORDS="alpha amd64 arm hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86"
IUSE="htmlsingle pdf"