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
commit65443a82ced5879b3cdbfb4a9720801634a16ecb (patch)
tree12ed216ec5bcbb2e0fa0f7cbc78e81fe91f89168 /dev-libs/opencryptoki
parentRemove old, add CONFIG_PROTECT to fix bug 351614, QA: install some misc files... (diff)
downloadhistorical-65443a82ced5879b3cdbfb4a9720801634a16ecb.tar.gz
historical-65443a82ced5879b3cdbfb4a9720801634a16ecb.tar.bz2
historical-65443a82ced5879b3cdbfb4a9720801634a16ecb.zip
Fix build with USE=-tpm.
Package-Manager: portage-2.2.0_alpha17/cvs/Linux x86_64
Diffstat (limited to 'dev-libs/opencryptoki')
-rw-r--r--dev-libs/opencryptoki/ChangeLog6
-rw-r--r--dev-libs/opencryptoki/Manifest12
-rw-r--r--dev-libs/opencryptoki/opencryptoki-2.3.3-r2.ebuild7
3 files changed, 14 insertions, 11 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/Manifest b/dev-libs/opencryptoki/Manifest
index ce1d7265aff4..bb924bec742f 100644
--- a/dev-libs/opencryptoki/Manifest
+++ b/dev-libs/opencryptoki/Manifest
@@ -7,13 +7,13 @@ DIST opencryptoki-2.3.2.tar.bz2 665134 RMD160 2945879a367b787432189abd74262e60a3
DIST opencryptoki-2.3.3-backports-3.tar.bz2 5972 RMD160 e26505faab863710e1d1b6fc78f712dbfb9a54b9 SHA1 54f50f2814478e450513620842fe80303d7318a8 SHA256 fb913dbb5c2b0d87067d9738892b2a4c4a7c192d6335cc0bae2a7083e913aa74
DIST opencryptoki-2.3.3.tar.bz2 694854 RMD160 a9ccedf5242dd611a50820fbdbb4dd9ee87a11d0 SHA1 663b1767ff33c71bd65e30e6d13d213f50528d6c SHA256 7ccae6350a7043c2abade1eb1517edb987f13e98584dd28733172e8d36600aa2
EBUILD opencryptoki-2.3.2.ebuild 2167 RMD160 a0b3f27addf56daa27755664913c1e28429dfc6a SHA1 cfc2bc6ee766632468d00500cfb57273d7746828 SHA256 46a3f3a0eb132b8835de10b4e11c5146d31bbd45ec8c2c7a9728ed87ba97bb1f
-EBUILD opencryptoki-2.3.3-r2.ebuild 3252 RMD160 ca489af6c8386a0ff0ef29a6b5320be44ba6db1f SHA1 c8fb6a121297695f9b0ed11ba3d61faee8ab513e SHA256 63232f2ec0b624962b5dfea02f39ce8185974f37f1ca543d5be00a3aa9d3ca66
-MISC ChangeLog 3699 RMD160 d96ac370eea70f5e516ccb922ff527180ea15406 SHA1 5c39d8cdcd843474da7b963b7f7c0a0f21f0d5f3 SHA256 6925883cf87b164655cbab862cde7bbb4df398b7f3cbc26e8a58d61b01e3a21d
+EBUILD opencryptoki-2.3.3-r2.ebuild 3252 RMD160 82f15e7c0e99ee829c472a15d364eaeab2215520 SHA1 3e5ba6ba28e1df9324ff7b9402c7d8a4aa14035c SHA256 1aae6f6f777d0f7ba584d1b6045880a80645256f0579eeeb129f2226d98f4ee2
+MISC ChangeLog 3815 RMD160 3fc87296c44a2a4d7ae36aed4a6a8f25e35488e4 SHA1 533601f8d2a4d6201921bbde71efe439b31894e1 SHA256 b6104fbd9053f511383f0ff28b68070ab01d111a84ff31f27f448e2bffd59150
MISC metadata.xml 303 RMD160 c584fb11ce80c614b24f441dee3dc359c032c585 SHA1 72be61c516f86101ea2c6fec4d831a36c9371435 SHA256 6f37596c4a13d63dcbfe0b13494aacf994e803dbdf3190d1545f9fd8b355cead
-----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.16 (GNU/Linux)
+Version: GnuPG v2.0.17 (GNU/Linux)
-iEYEARECAAYFAk0w70sACgkQAiZjviIA2XgNJQCfblmESHlG1lZu1vc5HLZZhmQp
-kDAAn29GB3ighwoGxNJoM3NMMy9U+oey
-=WawU
+iEYEARECAAYFAk03kyYACgkQAiZjviIA2XjNJACfZWU8IqzBQL83dffGz09gi4vF
+ReIAnjdoPUDX94xsJIDx0nc+v1VRjDWn
+=5z1M
-----END PGP SIGNATURE-----
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