Gentoo Archives: gentoo-commits

From: "Ulrich Mueller (ulm)" <ulm@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in app-crypt/ekeyd: ChangeLog ekeyd-1.1.4-r2.ebuild
Date: Fri, 23 Nov 2012 10:33:32
Message-Id: 20121123103320.C5EB120C65@flycatcher.gentoo.org
1 ulm 12/11/23 10:33:20
2
3 Modified: ChangeLog ekeyd-1.1.4-r2.ebuild
4 Log:
5 Fix LICENSE, MIT/Expat license according to COPYING in tarball. Whitespace.
6
7 (Portage version: 2.1.11.31/cvs/Linux x86_64, signed Manifest commit with key E7BE08CA7DC6EA25)
8
9 Revision Changes Path
10 1.30 app-crypt/ekeyd/ChangeLog
11
12 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-crypt/ekeyd/ChangeLog?rev=1.30&view=markup
13 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-crypt/ekeyd/ChangeLog?rev=1.30&content-type=text/plain
14 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-crypt/ekeyd/ChangeLog?r1=1.29&r2=1.30
15
16 Index: ChangeLog
17 ===================================================================
18 RCS file: /var/cvsroot/gentoo-x86/app-crypt/ekeyd/ChangeLog,v
19 retrieving revision 1.29
20 retrieving revision 1.30
21 diff -u -r1.29 -r1.30
22 --- ChangeLog 12 Jul 2012 15:31:17 -0000 1.29
23 +++ ChangeLog 23 Nov 2012 10:33:20 -0000 1.30
24 @@ -1,6 +1,9 @@
25 # ChangeLog for app-crypt/ekeyd
26 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
27 -# $Header: /var/cvsroot/gentoo-x86/app-crypt/ekeyd/ChangeLog,v 1.29 2012/07/12 15:31:17 axs Exp $
28 +# $Header: /var/cvsroot/gentoo-x86/app-crypt/ekeyd/ChangeLog,v 1.30 2012/11/23 10:33:20 ulm Exp $
29 +
30 + 23 Nov 2012; Ulrich Müller <ulm@g.o> ekeyd-1.1.4-r2.ebuild:
31 + Fix LICENSE, MIT/Expat license according to COPYING in tarball. Whitespace.
32
33 12 Jul 2012; Ian Stakenvicius <axs@g.o> ekeyd-1.1.4-r2.ebuild:
34 added GPL-2 to LICENSE per bug 425890
35
36
37
38 1.4 app-crypt/ekeyd/ekeyd-1.1.4-r2.ebuild
39
40 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-crypt/ekeyd/ekeyd-1.1.4-r2.ebuild?rev=1.4&view=markup
41 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-crypt/ekeyd/ekeyd-1.1.4-r2.ebuild?rev=1.4&content-type=text/plain
42 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-crypt/ekeyd/ekeyd-1.1.4-r2.ebuild?r1=1.3&r2=1.4
43
44 Index: ekeyd-1.1.4-r2.ebuild
45 ===================================================================
46 RCS file: /var/cvsroot/gentoo-x86/app-crypt/ekeyd/ekeyd-1.1.4-r2.ebuild,v
47 retrieving revision 1.3
48 retrieving revision 1.4
49 diff -u -r1.3 -r1.4
50 --- ekeyd-1.1.4-r2.ebuild 12 Jul 2012 15:31:17 -0000 1.3
51 +++ ekeyd-1.1.4-r2.ebuild 23 Nov 2012 10:33:20 -0000 1.4
52 @@ -1,6 +1,6 @@
53 # Copyright 1999-2012 Gentoo Foundation
54 # Distributed under the terms of the GNU General Public License v2
55 -# $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 $
56 +# $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 $
57
58 EAPI=4
59
60 @@ -10,13 +10,11 @@
61 HOMEPAGE="http://www.entropykey.co.uk/"
62 SRC_URI="http://www.entropykey.co.uk/res/download/${P}.tar.gz"
63
64 -LICENSE="as-is GPL-2" # yes, truly, but GPL-2 added for init script
65 -
66 +LICENSE="MIT GPL-2" # GPL-2 (only) for init script
67 SLOT="0"
68 -
69 KEYWORDS="~amd64 ~x86"
70 -
71 IUSE="usb kernel_linux munin minimal"
72 +REQUIRED_USE="minimal? ( !munin !usb )"
73
74 EKEYD_RDEPEND="dev-lang/lua
75 usb? ( virtual/libusb:0 )"
76 @@ -34,8 +32,6 @@
77
78 CONFIG_CHECK="~USB_ACM"
79
80 -REQUIRED_USE="minimal? ( !munin !usb )"
81 -
82 pkg_setup() {
83 if ! use minimal && use kernel_linux && ! use usb && linux_config_exists; then
84 check_extra_config