Actually install at least one smartcard_list.txt file, combining -r0 and -r1.

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

4 files changed, 19 insertions, 84 deletions

diff --git a/sys-apps/pcsc-tools/ChangeLog b/sys-apps/pcsc-tools/ChangeLog
index 4582b5eb0fcf..b2b555933c0f 100644
--- a/sys-apps/pcsc-tools/ChangeLog
+++ b/sys-apps/pcsc-tools/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for sys-apps/pcsc-tools
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/pcsc-tools/ChangeLog,v 1.10 2011/03/09 16:29:32 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/pcsc-tools/ChangeLog,v 1.11 2011/04/15 18:23:53 flameeyes Exp $
+
+*pcsc-tools-1.4.17-r2 (15 Apr 2011)
+
+  15 Apr 2011; Diego E. Pettenò <flameeyes@gentoo.org>
+  -pcsc-tools-1.4.17.ebuild, -pcsc-tools-1.4.17-r1.ebuild,
+  +pcsc-tools-1.4.17-r2.ebuild:
+  Actually install at least one smartcard_list.txt file, combining -r0 and -r1.
 
 *pcsc-tools-1.4.17-r1 (09 Mar 2011)
 
diff --git a/sys-apps/pcsc-tools/Manifest b/sys-apps/pcsc-tools/Manifest
index f5db4fedd9c9..1dcf6faef09b 100644
--- a/sys-apps/pcsc-tools/Manifest
+++ b/sys-apps/pcsc-tools/Manifest
@@ -4,14 +4,13 @@ Hash: SHA1
 AUX smartcard.cron 319 RMD160 1dd317a5e9a16cb7416385a056c1e98ac5eb93ed SHA1 d20e90a91e2a77415badfc08dc49c129055c46d6 SHA256 f01e91705425e0c1d85bdc0e5eafb9ac423e94e2d109279f58bf75e02ee1d398
 DIST pcsc-tools-1.4.17.tar.gz 83724 RMD160 46bd829c9df19dab57de5a8955e11a8d7c16f113 SHA1 416b9f2c24cc82f5695596bda887ba2f5e40dd8e SHA256 02b1893743d41ed69e2d5fec89c551ffc565607fb70c5f91bdbdceb4890856ea
 DIST pcsc-tools-smartcard_list-20101010.txt.bz2 29128 RMD160 0164f03c234b082ef2edb38a8664de95520fe706 SHA1 509f19d45e429e917db07981b2973549b18f9924 SHA256 1cb49c2fae9bb2d4612eb1bb7b789ac0d1ec3488e37600c54c041aa4cc988be4
-EBUILD pcsc-tools-1.4.17-r1.ebuild 1612 RMD160 0b74fc1b57945a2dc431ab36e4cd218b9e10024c SHA1 aafe6539cb66173b867a657f7f059c1628f7895f SHA256 b051c3e7031db72bf0958fb022d95efa64fe266e02b2b160bb7b3cd3feaa1bd8
-EBUILD pcsc-tools-1.4.17.ebuild 2099 RMD160 6feee90535e912e407809f5131690ecc49b71bfc SHA1 1d259fbeeed48caaf0adbfdbb12330c21a3bef33 SHA256 b2a955a8b2613d85aba09eca9b7dc60ed73f36cfb78de2fd190db110f7384029
-MISC ChangeLog 3682 RMD160 eeb621bf1a69a642c610527c59c723ec9ba760f2 SHA1 74ad917019c8bfe671fab72045dffa8477b38058 SHA256 b1eb76169a79848a91d2eb41847d09aabdb31ebf614d4e4c9c588c310eee8918
+EBUILD pcsc-tools-1.4.17-r2.ebuild 1792 RMD160 f95bf3d8de8a90e142095e0709f34a919c5d262e SHA1 6f254e785b0e1763598f2cae4645c2e443bc3713 SHA256 5cef4ad1eb05403c7d79b21ad8a1d1f9f604941ee2c9565c9d019df3389c5335
+MISC ChangeLog 3947 RMD160 e24cf620a07b38829364294aa95f34a63812acae SHA1 0812e812f8ecdaf8284adbfad31dadf141bb4c3b SHA256 8897cc5c884695496f117159c0a0714872f220432a6e151053cb16aa1b3aa863
 MISC metadata.xml 385 RMD160 ada404c0b74629515143cdfdbada80bb3f2962a5 SHA1 61da416f7fdee458759c1cd1b3f1eec4f82dbd4a SHA256 3c22204be4a3a8c91be6c1129cf366c7b52402abae2c4af28f229f8c1349d1e3
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEARECAAYFAk13qyMACgkQAiZjviIA2Xgm9gCeIqvmRsarE34yMoIQz4+HtHD7
-uIEAnibnitIDczlNBCFG9g76TkgQzaae
-=ySTk
+iEYEARECAAYFAk2ojScACgkQAiZjviIA2XhvEgCfWOB8O1y0plLmMg3hnVt3jOjk
+rT0AoLvo4taWpggpUCTakslOFd5QhsMN
+=OQ/W
 -----END PGP SIGNATURE-----
