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).

(Portage version: 2.2.0_alpha15/cvs/Linux x86_64)

2 files changed, 26 insertions, 3 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/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
 }