Fix parallelinstall patch (update sent upstream), remove automake 1.11 restriction.

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

4 files changed, 27 insertions, 21 deletions

diff --git a/dev-libs/opensc/ChangeLog b/dev-libs/opensc/ChangeLog
index 12c9be94bac2..a59a8c05cfb0 100644
--- a/dev-libs/opensc/ChangeLog
+++ b/dev-libs/opensc/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-libs/opensc
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/opensc/ChangeLog,v 1.122 2012/06/22 23:27:32 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/opensc/ChangeLog,v 1.123 2012/06/24 08:18:12 flameeyes Exp $
+
+  24 Jun 2012; Diego E. Pettenò <flameeyes@gentoo.org>
+  files/opensc-0.12.2-parallelinstall.patch, opensc-0.12.2-r1.ebuild:
+  Fix parallelinstall patch (update sent upstream), remove automake 1.11
+  restriction.
 
   22 Jun 2012; Diego E. Pettenò <flameeyes@gentoo.org> -opensc-0.12.2.ebuild,
   opensc-0.12.2-r1.ebuild:
diff --git a/dev-libs/opensc/Manifest b/dev-libs/opensc/Manifest
index 14bea943c1da..071839e41961 100644
--- a/dev-libs/opensc/Manifest
+++ b/dev-libs/opensc/Manifest
@@ -5,21 +5,21 @@ AUX opensc-0.11.13+pcsc-lite-1.6.2.patch 2581 RMD160 ecff368edb374c1f5965b34f0e3
 AUX opensc-0.11.13-overflows.patch 2463 RMD160 d5879f4f5acde30828904c78df5f8973d071d49b SHA1 701383d7df0ccf4e154361a43f23c552eee1b498 SHA256 fd2071a803ed34ec961ab7a4dcddedaf00180e2fc54a1b53f9af945f2960c921
 AUX opensc-0.12.1-crossbuild.patch 1839 RMD160 21c3ce0de0c293ed76c003bf8327908329e43f9f SHA1 d5e730f5c7f64f1e6aa137edef726901059fb183 SHA256 dd1f76f60d6223fc86ee80f500b89ffc3dfebffac04ef999f58df17d90b1bedb
 AUX opensc-0.12.2-dl.patch 1264 RMD160 48acbd83c22bf5f4fcd199ea3b292f84fd798886 SHA1 68434844b65452963d597dfdc82a62a7a8275cb6 SHA256 6d081c0c598b0999fad501ba97f293156d5a64928d769891c18cb6783e01da71
-AUX opensc-0.12.2-parallelinstall.patch 2132 RMD160 4b5401fa9840dca5fc4f78df3e3a6444c39de1f2 SHA1 2f0bc80cf8c5b8d3524f119a65d2e23be3bdcdcd SHA256 bb7b632fe4ef164f09cdff1e02598711bf14207a0e3e428a1b9d2e46715b0495
+AUX opensc-0.12.2-parallelinstall.patch 2249 RMD160 f0c4f6bc5a58025d5c7260063dd74caba606c93c SHA1 d37feb11e0fa010c099963582ca04d0cc62dae51 SHA256 70d94889f3443f1b8b303f6adb7755c2cb23610446fb0ebc8888e9cd36d17957
 DIST opensc-0.11.13.tar.gz 1513327 RMD160 cd900866e51cd64fa7c5a3287cd58193dec26528 SHA1 408b374286004c3df15ec17856f69fd4c2a1aceb SHA256 a9a42d6d51fb500f34248fcd0d4083c99d25bc5e74df60fe4efa19b5b4e6d890
 DIST opensc-0.12.2.tar.gz 1738553 RMD160 45504135db05fd404a357ebd8bea047c5c8604dc SHA1 8c34be52eb94025eb181c02b466223901bef744c SHA256 50e7371c0f45a3ed887098b712554905e3ef639d4dfca5ac90b8af5f69f1e675
 EBUILD opensc-0.11.13-r2.ebuild 1487 RMD160 161e2629d3c04fb30949d1c798ae985430bcd134 SHA1 3f4bd510e302354ce02c90a4f62e149d3296ed6b SHA256 f95cfe682685f53c1735b322f787daf45caf6f3adfd0c093b0ebeea40ac3a548
