Correct the license for cpphs

Package-Manager: portage-2.1.1-r1

5 files changed, 32 insertions, 28 deletions

diff --git a/dev-haskell/cpphs/ChangeLog b/dev-haskell/cpphs/ChangeLog
index 6f3e279e9f69..46d7a475ee5e 100644
--- a/dev-haskell/cpphs/ChangeLog
+++ b/dev-haskell/cpphs/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-haskell/cpphs
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-haskell/cpphs/ChangeLog,v 1.15 2006/10/05 03:07:27 cparrott Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/cpphs/ChangeLog,v 1.16 2006/10/11 18:38:06 dcoutts Exp $
+
+  11 Oct 2006; Duncan Coutts <dcoutts@gentoo.org> cpphs-0.9.ebuild,
+  cpphs-1.1.ebuild, cpphs-1.2.ebuild:
+  Correct the license for cpphs
 
   05 Oct 2006; Chris Parrott <cparrott@gentoo.org> cpphs-1.2.ebuild:
   marked stable for amd64 (bug 144678)
diff --git a/dev-haskell/cpphs/Manifest b/dev-haskell/cpphs/Manifest
index 8664d465f1b9..9388f82b8f45 100644
--- a/dev-haskell/cpphs/Manifest
+++ b/dev-haskell/cpphs/Manifest
@@ -1,25 +1,25 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-DIST cpphs-0.9.tar.gz 40972 RMD160 7799c2031f80a10ab3edde80247db17df3f8f88a SHA256 94686afac6fc2f4729808af28be059880a9f76372ca2c772c24798ac14365364
-DIST cpphs-1.1.tar.gz 44099 RMD160 d1cc3484da2b6224623c7e5923702643cf904693 SHA256 468c47e1d08d1385ec58c0a34a6899a43df4197bd7014df543ae33d8c1798fea
+DIST cpphs-0.9.tar.gz 40972 RMD160 7799c2031f80a10ab3edde80247db17df3f8f88a SHA1 4922f70e5a21485ff2b801bf18f25582a4c82b3b SHA256 94686afac6fc2f4729808af28be059880a9f76372ca2c772c24798ac14365364
+DIST cpphs-1.1.tar.gz 44099 RMD160 d1cc3484da2b6224623c7e5923702643cf904693 SHA1 dbf2c8c5ce7facb82d47bb70a554b7b0915c731f SHA256 468c47e1d08d1385ec58c0a34a6899a43df4197bd7014df543ae33d8c1798fea
 DIST cpphs-1.2.tar.gz 89417 RMD160 18613eb0bafb580f4611a9deef14d66270ab2ff6 SHA1 b000ba9e54ec0d0a07785bee0a0d965a51a6c250 SHA256 6e2c407ca0a52cce9ee1e487381263627bcfa6f7373dc8162aafafc00b3cdb28
