Fix build with recent pcsc-lite (backport from upstream); closes bug #341371; add dependency over libtool (needed for ltdl), and over readline (it was automagic before). In r1 instead add USE flag for readline, OpenSSL and zlib, and rebuild autotools with modern versions to fix bug #317295.

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

5 files changed, 156 insertions, 4 deletions

diff --git a/dev-libs/opensc/ChangeLog b/dev-libs/opensc/ChangeLog
index d6d34aec652a..02036cd82d41 100644
--- a/dev-libs/opensc/ChangeLog
+++ b/dev-libs/opensc/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for dev-libs/opensc
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/opensc/ChangeLog,v 1.101 2010/10/17 18:02:28 arfrever Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/opensc/ChangeLog,v 1.102 2010/11/29 13:43:03 flameeyes Exp $
+
+*opensc-0.11.13-r1 (29 Nov 2010)
+
+  29 Nov 2010; Diego E. Pettenò <flameeyes@gentoo.org> opensc-0.11.13.ebuild,
+  +opensc-0.11.13-r1.ebuild, +files/opensc-0.11.13+pcsc-lite-1.6.2.patch:
+  Fix build with recent pcsc-lite (backport from upstream); closes bug #341371;
+  add dependency over libtool (needed for ltdl), and over readline (it was
+  automagic before). In r1 instead add USE flag for readline, OpenSSL and zlib,
+  and rebuild autotools with modern versions to fix bug #317295.
 
   17 Oct 2010; Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org>
   opensc-0.11.13.ebuild:
diff --git a/dev-libs/opensc/Manifest b/dev-libs/opensc/Manifest
index 3e26f82db09b..80dd2f1e52b5 100644
--- a/dev-libs/opensc/Manifest
+++ b/dev-libs/opensc/Manifest
@@ -1,4 +1,16 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+AUX opensc-0.11.13+pcsc-lite-1.6.2.patch 2581 RMD160 ecff368edb374c1f5965b34f0e342fc5ac7e1e45 SHA1 969d4e9312b9056288d4699c4275a9d118d50443 SHA256 de08b3a968068ed600aa172891be59f0bb0b8a432bc6eea8fcc99a405ee309f5
 DIST opensc-0.11.13.tar.gz 1513327 RMD160 cd900866e51cd64fa7c5a3287cd58193dec26528 SHA1 408b374286004c3df15ec17856f69fd4c2a1aceb SHA256 a9a42d6d51fb500f34248fcd0d4083c99d25bc5e74df60fe4efa19b5b4e6d890
