Revision bump: avoid /var/lib/lib directory prefix (thanks to frank Swiderski for reportign); disable CCA token so that the whole package is under CPL-0.5 (and also it seems to be limited to s390 hardware).

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

3 files changed, 31 insertions, 8 deletions

diff --git a/dev-libs/opencryptoki/ChangeLog b/dev-libs/opencryptoki/ChangeLog
index 985ff377da03..d1668d335f8c 100644
--- a/dev-libs/opencryptoki/ChangeLog
+++ b/dev-libs/opencryptoki/ChangeLog
@@ -1,6 +1,14 @@
 # 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.12 2011/01/14 00:19:45 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/opencryptoki/ChangeLog,v 1.13 2011/01/15 00:15:16 flameeyes Exp $
+
+*opencryptoki-2.3.3-r2 (15 Jan 2011)
+
+  15 Jan 2011; Diego E. Pettenò <flameeyes@gentoo.org>
+  -opencryptoki-2.3.3-r1.ebuild, +opencryptoki-2.3.3-r2.ebuild:
+  Revision bump: avoid /var/lib/lib directory prefix (thanks to frank Swiderski
+  for reportign); disable CCA token so that the whole package is under CPL-0.5
+  (and also it seems to be limited to s390 hardware).
 
 *opencryptoki-2.3.3-r1 (14 Jan 2011)
 
diff --git a/dev-libs/opencryptoki/Manifest b/dev-libs/opencryptoki/Manifest
index e6ab6492e530..109338687b18 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-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-r1.ebuild 2357 RMD160 f35823be7cbe77eb3064be2c5face1da78eab158 SHA1 9c8899bbe70382ce0b5393eaaf0c70c48926510f SHA256 435764103c6dce8944d20a78ca518c9435be8d1de0a1a7fff67a753277903347
-MISC ChangeLog 3043 RMD160 abe57965d79a93d1967bab9f077f596e45a43831 SHA1 4bbd9332da692a2f531fa13b4c68e96e1f0f2c62 SHA256 e31662697c5acfbaa7abecb0e11e2324afee8b2218ed8f82f9b9cb393837d8a8
+EBUILD opencryptoki-2.3.3-r2.ebuild 3050 RMD160 3f4a07a522ca1427832e4129c451a8786962abed SHA1 ac6b7b30120d23ea51b9352eb49594fa729f076c SHA256 eb45249534e42e163a887a039e571eacda7bde730a530018ab4a54a103f7d3b3
+MISC ChangeLog 3415 RMD160 ec51d77705cfb680a2db6899281d4a716a7a6df5 SHA1 09f91949055199d5cdaa807b1b573c908bdcbc5e SHA256 37a7e51684eef6072bdc28353bba01dca187c55613b852c28e233e54d496fd3b
 MISC metadata.xml 303 RMD160 c584fb11ce80c614b24f441dee3dc359c032c585 SHA1 72be61c516f86101ea2c6fec4d831a36c9371435 SHA256 6f37596c4a13d63dcbfe0b13494aacf994e803dbdf3190d1545f9fd8b355cead
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.16 (GNU/Linux)
 
-iEYEARECAAYFAk0vlnMACgkQAiZjviIA2Xj7OgCfZ7zNEbVmx9i7uNMsJDSn45BO
-BfQAnA5Ufu8fWHyO+ED0MXu7tha4b3MO
-=MXb4
+iEYEARECAAYFAk0w5t8ACgkQAiZjviIA2XixXACg8EPF6r0pTzV1sawcwXftnJFX
+YxMAn3DY8/4t4epRRkBQ6WoKN0p3wtOH
+=yBo2
 -----END PGP SIGNATURE-----
diff --git a/dev-libs/opencryptoki/opencryptoki-2.3.3-r1.ebuild b/dev-libs/opencryptoki/opencryptoki-2.3.3-r2.ebuild
index f062edfee60d..4eaa65154e7a 100644
--- a/dev-libs/opencryptoki/opencryptoki-2.3.3-r1.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-r1.ebuild,v 1.1 2011/01/14 00:19:45 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/opencryptoki/opencryptoki-2.3.3-r2.ebuild,v 1.1 2011/01/15 00:15:16 flameeyes Exp $
 
 EAPI="2"
 
@@ -16,6 +16,8 @@ SRC_URI="mirror://sourceforge/opencryptoki/${P}.tar.bz2
 	${BACKPORTS:+
 		http://dev.gentoo.org/~flameeyes/${PN}/${P}-backports-${BACKPORTS}.tar.bz2}"
 
+# Upstream is looking into relicensing it into CPL-1.0 entirely; the CCA
+# token sources are under CPL-1.0 already.
 LICENSE="CPL-0.5"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
@@ -45,7 +47,19 @@ src_prepare() {
 }
 
 src_configure() {
+	# package uses ${localstatedir}/lib as the default path, so if we
+	# leave it to econf, it'll create /var/lib/lib.
+
+	# Since upstream by default seem to enable any possible token, even
+	# when they don't seem to be used, we limit ourselves to the
+	# software emulation token (swtok) and if the user enabled the tpm
+	# USE flag, tpmtok.  The rest of the tokens seem to be hardware- or
+	# software-dependent even when they build fine without their
+	# requirements, but until somebody asks for those, I'd rather not
+	# enable them.
+
 	econf \
+		--localstatedir=/var \
 		--enable-fast-install \
 		--disable-dependency-tracking \
 		$(use_enable debug) \
@@ -54,10 +68,11 @@ src_configure() {
 		--disable-icatok \
 		--enable-swtok \
 		$(use_enable tpm tpmtok) \
-		--disable-icctok \
 		--disable-aeptok \
 		--disable-bcomtok \
+		--disable-ccatok \
 		--disable-crtok \
+		--disable-icctok \
 		--disable-pkcscca_migrate
 }