Version bump.

Package-Manager: portage-13308-svn/cvs/Linux x86_64

6 files changed, 128 insertions, 9 deletions

diff --git a/sys-apps/ifd-gempc/ChangeLog b/sys-apps/ifd-gempc/ChangeLog
index 9f96f2f3a6f8..3f6c6703ff51 100644
--- a/sys-apps/ifd-gempc/ChangeLog
+++ b/sys-apps/ifd-gempc/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for sys-apps/ifd-gempc
-# Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/ifd-gempc/ChangeLog,v 1.12 2007/11/11 06:25:53 alonbl Exp $
+# Copyright 2000-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/ifd-gempc/ChangeLog,v 1.13 2009/04/10 00:39:41 arfrever Exp $
+
+*ifd-gempc-1.0.4 (10 Apr 2009)
+
+  10 Apr 2009; Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org>
+  +files/ifd-gempc-1.0.4-respect_LDFLAGS.patch, files/reader.conf,
+  ifd-gempc-1.0.3.ebuild, +ifd-gempc-1.0.4.ebuild:
+  Version bump.
 
   11 Nov 2007; Alon Bar-Lev <alonbl@gentoo.org> ifd-gempc-1.0.3.ebuild:
   Cleanups
diff --git a/sys-apps/ifd-gempc/Manifest b/sys-apps/ifd-gempc/Manifest
index cd7863c0d81b..b84bc0b58733 100644
--- a/sys-apps/ifd-gempc/Manifest
+++ b/sys-apps/ifd-gempc/Manifest
@@ -1,5 +1,8 @@
-AUX reader.conf 253 RMD160 3241986fa21df7ec3936cd11ffbe684ffd1c7619 SHA1 e2cf484917cd448012447221be0e76a0aab25b6a SHA256 f56d81d01d8befed58c6918e0d8d9b62da8037d446068045cca2aa7b6488fb1e
+AUX ifd-gempc-1.0.4-respect_LDFLAGS.patch 1640 RMD160 cd68a956be815d9228050ee7f3a8e8ecd44faa50 SHA1 e4e5724c122b8f7fe9402a0cb43db15c2cbfe9e6 SHA256 32156ffceae942c8150ad2c9fdde3bd76ba278fe9b4b0d3179be5ac894ea164f
+AUX reader.conf 246 RMD160 1e02a6da021cf8deb3e18fd481df668a02cf400b SHA1 dda1a746cd1367d83c5667c75bdb8fcd712b7094 SHA256 e5c27f84c490f45f3c3fbaaffebe502bc8499795905888345a83d75f70218aee
 DIST ifd-gempc-1.0.3.tar.gz 303831 RMD160 31fb52bb83d7c284bcbc16e04e24554babc64f0a SHA1 8a17e6ea6ab45325f2d897ce09edc63be84b78f2 SHA256 827b58f8f12483bbbcf37fbeb93715aeef152f4c0085251ace7da967df9b12d8
-EBUILD ifd-gempc-1.0.3.ebuild 1518 RMD160 c417e71f42147fd16d45693e7db93edc3e595b82 SHA1 619d16924bafce1e731f89c7b214dced75c5ebfe SHA256 f22231283d8d8f63563c86ea87ccc6c9ed505ab05f20fd390e3faa1e1f28b1cf
-MISC ChangeLog 2372 RMD160 5149eab0b1426ec1344ee1f197048e4456f14fc7 SHA1 33ca44f9f80c3186ac880d11aa8026b3694ec7ff SHA256 e5a10238de9ede4ad258ae0d751cab4e8f35e1d23a5ac6d11dc4f68a8bb1296d
+DIST ifd-gempc-1.0.4.tar.gz 305102 RMD160 214985d0386d82319c42d309d46613a3bc771192 SHA1 39b12896d8f943424aa137fc9129b742970838d0 SHA256 7c80b12a0ed6ace161e1408bbf2d32674d9960413824fe689ac5eb14a5171bdb
+EBUILD ifd-gempc-1.0.3.ebuild 1566 RMD160 022b95ea25339ce242a5445eb5325c578eb2d463 SHA1 b12412d43a70d48993ef266b096cb271ab67470e SHA256 ed6fd3629b5029f3fef53956b088cd0394e1897410e2bc888e320d8717353969
+EBUILD ifd-gempc-1.0.4.ebuild 1680 RMD160 e29a7713b2403a18824ab9e62c3972ca339c61f6 SHA1 69536419cb3a9afe7f02877409743cf3d0ddb969 SHA256 66120d6182d1d805c819ac8aff1b75e9002c54f9f0df39eacac2c507147511c1
+MISC ChangeLog 2614 RMD160 cd5ff845235586039cc4a67dedd0421af5edb99c SHA1 9104334969004c6adad762cd28ab644f90b4f303 SHA256 892164ee9ed90b7866a495d6f21092a32b6ff53b5c2e7686f32f9b8623ed18d3
 MISC metadata.xml 315 RMD160 93a7f942f2f279df1959ce7b8fdb482c1f5e6ed9 SHA1 4681859d7d7c68b5bd7d37a6b6e429b20cad729f SHA256 46fae106f99247755d60ff913fc885ed505ab6b8eb178bfc70fbed84236961cd
