4 files changed, 123 insertions, 3 deletions
diff --git a/sys-apps/pcsc-slb-rf72-drv/ChangeLog b/sys-apps/pcsc-slb-rf72-drv/ChangeLog
index eeb3d5e15078..1f9a661b2aed 100644
--- a/sys-apps/pcsc-slb-rf72-drv/ChangeLog
+++ b/sys-apps/pcsc-slb-rf72-drv/ChangeLog
@@ -1,6 +1,16 @@
 # ChangeLog for sys-apps/pcsc-slb-rf72-drv
-# Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/pcsc-slb-rf72-drv/ChangeLog,v 1.11 2007/11/11 13:04:32 alonbl Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/pcsc-slb-rf72-drv/ChangeLog,v 1.12 2010/12/10 19:22:51 c1pher Exp $
+
+*pcsc-slb-rf72-drv-1.1.0-r2 (10 Dec 2010)
+
+  10 Dec 2010; Dane Smith <c1pher@gentoo.org>
+  +pcsc-slb-rf72-drv-1.1.0-r2.ebuild,
+  +files/pcsc-slb-rf72-drv-1.1.0-build-new.patch:
+  Revision bump.
+  *Fixed LDFLAGS respect wrt bug 334775.
+  *Moved to EAPI 2.
+  *Numerous small QA fixes.
 
   11 Nov 2007; Alon Bar-Lev <alonbl@gentoo.org>
   -pcsc-slb-rf72-drv-1.1.0.ebuild:
diff --git a/sys-apps/pcsc-slb-rf72-drv/Manifest b/sys-apps/pcsc-slb-rf72-drv/Manifest
index 742b2cfad0cc..316ad2ba89e6 100644
--- a/sys-apps/pcsc-slb-rf72-drv/Manifest
+++ b/sys-apps/pcsc-slb-rf72-drv/Manifest
@@ -1,6 +1,28 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+AUX pcsc-slb-rf72-drv-1.1.0-build-new.patch 923 RMD160 37c0fb3affa6f50289e35e40b83606237b199635 SHA1 a63ae8771baeed93a05dd8e50ece67a890ab3647 SHA256 38f872da5ff27674faa97b9b2864b5f18bdbd70d11ba0332158bfdbb4ca43012
 AUX pcsc-slb-rf72-drv-1.1.0-build.patch 912 RMD160 10b7b6c2e48fbafe94600ca6d39544c8151dc3e2 SHA1 8d765b24041952a6adb6c3ce0a672d6109cc61e0 SHA256 3e6a1d856e729ecf144701286a4a3c60fcde7d68942e6778f4698d297e797370
 AUX reader.conf 275 RMD160 2d829c6c6262387783030e32ad1543af9d7a8a39 SHA1 744d8645869db60104e734fdfd82fe5a91a8b217 SHA256 98ae5f9a09fd11325c9996da0ed74eb93e6b78e70984ba1f30f3d71de89ea242
 DIST slb_rf72-drv-1.1.0.tar.gz 53110 RMD160 16d67114eb002b9c8f8ebd39940430c31e2594ef SHA1 f39eef22ab2adf6bc6d9ece54c34854b17d51f87 SHA256 9b1abb82fa805377472d158b79bea58abf3532b0559de540ff448b6d8939835c
 EBUILD pcsc-slb-rf72-drv-1.1.0-r1.ebuild 1649 RMD160 d540c1237e4faeb2da276a9cd2ded10541d47a34 SHA1 f9819dd57a02518e707c3419a142c8989f40e76f SHA256 5f7a7d061e930dc5c51756fe91e9a9a9c36879da1b858d64eded76e12f706596
