Revision bump: when both pcsc-lite and openct are disabled, build the dynamic CT-API interface only rather than error out. This is useful if you only care about the PKCS#11 utilities, rather than actual Smartcard access.

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

4 files changed, 58 insertions, 27 deletions

diff --git a/dev-libs/opensc/ChangeLog b/dev-libs/opensc/ChangeLog
index 2d3575b59b39..cca37ee8352c 100644
--- a/dev-libs/opensc/ChangeLog
+++ b/dev-libs/opensc/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for dev-libs/opensc
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/opensc/ChangeLog,v 1.112 2011/04/12 20:07:44 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/opensc/ChangeLog,v 1.113 2011/04/18 18:49:57 flameeyes Exp $
+
+*opensc-0.12.0-r2 (18 Apr 2011)
+
+  18 Apr 2011; Diego E. Pettenò <flameeyes@gentoo.org>
+  -opensc-0.12.0-r1.ebuild, +opensc-0.12.0-r2.ebuild, metadata.xml:
+  Revision bump: when both pcsc-lite and openct are disabled, build the dynamic
+  CT-API interface only rather than error out. This is useful if you only care
+  about the PKCS#11 utilities, rather than actual Smartcard access.
 
   12 Apr 2011; Diego E. Pettenò <flameeyes@gentoo.org>
   opensc-0.12.0-r1.ebuild:
diff --git a/dev-libs/opensc/Manifest b/dev-libs/opensc/Manifest
index 051c69c8f7c0..8782a0265b95 100644
--- a/dev-libs/opensc/Manifest
+++ b/dev-libs/opensc/Manifest
@@ -7,13 +7,13 @@ DIST opensc-0.11.13.tar.gz 1513327 RMD160 cd900866e51cd64fa7c5a3287cd58193dec265
 DIST opensc-0.12.0.tar.gz 1409151 RMD160 ff377d21daaf2777b8518ed166237f831692f36d SHA1 1400da0732a4cbf9ff7f8296bf59c6e153207247 SHA256 84f8a8e1825e487d321390f0650c590334c76f81291d2eb5a315ad73459d2f6f
 EBUILD opensc-0.11.13-r2.ebuild 1489 RMD160 7c6e0575e7fc039e46f2e6ebe26cdfbd1cc5829c SHA1 5976153f2bfebaf86a9f005b4b476e157b613574 SHA256 1653ee4eabb0e6e628a7b837dbeed8bb2e66b1c08b5016ec7f89ca8aa8ebd932
 EBUILD opensc-0.11.13.ebuild 1288 RMD160 e5266eda5f28fdbf5e089819b535e95a963de651 SHA1 88c390b973d87168b2c225ec06202f66ff56b057 SHA256 feda7102d4b9446ee2de8bd20e8d588ec078d07863fbb3080c4fe5bce9f7172e
-EBUILD opensc-0.12.0-r1.ebuild 1336 RMD160 41a1351a5204f30063f54e29e36233d1dc9343cb SHA1 ef99bd0db6763e4a3b41ddc07511f3747de3c607 SHA256 87402395703b2054b1d1bdf5a274ce00be824ec13d56924f744e54c1f17d7517
-MISC ChangeLog 16175 RMD160 ad916e9987f3cc7bd290637f0046bb8192797499 SHA1 21b7488d5996f6245dbc8658297d59cfe88ec349 SHA256 8047b9b182c55e9d8bf979f46ca32af01a94ae89af6963daad41ab9670b27be6
-MISC metadata.xml 829 RMD160 1a574a0817d81d05bc4f59f937d0d61b9545e59e SHA1 081a453e313ceca31c4eaa3dbea1c69090b340fd SHA256 cde88ffbae200b6e98bbd2d0519c2bc7d0c2745ac0f59931e53db815ccd222dc
+EBUILD opensc-0.12.0-r2.ebuild 1561 RMD160 22b4d6c65f2804f29bfd8ddafc3ad0be1e986afa SHA1 2263be0284a7eeccf3e5f99210c81dfc382730b0 SHA256 dbd8f5e864dcc447ab5b7d873cd1d816468576fa98c24bd89816f41de7960e69
+MISC ChangeLog 16560 RMD160 dbb25f17db2095a16fa647f4c5646c5e39e6ad86 SHA1 be9db8a94b98aa09c19c3f076af3a29711f81559 SHA256 039fdd9e7cac1a1200e33ab377a1ab86fc0344fb6b65a129573b9fb370887942
+MISC metadata.xml 1161 RMD160 a4ab8cb7e93834292b97390869bff0d1b43b6a1b SHA1 d3b39e7342bdae1b0411566db527680411212109 SHA256 d0a32ae880a24b767b8bd284c3545f39e8af70adbcbd6ce87685c6d21de5fcc8
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEARECAAYFAk2ksQcACgkQAiZjviIA2XgkhgCdFgzr6d4VGDKZ/QeTpC+WW+f1
-tTwAn0ziZRYHtDzkWpSN4/7KG+A1w9bu
-=wDMl
+iEYEARECAAYFAk2sh7sACgkQAiZjviIA2XgIAQCgyHJkT2XDy9kUqRWS2xh8kJtu
+K2AAoM0y/Uwktqzqv+r8/TzKX8sC8QQV
+=4Taz
 -----END PGP SIGNATURE-----
