Add sys-libs/libchipcard support through chipcard2 USE flag. Fixes bug 131421, reported by Christoph Probst <chris-ml-gentoo-bugzilla at netzpunkt dot org>. Also removing old ebuilds.

(Portage version: 2.0.54)

7 files changed, 27 insertions, 42 deletions

diff --git a/app-crypt/ccid/ChangeLog b/app-crypt/ccid/ChangeLog
index 5365d8ca1070..c4d125a9c50e 100644
--- a/app-crypt/ccid/ChangeLog
+++ b/app-crypt/ccid/ChangeLog
@@ -1,6 +1,14 @@
 # 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.7 2006/04/22 21:01:29 vanquirius Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/ccid/ChangeLog,v 1.8 2006/05/24 02:44:03 vanquirius Exp $
+
+*ccid-1.0.1-r1 (24 May 2006)
+
+  24 May 2006; Marcelo Goes <vanquirius@gentoo.org> -ccid-0.9.4.3.ebuild,
+  -ccid-1.0.0.ebuild, +ccid-1.0.1-r1.ebuild:
+  Add sys-libs/libchipcard support through chipcard2 USE flag. Fixes bug
+  131421, reported by Christoph Probst <chris-ml-gentoo-bugzilla at netzpunkt
+  dot org>. Also removing old ebuilds.
 
 *ccid-1.0.1 (22 Apr 2006)
 
diff --git a/app-crypt/ccid/Manifest b/app-crypt/ccid/Manifest
index 08aa9c480b2a..b112e8044ce4 100644
--- a/app-crypt/ccid/Manifest
+++ b/app-crypt/ccid/Manifest
@@ -1,8 +1,8 @@
 MD5 8ec6cc76c2fcda57af8cd626e5b15979 ChangeLog 1503
-MD5 199d9c382941b2c6d6fe857335d8088e ccid-0.9.4.3.ebuild 877
-MD5 40e0518e541f4121ac8e2883c8f2b48a ccid-1.0.0.ebuild 630
+MD5 6c980df3c2968551ecaeb5e5286f87a6 ccid-1.0.1-r1.ebuild 986
 MD5 6203fb12b98f3cb3460f3e5232775432 ccid-1.0.1.ebuild 630
 MD5 d94d0d1884c8abdd81c3854e95486f42 files/digest-ccid-0.9.4.3 130
 MD5 dd7942e4cc2c6341639d398a2e552b8d files/digest-ccid-1.0.0 62
 MD5 aee7612ac414fe84589084fc4e20038d files/digest-ccid-1.0.1 62
+MD5 aee7612ac414fe84589084fc4e20038d files/digest-ccid-1.0.1-r1 62
 MD5 2603eeeb20b24caddac3e9ce6996f357 metadata.xml 251
diff --git a/app-crypt/ccid/ccid-0.9.4.3.ebuild b/app-crypt/ccid/ccid-0.9.4.3.ebuild
deleted file mode 100644
index 9cf1efad0a2d..000000000000
--- a/app-crypt/ccid/ccid-0.9.4.3.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/ccid/ccid-0.9.4.3.ebuild,v 1.1 2005/12/10 17:56:26 vanquirius Exp $
-
-inherit eutils
-
-DESCRIPTION="CCID free software driver"
-HOMEPAGE="http://pcsclite.alioth.debian.org/ccid.html"
-MY_PV="${PV%.*}"
-MY_PV_P="${PV/*[^.].}"
-SRC_URI="mirror://debian/pool/main/c/ccid/ccid_${MY_PV}.orig.tar.gz
-	mirror://debian/pool/main/c/ccid/ccid_${MY_PV}-${MY_PV_P}.diff.gz"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~ppc ~x86"
-IUSE=""
-S="${WORKDIR}/ccid-${MY_PV}.orig"
-RDEPEND=">=sys-apps/pcsc-lite-1.2.9_beta9
-	>=dev-libs/libusb-0.1.4"
-
-
-src_unpack () {
-	unpack ${A}
-	cd "${S}"
-	epatch "${WORKDIR}/ccid_${MY_PV}-${MY_PV_P}.diff"
-}
-
-src_install() {
-	cd ccid-${MY_PV}.orig
-	make install DESTDIR="${D}" || die "Cannot install"
-
-	dodoc README AUTHORS
-}
diff --git a/app-crypt/ccid/ccid-1.0.0.ebuild b/app-crypt/ccid/ccid-1.0.1-r1.ebuild
index 6a4826b1e63f..65c18be45505 100644
--- a/app-crypt/ccid/ccid-1.0.0.ebuild
+++ b/app-crypt/ccid/ccid-1.0.1-r1.ebuild
@@ -1,20 +1,32 @@
 # 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.0.0.ebuild,v 1.1 2006/04/01 19:36:29 vanquirius Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/ccid/ccid-1.0.1-r1.ebuild,v 1.1 2006/05/24 02:44:03 vanquirius Exp $
 
 inherit eutils
 
-DL_NUM="1474"
+DL_NUM="1563"
 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="~ppc ~x86"
-IUSE=""
+IUSE="chipcard2"
 RDEPEND=">=sys-apps/pcsc-lite-1.2.9_beta9
 	>=dev-libs/libusb-0.1.4"
 
+src_compile() {
+	local myconf
+
+	# bug 131421 - allow ccid to work with sys-libs/libchipcard
+	use chipcard2 && myconf="${myconf} --disable-pcsclite \
+		--enable-usbdropdir=/usr/lib/chipcard2-server/lowlevel/ifd \
+		--enable-ccidtwindir=/usr/lib/chipcard2-server/lowlevel/ifd"
+
+	econf ${myconf} || 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/digest-ccid-0.9.4.3 b/app-crypt/ccid/files/digest-ccid-0.9.4.3
deleted file mode 100644
index 760d9bd3189a..000000000000
--- a/app-crypt/ccid/files/digest-ccid-0.9.4.3
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 f838ebae8e56edb4bf31c865ac6c737e ccid_0.9.4-3.diff.gz 5199
-MD5 7553bba06c8f2d503fbaf9c60002ea50 ccid_0.9.4.orig.tar.gz 515604
diff --git a/app-crypt/ccid/files/digest-ccid-1.0.0 b/app-crypt/ccid/files/digest-ccid-1.0.0
deleted file mode 100644
index 587377dcc75e..000000000000
--- a/app-crypt/ccid/files/digest-ccid-1.0.0
+++ /dev/null
@@ -1 +0,0 @@
-MD5 cae1d55c3361d6202adfdbea9d4e94d7 ccid-1.0.0.tar.gz 536090
diff --git a/app-crypt/ccid/files/digest-ccid-1.0.1-r1 b/app-crypt/ccid/files/digest-ccid-1.0.1-r1
new file mode 100644
index 000000000000..6142f2a1eb38
--- /dev/null
+++ b/app-crypt/ccid/files/digest-ccid-1.0.1-r1
@@ -0,0 +1 @@
+MD5 858bd7d680cdaf0ac53c70d43974a2df ccid-1.0.1.tar.gz 529540