Fix license from GPL-2 to GPL-3 wrt #308829 by Thomas Kahle.

Package-Manager: portage-2.2_rc67/cvs/Linux x86_64

4 files changed, 12 insertions, 18 deletions

diff --git a/sys-libs/readline/ChangeLog b/sys-libs/readline/ChangeLog
index fd25efb8a1cf..a6dbd4729ecc 100644
--- a/sys-libs/readline/ChangeLog
+++ b/sys-libs/readline/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sys-libs/readline
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/readline/ChangeLog,v 1.149 2010/01/24 16:47:12 klausman Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/readline/ChangeLog,v 1.150 2010/03/12 18:14:16 ssuominen Exp $
+
+  12 Mar 2010; Samuli Suominen <ssuominen@gentoo.org>
+  readline-6.0_p4.ebuild, readline-6.1.ebuild:
+  Fix license from GPL-2 to GPL-3 wrt #308829 by Thomas Kahle.
 
   24 Jan 2010; Tobias Klausmann <klausman@gentoo.org>
   readline-6.0_p4.ebuild:
diff --git a/sys-libs/readline/Manifest b/sys-libs/readline/Manifest
index cda6de96c5bd..53a235d3285b 100644
--- a/sys-libs/readline/Manifest
+++ b/sys-libs/readline/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
-
 AUX readline-5.0-no_rpath.patch 363 RMD160 6a4ea25da4f683a77892a24f904de873579270fd SHA1 6e5e24e7965cd71abc8b09897de74b766a85461e SHA256 59df6107772d1a93550bacc267a2c00f9dfd6d5380b8497d8fd756a7191b9e4b
 AUX readline-5.2-no-ignore-shlib-errors.patch 688 RMD160 ffb4bddfe278dd4f3c56c2bfe1f62daedbe4dc59 SHA1 e899ea5a3270b9c64aebc91fe49d45b053107a2b SHA256 2c585c4e2d69d6b91157f378a3dd11cb49beefab808eef3350cf1b8357b2efc6
 AUX readline-6.0-rlfe-build.patch 743 RMD160 49ddd8e98588ea3efbd2c8fd613e27fa52d70b95 SHA1 29e6ca942db168919973d79a0f11e0c9b88268ac SHA256 3a084fe0c976355031b2b7a467b60489e4d26d5d4c443b69f102e55fa8ca4f2b
@@ -33,14 +30,7 @@ DIST readline60-003 1970 RMD160 9c6276146a6358d87bdf86ce0d1b9eb8e3a4a2e6 SHA1 f1
 DIST readline60-004 1840 RMD160 b03c01243ea3653cd5b7307c2546aae110603b60 SHA1 4fb45252521e063776bef3aecd874a524fc9c4f8 SHA256 f5cbb02ad37e682f0876d454a07bc2b4ad433a4b0f9f096893454bec1af3eafb
 EBUILD readline-4.3_p5.ebuild 1591 RMD160 d689f7d568d7e3b1115fbf89daf7c8840d801fa1 SHA1 6277a967c3304b2bbc54d2dac5b98d03cb539a68 SHA256 a0f153f8c647359666a214d47647514853a17c2dde8a5a52e0ff934cebb55b4a
 EBUILD readline-5.2_p14.ebuild 1905 RMD160 292c4388861f43c7cbbb7f5eda9bb3afc5ef90e1 SHA1 c5ceb9f28c7f9a480881275919200671d4233ab5 SHA256 170279df1909b218b3c9ff6b9cc3e315b1a72b8f1a6b5615010e903d67c65259