diff --git a/dev-libs/opensc/metadata.xml b/dev-libs/opensc/metadata.xml
index 02167552fc28..195b2cb7eeda 100644
--- a/dev-libs/opensc/metadata.xml
+++ b/dev-libs/opensc/metadata.xml
@@ -1,21 +1,32 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>crypto</herd>
-<maintainer>
-  <email>crypto@gentoo.org</email>
+  <herd>crypto</herd>
+  <maintainer>
+    <email>crypto@gentoo.org</email>
     <name>Crypto Herd</name>
-</maintainer>
-<longdescription>
-OpenSC is a library for accessing SmartCard devices. It is also the core library of the OpenSC 
-project. 
+  </maintainer>
+  <longdescription>
+    OpenSC is a library for accessing SmartCard devices. It is also
+    the core library of the OpenSC project.
 
-Basic functionality (e.g. SELECT FILE, READ BINARY) should work on any ISO 7816-4 compatible SmartCard. 
-Encryption and decryption using private keys on the SmartCard is possible with PKCS #15 compatible 
-cards, such as the FINEID (Finnish Electronic IDentity) card.
-</longdescription>
-<use>
-  <flag name='openct'>Build using <pkg>dev-libs/openct</pkg> compatibility</flag>
-  <flag name='pcsc-lite'>Build with <pkg>sys-apps/pcsc-lite</pkg></flag>
-</use>
+    Basic functionality (e.g. SELECT FILE, READ BINARY) should work on
+    any ISO 7816-4 compatible SmartCard.  Encryption and decryption
+    using private keys on the SmartCard is possible with PKCS #15
+    compatible cards, such as the FINEID (Finnish Electronic IDentity)
+    card.
+  </longdescription>
+  <use>
+    <flag name='openct'>
+      Use <pkg>dev-libs/openct</pkg> (and CT-API) for accessing
+      Smartcard hardware. If neither openct nor pcsc-lite are enabled,
+      only CT-API dynamic linking is enabled.
+    </flag>
+
+    <flag name='pcsc-lite'>
+      Use <pkg>sys-apps/pcsc-lite</pkg> (and PC/SC API) for accessing
+      Smartcard hardware. If neither openct nor pcsc-lite are enabled,
+      only CT-API dynamic linking is enabled.
+    </flag>
+  </use>
 </pkgmetadata>
diff --git a/dev-libs/opensc/opensc-0.12.0-r1.ebuild b/dev-libs/opensc/opensc-0.12.0-r2.ebuild
index 7989b35c6f15..a8bcd70be6b3 100644
--- a/dev-libs/opensc/opensc-0.12.0-r1.ebuild
+++ b/dev-libs/opensc/opensc-0.12.0-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/opensc/opensc-0.12.0-r1.ebuild,v 1.2 2011/04/12 20:07:44 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/opensc/opensc-0.12.0-r2.ebuild,v 1.1 2011/04/18 18:49:57 flameeyes Exp $
 
 EAPI="4"
 
@@ -26,19 +26,31 @@ DEPEND="${RDEPEND}
 	app-text/docbook-xsl-stylesheets
 	dev-libs/libxslt"
 
-REQUIRED_USE="^^ ( pcsc-lite openct )"
+REQUIRED_USE="
+	pcsc-lite? ( !openct )
+	openct? ( !pcsc-lite )"
 
 src_configure() {
+	# disable everything, enable selectively
+	local myconf="--disable-pcsc --disable-openct --disable-ctapi"
+
+	if use pcsc-lite; then
+		myconf+=" --enable-pcsc"
+	elif use openct; then
+		myconf+=" --enable-openct"
+	else
+		myconf+=" --enable-ctapi"
+	fi
+
 	econf \
 		--docdir="/usr/share/doc/${PF}" \
 		--htmldir="/usr/share/doc/${PF}/html" \
 		--disable-static \
 		$(use_enable doc) \
 		$(use_enable openct) \
-		$(use_enable pcsc-lite pcsc) \
 		$(use_enable readline) \
-		$(use_enable ssl openssl) \
-		$(use_enable zlib)
+		$(use_enable zlib) \
+		${myconf}
 }
 
 src_install() {