Fix building with recent pcsc-lite by renaming FEATURE_MCT_READERDIRECT with FEATURE_...

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

diff --git a/dev-libs/cyberjack/ChangeLog b/dev-libs/cyberjack/ChangeLog
index d906ec98561bf2fb831a6206dbf1ee677eb0d16c..39795f782be7bdf935de6699057508ed5235023b 100644 (file)
--- a/dev-libs/cyberjack/ChangeLog
+++ b/dev-libs/cyberjack/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-libs/cyberjack
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/cyberjack/ChangeLog,v 1.18 2011/08/07 02:57:17 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/cyberjack/ChangeLog,v 1.19 2011/10/13 19:34:36 ssuominen Exp $
+
+  13 Oct 2011; Samuli Suominen <ssuominen@gentoo.org>
+  cyberjack-3.99.5_p02.ebuild:
+  Fix building with recent pcsc-lite by renaming FEATURE_MCT_READERDIRECT with
+  FEATURE_MCT_READER_DIRECT in ifd/ifd.cpp wrt
+  http://ludovicrousseau.blogspot.com/2011/06/new-version-of-pcsc-lite-173.html
 
   07 Aug 2011; Pawel Hajdan jr <phajdan.jr@gentoo.org>
   cyberjack-3.3.5-r2.ebuild:

diff --git a/dev-libs/cyberjack/Manifest b/dev-libs/cyberjack/Manifest
index b96d85908b6877cad2b2361620192bb0abb8b157..d0abcb0a4f7d5f1fe31bc59198e76cc5296e02de 100644 (file)
--- a/dev-libs/cyberjack/Manifest
+++ b/dev-libs/cyberjack/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA1
 
 AUX cyberjack-3.3.2-udev.patch 608 RMD160 f82a74da23b3902f8a899fe0d07de57d8419ebe9 SHA1 fefd5d00ab6f4332a47e15c9df7cc0d0b67aed1d SHA256 984a95626452f17d9e22cce44ed1e43a00b79addcdc69c8b9fd645c657278fb3
 AUX cyberjack.rules-r1 557 RMD160 9ed19421b90feaddc756020c74c054b5434ea92a SHA1 0b903b24657219ed0516d1e3ef078f2492d20d4e SHA256 5f67373deef6622de89edbeea0d1589ae1ec688db06e80463ce925bfcd9bbfcc
@@ -7,15 +7,17 @@ AUX cyberjack.sh 533 RMD160 91b567c025ec250720352aaeb1b736ea9fd4ab85 SHA1 94f79d
 DIST ctapi-cyberjack-3.3.5.tar.gz 1215789 RMD160 de7a5452cf876cd553fb4567b67a2f4bcf2e8ed4 SHA1 089ca17b3fe1c06f705ec3910d6a0cc82288656f SHA256 eba8788fb3de44d9184c6bc0ebdbaa0e348dfa29c285ba544c048dc926ec205b
 DIST pcsc-cyberjack_3.99.5final.SP02.tar.gz 1166940 RMD160 df4ded861f7fd965ff9d18bed5208d105996e38e SHA1 d291f78e6804c81eaa0a91cc9c2ae87b23f2cb2f SHA256 e4e8e93cc44111c1ea2b70e95a0c9f3e978d463d250c39f73cf364d9f50e4b82
 EBUILD cyberjack-3.3.5-r2.ebuild 2211 RMD160 da47a8e81888898f86126490a419ac93236f4519 SHA1 b80d51482f3e02e483a933e724ec7ce40d6c470d SHA256 3d600a49e0f4d0ec5d864b2b89aa8a21514a1a90c1b7b392c3d3deb34ee137fb
