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

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

3 files changed, 14 insertions, 78 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/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
-}