-EBUILD opensc-0.12.2-r1.ebuild 1955 RMD160 06c5c93fecc9330ebd4bf1d83158b0f21e5c5a5d SHA1 c968ca7680550934d40008f131f32b2bc3681618 SHA256 0aecd707510571f32151d6597499ef7b3b58ffa66185af9ed1d62e4d06f9a423
-MISC ChangeLog 18520 RMD160 60783a49c7de1d389839c3956ed409f20e07c789 SHA1 ea75c61c97a362427f4e2449e963a714d929ccb1 SHA256 c19ca37f52f117c04b91186ccf3ce5e88a24199bf568a52fec489f5292125cde
+EBUILD opensc-0.12.2-r1.ebuild 1935 RMD160 e305e5a423bfd83dcbbef52a364f04f094746be1 SHA1 8ad9458550cdb36e0e3f930825e545a7037a3cfe SHA256 c4861e845ca172dd49c45ad0d81b6f3657fbd11be164195c6c2c56d6c49759d3
+MISC ChangeLog 18735 RMD160 fa955259c00d179b26d691346529b01a1416db8f SHA1 92b440aa4bc899d7b1425b28ec3a141ddfc56f9d SHA256 47fc1899a8ccf86132b4c41611a54070e55eb38855017b44f3ff262d27bcf400
 MISC metadata.xml 1322 RMD160 c7e8d6ae1d7474f49a0a5167c046e26deefc67e1 SHA1 4834a5d29302898026b878aca75c51ccad4bde07 SHA256 4bc1d4fac5acdfea7a9ffd78a107b1a4cb2d1b0e62930367b7ded696604dc94e
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQEcBAEBAgAGBQJP5P9vAAoJEBzRPIrUMBNCbP8H/0/twyA03LiWgojYMsb7+65m
-gKdcubdhlgzAQzNPdiTGnJB7+qiydDOt8sUGaGQ4FJeo3Xj8Fx9Ahdr4o2A+g0uE
-nBwNaO5YoiwNP/HqqBWlkkNDFHNOebgD1j7qpS/zYtc/AddOrnMsBqrK6SWjwcfs
-OvfryKIRVFiawFQ5SagKxOkWNZL8/MLNPKpWS3DBZoF+lQ4rqE3tojizwrcCbt8h
-8v+CsBD3KoLCXMAjlJWEkXZHFUBDbCARAJEx+oI0b5e96SDhfQpkqG6ItuclVCwN
-QVD60V6alXBUX4NBNPWjKCZZHLhtPbN1qPoCYUdj4SDS6fGMx0NNCXw+qp8CkY0=
-=KTTq
+iQEcBAEBAgAGBQJP5s1QAAoJEBzRPIrUMBNCZOAH/1vAAsv6cIyIbsKlHwMFiTjT
+KbWylK1UW3/Sh4a8O/d6kc53N7pnF4jGWxNW2Db77Ts+t+D2JAo70NUwEGCttwbn
+r0vDxM+cQBJHiGN141q9OU5RHmAImP0F7xH0uAED7TMVgzB/LhHGfW+YmxSZPvlW
+TxK0KGASNXP95aQfsqupTD5cD7Zh8jG8rYaTGEAYvOdc2lbI0+TctZcTKSVG3gK7
+8RyxHVuiptiKZA01yaRz8QAKu7aIVhM7eZnS+NKWMl2gk18l0j63tw7/pNQOFQVN
+xdYU+1G/fhydnKVGIvjaZ1oh60EHk8S69UAZcyDN0tm0v1tNQ5ogN9hL0GsdyKs=
+=05Zb
 -----END PGP SIGNATURE-----
diff --git a/dev-libs/opensc/files/opensc-0.12.2-parallelinstall.patch b/dev-libs/opensc/files/opensc-0.12.2-parallelinstall.patch
index 823fa08c56db..3ef24ec3d254 100644
--- a/dev-libs/opensc/files/opensc-0.12.2-parallelinstall.patch
+++ b/dev-libs/opensc/files/opensc-0.12.2-parallelinstall.patch
@@ -1,4 +1,4 @@
-From 9e62ac20a1dc39e001875e57067ab7fa2389ae73 Mon Sep 17 00:00:00 2001
+From 4ede74dd803ddbc4d0686bec0749459f54854495 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
@@ -10,6 +10,9 @@ Content-Transfer-Encoding: 8bit
 Relying on the rule that creates the directory is a bad idea to be
 parallel safe.
 
+(Patch modified to use autoconf's MKDIR_P instead of automake's
+deprecated mkdir_p, allowing use of automake 1.12).
+
 Signed-off-by: Diego Elio Pettenò <flameeyes@flameeyes.eu>
 ---
  etc/Makefile.am        |    4 ++--
@@ -17,7 +20,7 @@ Signed-off-by: Diego Elio Pettenò <flameeyes@flameeyes.eu>
  2 files changed, 6 insertions(+), 5 deletions(-)
 
 diff --git a/etc/Makefile.am b/etc/Makefile.am
-index 0ef546f..478a7bb 100644
+index 0ef546f..3b75995 100644
 --- a/etc/Makefile.am
 +++ b/etc/Makefile.am
 @@ -18,8 +18,8 @@ opensc.conf: opensc.conf.in force
@@ -27,21 +30,21 @@ index 0ef546f..478a7bb 100644
 -sysconf_DATA=#required in order to create dir
 -install-exec-hook:	install-sysconfDATA opensc.conf
 +install-exec-hook: opensc.conf
-+	$(mkdir_p) "$(DESTDIR)$(sysconfdir)"
++	$(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
+index 8ff9abc..211055b 100644
 --- a/src/pkcs11/Makefile.am
 +++ b/src/pkcs11/Makefile.am
-@@ -52,19 +52,20 @@ pkcs11-jar: jar-dir
+@@ -53,19 +53,20 @@ pkcs11-jar: jar-dir
  		 -k"testcert" jar-dir
  
  if WIN32
 -install-exec-hook:	install-pkcs11DATA
 +install-exec-hook:
-+	$(mkdir_p) "$(DESTDIR)$(libdir)"
++	$(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
@@ -55,7 +58,7 @@ index ba5e70d..742c5fb 100644
  endif
 -install-exec-hook:	install-pkcs11DATA
 +install-exec-hook:
-+	$(mkdir_p) "$(DESTDIR)$(pkcs11dir)"
++	$(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"; \
diff --git a/dev-libs/opensc/opensc-0.12.2-r1.ebuild b/dev-libs/opensc/opensc-0.12.2-r1.ebuild
index 1c4e23a0577a..065b5292e5c6 100644
--- a/dev-libs/opensc/opensc-0.12.2-r1.ebuild
+++ b/dev-libs/opensc/opensc-0.12.2-r1.ebuild
@@ -1,11 +1,9 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/opensc/opensc-0.12.2-r1.ebuild,v 1.2 2012/06/22 23:27:32 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/opensc/opensc-0.12.2-r1.ebuild,v 1.3 2012/06/24 08:18:12 flameeyes Exp $
 
 EAPI="4"
 
-WANT_AUTOMAKE=1.11
-
 inherit eutils autotools
 
 DESCRIPTION="Libraries and applications to access smartcards"