Revision bump, thanks to Alon Bar-Lev in bug #351634: re-enable openct backend as an alternative to pcsc-lite (which otherwise would require some KEYWORDS to be dropped); use EAPI=4 and REQUIRED_USE to specify that exactly one between pcsc-lite and openct can be enabled; enable pcsc-lite by default; (these last two also fix bug #363119 by William Keaney); depend on libxslt and docbook stylesheets as it's required to produce the man pages; general cleanups.

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

3 files changed, 40 insertions, 18 deletions

diff --git a/dev-libs/opensc/ChangeLog b/dev-libs/opensc/ChangeLog
index 21791318e1b0..d0f51ffadeb9 100644
--- a/dev-libs/opensc/ChangeLog
+++ b/dev-libs/opensc/ChangeLog
@@ -1,6 +1,18 @@
 # 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.110 2011/03/14 00:33:33 kingtaco Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/opensc/ChangeLog,v 1.111 2011/04/12 07:13:18 flameeyes Exp $
+
+*opensc-0.12.0-r1 (12 Apr 2011)
+
+  12 Apr 2011; Diego E. Pettenò <flameeyes@gentoo.org> -opensc-0.12.0.ebuild,
+  +opensc-0.12.0-r1.ebuild:
+  Revision bump, thanks to Alon Bar-Lev in bug #351634: re-enable openct
+  backend as an alternative to pcsc-lite (which otherwise would require some
+  KEYWORDS to be dropped); use EAPI=4 and REQUIRED_USE to specify that exactly
+  one between pcsc-lite and openct can be enabled; enable pcsc-lite by default;
+  (these last two also fix bug #363119 by William Keaney); depend on libxslt
+  and docbook stylesheets as it's required to produce the man pages; general
+  cleanups.
 
 *opensc-0.12.0 (14 Mar 2011)
 
diff --git a/dev-libs/opensc/Manifest b/dev-libs/opensc/Manifest
index d3c3c9529918..af764f245123 100644
--- a/dev-libs/opensc/Manifest
+++ b/dev-libs/opensc/Manifest
@@ -1,9 +1,19 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX opensc-0.11.13+pcsc-lite-1.6.2.patch 2581 RMD160 ecff368edb374c1f5965b34f0e342fc5ac7e1e45 SHA1 969d4e9312b9056288d4699c4275a9d118d50443 SHA256 de08b3a968068ed600aa172891be59f0bb0b8a432bc6eea8fcc99a405ee309f5
 AUX opensc-0.11.13-overflows.patch 2463 RMD160 d5879f4f5acde30828904c78df5f8973d071d49b SHA1 701383d7df0ccf4e154361a43f23c552eee1b498 SHA256 fd2071a803ed34ec961ab7a4dcddedaf00180e2fc54a1b53f9af945f2960c921
 DIST opensc-0.11.13.tar.gz 1513327 RMD160 cd900866e51cd64fa7c5a3287cd58193dec26528 SHA1 408b374286004c3df15ec17856f69fd4c2a1aceb SHA256 a9a42d6d51fb500f34248fcd0d4083c99d25bc5e74df60fe4efa19b5b4e6d890
 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.ebuild 1206 RMD160 ff083b197707ae8bcbd14c4cb9132ffc2d2f6206 SHA1 b4c79cd4866cbb52efe67a211226d880629b6990 SHA256 b72db2235e7144ea88cf5095af5162cc91283e23941a6a45325d16e04a5a5785
-MISC ChangeLog 15326 RMD160 ac467211891dd0581dbff80c58f161adbfacf65f SHA1 a13ef0221aa5e3e02da9fb29f42ccc1780c1f977 SHA256 141677331496a1650022b3fcc2db80d80ee086eccaba0f1b4b1ae5cd9d43036d
+EBUILD opensc-0.12.0-r1.ebuild 1281 RMD160 a8b3c30dc1633635dc19f24f8349cb50bc38ff7e SHA1 f53e39fcd5824b3615a2812ab4668b380028f135 SHA256 f744dc1cf495700b37d46e44bbb63d7542820e579b05f3eeaf283df4ef1ef6ce
+MISC ChangeLog 15943 RMD160 979e9cd6c544a501c5cde7022433ec083926fba5 SHA1 6fb294c5a353fd057a2e0dc1c92089e9f69513ea SHA256 08688f7c8c8bc32bf68ac42f41ba96eceac2ce67b36930a2e91629596f39fcbe
 MISC metadata.xml 829 RMD160 1a574a0817d81d05bc4f59f937d0d61b9545e59e SHA1 081a453e313ceca31c4eaa3dbea1c69090b340fd SHA256 cde88ffbae200b6e98bbd2d0519c2bc7d0c2745ac0f59931e53db815ccd222dc
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.17 (GNU/Linux)
+
+iEYEARECAAYFAk2j+4UACgkQAiZjviIA2XjwfACglL7CN9sYP3FBsrOMFw89ZuDl
+DdAAoJ3Tqzvu3N8XHnYkavLIEDzrGhVW
+=Bnua
+-----END PGP SIGNATURE-----
diff --git a/dev-libs/opensc/opensc-0.12.0.ebuild b/dev-libs/opensc/opensc-0.12.0-r1.ebuild
index 9737ead9ca0b..9894e69d59d3 100644
--- a/dev-libs/opensc/opensc-0.12.0.ebuild
+++ b/dev-libs/opensc/opensc-0.12.0-r1.ebuild
@@ -1,12 +1,10 @@
 # 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.ebuild,v 1.1 2011/03/14 00:33:33 kingtaco Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/opensc/opensc-0.12.0-r1.ebuild,v 1.1 2011/04/12 07:13:18 flameeyes Exp $
 
-EAPI="2"
+EAPI="4"
 
-inherit eutils autotools
-
-DESCRIPTION="SmartCard library and applications"
+DESCRIPTION="Libraries and applications to access smartcards."
 HOMEPAGE="http://www.opensc-project.org/opensc/"
 
 SRC_URI="http://www.opensc-project.org/files/${PN}/${P}.tar.gz"
@@ -14,34 +12,36 @@ KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-IUSE="doc pcsc-lite readline ssl zlib"
+IUSE="doc +pcsc-lite openct readline ssl zlib"
 
 # libtool is required at runtime for libltdl
-RDEPEND="
-	sys-devel/libtool
+RDEPEND="sys-devel/libtool
 	zlib? ( sys-libs/zlib )
 	readline? ( sys-libs/readline )
 	ssl? ( dev-libs/openssl )
+	openct? ( >=dev-libs/openct-0.5.0 )
 	pcsc-lite? ( >=sys-apps/pcsc-lite-1.3.0 )"
 DEPEND="${RDEPEND}
-	dev-util/pkgconfig"
+	dev-util/pkgconfig
+	app-text/docbook-xsl-stylesheets
+	dev-libs/libxslt"
 
-src_prepare() {
-	eautoreconf
-}
+REQUIRED_USE="^^ ( pcsc-lite openct )"
 
 src_configure() {
 	econf \
 		--docdir="/usr/share/doc/${PF}" \
 		--htmldir="/usr/share/doc/${PF}/html" \
 		$(use_enable doc) \
+		$(use_enable openct) \
 		$(use_enable pcsc-lite pcsc) \
 		$(use_enable readline) \
 		$(use_enable ssl openssl) \
-		$(use_enable zlib) \
-		--with-pinentry="/usr/bin/pinentry"
+		$(use_enable zlib)
 }
 
 src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed"
+	emake DESTDIR="${D}" install || die
+
+	dodoc ChangeLog
 }