Cleanup old; add an 'use logger' to the init script.

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

5 files changed, 17 insertions, 119 deletions

diff --git a/sys-apps/pcsc-lite/ChangeLog b/sys-apps/pcsc-lite/ChangeLog
index a16a7a8f160e..f14bd36f724d 100644
--- a/sys-apps/pcsc-lite/ChangeLog
+++ b/sys-apps/pcsc-lite/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sys-apps/pcsc-lite
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/pcsc-lite/ChangeLog,v 1.151 2012/12/06 03:57:16 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/pcsc-lite/ChangeLog,v 1.152 2012/12/28 11:53:28 flameeyes Exp $
+
+  28 Dec 2012; Diego E. Pettenò <flameeyes@gentoo.org> -files/pcscd-init.3,
+  -pcsc-lite-1.6.6-r2.ebuild, files/pcscd-init.5:
+  Cleanup old; add an 'use logger' to the init script.
 
   06 Dec 2012; Pawel Hajdan jr <phajdan.jr@gentoo.org> pcsc-lite-1.8.6.ebuild:
   x86 stable wrt bug #442432
diff --git a/sys-apps/pcsc-lite/Manifest b/sys-apps/pcsc-lite/Manifest
index 9e6a5af20f1a..6ee59189a3a7 100644
--- a/sys-apps/pcsc-lite/Manifest
+++ b/sys-apps/pcsc-lite/Manifest
@@ -2,22 +2,23 @@
 Hash: SHA256
 
 AUX 99-pcscd-hotplug.rules 483 SHA256 85b0927bd4311a5aeabcadcfa69b6096befb593216579bfbb295985a5bead3d7 SHA512 3c234a782417ca52811217b8b7f97feb6336aee99a165fca5d041275ee9461e23f8a3e807d47dd250fd489f2ea04cca5e6f559d2abfd6be1126e57c8666e8e0a WHIRLPOOL 57164425af845961cc4ffed47613139d5eb84723471b704391ca5fae3c0a2657452220e309e7ef99e7f1a720ca0cdda4907f3f8803f90ede8be84a93f436dd99
-AUX pcscd-init.3 740 SHA256 7c15616a1221c31d89317f29faeea4682a6d9284a6a9ce97f00ab8ee0a2a58d7 SHA512 eb9f523f326e39b55add52cc400896c20c7683328e67f1d7920259de607a527d99876036ead734297ed1079dbd5bd1fad97e330af22a03e1b16ea18f89184d07 WHIRLPOOL 6dc026dcf438368687bfdb5ea186d8423306775853ab2eb1f58186741c54e5cd52ea93b3adde707d1b56f4d2b5340b109bafb02bdc4e5a91013fe09b94d1ac4d
-AUX pcscd-init.5 514 SHA256 82df3730d75eea94b096ac7db818a9dfe854725095859fdf2f550e6f1303f99b SHA512 e27ece9a511d8ab48c441f99d491b77b3adc4e5743e98ff92b39c7bf8655ab85114c3fc843c8cdc48a261400f1e1026216a87bb0b9781028ac44af7058b80fc9 WHIRLPOOL 9a0a8958eb4a104494da9fafd16eafdaa37eb5fe2681dcfe30641a9f77a32f3285aa55d7f6486ddf99b41e4b907ecb47231880d2b25bb6afc4134254281970e3
-DIST pcsc-lite-1.6.6.tar.bz2 480232 SHA256 7a94c27ae687619435b29ad63e0561aca20413333187b4301c75d1a1547ceea8 SHA512 b3b13a4d11cdccc2483bdc81acb8d7e2a38b2a7b35b90d2ff2562ec8205d0d493720fe28432c51f2917ed02a1771c63bbeee6aed54a8d6fee7e299d90aa7f43b WHIRLPOOL abf8805a1cf213b087a619d73f67a327dac6dafedb2136035f307b2577e7bd13b213e76e1ce881932199bda7495dd8ca2eec6730c7ae8047e2705184fcad8e14
+AUX pcscd-init.5 525 SHA256 ad7e71c35797378ef45ea5a027c10d2e2680a43c62c1f358e0bb28dd5ceeb432 SHA512 274cded90b743775e72d67d227da7ab6aad212f8221ad74a24dac77e2eb3109417b323836ab4f20bef543084285badd52ab43af85485ca1b6e2d020a26e00df3 WHIRLPOOL 0c8320fa1ab3cd1badceda2bd4d486bf4d94efc4a53dfd0806b05562df7ae097144b37c43f2819fd84b0399a50ebb0e847fd1d7646c51b28cd2735472e631b29
 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