diff --git a/sys-apps/pcsc-tools/pcsc-tools-1.4.17-r1.ebuild b/sys-apps/pcsc-tools/pcsc-tools-1.4.17-r2.ebuild
index 18cf1d69fe6b..8952f9389877 100644
--- a/sys-apps/pcsc-tools/pcsc-tools-1.4.17-r1.ebuild
+++ b/sys-apps/pcsc-tools/pcsc-tools-1.4.17-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 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.17-r1.ebuild,v 1.1 2011/03/09 16:29:32 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/pcsc-tools/pcsc-tools-1.4.17-r2.ebuild,v 1.1 2011/04/15 18:23:53 flameeyes Exp $
 
 EAPI="3"
 
@@ -10,7 +10,8 @@ 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"
+SRC_URI="http://ludovic.rousseau.free.fr/softwares/${PN}/${P}.tar.gz
+	mirror://gentoo/${PN}-smartcard_list-${SMARTCARD_DATE}.txt.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
@@ -55,6 +56,9 @@ src_install() {
 		newexe "${FILESDIR}"/smartcard.cron update-smartcard_list \
 			|| die "Failed to install update cronjob"
 	fi
+
+	insinto /usr/share/pcsc
+	newins "${WORKDIR}"/${PN}-smartcard_list-${SMARTCARD_DATE}.txt smartcard_list.txt || die
 }
 
 pkg_postinst() {
diff --git a/sys-apps/pcsc-tools/pcsc-tools-1.4.17.ebuild b/sys-apps/pcsc-tools/pcsc-tools-1.4.17.ebuild
deleted file mode 100644
index a681d80c85cc..000000000000
--- a/sys-apps/pcsc-tools/pcsc-tools-1.4.17.ebuild
+++ /dev/null
@@ -1,75 +0,0 @@
-# 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.17.ebuild,v 1.1 2010/10/11 08:36:34 flameeyes Exp $
-
-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/${PN}-smartcard_list-${SMARTCARD_DATE}.txt.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~x86"
-## ~arm waiting for keywords
-IUSE="gtk"
-
-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_prepare() {
-	sed -i -e 's:-Wall -O2:${CFLAGS}:g' Makefile
-}
-
-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() {
-	# 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
-
-	dodoc README Changelog || die
-
-	if use gtk; then
-		domenu gscriptor.desktop || die
-		dobin gscriptor || die
-		doman gscriptor.1p || die
-	fi
-
-	insinto /usr/share/pcsc
-	newins "${WORKDIR}"/${PN}-smartcard_list-${SMARTCARD_DATE}.txt smartcard_list.txt || die
-}
-
-pkg_postinst() {
-	use gtk && fdo-mime_desktop_database_update
-
-	elog ""
-	elog "If your card reader isn't recognized, you should make sure you"
-	elog "have the latest copy of smartcard_list.txt.  Download it from:"
-	elog "http://ludovic.rousseau.free.fr/softwares/pcsc-tools/smartcard_list.txt"
-	elog ""
-	elog "Note you may also need a firmware upgrade for your card reader in"
-	elog "order for this to work.  See:"
-	elog "http://symbolik.wordpress.com/2007/02/26/scm-scr-331-usb-smartcard-reader-firmware-upgrade/"
-	elog ""
-}
-
-pkg_postrm() {
-	fdo-mime_desktop_database_update
-}