-EBUILD cyberjack-3.99.5_p02.ebuild 1641 RMD160 8df81a20ea046a5f9577caf5b1c51b43f0425d3f SHA1 c7f326df53455505b0317b157ae2b268b2c43d96 SHA256 40ebb18fab4ad4d7f61efcd15625f6483b037d1c1efbfd4dd33c9103026b81aa
-MISC ChangeLog 3527 RMD160 1305e8aab44148936eccc92697e6a9b4d4bd9a55 SHA1 398e3aa64975a691ef2959b0db99900f62676785 SHA256 51519d4968a9d3cbb75f2eafbe89af81ed4a67c3f3dce976aad3c9f761398e4f
+EBUILD cyberjack-3.99.5_p02.ebuild 1599 RMD160 39458d4a195e2a747923d40a64586533e89f91ee SHA1 610565d443c9aaefec516be2340229e3d41cb982 SHA256 83a690b21d76967debf4ce66fead24b18a24b86307b8b4a694e2b7ef8e1d7203
+MISC ChangeLog 3818 RMD160 c84c008b931b6b77563fd2659bdb1c6fb7d5acb2 SHA1 6a315af65a46fc296126203b5aa131fdd4c4bd72 SHA256 4d164abd25dceb96636e1f497e4e8217eb2d472cbca6d4a0ca7752b09c87a566
 MISC metadata.xml 491 RMD160 f335218a7b97693494027360df10940415caa5de SHA1 7cf9dfc3775415632a2a2fd65445ac203c71a8ff SHA256 ebe2ae5d276501ceb701e01c3195fb8f96aa0ad149c4a65fb622dd725abb054d
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iJwEAQEIAAYFAk59C6oACgkQfXuS5UK5QB0EggP/R9Dju3gqCv3wnBqniyC9x1HY
-Mslbc7+shA/G8TWShoqEKk8XG0L9UVfo8yW3GoV6IYoftHGrV4ADPsAmls4GL9FV
-rrj39MmaHmrCX2yeThZr/l2+zDGA3IljUgeGs39pzTmLnNQKWAfIDqQn2URwJVCf
-+1LZR7OgbP93rJ5OujE=
-=Z2kw
+iQEcBAEBAgAGBQJOlz1PAAoJEEdUh39IaPFNEOcIAJlfBf5GAGi50RRcwgVHGjAf
+C3LC7IImzEgP/EPIISM/37LxyAjB3JhX7nzjNhlbZoeaW8yZJIursvbvJ4rNPLtb
+FwTJY7A+RCBTZlyqkPDNKN48Zqv6wkdXXwgtV4W8qwbBDSR1tN3cJn7sTh4BfQA4
+D01RVN77qWjAqUmSdUw90Uy5ClBTgaLPuBwJgV3ug2Jw3Xs7WMuvCYFmw08UO1vC
+Dnw6uR162TTV/G5pxG47W+hfl8sBr1QzjhvwwRxcJZqZDTLmfoAWBMQ5H/QcFvEo
+Tk+hGBl7i5Lbp1Zb3jIjQ10PUJqW0cCISApQwiNfzxFnNZYYuK1OaPaKFJAMTRE=
+=0AER
 -----END PGP SIGNATURE-----

diff --git a/dev-libs/cyberjack/cyberjack-3.99.5_p02.ebuild b/dev-libs/cyberjack/cyberjack-3.99.5_p02.ebuild
index 5d30a27c849fe204d543cff4fb294551c5230183..c3db7261721ff08b20152acb666ea3ab38fa28dd 100644 (file)
--- a/dev-libs/cyberjack/cyberjack-3.99.5_p02.ebuild
+++ b/dev-libs/cyberjack/cyberjack-3.99.5_p02.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/dev-libs/cyberjack/cyberjack-3.99.5_p02.ebuild,v 1.1 2011/08/05 19:08:23 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/cyberjack/cyberjack-3.99.5_p02.ebuild,v 1.2 2011/10/13 19:34:36 ssuominen Exp $
 
 EAPI=4
 inherit toolchain-funcs
@@ -27,6 +27,12 @@ S=${WORKDIR}/${MY_P/_/-}
 
 DOCS=( ChangeLog NEWS doc/README.txt )
 
+src_prepare() {
+       # Fix building with recent pcsc-lite
+       has_version '>=sys-apps/pcsc-lite-1.7.3' && \
+               sed -i -e 's:FEATURE_MCT_READERDIRECT:FEATURE_MCT_READER_DIRECT:' ifd/ifd.cpp
+}
+
 src_configure() {
        econf \
                --mandir=/usr/share/man/man8 \
@@ -41,12 +47,6 @@ src_configure() {
 src_install() {
        default
 
-# FIXME: Should we install udev rules (from 3.3.5-r2) and do they need updating?
-#      insinto /lib/udev
-#      doins "${FILESDIR}"/cyberjack.sh
-#      insinto /lib/udev/rules.d
-#      newins "${FILESDIR}"/cyberjack.rules-r1 99-cyberjack-rules
-
        rm -f "${D}"usr/lib*/cyberjack/pcscd_init.diff
        find "${D}"usr -name '*.la' -exec rm -f {} +
 }