-EBUILD pcsc-lite-1.6.6-r2.ebuild 2215 SHA256 917b6b63d7d171e1c475612b27c74019cf823094b53c50854cbe542c9adf6fc9 SHA512 1ca7d9af7d2d825a03af1733fe8ee6ed2c1f771075808ac3115c78b376d435e2737405af7256d99c8ba8b624e0212878ded7d5e5338f0f609524228613496867 WHIRLPOOL af9a27c66a0bf1b1837622a2f9aabeb4c85fac359970f2b6b8575246a9dbec90085a7607e3a59245e3327197114be3023f2521d3cf6a0d86505eaf8d7611c890
 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 2526 SHA256 150ccff6b8d2afe7e308532c3c9ee2e9f25f2d68d9475c2ad4375d7d3f987b8c SHA512 18455d2a485f84e2432176669e5b71e165df183a7ba912d8b8f1e7c29dc387e347ec15f7b6e0458946936d35b613dc007ae87ebed057c39f544c8349d9561164 WHIRLPOOL 6c45d551ac6264ce75a5894ce1f6f9a913b1e5d8de1d3fd95e4294fb583f16b54ba3e7b65d4fa85d57d615eac5f787878ca045b3b1a58ca4318c689e97c13ef2
-MISC ChangeLog 22079 SHA256 c446c5adc7b514323c12e8d7c0a6919ba7b428338657cd12b36c2a0536e73907 SHA512 60b6e3f5f030140536084999ecdc8258a69178242bf39b778360c54d23813b563d6636cf59555f1cf152882707b8a5d246f2908448b878ce2b81be0736531414 WHIRLPOOL 68ca4b9491764b967e91463c98ca41b84052c92ca480ef3f60927a2d7f2230f2301f7c6cf53a8886909c6ef4f891433ba4c5d7e6bf21b7f7062ff23f7d6cf157
+MISC ChangeLog 22261 SHA256 586dcd2623d9fed13d1c9d4f3541d3dd0d43457d689dc81d32276c17cc699fb7 SHA512 fbe6272f658f61558eb3ea9f72623ebfae92fcff48eb55d794e79240817b19b6c08d043596f87f769650cb847b7140f56b235901f19560a5243cba4e8e30d3ce WHIRLPOOL 286d844806d8c3967d93a44667dea2112755a21fb2c118c14f8155b3d3a6c5a8ae70013a38141259da4a967151f912b3f00bd6e478a0c679ab8e6e75d4d4cf6a
 MISC metadata.xml 1271 SHA256 81b3fbf2719be0adcbce8b6a2ed091af496773ea839eee95fcf768706c185690 SHA512 fba5bbdc048491a298b0869a5351ab253029853a8c847fd409e1c4914005d1dc19f35651c9e3d821d924dbfaa277c5cb8d50a0afa8214f29809027ffa63a2d16 WHIRLPOOL a37736ccc477096163ca6b2a2805605a8e0cf6648a0b009396612253f2972c9c1034a875d6fae172863f2297db62b97f0b471d9854a637882a8fd2ff197dcf66
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEAREIAAYFAlDAF6IACgkQuUQtlDBCeQJ/DgCfZl8KDRZPXqK4I/BcCvJ6aKwG
-XacAn1rvyVvGSRELOVyNfgoF3lNPMCxK
-=qpcX
+iQEcBAEBCAAGBQJQ3Yg9AAoJEBzRPIrUMBNCEiUH/1xSS9AnmLIJvKwxD93ziHyq
+/sXzfYm1TJMnB4Nrq25Np0sXY/IFV8WHGftUjCfklHoUicMsqOqVeQZ2HP2CYQJl
+0t5hHaOz1Ts+IyNUf1t5QHVVUA4KKVqf7QwE4CSZ1rNENzvCpWuNXTszakFyyRc9
+ybgCAGJcLoEncwIhgXwhhXr9HeJ/jRvSIrGDbXmrbmgdxv9XpQaKAnbWl2n312ce
+YPeEZP5enETYgUT516LuQraXAjRASbKIp5swIn6cqjbTwZJAmZRrQej2kMQb8+hI
+gZ1GhyIzuSgX7OT1nYxxmjMnFxg0TDcr+/LajL7Ml0n/ZjDxd8irwZT5z/6wVJs=
+=WFmr
 -----END PGP SIGNATURE-----