-EBUILD cpphs-0.9.ebuild 700 RMD160 6da5c1cbdf65a76a41068e0022257db7dda2a254 SHA1 b81b30f05cc50308d2b056e048872b655bc429c8 SHA256 8700e8fbfed760278e304d9089be31f931cde316fe648e91bf16c08f58b153ea
-MD5 d2cec27421f15d3a4c2345edb0a3f5d5 cpphs-0.9.ebuild 700
-RMD160 6da5c1cbdf65a76a41068e0022257db7dda2a254 cpphs-0.9.ebuild 700
-SHA256 8700e8fbfed760278e304d9089be31f931cde316fe648e91bf16c08f58b153ea cpphs-0.9.ebuild 700
-EBUILD cpphs-1.1.ebuild 618 RMD160 1291fd7ab88cdd80a2c64afc9351dd3da6c950a9 SHA1 5f7c901f442077d727c04847fbb89444b0aacf0e SHA256 c411631e6dae4e4742a68034e5d9a0e4070bffa7074563f2029d401439315819
-MD5 e6b47ad119a342edf15a1d3a0b3281bb cpphs-1.1.ebuild 618
-RMD160 1291fd7ab88cdd80a2c64afc9351dd3da6c950a9 cpphs-1.1.ebuild 618
-SHA256 c411631e6dae4e4742a68034e5d9a0e4070bffa7074563f2029d401439315819 cpphs-1.1.ebuild 618
-EBUILD cpphs-1.2.ebuild 621 RMD160 28d8572efd160c0e905b4ec5211ab23117dceddd SHA1 af74272bbee9b79cb721a0445daa802f814b5e57 SHA256 b018acabf08832bd5206038394dcf48b88cf7c9dedf686c07dc6522db025235c
-MD5 2aa9843ed9b1836a45c79297a5ed39ad cpphs-1.2.ebuild 621
-RMD160 28d8572efd160c0e905b4ec5211ab23117dceddd cpphs-1.2.ebuild 621
-SHA256 b018acabf08832bd5206038394dcf48b88cf7c9dedf686c07dc6522db025235c cpphs-1.2.ebuild 621
-MISC ChangeLog 1815 RMD160 271fdfa4056e49d25be61420414c0fa816cd8a3f SHA1 2fb93f7dd1bbec41a927badb3bc630e9fd544475 SHA256 47bed9de85ba270e7523d6cca87c6e2fd5f29b523cd2b2700862ca1bff7c4b47
-MD5 d2f8641444616f879c4f763504047646 ChangeLog 1815
-RMD160 271fdfa4056e49d25be61420414c0fa816cd8a3f ChangeLog 1815
-SHA256 47bed9de85ba270e7523d6cca87c6e2fd5f29b523cd2b2700862ca1bff7c4b47 ChangeLog 1815
+EBUILD cpphs-0.9.ebuild 711 RMD160 95e9b8e283e358f3001d507c8a39a7b93563bb27 SHA1 11665c9261a37bbdfb3094c52507371a628c8245 SHA256 37982c14e41cc6b2474503ad9f54782f43b6b5fb763baf558ee0ab88f4130c90
+MD5 244890aba58dd16c31bdfffbbf2e7649 cpphs-0.9.ebuild 711
+RMD160 95e9b8e283e358f3001d507c8a39a7b93563bb27 cpphs-0.9.ebuild 711
+SHA256 37982c14e41cc6b2474503ad9f54782f43b6b5fb763baf558ee0ab88f4130c90 cpphs-0.9.ebuild 711
+EBUILD cpphs-1.1.ebuild 627 RMD160 b2f8742df31ebd712a8a9bee37d24e7247d04bf7 SHA1 bc8d0b289a3e98640bec28e7ca077dfdeb225dfe SHA256 4967ceed24b62ba2e1ceeb25bc180015ddecfc2620b776bbcb5c356c6d354366
+MD5 02d3d23b0fabd885905150d92162a809 cpphs-1.1.ebuild 627
+RMD160 b2f8742df31ebd712a8a9bee37d24e7247d04bf7 cpphs-1.1.ebuild 627
+SHA256 4967ceed24b62ba2e1ceeb25bc180015ddecfc2620b776bbcb5c356c6d354366 cpphs-1.1.ebuild 627
+EBUILD cpphs-1.2.ebuild 629 RMD160 860ad2ee39c0a7000abd10e59ba886040af70a16 SHA1 032408a7da9e595ababd9ba51def7875d7ae2c36 SHA256 209f348ecc8d794ea4235fafef22180816197aeab9fc755d4a8bafa2bbeaf071
+MD5 2b15e117847f7f29bd4f2d3a85477700 cpphs-1.2.ebuild 629
+RMD160 860ad2ee39c0a7000abd10e59ba886040af70a16 cpphs-1.2.ebuild 629
+SHA256 209f348ecc8d794ea4235fafef22180816197aeab9fc755d4a8bafa2bbeaf071 cpphs-1.2.ebuild 629
+MISC ChangeLog 1953 RMD160 488c3affb7240dd81411c1fd9ad50583cedacb50 SHA1 4d8d94e06f2829da9882ea6680971abfccbb7e87 SHA256 e0ddc39448675a6f76bebfab2bc9ff946abfa83f79abcaedb632cac6f40d4f2a
+MD5 6f76ef9d9b8df17c15f5c4266196a6ca ChangeLog 1953
+RMD160 488c3affb7240dd81411c1fd9ad50583cedacb50 ChangeLog 1953
+SHA256 e0ddc39448675a6f76bebfab2bc9ff946abfa83f79abcaedb632cac6f40d4f2a ChangeLog 1953
 MISC metadata.xml 223 RMD160 7783e6057effb8b8f0b79cffe8b557b32c633839 SHA1 7b962c77f2e38479a9d1621ec8d307ca9f761753 SHA256 1d00c8be162a6cb87b3de440b3e63e10b39c12d56e8fbfe592e75aed872b2508
 MD5 c694674dcbef799cd4fdb6914683ebff metadata.xml 223
 RMD160 7783e6057effb8b8f0b79cffe8b557b32c633839 metadata.xml 223
