Missed one patch from the Chromium project; also solve implicit declarations, and restrict tests with an explanation on why.

Package-Manager: portage-2.2.0_alpha15/cvs/Linux x86_64

3 files changed, 22 insertions, 10 deletions

diff --git a/dev-libs/opencryptoki/ChangeLog b/dev-libs/opencryptoki/ChangeLog
index 309712489c49..985ff377da03 100644
--- a/dev-libs/opencryptoki/ChangeLog
+++ b/dev-libs/opencryptoki/ChangeLog
@@ -1,6 +1,13 @@
 # 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.11 2011/01/13 23:39:07 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/opencryptoki/ChangeLog,v 1.12 2011/01/14 00:19:45 flameeyes Exp $
+
+*opencryptoki-2.3.3-r1 (14 Jan 2011)
+
+  14 Jan 2011; Diego E. Pettenò <flameeyes@gentoo.org>
+  -opencryptoki-2.3.3.ebuild, +opencryptoki-2.3.3-r1.ebuild:
+  Missed one patch from the Chromium project; also solve implicit declarations,
+  and restrict tests with an explanation on why.
 
 *opencryptoki-2.3.3 (13 Jan 2011)
 
diff --git a/dev-libs/opencryptoki/Manifest b/dev-libs/opencryptoki/Manifest
index 09e911cc4413..e6ab6492e530 100644
--- a/dev-libs/opencryptoki/Manifest
+++ b/dev-libs/opencryptoki/Manifest
@@ -4,16 +4,16 @@ Hash: SHA1
 AUX pkcsslotd.init.2 663 RMD160 f572831162024c441589986ce36021fc48aca7ff SHA1 d82db8e526ddc2307200e1767aa2e55184d068c1 SHA256 80c2e13cb0e9255fa3fc13977c4d1c73a10be4740a50959b8d487d328a1e1192
 DIST opencryptoki-2.3.2-backports-1.tar.bz2 5911 RMD160 2d802eddbc79dfd7d96252da42c31ce0b043fbb9 SHA1 6c6888ae31cd45fb533ebf8fe95584f9c382c57b SHA256 dba0be89b326afedb6b53d20f4410487cc050f285d0b1a3c11f20e2c45acb01e
 DIST opencryptoki-2.3.2.tar.bz2 665134 RMD160 2945879a367b787432189abd74262e60a3b237bb SHA1 c264f0158d516287846000cd1e90830b18ac4e1d SHA256 44fdf74a9eab2586240a69779c5c323e8378e8f2fde21cd4f8bd9186a24c30f7
-DIST opencryptoki-2.3.3-backports-1.tar.bz2 4141 RMD160 eb412c8d8e05773598bb0d18c89249ceb734bcbe SHA1 69dc573a3383ef69b110a5b84c79cfbf837c5871 SHA256 bf0c4f5d7a16442aa1843d81a9917f28163f834b981851d0548a0b3ab33809de
+DIST opencryptoki-2.3.3-backports-2.tar.bz2 5436 RMD160 02bfa88ab13486dd3ca627ee4021326274481213 SHA1 3a9b87c544418a6e9678fda525df7984ef6543c2 SHA256 e415a899f7ea4f02247c8e8c34e6a31d7fc6256940777f87771eaea58beb1ffe
 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.ebuild 2167 RMD160 b46ca898d5f14d8902e9d6871770020d486979ea SHA1 34ec4286bee61919233a2c3864644b4d5dee2ff9 SHA256 7c4bfb0c026504a0570be939bf5adcb704b93987515da25c7af85133e430dd44
-MISC ChangeLog 2758 RMD160 e3aca06758c87208d7f687bfeb5e087c9d26fc36 SHA1 b0dce229fbe853768fb72b261a02323e6d99ff51 SHA256 d4327193a4b0240b36ff55285a4403b5b61647881006f3e868f5b5f31cbda3ad
+EBUILD opencryptoki-2.3.3-r1.ebuild 2357 RMD160 f35823be7cbe77eb3064be2c5face1da78eab158 SHA1 9c8899bbe70382ce0b5393eaaf0c70c48926510f SHA256 435764103c6dce8944d20a78ca518c9435be8d1de0a1a7fff67a753277903347
+MISC ChangeLog 3043 RMD160 abe57965d79a93d1967bab9f077f596e45a43831 SHA1 4bbd9332da692a2f531fa13b4c68e96e1f0f2c62 SHA256 e31662697c5acfbaa7abecb0e11e2324afee8b2218ed8f82f9b9cb393837d8a8
 MISC metadata.xml 303 RMD160 c584fb11ce80c614b24f441dee3dc359c032c585 SHA1 72be61c516f86101ea2c6fec4d831a36c9371435 SHA256 6f37596c4a13d63dcbfe0b13494aacf994e803dbdf3190d1545f9fd8b355cead
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.16 (GNU/Linux)
 
-iEYEARECAAYFAk0vjO0ACgkQAiZjviIA2XhPOACeM0GCrXSqkMWn5Tj4UJ/Uw6Wh
-JfAAoO/GF+F7u/c2hhbNvKgGWmM1xNaO
-=QhbV
+iEYEARECAAYFAk0vlnMACgkQAiZjviIA2Xj7OgCfZ7zNEbVmx9i7uNMsJDSn45BO
+BfQAnA5Ufu8fWHyO+ED0MXu7tha4b3MO
+=MXb4
 -----END PGP SIGNATURE-----
diff --git a/dev-libs/opencryptoki/opencryptoki-2.3.3.ebuild b/dev-libs/opencryptoki/opencryptoki-2.3.3-r1.ebuild
index 261b4138b5f8..f062edfee60d 100644
--- a/dev-libs/opencryptoki/opencryptoki-2.3.3.ebuild
+++ b/dev-libs/opencryptoki/opencryptoki-2.3.3-r1.ebuild
@@ -1,16 +1,16 @@
 # 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.ebuild,v 1.1 2011/01/13 23:39:07 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/opencryptoki/opencryptoki-2.3.3-r1.ebuild,v 1.1 2011/01/14 00:19:45 flameeyes Exp $
 
 EAPI="2"
 
 # backports are maintained as tags on Diego's repository on gitorious:
 # http://gitorious.org/~flameeyes/opencryptoki/flameeyess-opencryptoki
-BACKPORTS=1
+BACKPORTS=2
 
 inherit autotools eutils multilib
 
-DESCRIPTION="PKCS#11 provider for IBM cryptographic hardware"
+DESCRIPTION="PKCS#11 provider cryptographic hardware"
 HOMEPAGE="http://sourceforge.net/projects/opencryptoki"
 SRC_URI="mirror://sourceforge/opencryptoki/${P}.tar.bz2
 	${BACKPORTS:+
@@ -26,6 +26,11 @@ DEPEND="${RDEPEND}"
 
 IUSE="+tpm debug"
 
+# tests right now basically don't exist; the only available thing would
+# test against an installed copy and would kill a running pcscd, all
+# things that we're not interested to.
+RESTRICT=test
+
 pkg_setup() {
 	enewgroup pkcs11
 }