Fixes #69732.

diff --git a/dev-java/gnu-classpath/ChangeLog b/dev-java/gnu-classpath/ChangeLog
index 1aca23de9cc62d30a294db7698dbf03b9628baef..372be9c24cffd663f83d94c8d61021bb9c7fd960 100644 (file)
--- a/dev-java/gnu-classpath/ChangeLog
+++ b/dev-java/gnu-classpath/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-java/gnu-classpath
 # Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/gnu-classpath/ChangeLog,v 1.19 2004/10/29 12:55:10 axxo Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/gnu-classpath/ChangeLog,v 1.20 2004/12/18 21:46:20 karltk Exp $
+
+  18 Dec 2004; <karltk@gentoo.org> gnu-classpath-0.10-r1.ebuild,
+  gnu-classpath-0.11.ebuild:
+  Changed license to GPL 2 with linking exception. Fixes #69732.
 
   29 Oct 2004; Thomas Matthijs <axxo@gentoo.org>
   gnu-classpath-0.10-r1.ebuild, gnu-classpath-0.11.ebuild:

diff --git a/dev-java/gnu-classpath/Manifest b/dev-java/gnu-classpath/Manifest
index b4d40daafa91173c54c370dedba1006fbed1ef5f..99535ea81746732d32af4273d50f0a49c2507ef2 100644 (file)
--- a/dev-java/gnu-classpath/Manifest
+++ b/dev-java/gnu-classpath/Manifest
@@ -1,16 +1,6 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 30220119230449a850dbf4d240f5d9bb gnu-classpath-0.10-r1.ebuild 1078
-MD5 8df97d5816e51b31abae8e615318269f ChangeLog 2465
+MD5 2e254dc79cc850fc4b37dd51e28f14f9 gnu-classpath-0.10-r1.ebuild 1103
+MD5 cced269f614ff89cb1889763e2d53d6d ChangeLog 2627
 MD5 a6ec7d7724fbd068ffb39b5be56134ed metadata.xml 157
-MD5 b66b0cf285145d50f5eaa2c945541679 gnu-classpath-0.11.ebuild 1076
+MD5 ed6e1c0e1c45002bb2578d625464c45c gnu-classpath-0.11.ebuild 1101
 MD5 6bcac2500b924707633a717d9bf03def files/digest-gnu-classpath-0.10-r1 67
 MD5 0965aebb02562b86de80b9aea8d8ac59 files/digest-gnu-classpath-0.11 67
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.2.6 (GNU/Linux)
-
-iD8DBQFBgj3h/rLF9B432nYRAr0/AKCGKudtgMPyUIbUsUiOqs8Z6hi03wCgnQ6p
-3LVAuP0c5qz+UaDuRsfw5Y0=
-=amd8
------END PGP SIGNATURE-----

diff --git a/dev-java/gnu-classpath/gnu-classpath-0.10-r1.ebuild b/dev-java/gnu-classpath/gnu-classpath-0.10-r1.ebuild
index 3af89e3a3ce59ad556cc0ef5beda0009c9e94249..a277d532d2120feb3cd0ff1871e7f792dcb09c74 100644 (file)
--- a/dev-java/gnu-classpath/gnu-classpath-0.10-r1.ebuild
+++ b/dev-java/gnu-classpath/gnu-classpath-0.10-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/gnu-classpath/gnu-classpath-0.10-r1.ebuild,v 1.4 2004/10/29 12:55:10 axxo Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/gnu-classpath/gnu-classpath-0.10-r1.ebuild,v 1.5 2004/12/18 21:46:20 karltk Exp $
 
 DESCRIPTION="Free core class libraries for use with virtual machines and compilers for the java programming language"
 SRC_URI="ftp://ftp.gnu.org/gnu/classpath/classpath-${PV}.tar.gz"
@@ -10,7 +10,7 @@ RDEPEND=">=virtual/jre-1.4
        gtk? ( media-libs/gdk-pixbuf >=x11-libs/gtk+-2 >=media-libs/libart_lgpl-2.1 )"
 DEPEND=">=virtual/jdk-1.4
        jikes? ( dev-java/jikes )"
-LICENSE="GPL-2"
+LICENSE="GPL-2-with-linking-exception"
 SLOT="0"
 KEYWORDS="x86 ~sparc ~ppc ~amd64"
 S=${WORKDIR}/classpath-${PV}

diff --git a/dev-java/gnu-classpath/gnu-classpath-0.11.ebuild b/dev-java/gnu-classpath/gnu-classpath-0.11.ebuild
index 08799f06ab6eecfd6141abecb94fe63d7e48f1e0..5d15d3e18fd93ad99c63742fcd60f9e27affd74d 100644 (file)
--- a/dev-java/gnu-classpath/gnu-classpath-0.11.ebuild
+++ b/dev-java/gnu-classpath/gnu-classpath-0.11.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/gnu-classpath/gnu-classpath-0.11.ebuild,v 1.3 2004/10/29 12:55:10 axxo Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/gnu-classpath/gnu-classpath-0.11.ebuild,v 1.4 2004/12/18 21:46:20 karltk Exp $
 
 DESCRIPTION="Free core class libraries for use with virtual machines and compilers for the java programming language"
 SRC_URI="ftp://ftp.gnu.org/gnu/classpath/classpath-${PV}.tar.gz"
@@ -10,7 +10,7 @@ RDEPEND=">=virtual/jre-1.4
        gtk? ( media-libs/gdk-pixbuf >=x11-libs/gtk+-2 >=media-libs/libart_lgpl-2.1 )"
 DEPEND=">=virtual/jdk-1.4
        jikes? ( dev-java/jikes )"
-LICENSE="GPL-2"
+LICENSE="GPL-2-with-linking-exception"
 SLOT="0"
 KEYWORDS="~x86 ~sparc ~ppc ~amd64"
 S=${WORKDIR}/classpath-${PV}