Version bump, and restrict dependencies on .16; thanks to Francesco Riosa for reporting that older version does not work with the new pcsc-lite (bug #340341). Remove oldest version and its patch. New version comes with new smartcard-list.txt file and no longer installs the smartcard.svg file, following instead the upstream-provided desktop file.

(Portage version: 2.2_rc91/cvs/Linux x86_64)

4 files changed, 46 insertions, 47 deletions

diff --git a/sys-apps/pcsc-tools/ChangeLog b/sys-apps/pcsc-tools/ChangeLog
index f9e575c52a0a..6e1298b36ea3 100644
--- a/sys-apps/pcsc-tools/ChangeLog
+++ b/sys-apps/pcsc-tools/ChangeLog
@@ -1,6 +1,17 @@
 # ChangeLog for sys-apps/pcsc-tools
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/pcsc-tools/ChangeLog,v 1.7 2010/06/30 01:38:56 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/pcsc-tools/ChangeLog,v 1.8 2010/10/11 08:36:34 flameeyes Exp $
+
+*pcsc-tools-1.4.17 (11 Oct 2010)
+
+  11 Oct 2010; Diego E. Pettenò <flameeyes@gentoo.org>
+  -pcsc-tools-1.4.15.ebuild, pcsc-tools-1.4.16.ebuild,
+  +pcsc-tools-1.4.17.ebuild, -files/pcsc-tools_no-gtk.patch:
+  Version bump, and restrict dependencies on .16; thanks to Francesco Riosa
+  for reporting that older version does not work with the new pcsc-lite (bug
+  #340341). Remove oldest version and its patch. New version comes with new
+  smartcard-list.txt file and no longer installs the smartcard.svg file,
+  following instead the upstream-provided desktop file.
 
   30 Jun 2010; Diego E. Pettenò <flameeyes@gentoo.org>
   pcsc-tools-1.4.16.ebuild:
diff --git a/sys-apps/pcsc-tools/files/pcsc-tools_no-gtk.patch b/sys-apps/pcsc-tools/files/pcsc-tools_no-gtk.patch
deleted file mode 100644
index 1aceed0a55fb..000000000000
--- a/sys-apps/pcsc-tools/files/pcsc-tools_no-gtk.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- Makefile.orig	2008-09-07 04:51:40.000000000 -0700
-+++ Makefile	2010-06-17 19:29:39.511217317 -0700
-@@ -17,8 +17,8 @@
- #LDLIBS=-framework PCSC
- 
- BIN=pcsc_scan
--BIN_SCRIPT=ATR_analysis gscriptor scriptor
--MAN=pcsc_scan.1.gz gscriptor.1p.gz scriptor.1p.gz ATR_analysis.1p.gz
-+BIN_SCRIPT=ATR_analysis scriptor
-+MAN=pcsc_scan.1.gz scriptor.1p.gz ATR_analysis.1p.gz
- 
- all: $(BIN) $(MAN)
- 
diff --git a/sys-apps/pcsc-tools/pcsc-tools-1.4.16.ebuild b/sys-apps/pcsc-tools/pcsc-tools-1.4.16.ebuild
index 36de30a4d8cd..7112aa45610b 100644
--- a/sys-apps/pcsc-tools/pcsc-tools-1.4.16.ebuild
+++ b/sys-apps/pcsc-tools/pcsc-tools-1.4.16.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/pcsc-tools/pcsc-tools-1.4.16.ebuild,v 1.2 2010/06/30 01:38:56 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/pcsc-tools/pcsc-tools-1.4.16.ebuild,v 1.3 2010/10/11 08:36:34 flameeyes Exp $
 
 EAPI="3"
 
@@ -19,7 +19,8 @@ KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~x86"
 ## ~arm waiting for keywords
 IUSE="gtk usb"
 
-RDEPEND=">=sys-apps/pcsc-lite-1.4.14"
+RDEPEND=">=sys-apps/pcsc-lite-1.4.14
+	<sys-apps/pcsc-lite-1.6.2"
 
 DEPEND="${RDEPEND}
 	dev-util/pkgconfig"
diff --git a/sys-apps/pcsc-tools/pcsc-tools-1.4.15.ebuild b/sys-apps/pcsc-tools/pcsc-tools-1.4.17.ebuild
index 0973d0b638fe..a681d80c85cc 100644
--- a/sys-apps/pcsc-tools/pcsc-tools-1.4.15.ebuild
+++ b/sys-apps/pcsc-tools/pcsc-tools-1.4.17.ebuild
@@ -1,63 +1,63 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/pcsc-tools/pcsc-tools-1.4.15.ebuild,v 1.3 2010/06/19 02:13:31 nerdboy Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/pcsc-tools/pcsc-tools-1.4.17.ebuild,v 1.1 2010/10/11 08:36:34 flameeyes Exp $
 
-inherit eutils fdo-mime multilib
+EAPI="3"
+
+SMARTCARD_DATE=20101010
+
+inherit eutils fdo-mime multilib toolchain-funcs
 
 DESCRIPTION="PC/SC Architecture smartcard tools"
 HOMEPAGE="http://ludovic.rousseau.free.fr/softwares/pcsc-tools/"
 SRC_URI="http://ludovic.rousseau.free.fr/softwares/${PN}/${P}.tar.gz
-	mirror://gentoo/smartcard_list.txt"
+	mirror://gentoo/${PN}-smartcard_list-${SMARTCARD_DATE}.txt.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~x86"
 ## ~arm waiting for keywords
-IUSE="debug gtk usb"
+IUSE="gtk"
 
-RDEPEND="usb? ( app-crypt/ccid )
-	>=sys-apps/pcsc-lite-1.4.14
-	dev-perl/pcsc-perl
-	gtk? ( dev-perl/gtk2-perl )"
+RDEPEND=">=sys-apps/pcsc-lite-1.4.14"
 
 DEPEND="${RDEPEND}
 	dev-util/pkgconfig"
+RDEPEND="${RDEPEND}
+	dev-perl/pcsc-perl
+	gtk? ( dev-perl/gtk2-perl )"
 
-src_compile() {
-	if ! use gtk ; then
-	    epatch "${FILESDIR}"/${PN}_no-gtk.patch
-	fi
-
-	if use debug ; then
-	    sed -i -e "s:-Wall -O2:${CFLAGS}:g" Makefile
-	else
-	    sed -i -e "s:-Wall -O2 -g:${CFLAGS}:g" Makefile
-	fi
-
-	sed -i -e "s:/usr/local:/usr:" Makefile
+src_prepare() {
+	sed -i -e 's:-Wall -O2:${CFLAGS}:g' Makefile
+}
 
-	make DESTDIR="${D}usr" all || die
+src_compile() {
+	tc-export CC
+	# explicitly only build the pcsc_scan application, or the man
+	# pages will be gzipped first, and then unpacked.
+	emake pcsc_scan || die
 }
 
 src_install() {
-	make DESTDIR="${D}usr" install || die
+	# install manually, makes it much easier since the Makefile
+	# requires fiddling with
+	dobin ATR_analysis scriptor pcsc_scan || die
+	doman pcsc_scan.1 scriptor.1p ATR_analysis.1p || die
 
-	# prepalldocs isn't supported any more?
-	dodoc README Changelog
+	dodoc README Changelog || die
 
-	if use gtk ; then
-	    doicon "${FILESDIR}"/smartcard.svg
-	    domenu gscriptor.desktop
-	    dosed "s:Categories=Utility;GTK;:Icon=smartcard.svg\\nCategories=System;:g" \
-	        /usr/share/applications/gscriptor.desktop
+	if use gtk; then
+		domenu gscriptor.desktop || die
+		dobin gscriptor || die
+		doman gscriptor.1p || die
 	fi
 
 	insinto /usr/share/pcsc
-	doins "${DISTDIR}"/smartcard_list.txt
+	newins "${WORKDIR}"/${PN}-smartcard_list-${SMARTCARD_DATE}.txt smartcard_list.txt || die
 }
 
 pkg_postinst() {
-	fdo-mime_desktop_database_update
+	use gtk && fdo-mime_desktop_database_update
 
 	elog ""
 	elog "If your card reader isn't recognized, you should make sure you"