-EBUILD opensc-0.11.13.ebuild 1120 RMD160 c48dc3a44d113c3f82d0b1d15118b55ae056c55c SHA1 c02bd45c2eda145f277a9afc4fe87c576385aec1 SHA256 94e24598d73dbaf3f339a996592d99584e6689f2f6ce76551e21e20031151e12
-MISC ChangeLog 13741 RMD160 d392111e33ecda06e915e5b4b7175689443b8e6f SHA1 3107378851d25f72856872535e0e33770f410bf6 SHA256 a46999491432499c8f04842daf0e85359231f29b517370a42783f890998091ed
+EBUILD opensc-0.11.13-r1.ebuild 1460 RMD160 d958f723fc37e1b444b98e238c17287345e527be SHA1 0d4df7abb33160ad1398377c9ab5486a7191970f SHA256 66a8d9c79f83ce851e5995872f34c16c5e286a32e8ce2fd6d840f7945339da7e
+EBUILD opensc-0.11.13.ebuild 1288 RMD160 e5266eda5f28fdbf5e089819b535e95a963de651 SHA1 88c390b973d87168b2c225ec06202f66ff56b057 SHA256 feda7102d4b9446ee2de8bd20e8d588ec078d07863fbb3080c4fe5bce9f7172e
+MISC ChangeLog 14230 RMD160 7dea7d733cca6e9997bde756008524a1d0a49fc6 SHA1 bf252d55e9c99af47e28fa18fcd1274745f2f93b SHA256 001a9a4c366109d19924e25588c06b8393fd3e70e2a5eb13cc1651cc7039e311
 MISC metadata.xml 829 RMD160 1a574a0817d81d05bc4f59f937d0d61b9545e59e SHA1 081a453e313ceca31c4eaa3dbea1c69090b340fd SHA256 cde88ffbae200b6e98bbd2d0519c2bc7d0c2745ac0f59931e53db815ccd222dc
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.16 (GNU/Linux)
+
+iEYEARECAAYFAkzzraAACgkQAiZjviIA2XjB7gCgyQRZniKNa4eCfFqeXp0wfYPR
+3zMAn1Vqr0LYbea2d6AMG6wuqZI6aqXJ
+=Yv61
+-----END PGP SIGNATURE-----
diff --git a/dev-libs/opensc/files/opensc-0.11.13+pcsc-lite-1.6.2.patch b/dev-libs/opensc/files/opensc-0.11.13+pcsc-lite-1.6.2.patch
new file mode 100644
index 000000000000..1cac75e8a15d
--- /dev/null
+++ b/dev-libs/opensc/files/opensc-0.11.13+pcsc-lite-1.6.2.patch
@@ -0,0 +1,64 @@
+Index: opensc-0.11.13/src/libopensc/internal-winscard.h
+===================================================================
+--- opensc-0.11.13.orig/src/libopensc/internal-winscard.h
++++ opensc-0.11.13/src/libopensc/internal-winscard.h
+@@ -77,7 +77,7 @@ typedef struct
+ 	unsigned long cbAtr;
+ 	unsigned char rgbAtr[MAX_ATR_SIZE];
+ }
+-SCARD_READERSTATE_A;
++SCARD_READERSTATE;
+ 
+ typedef struct _SCARD_IO_REQUEST
+ {
+@@ -87,8 +87,8 @@ typedef struct _SCARD_IO_REQUEST
+ SCARD_IO_REQUEST, *PSCARD_IO_REQUEST, *LPSCARD_IO_REQUEST;
+ 
+ typedef const SCARD_IO_REQUEST *LPCSCARD_IO_REQUEST;
+-typedef SCARD_READERSTATE_A SCARD_READERSTATE, *PSCARD_READERSTATE_A,
+-	*LPSCARD_READERSTATE_A;
++typedef SCARD_READERSTATE SCARD_READERSTATE, *PSCARD_READERSTATE,
++	*SCARD_READERSTATE;
+ 
+ #endif	/* HAVE_SCARD_H */
+ 
+@@ -113,7 +113,7 @@ typedef LONG (PCSC_API *SCardEndTransact
+ typedef LONG (PCSC_API *SCardStatus_t)(SCARDHANDLE hCard, LPSTR mszReaderNames, LPDWORD pcchReaderLen,
+ 	LPDWORD pdwState, LPDWORD pdwProtocol, LPBYTE pbAtr, LPDWORD pcbAtrLen);
+ typedef LONG (PCSC_API *SCardGetStatusChange_t)(SCARDCONTEXT hContext, DWORD dwTimeout,
+-	LPSCARD_READERSTATE_A rgReaderStates, DWORD cReaders);
++	SCARD_READERSTATE *rgReaderStates, DWORD cReaders);
+ typedef LONG (PCSC_API *SCardControlOLD_t)(SCARDHANDLE hCard, LPCVOID pbSendBuffer, DWORD cbSendLength,
+ 	LPVOID pbRecvBuffer, LPDWORD lpBytesReturned);
+ typedef LONG (PCSC_API *SCardControl_t)(SCARDHANDLE hCard, DWORD dwControlCode, LPCVOID pbSendBuffer,
+Index: opensc-0.11.13/src/libopensc/reader-pcsc.c
+===================================================================
+--- opensc-0.11.13.orig/src/libopensc/reader-pcsc.c
++++ opensc-0.11.13/src/libopensc/reader-pcsc.c
+@@ -80,7 +80,7 @@ struct pcsc_private_data {
+ 
+ struct pcsc_slot_data {
+ 	SCARDHANDLE pcsc_card;
+-	SCARD_READERSTATE_A reader_state;
++	SCARD_READERSTATE reader_state;
+ 	DWORD verify_ioctl;
+ 	DWORD verify_ioctl_start;
+ 	DWORD verify_ioctl_finish;
+@@ -353,7 +353,7 @@ static int pcsc_wait_for_event(sc_reader
+ 	sc_context_t *ctx;
+ 	SCARDCONTEXT pcsc_ctx;
+ 	LONG ret;
+-	SCARD_READERSTATE_A rgReaderStates[SC_MAX_READERS];
++	SCARD_READERSTATE rgReaderStates[SC_MAX_READERS];
+ 	unsigned long on_bits, off_bits;
+ 	time_t end_time, now, delta;
+ 	size_t i;
+@@ -401,7 +401,7 @@ static int pcsc_wait_for_event(sc_reader
+ 	/* Wait for a status change and return if it's a card insert/removal
+ 	 */
+ 	for( ; ; ) {
+-		SCARD_READERSTATE_A *rsp;
++		SCARD_READERSTATE *rsp;
+ 
+ 		/* Scan the current state of all readers to see if they
+ 		 * match any of the events we're polling for */
diff --git a/dev-libs/opensc/opensc-0.11.13-r1.ebuild b/dev-libs/opensc/opensc-0.11.13-r1.ebuild
new file mode 100644
index 000000000000..e342c041576a
--- /dev/null
+++ b/dev-libs/opensc/opensc-0.11.13-r1.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/opensc/opensc-0.11.13-r1.ebuild,v 1.1 2010/11/29 13:43:03 flameeyes Exp $
+
+EAPI="2"
+
+inherit eutils autotools
+
+DESCRIPTION="SmartCard library and applications"
+HOMEPAGE="http://www.opensc-project.org/opensc/"
+
+SRC_URI="http://www.opensc-project.org/files/${PN}/${P}.tar.gz"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+IUSE="doc openct pcsc-lite readline ssl zlib"
+
+# libtool is required at runtime for libltdl
+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"
+
+pkg_setup() {
+	if use openct; then
+		elog "Support for openct is deprecated."
+		elog "It is recommended to use pcsc-lite."
+	fi
+}
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}+pcsc-lite-1.6.2.patch
+
+	eautoreconf
+}
+
+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"
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die "emake install failed"
+}
diff --git a/dev-libs/opensc/opensc-0.11.13.ebuild b/dev-libs/opensc/opensc-0.11.13.ebuild
index 3d6a19d4701c..55443686d04a 100644
--- a/dev-libs/opensc/opensc-0.11.13.ebuild
+++ b/dev-libs/opensc/opensc-0.11.13.ebuild
@@ -1,9 +1,11 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/opensc/opensc-0.11.13.ebuild,v 1.7 2010/10/17 18:02:28 arfrever Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/opensc/opensc-0.11.13.ebuild,v 1.8 2010/11/29 13:43:03 flameeyes Exp $
 
 EAPI="2"
 
+inherit eutils
+
 DESCRIPTION="SmartCard library and applications"
 HOMEPAGE="http://www.opensc-project.org/opensc/"
 
@@ -14,8 +16,11 @@ LICENSE="LGPL-2.1"
 SLOT="0"
 IUSE="doc openct pcsc-lite"
 
+# libtool is required at runtime for libltdl
 RDEPEND="dev-libs/openssl
 	sys-libs/zlib
+	sys-devel/libtool
+	sys-libs/readline
 	openct? ( >=dev-libs/openct-0.5.0 )
 	pcsc-lite? ( >=sys-apps/pcsc-lite-1.3.0 )"
 DEPEND="${RDEPEND}
@@ -28,6 +33,10 @@ pkg_setup() {
 	fi
 }
 
+src_prepare() {
+	epatch "${FILESDIR}"/${P}+pcsc-lite-1.6.2.patch
+}
+
 src_configure() {
 	econf \
 		--docdir="/usr/share/doc/${PF}" \