diff --git a/sys-apps/ifd-gempc/files/ifd-gempc-1.0.4-respect_LDFLAGS.patch b/sys-apps/ifd-gempc/files/ifd-gempc-1.0.4-respect_LDFLAGS.patch
new file mode 100644
index 000000000000..c8f2f7ad326a
--- /dev/null
+++ b/sys-apps/ifd-gempc/files/ifd-gempc-1.0.4-respect_LDFLAGS.patch
@@ -0,0 +1,52 @@
+--- GemPC410/Makefile
++++ GemPC410/Makefile
+@@ -40,7 +40,7 @@
+ 
+ libGemPC410.so: common $(targets)
+ 	rm -f $@
+-	$(CC) -shared $(targets) $(common_targets) -o $@
++	$(CC) -shared $(LDFLAGS) $(targets) $(common_targets) -o $@
+ 	chmod -x $@
+ 	mv $@ $@.$(version)
+ 
+--- GemPC430/Makefile
++++ GemPC430/Makefile
+@@ -5,7 +5,7 @@
+ # set these paths to where you installed pcsc-lite and libusb
+ # you can use more than one path in each variable
+ INCS = -I/usr/local/include `pkg-config libpcsclite --cflags`
+-LIBS = -L/usr/local/lib
++LIBS = -L/usr/local/lib -lusb
+ INSTALL_DIR = $(DESTDIR)`pkg-config libpcsclite --variable=usbdropdir`
+ 
+ # use a correct default CFLAGS
+@@ -14,7 +14,6 @@
+ else
+ CFLAGS += -Wall -fPIC -I. -I../common -DGEMPC=430 $(INCS)
+ endif
+-LDFLAGS = $(LIBS) -lusb
+ 
+ # /home/rousseau/sc/pcsc/i/ifd-gempc-0.5.10/GemPC410 -> 0.5.10
+ version=$(shell expr `pwd` : '.*-\([0-9.]*\)')
+@@ -27,7 +26,7 @@
+ 
+ check: check_stamp
+ check_stamp:
+-	CFLAGS="$(INCS)" LDFLAGS="$(LIBS)" ../check 430
++	CFLAGS="$(INCS)" LIBS="$(LIBS)" ../check 430
+ 	touch check_stamp
+ 
+ expert: ifd-GemPC430 libGemPC430.so
+@@ -36,10 +35,10 @@
+ 	$(MAKE) -C ../common CFLAGS="$(CFLAGS) -I../GemPC430" all
+ 
+ ifd-GemPC430: common $(targets) main.o ../common/GCdebug.o
+-	$(CC) $(LDFLAGS) -o $@ $(targets) $(common_targets) main.o ../common/GCdebug.o
++	$(CC) $(LDFLAGS) -o $@ $(targets) $(common_targets) main.o ../common/GCdebug.o $(LIBS)
+ 
+ libGemPC430.so: common $(targets)
+-	$(CC) -shared $(LDFLAGS) -o $@ $(targets) $(common_targets)
++	$(CC) -shared $(LDFLAGS) -o $@ $(targets) $(common_targets) $(LIBS)
+ 
+ main.o: ../GemPC410/main.c
+ 	$(CC) $(CFLAGS) -c -o $@ $^
diff --git a/sys-apps/ifd-gempc/files/reader.conf b/sys-apps/ifd-gempc/files/reader.conf
index 86e99bbab795..74de4a1a60ca 100644
--- a/sys-apps/ifd-gempc/files/reader.conf
+++ b/sys-apps/ifd-gempc/files/reader.conf
@@ -5,7 +5,7 @@
 FRIENDLYNAME    "GemPC410"
 # Update the following to the right COM port
 DEVICENAME       /dev/null
