Add a patch to fix some corner cases in build, where the just-built opensc tools used the old library.

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

4 files changed, 59 insertions, 14 deletions

diff --git a/dev-libs/opensc/ChangeLog b/dev-libs/opensc/ChangeLog
index cca37ee8352c..e2c54d82beaa 100644
--- a/dev-libs/opensc/ChangeLog
+++ b/dev-libs/opensc/ChangeLog
@@ -1,6 +1,11 @@
 # 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.113 2011/04/18 18:49:57 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/opensc/ChangeLog,v 1.114 2011/07/03 17:13:16 flameeyes Exp $
+
+  03 Jul 2011; Diego E. Pettenò <flameeyes@gentoo.org>
+  opensc-0.12.0-r2.ebuild, +files/opensc-0.12.0-crossbuild.patch:
+  Add a patch to fix some corner cases in build, where the just-built opensc
+  tools used the old library.
 
 *opensc-0.12.0-r2 (18 Apr 2011)
 
diff --git a/dev-libs/opensc/Manifest b/dev-libs/opensc/Manifest
index 8782a0265b95..054618657062 100644
--- a/dev-libs/opensc/Manifest
+++ b/dev-libs/opensc/Manifest
@@ -1,19 +1,10 @@
------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
+AUX opensc-0.12.0-crossbuild.patch 1976 RMD160 e5d4a702f3cebef3ba24fca175aac3752a83a0be SHA1 ed3e6d1e2c6e248e6eaa9e53fde50fa6c75b6b97 SHA256 daa295cbdee3b27d9e0c9d5bc86361f272f5b36613f7f07657e7de2b4b3d628f
 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-r2.ebuild 1561 RMD160 22b4d6c65f2804f29bfd8ddafc3ad0be1e986afa SHA1 2263be0284a7eeccf3e5f99210c81dfc382730b0 SHA256 dbd8f5e864dcc447ab5b7d873cd1d816468576fa98c24bd89816f41de7960e69
