Fix USE -ssl

Package-Manager: portage-2.2.8-r1/cvs/Linux x86_64
Manifest-Sign-Key: 0xBF20DC51

4 files changed, 54 insertions, 6 deletions

diff --git a/dev-libs/opensc/ChangeLog b/dev-libs/opensc/ChangeLog
index 25bec2255f24..d5cc7e16030e 100644
--- a/dev-libs/opensc/ChangeLog
+++ b/dev-libs/opensc/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-libs/opensc
-# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/opensc/ChangeLog,v 1.134 2013/02/08 20:10:08 alonbl Exp $
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/opensc/ChangeLog,v 1.135 2014/02/19 19:36:43 alonbl Exp $
+
+  19 Feb 2014; Alon Bar-Lev <alonbl@gentoo.org>
+  +files/opensc-0.13.0-openssl.patch, opensc-0.13.0.ebuild:
+  Fix USE -ssl
 
   08 Feb 2013; Alon Bar-Lev <alonbl@gentoo.org> metadata.xml,
   opensc-0.13.0.ebuild:
diff --git a/dev-libs/opensc/Manifest b/dev-libs/opensc/Manifest
index 13eac2ba5a54..199810de7d1d 100644
--- a/dev-libs/opensc/Manifest
+++ b/dev-libs/opensc/Manifest
@@ -1,13 +1,24 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
 AUX opensc-0.11.13+pcsc-lite-1.6.2.patch 2581 SHA256 de08b3a968068ed600aa172891be59f0bb0b8a432bc6eea8fcc99a405ee309f5 SHA512 1dd468f7653a3426d63481b9ee00157c854a56c35bb6a3da9958e3f39d7d36cc745e8aaeb88ed16b6617959ffb3a6d17f0e7297734e41890aac3c80cd994d58b WHIRLPOOL 9613a6d2bcd448be46d1a5c40abf92e7db658f39ec4b70047baff8dda96bd31174e1a24607c0521c3b9608f819a6d30ba9bee32327badd17d8403c898b361cb7
 AUX opensc-0.11.13-overflows.patch 2463 SHA256 fd2071a803ed34ec961ab7a4dcddedaf00180e2fc54a1b53f9af945f2960c921 SHA512 09f459a2f6fafae131b5ad43500958682f22587b418aa1922939f38ceecbc90810903d0bf20788c484bf23e2e6ebe879e00a94bb7c334af65cb31fe01d6bcfb3 WHIRLPOOL bb5c75a3e5db86863ff0d60d4d3c8a3ae5a42531310054daeea7bb02f785755d148be00dbe61bea0b3af8d37c489316806cf0a274e0fde63230c32b3e956e3ac
 AUX opensc-0.12.1-crossbuild.patch 1839 SHA256 dd1f76f60d6223fc86ee80f500b89ffc3dfebffac04ef999f58df17d90b1bedb SHA512 92f3a9c396082e7ab133c3eedd2a672d1de716ae420f255efa1a5b81877cf598d971fc5f4f32ffe5c89b8c447657c1845528b5932d520c435eb440d077805fda WHIRLPOOL 118ee84e436c37b1307c0e74245a325c75504357363877db85085179707ff035fae6cd02755d58db12d3eef31ebcfbc0bb08994c0f814ea11d1bc787a69ad9c7
 AUX opensc-0.12.2-dl.patch 1264 SHA256 6d081c0c598b0999fad501ba97f293156d5a64928d769891c18cb6783e01da71 SHA512 90c1cd6e7fdb03a26ad031bd1b7bd7490d9cd890d3862d39b6929cea5ded393a43e86e2e364f492346d049b6d9eb58e6868561d2dcca4314084ef112bee43a16 WHIRLPOOL 3fab99f52ee034ebdb841c4dc30ca0b115f0b975b48150a49a4b89c38a2426287bc10b6bec9d105dac144d124acfc070de6e281c6ddde95f31d95bbd38c25d5e
 AUX opensc-0.12.2-parallelinstall.patch 2249 SHA256 70d94889f3443f1b8b303f6adb7755c2cb23610446fb0ebc8888e9cd36d17957 SHA512 dc632d0e97485708c825912f231db98edefdbadf71c37af2258b9f26cc7378fa4c8b1b4d6981c546b0e86bfc28615a5830c59f08fdf6ff995f110abccf3a54ae WHIRLPOOL aa9eff0174e6419a484448daed8e62282b538c67d21f572e66159558838d24229f10cbaf1f775d66ea69ec67a3ab28e611c1071f26372b97532d48918c932c84
