Version bump, remove old and patches. It's likely not going to work anyway, since pcsc-lite has changed on its own, but at least provide what upstream provides.

Package-Manager: portage-2.2.0_alpha10/cvs/Linux x86_64

6 files changed, 27 insertions, 171 deletions

diff --git a/sys-apps/ifd-gempc/ChangeLog b/sys-apps/ifd-gempc/ChangeLog
index 072b8c7876da..0d770020e276 100644
--- a/sys-apps/ifd-gempc/ChangeLog
+++ b/sys-apps/ifd-gempc/ChangeLog
@@ -1,6 +1,16 @@
 # ChangeLog for sys-apps/ifd-gempc
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/ifd-gempc/ChangeLog,v 1.15 2009/05/16 09:23:13 robbat2 Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/ifd-gempc/ChangeLog,v 1.16 2010/12/26 18:35:31 flameeyes Exp $
+
+*ifd-gempc-1.0.6 (26 Dec 2010)
+
+  26 Dec 2010; Diego E. Pettenò <flameeyes@gentoo.org>
+  -ifd-gempc-1.0.3.ebuild, -ifd-gempc-1.0.4.ebuild,
+  -files/ifd-gempc-1.0.4-respect_LDFLAGS.patch, -ifd-gempc-1.0.5.ebuild,
+  +ifd-gempc-1.0.6.ebuild:
+  Version bump, remove old and patches. It's likely not going to work anyway,
+  since pcsc-lite has changed on its own, but at least provide what upstream
+  provides.
 
   16 May 2009; Robin H. Johnson <robbat2@gentoo.org> ifd-gempc-1.0.3.ebuild,
   ifd-gempc-1.0.4.ebuild, ifd-gempc-1.0.5.ebuild:
diff --git a/sys-apps/ifd-gempc/Manifest b/sys-apps/ifd-gempc/Manifest
index 6ba77da8140d..3bea9a6cfae1 100644
--- a/sys-apps/ifd-gempc/Manifest
+++ b/sys-apps/ifd-gempc/Manifest
@@ -1,10 +1,15 @@
-AUX ifd-gempc-1.0.4-respect_LDFLAGS.patch 1640 RMD160 cd68a956be815d9228050ee7f3a8e8ecd44faa50 SHA1 e4e5724c122b8f7fe9402a0cb43db15c2cbfe9e6 SHA256 32156ffceae942c8150ad2c9fdde3bd76ba278fe9b4b0d3179be5ac894ea164f
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 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
-DIST ifd-gempc-1.0.4.tar.gz 305102 RMD160 214985d0386d82319c42d309d46613a3bc771192 SHA1 39b12896d8f943424aa137fc9129b742970838d0 SHA256 7c80b12a0ed6ace161e1408bbf2d32674d9960413824fe689ac5eb14a5171bdb
-DIST ifd-gempc-1.0.5.tar.gz 75838 RMD160 17731c7e85359adc3177f5b7f214662ea7c0c6af SHA1 280e907fbc6d0b34d399c2eaa34fa9da41ee5bec SHA256 11897da6702f3ea5920175576c6f19b0d122bc8ec34c3154a6abad9573fab68d
-EBUILD ifd-gempc-1.0.3.ebuild 1558 RMD160 d565789d24d3337678ef80f6390e2ac6dd16cdb8 SHA1 84fb81d78caf1d33538308705e0588d8d9fa81f4 SHA256 56bcd23de41c1e1a53db71b72e86af56d8d4af117fadd9fc4365dfe6e7c6deda
-EBUILD ifd-gempc-1.0.4.ebuild 1672 RMD160 4712cafd2b8700c4f7cd8a91cb6008d5ee0cd25d SHA1 2b5c1fa2e3d67eee45bd45360ab112038ff29ea8 SHA256 edc68f10224e9a630a95a4071ea0e465c8315939d0bdea465c0cb84b598fb0be
-EBUILD ifd-gempc-1.0.5.ebuild 1650 RMD160 0defd00938f02d50cd26d577b4220d171de4f513 SHA1 d0b0130170bc6e3af00abc753309e17838608b5f SHA256 ae7471fcb7e42e127c6d162e663de334d8649b027b31f42a1ac00850f0c2c7e5
-MISC ChangeLog 2950 RMD160 1af234cd1d57a81d346d2118e7aeeaf79061af5d SHA1 dfc9b94d8f5dc0bcc9a8b87801dd88c42d9b969b SHA256 4679e9c20d3e125888b2337407c3366cf77af58d832ece7fc9f47c32b3bfaf85
+DIST ifd-gempc-1.0.6.tar.gz 76156 RMD160 95bb5616a110325dea1612a80dec640a5ad2faf1 SHA1 545f427aa62f04cb4dbbb6b99c6caf6caec750f6 SHA256 29f772aed8f0dfaf65c1f539338c728344af2cf50aca6b5652ed4afca65d3da3
+EBUILD ifd-gempc-1.0.6.ebuild 1652 RMD160 68d1b4a224d9d022d0aa8478bf9084709069540f SHA1 c3c45b81258cc9ddddb81f78430f84aac2cec6d3 SHA256 48365c67ca4f026960187e174b486bdb3c605cd52ae450edc5b4d8cba7862de0
+MISC ChangeLog 3360 RMD160 68e205eda6cf286d8ec14f6367ce8d0c1407853d SHA1 d5a08b11bfea30476e05c69473ed62655c2a5606 SHA256 880b54cb617fbbe7ce6710fffb8eca7e985d4c2f493219b269dbdd91f8270e15
 MISC metadata.xml 315 RMD160 93a7f942f2f279df1959ce7b8fdb482c1f5e6ed9 SHA1 4681859d7d7c68b5bd7d37a6b6e429b20cad729f SHA256 46fae106f99247755d60ff913fc885ed505ab6b8eb178bfc70fbed84236961cd
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.16 (GNU/Linux)
+
+iEYEARECAAYFAk0XitIACgkQAiZjviIA2XgtLQCg7E6XDDeLBUH9lMAtBbtT0rNs
+n6kAoPAjIKlXomQpIfNPMXkQPhiWCP9W
+=cnum
+-----END PGP SIGNATURE-----
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
deleted file mode 100644
index c8f2f7ad326a..000000000000
--- a/sys-apps/ifd-gempc/files/ifd-gempc-1.0.4-respect_LDFLAGS.patch
+++ /dev/null
@@ -1,52 +0,0 @@
---- 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/ifd-gempc-1.0.3.ebuild b/sys-apps/ifd-gempc/ifd-gempc-1.0.3.ebuild
deleted file mode 100644
index a5f338c5f036..000000000000
--- a/sys-apps/ifd-gempc/ifd-gempc-1.0.3.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# 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.4 2009/05/16 09:23:13 robbat2 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="~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_beta5
-	=virtual/libusb-0*"
-DEPEND="${RDEPEND}
-	dev-util/pkgconfig"
-
-src_compile() {
-	emake CC="$(tc-getCC)" || die
-}
-
-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
-}
diff --git a/sys-apps/ifd-gempc/ifd-gempc-1.0.4.ebuild b/sys-apps/ifd-gempc/ifd-gempc-1.0.4.ebuild
deleted file mode 100644
index ad80efb39d61..000000000000
--- a/sys-apps/ifd-gempc/ifd-gempc-1.0.4.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# 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.2 2009/05/16 09:23:13 robbat2 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
-	=virtual/libusb-0*"
-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
-}
diff --git a/sys-apps/ifd-gempc/ifd-gempc-1.0.5.ebuild b/sys-apps/ifd-gempc/ifd-gempc-1.0.6.ebuild
index 7219c2e6278e..6003797fff58 100644
--- a/sys-apps/ifd-gempc/ifd-gempc-1.0.5.ebuild
+++ b/sys-apps/ifd-gempc/ifd-gempc-1.0.6.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2010 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.5.ebuild,v 1.2 2009/05/16 09:23:13 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/ifd-gempc/ifd-gempc-1.0.6.ebuild,v 1.1 2010/12/26 18:35:31 flameeyes Exp $
 
 inherit toolchain-funcs