-MISC ChangeLog 16560 RMD160 dbb25f17db2095a16fa647f4c5646c5e39e6ad86 SHA1 be9db8a94b98aa09c19c3f076af3a29711f81559 SHA256 039fdd9e7cac1a1200e33ab377a1ab86fc0344fb6b65a129573b9fb370887942
+EBUILD opensc-0.12.0-r2.ebuild 1663 RMD160 2300666e6134e6346367ef7c2f1fba56aeeae156 SHA1 7ed57247ce30cb80e71156498497401b6e184452 SHA256 98e750199b69c59a6cadc2e55610e4ae993bb2d0621dde70497aa5260921c78c
+MISC ChangeLog 16790 RMD160 dbd830c4272cdd8c8d8f248b228d5bf341f5beec SHA1 28c65934d57038cf723b6dacd0f44bff6d5cdeac SHA256 730f0e7b9adc4e882f1e687c529455cc949c7a9aabdc39ac0360bc3271bd9121
 MISC metadata.xml 1161 RMD160 a4ab8cb7e93834292b97390869bff0d1b43b6a1b SHA1 d3b39e7342bdae1b0411566db527680411212109 SHA256 d0a32ae880a24b767b8bd284c3545f39e8af70adbcbd6ce87685c6d21de5fcc8
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
-
-iEYEARECAAYFAk2sh7sACgkQAiZjviIA2XgIAQCgyHJkT2XDy9kUqRWS2xh8kJtu
-K2AAoM0y/Uwktqzqv+r8/TzKX8sC8QQV
-=4Taz
------END PGP SIGNATURE-----
diff --git a/dev-libs/opensc/files/opensc-0.12.0-crossbuild.patch b/dev-libs/opensc/files/opensc-0.12.0-crossbuild.patch
new file mode 100644
index 000000000000..82a9bb2e7ded
--- /dev/null
+++ b/dev-libs/opensc/files/opensc-0.12.0-crossbuild.patch
@@ -0,0 +1,42 @@
+Index: opensc-0.12.0/src/pkcs11/Makefile.am
+===================================================================
+--- opensc-0.12.0.orig/src/pkcs11/Makefile.am
++++ opensc-0.12.0/src/pkcs11/Makefile.am
+@@ -15,9 +15,10 @@ OPENSC_PKCS11_SRC = pkcs11-global.c pkcs
+ 	mechanism.c openssl.c framework-pkcs15.c \
+ 	framework-pkcs15init.c debug.c opensc-pkcs11.exports \
+ 	pkcs11-display.c pkcs11-display.h
+-OPENSC_PKCS11_LIBS = $(OPTIONAL_OPENSSL_LIBS) $(PTHREAD_LIBS) \
++OPENSC_PKCS11_LIBS = \
+ 	$(top_builddir)/src/common/libcompat.la \
+-	$(top_builddir)/src/libopensc/libopensc.la
++	$(top_builddir)/src/libopensc/libopensc.la \
++	$(OPTIONAL_OPENSSL_LIBS) $(PTHREAD_LIBS)
+ 
+ libpkcs11_la_SOURCES = libpkcs11.c
+ libpkcs11_la_LIBADD = $(LTLIB_LIBS)
+@@ -35,7 +36,7 @@ onepin_opensc_pkcs11_la_LDFLAGS = $(AM_L
+ 	-module -shared -avoid-version -no-undefined
+ 
+ pkcs11_spy_la_SOURCES = pkcs11-spy.c pkcs11-display.c pkcs11-display.h pkcs11-spy.exports
+-pkcs11_spy_la_LIBADD = $(OPTIONAL_OPENSSL_LIBS) $(LTLIB_LIBS) libpkcs11.la
++pkcs11_spy_la_LIBADD = libpkcs11.la $(OPTIONAL_OPENSSL_LIBS) $(LTLIB_LIBS)
+ pkcs11_spy_la_LDFLAGS = $(AM_LDFLAGS) \
+ 	-export-symbols "$(srcdir)/pkcs11-spy.exports" \
+ 	-module -shared -avoid-version -no-undefined
+Index: opensc-0.12.0/src/tools/Makefile.am
+===================================================================
+--- opensc-0.12.0.orig/src/tools/Makefile.am
++++ opensc-0.12.0/src/tools/Makefile.am
+@@ -24,8 +24,9 @@ opensc_explorer_LDADD = $(OPTIONAL_READL
+ pkcs15_tool_SOURCES = pkcs15-tool.c util.c
+ pkcs15_tool_LDADD = $(OPTIONAL_OPENSSL_LIBS)
+ pkcs11_tool_SOURCES = pkcs11-tool.c util.c
+-pkcs11_tool_LDADD = $(OPTIONAL_OPENSSL_LIBS) $(LTLIB_LIBS) \
+-	$(top_builddir)/src/pkcs11/libpkcs11.la
++pkcs11_tool_LDADD = \
++	$(top_builddir)/src/pkcs11/libpkcs11.la \
++	$(OPTIONAL_OPENSSL_LIBS) $(LTLIB_LIBS)
+ pkcs15_crypt_SOURCES = pkcs15-crypt.c util.c
+ pkcs15_crypt_LDADD = $(OPTIONAL_OPENSSL_LIBS)
+ cryptoflex_tool_SOURCES = cryptoflex-tool.c util.c
diff --git a/dev-libs/opensc/opensc-0.12.0-r2.ebuild b/dev-libs/opensc/opensc-0.12.0-r2.ebuild
index a8bcd70be6b3..0b3e773fef0f 100644
--- a/dev-libs/opensc/opensc-0.12.0-r2.ebuild
+++ b/dev-libs/opensc/opensc-0.12.0-r2.ebuild
@@ -1,9 +1,11 @@
 # 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-r2.ebuild,v 1.1 2011/04/18 18:49:57 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/opensc/opensc-0.12.0-r2.ebuild,v 1.2 2011/07/03 17:13:16 flameeyes Exp $
 
 EAPI="4"
 
+inherit eutils autotools
+
 DESCRIPTION="Libraries and applications to access smartcards."
 HOMEPAGE="http://www.opensc-project.org/opensc/"
 
@@ -30,6 +32,11 @@ REQUIRED_USE="
 	pcsc-lite? ( !openct )
 	openct? ( !pcsc-lite )"
 
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-crossbuild.patch
+	eautoreconf
+}
+
 src_configure() {
 	# disable everything, enable selectively
 	local myconf="--disable-pcsc --disable-openct --disable-ctapi"