correct libperl license

Package-Manager: portage-2.1.7.17/cvs/Linux x86_64

4 files changed, 26 insertions, 11 deletions

diff --git a/sys-devel/libperl/ChangeLog b/sys-devel/libperl/ChangeLog
index 6be3d9823eb9..e43e55733592 100644
--- a/sys-devel/libperl/ChangeLog
+++ b/sys-devel/libperl/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sys-devel/libperl
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/libperl/ChangeLog,v 1.150 2009/12/11 14:25:22 ranger Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/libperl/ChangeLog,v 1.151 2010/02/03 00:15:25 hanno Exp $
+
+  03 Feb 2010; Hanno Boeck <hanno@gentoo.org> libperl-5.8.8-r2.ebuild,
+  libperl-5.10.1.ebuild:
+  Change license, Perl is Artistic or GPL-1 or later. We can't express or
+  later for now, so adding all GPL-1/2/3.
 
   11 Dec 2009; Brent Baude <ranger@gentoo.org> libperl-5.10.1.ebuild:
   Marking libperl-5.10.1 ~ppc64 for bug 288028
diff --git a/sys-devel/libperl/Manifest b/sys-devel/libperl/Manifest
index e1c4f9f2b960..fa507212ab2e 100644
--- a/sys-devel/libperl/Manifest
+++ b/sys-devel/libperl/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX libperl-5.8.8-CVE-2008-1927.patch 8129 RMD160 523467accd75f42ea254b1aed219efbfc2c32637 SHA1 0a36c92bb3c59064f3370376a76ef66c63fb1ba4 SHA256 614ebf7a0885fb5f7203627a3051f4df8fee2988d6bfec5a3d8fe70d97f9e45b
 AUX libperl-5.8.8-ccld-cflags.patch 334 RMD160 cedae5a13f77ca057e3a2b7719e3ffd16890f918 SHA1 ac40a4456fa9027febb423cf194b17eb2cca5eb6 SHA256 f2af08a63056970ff5183d27bf017d2f919482a4897512d096f4747b9951fff9
 AUX libperl-5.8.8-cplusplus.patch 854 RMD160 1fbfc7ec9940622beb644ce0fa98a6f52131c9db SHA1 e4718e0b1c869ec56d59466caed3fab555848085 SHA256 ea1368e609b0d992b6cd5f92c327768d8c61ca2096826f26af2576263efb8a89
@@ -12,7 +15,14 @@ AUX libperl-create-libperl-soname.patch 417 RMD160 ea221c4f1a284ad28b30e93542228
 AUX libperl-noksh.patch 611 RMD160 6ddb9e7140c60e05042c3c488c97399a86f965fc SHA1 61bf5bb0955bd04a758d1381fa4260ed9fdbb1d1 SHA256 0861f7f54c184e99a0ffeebeab9420d969d2002f921bc3fb14841a1e24be1f5e
 AUX perl-hppa-pa7200-configure.patch 446 RMD160 ab902e2b5cf7f96023e0e267f170401b036dd4f5 SHA1 fcb7e61cdf1ce1c9993f257507b3289ce45382d7 SHA256 4fe6a010dbdc39325f4003e7ccd02cb7996b4a99b64ab0fa8b12d6fe67f87a31
 DIST perl-5.8.8.tar.bz2 10123359 RMD160 e78f26d9b96e6db35f946ad4ff55e3a69385c71b SHA1 4aab490040727ca4419098720eca2ba4367df539 SHA256 818a140d9c04ea8dab3a05104b34ced7f7d9d0a91bfed91baf89a84d0dfb1bc9
