app-crypt/truecrypt: Allow for the use of scute's pkcs11.h file if using >=dev-libs/opensc-0.12 wrt bug 369781.

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

3 files changed, 34 insertions, 19 deletions

diff --git a/app-crypt/truecrypt/ChangeLog b/app-crypt/truecrypt/ChangeLog
index da4b920d1517..7fce8191d3a5 100644
--- a/app-crypt/truecrypt/ChangeLog
+++ b/app-crypt/truecrypt/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-crypt/truecrypt
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/truecrypt/ChangeLog,v 1.64 2011/06/01 21:24:10 c1pher Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/truecrypt/ChangeLog,v 1.65 2011/07/15 13:10:37 c1pher Exp $
+
+  15 Jul 2011; Dane Smith <c1pher@gentoo.org> truecrypt-7.0a-r5.ebuild:
+  Allow for the inclusion of our own pkcs11.h if using >=opensc-0.12 wrt
+  bug 369781. No revbump. Thanks to Alon Bar-Lev and Diego Elio Petteno
+  for help with the fix.
 
 *truecrypt-7.0a-r5 (01 Jun 2011)
 
diff --git a/app-crypt/truecrypt/Manifest b/app-crypt/truecrypt/Manifest
index 7c84a8e30588..497f725c383b 100644
--- a/app-crypt/truecrypt/Manifest
+++ b/app-crypt/truecrypt/Manifest
@@ -1,29 +1,30 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA256
 
 AUX execstack-fix.diff 1955 RMD160 bac693c2ef2029f3d3ba8fb6fb5943404108c085 SHA1 f77beb975efe8577378a29510b7f530021119a7e SHA256 227c8e0bb04bd5f6915fc2570fbcbf1cca704b4b818bc5de283653197309a5fb
 AUX makefile-archdetect.diff 266 RMD160 9cb64f2d12174d458e6268802aaf92ae6e0de4a9 SHA1 d935b856299a78f1c818b3b989849d9f165015a3 SHA256 aa201bb7c93852c814d71c963b1d416d62aa2d1e685f9f5149b1388dca9ae883
 AUX truecrypt-stop.sh 308 RMD160 4b2e6f47520f701324c03b5a43118cc38ee409a3 SHA1 7139ba403e482a4746e1d545115b74760b1438ea SHA256 243a9d1041b291e12ce2065959838f0cfe01484bffac7915991ebeb90d2ccd2c
 AUX truecrypt.init 729 RMD160 63472dd371afd892e6b00de0e3e516c74ed0075a SHA1 8cb25b2093322e449715abcb3034454fcc6ef77f SHA256 6530577c5f86800a7d92a76b927538006a27f57cf517c6f2bdb793cebaa70b59
 DIST truecrypt-7.0a.tar.gz 1996312 RMD160 92b01f87c725feb43aded666ba44fcbd3e3ac740 SHA1 42be0f333e6791e7a122b3e1183e014cd3860198 SHA256 6c845153ee868429e2a531407383e9349754d1579cf66fc838632c44baaba021
+DIST truecrypt-pkcs11.h.bz2 8286 RMD160 15c22390f81a1cb0bfd6699b08acd84cffad9bae SHA1 59d02f97c565f006f2265ff0f4c9a23c3323bff8 SHA256 9e7782dd93f7e37fc0eaa118f9fbce7c643555e134fd39f2076e0fc541ac3494
 EBUILD truecrypt-7.0a-r2.ebuild 3458 RMD160 0f1d3b6d529fa89809ca4944cae0e292c015f1a2 SHA1 e8c8aea3b7800df23498096dc485c9ae8a7a62e2 SHA256 0088a216a26381427e8de29354a7a1ad1b5fe28a80192bb7bc71d64f4d89df69
