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-classpath-inetlib/ChangeLog b/dev-java/gnu-classpath-inetlib/ChangeLog
index ce2bce9e4c553517eb9f608be64e523e5241b7d0..ca88c2e15c0e0ef1bba14a394266cdcca3d7d384 100644 (file)
--- a/dev-java/gnu-classpath-inetlib/ChangeLog
+++ b/dev-java/gnu-classpath-inetlib/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-java/gnu-classpath-inetlib
-# Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/gnu-classpath-inetlib/ChangeLog,v 1.21 2006/11/28 03:54:25 nichoj Exp $
+# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/gnu-classpath-inetlib/ChangeLog,v 1.22 2007/03/28 18:14:46 betelgeuse Exp $
+
+  28 Mar 2007; Petteri Räty <betelgeuse@gentoo.org>
+  gnu-classpath-inetlib-1.0-r2.ebuild, gnu-classpath-inetlib-1.1-r2.ebuild:
+  Switch license to GPL-2-with-linking-exception as that is what the actual
+  *.java files indicate (bug #172161).
 
   28 Nov 2006; Joshua Nichols <nichoj@gentoo.org>
   gnu-classpath-inetlib-1.0-r2.ebuild:

diff --git a/dev-java/gnu-classpath-inetlib/Manifest b/dev-java/gnu-classpath-inetlib/Manifest
index cd2400718f0cfc7af2851743f77498aa20743b32..cdcb723ba6ee5493a06e0f3658c03f10a2d9f6f3 100644 (file)
--- a/dev-java/gnu-classpath-inetlib/Manifest
+++ b/dev-java/gnu-classpath-inetlib/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX gnu-classpath-inetlib-1.0-jdk15.patch 3035 RMD160 267b766def47190719942efcae991cfec107981e SHA1 a4bcdb580da639c05b7789ca9e835c0eb8728181 SHA256 c8cc12545a6ae37fc510b338dd8470ac1d704baf135b6c4dec51fb9a254cfd30
 MD5 a8b9ea912b3634be0f6bd77a120f999f files/gnu-classpath-inetlib-1.0-jdk15.patch 3035
 RMD160 267b766def47190719942efcae991cfec107981e files/gnu-classpath-inetlib-1.0-jdk15.patch 3035
@@ -8,18 +11,18 @@ RMD160 94738b692c0a9dfad3d38bf470c1429b88fd8df9 files/gnu-classpath-inetlib-1.1-
 SHA256 98cafdb45968673a3378b1c031f15be7519add216a5fd19d8ad672bc3c6b1129 files/gnu-classpath-inetlib-1.1-jdk15.patch 3932
 DIST inetlib-1.0.tar.gz 151002 RMD160 c3dc231e02268e1a6bbb4a17bc3409c23995ef8e SHA1 6f5e6ab6237024c12778f4eae4cef757a79a207a SHA256 f59a46051b01dd01f04d0cc677d95a6c02b3389787d59a63b0f74bef20f887f8
 DIST inetlib-1.1.tar.gz 177251 RMD160 0cc424a46105798ea71cb8793bc4ba60a16603b7 SHA1 125e5529746f1c15bdeb42c909d8e5bc57f9533b SHA256 2b30cad60f3136b04f9ae4a906da8ac964654dacd3281097ec3558e67c9a51a0
-EBUILD gnu-classpath-inetlib-1.0-r2.ebuild 1720 RMD160 ac6d951409a0b94cba2516fb17fe3232242d1965 SHA1 5c8c7a20b079d2220034523309f6f359d18941b0 SHA256 6eb03c50811188a7e9dc642ab3c062cfa2cfbef70901d72da275c450f1be7669
-MD5 83a2c749342ab9fe83d8e47933018b9d gnu-classpath-inetlib-1.0-r2.ebuild 1720
-RMD160 ac6d951409a0b94cba2516fb17fe3232242d1965 gnu-classpath-inetlib-1.0-r2.ebuild 1720
-SHA256 6eb03c50811188a7e9dc642ab3c062cfa2cfbef70901d72da275c450f1be7669 gnu-classpath-inetlib-1.0-r2.ebuild 1720
-EBUILD gnu-classpath-inetlib-1.1-r2.ebuild 1321 RMD160 d99992c0b07bcc1b4edbe99cac72df9d43662300 SHA1 0ef0a87240b3d80ebdc9ecc0730d5c7b708ef369 SHA256 fe99361ed4c98927fe73063741f50f9d80c5fa90f6ac5b403bf33312868a2c8e
-MD5 cf83ec645b85b4c518748bfea7d7c289 gnu-classpath-inetlib-1.1-r2.ebuild 1321
-RMD160 d99992c0b07bcc1b4edbe99cac72df9d43662300 gnu-classpath-inetlib-1.1-r2.ebuild 1321
-SHA256 fe99361ed4c98927fe73063741f50f9d80c5fa90f6ac5b403bf33312868a2c8e gnu-classpath-inetlib-1.1-r2.ebuild 1321
-MISC ChangeLog 1613 RMD160 9896f6d6d14e01f588c58d132493c3548934c3e3 SHA1 a4aef3535293f9089a6e2cccd5d96cb107431589 SHA256 fee73a2950eafba6f624045fe4d9f68de4f49acd7573363021c93547b7a3e687
-MD5 78e590a26482526c927ed34e98be189e ChangeLog 1613
-RMD160 9896f6d6d14e01f588c58d132493c3548934c3e3 ChangeLog 1613
-SHA256 fee73a2950eafba6f624045fe4d9f68de4f49acd7573363021c93547b7a3e687 ChangeLog 1613
+EBUILD gnu-classpath-inetlib-1.0-r2.ebuild 1747 RMD160 e1529c6774a1ca5a5967ea54b5e71fef59751fcb SHA1 6f9911f955e421c504bcbacac129a128643e4a87 SHA256 3213a7140fd7a4f876bade7513c0419db1d3440d293d554c81e77a12638d2c46
+MD5 8ce5ab8393192c557df9f93331895168 gnu-classpath-inetlib-1.0-r2.ebuild 1747
+RMD160 e1529c6774a1ca5a5967ea54b5e71fef59751fcb gnu-classpath-inetlib-1.0-r2.ebuild 1747
+SHA256 3213a7140fd7a4f876bade7513c0419db1d3440d293d554c81e77a12638d2c46 gnu-classpath-inetlib-1.0-r2.ebuild 1747
+EBUILD gnu-classpath-inetlib-1.1-r2.ebuild 1348 RMD160 810ef191fac3468eb187baaa9a01b3a7876f5a8c SHA1 f5989882a554a04f18cb19a5d217119823b5e546 SHA256 79585779470ce22a47b341ffc565bbcd5cff6921e298b94b221dea8792eba39d
+MD5 f747d3c3f8958b3da761ac85bde907ca gnu-classpath-inetlib-1.1-r2.ebuild 1348
+RMD160 810ef191fac3468eb187baaa9a01b3a7876f5a8c gnu-classpath-inetlib-1.1-r2.ebuild 1348
+SHA256 79585779470ce22a47b341ffc565bbcd5cff6921e298b94b221dea8792eba39d gnu-classpath-inetlib-1.1-r2.ebuild 1348
+MISC ChangeLog 1862 RMD160 fe3d739b88243ba701a6c18a43e3dd406845c96f SHA1 443f8cda5d1d2ae82a93a0e515018548f5f4bcfd SHA256 b99b92c84d0f6ef68de4443060c1e48bec4bcebf4eef0f362be522863f949200
+MD5 e56c10ffc0c13a3729260d018b6d958d ChangeLog 1862
+RMD160 fe3d739b88243ba701a6c18a43e3dd406845c96f ChangeLog 1862
+SHA256 b99b92c84d0f6ef68de4443060c1e48bec4bcebf4eef0f362be522863f949200 ChangeLog 1862
 MISC metadata.xml 430 RMD160 d3f7cd9542b083b9cacda3e678a8faf76a85b9a5 SHA1 40dc1cf7659e11765df7cfb0ced41eec6f3bf537 SHA256 bef2fad85b9f4da5e38421c1bfd3a81a6c5a3a12a5077eefae398c0dfe5b718b
 MD5 cae9047aa616f454f13653091a077f60 metadata.xml 430
 RMD160 d3f7cd9542b083b9cacda3e678a8faf76a85b9a5 metadata.xml 430
@@ -30,3 +33,10 @@ SHA256 2d27b7721d3743b0ca34f8a5d0d6a6352fce0113579653e73499138b533cafef files/di
 MD5 eb2b08694c0bdeed41c430ff8d8e792c files/digest-gnu-classpath-inetlib-1.1-r2 235
 RMD160 c925240dbf9a51c3d4d0dc9b14569d1ae1933a4c files/digest-gnu-classpath-inetlib-1.1-r2 235
 SHA256 dc83250a1ebec0229a1504a07fc3536d4759801d9d95e81a261f2697e6ec9d5e files/digest-gnu-classpath-inetlib-1.1-r2 235
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.3 (GNU/Linux)
+
+iD8DBQFGCrCbcxLzpIGCsLQRAntrAJ9nMg/uOJiBNGMYy6TkB4a8rnivywCeONI8
+WjwMImUUY+B6WBzBZwP5XpI=
+=xt8J
+-----END PGP SIGNATURE-----

diff --git a/dev-java/gnu-classpath-inetlib/gnu-classpath-inetlib-1.0-r2.ebuild b/dev-java/gnu-classpath-inetlib/gnu-classpath-inetlib-1.0-r2.ebuild
index 702beea6bf7974288fc558a379abaccb2ec74c4f..435904c2beb975df31e6bade05998544db743ec1 100644 (file)
--- a/dev-java/gnu-classpath-inetlib/gnu-classpath-inetlib-1.0-r2.ebuild
+++ b/dev-java/gnu-classpath-inetlib/gnu-classpath-inetlib-1.0-r2.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-classpath-inetlib/gnu-classpath-inetlib-1.0-r2.ebuild,v 1.6 2006/11/28 03:54:25 nichoj Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/gnu-classpath-inetlib/gnu-classpath-inetlib-1.0-r2.ebuild,v 1.7 2007/03/28 18:14:46 betelgeuse Exp $
 
 inherit java-pkg-2
 
@@ -9,7 +9,7 @@ MY_P="${MY_PN}-${PV}"
 DESCRIPTION="Network extensions library for GNU classpath and classpathx"
 HOMEPAGE="http://www.gnu.org/software/classpath/"
 SRC_URI="mirror://gnu/classpath/${MY_P}.tar.gz"
-LICENSE="GPL-2"
+LICENSE="GPL-2-with-linking-exception"
 SLOT="1.0"
 KEYWORDS="amd64 ~ppc x86"
 IUSE="doc"

diff --git a/dev-java/gnu-classpath-inetlib/gnu-classpath-inetlib-1.1-r2.ebuild b/dev-java/gnu-classpath-inetlib/gnu-classpath-inetlib-1.1-r2.ebuild
index 011b4d243e4ba3f09fc0f08febfebcaebc29a1bd..a1018719bd1a209ceb31974a32766ecade00304a 100644 (file)
--- a/dev-java/gnu-classpath-inetlib/gnu-classpath-inetlib-1.1-r2.ebuild
+++ b/dev-java/gnu-classpath-inetlib/gnu-classpath-inetlib-1.1-r2.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-classpath-inetlib/gnu-classpath-inetlib-1.1-r2.ebuild,v 1.3 2006/09/29 21:45:25 caster Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/gnu-classpath-inetlib/gnu-classpath-inetlib-1.1-r2.ebuild,v 1.4 2007/03/28 18:14:46 betelgeuse Exp $
 
 inherit java-pkg-2 java-ant-2
 
@@ -9,7 +9,7 @@ MY_P="${MY_PN}-${PV}"
 DESCRIPTION="Network extensions library for GNU classpath and classpathx"
 HOMEPAGE="http://www.gnu.org/software/classpath/"
 SRC_URI="mirror://gnu/classpath/${MY_P}.tar.gz"
-LICENSE="GPL-2"
+LICENSE="GPL-2-with-linking-exception"
 SLOT="1.1"
 KEYWORDS="~amd64 ~ppc ~x86"
 IUSE="doc"