From: Diego Elio Pettenò <flameeyes@gentoo.org>
Date: Fri, 21 Oct 2011 23:00:47 +0000 (+0000)
Subject: Revision bump to make the new init script follow the more declarative OpenRC style.
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=81892563f2219cb7c685d8a448d2d6bb370012e5;p=gentoo.git

Revision bump to make the new init script follow the more declarative OpenRC style.

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

diff --git a/sys-apps/pcsc-lite/ChangeLog b/sys-apps/pcsc-lite/ChangeLog
index 888bb891a0d8..d27d731d6c47 100644
--- a/sys-apps/pcsc-lite/ChangeLog
+++ b/sys-apps/pcsc-lite/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for sys-apps/pcsc-lite
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/pcsc-lite/ChangeLog,v 1.121 2011/10/17 20:44:27 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/pcsc-lite/ChangeLog,v 1.122 2011/10/21 23:00:47 flameeyes Exp $
+
+*pcsc-lite-1.7.4-r2 (21 Oct 2011)
+
+  21 Oct 2011; Diego E. Pettenò <flameeyes@gentoo.org>
+  +pcsc-lite-1.7.4-r2.ebuild, +files/pcscd-init.5:
+  Revision bump to make the new init script follow the more declarative OpenRC
+  style.
 
   17 Oct 2011; Markus Meier <maekke@gentoo.org> pcsc-lite-1.7.2-r2.ebuild:
   arm stable, bug #386345
diff --git a/sys-apps/pcsc-lite/Manifest b/sys-apps/pcsc-lite/Manifest
index 4c38455b5b09..5b9e21ce0c81 100644
--- a/sys-apps/pcsc-lite/Manifest
+++ b/sys-apps/pcsc-lite/Manifest
@@ -4,18 +4,20 @@ Hash: SHA1
 AUX 99-pcscd-hotplug.rules 483 RMD160 7c15ea902e65354e1e0c65a8ab8099ca84b89591 SHA1 9fc47a6edc71671680417ecbaf1de2150f9d614a SHA256 85b0927bd4311a5aeabcadcfa69b6096befb593216579bfbb295985a5bead3d7
 AUX pcscd-init.3 740 RMD160 48ca6cfcc0ca05d1f21237e5dd475ccb9b52f426 SHA1 a168b781aad5a887fd6d7077d58333022e97f41f SHA256 7c15616a1221c31d89317f29faeea4682a6d9284a6a9ce97f00ab8ee0a2a58d7
 AUX pcscd-init.4 750 RMD160 de99ab7862d0710e045e1a0ac26018476a11bd45 SHA1 61bf37ebde96a8303d6318b55782904417b16a5d SHA256 93367896888d46a11dd0b226e7f3476ded20e328c9b653a8e38ba6b498e63639
+AUX pcscd-init.5 514 RMD160 5345f61ed9bedc30f4794a992cd0a299698da44a SHA1 85ee4fb844236e710b08091ec16a0ae875e126e4 SHA256 82df3730d75eea94b096ac7db818a9dfe854725095859fdf2f550e6f1303f99b
 DIST pcsc-lite-1.6.6.tar.bz2 480232 RMD160 e4041b846d34cf94069b6ed71e1892af34d92acd SHA1 bdd4b2f87955e2719be9b4f5da253904c721fdec SHA256 7a94c27ae687619435b29ad63e0561aca20413333187b4301c75d1a1547ceea8
 DIST pcsc-lite-1.7.2.tar.bz2 484630 RMD160 1566b0110a8f70633f593f4a40f92ce38f603ee4 SHA1 b66533e2f90ce289854400db8c8b578a32980c32 SHA256 41f13d552eaa2c3978fbb6f2125e81903a0767011d999052fd1a6ee03880b398
 DIST pcsc-lite-1.7.4.tar.bz2 503848 RMD160 0bec1904894e7b04cbeca8f60da35b64ac950279 SHA1 6b815a1367390921ce4935f97de5cacb6965c9a7 SHA256 d8e4a7eaae05089dccaeca0524ffd9b308d9e8f3da3fb043515e6c1d7b5583d1
 EBUILD pcsc-lite-1.6.6-r2.ebuild 2278 RMD160 be3c6a323e4a6c319de9eb70c1b8577682a2c75d SHA1 3d6d4143c820128d777823dc454e38c2211a4113 SHA256 d2defbae4f39c7ab4d61d275d9ffa2c128f6c359c65f183ad5f48b2d8203f8cf
 EBUILD pcsc-lite-1.7.2-r2.ebuild 2553 RMD160 1f140eac62c4fba90f85caacd8b7e6d050861499 SHA1 47b52e4e0463d3106faae71aad015a57edb01429 SHA256 25ecd32df9e1e802bb3e7e5ff5d1c449da5dc530ae5e1742d9213cc38e082547
 EBUILD pcsc-lite-1.7.4-r1.ebuild 2560 RMD160 9a0be6a10d68481a46f0f6a6efffa270234b3bba SHA1 3100678dd4621e0414f8819f7b7cf4d10ce8b205 SHA256 13b9b6a73a8b0587f54cc8537d00ad1c7055768c543657e89f2c3483366119ec
