summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDiego Elio Pettenò <flameeyes@gentoo.org>2011-04-14 07:21:17 +0000
committerDiego Elio Pettenò <flameeyes@gentoo.org>2011-04-14 07:21:17 +0000
commit4050b40370ec29ab74f3e1158c8d1310a37b2b7d (patch)
tree47c57e1b26611e1aba641fd5759bfc60c93b2f65 /dev-libs/opencryptoki
parentRevision bump for bug #362883 wrt Andrei Slavoiu (diff)
downloadgentoo-2-4050b40370ec29ab74f3e1158c8d1310a37b2b7d.tar.gz
gentoo-2-4050b40370ec29ab74f3e1158c8d1310a37b2b7d.tar.bz2
gentoo-2-4050b40370ec29ab74f3e1158c8d1310a37b2b7d.zip
Another try at having a proper init script.
(Portage version: 2.2.0_alpha30/cvs/Linux x86_64)
Diffstat (limited to 'dev-libs/opencryptoki')
-rw-r--r--dev-libs/opencryptoki/ChangeLog8
-rw-r--r--dev-libs/opencryptoki/opencryptoki-2.3.3-r5.ebuild (renamed from dev-libs/opencryptoki/opencryptoki-2.3.3-r4.ebuild)9
2 files changed, 10 insertions, 7 deletions
diff --git a/dev-libs/opencryptoki/ChangeLog b/dev-libs/opencryptoki/ChangeLog
index 2abfc59429e4..828992fa00d8 100644
--- a/dev-libs/opencryptoki/ChangeLog
+++ b/dev-libs/opencryptoki/ChangeLog
@@ -1,6 +1,12 @@
# 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.19 2011/04/12 21:25:04 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/opencryptoki/ChangeLog,v 1.20 2011/04/14 07:21:17 flameeyes Exp $
+
+*opencryptoki-2.3.3-r5 (14 Apr 2011)
+
+ 14 Apr 2011; Diego E. Pettenò <flameeyes@gentoo.org>
+ -opencryptoki-2.3.3-r4.ebuild, +opencryptoki-2.3.3-r5.ebuild:
+ Another try at having a proper init script.
*opencryptoki-2.3.3-r4 (12 Apr 2011)
diff --git a/dev-libs/opencryptoki/opencryptoki-2.3.3-r4.ebuild b/dev-libs/opencryptoki/opencryptoki-2.3.3-r5.ebuild
index 21e637155021..7a281bf2e939 100644
--- a/dev-libs/opencryptoki/opencryptoki-2.3.3-r4.ebuild
+++ b/dev-libs/opencryptoki/opencryptoki-2.3.3-r5.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-r4.ebuild,v 1.1 2011/04/12 21:25:04 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/opencryptoki/opencryptoki-2.3.3-r5.ebuild,v 1.1 2011/04/14 07:21:17 flameeyes Exp $
EAPI="2"
@@ -100,11 +100,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 \
- -e "$(use tpm && echo 'p' || echo '/use tcsd/d')" \
- "${FILESDIR}/pkcsslotd.init.2" \
- > "${T}"/pkcsslotd.init || die
-
+ cp "${FILESDIR}"/pkcsslotd.init.2 "${T}"/pkcsslotd.init
+ use tpm || sed -i -e '/use tcsd/d' "${T}"/pkcsslotd.init
newinitd "${T}/pkcsslotd.init" pkcsslotd
dodoc README AUTHORS FAQ TODO doc/openCryptoki-HOWTO.pdf || die