+AUX opensc-0.13.0-openssl.patch 963 SHA256 6a61d3fc4750026a15ec6e2a4594ab8123e748f40e79f08622c646f13f6ddbc7 SHA512 a1108f404f5ceb87808d9be7dfff4391152d5d3d4f63946f56946c31d78b5a521f3d916ed5e8b76019560817812dceeb6aff0020904dddaaf13fe87fc7e43f76 WHIRLPOOL 3e0e6a126540fe053321f268c2489709ca0f1abf2bd759000c5315c655666bae2ea9a9bd1ef7ae835f9708dbdb806a1e551619cd25d64ac62353aad5fc492070
 DIST opensc-0.11.13.tar.gz 1513327 SHA256 a9a42d6d51fb500f34248fcd0d4083c99d25bc5e74df60fe4efa19b5b4e6d890 SHA512 f999c3cbcf99789578570bb77f4ae37efdc75fc516bdc1eae8f282bd57acc7f0a36dcba0fec98e53515064139dac2b3972fafdbfd09f19e1d2bd71030d021a99 WHIRLPOOL b33a68ca8f717d82553d9a7705ed97e1faf28fccae6362ca845af03824604812b35725d5c88457292ccf9e299cd133a22656e14f89334f5a427424e1c90ca72c
 DIST opensc-0.12.2.tar.gz 1738553 SHA256 50e7371c0f45a3ed887098b712554905e3ef639d4dfca5ac90b8af5f69f1e675 SHA512 544971f2c79723f618806c7043f0f1ffc25332752cbcaec97ffb1c99f9a2dff2237a6e5f5e020a4b9878921fec3a5234ca7e4fe9c8175c3f6142b169fcc65334 WHIRLPOOL 4969811d68d72e82c3a2b0297d5ff9aaca083b6ef8e66223d4385dce35cd9560cdda7cca8ccd38b52eb55465dbd6f8704485778b21d2a88bb548a5bbd87071e2
 DIST opensc-0.13.0.tar.gz 1946899 SHA256 abde46ae53b12b3273e40c532ffd4f7d423a51e0919a5234761453c17c089b14 SHA512 2d33088ff208f6a492dea896a0c0ccbf79b21bbcd953eb89cc7659fd60feb3e9258c2cdbb3112c30b16c3b4ef5bcfc914e0c3783894ac0b119a67116c1703a51 WHIRLPOOL 25934d790f3f855136aac263a49c0d49b604b748b9bad9f7de62d3781f37dc3e318c7fa9a20280fe7ca806ad6ea8d9ec104ba9a8a45b82237039fd965777d6e8
 EBUILD opensc-0.11.13-r2.ebuild 1487 SHA256 f95cfe682685f53c1735b322f787daf45caf6f3adfd0c093b0ebeea40ac3a548 SHA512 0d2da6d1bf06c6b798ecc38bccfd600f51d99d7865245e7720ff2bf0069efcb540fe5538672fe4fa97aecd30c7441bd315bec772a9fb5892d84601cc2a64d647 WHIRLPOOL 222461c33e9a94bcb424461b638b35cce79c9b1dde32eb485607272835c7b79eca4c4ca338e7d849ef10ccfcce6ef5916aa4a9636630352f81d6b050700d8442
 EBUILD opensc-0.12.2-r2.ebuild 1949 SHA256 260261e276bf1f55132381710630c6821eeef3534ab9e75a578a556594a834e5 SHA512 7b063a0a7031d30cfa27448a395efc3b12b402f60ab76355a085e41837aab9136500e2aaa9e6713a1e0bff2a9eb6e14d3f7f3d2d95d27f91f3e78a0cf356047e WHIRLPOOL 84cb1771ae4c7aa6d316876f0fc3552e0a6b26a30a270c20cdcd9b7974fd975b6cd7f30b63a814bb0afb682cff1847099994cd9b71de6358091622480c214922