-MISC ChangeLog 17560 RMD160 32a3aacf4e62b2b1f61161c9a9d83b27c4752c14 SHA1 fd3ccc7593ec18d7a11730d08921e72a91131d7b SHA256 51d54b89c3a4d81780dbb6be6596d134cbafda9d2203e8ea1fd9dfcaaf895a76
+EBUILD pcsc-lite-1.7.4-r2.ebuild 2560 RMD160 e4096dde811717ef791f712c3399fb5c3895884c SHA1 293831f31d0095a45d34f05c7db1194d094cd655 SHA256 87d332293abf6478c5099d1ecfefc146f9c2d744249d0ff55221e360d51c4e6d
+MISC ChangeLog 17794 RMD160 4e66a25884b1fe5c3e7266894a9b5d1a7025ef0c SHA1 c435b5233b9bb4cfed66ec998f9a76c69e93c0b4 SHA256 a44bee0a362a3a441519e570e3d3eae601b0717626f1e52655ada7b3126ab6fd
 MISC metadata.xml 704 RMD160 0f066833324e6a52444bf2a79a70f80121a78f77 SHA1 a70095b31a37b688a81bc1a9e0a90a5a04200b35 SHA256 49cf3849ef13f6e44699fb5ebb45b2db5d9fd214054de18a937ddf69e60fee69
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iEYEARECAAYFAk6clDQACgkQkKaRLQcq0GIspACfTxxy+MWl54t3yGiOK63BGWrF
-LR4An3cjDmk5OHROyHYuUPTg0mubzWkO
-=fBCj
+iEYEARECAAYFAk6h+ZsACgkQAiZjviIA2XgIqwCffZe8wQ+HS+5OXpduCjTRX7tr
+EdQAn3m2a0oLHS9XKFvNBWebc7EwaPpt
+=vIKW
 -----END PGP SIGNATURE-----
diff --git a/sys-apps/pcsc-lite/files/pcscd-init.5 b/sys-apps/pcsc-lite/files/pcscd-init.5
new file mode 100644
index 000000000000..ce4cbee21c66
--- /dev/null
+++ b/sys-apps/pcsc-lite/files/pcscd-init.5
@@ -0,0 +1,23 @@
+#!/sbin/runscript
+# Copyright 1999-2011 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.5,v 1.1 2011/10/21 23:00:47 flameeyes Exp $
+
+name="PC/SC Daemon"
+
+pidfile=/var/run/pcscd/pcscd.pid
+
+command=/usr/sbin/pcscd
+command_args="${EXTRA_OPTS}"
+
+start_stop_daemon_args="--user pcscd:pcscd"
+
+depend() {
+	need localmount
+
+	after udev openct
+}
+
+start_pre() {
+	checkpath -d -m 0755 -o pcscd:pcscd /var/run/pcscd
+}
diff --git a/sys-apps/pcsc-lite/pcsc-lite-1.7.4-r2.ebuild b/sys-apps/pcsc-lite/pcsc-lite-1.7.4-r2.ebuild
new file mode 100644
index 000000000000..33da0b0edb69
--- /dev/null
+++ b/sys-apps/pcsc-lite/pcsc-lite-1.7.4-r2.ebuild
@@ -0,0 +1,86 @@
+# Copyright 1999-2011 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.7.4-r2.ebuild,v 1.1 2011/10/21 23:00:47 flameeyes Exp $
+
+EAPI="4"
+
+inherit multilib eutils
+
+DESCRIPTION="PC/SC Architecture smartcard middleware library"
+HOMEPAGE="http://pcsclite.alioth.debian.org/"
+
+STUPID_NUM="3598"
+MY_P="${PN}-${PV/_/-}"
+SRC_URI="http://alioth.debian.org/download.php/${STUPID_NUM}/${MY_P}.tar.bz2"
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="as-is"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+IUSE="usb kernel_linux"
+
+RDEPEND="!kernel_linux? ( usb? ( virtual/libusb:1 ) )
+	kernel_linux? ( sys-fs/udev )"
+DEPEND="${RDEPEND}
+	dev-util/pkgconfig"
+RDEPEND="${RDEPEND}
+	!<app-crypt/ccid-1.4.1-r1"
+
+pkg_setup() {
+	enewgroup openct # make sure it exists
+	enewgroup pcscd
+	enewuser pcscd -1 -1 /var/run/pcscd pcscd,openct
+}
+
+src_configure() {
+	local myconf=
+
+	if use kernel_linux; then
+		myconf="${myconf} --enable-libudev --disable-libusb"
+	else
+		myconf="${myconf} --disable-libudev $(use_enable usb libusb)"
+	fi
+
+	econf \
+		--disable-maintainer-mode \
+		--disable-dependency-tracking \
+		--docdir="${EPREFIX}/usr/share/doc/${PF}" \
+		--enable-usbdropdir="${EPREFIX}/usr/$(get_libdir)/readers/usb" \
+		${myconf}
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die "emake install failed"
+	find "${D}" -name '*.la' -delete
+
+	dodoc AUTHORS DRIVERS HELP README SECURITY ChangeLog
+
+	newinitd "${FILESDIR}/pcscd-init.5" pcscd
+
+	if use kernel_linux; then
+		insinto /lib/udev/rules.d
+		doins "${FILESDIR}"/99-pcscd-hotplug.rules
+	fi
+}
+
+pkg_postinst() {
+	elog "Starting from version 1.6.5, pcsc-lite will start as user nobody in"
+	elog "the pcscd group, to avoid running as root."
+	elog ""
+	elog "This also means you need the newest drivers available so that the"
+	elog "devices get the proper owner."
+	elog ""
+	elog "Furthermore, a conf.d file is no longer installed by default, as"
+	elog "the default configuration does not require one. If you need to"
+	elog "pass further options to pcscd, create a file and set the"
+	elog "EXTRA_OPTS variable."
+	elog ""
+	if use kernel_linux; then
+		elog "HAL support has been dropped by the ebuild; if you want hotplug"
+		elog "support, that's provided already by UDEV rules; you only need to"
+		elog "tell the init system to hotplug it, by setting this variable in"
+		elog "/etc/rc.conf:"
+		elog ""
+		elog "    rc_hotplug=\"pcscd\""
+	fi
+}