@@ -36,7 +36,7 @@ SHA256 870fc6bb28f72d2f903e831e8825039a198e11bc38a5e0b191b07c501658cf1e files/di
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.5 (GNU/Linux)
 
-iD8DBQFFJHbVWAIrQc5r/yMRAqmoAKCtl22bzL7Q1zP96MSQODiyslOdrQCfXNVr
-GJzkz5RM1ie7Z2CbybuaYtQ=
-=L2at
+iD8DBQFFLTnCnUVyUObPUL4RApyvAJ9s95owQrf3acHmrS7AHSWPLG+D6wCgjuH5
+YEUDe1tEIaD6IrCGx0emugI=
+=1MTo
 -----END PGP SIGNATURE-----
diff --git a/dev-haskell/cpphs/cpphs-0.9.ebuild b/dev-haskell/cpphs/cpphs-0.9.ebuild
index 1078ebeb5ee1..4138ad6e5ad8 100644
--- a/dev-haskell/cpphs/cpphs-0.9.ebuild
+++ b/dev-haskell/cpphs/cpphs-0.9.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-haskell/cpphs/cpphs-0.9.ebuild,v 1.3 2006/08/27 21:30:12 wormo Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/cpphs/cpphs-0.9.ebuild,v 1.4 2006/10/11 18:38:06 dcoutts Exp $
 
 inherit eutils ghc-package
 
 DESCRIPTION="A liberalised cpp-a-like preprocessor for Haskell"
 HOMEPAGE="http://www.cs.york.ac.uk/fp/cpphs/"
 SRC_URI="http://www.cs.york.ac.uk/fp/cpphs/${P}.tar.gz"
-LICENSE="GPL-2"
+LICENSE="GPL-2 LGPL-2.1"
 
 SLOT="0"
 KEYWORDS="~x86 ~amd64 ~sparc"
diff --git a/dev-haskell/cpphs/cpphs-1.1.ebuild b/dev-haskell/cpphs/cpphs-1.1.ebuild
index d27f85e6b737..3fee6005397b 100644
--- a/dev-haskell/cpphs/cpphs-1.1.ebuild
+++ b/dev-haskell/cpphs/cpphs-1.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-haskell/cpphs/cpphs-1.1.ebuild,v 1.5 2006/03/28 01:44:45 dcoutts Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/cpphs/cpphs-1.1.ebuild,v 1.6 2006/10/11 18:38:06 dcoutts Exp $
 
 CABAL_FEATURES="bin"
 inherit eutils haskell-cabal
@@ -9,7 +9,7 @@ DESCRIPTION="A liberalised cpp-a-like preprocessor for Haskell"
 HOMEPAGE="http://haskell.org/cpphs/"
 SRC_URI="http://www.cs.york.ac.uk/fp/cpphs/${P}.tar.gz"
 
-LICENSE="GPL-2"
+LICENSE="GPL-2 LGPL-2.1"
 SLOT="0"
 KEYWORDS="~amd64 ~ia64 ~ppc64 ~sparc ~x86"
 IUSE=""
diff --git a/dev-haskell/cpphs/cpphs-1.2.ebuild b/dev-haskell/cpphs/cpphs-1.2.ebuild
index 7cc0080e1542..6fba795936a5 100644
--- a/dev-haskell/cpphs/cpphs-1.2.ebuild
+++ b/dev-haskell/cpphs/cpphs-1.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-haskell/cpphs/cpphs-1.2.ebuild,v 1.6 2006/10/05 03:07:27 cparrott Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/cpphs/cpphs-1.2.ebuild,v 1.7 2006/10/11 18:38:06 dcoutts Exp $
 
 CABAL_FEATURES="bin lib profile"
 inherit eutils haskell-cabal
@@ -9,7 +9,7 @@ DESCRIPTION="A liberalised cpp-a-like preprocessor for Haskell"
 HOMEPAGE="http://haskell.org/cpphs/"
 SRC_URI="http://www.cs.york.ac.uk/fp/cpphs/${P}.tar.gz"
 
-LICENSE="GPL-2"
+LICENSE="GPL-2 LGPL-2.1"
 SLOT="0"
 KEYWORDS="amd64 ~ia64 ~ppc ppc64 sparc x86"
 IUSE=""