-EBUILD libperl-5.10.1.ebuild 779 RMD160 9ffbf6cf359b045e4a963f5a9e7178520865f0c4 SHA1 f48702e09d88e7123ec0461c78f0eaa6e83a69db SHA256 2a90d4842a5b3a9ce0c6d7373874ebf647816fba82425d646185a07c18332a23
-EBUILD libperl-5.8.8-r2.ebuild 12574 RMD160 3910ccce1a2101f0d0910bae8e41bf0a2871e714 SHA1 5bdf8fbfbd444afb71c3c9ba1ead6bf44643939a SHA256 00bd579000619bf0cd742b253c547798c707f5c2340ab893f5b98b032ff3f13c
-MISC ChangeLog 21529 RMD160 38aa3ab4e567cdadac6b34916497e5428b3a3e5b SHA1 4408ab2b0f6040d66dd531a38dcbe56329281740 SHA256 0e4324c48446f85c6b9a4d184c240f477117bdc704a2df327366f8a12f08135e
+EBUILD libperl-5.10.1.ebuild 806 RMD160 e88ddb324e27f64bd24cc7fad2ec74dfd1ffaa33 SHA1 cfa494cf3ba003c33a833743cb83473f05e1d044 SHA256 b84b29bcfdce6b9d89b6e9059be054160a338729b60438f729181da0917020bd
+EBUILD libperl-5.8.8-r2.ebuild 12586 RMD160 4da464c86584909d00a903e1493d8ed883470528 SHA1 487d803ffb510caddea592f83d217f2cc4372213 SHA256 424266d6d2fc177e1a73428cf065f2e8d9dbbc09edefaaff3c14d5bff1c248be
+MISC ChangeLog 21741 RMD160 657d34a38efb481b63273ab00d7a99a841ef7988 SHA1 bb17a74262766721f95490445888c784fb9fe806 SHA256 69cdd19bbdd7cd4e279992df7f118888d8aad3fb1a2b29e5287c831328e5a5d3
 MISC metadata.xml 403 RMD160 1cda5ea2e30a403f93919ff6517319385ea1aa56 SHA1 f2f65146ecf4c7f65e707259286bea45418b65b1 SHA256 71229202663c60ee0e512c81936ceb8a9b70e95c211a4615a14592aa62ea823a
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.14 (GNU/Linux)
+
+iEYEARECAAYFAktowCMACgkQr2QksT29OyBo5QCffetpzNXT5g5ZmhWyeEZVGBJS
+P5UAn2SExrM+ToKuyGC/G7ncCOkr1nTo
+=Ml7z
+-----END PGP SIGNATURE-----
diff --git a/sys-devel/libperl/libperl-5.10.1.ebuild b/sys-devel/libperl/libperl-5.10.1.ebuild
index 80a6fd309e81..17a1d55bfcd5 100644
--- a/sys-devel/libperl/libperl-5.10.1.ebuild
+++ b/sys-devel/libperl/libperl-5.10.1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/libperl/libperl-5.10.1.ebuild,v 1.10 2009/12/11 14:25:22 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/libperl/libperl-5.10.1.ebuild,v 1.11 2010/02/03 00:15:25 hanno Exp $
 
 inherit multilib
 
@@ -8,7 +8,7 @@ DESCRIPTION="Larry Wall's Practical Extraction and Report Language"
 SRC_URI=""
 HOMEPAGE="http://www.gentoo.org/"
 
-LICENSE="GPL-2"
+LICENSE="|| ( Artistic GPL-1 GPL-2 GPL-3 )"
 SLOT="1"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
 IUSE=""
diff --git a/sys-devel/libperl/libperl-5.8.8-r2.ebuild b/sys-devel/libperl/libperl-5.8.8-r2.ebuild
index 638b34002674..1b63b094c81c 100644
--- a/sys-devel/libperl/libperl-5.8.8-r2.ebuild
+++ b/sys-devel/libperl/libperl-5.8.8-r2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/libperl/libperl-5.8.8-r2.ebuild,v 1.12 2009/11/04 12:37:54 haubi Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/libperl/libperl-5.8.8-r2.ebuild,v 1.13 2010/02/03 00:15:25 hanno Exp $
 
 # The basic theory based on comments from Daniel Robbins <drobbins@gentoo.org>.
 #
@@ -67,7 +67,7 @@ SRC_URI="mirror://cpan/src/${MY_P}.tar.bz2"
 HOMEPAGE="http://www.perl.org"
 SLOT="${PERLSLOT}"
 LIBPERL="libperl$(get_libname ${PERLSLOT}.${SHORT_PV})"
-LICENSE="|| ( Artistic GPL-2 )"
+LICENSE="|| ( Artistic GPL-1 GPL-2 GPL-3 )"
 KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc ~sparc-fbsd x86 ~x86-fbsd"
 
 # rac 2004.08.06