-EBUILD opensc-0.13.0.ebuild 1405 SHA256 3dba6107f7d827f0ae2432ea3cec0fdd5ba41113d5571ffa3a7e1109a02515a4 SHA512 da575e633173e03325201040edf685cd916bbff28c0343cd406c1d63330f40343d08cb14e9e33847f5e2cac77d71a8f82b1c1161a243729edb5ef8841d3da6c2 WHIRLPOOL a957aa8bfcd3d59348ecba9c5392ddb01410c61eaaa6614489abd0d6396a237d25863dfea0122ed9984ed950b77e0e878e06408d04bd12802b6fa13d1688b4c7
-MISC ChangeLog 20107 SHA256 9d2aaaa0493e7c8b365c4ae603ec382049aef6f752d7576fb2d73900ad5136e4 SHA512 8ce7a918ff2ed68711c21338f474e5afc08139d7697b1b7ee3c96509b1f4067216904f3ba8b14d730313fd408754518541d7dd15a2bcbae5d908f4e0e97d417f WHIRLPOOL ab9bd4d39f05ef0f04131727b2bb4fb8602cbbaa0e7faade71143e8cec0e4e928155786aac825975e29bdd0b84f226d784e05728d3e02666da0cb3b5478d6df0
+EBUILD opensc-0.13.0.ebuild 1481 SHA256 ed246c68adcd3e6057a6d674a9f724d96d5a0359c1b8b7100ab9cf5478ee64c4 SHA512 dc5272cc71356c7633015a9eb418aa0c3c7136c86eebdfa397d75297164308f9fd2929c9641bcef47616627250dc55f4e836535ae437db31b6b7daac0275a97b WHIRLPOOL 5c0ecae2eb320146af05a4acd649661c9862f5071488fc865631a3b48477d65e68fda15964054b3e708940654cf8f11e9db7ba91ef4b3540031301a7830f9a82
+MISC ChangeLog 20231 SHA256 d08aa1f3df0f1997bcdc4574cce6f5c1d64b0908678ebef2ffb53ad182f182c2 SHA512 6e15eafdbb0e485b1e58bd7bd14ad853c5124e99ae5120cc38ba5d23f08580657a06116b43982b915dc35671ae87b27ea7fc207effb8efe62391fca3037e1e54 WHIRLPOOL 6b8fee2a22d190c39dc4aeb45846bdfbcde8942a1a2420fb2bc3195b95bd905f52ca5130002a34cf1ef895cc9b129675f6e56d40238bbc5e3045cb2b654141f6
 MISC metadata.xml 1210 SHA256 d4083d49ca45196e8650f6fc7900ba1569eaea7aecbf940425473ff6c339bc4c SHA512 5ea60e9893d894ef225d47d60b4381936734221566c346ca53f6df3be5936d45187ab5e8d5b8ffc1a1a090c48ea9ace3fded309e2972358c98fc498effa1f0df WHIRLPOOL 1c9acf6a9bd7ed2c6b3a563095d10d935bddb0cec867efed873fcc4793e13ffb5eeb3eb008b84dd5dd15eb849ad428f81281ca402a19c351e9d72c55e43f5c58
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.22 (GNU/Linux)
+
+iF4EAREIAAYFAlMFB9gACgkQXYk9GL8g3FF6vwD9EQt6ogvtt8/MyMuVfJO6MWmZ
+LGKb1bU7IzDWcRSkzxAA/RAXUq6YuDmrqdXM/0g0lWfARNK/vh2vIFgpMrtz1AFj
+=RBNu
+-----END PGP SIGNATURE-----
diff --git a/dev-libs/opensc/files/opensc-0.13.0-openssl.patch b/dev-libs/opensc/files/opensc-0.13.0-openssl.patch
new file mode 100644
index 000000000000..1568493d757d
--- /dev/null
+++ b/dev-libs/opensc/files/opensc-0.13.0-openssl.patch
@@ -0,0 +1,27 @@
+diff -urNp opensc-0.13.0.old/src/libopensc/iasecc-sm.c opensc-0.13.0/src/libopensc/iasecc-sm.c
+--- opensc-0.13.0.old/src/libopensc/iasecc-sm.c	2012-12-04 16:43:40.000000000 +0200
++++ opensc-0.13.0/src/libopensc/iasecc-sm.c	2014-02-19 21:24:34.479234564 +0200
+@@ -26,10 +26,6 @@
+ #include "asn1.h"
+ #include "cardctl.h"
+ 
+-#ifndef ENABLE_OPENSSL
+-#error "Need OpenSSL"
+-#endif
+-
+ #include "sm.h"
+ #include "iasecc.h"
+ #include "authentic.h"
+diff -urNp opensc-0.13.0.old/src/pkcs11/framework-pkcs15.c opensc-0.13.0/src/pkcs11/framework-pkcs15.c
+--- opensc-0.13.0.old/src/pkcs11/framework-pkcs15.c	2012-12-04 16:43:40.000000000 +0200
++++ opensc-0.13.0/src/pkcs11/framework-pkcs15.c	2014-02-19 21:31:43.816108633 +0200
+@@ -2853,8 +2853,8 @@ struct sc_pkcs11_framework_ops framework
+ 	pkcs15_login,
+ 	pkcs15_logout,
+ 	pkcs15_change_pin,
+-	pkcs15_initialize,
+ #ifdef USE_PKCS15_INIT
++	pkcs15_initialize,
+ 	pkcs15_init_pin,
+ 	pkcs15_create_object,
+ 	pkcs15_gen_keypair,
diff --git a/dev-libs/opensc/opensc-0.13.0.ebuild b/dev-libs/opensc/opensc-0.13.0.ebuild
index 3dabc431b129..01f9db92238c 100644
--- a/dev-libs/opensc/opensc-0.13.0.ebuild
+++ b/dev-libs/opensc/opensc-0.13.0.ebuild
@@ -1,9 +1,11 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/opensc/opensc-0.13.0.ebuild,v 1.2 2013/02/08 20:10:08 alonbl Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/opensc/opensc-0.13.0.ebuild,v 1.3 2014/02/19 19:36:43 alonbl Exp $
 
 EAPI=4
 
+inherit eutils
+
 DESCRIPTION="Libraries and applications to access smartcards"
 HOMEPAGE="http://www.opensc-project.org/opensc/"
 SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
@@ -29,6 +31,10 @@ REQUIRED_USE="
 	ctapi? ( !pcsc-lite !openct )
 	|| ( pcsc-lite openct ctapi )"
 
+src_prepare() {
+	epatch "${FILESDIR}/${P}-openssl.patch"
+}
+
 src_configure() {
 	econf \
 		--docdir="/usr/share/doc/${PF}" \