-LIBPATH          %PCSC_DRIVERS_DIR%/serial/libGemPC410.so.1.0.1
+LIBPATH          %PCSC_DRIVERS_DIR%/serial/%libGemPC410%
 CHANNELID        1
 
 # End of file
diff --git a/sys-apps/ifd-gempc/ifd-gempc-1.0.3.ebuild b/sys-apps/ifd-gempc/ifd-gempc-1.0.3.ebuild
index af58980eee9e..893d5bf3ae7f 100644
--- a/sys-apps/ifd-gempc/ifd-gempc-1.0.3.ebuild
+++ b/sys-apps/ifd-gempc/ifd-gempc-1.0.3.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/ifd-gempc/ifd-gempc-1.0.3.ebuild,v 1.2 2007/11/11 06:25:53 alonbl Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/ifd-gempc/ifd-gempc-1.0.3.ebuild,v 1.3 2009/04/10 00:39:41 arfrever Exp $
 
 inherit eutils toolchain-funcs
 
@@ -28,7 +28,7 @@ src_install () {
 	dodir "$(dirname "${conf}")"
 	insinto "$(dirname "${conf}")"
 	newins "${FILESDIR}/reader.conf" "$(basename "${conf}")"
-	sed -i "s#%PCSC_DRIVERS_DIR%#${pcscdir}#g" "${D}/${conf}"
+	sed -e "s:%PCSC_DRIVERS_DIR%:${pcscdir}:g" -e "s:%libGemPC410%:libGemPC410.so.${PV}:g" -i "${D}${conf}"
 
 	einfo "NOTICE:"
 	einfo "1. if you are using GemPC410 modify ${conf}"
diff --git a/sys-apps/ifd-gempc/ifd-gempc-1.0.4.ebuild b/sys-apps/ifd-gempc/ifd-gempc-1.0.4.ebuild
new file mode 100644
index 000000000000..b8d5f0bbfb6a
--- /dev/null
+++ b/sys-apps/ifd-gempc/ifd-gempc-1.0.4.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/ifd-gempc/ifd-gempc-1.0.4.ebuild,v 1.1 2009/04/10 00:39:41 arfrever Exp $
+
+inherit eutils toolchain-funcs
+
+DESCRIPTION="GemCore based PC/SC reader drivers for pcsc-lite"
+HOMEPAGE="http://ludovic.rousseau.free.fr/softwares/ifd-GemPC"
+LICENSE="GPL-2 BSD"
+KEYWORDS="~amd64 ~ppc ~x86"
+SLOT="0"
+SRC_URI="http://ludovic.rousseau.free.fr/softwares/ifd-GemPC/${P}.tar.gz"
+IUSE=""
+RDEPEND=">=sys-apps/pcsc-lite-1.2.9_beta7
+	>=dev-libs/libusb-0.1.10a"
+DEPEND="${RDEPEND}
+	dev-util/pkgconfig"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	epatch "${FILESDIR}/${P}-respect_LDFLAGS.patch"
+}
+
+src_compile() {
+	emake CC="$(tc-getCC)" || die "emake failed"
+}
+
+src_install () {
+	local pcscdir="$(pkg-config --variable=usbdropdir libpcsclite)"
+	local conf="/etc/reader.conf.d/${PN}.conf"
+	emake install CC="$(tc-getCC)" DESTDIR="${D}" || die
+	dodoc README*
+	dodir "$(dirname "${conf}")"
+	insinto "$(dirname "${conf}")"
+	newins "${FILESDIR}/reader.conf" "$(basename "${conf}")"
+	sed -e "s:%PCSC_DRIVERS_DIR%:${pcscdir}:g" -e "s:%libGemPC410%:libGemPC410.so.${PV}:g" -i "${D}${conf}"
+
+	einfo "NOTICE:"
+	einfo "1. if you are using GemPC410 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
+}