Update LICENSE, the Scintilla license is a duplicate of the HPND.

Package-Manager: portage-2.1.11.51/cvs/Linux x86_64
Manifest-Sign-Key: 0x9433907D693FB5B8!

4 files changed, 29 insertions, 8 deletions

diff --git a/app-editors/scite/ChangeLog b/app-editors/scite/ChangeLog
index 46324128b39c..12c9f3644c3c 100644
--- a/app-editors/scite/ChangeLog
+++ b/app-editors/scite/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-editors/scite
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/scite/ChangeLog,v 1.150 2013/01/29 21:11:51 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/scite/ChangeLog,v 1.151 2013/02/21 21:52:08 ulm Exp $
+
+  21 Feb 2013; Ulrich Müller <ulm@gentoo.org> scite-3.2.3.ebuild,
+  scite-3.2.4.ebuild:
+  Update LICENSE, the Scintilla license is a duplicate of the HPND.
 
 *scite-3.2.4 (29 Jan 2013)
 
diff --git a/app-editors/scite/Manifest b/app-editors/scite/Manifest
index e2e077d5f2be..33f42f5f3a4c 100644
--- a/app-editors/scite/Manifest
+++ b/app-editors/scite/Manifest
@@ -1,8 +1,25 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
 AUX scite-3.0.1-no-lua.patch 632 SHA256 30a228b95cfbdfd3c9dbe01e78a2ed887dbff92f7e3b04fbb254a5777cc66bfb SHA512 7aaf72b7e58bcfdf4278c6dce4f62f5679513f1de68744e7bc842ff7e4c6ab792c5149df07f50206c638a70d1be1261fb21e3cd1fe603c13f9350674a6bbdf45 WHIRLPOOL 770367be441ffd06a3db7d0503ba9b2a5d163afdb6ba503624c79b9ad4417e097b338ce65ba54a3bc072bdb7c99c75359df7e4fe6e4e0a90bc0dfd80d9f9a1c3
 AUX scite.desktop 138 SHA256 f91b1e14fdb6f78901001ece140eaf1dc60efe6fc0364f6f145671964a0c40bd SHA512 9e226e4207ccaf0ae654e0456906547d9eaa77d5f09e057e56a657ae06fe909a759a8ae30bb625ec556f72a3a7105fc1f4407f1f51c05c40ba2cc1ec08469da6 WHIRLPOOL 6a0de80f0eb8479e54e644e8a729d4b45bba6b0ce2fd0662309ed4f6e70b4e36ff531cf23a220485e0ec26bb0349efe782279d9a7e66d1d54af99f3520a1de60
 DIST scite323.tgz 2053250 SHA256 d0d324a5e420ff96db6cd1c6eeac23b6f4c046e7545e73c4625ab2add90e4a65 SHA512 70125c33a8bcb68d428a6f006d1043a9398ce34ef11f2287ebdcd84bab132c515d176ec247c2c0d3321b2f8cfa9f4a01c67526f48d2ae1d00d6d3429e2616990 WHIRLPOOL 5f260a7b11869dd41047fab3dbeebc8bbd0b7cb70d6129efb28459648ad42b1d99895ac9b5baf239a0d684c3a3205fbe6190213b72da66ec3daf150d4e082c67
 DIST scite324.tgz 1956084 SHA256 bd20b97513aee8e4584253d6ca31ec658bd4f098ceefb354889eb8a498cb5c08 SHA512 974d8609e663808b1f7bcb290f97ac4fbb61cc13c9328dd357960c637b50326fb7d75de6e19fe53cdfe4df5f5fb41c8a9dd23494715b43e4b56834aaae67b485 WHIRLPOOL 46950463738ae3098da594476d101f28941b26127fcd140c0879b48ffbe73f2f5bcc3750fa301ee5d40c9e7c46e5868fb2f1377a6485c2dd4b9c2fd7f5a4d8fd
