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.

(Portage version: 2.2.0_alpha10/cvs/Linux x86_64)

5 files changed, 14 insertions, 163 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/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