gentoo resync 08.09.2018

3 files changed, 2 insertions, 109 deletions

diff --git a/sys-apps/pcsc-lite/Manifest b/sys-apps/pcsc-lite/Manifest
index 957a80ec1766..f2ab6a988006 100644
--- a/sys-apps/pcsc-lite/Manifest
+++ b/sys-apps/pcsc-lite/Manifest
@@ -1,8 +1,6 @@
 AUX 99-pcscd-hotplug.rules 358 BLAKE2B 6ff034ffd1a1942d5d0429f9ed35428853ff8daa06eeec753415df8b514894dbc925c9210df80fbdf2f723a476740e8d15785c2c98cca6733249c4643aa632aa SHA512 74421fe073cb55f665c4a0350931beae7c252300b4954f69f215334e3e4e6dda927f51837540d24d893ba8ae862e3c1370b694d153508c4186e94959d37f918a
 AUX pcsc-lite-1.8.11-polkit-pcscd.patch 744 BLAKE2B b9a846a989d1708a30bb62e93ab19fbf5cfe4c2c601d435b53a8933117d919a4fbac8835e68b895507840a25a9aab85e35f6b4c2e7461ec3c7893d483e12f759 SHA512 4f8b774ec888d51c0ad82431cb9d041be6b69af0bfa2a535c6b7e47afb0056147c08ab9265d7da2259a74347ceba9dba320ad0892d3a25797efc64b79113f4a5
 AUX pcscd-init.7 408 BLAKE2B 15ba28f80cc0f44598a553bced62bf8972b698bf8c02a715531ffbb0724915004e47e2779fefa6349adccfdc7d32e8880f8d6d82ea98178e8556b9453c31019d SHA512 e4dac959dbea3d418a3e4012788a3cc7b8aeea295f56f1c3e2f0a599cf469d302f3eaadf05cd0b3c7929a583f8d0b6756177ebe2c497c404b70e9aed7fb7d003
-DIST pcsc-lite-1.8.22.tar.bz2 751724 BLAKE2B d11ca9588449ea8508550b60aad2d2bb6a140c02a86287f6d972ced97fdc8a5db80d542624cbaebdda564192217186c79c30b046cb7d6f6c7a450d91c0f1c9fb SHA512 762eccf6a25040653f563b93bf11262ddc015323d06d759a3472ba80af0489804410ba17c7e5330ccd4b5accc8b7314c80b5e99da278561d3818d8c381e6a025
 DIST pcsc-lite-1.8.23.tar.bz2 749922 BLAKE2B 62c7fb931735bf5fba55e75141a3e4216a126c56ae47833168b154abacd3294dba4afc47b74814a474ca9e52c7ca62a532a0e6ae9fb88b635592e8c545f68e76 SHA512 fef9f40376660bc9de938608cfdbf12ca764be1ebb59c7a1065cb74a21ecc7333f86add25028bd47ec55b2227a9e2d15e1afcb6d0aeb510636d2aadef254bec4
-EBUILD pcsc-lite-1.8.22.ebuild 3112 BLAKE2B c1d106f3b4f16ced53101f297682baff29474e2eccb04bce34c7b11b094696f0899dae6fee3de59f5ffc61f2900cd25f41719a7393a03aaa741a86b8e36e6ab5 SHA512 e34b879d3e806c22d3d337cfbd100063f2464f127edba5afc312787ffdb58db16d6e54f637ef550335190f1b33781bf4daa01c87a2c34ff924745741169e445c
-EBUILD pcsc-lite-1.8.23.ebuild 3178 BLAKE2B d7b1d679878ba0af7220ae219b9306e11387c73c49e60221e9f17158ce2d4abd3ef606181a6df06f74d091a516b9347c9b157a5d9095f0279947e0d35df6b26e SHA512 d449fc2c2be6f9457ab704dcf1642103f1be58a8e195d794114897ecc228bf3f86cfbc3afd6bd518e8baf53dcdbdc3e56153a3765b9425121d6f42821c407254
+EBUILD pcsc-lite-1.8.23.ebuild 3176 BLAKE2B eb1e6b7e25fc4e8182eaa7b37fd31bdc9b6c5b808aedfaa06ff5c5109b9ef1ec0903cad253022cfb447eb74f443aef1a40c3ace27e64cafd9d1638e6ee295c33 SHA512 2cb289e5f2cf8ea36058563c6d37aaa71fc3ec605a3f80eb8a5ac5ed8da93abcf7f8b49472edda272156f77b72a0f28dc0907f10362e4720c26bb4c40a00e79f
 MISC metadata.xml 1077 BLAKE2B d13414e4b691e3df98ce7fefb9939a2cfd224d7ce76b78a72c0585c22acf18939ccee85a5f19791ccdbb8e31e8ba93cb0c537dc86a8a8820435efbef07c7d941 SHA512 4abc19855a868236dfdcfa6d42fcb901fdf52796e08b589a1413c78b931aee74fd482121ff67da632c2cf2e1ba018ff02f1122f1dac5c2185046f98952efd838
