Switch license to GPL-2-with-linking-exception as that is what the actual *.java...

Package-Manager: portage-2.1.2.2

diff --git a/dev-java/gnu-jaf/ChangeLog b/dev-java/gnu-jaf/ChangeLog
index 272de0bf3153c5f68eeff95b9b41a918cbbc9372..73614051498241feeca0b19d36903b6b70953fbe 100644 (file)
--- a/dev-java/gnu-jaf/ChangeLog
+++ b/dev-java/gnu-jaf/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-java/gnu-jaf
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/gnu-jaf/ChangeLog,v 1.14 2007/03/27 06:14:06 opfer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/gnu-jaf/ChangeLog,v 1.15 2007/03/28 18:11:43 betelgeuse Exp $
+
+  28 Mar 2007; Petteri Räty <betelgeuse@gentoo.org> gnu-jaf-1.0-r1.ebuild,
+  gnu-jaf-1.0-r2.ebuild:
+  Switch license to GPL-2-with-linking-exception as that is what the actual
+  *.java files indicate.
 
   27 Mar 2007; Christian Faulhammer <opfer@gentoo.org>
   gnu-jaf-1.0-r2.ebuild:

diff --git a/dev-java/gnu-jaf/gnu-jaf-1.0-r1.ebuild b/dev-java/gnu-jaf/gnu-jaf-1.0-r1.ebuild
index 51dbb8d26e118d45e0ce5061ad36913bd2efb6ba..befaba95bf4577515867360187c81a7faf4d07fd 100644 (file)
--- a/dev-java/gnu-jaf/gnu-jaf-1.0-r1.ebuild
+++ b/dev-java/gnu-jaf/gnu-jaf-1.0-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/gnu-jaf/gnu-jaf-1.0-r1.ebuild,v 1.6 2007/03/26 15:20:48 betelgeuse Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/gnu-jaf/gnu-jaf-1.0-r1.ebuild,v 1.7 2007/03/28 18:11:43 betelgeuse Exp $
 
 inherit java-pkg
 
@@ -8,7 +8,7 @@ DESCRIPTION="GNU JAF: JavaBeans Activation Framework"
 HOMEPAGE="http://www.gnu.org/software/classpathx/jaf/jaf.html"
 SRC_URI="mirror://gnu/classpathx/activation-${PV}.tar.gz"
 
-LICENSE="LGPL-2.1"
+LICENSE="GPL-2-with-linking-exception"
 SLOT="1"
 KEYWORDS="amd64 ppc ppc64 x86"
 IUSE="doc source"

diff --git a/dev-java/gnu-jaf/gnu-jaf-1.0-r2.ebuild b/dev-java/gnu-jaf/gnu-jaf-1.0-r2.ebuild
index 3d4e64fac4c12aef766daae72fbdb1a126fc2943..56963e75f93f48a9a2bdfbcb68c52f2a6d349e32 100644 (file)
--- a/dev-java/gnu-jaf/gnu-jaf-1.0-r2.ebuild
+++ b/dev-java/gnu-jaf/gnu-jaf-1.0-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/gnu-jaf/gnu-jaf-1.0-r2.ebuild,v 1.6 2007/03/27 06:14:06 opfer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/gnu-jaf/gnu-jaf-1.0-r2.ebuild,v 1.7 2007/03/28 18:11:43 betelgeuse Exp $
 
 inherit java-pkg-2
 
@@ -8,7 +8,7 @@ DESCRIPTION="GNU implementation of the JavaBeans Activation Framework"
 HOMEPAGE="http://www.gnu.org/software/classpathx/jaf/jaf.html"
 SRC_URI="mirror://gnu/classpathx/activation-${PV}.tar.gz"
 
-LICENSE="LGPL-2.1"
+LICENSE="GPL-2-with-linking-exception"
 SLOT="1"
 KEYWORDS="~amd64 ~ppc ~ppc64 x86 ~x86-fbsd"
 IUSE="doc source"

diff --git a/dev-java/gnu-javamail/ChangeLog b/dev-java/gnu-javamail/ChangeLog
index 2679407e3a5ab3d892fbc2b52995da0e36a22a27..2e8f1b775ec2949b2fcc6265c1fbd9efca0b53d4 100644 (file)
--- a/dev-java/gnu-javamail/ChangeLog
+++ b/dev-java/gnu-javamail/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-java/gnu-javamail
-# Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/gnu-javamail/ChangeLog,v 1.20 2006/11/28 03:59:13 nichoj Exp $
+# Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/gnu-javamail/ChangeLog,v 1.21 2007/03/28 18:15:23 betelgeuse Exp $
+
+  28 Mar 2007; Petteri Räty <betelgeuse@gentoo.org>
+  gnu-javamail-1.0-r1.ebuild:
+  Switch license to GPL-2-with-linking-exception as that is what the actual
+  *.java files indicate.
 
   28 Nov 2006; Joshua Nichols <nichoj@gentoo.org> -gnu-javamail-1.0.ebuild:
   Dropped earlier revision with equivalent keywords.

diff --git a/dev-java/gnu-javamail/gnu-javamail-1.0-r1.ebuild b/dev-java/gnu-javamail/gnu-javamail-1.0-r1.ebuild
index afbb76368fea85f3fdc3d3eb53d7f1a061a75204..588956b8d7150a74fe4ee8d7a89602b59ce6fda6 100644 (file)
--- a/dev-java/gnu-javamail/gnu-javamail-1.0-r1.ebuild
+++ b/dev-java/gnu-javamail/gnu-javamail-1.0-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2006 Gentoo Foundation
+# Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/gnu-javamail/gnu-javamail-1.0-r1.ebuild,v 1.4 2006/11/28 03:55:31 nichoj Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/gnu-javamail/gnu-javamail-1.0-r1.ebuild,v 1.5 2007/03/28 18:15:23 betelgeuse Exp $
 
 inherit java-pkg-2
 
@@ -9,7 +9,7 @@ MY_P="${MY_PN}-${PV}"
 DESCRIPTION="GNU implementation of the Javamail API"
 HOMEPAGE="http://www.gnu.org/software/classpathx/javamail/"
 SRC_URI="mirror://gnu/classpathx/${MY_P}.tar.gz"
-LICENSE="GPL-2"
+LICENSE="GPL-2-with-linking-exception"
 SLOT="1"
 KEYWORDS="amd64 x86"
 IUSE="doc"