Fix LICENSE, see notices in source files, bug 446768.

Package-Manager: portage-2.1.11.38/cvs/Linux x86_64
Manifest-Sign-Key: 0xE7BE08CA7DC6EA25

4 files changed, 34 insertions, 20 deletions

diff --git a/x11-misc/xkeycaps/ChangeLog b/x11-misc/xkeycaps/ChangeLog
index 4f8533e2c8b9..776fdfb0f7da 100644
--- a/x11-misc/xkeycaps/ChangeLog
+++ b/x11-misc/xkeycaps/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for x11-misc/xkeycaps
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/xkeycaps/ChangeLog,v 1.26 2012/03/18 19:57:50 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/xkeycaps/ChangeLog,v 1.27 2012/12/23 20:23:24 ulm Exp $
+
+  23 Dec 2012; Ulrich Müller <ulm@gentoo.org> xkeycaps-2.46.ebuild,
+  xkeycaps-2.47-r1.ebuild:
+  Fix LICENSE, see notices in source files, bug 446768.
 
   18 Mar 2012; Raúl Porcel <armin76@gentoo.org> xkeycaps-2.46.ebuild,
   xkeycaps-2.47-r1.ebuild:
diff --git a/x11-misc/xkeycaps/Manifest b/x11-misc/xkeycaps/Manifest
index 33f09912ef18..899444ed3ad0 100644
--- a/x11-misc/xkeycaps/Manifest
+++ b/x11-misc/xkeycaps/Manifest
@@ -1,19 +1,29 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA256
 
