"as-is" license cleanup, bug 436698.

(Portage version: 2.1.11.23/cvs/Linux x86_64)

3 files changed, 10 insertions, 5 deletions

diff --git a/dev-texlive/texlive-documentation-german/ChangeLog b/dev-texlive/texlive-documentation-german/ChangeLog
index 1dc0d4ccceaf..1281366809e7 100644
--- a/dev-texlive/texlive-documentation-german/ChangeLog
+++ b/dev-texlive/texlive-documentation-german/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-texlive/texlive-documentation-german
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-texlive/texlive-documentation-german/ChangeLog,v 1.50 2012/07/27 01:37:06 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-texlive/texlive-documentation-german/ChangeLog,v 1.51 2012/10/03 18:10:33 ulm Exp $
+
+  03 Oct 2012; Ulrich Müller <ulm@gentoo.org>
+  texlive-documentation-german-2011.ebuild,
+  texlive-documentation-german-2012.ebuild:
+  "as-is" license cleanup, bug 436698.
 
 *texlive-documentation-german-2012 (27 Jul 2012)
 
diff --git a/dev-texlive/texlive-documentation-german/texlive-documentation-german-2011.ebuild b/dev-texlive/texlive-documentation-german/texlive-documentation-german-2011.ebuild
index 1c079d5fdd4c..ada43f6d2ced 100644
--- a/dev-texlive/texlive-documentation-german/texlive-documentation-german-2011.ebuild
+++ b/dev-texlive/texlive-documentation-german/texlive-documentation-german-2011.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-texlive/texlive-documentation-german/texlive-documentation-german-2011.ebuild,v 1.10 2012/05/09 17:06:26 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-texlive/texlive-documentation-german/texlive-documentation-german-2011.ebuild,v 1.11 2012/10/03 18:10:33 ulm Exp $
 
 EAPI="3"
 
@@ -11,7 +11,7 @@ TEXLIVE_MODULE_SRC_CONTENTS=""
 inherit  texlive-module
 DESCRIPTION="TeXLive German documentation"
 
-LICENSE="GPL-2 as-is FDL-1.1 GPL-1 LPPL-1.3 "
+LICENSE="GPL-2 FDL-1.1 GPL-1 LPPL-1.3 TeX-other-free"
 SLOT="0"
 KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
diff --git a/dev-texlive/texlive-documentation-german/texlive-documentation-german-2012.ebuild b/dev-texlive/texlive-documentation-german/texlive-documentation-german-2012.ebuild
index 797042386333..625853417636 100644
--- a/dev-texlive/texlive-documentation-german/texlive-documentation-german-2012.ebuild
+++ b/dev-texlive/texlive-documentation-german/texlive-documentation-german-2012.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-texlive/texlive-documentation-german/texlive-documentation-german-2012.ebuild,v 1.1 2012/07/27 01:37:06 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-texlive/texlive-documentation-german/texlive-documentation-german-2012.ebuild,v 1.2 2012/10/03 18:10:33 ulm Exp $
 
 EAPI="4"
 
@@ -11,7 +11,7 @@ TEXLIVE_MODULE_SRC_CONTENTS="fifinddo-info.source "
 inherit  texlive-module
 DESCRIPTION="TeXLive German documentation"
 
-LICENSE="GPL-2 as-is FDL-1.1 GPL-1 LPPL-1.3 "
+LICENSE="GPL-2 FDL-1.1 GPL-1 LPPL-1.3 TeX-other-free"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE=""