Make sure we remove run files before trying to start or pcscd will abort #99505 by Alon Bar-Lev.

Package-Manager: portage-2.0.51.22-r1

5 files changed, 43 insertions, 29 deletions

diff --git a/sys-apps/pcsc-lite/ChangeLog b/sys-apps/pcsc-lite/ChangeLog
index 9a9f88674c05..f8faffdba28c 100644
--- a/sys-apps/pcsc-lite/ChangeLog
+++ b/sys-apps/pcsc-lite/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sys-apps/pcsc-lite
-# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/pcsc-lite/ChangeLog,v 1.12 2005/01/23 11:10:29 corsair Exp $
+# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/pcsc-lite/ChangeLog,v 1.13 2005/07/20 01:11:08 vapier Exp $
+
+  20 Jul 2005; Mike Frysinger <vapier@gentoo.org> +files/pcscd-confd,
+  files/pcscd-init, pcsc-lite-1.2.9_beta6.ebuild:
+  Make sure we remove run files before trying to start or pcscd will abort
+  #99505 by Alon Bar-Lev.
 
   23 Jan 2005; Markus Rothe <corsair@gentoo.org> pcsc-lite-1.2.0.ebuild,
   pcsc-lite-1.2.9_beta6.ebuild:
diff --git a/sys-apps/pcsc-lite/Manifest b/sys-apps/pcsc-lite/Manifest
index 241085e8287f..e9a099a8c29f 100644
--- a/sys-apps/pcsc-lite/Manifest
+++ b/sys-apps/pcsc-lite/Manifest
@@ -1,7 +1,18 @@
-MD5 a956df17118157e22bceab530151122d ChangeLog 1529
-MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 MD5 e274b90633c12d9a1ba6bedf6e468964 pcsc-lite-1.2.0.ebuild 1263
-MD5 dab0f52eec17a05d2b9144dec262d0a2 pcsc-lite-1.2.9_beta6.ebuild 1408
-MD5 9f6a6cee89838d92aec450caafcbb9d0 files/digest-pcsc-lite-1.2.9_beta6 73
-MD5 8d679a8c6d76845932fedb2c29eb8749 files/pcscd-init 458
+MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164
+MD5 251a614d3a25327a22a3ce18a12ec22d pcsc-lite-1.2.9_beta6.ebuild 1297
+MD5 041402d34691b18f8d8c37133ef5857d ChangeLog 1750
+MD5 52deea7f2003badde6eb9c112bcc9645 files/pcscd-init 485
+MD5 4a6af6338f7bf5bdc3b2488aa9fd3ea4 files/pcscd-confd 84
 MD5 aa81afb9cffef205c955fc1ab2a9bfd1 files/digest-pcsc-lite-1.2.0 67
+MD5 9f6a6cee89838d92aec450caafcbb9d0 files/digest-pcsc-lite-1.2.9_beta6 73
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.1 (GNU/Linux)
+
+iD8DBQFC3aTFgIKl8Uu19MoRAoDEAJ4ruGkRmvaP3itippYDCZGaQ9Sa+wCbBbVY
+VME4b3+xvpYi73KvwN4GRik=
+=xx0Y
+-----END PGP SIGNATURE-----
diff --git a/sys-apps/pcsc-lite/files/pcscd-confd b/sys-apps/pcsc-lite/files/pcscd-confd
new file mode 100644
index 000000000000..47f71289c35a
--- /dev/null
+++ b/sys-apps/pcsc-lite/files/pcscd-confd
@@ -0,0 +1,4 @@
+# /etc/conf.d/pcscd
+
+# Options to pass to pcscd, see pcscd(8) manpage
+PCSCD_OPTS=""
diff --git a/sys-apps/pcsc-lite/files/pcscd-init b/sys-apps/pcsc-lite/files/pcscd-init
index 05aec14b9163..19b3d58f081f 100644
--- a/sys-apps/pcsc-lite/files/pcscd-init
+++ b/sys-apps/pcsc-lite/files/pcscd-init
@@ -1,11 +1,13 @@
 #!/sbin/runscript
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/pcsc-lite/files/pcscd-init,v 1.3 2004/07/15 00:47:27 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/pcsc-lite/files/pcscd-init,v 1.4 2005/07/20 01:11:08 vapier Exp $
 
 start() {
+	# pcscd won't start if these exist
+	rm -f /var/run/pcscd.{comm,pub}
 	ebegin "Starting pcscd"
-	start-stop-daemon --start --quiet --background --exec /usr/sbin/pcscd
+	/usr/sbin/pcscd ${PCSCD_OPTS}
 	eend $?
 }
 
diff --git a/sys-apps/pcsc-lite/pcsc-lite-1.2.9_beta6.ebuild b/sys-apps/pcsc-lite/pcsc-lite-1.2.9_beta6.ebuild
index d9a6ca10d9dd..4809b4b94118 100644
--- a/sys-apps/pcsc-lite/pcsc-lite-1.2.9_beta6.ebuild
+++ b/sys-apps/pcsc-lite/pcsc-lite-1.2.9_beta6.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/pcsc-lite/pcsc-lite-1.2.9_beta6.ebuild,v 1.4 2005/05/14 18:02:29 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/pcsc-lite/pcsc-lite-1.2.9_beta6.ebuild,v 1.5 2005/07/20 01:11:08 vapier Exp $
 
 inherit eutils
 
@@ -12,23 +12,14 @@ SRC_URI="https://alioth.debian.org/download.php/${NUM}/${MY_P}.tar.gz"
 
 LICENSE="as-is"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86 ~ppc64"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
 IUSE="static debug"
 
 RDEPEND="!static? ( dev-libs/libusb )"
-DEPEND="sys-devel/make
-	sys-devel/libtool
-	sys-apps/sed
-	sys-devel/flex
-	sys-apps/gawk
-	dev-libs/libusb
-	dev-util/pkgconfig
-	sys-devel/gcc
-	virtual/libc
-	dev-libs/libusb
-	>=sys-apps/portage-2.0.51"
-
-S="${WORKDIR}/${MY_P}"
+DEPEND="dev-libs/libusb
+	dev-util/pkgconfig"
+
+S=${WORKDIR}/${MY_P}
 
 src_compile() {
 	econf \
@@ -37,20 +28,21 @@ src_compile() {
 		--enable-muscledropdir=/usr/share/pcsc/services \
 		$(use_enable debug) \
 		$(use_enable static) \
-		|| die "./configure failed"
+		|| die "configure failed"
 	emake || die
 }
 
 src_install() {
-	emake DESTDIR=${D} install || die
+	make DESTDIR="${D}" install || die
 
 	dodoc AUTHORS ChangeLog DRIVERS HELP INSTALL NEWS README SECURITY
 	dodoc doc/*.pdf doc/README.DAEMON
 	docinto sample
 	dodoc src/utils/README src/utils/sample.*
-	rm -rf ${D}/usr/doc
+	rm -r "${D}"/usr/doc
 
-	newinitd ${FILESDIR}/pcscd-init pcscd
+	newinitd "${FILESDIR}"/pcscd-init pcscd
+	newconfd "${FILESDIR}"/pcscd-confd pcscd
 }
 
 pkg_postinst() {