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

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

3 files changed, 56 insertions, 2 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/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"