Fix LICENSE, bug 444492.

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

5 files changed, 16 insertions, 12 deletions

diff --git a/app-i18n/nkf/ChangeLog b/app-i18n/nkf/ChangeLog
index 76ed1e4cf9fe..63a27d698f2b 100644
--- a/app-i18n/nkf/ChangeLog
+++ b/app-i18n/nkf/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-i18n/nkf
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/nkf/ChangeLog,v 1.52 2012/03/15 01:47:50 naota Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/nkf/ChangeLog,v 1.53 2012/12/07 19:18:19 ulm Exp $
+
+  07 Dec 2012; Ulrich Müller <ulm@gentoo.org> nkf-2.0.7.ebuild,
+  nkf-2.1.0-r1.ebuild, nkf-2.1.2.ebuild, nkf-2.1.2-r1.ebuild:
+  Fix LICENSE, bug 444492.
 
 *nkf-2.1.2-r1 (15 Mar 2012)
 
diff --git a/app-i18n/nkf/nkf-2.0.7.ebuild b/app-i18n/nkf/nkf-2.0.7.ebuild
index c185c4d0d73b..f62809fec6f7 100644
--- a/app-i18n/nkf/nkf-2.0.7.ebuild
+++ b/app-i18n/nkf/nkf-2.0.7.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/nkf/nkf-2.0.7.ebuild,v 1.9 2011/01/08 19:35:49 arfrever Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/nkf/nkf-2.0.7.ebuild,v 1.10 2012/12/07 19:18:19 ulm Exp $
 
 EAPI="3"
 
@@ -12,7 +12,7 @@ HOMEPAGE="http://sourceforge.jp/projects/nkf/"
 SRC_URI="mirror://sourceforge.jp/nkf/20770/${MY_P}.tar.gz
 	python? ( http://city.plala.jp/download/nkf/NKF_python.tgz )"
 
-LICENSE="as-is"
+LICENSE="ZLIB"
 SLOT="0"
 KEYWORDS="alpha amd64 hppa ia64 ppc ppc64 sh sparc x86"
 IUSE="perl python linguas_ja"
diff --git a/app-i18n/nkf/nkf-2.1.0-r1.ebuild b/app-i18n/nkf/nkf-2.1.0-r1.ebuild
index 8819ef59509c..7ff3ca6cc493 100644
--- a/app-i18n/nkf/nkf-2.1.0-r1.ebuild
+++ b/app-i18n/nkf/nkf-2.1.0-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/nkf/nkf-2.1.0-r1.ebuild,v 1.3 2011/10/11 11:02:19 naota Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/nkf/nkf-2.1.0-r1.ebuild,v 1.4 2012/12/07 19:18:19 ulm Exp $
 
 EAPI="3"
 PYTHON_DEPEND="python? 2"
@@ -11,7 +11,7 @@ HOMEPAGE="http://sourceforge.jp/projects/nkf/"
 SRC_URI="mirror://sourceforge.jp/nkf/44486/${P}.tar.gz
 	python? ( http://city.plala.jp/moin/NkfPython?action=AttachFile&do=get&target=NKF_python20090602.tgz -> NKF_python20090602.tgz )"
 
-LICENSE="as-is"
+LICENSE="ZLIB"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~x86-macos"
 IUSE="perl python linguas_ja"
diff --git a/app-i18n/nkf/nkf-2.1.2-r1.ebuild b/app-i18n/nkf/nkf-2.1.2-r1.ebuild
index 4fb40fa533cd..421fcd1c5950 100644
--- a/app-i18n/nkf/nkf-2.1.2-r1.ebuild
+++ b/app-i18n/nkf/nkf-2.1.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-i18n/nkf/nkf-2.1.2-r1.ebuild,v 1.1 2012/03/15 01:47:50 naota Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/nkf/nkf-2.1.2-r1.ebuild,v 1.2 2012/12/07 19:18:19 ulm Exp $
 
 EAPI="3"
 PYTHON_DEPEND="python? 2"
@@ -11,7 +11,7 @@ HOMEPAGE="http://sourceforge.jp/projects/nkf/"
 SRC_URI="mirror://sourceforge.jp/nkf/53171/${P}.tar.gz
 	python? ( http://dev.gentoo.org/~naota/files/NKF_python20090602.tgz )"
 
-LICENSE="MIT"
+LICENSE="ZLIB"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~x86-macos"
 IUSE="perl python linguas_ja"
diff --git a/app-i18n/nkf/nkf-2.1.2.ebuild b/app-i18n/nkf/nkf-2.1.2.ebuild
index f2cf3f9d2e92..38edb370ea56 100644
--- a/app-i18n/nkf/nkf-2.1.2.ebuild
+++ b/app-i18n/nkf/nkf-2.1.2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/nkf/nkf-2.1.2.ebuild,v 1.1 2011/11/20 15:15:35 naota Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/nkf/nkf-2.1.2.ebuild,v 1.2 2012/12/07 19:18:19 ulm Exp $
 
 EAPI="3"
 PYTHON_DEPEND="python? 2"
@@ -11,7 +11,7 @@ HOMEPAGE="http://sourceforge.jp/projects/nkf/"
 SRC_URI="mirror://sourceforge.jp/nkf/53171/${P}.tar.gz
 	python? ( http://city.plala.jp/moin/NkfPython?action=AttachFile&do=get&target=NKF_python20090602.tgz -> NKF_python20090602.tgz )"
 
-LICENSE="as-is"
+LICENSE="ZLIB"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~x86-macos"
 IUSE="perl python linguas_ja"