3 files changed, 22 insertions, 13 deletions
diff --git a/app-crypt/ekeyd/ChangeLog b/app-crypt/ekeyd/ChangeLog
index e156a3969f97..72a5f5e9b284 100644
--- a/app-crypt/ekeyd/ChangeLog
+++ b/app-crypt/ekeyd/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for app-crypt/ekeyd
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/ekeyd/ChangeLog,v 1.29 2012/07/12 15:31:17 axs Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/ekeyd/ChangeLog,v 1.30 2012/11/23 10:33:20 ulm Exp $
+
+  23 Nov 2012; Ulrich Müller <ulm@gentoo.org> ekeyd-1.1.4-r2.ebuild:
+  Fix LICENSE, MIT/Expat license according to COPYING in tarball. Whitespace.
 
   12 Jul 2012; Ian Stakenvicius <axs@gentoo.org> ekeyd-1.1.4-r2.ebuild:
   added GPL-2 to LICENSE per bug 425890
diff --git a/app-crypt/ekeyd/Manifest b/app-crypt/ekeyd/Manifest
index 28f51a2b4bc8..e2eaa3505b28 100644
--- a/app-crypt/ekeyd/Manifest
+++ b/app-crypt/ekeyd/Manifest
@@ -8,13 +8,23 @@ AUX ekey-ulusbd.init.2 1017 SHA256 0383865a5d543296822836fa150a83ddbf63bf0b7c8a7
 AUX ekeyd-1.1.4-gentoo.patch 6565 SHA256 ed663baf91af89db437150e04a1ec8dacfeb990c6c0659b632d8e895e2230f1d SHA512 f65a1cef8bd4e280a8dd8ce51f23661286ed3fd688d34943793eb326d417016a53312c6b344aab3465a8930c7de8cd10d6d572bd67f92cf8f65386f2f5ca1875 WHIRLPOOL 40e642b074031a538f2e2bba0a55a7d9c2ed83a22492c0cf1f3e4cb8fe2a360fd021ec0370264c81f611531748f1e1887a18df6665a1f8bff7938f56da9197e6
 AUX ekeyd.init.2 810 SHA256 a38169a3071fc3c2b7a736ff38c4e637c3ea4fb81b9bb36723dd24d13cc719ba SHA512 9984ced308ac743375e7cea42f99a51d2dc97b17bd0acf48df4a7a165a3facd7232038e65f5d0ea14bf3475c8438f62b7c4ceb30c17bdddadd9b22a8f95b280a WHIRLPOOL 087c68ff3688d1fd868f5e5d88682f76cef42d9ae437b66ca7fd0c33590acffd56baae5138f04bca248d93c0461f8901e87562dd01252e17f7914e1866bd52aa
 DIST ekeyd-1.1.4.tar.gz 100911 SHA256 147ca4ff964ab7b344a08d3cd6f9b1bf03ba18776a1941d603681d8102cce0c8 SHA512 40632722827e07ebc643fa32af9910b28053873329772681dba2b029ad0b3c63d1d6bba3fdd0549b84e23779d2e2ae0323a53e1fdf93eb963570bab2227b63e6 WHIRLPOOL 1dc89c735befeeb8fb2d840d27ddcce0b8b15cffb8be0b9e6fa978f0c14bc9cef8345b8b1f4a3c6140031b1a01d92c26674e011acec3c6605ddf7b5c2e56d248