-EBUILD scite-3.2.3.ebuild 2173 SHA256 322409c1a9698d86f14561160bcb41762439f9bd872b2ad27d23b86a4c139b33 SHA512 45a49e3a290ee909b54ee4f57aead0f79562b2f85ecc9f0fd40d28cce597f59a71f0f67f38cee408a3084e0008688a194c231f3ebd81ad0b3937b0e3869096b4 WHIRLPOOL 32c0a9bb1d1c6be857a5bb2f21f86cebb2b4b673a79fcfb69cf921ab9dfa4fcf9d76a3bb2a376ccbf51c4d9446eeed96b0bad659d33306e25353b42c6d11d1a8
-EBUILD scite-3.2.4.ebuild 2176 SHA256 d495b0a3eb955b3391f92f227a9b5a39b5eb498d81d41a5d501c010e16257718 SHA512 84125c21092316ae2694bc6ee09f79d8ac08c6218c9ed347ad2d0cf66d3d98445ca9eaea1dcbc6404cc71a3ebc31f4c0a1a86d4c3eb277ae1388aeca66bdd88f WHIRLPOOL c03ea450377f70b6305c1b1ddd20b1aa270f9e6335ab0919dc89d6e6cf6b07940ea337263ff83e7cde68ec934251b028af8e47ee21859560ecf89c94db37f32e
-MISC ChangeLog 21191 SHA256 16bffbff9f289bb75de42ebcc74ea0b9c25855907d46cbc48cebe5471974bc72 SHA512 3af4021cc768ed1647613c3cdf2df8d5442b5b2cabfd53dc34988c47c196a672e022fd2147331c34ea686cbb262955480dc71252f1ad5e3bc1fddecf347b05ca WHIRLPOOL ef30c3a1585f0cb3824c8f8210e4e36194fcc61bc846266a0a48657862565a01d1fd309a176643ac9fde0228d4c69c8934c69bffd100d380032746acd15de00d
+EBUILD scite-3.2.3.ebuild 2181 SHA256 bc7167fe60e7c0b9eacb3513780f42a0bedb9aac46d734d7607161d60441f0ba SHA512 63cfddbcd62e1279824c7865850ec65832ce373edc491cca0f4f10c8a2ef9898d448627024e62223a696d88fbdea7bd736fe0182c1ad39cc92f6ba741f1157aa WHIRLPOOL c7487998576f87bbf23337fa413ebc754dbf38564524cae941d362e44a03b853d710ef6c2847d279e2e3175ea8e973d89f2e03662301c4d32e9f9991b035f2e6
+EBUILD scite-3.2.4.ebuild 2184 SHA256 c0c6f6893416daee00a55926777d44655e47a54073e66414337f6e8120d1d5a2 SHA512 cbdfe7cdabe3872b28ac7c9f99d12da096f5b27f26ffce23eebb33486096a93310fac8b8e585cbc6a93711e13aefd06e745bb36afc6560684c66dfc811a7089f WHIRLPOOL a62cf0d24cb7416668d51f1fc6e20f6f5fd95e96697692357dd5a35a089d42dd0f7b37937a49b1bfb4fe3880c60a6f38d74702f65913879b099b62c8c39534fc
+MISC ChangeLog 21349 SHA256 c923744d8fa376fe8245c801d343ed206469364c836fd403034d782919664ebb SHA512 13be3d984df81940a7f57454fc018abc2f5fc69ca5e7d388b443535225caa7c0821cf48689ff56cb35e0808ed4f96950cb59a1a1f7dd31a37ac5a4ce367e286e WHIRLPOOL e3365f2b39743c5bff9c5cfc6e239a07230d5dbe12b0bcc4cc483a42e3a0e33fac4c40855eae382aa11bd922885bfcd0bc44a9b4485450e564b19b7d319f93ee
 MISC metadata.xml 218 SHA256 e124ad5b959f26606c176ee0a8cc3e59839b98e93c712fe4b699e7e4df11fd6b SHA512 d689950ba64adf80b0b7b667dfa81f230bc7ecf280eabba76ea3f4f0ecec3105d850cb24d34a88243debd08febe8bbd95e389fb8463f6aaeffe96a39a87d569b WHIRLPOOL 72aa8e8b9896ec82acedd6f4b4a1876861523430bc29bc96fcc03da4475e78ddb3802268b81d80d535d6942baad1508fe939a9a769b7635dfebbef7076962ee6
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.19 (GNU/Linux)
+
+iQGcBAEBCAAGBQJRJpgPAAoJEJQzkH1pP7W4nacL/3ZoYVZ5RwM0Vo9XGlxDJ9aK
+9TLyqLK6TbYH9VbY6Pf78mNnIndLaDQ+stzWjdoWpiJOM9n8cV4NxTuqpDCSKaos
+kVPaBLRQ2zF+lmEoo0++2zCfgQbW6BUldujizGaXSKuLYuLHOHzGpk2E8mlXW5re
+eEHeOE144uQtgMNZN3ExmTDj6cNjQ5+/x5TOTTN0sfHy+GrJoFBCmd00+ghdMNVf
+KpRr5kj0+Vsi34SiUS7eCveDPFUvpK5RiZ/sAMnkWnd1PtQmcGeV0xdDp5wn6aZy
+D4e7m0Svq6Af4Tk6MGk9PF9qglEBrIcoFK90xP+k9mz3RQCnk0URlaefpoqZ+8sT
++3mWa/BOeUB3lz10VdBE1FtcQcKi4BfwYXtiT+dIjsteP8P+YU5lCISbvi1MM4sq
+nbPlj5DbMbnkcm+KTZT09K+KNViZAQHDXKzjDcRwYt3tLJa8jWfxy/cP/Lnj9gYH
+Ea7gMkj/TMpkIT5hI/mtFY4mMbhaFgcV2lKAlbzXYQ==
+=SaiY
+-----END PGP SIGNATURE-----
diff --git a/app-editors/scite/scite-3.2.3.ebuild b/app-editors/scite/scite-3.2.3.ebuild
index d592e363f740..3c8300f7d378 100644
--- a/app-editors/scite/scite-3.2.3.ebuild
+++ b/app-editors/scite/scite-3.2.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/scite/scite-3.2.3.ebuild,v 1.4 2013/01/02 12:14:52 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/scite/scite-3.2.3.ebuild,v 1.5 2013/02/21 21:52:08 ulm Exp $
 
 EAPI="4"
 
