summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorUlrich Müller <ulm@gentoo.org>2012-11-23 10:33:20 +0000
committerUlrich Müller <ulm@gentoo.org>2012-11-23 10:33:20 +0000
commitc8ad2913c8a75d46b2a92888f3b8f702176680d1 (patch)
tree1f5d7f9c0fb4d2e47b3225ee227688570020b25f /app-crypt/ekeyd
parentVersion bump (diff)
downloadgentoo-2-c8ad2913c8a75d46b2a92888f3b8f702176680d1.tar.gz
gentoo-2-c8ad2913c8a75d46b2a92888f3b8f702176680d1.tar.bz2
gentoo-2-c8ad2913c8a75d46b2a92888f3b8f702176680d1.zip
Fix LICENSE, MIT/Expat license according to COPYING in tarball. Whitespace.
(Portage version: 2.1.11.31/cvs/Linux x86_64, signed Manifest commit with key E7BE08CA7DC6EA25)
Diffstat (limited to 'app-crypt/ekeyd')
-rw-r--r--app-crypt/ekeyd/ChangeLog5
-rw-r--r--app-crypt/ekeyd/ekeyd-1.1.4-r2.ebuild10
2 files changed, 7 insertions, 8 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/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