diff --git a/sys-apps/pcsc-lite/pcsc-lite-1.8.22.ebuild b/sys-apps/pcsc-lite/pcsc-lite-1.8.22.ebuild
deleted file mode 100644
index 4d2ab52863b3..000000000000
--- a/sys-apps/pcsc-lite/pcsc-lite-1.8.22.ebuild
+++ /dev/null
@@ -1,105 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
-
-inherit python-single-r1 systemd udev user multilib-minimal
-
-DESCRIPTION="PC/SC Architecture smartcard middleware library"
-HOMEPAGE="https://pcsclite.apdu.fr/"
-
-SRC_URI="https://pcsclite.apdu.fr/files/${P}.tar.bz2"
-
-# 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 ~arm64 hppa ia64 ~m68k ppc ppc64 s390 ~sh ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
-
-# This is called libusb so that it doesn't fool people in thinking that
-# it is _required_ for USB support. Otherwise they'll disable udev and
-# that's going to be worse.
-IUSE="python libusb policykit selinux +udev"
-
-REQUIRED_USE="^^ ( udev libusb ) \
-	python? ( ${PYTHON_REQUIRED_USE} )"
-
-# No dependencies need the MULTILIB_DEPS because the libraries are actually
-# standalone, the deps are only needed for the daemon itself.
-CDEPEND="libusb? ( virtual/libusb:1 )
-	udev? ( virtual/udev )
-	policykit? ( >=sys-auth/polkit-0.111 )
-	python? ( ${PYTHON_DEPS} )"
-DEPEND="${CDEPEND}
-	virtual/pkgconfig"
-RDEPEND="${CDEPEND}
-	!<app-crypt/ccid-1.4.1-r1
-	!<sys-apps/baselayout-2
-	!<sys-apps/openrc-0.11.8
-	selinux? ( sec-policy/selinux-pcscd )
-"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.8.11-polkit-pcscd.patch
-)
-
-DOCS=( AUTHORS DRIVERS HELP README SECURITY ChangeLog )
-
-pkg_setup() {
-	use python && python-single-r1_pkg_setup
-	enewgroup openct # make sure it exists
-	enewgroup pcscd
-	enewuser pcscd -1 -1 /run/pcscd pcscd,openct
-}
-
-multilib_src_configure() {
-	ECONF_SOURCE="${S}" econf \
-		--disable-maintainer-mode \
-		--enable-usbdropdir="${EPREFIX}/usr/$(get_libdir)/readers/usb" \
-		--enable-ipcdir=/run/pcscd \
-		--with-systemdsystemunitdir="$(systemd_get_systemunitdir)" \
-		$(multilib_native_use_enable udev libudev) \
-		$(multilib_native_use_enable libusb) \
-		$(multilib_native_use_enable policykit polkit)
-}
-
-multilib_src_install_all() {
-	einstalldocs
-
-	newinitd "${FILESDIR}"/pcscd-init.7 pcscd
-
-	if use udev; then
-		insinto "$(get_udevdir)"/rules.d
-		doins "${FILESDIR}"/99-pcscd-hotplug.rules
-	fi
-
-	for f in "${ED}/usr/bin/pcsc-spy"; do
-		if use python; then
-			python_fix_shebang "${f}"
-		else
-			rm "${f}"
-		fi
-	done
-}
-
-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 udev; then
-		elog "Hotplug support is provided by udev rules; you only need to tell"
-		elog "the init system to hotplug it, by setting this variable in"
-		elog "/etc/rc.conf:"
-		elog ""
-		elog "    rc_hotplug=\"pcscd\""
-	fi
-}
diff --git a/sys-apps/pcsc-lite/pcsc-lite-1.8.23.ebuild b/sys-apps/pcsc-lite/pcsc-lite-1.8.23.ebuild
index 906dcb901940..2136aebdae3f 100644
--- a/sys-apps/pcsc-lite/pcsc-lite-1.8.23.ebuild
+++ b/sys-apps/pcsc-lite/pcsc-lite-1.8.23.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://pcsclite.apdu.fr/files/${P}.tar.bz2"
 # upstream.
 LICENSE="BSD ISC MIT GPL-3+ GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ia64 ~m68k ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~m68k ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 
 # This is called libusb so that it doesn't fool people in thinking that
 # it is _required_ for USB support. Otherwise they'll disable udev and