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.

Package-Manager: portage-2.2_rc91/cvs/Linux x86_64

5 files changed, 55 insertions, 57 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/Manifest b/sys-apps/pcsc-tools/Manifest
index ff1d55f29780..9efe86aa90f2 100644
--- a/sys-apps/pcsc-tools/Manifest
+++ b/sys-apps/pcsc-tools/Manifest
@@ -1,20 +1,19 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-AUX pcsc-tools_no-gtk.patch 389 RMD160 c38bfb64b561deb5cab0159a48e1092a5094ee06 SHA1 55e2eea17fea6a78beb6bf77c9a29659d6e07c04 SHA256 6d3befa993e1b7e866f3060b961b7c60b0b4f5017b77ab8355a8ef48137a2a7e
 AUX smartcard.svg 13308 RMD160 0ac4082b8e27b9ec661e70328e964d32a70b4ea7 SHA1 db036b0bb1f98fd363262faa3b5435c705f78715 SHA256 ad846a422e0ca0967a4bbee57c61c9b481df4559470ea6145d0cc7cfd502dc5b
-DIST pcsc-tools-1.4.15.tar.gz 64090 RMD160 e5f278a43cf138a6bcdaa1ac478d64fb123bab5b SHA1 cdc37f7763ebeb927487585d4eecd84d8e366421 SHA256 a46ade975d4dd5722e9f087bbb26410f2eda5d889d078d0d5eeee15b9133e4b6
 DIST pcsc-tools-1.4.16.tar.gz 78732 RMD160 e01517259bf3c24cb8fe38529cea9dbd6cdeeb24 SHA1 10dffcee881f3846420d267e755e84d31c8d69e6 SHA256 dd86355430d39f3a15da1e9d1c65779c75a237b87c7ee9cb30badbc283e253fa
+DIST pcsc-tools-1.4.17.tar.gz 83724 RMD160 46bd829c9df19dab57de5a8955e11a8d7c16f113 SHA1 416b9f2c24cc82f5695596bda887ba2f5e40dd8e SHA256 02b1893743d41ed69e2d5fec89c551ffc565607fb70c5f91bdbdceb4890856ea
 DIST pcsc-tools-smartcard_list-20100630.txt.bz2 28367 RMD160 49807b37b8ed33730815c019acee440b4f0be9ad SHA1 af58897307652f92a1d0b258f846b9e3262ebcb1 SHA256 0bb7319f3e7db9f4ea7b2814eff763825aa2228c87b5aa29211ff31742ea61fd
-DIST smartcard_list.txt 74636 RMD160 ce99dd5df9a33b185bf40afb03e4cfa6a358be78 SHA1 5dfd096fee336b6e226e07478829a02a49920163 SHA256 2e0ae30bc772d1631c47388ff53b841b76a14543c0547da53826923067af238b
-EBUILD pcsc-tools-1.4.15.ebuild 2040 RMD160 eada583398f983da538f6708c64a439ea19c0d5d SHA1 a8c489170df375fba57e9854d9e91e9f29b5460d SHA256 e08a2276d736bbe759fa0cd111c5c3c91da54aabcc1b2cae0a77b75e14979abe
-EBUILD pcsc-tools-1.4.16.ebuild 2284 RMD160 3a17ce2790e9336abb75688320e964b1b5ceef28 SHA1 ab0b5cf1f60b284e909f805d2ac8e01572f50d09 SHA256 f12e76110277fb54682041edddc0d897bbfb85859ddefcbf3c86326eb5767cf5
-MISC ChangeLog 2585 RMD160 2586e1223440bdb2df19b2accedee30c2227036b SHA1 bd92f7e52fe5852396fa560ad0b8745670ed7ccc SHA256 ce986da209d409b1ddd5e437acc2d4fb0b7bef3800c69033d97dd2a6480482f2
+DIST pcsc-tools-smartcard_list-20101010.txt.bz2 29128 RMD160 0164f03c234b082ef2edb38a8664de95520fe706 SHA1 509f19d45e429e917db07981b2973549b18f9924 SHA256 1cb49c2fae9bb2d4612eb1bb7b789ac0d1ec3488e37600c54c041aa4cc988be4
+EBUILD pcsc-tools-1.4.16.ebuild 2311 RMD160 7e9e562cd1bb2425a7ea7e02ef17b35cc0c5d804 SHA1 157dfc56c9ec8a1401a92cc7b25a9603cbfd8cd3 SHA256 05c7c32d78231816db23e5d33598d7631f42aa15f225a547016f638b76f8b4b8
+EBUILD pcsc-tools-1.4.17.ebuild 2099 RMD160 6feee90535e912e407809f5131690ecc49b71bfc SHA1 1d259fbeeed48caaf0adbfdbb12330c21a3bef33 SHA256 b2a955a8b2613d85aba09eca9b7dc60ed73f36cfb78de2fd190db110f7384029
+MISC ChangeLog 3150 RMD160 30942ff9ea431f52184f27f6077d4aa6bfbf9adc SHA1 fac877a486b0cc60158c245948bddfa23c1c6196 SHA256 beada19c2f389ed5bdd50765d508c75c266f2c5a2fdca8e5f12ecb5dcfa58628
 MISC metadata.xml 392 RMD160 a0b7f7f213da5f7b7f79ba13a1cd4df444558d33 SHA1 d38241d582bb438599511cddce5fe51df301505c SHA256 698922e4324835d3a61042acffd70999ca6e1b1486a2347a16aabf0062a6c42e
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.15 (GNU/Linux)
+Version: GnuPG v2.0.16 (GNU/Linux)
 
-iEYEARECAAYFAkwqoEMACgkQAiZjviIA2XgJxQCgyGoPeibM7uyA3mOj8/MEquLM
-ha4An1aHWHibORrNzokH3pgv2UgBtZxm
-=Moze
+iEYEARECAAYFAkyyzHMACgkQAiZjviIA2XhTdQCg18tobyCv+LNGywR3Jbet2vK6
+vpoAn1hM1oq8cgtPwgE5HVs25ShxRlq+
+=67gH
 -----END PGP SIGNATURE-----
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"