diff --git a/sys-apps/pcsc-lite/files/pcscd-init.3 b/sys-apps/pcsc-lite/files/pcscd-init.3
deleted file mode 100644
index 7d872ccef416..000000000000
--- a/sys-apps/pcsc-lite/files/pcscd-init.3
+++ /dev/null
@@ -1,33 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2010 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.3,v 1.1 2010/12/04 02:08:39 flameeyes Exp $
-
-depend() {
-	need localmount
-}
-
-start() {
-	if ! [ -d /var/run/pcscd ]; then
-		mkdir -p /var/run/pcscd
-	fi
-
-	chgrp pcscd /var/run/pcscd
-	chmod 0775 /var/run/pcscd
-
-	ebegin "Starting pcscd"
-	start-stop-daemon --start \
-        --exec /usr/sbin/pcscd \
-        --pidfile /var/run/pcscd/pcscd.pid \
-		--chuid nobody:pcscd \
-		-- ${EXTRA_OPTS}
-	eend $?
-}
-
-stop() {
-	ebegin "Stopping pcscd"
-	start-stop-daemon --stop \
-        --exec /usr/sbin/pcscd \
-        --pidfile /var/run/pcscd/pcscd.pid
-	eend $?
-}
diff --git a/sys-apps/pcsc-lite/files/pcscd-init.5 b/sys-apps/pcsc-lite/files/pcscd-init.5
index ce4cbee21c66..94b5f431d129 100644
--- a/sys-apps/pcsc-lite/files/pcscd-init.5
+++ b/sys-apps/pcsc-lite/files/pcscd-init.5
@@ -1,7 +1,7 @@
 #!/sbin/runscript
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 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 $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/pcsc-lite/files/pcscd-init.5,v 1.2 2012/12/28 11:53:28 flameeyes Exp $
 
 name="PC/SC Daemon"
 
@@ -14,8 +14,8 @@ start_stop_daemon_args="--user pcscd:pcscd"
 
 depend() {
 	need localmount
-
 	after udev openct
+	use logger
 }
 
 start_pre() {
diff --git a/sys-apps/pcsc-lite/pcsc-lite-1.6.6-r2.ebuild b/sys-apps/pcsc-lite/pcsc-lite-1.6.6-r2.ebuild
deleted file mode 100644
index e9fd817e171b..000000000000
--- a/sys-apps/pcsc-lite/pcsc-lite-1.6.6-r2.ebuild
+++ /dev/null
@@ -1,74 +0,0 @@
-# Copyright 1999-2012 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.6.6-r2.ebuild,v 1.5 2012/11/28 22:50:01 ssuominen Exp $
-
-EAPI=4
-
-inherit multilib eutils user udev
-
-DESCRIPTION="PC/SC Architecture smartcard middleware library"
-HOMEPAGE="http://pcsclite.alioth.debian.org/"
-
-STUPID_NUM="3479"
-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"
-SLOT="0"
-KEYWORDS="amd64 arm hppa ia64 m68k ppc ppc64 s390 sh sparc x86 ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos"
-IUSE="usb kernel_linux"
-
-RDEPEND="usb? ( virtual/libusb:1 )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-RDEPEND="${RDEPEND}
-	!<app-crypt/ccid-1.4.1-r1
-	kernel_linux? ( virtual/udev )"
-
-pkg_setup() {
-	enewgroup pcscd
-}
-
-src_configure() {
-	econf \
-		--disable-maintainer-mode \
-		--docdir="${EPREFIX}/usr/share/doc/${PF}" \
-		--enable-usbdropdir="${EPREFIX}/usr/$(get_libdir)/readers/usb" \
-		$(use_enable usb libusb) \
-		--disable-libhal
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-	dodoc AUTHORS DRIVERS HELP README SECURITY ChangeLog
-
-	newinitd "${FILESDIR}"/pcscd-init.3 pcscd
-
-	if use kernel_linux; then
-		insinto "$(udev_get_udevdir)"/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
-}