-EBUILD truecrypt-7.0a-r5.ebuild 3613 RMD160 dac3abffe13f41492882edfbb9eaf42572745ec7 SHA1 5b7edb8c6a93d0769730652486e144223606afcf SHA256 42d0a1a814cc150ac178101dbeb69747b919b0daf138cc5fd68c007c0035f809
-MISC ChangeLog 12641 RMD160 e8a87a7c6a1424a960302f1abc6e75b35a9ae6ad SHA1 fdb053261fc29539e7167d1ee4d34792b4bbf67d SHA256 8064e423277e8f723d62b59f710efbe35e6892d7c49dd1af16edfdb890d6484c
+EBUILD truecrypt-7.0a-r5.ebuild 3956 RMD160 fa4f8cad6b926b46b42523ede3dca3d808964b50 SHA1 ece0bfb7df34d6298fd717e82a1eb52e2c5f4ed3 SHA256 6ddff384a1adc857d428271da21623dd9808905872a3742709928b2a94b1a237
+MISC ChangeLog 12884 RMD160 c12c46c280e7e478ab3b571fa695d44d9e560678 SHA1 3b565385e85fcb7aaf2a3bd1c4205d38997ab481 SHA256 cbaaa0ce1f5d07cb68e12f569c63b8d5afc0d460238575937e028f0cd5002840
 MISC metadata.xml 250 RMD160 0ed9b992d346dffc7427a6f36ad6db15f099542f SHA1 906ae1d1afaf4c06a5b54cf7e25843dbac2bb5ba SHA256 c4dab52dbdf0558df59853ea282e0b1deb4cb968914468a648070dcd31a456d8
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iQIcBAEBAgAGBQJN5qznAAoJEEsurZwMLhUxmtAP/AgxfUF0eSRB+Ji08X7IQIxy
-roPCL4VhRxpyv+WkMzRtkp5oqLSWbn8gOXkRI4NkOWcruCTqiycZhZPAbIPiV5LC
-0AcvguXAkYO4bQLUQabIcdzrL1XY2ch9IDco4LFcusDMwJZX/5XD+pwLleFtwDlC
-+7F4Ve/YcY2HE8ovR6h4tmnRbIBCMDB42c7Auc2M6lJ03K4xhbUmcVQ/sc9mec4T
-4g5tqjwpUVn3GL3WIlIfs6znGXWixO38KOq1vQme+lcbgbLR7dna6wjagLVxRW8O
-dPofIODo4nCUb7m55zSClX0jm7Crz8L1Te2pkiIAop5yT/t+/YybBCgCs5s1hMhG
-yQ0GVIAiuof1II4ZC6pdAIyCzd2BcPJfO1zZWnssVrrROl1XuT2pBEJmfmU8/o0s
-4PtNewZ4lu3Y280Zp9BPyJ8Uh1jJWZwkRJkBK6wP5uH7iQSRkOg1wpMzGTBV0EFQ
-CbHSz0TH/wMSvr/Cpxr+fAUpVJLLwEX8oF0CrGCw2s1K+56FCa9uqGCwcdUaXWdw
-7fvJ/+TpPGPegri7UtHReVgwXKoZKbQB/QlFDYUl0i6zGiEBcaCajD27yzQ+CSRG
-5puCtlJJ91k33zxUnN4rZJ59AuMxXjOz0N3qODnpfTJVzK4g6A/QuCNjIgrSCfqd
-EEpK+ponj1l7W/6DsX1P
-=eUSb
+iQIcBAEBCAAGBQJOIDw+AAoJEEsurZwMLhUxmXsP/Ak6PCmgQ8Xmo5nfqJxLb2Yr
+cDfG5QBNtAaYxS9PLf0C0DBtpNjkXk0f92/obqS6X4l6/sZVvvdEHU3bVJ95TN6n
+MeXIebmVN/D97VDHv8JxzhBEeXn6KSOclA+uCai7iKbGveO9oao79PzEZqMPsIW/
+5v0lTW1qc7aFL20/XCbqQexJ90BEXB/Wu+VGJwRVN/+Cj40JCqyHpA+TH0rU3ZLo
+bFl+CDluWowDHILW7Ill8kNLv6l/R7EpjfwGZGlNIcMNbFuWz5lKu/1I34nYRqgW
+wXa6pK6pA1pdUAKYFDVozS3ZfF/Md0IUh6z5uIKPsEU74X7xY1V/+hf21R3wE0Y6
+aPB/kqShbh2QAlgIpTKAdNkbQ1o4q0qMWRTLoOI4Y8i3mPsUYLFmKy1JqlkCOG7s
+3zJSQpiDL5h732I+GByGeh7K/Bpqa/je2Oar1x0n86CAOkoHVpxpnPxtUkn1ZDib
+erYKFo3fIxLf6DG72Z3W/oOteiO9wevqEX4MLedU1VnhBHytpKYg96OZ12oYX945
+y4aYBAUpAaaxmdrON0jCCcr/vdVOkzqLDTHMGxiaH0ip06FN/2uI3jZAQdD63019
+5jaAbeCvN4QHqppnXCyljOJuidnel+RP/zeGTbIRgcf0QaL42oJEjTlsAP0vKI4R
+nvtU3vVmdFkhc27saU7j
+=9RIy
 -----END PGP SIGNATURE-----
diff --git a/app-crypt/truecrypt/truecrypt-7.0a-r5.ebuild b/app-crypt/truecrypt/truecrypt-7.0a-r5.ebuild
index bf7fcc7bb11c..492137cda58f 100644
--- a/app-crypt/truecrypt/truecrypt-7.0a-r5.ebuild
+++ b/app-crypt/truecrypt/truecrypt-7.0a-r5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/truecrypt/truecrypt-7.0a-r5.ebuild,v 1.1 2011/06/01 21:24:10 c1pher Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/truecrypt/truecrypt-7.0a-r5.ebuild,v 1.2 2011/07/15 13:10:37 c1pher Exp $
 
 EAPI="2"
 
@@ -9,7 +9,8 @@ inherit flag-o-matic linux-info multilib toolchain-funcs wxwidgets eutils \
 
 DESCRIPTION="Free open-source disk encryption software"
 HOMEPAGE="http://www.truecrypt.org/"
-SRC_URI="${P}.tar.gz"
+SRC_URI="${P}.tar.gz\
+	mirror://gentoo/${PN}-pkcs11.h.bz2"
 
 LICENSE="truecrypt-3.0"
 SLOT="0"
@@ -54,6 +55,11 @@ src_prepare() {
 
 	epatch "${FILESDIR}/makefile-archdetect.diff"
 	epatch "${FILESDIR}/execstack-fix.diff"
+	if ! has_version dev-libs/pkcs11-helper && \
+		has_version "=dev-libs/opensc-0.12*"; then
+		mkdir pkcs11 || die
+		cp "${WORKDIR}"/truecrypt-pkcs11.h pkcs11/pkcs11.h || die
+	fi
 }
 
 src_compile() {
@@ -63,6 +69,9 @@ src_compile() {
 
 	if has_version dev-libs/pkcs11-helper; then
 		pkcs11_include_directory="/usr/include/pkcs11-helper-1.0"
+	elif has_version "=dev-libs/opensc-0.12*"; then
+		pkcs11_include_directory="/usr/include/opensc"
+		append-flags -I"${S}"/pkcs11
 	else
 		pkcs11_include_directory="/usr/include/opensc"
 	fi