From: Hanno Boeck <hanno@gentoo.org>
Date: Fri, 20 Apr 2007 19:06:59 +0000 (+0000)
Subject: remove libchipcard-specific stuff in ccid
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=fbff01841cde1c1817fd6e50ec911867112d66ae;p=gentoo.git

remove libchipcard-specific stuff in ccid
Package-Manager: portage-2.1.2.4
---

diff --git a/app-crypt/ccid/ChangeLog b/app-crypt/ccid/ChangeLog
index 8074fff9a035..f4cdbb75fe26 100644
--- a/app-crypt/ccid/ChangeLog
+++ b/app-crypt/ccid/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for app-crypt/ccid
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/ccid/ChangeLog,v 1.14 2007/01/27 17:08:49 alonbl Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/ccid/ChangeLog,v 1.15 2007/04/20 19:06:59 hanno Exp $
+
+  20 Apr 2007; Hanno Boeck <hanno@gentoo.org> ccid-1.2.1.ebuild:
+  Remove libchipcard-specific paths.
 
 *ccid-1.2.1 (27 Jan 2007)
 
diff --git a/app-crypt/ccid/Manifest b/app-crypt/ccid/Manifest
index 11f43e3eb581..f1910de32b21 100644
--- a/app-crypt/ccid/Manifest
+++ b/app-crypt/ccid/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 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
@@ -26,14 +29,14 @@ EBUILD ccid-1.2.0.ebuild 1232 RMD160 82360cdee8d9afc73c83fa9bd5e7dfee94fbbad8 SH
 MD5 2f31e0334c34cd486781cff02c92cd9a ccid-1.2.0.ebuild 1232
 RMD160 82360cdee8d9afc73c83fa9bd5e7dfee94fbbad8 ccid-1.2.0.ebuild 1232
 SHA256 b575a9b76242f07ba8bcd64ecc4dda94b004ca0cd58606c258280e2bac4de199 ccid-1.2.0.ebuild 1232
-EBUILD ccid-1.2.1.ebuild 1232 RMD160 c7ca04dfeb4d299bf42e546939ef9387f2443576 SHA1 259f5de756a8b4ac1716caaf852b9618049e067f SHA256 21844039ef6a1e0f7addab594be244f2bb90dbd61c67bd8ba719a61c76b0d115
-MD5 bc667f223f63fdbce0e53e9e338fc5ab ccid-1.2.1.ebuild 1232
-RMD160 c7ca04dfeb4d299bf42e546939ef9387f2443576 ccid-1.2.1.ebuild 1232
-SHA256 21844039ef6a1e0f7addab594be244f2bb90dbd61c67bd8ba719a61c76b0d115 ccid-1.2.1.ebuild 1232
-MISC ChangeLog 2692 RMD160 f8a2498d80b3ae786a52e7991ae3f3a169ff4a2e SHA1 e02e0795847e0c7fc82a57f980d7b70d138f27da SHA256 1bf93c2d476acad9931102d26e8c25c10041a96dfe723b40d3aa908bbf5e9b45
-MD5 3cb5cf92c49acd2012dec06efebb744d ChangeLog 2692
-RMD160 f8a2498d80b3ae786a52e7991ae3f3a169ff4a2e ChangeLog 2692
-SHA256 1bf93c2d476acad9931102d26e8c25c10041a96dfe723b40d3aa908bbf5e9b45 ChangeLog 2692
+EBUILD ccid-1.2.1.ebuild 942 RMD160 ae78b8b5279ee8354495d925f27ed2d28d28611e SHA1 1843e6bcc8ef32aae5ed2c28810f58d7b677cd3c SHA256 1bc22f3c123620613ce514aee5b13cdb56f3fa4986b01f250e4bb3231c2eb609
+MD5 a4cc24a28de873a34ed1d6abc99f2e94 ccid-1.2.1.ebuild 942
+RMD160 ae78b8b5279ee8354495d925f27ed2d28d28611e ccid-1.2.1.ebuild 942
+SHA256 1bc22f3c123620613ce514aee5b13cdb56f3fa4986b01f250e4bb3231c2eb609 ccid-1.2.1.ebuild 942
+MISC ChangeLog 2794 RMD160 0290f67f28c0c66eb3812ab2bbecc7eb3a6c7a23 SHA1 e7b450e6124462fb9efc7c485513c4da27e251fa SHA256 ce7a080eb608300cf4f9c4a4e859d140f1ade936e107512f648861b6e9871b50
+MD5 a89abc777615115fb87952343cdc2b7a ChangeLog 2794
+RMD160 0290f67f28c0c66eb3812ab2bbecc7eb3a6c7a23 ChangeLog 2794
+SHA256 ce7a080eb608300cf4f9c4a4e859d140f1ade936e107512f648861b6e9871b50 ChangeLog 2794
 MISC metadata.xml 251 RMD160 9c13ff790c7419d4e0d2d370036b7f4e4594ea4f SHA1 563aa19984b291a6cade6d6487dbf4a2a17e6874 SHA256 1739a4e8833a2a5b9501182eb830cbd3e26014ccef5e9ae1b4d7a0686c665c1b
 MD5 2603eeeb20b24caddac3e9ce6996f357 metadata.xml 251
 RMD160 9c13ff790c7419d4e0d2d370036b7f4e4594ea4f metadata.xml 251
@@ -56,3 +59,10 @@ SHA256 42e9ebc15faf045be1ed84e413d423d1b48fe879fc9a6f968c4ef56e54e5b8d7 files/di
 MD5 32673899fc65c06010e158aa5dbc4cf1 files/digest-ccid-1.2.1 232
 RMD160 a1ac9d7519ba9b25635d658ad37bd264607505ac files/digest-ccid-1.2.1 232
 SHA256 d97ce702e082c069982454e575c4cd5b5c82d2e95b6c827e2d7b2423cc1d598f files/digest-ccid-1.2.1 232
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.3 (GNU/Linux)
+
+iD8DBQFGKQ9Yr2QksT29OyARApQJAJ4h895SUjQPKRwzQCbxV9/epn4OBACfc8L9
+OPGt5FzvMqjnv3xFKdoJcO4=
+=Kxf5
+-----END PGP SIGNATURE-----
diff --git a/app-crypt/ccid/ccid-1.2.1.ebuild b/app-crypt/ccid/ccid-1.2.1.ebuild
index 84817bba18cf..2f1cfefb91b9 100644
--- a/app-crypt/ccid/ccid-1.2.1.ebuild
+++ b/app-crypt/ccid/ccid-1.2.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/ccid/ccid-1.2.1.ebuild,v 1.1 2007/01/27 17:08:49 alonbl Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/ccid/ccid-1.2.1.ebuild,v 1.2 2007/04/20 19:06:59 hanno Exp $
 
 inherit eutils autotools
 
@@ -11,19 +11,13 @@ SRC_URI="http://alioth.debian.org/download.php/${STUPID_NUM}/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="chipcard2 twinserial nousb"
+IUSE="twinserial nousb"
 RDEPEND=">=sys-apps/pcsc-lite-1.3.3
-	!chipcard2? ( >=dev-libs/libusb-0.1.4 )
-	chipcard2? ( sys-libs/libchipcard )"
+	>=dev-libs/libusb-0.1.4"
 
 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 \