summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDiego Elio Pettenò <flameeyes@gentoo.org>2011-01-20 01:43:33 +0000
committerDiego Elio Pettenò <flameeyes@gentoo.org>2011-01-20 01:43:33 +0000
commit4b2da87599b46261b69fae7c6c543f9ab5272532 (patch)
treea222e56e52c17401fe232462626ba97161e460a9 /dev-libs
parentRemove old, add CONFIG_PROTECT to fix bug 351614, QA: install some misc files... (diff)
downloadgentoo-2-4b2da87599b46261b69fae7c6c543f9ab5272532.tar.gz
gentoo-2-4b2da87599b46261b69fae7c6c543f9ab5272532.tar.bz2
gentoo-2-4b2da87599b46261b69fae7c6c543f9ab5272532.zip
Fix build with USE=-tpm.
(Portage version: 2.2.0_alpha17/cvs/Linux x86_64)
Diffstat (limited to 'dev-libs')
-rw-r--r--dev-libs/opencryptoki/ChangeLog6
-rw-r--r--dev-libs/opencryptoki/opencryptoki-2.3.3-r2.ebuild7
2 files changed, 8 insertions, 5 deletions
diff --git a/dev-libs/opencryptoki/ChangeLog b/dev-libs/opencryptoki/ChangeLog
index 82cd3c6627aa..a36adc235383 100644
--- a/dev-libs/opencryptoki/ChangeLog
+++ b/dev-libs/opencryptoki/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for dev-libs/opencryptoki
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/opencryptoki/ChangeLog,v 1.15 2011/01/15 00:51:12 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/opencryptoki/ChangeLog,v 1.16 2011/01/20 01:43:33 flameeyes Exp $
+
+ 20 Jan 2011; Diego E. Pettenò <flameeyes@gentoo.org>
+ opencryptoki-2.3.3-r2.ebuild:
+ Fix build with USE=-tpm.
15 Jan 2011; Diego E. Pettenò <flameeyes@gentoo.org>
opencryptoki-2.3.3-r2.ebuild:
diff --git a/dev-libs/opencryptoki/opencryptoki-2.3.3-r2.ebuild b/dev-libs/opencryptoki/opencryptoki-2.3.3-r2.ebuild
index 5300b6843dd2..4646f1c057f3 100644
--- a/dev-libs/opencryptoki/opencryptoki-2.3.3-r2.ebuild
+++ b/dev-libs/opencryptoki/opencryptoki-2.3.3-r2.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/opencryptoki/opencryptoki-2.3.3-r2.ebuild,v 1.3 2011/01/15 00:51:12 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/opencryptoki/opencryptoki-2.3.3-r2.ebuild,v 1.4 2011/01/20 01:43:33 flameeyes Exp $
EAPI="2"
@@ -90,9 +90,8 @@ src_install() {
# make sure that we don't modify the init script if the USE flags
# are enabled for the needed services.
- sed -n \
- $(use tpm || echo '-e /use tcsd/d') \
- -e 'p' \
+ sed \
+ -e "$(use tpm && echo 'p' || echo '/use tcsd/d')" \
"${FILESDIR}/pkcsslotd.init.2" \
> "${T}"/pkcsslotd.init || die