-AUX Imakefile.patch 664 RMD160 c7cf1a22e3dec7b9290ee84a8706698c06473763 SHA1 86cf5c126d4c52587edba70808c7efd7882d2f26 SHA256 a4f64f4ec83c755655aac25b5a3d60e3f13bc52b71c261d7880fe5851e9d1935
-AUX xkeycaps-2.47-Imakefile.patch 758 RMD160 f73a937628fb10e769f05151293037679c2a5abc SHA1 8f418e41ad43ef3df0605f8a0b2ea75bcc9ea526 SHA256 6d82c2e6cfcdc12c27a64ea690485ae1b7ab8fbe2d678bbb0fafe2a4d60f38d6
-AUX xkeycaps-2.47-man.patch 639 RMD160 4c96acda11fc1ede4ff0a31bdc0b1d538f31eba4 SHA1 2980a0d0a79466ba1d72dc96a5b189c5fe9744e6 SHA256 c56ceda9483ebf96c040deff495a8c03a2a629c1a32d209817a331bd6182127b
-DIST xkeycaps-2.46.tar.Z 489439 RMD160 ee787ac4970204689ec54d14b6072235c7026acb SHA1 458133a394f63d84efacaf917254074005ce953d SHA256 40da137109e0ef0b687a72b71a1ef0b3d08a10749fdda05fc16c52b4cbed763e
-DIST xkeycaps_2.47.orig.tar.gz 351418 RMD160 52c5b817df837797595253409b25178acd014b3f SHA1 a018f8529f7199c818a7aea5e252b08622f90b7d SHA256 efd92e6179ec4506cbb08db11091185f3bd1567eecb2291f91f70980e175d8f4
-EBUILD xkeycaps-2.46.ebuild 992 RMD160 75a8ab1c98cf2962e903e68ffb1a750442182d21 SHA1 2779ef100e1d630985059cb7eb2f2d070270403a SHA256 341545aa81d1d08c46b33be6381eac9c505c6b102edc72981591e9f170555084
-EBUILD xkeycaps-2.47-r1.ebuild 1105 RMD160 1d8089e88e1ea8761fd009459df7020cb5ac9816 SHA1 4dfe8f73accfab870cae962472150bca8baf44a7 SHA256 8961d7fa9aa889c408ad255ac20d350d8263fd6da127e97bb3e2a0ae94ad4ba3
-MISC ChangeLog 3359 RMD160 adebdbfb1069959c8dc4e48044210bd754dd9f04 SHA1 55832564f71c65f6996e76d7fe8d210c8d0caaf3 SHA256 fb0c243110b036645289a4718ce1adf4a6c69ef213dc7fcdc7734b23c9eb818b
-MISC metadata.xml 166 RMD160 7b80226659bf40e97050b1ffce1858d5f20b3c60 SHA1 e6c6436c304a65b4a012a5b7be7ee264b228a645 SHA256 8e7de0a7f7c15840474de373a3ce36adcc5dd658b2e4d18366fcb63b964a0826
+AUX Imakefile.patch 664 SHA256 a4f64f4ec83c755655aac25b5a3d60e3f13bc52b71c261d7880fe5851e9d1935 SHA512 383765b5f15dae5848d893f396cd45be5c8a1914d85b02c920b2463fdc0c8d160020f53b65dee3a950fcb50620382f140cc595a082dec2c6eea5ab8fc6cfe02c WHIRLPOOL 461d17180b513d279d4bfe64aabbf54b7a954378fad3de63fd8768d37d1ffd0409d73e5f916416d8d6768dd22c277679705a25027f5d55930add41b0168ca91e
+AUX xkeycaps-2.47-Imakefile.patch 758 SHA256 6d82c2e6cfcdc12c27a64ea690485ae1b7ab8fbe2d678bbb0fafe2a4d60f38d6 SHA512 f3bef8615e6a040ab05fc71cf45323515f752ffc8cc1914098b1a8433a77c91c0f9aaba11e73bc984c808d1e5421f94c5dab4562e5f442a8558d2987145928a5 WHIRLPOOL 2615cd49da00cabb4a2bc72b987a121844f89e65f4cac8922e90d6303dfb0c7d2c0cc0de12a61b508fbd238fb0e6f913c20878568216328a53ae0b265183e006
+AUX xkeycaps-2.47-man.patch 639 SHA256 c56ceda9483ebf96c040deff495a8c03a2a629c1a32d209817a331bd6182127b SHA512 6eab220c2c5c274ae5bfdc5bcf9c028409a3f0ee1b764aaaae81b2b7496fea48e64ea6fbcba0bf175ee10bcc81309ddcaeed3c4b9b831b9f8d8341df20a9c950 WHIRLPOOL 1142b75ca96a51c4cc880607cd37839b40316109803b41ae2b650aaa38e1c6db85096747e08b3ec1126924003f08058695a8267b58f64b2cad0273091623b6a7
+DIST xkeycaps-2.46.tar.Z 489439 SHA256 40da137109e0ef0b687a72b71a1ef0b3d08a10749fdda05fc16c52b4cbed763e
+DIST xkeycaps_2.47.orig.tar.gz 351418 SHA256 efd92e6179ec4506cbb08db11091185f3bd1567eecb2291f91f70980e175d8f4
+EBUILD xkeycaps-2.46.ebuild 987 SHA256 dcfffd0bd566ec4bc651fc86724ab86b02c63bf4a25e68a68c463b4923ebf5f4 SHA512 c94cdc6fe73a25c5af9cab884f93fb867e708e0bc85b0cc49d9c794650c57c754076af901dbfce877bb2e57e4bf9561853904e05f2c3cd7a89f3d7b9af207ee4 WHIRLPOOL d419bc6e9628f38eaaea368faac655c51f1c4b215af671725eda7a1b6317e2cd238f00e1abe163f0adb46eb7686e6da021ebe75bbb140bff64d2c66e5a684db0
+EBUILD xkeycaps-2.47-r1.ebuild 1100 SHA256 3cc78807a6013f74d4d68717fd90787990c61916a24b81e06fbca9a8efef0024 SHA512 1c38ba497ceac68fb392dc7c6e51bf7c6a7e45005aeb0784bcb24e2956e5f7df6b38160363bafb66ec08183fd183fb4cb57d46fa7112035ee4f37cf172eecabd WHIRLPOOL ebb2bac3d8d97e5bfda341195b098c932f158a2e33fe8860ac3a5307fe9ee62de7668674479c3177fd2263e122cfa59851a367b5b31181520efc5d40ef0d2c1b
+MISC ChangeLog 3508 SHA256 59e7b764e18a98ae7708361568752bb654e69e3fb420c480396e93b0cc5974b0 SHA512 9d84be0b1d8e05578e18cf31ce1d5f853ab72c57442f97ac66d71da882a9fa50ee9ac3f40339252a04a8526bb91f57c8295ef726de369f71f021caa10bd2eb61 WHIRLPOOL 238315f6fbe4a3ce0393c301ea15f9e75a2413a2d378028e2ff29c818bf77c0b4add440b5d21b929aa826b14de9f0beb9d9252c2a69d00de1e6fc4a7bda2df1c
+MISC metadata.xml 166 SHA256 8e7de0a7f7c15840474de373a3ce36adcc5dd658b2e4d18366fcb63b964a0826 SHA512 23980b683f9a89f988407b1dcc27a4465a18912f6e6cf8e1fed46182f00c4023d4802434f36b9482121ba9ffe9bc5d6e91b5d3a4ba9067fcfd8e57799c128fe3 WHIRLPOOL 96d79ff499e108ad89b80507c2e94a09af1e8031e5e2a7f9cecb2dddbf517872361436bdb983dc580660064a62663ad63aa1fad8f49dd3758253f4e378bfd297
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
+Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEARECAAYFAk9mPkQACgkQuQc30/atMkA2UwCfYYJdqCkifZcCmRY7kwbfJosf
-TwcAniDliztTUou3WletN9bs/uEnVsq8
-=bcZt
+iQIcBAEBCAAGBQJQ12i9AAoJEDxpGckxwJCB99wQAKV4D5UjshqwN+tfDNSKYwHW
+QJDqaxui2wB6Nq0aI/ZrCZP96hPYOVJXDN77/lwfeDbetPsE+WC1s9+pJatFb3tH
+DqWzc/F6Po6I6OoXSUkBligIvtDSyZZ9AdK2mhQlt+ynEf3bOwam1uYeVs1zO7gs
+ehku3i4+Wo/jq+TiMoyYxNeviHQiBHiSDS+i6IB4HWqONXESaPnKmvMxV6JYBjSK
+N2fap/4z6PUK4pX/elK7raqpecMovGKESEv7/y+LIH3sul/mUSl7iVc6VwFPzff5
+psJIbXIBtUKhyraufwzyVUn+Npq1w60UI0M8iqY1FWkd6FgGLpJKyjhmenWu5ipv
+S6UYJQV64+H7tP6qWMg0j/K1MeLtgKMnri93TXOqIIe4dBQynfg5MED4wSrATxIt
+4IMNRfWpadRkI5hH6+YjCFTVOVcrsLXvZBBtzcdqOjN+woTF3b9+vFFuhwL94sfn
+mdfNJN4WM648jPNcJoMc9IqB0MjUUMi5MrPH18UJSo0OkOuOc/NEa1s/inYB+f8g
+vsInhHcKvPZ1N2nCMRC6iIVHEDy/wBOqpxqGAM5DV+TUa77VAsWUk+be0x6AAXAm
+WfoDNvamSGe5nWRR/kdwJg9QzGjZM/4mFf0H/1bIZJ36sfiLjqIk4eTIPjejD2UP
+9K70zs+913WT7bun+jlT
+=0uvQ
 -----END PGP SIGNATURE-----
