Version bump; use /run directly rather than rely on /var/run. Add GPL-2 to the list of licenses because of init script.

Package-Manager: portage-2.2.0_alpha152/cvs/Linux x86_64
Manifest-Sign-Key: 0x1CD13C8AD4301342

4 files changed, 60 insertions, 10 deletions

diff --git a/sys-apps/pcsc-lite/ChangeLog b/sys-apps/pcsc-lite/ChangeLog
index 8bfed78fdb79..93f1e2d9df2a 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-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/pcsc-lite/ChangeLog,v 1.153 2013/01/01 14:52:50 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/pcsc-lite/ChangeLog,v 1.154 2013/01/16 20:49:25 flameeyes Exp $
+
+*pcsc-lite-1.8.8 (16 Jan 2013)
+
+  16 Jan 2013; Diego E. Pettenò <flameeyes@gentoo.org> +files/pcscd-init.6,
+  +pcsc-lite-1.8.8.ebuild, -pcsc-lite-1.8.7.ebuild:
+  Version bump; use /run directly rather than rely on /var/run. Add GPL-2 to the
+  list of licenses because of init script.
 
   01 Jan 2013; Agostino Sarubbo <ago@gentoo.org> pcsc-lite-1.8.7.ebuild:
   Add ~alpha, wrt bug #449220
diff --git a/sys-apps/pcsc-lite/Manifest b/sys-apps/pcsc-lite/Manifest
index 9995a5be0805..80722959b8a3 100644
--- a/sys-apps/pcsc-lite/Manifest
+++ b/sys-apps/pcsc-lite/Manifest
@@ -1,10 +1,25 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
 AUX 99-pcscd-hotplug.rules 483 SHA256 85b0927bd4311a5aeabcadcfa69b6096befb593216579bfbb295985a5bead3d7 SHA512 3c234a782417ca52811217b8b7f97feb6336aee99a165fca5d041275ee9461e23f8a3e807d47dd250fd489f2ea04cca5e6f559d2abfd6be1126e57c8666e8e0a WHIRLPOOL 57164425af845961cc4ffed47613139d5eb84723471b704391ca5fae3c0a2657452220e309e7ef99e7f1a720ca0cdda4907f3f8803f90ede8be84a93f436dd99
 AUX pcscd-init.5 525 SHA256 ad7e71c35797378ef45ea5a027c10d2e2680a43c62c1f358e0bb28dd5ceeb432 SHA512 274cded90b743775e72d67d227da7ab6aad212f8221ad74a24dac77e2eb3109417b323836ab4f20bef543084285badd52ab43af85485ca1b6e2d020a26e00df3 WHIRLPOOL 0c8320fa1ab3cd1badceda2bd4d486bf4d94efc4a53dfd0806b05562df7ae097144b37c43f2819fd84b0399a50ebb0e847fd1d7646c51b28cd2735472e631b29
+AUX pcscd-init.6 517 SHA256 e605bd74a16a978144346265aca4c48f709cf7c3fc1043930cdf591cba4b8620 SHA512 3b70cdd1b07d1a118a5b808f3d2ab3d129c16c388d54d19df82886c2a1de947be7eb1e0da100395445681e68402e74d7a4c60bd070061b4495edd0143e27e394 WHIRLPOOL 30b18a45795b9ba7b2eb2d2e5cfe8e4dd576077be0552be8d93e97101f4573dc4f765b4db18718ba39e923667534ee50becdeabae42685e837cb2002a7da77f5
 DIST pcsc-lite-1.8.2.tar.bz2 548706 SHA256 5525c7fff09e855ca75203256a1c5acc518dae8740867d41e10b75c55d94a364 SHA512 093666b8e44c24ef259cc5cf1f46ffebed7f0eedda43f7a4e58112695912b87148b5d1ae8fbd398bd0a623b943bb6f75253e5c6fdccf64f38b750c78a10f3064 WHIRLPOOL efc629635af17701a5db5e7184bf448e29b8b33a713083d2c48f3c9d96820709f756dbd1ef61b05bdd2fbb8b19e7e7254e1f00a61ff8d42c4280e9e51516789b
 DIST pcsc-lite-1.8.6.tar.bz2 554106 SHA256 1e44049168d1ce55fd56c175f61206955254df0f385455f2a20ec7e8a0e6a77a SHA512 8a4f2f6f3627125d0d70131de03240faacb58bb402af471bebd3c366dac0207f352af80b12c59aff3acaa7f30217ebe444ea6e1874aa0f35aae204bafe236a68 WHIRLPOOL ff3a2a63cbf1e59eaec5096554b1e12f191a0ed1b7c4d3b815dcdf7eccbaa373a5c594eae5510933e132c01d9fed78d3aec340ce336e22678ce67f7356407903