-MISC ChangeLog 1956 RMD160 98cc08629391ff2cfb0b36c8f46b8114a54cb026 SHA1 e58fb0fd6f982e93732e14a2d6b488e30ab02c10 SHA256 19cc3348ac7f001f42f53901f676afcd76964ccd914d6cd96c2f3df51c36dc2f
+EBUILD pcsc-slb-rf72-drv-1.1.0-r2.ebuild 1698 RMD160 b60d8b70663ac4b70f1dcdacdc7aa5dce4e6b00f SHA1 04dabe8a3235affb5816eecf343999bbca4cf810 SHA256 ed5a66993dae6921db1d6ee6c572fdef3c70694a8980a353a7959a2d6bf398e0
+MISC ChangeLog 2240 RMD160 5c4bc822c2d3185de328f6ff94bee609c286291a SHA1 78cca66717046fff8524f397c35af7c7f14c8a7a SHA256 cf3f73bf760a318c0a72191d37b7cd00e74f8a2e5568a7490ae9e7d5358dbc4a
 MISC metadata.xml 159 RMD160 7f0018281c6308f73c2d95b3690e3804f0c353c5 SHA1 09baadee9aeb270d0a7f31be07db9db5c105abbc SHA256 fabd15e2740a2a68e0bda738d0cd4300b133ff11239802afe7e60aa3862c9c03
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.16 (GNU/Linux)
+
+iQIcBAEBAgAGBQJNAn3pAAoJEEsurZwMLhUxhT4P/3HNdgJMsX3OTxO8TVsmsNWK
+KeA5Pheh6/ZAkrgBTxB9030FsXZW2UfOzAsLNgTn7s4o3YMTS+aumttDURzMGfQC
+40UcftK76PDcsboti3WyF9F9b4cwQOlRErzOXIeSDeZlgOX6sT0RjhuXVZkt+eVI
+gVAbckAzTDbQXfioPXe9cnpj5pXnxyqBWJW8R3z51OxS/a6vv7AtYPbkfFvGLzR7
+B5mqFUKFnRTpKKM2J0SMGEnD9/rEHNSLfiQhNyzzy+M+Zppkt2luGj098qXQjugb
+wHlPgMV8U/IQO6byKCetLPAadfaMR2Zb/eYkRDPSFu3QwlXYqkQqEi6sBLJwTWX5
+bpdBr5uoonF1/WoZ6V4vPQ5/q5qSWbwh854h9XNLtkCf/lUpGWo9m8jlpSyoAqJP
+vN4xY8Nm6yAn3EWVJ3KUTC9zH4XuVPiBps44rDoPDY3BTchi+yp5l0/IMMsWQaGq
+87NMx55WEb1gEKPAFRtho0/78E/bwwu6sl9rinNEFjdzboGK1+o9drFVBDuiaui9
+ASS4FteJkvLmThwcRs7FT5przQWj/Q/bD3ryFtD9sRFR8Ii//6bfwlvt2G+jn9CP
+v71NMtbLoTsc17yXwPMX9wLaxgUNa9cynbwxGTbh5KLg0wjoICXFnvwDZVamGovn
+FDQXVPiXyJZC4M/o6aZB
+=Cbbc
+-----END PGP SIGNATURE-----
diff --git a/sys-apps/pcsc-slb-rf72-drv/files/pcsc-slb-rf72-drv-1.1.0-build-new.patch b/sys-apps/pcsc-slb-rf72-drv/files/pcsc-slb-rf72-drv-1.1.0-build-new.patch
new file mode 100644
index 000000000000..dd386b686bc8
--- /dev/null
+++ b/sys-apps/pcsc-slb-rf72-drv/files/pcsc-slb-rf72-drv-1.1.0-build-new.patch
@@ -0,0 +1,24 @@
+diff -urNp slb_rf72.org/ifdhandler.c slb_rf72/ifdhandler.c
+--- slb_rf72.org/ifdhandler.c	2001-08-23 17:19:22.000000000 +0300
++++ slb_rf72/ifdhandler.c	2006-10-07 12:57:43.000000000 +0200
+@@ -37,6 +37,7 @@
+ #ifdef HAVE_PTHREAD_H
+ #include <pthread.h>
+ #endif
++#include <openct/ctapi.h>
+ 
+ /*
+  * Not exported constants definition
+diff -urNp slb_rf72.org/Makefile slb_rf72/Makefile
+--- slb_rf72.org/Makefile	2001-09-05 18:22:00.000000000 +0300
++++ slb_rf72/Makefile	2006-10-07 13:05:20.000000000 +0200
+@@ -16,7 +16,7 @@ clean: 
+ 	rm -f test *.o *.lo *.so
+ 
+ lib:  $(OBJ)
+-	$(LD) -G ifdhandler.o lib/libctapi.a -o libslb_rf72.so
++	$(CC) $(LDFLAGS) -shared `pkg-config --libs-only-L libopenct` -lopenctapi ifdhandler.o -o libslb_rf72.so
+ 
+ ifdhandler.o: ifdhandler.h ifdhandler.c
+-	$(CC) $(CFLAGS) -c ifdhandler.c $(INCLUDES)
++	$(CC) $(CFLAGS) `pkg-config --cflags libopenct` -fPIC -DHAVE_PTHREAD_H -c ifdhandler.c $(INCLUDES)
diff --git a/sys-apps/pcsc-slb-rf72-drv/pcsc-slb-rf72-drv-1.1.0-r2.ebuild b/sys-apps/pcsc-slb-rf72-drv/pcsc-slb-rf72-drv-1.1.0-r2.ebuild
new file mode 100644
index 000000000000..42e56771258a
--- /dev/null
+++ b/sys-apps/pcsc-slb-rf72-drv/pcsc-slb-rf72-drv-1.1.0-r2.ebuild
@@ -0,0 +1,64 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/pcsc-slb-rf72-drv/pcsc-slb-rf72-drv-1.1.0-r2.ebuild,v 1.1 2010/12/10 19:22:51 c1pher Exp $
+
+EAPI="2"
+
+inherit eutils toolchain-funcs
+
+MY_P="slb_rf72"
+S=${WORKDIR}/${MY_P}
+DESCRIPTION="Schlumberger Reflex 72 Serial Smartcard Reader"
+HOMEPAGE="http://www.linuxnet.com/sourcedrivers.html"
+LICENSE="as-is"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+SLOT="0"
+SRC_URI="http://www.linuxnet.com/drivers/readers/files/slb_rf72-drv-1.1.0.tar.gz"
+RDEPEND="sys-apps/pcsc-lite
+	dev-libs/openct"
+DEPEND="${RDEPEND}
+	dev-util/pkgconfig"
+
+src_prepare() {
+	epatch "${FILESDIR}/${P}-build-new.patch"
+}
+
+src_compile() {
+	emake CC="$(tc-getCC)" LD="$(tc-getLD)" || die
+}
+
+src_install () {
+	local pcscdir="$(pkg-config --variable=usbdropdir libpcsclite)"
+	local conf="/etc/reader.conf.d/${PN}.conf"
+
+	dodoc ERRATA README || die
+
+	dodir "${pcscdir}/serial" || die
+	insinto "${pcscdir}/serial"
+	insopts -m755
+	doins libslb_rf72.so || die
+
+	dodir "$(dirname "${conf}")" || die
+	insinto "$(dirname "${conf}")"
+	newins "${FILESDIR}/reader.conf" "$(basename "${conf}")" || die
+	sed -i "s#%PCSC_DRIVERS_DIR%#${pcscdir}#g" "${D}/${conf}" || die
+
+	einfo "NOTICE:"
+	einfo "1. modify ${conf}"
+	einfo "2. run update-reader.conf, yes this is a command..."
+	einfo "3. restart pcscd"
+}
+
+pkg_postrm() {
+	#
+	# Without this, pcscd will not start next time.
+	#
+	local conf="/etc/reader.conf.d/${PN}.conf"
+	if ! [ -f "$(grep LIBPATH "${conf}" | sed 's/LIBPATH *//' | sed 's/ *$//g' | head -n 1)" ]; then
+		rm "${conf}"
+		update-reader.conf
+		einfo "NOTICE:"
+		einfo "You need to restart pcscd"
+	fi
+}