summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSamuli Suominen <ssuominen@gentoo.org>2011-10-13 19:34:36 +0000
committerSamuli Suominen <ssuominen@gentoo.org>2011-10-13 19:34:36 +0000
commit922240c27ba239e1765ad5ad0dc7e7831e765c89 (patch)
treef1d52f00f4c2b06d65668eb045260c02c99d7209
parent[app-emulation/xen-tools] Sabayon Tinderbox build failuire, fixes bug #377557... (diff)
downloadgentoo-2-922240c27ba239e1765ad5ad0dc7e7831e765c89.tar.gz
gentoo-2-922240c27ba239e1765ad5ad0dc7e7831e765c89.tar.bz2
gentoo-2-922240c27ba239e1765ad5ad0dc7e7831e765c89.zip
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
(Portage version: 2.2.0_alpha64/cvs/Linux x86_64)
-rw-r--r--dev-libs/cyberjack/ChangeLog8
-rw-r--r--dev-libs/cyberjack/cyberjack-3.99.5_p02.ebuild14
2 files changed, 14 insertions, 8 deletions
diff --git a/dev-libs/cyberjack/ChangeLog b/dev-libs/cyberjack/ChangeLog
index d906ec98561b..39795f782be7 100644
--- 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/cyberjack-3.99.5_p02.ebuild b/dev-libs/cyberjack/cyberjack-3.99.5_p02.ebuild
index 5d30a27c849f..c3db7261721f 100644
--- 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 {} +
}