Fix bug #412299, thanks to Michelangelo Scopelliti for reporting. Also remove old versions.

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

2 files changed, 64 insertions, 42 deletions

diff --git a/dev-libs/opensc/files/opensc-0.12.0-crossbuild.patch b/dev-libs/opensc/files/opensc-0.12.0-crossbuild.patch
deleted file mode 100644
index 82a9bb2e7ded..000000000000
--- a/dev-libs/opensc/files/opensc-0.12.0-crossbuild.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-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/files/opensc-0.12.2-parallelinstall.patch b/dev-libs/opensc/files/opensc-0.12.2-parallelinstall.patch
new file mode 100644
index 000000000000..823fa08c56db
--- /dev/null
+++ b/dev-libs/opensc/files/opensc-0.12.2-parallelinstall.patch
@@ -0,0 +1,64 @@
+From 9e62ac20a1dc39e001875e57067ab7fa2389ae73 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Diego=20Elio=20Petten=C3=B2?= <flameeyes@flameeyes.eu>
+Date: Sun, 13 May 2012 14:55:35 -0700
+Subject: [PATCH] build: fix parallel install by creating directory in the
+ rule
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Relying on the rule that creates the directory is a bad idea to be
+parallel safe.
+
+Signed-off-by: Diego Elio Pettenò <flameeyes@flameeyes.eu>
+---
+ etc/Makefile.am        |    4 ++--
+ src/pkcs11/Makefile.am |    7 ++++---
+ 2 files changed, 6 insertions(+), 5 deletions(-)
+
+diff --git a/etc/Makefile.am b/etc/Makefile.am
+index 0ef546f..478a7bb 100644
+--- a/etc/Makefile.am
++++ b/etc/Makefile.am
+@@ -18,8 +18,8 @@ opensc.conf: opensc.conf.in force
+ 		-e 's|@DEFAULT_PCSC_PROVIDER[@]|$(DEFAULT_PCSC_PROVIDER)|g' \
+ 		< $< > $@
+ 
+-sysconf_DATA=#required in order to create dir
+-install-exec-hook:	install-sysconfDATA opensc.conf
++install-exec-hook: opensc.conf
++	$(mkdir_p) "$(DESTDIR)$(sysconfdir)"
+ 	if [ -f "$(DESTDIR)$(sysconfdir)/opensc.conf" ]; then \
+ 		$(INSTALL_DATA) opensc.conf "$(DESTDIR)$(sysconfdir)/opensc.conf.new"; \
+ 	else \
+diff --git a/src/pkcs11/Makefile.am b/src/pkcs11/Makefile.am
+index ba5e70d..742c5fb 100644
+--- a/src/pkcs11/Makefile.am
++++ b/src/pkcs11/Makefile.am
+@@ -52,19 +52,20 @@ pkcs11-jar: jar-dir
+ 		 -k"testcert" jar-dir
+ 
+ if WIN32
+-install-exec-hook:	install-pkcs11DATA
++install-exec-hook:
++	$(mkdir_p) "$(DESTDIR)$(libdir)"
+ 	for l in opensc-pkcs11.dll onepin-opensc-pkcs11.dll pkcs11-spy.dll; do \
+ 		mv "$(DESTDIR)$(libdir)/$$l" "$(DESTDIR)$(bindir)/$$l"; \
+ 	done
+ else
+ # see http://wiki.cacert.org/wiki/Pkcs11TaskForce
+-pkcs11_DATA = #This will create the directory
+ if CYGWIN
+ PKCS11_SUFFIX=.dll
+ else
+ PKCS11_SUFFIX=.so
+ endif
+-install-exec-hook:	install-pkcs11DATA
++install-exec-hook:
++	$(mkdir_p) "$(DESTDIR)$(pkcs11dir)"
+ 	for l in opensc-pkcs11$(PKCS11_SUFFIX) onepin-opensc-pkcs11$(PKCS11_SUFFIX) pkcs11-spy$(PKCS11_SUFFIX); do \
+ 		rm -f "$(DESTDIR)$(pkcs11dir)/$$l"; \
+ 		$(LN_S) ../$$l "$(DESTDIR)$(pkcs11dir)/$$l"; \
+-- 
+1.7.8.6
+