-DIST pcsc-lite-1.8.7.tar.bz2 552310 SHA256 9ef73a893d2e34e02af2ffc313f3b88bf3000c3f608dcd3ae84c1c1a0445ef7b SHA512 b9f654481932934e230a7d97a6bac8cb9ede68ffc7e01948df27404e6f44a2e0ea0b6171a3ace2185267f4e898b7d414f6a5aeb0acdbce9472ae148ac9e71186 WHIRLPOOL 3d0174800916a5bfd59ba14b66f1bee49952fff3c8e00f4ea31ceca10e00eb1ad10fa964a7150e18c1b8ceebd7d8f01f6c36cee9d4e67a3ba433d608bafe36bf
+DIST pcsc-lite-1.8.8.tar.bz2 551751 SHA256 fe66354a7e738d3ef8b4e572c7e447b85894da9262381fbf004e8abcc12885e7 SHA512 02b0ce81fb1f3a0358967825499ff3687bd7375ac6b0ff892f23c0980864046330a3db6b1296aa7a4baa135f94a8b85112518a2584de3b522bd2b8dc58894658 WHIRLPOOL 70ddcba8d0386a4887353fb3e49b69527bec8f24da01cd45cb9e60a67249c5a63172081cbff9a3cf7025cbe991b37ad8cb9b479b4c69e873ffe948d12fb913dc
 EBUILD pcsc-lite-1.8.2.ebuild 2489 SHA256 7873f20d7ffe9c3fb03ebd58b7425dd07948ed5b0b5523429b79b06dbc1c3da8 SHA512 c11178cd081b1dcd1bcdd7dd24a3d03c7f824a14b5e2520f64a596d75a4b585c7700223f73c7a82b1b46b7007b442bbddb6cdeb357494cd189230be3eceb7c2b WHIRLPOOL 2757493075874b570f27a0250aad69f86af0bfd35bf6d385dc8369fad0ecacb86441788e22da857371792876b647cd957b82c8c69e21d7a1b21222dedac72a5a
 EBUILD pcsc-lite-1.8.6.ebuild 2521 SHA256 cc20a9dcab01baf116ab9d32bc4346164b3ff31380773be914fd9818274f2b13 SHA512 666824f3e064d0ec72bae57ee1fc13e3aa06bf72c4b298de823eb4b2551c11b03a169ab94de2bf20c53ee5e0723b90a964e9496828d4a394dd14b1918fd1663b WHIRLPOOL fb79b6c24525cec37681616469e60ad7c4857f7723e95e153e7ec46c4ac77c2b91eefe498b05509eb7b3c389700389b270388bee01a1c307ef69e96438b08423