diff --git a/x11-misc/xkeycaps/xkeycaps-2.46.ebuild b/x11-misc/xkeycaps/xkeycaps-2.46.ebuild
index 772fd2d6cf97..2e610f891007 100644
--- a/x11-misc/xkeycaps/xkeycaps-2.46.ebuild
+++ b/x11-misc/xkeycaps/xkeycaps-2.46.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/xkeycaps/xkeycaps-2.46.ebuild,v 1.22 2012/03/18 19:57:50 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/xkeycaps/xkeycaps-2.46.ebuild,v 1.23 2012/12/23 20:23:24 ulm Exp $
 
 inherit eutils
 
@@ -8,9 +8,9 @@ DESCRIPTION="GUI frontend to xmodmap"
 SRC_URI="http://www.jwz.org/${PN}/${P}.tar.Z"
 HOMEPAGE="http://www.jwz.org/xkeycaps/"
 
-LICENSE="as-is"
-KEYWORDS="amd64 ppc ppc64 x86"
+LICENSE="HPND"
 SLOT="0"
+KEYWORDS="amd64 ppc ppc64 x86"
 IUSE=""
 
 RDEPEND="x11-misc/xbitmaps
diff --git a/x11-misc/xkeycaps/xkeycaps-2.47-r1.ebuild b/x11-misc/xkeycaps/xkeycaps-2.47-r1.ebuild
index 32d2c19a0843..b9aa3e04f447 100644
--- a/x11-misc/xkeycaps/xkeycaps-2.47-r1.ebuild
+++ b/x11-misc/xkeycaps/xkeycaps-2.47-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/xkeycaps/xkeycaps-2.47-r1.ebuild,v 1.6 2012/03/18 19:57:50 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/xkeycaps/xkeycaps-2.47-r1.ebuild,v 1.7 2012/12/23 20:23:24 ulm Exp $
 
 inherit eutils toolchain-funcs
 
@@ -8,7 +8,7 @@ DESCRIPTION="GUI frontend to xmodmap"
 HOMEPAGE="http://packages.qa.debian.org/x/xkeycaps.html"
 SRC_URI="mirror://debian/pool/main/x/${PN}/${PN}_${PV}.orig.tar.gz"
 
-LICENSE="as-is"
+LICENSE="HPND"
 SLOT="0"
 KEYWORDS="amd64 ppc ppc64 x86"
 IUSE=""