-EBUILD readline-6.0_p4.ebuild 2930 RMD160 13341b7a622100586d6125be11aa8d1411ed417d SHA1 75e195874ba9d2cc8d767a68a75fa8cbe9695a71 SHA256 ae92c8cd31f288e794ee0f7dd8684399e1dad06eadc9e047dc59e7d6cc742bcd
-EBUILD readline-6.1.ebuild 2763 RMD160 9eaa13d329dad4e02dda98bd14901fa9d1235d50 SHA1 e36a9684ed99554e6a8af3157014a82a390e34e6 SHA256 319296e7a776dc64ade0cfd51626be53064a746384385cf8cd256450d4f88b76
-MISC ChangeLog 18971 RMD160 16f5617b25758239852d89dfebbc8323a42fdd39 SHA1 699f66dfc9eabe40772aff47b1d2eb3f339f72ea SHA256 c40a4726c14def8e2369f64510363694401271ddeb33181ed6a2ce312c6b2662
+EBUILD readline-6.0_p4.ebuild 2931 RMD160 c893cb5a03b9073002868967a3e4a8884f2f0865 SHA1 3e9b72d63131c8faec2c360b4408cc13692d4b08 SHA256 76f31753e9c5dc2892600982a98dd2757a9aae725cf306d926051a7f68d096e9
+EBUILD readline-6.1.ebuild 2766 RMD160 c1c2658faed9795d3273ef9f129b30453a537e21 SHA1 aa458bb786517eae4f011585ba5ecee4fda56c77 SHA256 da324ab29d702db0314262be2daf20e40017904a2f3d08ff9786097e1cceda29
+MISC ChangeLog 19137 RMD160 c80d9722b19b3991221afc5ec2f9590734fa6d2e SHA1 f53083adf4468eae931a1d3c6e183433383173a7 SHA256 ac4432d4e2d94431b86481c9fbd89a5ca4f56a8ae2c65bb86ef392ba91befb53
 MISC metadata.xml 164 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 SHA1 9c213f5803676c56439df3716be07d6692588856 SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.14 (GNU/Linux)
-
-iF4EAREIAAYFAktqGlkACgkQTwhj9JtAlp6NrgD+MPEsUwm7JuRyIy24/guJiIFX
-uarKv07nXBcisee5/KwA/jTnKwFMwHZVXFjnaJK8Olpw8tgevqzXvL5DK9SZYB0j
-=PGdX
------END PGP SIGNATURE-----
diff --git a/sys-libs/readline/readline-6.0_p4.ebuild b/sys-libs/readline/readline-6.0_p4.ebuild
index e5a5f52ef465..c32b811230a3 100644
--- a/sys-libs/readline/readline-6.0_p4.ebuild
+++ b/sys-libs/readline/readline-6.0_p4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/readline/readline-6.0_p4.ebuild,v 1.11 2010/01/24 16:47:12 klausman Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/readline/readline-6.0_p4.ebuild,v 1.12 2010/03/12 18:14:16 ssuominen Exp $
 
 inherit autotools eutils multilib toolchain-funcs flag-o-matic
 
@@ -29,7 +29,7 @@ DESCRIPTION="Another cute console display library"
 HOMEPAGE="http://cnswww.cns.cwru.edu/php/chet/readline/rltop.html"
 SRC_URI="mirror://gnu/${PN}/${MY_P}.tar.gz $(patches)"
 
-LICENSE="GPL-2"
+LICENSE="GPL-3"
 SLOT="0"
 KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~sparc-fbsd ~x86-fbsd"
 IUSE=""
diff --git a/sys-libs/readline/readline-6.1.ebuild b/sys-libs/readline/readline-6.1.ebuild
index e1c4dd30f532..ddd19a9a8413 100644
--- a/sys-libs/readline/readline-6.1.ebuild
+++ b/sys-libs/readline/readline-6.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/readline/readline-6.1.ebuild,v 1.1 2010/01/05 00:54:55 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/readline/readline-6.1.ebuild,v 1.2 2010/03/12 18:14:16 ssuominen Exp $
 
 inherit autotools eutils multilib toolchain-funcs flag-o-matic
 
@@ -30,7 +30,7 @@ DESCRIPTION="Another cute console display library"
 HOMEPAGE="http://cnswww.cns.cwru.edu/php/chet/readline/rltop.html"
 SRC_URI="mirror://gnu/${PN}/${MY_P}.tar.gz $(patches)"
 
-LICENSE="GPL-2"
+LICENSE="GPL-3"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd"
 IUSE=""