@@ -11,7 +11,7 @@ DESCRIPTION="A very powerful editor for programmers"
 HOMEPAGE="http://www.scintilla.org/SciTE.html"
 SRC_URI="mirror://sourceforge/scintilla/${PN}${MY_PV}.tgz"
 
-LICENSE="Scintilla"
+LICENSE="HPND lua? ( MIT )"
 SLOT="0"
 KEYWORDS="amd64 ppc x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux"
 IUSE="lua"
diff --git a/app-editors/scite/scite-3.2.4.ebuild b/app-editors/scite/scite-3.2.4.ebuild
index fe23a4b243fc..5b0cbb8841eb 100644
--- a/app-editors/scite/scite-3.2.4.ebuild
+++ b/app-editors/scite/scite-3.2.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/scite/scite-3.2.4.ebuild,v 1.1 2013/01/29 21:11:51 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/scite/scite-3.2.4.ebuild,v 1.2 2013/02/21 21:52:08 ulm Exp $
 
 EAPI="4"
 
@@ -11,7 +11,7 @@ DESCRIPTION="A very powerful editor for programmers"
 HOMEPAGE="http://www.scintilla.org/SciTE.html"
 SRC_URI="mirror://sourceforge/scintilla/${PN}${MY_PV}.tgz"
 
-LICENSE="Scintilla"
+LICENSE="HPND lua? ( MIT )"
 SLOT="0"
 KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux"
 IUSE="lua"