From: Alon Bar-Lev Date: Thu, 28 Dec 2006 20:50:48 +0000 (+0000) Subject: Add twinserial support, closes bug#157716, thanks to Jerome X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=9b362aa39dd79c51103a831479ce04c7cf9ec3c9;p=gentoo.git Add twinserial support, closes bug#157716, thanks to Jerome Package-Manager: portage-2.1.1-r2 --- diff --git a/app-crypt/ccid/ChangeLog b/app-crypt/ccid/ChangeLog index 94bcdaf243eb..2592292761b1 100644 --- a/app-crypt/ccid/ChangeLog +++ b/app-crypt/ccid/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for app-crypt/ccid # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-crypt/ccid/ChangeLog,v 1.10 2006/12/02 23:33:04 beandog Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-crypt/ccid/ChangeLog,v 1.11 2006/12/28 20:50:48 alonbl Exp $ + +*ccid-1.1.0-r1 (28 Dec 2006) + + 28 Dec 2006; Alon Bar-Lev + +files/ccid-1.1.0-build.patch, +ccid-1.1.0-r1.ebuild: + Add twinserial support, closes bug#157716, thanks to Jerome 02 Dec 2006; Steve Dibb ccid-1.0.1.ebuild, ccid-1.0.1-r1.ebuild, ccid-1.1.0.ebuild: diff --git a/app-crypt/ccid/Manifest b/app-crypt/ccid/Manifest index b0b8a2c8f8d4..d0546d5e7f20 100644 --- a/app-crypt/ccid/Manifest +++ b/app-crypt/ccid/Manifest @@ -1,3 +1,7 @@ +AUX ccid-1.1.0-build.patch 1507 RMD160 384517b59fea503b5acdd79eef3c2d0e9de26e1f SHA1 2e7ec7b306f047858a361432041c7f2d256bba38 SHA256 5c938d85c7b1f8ab9a9c214fa40dcbaa3cdc4837fa5da27103a10769a66b910a +MD5 4eb663ef5efe2b930675f07c41b83480 files/ccid-1.1.0-build.patch 1507 +RMD160 384517b59fea503b5acdd79eef3c2d0e9de26e1f files/ccid-1.1.0-build.patch 1507 +SHA256 5c938d85c7b1f8ab9a9c214fa40dcbaa3cdc4837fa5da27103a10769a66b910a files/ccid-1.1.0-build.patch 1507 DIST ccid-1.0.1.tar.gz 529540 DIST ccid-1.1.0.tar.gz 540628 RMD160 9569d64e597b1f6248e394517434ef170a1e5662 SHA1 667597f430b81cdc0745d20237bee5c358cd0d7f SHA256 a11c6df683a529d7101cf1dbcf1e376e9e01a9f7b3e73a1b19f335dd32c93093 EBUILD ccid-1.0.1-r1.ebuild 993 RMD160 23adaa5b9e6eb0c7edbf7130efcc5750088db98b SHA1 8198aac3d5984be09621822004ae02f624753708 SHA256 32dfea33bd060ab58514752fa5323d9729fd94fc2fbc9cad55f63369f3f263a7 @@ -8,14 +12,18 @@ EBUILD ccid-1.0.1.ebuild 634 RMD160 491003d5086653fcfaa13a76893aeccb9082887c SHA MD5 3837a80bfff7eb3ec85e6d5507586fb9 ccid-1.0.1.ebuild 634 RMD160 491003d5086653fcfaa13a76893aeccb9082887c ccid-1.0.1.ebuild 634 SHA256 c6042fb15b3167e9214ef6a58e4885fd6b96bec63150a51b133b8d9d1cccadad ccid-1.0.1.ebuild 634 +EBUILD ccid-1.1.0-r1.ebuild 1223 RMD160 80797b3d0a189a56434de4502dcff0a31c82c2e2 SHA1 9e91bf5c63632e5f3a986a8c157f4d6acd32cad8 SHA256 b940cd8be14c4cbebee646c5962884b3c4d0cf85980869232a8c58a844184ecc +MD5 85bc819eb24ae559370c7fef1956e46d ccid-1.1.0-r1.ebuild 1223 +RMD160 80797b3d0a189a56434de4502dcff0a31c82c2e2 ccid-1.1.0-r1.ebuild 1223 +SHA256 b940cd8be14c4cbebee646c5962884b3c4d0cf85980869232a8c58a844184ecc ccid-1.1.0-r1.ebuild 1223 EBUILD ccid-1.1.0.ebuild 984 RMD160 134abc7ebbe13097749cc6ee6659c7bcf9a98dd7 SHA1 30d57fc9f44b45e5a29cffa1ff76d1103821555c SHA256 4bc341bc5885feeb07e9b44ce92dcbe08da83d0ddff62e12d2e17d7dc38e663d MD5 2f81a82116531608b75d8769252eb8ca ccid-1.1.0.ebuild 984 RMD160 134abc7ebbe13097749cc6ee6659c7bcf9a98dd7 ccid-1.1.0.ebuild 984 SHA256 4bc341bc5885feeb07e9b44ce92dcbe08da83d0ddff62e12d2e17d7dc38e663d ccid-1.1.0.ebuild 984 -MISC ChangeLog 2127 RMD160 5a2da5615f0cfb76972b70be7f334fd24cd72089 SHA1 b59379a226de7fda397d8d46385c60cc829a0053 SHA256 577ba83db6d4914f49320b8bdff3bcc2b7a65476aa6f95062c5bb5a0dae83d43 -MD5 c44301d4333be07b5b707643955d3b31 ChangeLog 2127 -RMD160 5a2da5615f0cfb76972b70be7f334fd24cd72089 ChangeLog 2127 -SHA256 577ba83db6d4914f49320b8bdff3bcc2b7a65476aa6f95062c5bb5a0dae83d43 ChangeLog 2127 +MISC ChangeLog 2323 RMD160 e8cfe30fe377e488c4544baf3f8aa1ee6f9f53ad SHA1 b8b2a2991b5df34ea6643c04ec8eb50363df93d1 SHA256 e49a6abce067bd1a6ccfa8da2cc214989db10db11fbc49f10e9de47d409f0f9e +MD5 ceb43694a768f1ba1acea7b49f09440b ChangeLog 2323 +RMD160 e8cfe30fe377e488c4544baf3f8aa1ee6f9f53ad ChangeLog 2323 +SHA256 e49a6abce067bd1a6ccfa8da2cc214989db10db11fbc49f10e9de47d409f0f9e ChangeLog 2323 MISC metadata.xml 251 RMD160 9c13ff790c7419d4e0d2d370036b7f4e4594ea4f SHA1 563aa19984b291a6cade6d6487dbf4a2a17e6874 SHA256 1739a4e8833a2a5b9501182eb830cbd3e26014ccef5e9ae1b4d7a0686c665c1b MD5 2603eeeb20b24caddac3e9ce6996f357 metadata.xml 251 RMD160 9c13ff790c7419d4e0d2d370036b7f4e4594ea4f metadata.xml 251 @@ -29,3 +37,6 @@ SHA256 1ac6e439f64132adcaf4e95af6f329665358abb1ef4f31d92199b5a35279c554 files/di MD5 0acfd71b683270315b2ba5564d2c8685 files/digest-ccid-1.1.0 232 RMD160 5a938fc31b25a9eb14f11cc4df4ba6cb034ba5fa files/digest-ccid-1.1.0 232 SHA256 11d9258df5c671437fbfff519020e6efd895d3af326b5931411d6f87eea7dfd3 files/digest-ccid-1.1.0 232 +MD5 0acfd71b683270315b2ba5564d2c8685 files/digest-ccid-1.1.0-r1 232 +RMD160 5a938fc31b25a9eb14f11cc4df4ba6cb034ba5fa files/digest-ccid-1.1.0-r1 232 +SHA256 11d9258df5c671437fbfff519020e6efd895d3af326b5931411d6f87eea7dfd3 files/digest-ccid-1.1.0-r1 232 diff --git a/app-crypt/ccid/ccid-1.1.0-r1.ebuild b/app-crypt/ccid/ccid-1.1.0-r1.ebuild new file mode 100644 index 000000000000..3df534ee1d06 --- /dev/null +++ b/app-crypt/ccid/ccid-1.1.0-r1.ebuild @@ -0,0 +1,48 @@ +# Copyright 1999-2006 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/app-crypt/ccid/ccid-1.1.0-r1.ebuild,v 1.1 2006/12/28 20:50:48 alonbl Exp $ + +inherit eutils autotools + +DL_NUM="1740" +DESCRIPTION="CCID free software driver" +HOMEPAGE="http://pcsclite.alioth.debian.org/ccid.html" +SRC_URI="http://alioth.debian.org/download.php/${DL_NUM}/${P}.tar.gz" +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~ppc ~x86" +IUSE="chipcard2 twinserial" +RDEPEND=" + !chipcard2? ( + >=sys-apps/pcsc-lite-1.3.2 + >=dev-libs/libusb-0.1.4 + ) + chipcard2? sys-libs/libchipcard" + +src_unpack() { + unpack ${A} + cd "${S}" + epatch "${FILESDIR}/${P}-build.patch" + eautoreconf +} + +src_compile() { + local myconf + + # bug 131421 - allow ccid to work with sys-libs/libchipcard + use chipcard2 && myconf="${myconf} \ + --enable-usbdropdir=/usr/lib/chipcard2-server/lowlevel/ifd \ + --enable-ccidtwindir=/usr/lib/chipcard2-server/lowlevel/ifd" + + use nousb && myconf="${myconf} --disable-pcsclite" + + econf \ + ${myconf} \ + $(use_enable twinserial) || die "econf failed" + emake || die "emake failed" +} + +src_install() { + make install DESTDIR="${D}" || die "Cannot install" + dodoc README AUTHORS +} diff --git a/app-crypt/ccid/files/ccid-1.1.0-build.patch b/app-crypt/ccid/files/ccid-1.1.0-build.patch new file mode 100644 index 000000000000..2840593c69b0 --- /dev/null +++ b/app-crypt/ccid/files/ccid-1.1.0-build.patch @@ -0,0 +1,42 @@ +diff -urNp ccid-1.1.0.org/configure.in ccid-1.1.0/configure.in +--- ccid-1.1.0.org/configure.in 2006-08-11 20:22:30.000000000 +0300 ++++ ccid-1.1.0/configure.in 2006-12-28 22:28:37.000000000 +0200 +@@ -211,13 +211,9 @@ fi + # --enable-twinserial + AC_ARG_ENABLE(twinserial, + AC_HELP_STRING([--enable-twinserial],[also compile and install the serial Twin driver]), +- [twinserial="${enableval}"], [twinserial=false]) ++ [twinserial="${enableval}"], [twinserial=no]) + AC_MSG_RESULT([build and install serial Twin driver : $twinserial]) +-if test "${twinserial}" = false ; then +- AM_CONDITIONAL(WITH_TWIN_SERIAL, false) +-else +- AM_CONDITIONAL(WITH_TWIN_SERIAL, true) +-fi ++AM_CONDITIONAL(WITH_TWIN_SERIAL, test "${twinserial}" != "no") + + # --enable-ccidtwindir=DIR + AC_ARG_ENABLE(ccidtwindir, +@@ -234,9 +230,7 @@ AC_ARG_ENABLE(pcsclite, + AC_HELP_STRING([--disable-pcsclite],[do not use pcsc-lite debug support]), + [ pcsclite="${enableval}" ], [ pcsclite=yes ] ) + +-if test "${pcsclite}" = no ; then +- AM_CONDITIONAL(WITHOUT_PCSC, true) +-else ++if test "${pcsclite}" != "no" ; then + # check that pcsc-lite is installed + OLD_LIBS="$LIBS" + LIBS="$LIBS $PCSC_LIBS" +@@ -244,10 +238,9 @@ else + [AC_MSG_ERROR([SCardEstablishContext() not found, install pcsc-lite 1.2.9-beta9 or later, or use PCSC_LIBS=... ./configure])]) + LIBS="$OLD_LIBS" + +- AM_CONDITIONAL(WITHOUT_PCSC, false) +- + pcsclite=yes + fi ++AM_CONDITIONAL(WITHOUT_PCSC, test "${pcsclite}" != "no") + AC_MSG_RESULT([compiled for pcsc-lite : $pcsclite]) + + diff --git a/app-crypt/ccid/files/digest-ccid-1.1.0-r1 b/app-crypt/ccid/files/digest-ccid-1.1.0-r1 new file mode 100644 index 000000000000..94b385228506 --- /dev/null +++ b/app-crypt/ccid/files/digest-ccid-1.1.0-r1 @@ -0,0 +1,3 @@ +MD5 3d216cb89030c6a74fb6851bcc80b08e ccid-1.1.0.tar.gz 540628 +RMD160 9569d64e597b1f6248e394517434ef170a1e5662 ccid-1.1.0.tar.gz 540628 +SHA256 a11c6df683a529d7101cf1dbcf1e376e9e01a9f7b3e73a1b19f335dd32c93093 ccid-1.1.0.tar.gz 540628