-EBUILD ekeyd-1.1.4-r2.ebuild 5748 SHA256 bb45907155817de83369cd342545af721c11e9505bc314f02f744324e64d325e SHA512 264323b3319f7537a2a8a26c5cd83dc4c32ec3375f6ef4826197b69bc3517499647e7014ca8261ac1b7a322bebde95674020bcb90f2e590461bd8a14b42a3355 WHIRLPOOL d146ddfb54be8836b8012667ebc345d4c814b73ce1ce4398b3fd430157612ed4e3360bff085fed8bc0120f9913daabaeadea1aac4933076aa1d1b686df7354dd
-MISC ChangeLog 7580 SHA256 1f40cda3d1d1fc55047a7c9c81f3c5d087050d86980b3d190a59aa9aa7fc151c SHA512 e01fb2ff8992a2a62ce5623a0e77f335ad0511bf4535740a9a6036668cef91a1ee95e7d1f20390c327e6459d817d884475808347f720ee2deafd2cb7ab270d02 WHIRLPOOL e58e3b54d464cb9f6f6de6a43da487c53c90c6db3032fb3bf6d0e506a3e928c680e0597e9390d9fac0afd64f5d7e14624f6f664d828caa215ebfa903f1613b81
+EBUILD ekeyd-1.1.4-r2.ebuild 5727 SHA256 fa8811f8be33df38afc3584893015480ad86873cec1ffd61e36f3051efbb5374 SHA512 4e530ea969e73d88ae9de5e50d439026ce56fe424c843801ce84c89b55313366c7de710b60990fe28e40cd3dd0f151d3c9532c9b44c454d506ec01c15ccd03c5 WHIRLPOOL 9be9cf7a7264fac0dc67cf1455ac825b0b63f00b8306224878939085c2b31297a481d69d284bbc2aeab50570ee2f55d29bfe077d06a0dace9a2b14c990ab8e23
+MISC ChangeLog 7729 SHA256 b5cd0425d29c34b7663749bdbfee94d2bbaa54b7364450a60ed7e476ec28dae4 SHA512 a2af1710656d50d3d4e82f7d246959fc0de329cf7e0017aa90a867b35247e24154ffb839fd51b1b0151085ed77f635af335e5df593bd646bc3747e276c493e13 WHIRLPOOL 3297a571191a2e01aac4c3df7a8d1675c231fca72b1ad7a3e12c9e4deacf2f29034dfb2e8162eb512811fc5606d62cca0d6e1f936cf7af525fb5be8bb753eff8
 MISC metadata.xml 869 SHA256 88e879d9e370b95619cc31e635cd9d712488891042ffa94ab42ff5c0d1f3c56e SHA512 b0faa8765cf1b568f2c255071cffd3af2c778bde3631fe4396ff814cb73dd2708bd447db7494bbbb6372411aef7f40beb7537076bb7e4bff442393e91a1e2764 WHIRLPOOL 6cd3433f8fc324ec47ad58c6b2abc5915e9e5403a258e4a116007de6af3b4318daa8cca81b3e9a9bda8e815a1c12fb6277cc63543e0803aa58cdebf1a5484c6b
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iF4EAREIAAYFAk/+7c8ACgkQ2ugaI38ACPC6HAEAlEUddH1L3KgA9NnVH4OBrzNf
-GzVbskvHATfsJJ0O8o0BALHDNJ1r2HSzDpXO6MzR3O7aguc/KsnKNnqdwWy/u9Sj
-=DOJh
+iQIcBAEBCAAGBQJQr1EzAAoJEDxpGckxwJCBpGEP/RXk8tU8nkJy1xfzvZ6m3Mxf
+wEcYqsZ2QPxXscl2gYcWQHyQPJYPviikI29it/rUatYOT4RgOlpCtI/7oYCvOmyO
+PCL3beYwrwZ6Yodzz+CDw/bMD7+HTBcVMwNnmRXheg6OLsjS2SLfYSnoGu68NuBL
+v6iv7M6/y/4creQ/ok8pd06d+ZKLF3T8BjUwvA/zJw4GRc2gw+8ZWSXbuLAl5DOr
+pi3noSP6m00H1SG3MmIBFJdvtqVnGR3t9jWvtwrCX+oo15+S8uYsWlS2dvBc0JW9
+tBhsfZWTotk1YRbb17FaldHH1pnd9kejsC7IcKLfYG30ZrNf5S91li6InXFZv7Na
+97Wu8cH5VSFAkUkQAoSk9NIBfKInVZZDA03dDyI40aKkGUm9R8Uv8g+tNCmCHVew
++M/iHmJG5zUl/7LAWioZimWg6rZLokO0Kz3lxFZYcKA1YtLxLc0UFZTrm9MP0vSW
+nqBhgMrNUrFnDddB9U0OpGz+mYSwHBdN0n0u3CqcoFtr5Pmvm0IeC+lWnthwICAB
+hRc0fKb4l9sfj1EBu2ud0i/kgl/x4QAJNycenm0sVLaOcBvZ9AXSUGwHp7qd3279
+itESdXSY0R4Juvk/ARBnqZE6GMIDcUjViDiVhGcS4sCegWJK4X6Kggt0AB5L+Wue
+tmcorro7MHmj06TtZAYW
+=wH+c
 -----END PGP SIGNATURE-----
diff --git a/app-crypt/ekeyd/ekeyd-1.1.4-r2.ebuild b/app-crypt/ekeyd/ekeyd-1.1.4-r2.ebuild
index 47717a0f2b81..8ade30dc2d2f 100644
--- a/app-crypt/ekeyd/ekeyd-1.1.4-r2.ebuild
+++ b/app-crypt/ekeyd/ekeyd-1.1.4-r2.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/app-crypt/ekeyd/ekeyd-1.1.4-r2.ebuild,v 1.3 2012/07/12 15:31:17 axs Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/ekeyd/ekeyd-1.1.4-r2.ebuild,v 1.4 2012/11/23 10:33:20 ulm Exp $
 
 EAPI=4
 
@@ -10,13 +10,11 @@ DESCRIPTION="Entropy Key userspace daemon"
 HOMEPAGE="http://www.entropykey.co.uk/"
 SRC_URI="http://www.entropykey.co.uk/res/download/${P}.tar.gz"
 
-LICENSE="as-is GPL-2" # yes, truly, but GPL-2 added for init script
-
+LICENSE="MIT GPL-2" # GPL-2 (only) for init script
 SLOT="0"
-
 KEYWORDS="~amd64 ~x86"
-
 IUSE="usb kernel_linux munin minimal"
+REQUIRED_USE="minimal? ( !munin !usb )"
 
 EKEYD_RDEPEND="dev-lang/lua
 		usb? ( virtual/libusb:0 )"
@@ -34,8 +32,6 @@ DEPEND="!minimal? ( ${EKEYD_DEPEND} )"
 
 CONFIG_CHECK="~USB_ACM"
 
-REQUIRED_USE="minimal? ( !munin !usb )"
-
 pkg_setup() {
 	if ! use minimal && use kernel_linux && ! use usb && linux_config_exists; then
 		check_extra_config