-EBUILD pcsc-lite-1.8.7.ebuild 2527 SHA256 6d963ed324dedc40a0ff5e019789359f36da97416ca04df80308ebb3cd38959f SHA512 e7a2b1a3b688e1ab67d7d94a5c094a60a39c58246ff9ecc9d2e80a9ff8b36d0eccbafb67467db02b755905e8bd683de5bf52ed4d5892148b0003d5000f87b398 WHIRLPOOL cf8a3245da8aa823135efa44cfa68150f366e078461cdd606151aefd41c14feb66082324b8036fbaec4f05cd5be7dd489890d996d208cb6348a81ee6d51e35a7
-MISC ChangeLog 22359 SHA256 02a3d8d95854cb1d92bc7e2ef8088d857c762cb5e856eee113a0ca273222151f SHA512 b6ceeae4050612910c14f11bef00b449040ac8b6a4616fd6a13270d038153cfb783c0624672d3c573e9395b776fcddca80298636c93cd6579a4dbbfeb6765e5a WHIRLPOOL 690b6e953373e8b98dacdc4787e0597ded284f022e0cebdb9041548c5d0a1ea1685a3f57046f30472c3770e3f9ff3f1b4500ca038760be30ee8343a9a14501dc
+EBUILD pcsc-lite-1.8.8.ebuild 2694 SHA256 dec5bf3188b65f97dcf735d175fc2cf71b8209e15b684b0074b905e2b078663a SHA512 43c018e3b5511090eb5522e0906f6b2f588b37b60213200156741be7646f82785745c859d0e76578875134cc21eea62b90c9157af4828434c633bd1000c379a4 WHIRLPOOL 115a1c1f620122e3a55ad9d7f7da52b33aad03f9dcd06fb8188c58178c7db6d2f95243187a6e711da80cddf42ce77cafb2feb856f42bc852e89a02ec3b0aafb1
+MISC ChangeLog 22651 SHA256 042c8aee243fac15146a631c65da0e328227f05513f936ea8d599d4d9422fee1 SHA512 91b4addd6fcac346e4e69e4ce1e54351d1b68e6e5557d176df4321b5bce30c17b0b4ceb8f817bf78a84d7beb228e2a6cb8d3a5ef8184d80bad7243f0f814ebe9 WHIRLPOOL c3d309a9abae20da9bc8035d297de42f8757600f197ebe8b73a780a3cb6812ab6d23cebd5ee772deec80d7361251d67e072db1d99c3c3030ec61ce47a118ea5f
 MISC metadata.xml 1271 SHA256 81b3fbf2719be0adcbce8b6a2ed091af496773ea839eee95fcf768706c185690 SHA512 fba5bbdc048491a298b0869a5351ab253029853a8c847fd409e1c4914005d1dc19f35651c9e3d821d924dbfaa277c5cb8d50a0afa8214f29809027ffa63a2d16 WHIRLPOOL a37736ccc477096163ca6b2a2805605a8e0cf6648a0b009396612253f2972c9c1034a875d6fae172863f2297db62b97f0b471d9854a637882a8fd2ff197dcf66
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.19 (GNU/Linux)
+
+iQEcBAEBCAAGBQJQ9xJ0AAoJEBzRPIrUMBNCkCMIAIF9KnDIKt7os5kRBOgYhaEV
+rbqoACrA1CdbvtIbIhlpgGxvDwx5gGMhc11b9d6gCIBbks/fp5RuGIUUe33BlpoF
+IZCa2lDDQJ5Cwv+v1Pcw7hPdtrpUX4C0AYLU5J40iTb0LSv0anjdIJHpXVAFpd2p
+k88s7xoEpJUKoZki0js3tLise1AHnnWp33n6Ip3g2UT9Yo6dc2vdy3wh7rfgiU9a
+kT9caZ5A1ehrV2cYUfje6feqbcaJ4jk44hBfqokBOC63namCYmuVaMdLfUHiRpAO
+4g7a1Vc9j8+n9Xtr7avn5x5Cmc/U4beJuYr8+T+pZ7ZWUo4bkW9m23LIjvANo1Q=
+=vfEv
+-----END PGP SIGNATURE-----
diff --git a/sys-apps/pcsc-lite/files/pcscd-init.6 b/sys-apps/pcsc-lite/files/pcscd-init.6
new file mode 100644
index 000000000000..db366062ca63
--- /dev/null
+++ b/sys-apps/pcsc-lite/files/pcscd-init.6
@@ -0,0 +1,23 @@
+#!/sbin/runscript
+# Copyright 1999-2013 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.6,v 1.1 2013/01/16 20:49:25 flameeyes Exp $
+
+name="PC/SC Daemon"
+
+pidfile=/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
+	use logger
+}
+
+start_pre() {
+	checkpath -d -m 0755 -o pcscd:pcscd /run/pcscd
+}
diff --git a/sys-apps/pcsc-lite/pcsc-lite-1.8.7.ebuild b/sys-apps/pcsc-lite/pcsc-lite-1.8.8.ebuild
index 71561fcfa4b4..345882fbc9aa 100644
--- a/sys-apps/pcsc-lite/pcsc-lite-1.8.7.ebuild
+++ b/sys-apps/pcsc-lite/pcsc-lite-1.8.8.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 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.8.7.ebuild,v 1.2 2013/01/01 14:52:50 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/pcsc-lite/pcsc-lite-1.8.8.ebuild,v 1.1 2013/01/16 20:49:25 flameeyes Exp $
 
 EAPI="4"
 
@@ -9,12 +9,14 @@ inherit eutils multilib udev user
 DESCRIPTION="PC/SC Architecture smartcard middleware library"
 HOMEPAGE="http://pcsclite.alioth.debian.org/"
 
-STUPID_NUM="3842"
+STUPID_NUM="3862"
 MY_P="${PN}-${PV/_/-}"
 SRC_URI="http://alioth.debian.org/download.php/${STUPID_NUM}/${MY_P}.tar.bz2"
 S="${WORKDIR}/${MY_P}"
 
-LICENSE="BSD ISC MIT GPL-3+"
+# GPL-2 is there for the init script; everything else comes from
+# upstream.
+LICENSE="BSD ISC MIT GPL-3+ GPL-2"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 
@@ -30,12 +32,14 @@ CDEPEND="libusb? ( virtual/libusb:1 )
 DEPEND="${CDEPEND}
 	virtual/pkgconfig"
 RDEPEND="${CDEPEND}
-	!<app-crypt/ccid-1.4.1-r1"
+	!<app-crypt/ccid-1.4.1-r1
+	!<sys-apps/baselayout-2
+	!<sys-apps/openrc-0.11.8"
 
 pkg_setup() {
 	enewgroup openct # make sure it exists
 	enewgroup pcscd
-	enewuser pcscd -1 -1 /var/run/pcscd pcscd,openct
+	enewuser pcscd -1 -1 /run/pcscd pcscd,openct
 }
 
 src_configure() {
@@ -45,6 +49,7 @@ src_configure() {
 		--docdir="${EPREFIX}/usr/share/doc/${PF}" \
 		--enable-usbdropdir="${EPREFIX}/usr/$(get_libdir)/readers/usb" \
 		--without-systemdsystemunitdir \
+		--enable-ipcdir=/run/pcscd \
 		$(use_enable udev libudev) \
 		$(use_enable libusb) \
 		${myconf}
@@ -56,7 +61,7 @@ src_install() {
 	default
 	prune_libtool_files
 
-	newinitd "${FILESDIR}"/pcscd-init.5 pcscd
+	newinitd "${FILESDIR}"/pcscd-init.6 pcscd
 
 	if use udev; then
 		insinto "$(udev_get_udevdir)"/rules.d