gentoo resync : 15.01.2020

5 files changed, 45 insertions, 162 deletions

diff --git a/sys-apps/pcsc-lite/Manifest b/sys-apps/pcsc-lite/Manifest
index c3456e2300f8..f346037b92d0 100644
--- a/sys-apps/pcsc-lite/Manifest
+++ b/sys-apps/pcsc-lite/Manifest
@@ -3,9 +3,8 @@ AUX 99-pcscd-hotplug.rules 358 BLAKE2B 6ff034ffd1a1942d5d0429f9ed35428853ff8daa0
 AUX pcsc-lite-1.8.11-polkit-pcscd.patch 744 BLAKE2B b9a846a989d1708a30bb62e93ab19fbf5cfe4c2c601d435b53a8933117d919a4fbac8835e68b895507840a25a9aab85e35f6b4c2e7461ec3c7893d483e12f759 SHA512 4f8b774ec888d51c0ad82431cb9d041be6b69af0bfa2a535c6b7e47afb0056147c08ab9265d7da2259a74347ceba9dba320ad0892d3a25797efc64b79113f4a5
 AUX pcscd-init.7 408 BLAKE2B 54e4995a169b7f816b0de9b409ae94a8328e792b50872d583988cc87ad20b5c2d20559f3702dc4525dcc46c4afabf817c1e76f4a080ca277f9ab01ebcf67441f SHA512 24fbd0fe2847f6c7bb961e4e0d9fa5197d408971fc33fa7652893ce9dbba958d19b02be7688afd4e9617520f93b6544af74968d6fcc3b31ad73b3ac585e87500
 AUX pcscd-udev 330 BLAKE2B 50e99953aec238fe98c6aee5219d3978b44d37c90ce74c9cb8e19b37c8677001e9b1b3701df8246bf051c6cf8b5c971f86bf1f580bfcbff270b8937328ca887d SHA512 06b672135fda9f83af4f030ff8078f8e1194ced529334c17c1a93f81ee9a5d4448bcea5ffec398f01d957a6607fbde7f69fbc23d727bb3ffad48a305cefe5c26
-DIST pcsc-lite-1.8.24.tar.bz2 755670 BLAKE2B 22cc072978e221d455373e1fdeb21ae8f3dacdd188a4e8a69ef44202924e6c17c4282d424c88ac32b04c62af6e67787f2d2ba936bd3e3667452b32c40254de28 SHA512 df2e6a7a8179563a6dbf654ab75cf78a4b297b0562214a081d7d2b5d00fd4adf92fd892bd16aacf9d5e2867f3ad46c88a88e5834e311011f37556dd7e8936a0c
 DIST pcsc-lite-1.8.25.tar.bz2 757099 BLAKE2B c34727833206b4c868e4f0cd6f8bcaf6899695a92488df8e2fc815c00771ea2f248d9d5fa457c02fc437b8350cbfa37390e07f45b90d08630c8afc34b247034a SHA512 0da63cefd70d9524b2afabd62c5f404758c805b84bbe9ef64fb801ef91a8934c38495513022565ea31bd8550b23bc95b9e9b098ddc76930e3d0643c1fbfb5deb
-EBUILD pcsc-lite-1.8.24.ebuild 3143 BLAKE2B c8ef25ce037c708a6907b6576bd445221acb5649c480627d2b0b0986b3982970a2e6248bcc96895bf68582e41e7a0c4d0b3f39e8872822df9e7439db04de690f SHA512 9acabc5a46749c7e629f50d45acf32d587a6e493af63d9c91231c0588c9d944d9292425d20f6915669f2102d4ef9be277bef33f3ca4ea8bd95290adae78569bd
-EBUILD pcsc-lite-1.8.25-r1.ebuild 3270 BLAKE2B c6f56b504f160d33ed088eafcb5bb1e1fc7a0fc14d6e0ab9059f1e5e5f9beb4be9957292ca7d6d89c3ccb2408459d6e7963f32e8b1cbd247c8a264f7f4c003dd SHA512 b53adb0a3249442eaa96b725fa836c969072e913cd04db3dd3110a361084ef3a58741f4b5f3156872ec2ddef3add4f3bed93b1c37c2f6b4bfc2ce38aa578e1ca
-EBUILD pcsc-lite-1.8.25.ebuild 3157 BLAKE2B 6acae101029143740b7f89583039e2c9055e297969b654b7085dcc79daa5d9e5a9512b59bdb649f9998782d62b4c8207c0b9561042f38fba675091544e0c7bff SHA512 da22534015b24d6bd9c84e42231648417e18ca43c87ea1e4a60037a214947a3132afaf42714b3af978db9b361bd6835ebaafa1855cc9d25417a8f0055ffa8023
-MISC metadata.xml 1193 BLAKE2B f842dcec2896ec10e4534bff193a9fce613e935c67fed485ff4d93641379b01160315a001a60c052fdce8895340a64e2d47d97d70947bae367e4e8ba249a49a8 SHA512 c3aceb88116b636691dcdda75b9b82b3e597f2988d4cf9d53ef907b765993f0bb1c2510fd1a9deda10d0ad9c24adbc7d3e95d310b25dde398f3e7de92378120c
+DIST pcsc-lite-1.8.26.tar.bz2 754838 BLAKE2B 98bc1abdd66a08dde479821f8b1ef489980a6d58d2a624902de12d0862a4e11b47ed7b12eceff438ecd794bd78a91a7a376e7f4c78c1b03867555dd0e5b734d5 SHA512 23f9f41e08f6a5ff1840bec621ee37d6eb268e4ced58df516eb7e32cb6a84998a1d04bafcec36e6524926963e6730a25301301d364b6bd4dda8da1caaa76f037
+EBUILD pcsc-lite-1.8.25-r1.ebuild 3034 BLAKE2B 942d27c6d1fc62515cb0d06c3305b80b927fd7a1bbb0deba55f5ca62ac2be8a4619befad2774534d6901b1b0f46635d8dd8a6166f7b2c0e8abede2d0d8fb844a SHA512 9d010856526b1e61b14793be62e70833cab0f31ed2b266cfc43c638203016e34f5c7288f25d210ee40334042506c43bddd30a1f97473aeb3b37255e83eb3d7c5
+EBUILD pcsc-lite-1.8.26.ebuild 3137 BLAKE2B d8c9cb8de8e16aaafdf88168a8649d6b97be7ac45fd8cb53257376b89305281971deb01459e99d20120358750af8deb9e325573403ef0b9d95c6fdd22d7bd257 SHA512 2d102477741164e9258b45a44513bbca59ee6fc8a9aa4df8c5fcbd6229d10233ff51c7da4079b334f5b98e98214a8f412acae47b5ebdb6302a1ad30ad644c737
+MISC metadata.xml 1172 BLAKE2B 4812ad5a9e6f621bbb49e4411893118e05d2c2f091852c8e883a0b016df95b5949bf03a56f219d62fd88bf4a577a167bafc5c8e87e2d38d83f06949cad935f35 SHA512 4c1cc89e8a1c2547c601bce8523a0adecc24403f5348a96a8760e178bc1fe93dc36b7b55d4ddfa541cdcbf4eabf8e2ccb1ce6092b42a80d20112c514b9ad1e41
diff --git a/sys-apps/pcsc-lite/metadata.xml b/sys-apps/pcsc-lite/metadata.xml
index 168fb01b4353..293526049b68 100644
--- a/sys-apps/pcsc-lite/metadata.xml
+++ b/sys-apps/pcsc-lite/metadata.xml
@@ -1,10 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="project">
-    <email>crypto@gentoo.org</email>
-    <name>Crypto</name>
-</maintainer>
 <maintainer type="person">
         <email>zlogene@gentoo.org</email>
         <name>Mikle Kolyada</name>
@@ -14,6 +10,7 @@
   </longdescription>
 
   <use>
+    <flag name="embedded">limit RAM and CPU ressources by disabling features</flag>
     <flag name="libusb" restrict="&gt;=sys-apps/pcsc-lite-1.8.0">
       Use <pkg>dev-libs/libusb</pkg> detection to hotplug new
       smartcard readers. This flag should only be enabled if you're
diff --git a/sys-apps/pcsc-lite/pcsc-lite-1.8.24.ebuild b/sys-apps/pcsc-lite/pcsc-lite-1.8.24.ebuild
deleted file mode 100644
index 93765f85c0f2..000000000000
--- a/sys-apps/pcsc-lite/pcsc-lite-1.8.24.ebuild
+++ /dev/null
@@ -1,104 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python2_7 python3_{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 systemd +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.
-DEPEND="libusb? ( virtual/libusb:1 )
-	udev? ( virtual/udev )
-	policykit? ( >=sys-auth/polkit-0.111 )
-	python? ( ${PYTHON_DEPS} )"
-RDEPEND="${DEPEND}
-	!<app-crypt/ccid-1.4.1-r1
-	!<sys-apps/baselayout-2
-	!<sys-apps/openrc-0.11.8
-	selinux? ( sec-policy/selinux-pcscd )"
-BDEPEND="virtual/pkgconfig"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.8.11-polkit-pcscd.patch
-)
-
-DOCS=( AUTHORS 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 systemd  libsystemd) \
-		$(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.25-r1.ebuild b/sys-apps/pcsc-lite/pcsc-lite-1.8.25-r1.ebuild
index 87907e6517d5..602e0cb56e08 100644
--- a/sys-apps/pcsc-lite/pcsc-lite-1.8.25-r1.ebuild
+++ b/sys-apps/pcsc-lite/pcsc-lite-1.8.25-r1.ebuild
@@ -1,13 +1,14 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python{2_7,3_{5,6,7}} )
 
-inherit python-single-r1 systemd udev user multilib-minimal
+PYTHON_COMPAT=( python{3_6,3_7} )
+
+inherit python-single-r1 systemd udev multilib-minimal
 
 DESCRIPTION="PC/SC Architecture smartcard middleware library"
-HOMEPAGE="https://pcsclite.apdu.fr/"
+HOMEPAGE="https://pcsclite.apdu.fr https://github.com/LudovicRousseau/PCSC"
 
 SRC_URI="https://pcsclite.apdu.fr/files/${P}.tar.bz2"
 
@@ -15,27 +16,28 @@ 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
 # that's going to be worse.
-IUSE="python libusb policykit selinux systemd +udev"
+IUSE="libusb policykit selinux systemd +udev"
 
-REQUIRED_USE="^^ ( udev libusb )
-	python? ( ${PYTHON_REQUIRED_USE} )"
+REQUIRED_USE="^^ ( udev libusb ) ${PYTHON_REQUIRED_USE}"
 
 # No dependencies need the MULTILIB_DEPS because the libraries are actually
 # standalone, the deps are only needed for the daemon itself.
 DEPEND="libusb? ( virtual/libusb:1 )
 	udev? ( virtual/udev )
 	policykit? ( >=sys-auth/polkit-0.111 )
-	python? ( ${PYTHON_DEPS} )"
+	acct-group/openct
+	acct-group/pcscd
+	acct-user/pcscd
+	${PYTHON_DEPS}"
+
 RDEPEND="${DEPEND}
-	!<app-crypt/ccid-1.4.1-r1
-	!<sys-apps/baselayout-2
-	!<sys-apps/openrc-0.11.8
 	selinux? ( sec-policy/selinux-pcscd )"
+
 BDEPEND="virtual/pkgconfig"
 
 PATCHES=(
@@ -45,10 +47,7 @@ PATCHES=(
 DOCS=( AUTHORS 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
+	python-single-r1_pkg_setup
 }
 
 multilib_src_configure() {
@@ -76,13 +75,7 @@ multilib_src_install_all() {
 		newins "${FILESDIR}"/99-pcscd-hotplug-r1.rules 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}" || die
-		fi
-	done
+	python_fix_shebang "${ED}"/usr/bin/pcsc-spy
 }
 
 pkg_postinst() {
diff --git a/sys-apps/pcsc-lite/pcsc-lite-1.8.25.ebuild b/sys-apps/pcsc-lite/pcsc-lite-1.8.26.ebuild
index 77ffad5c2320..e962566ef384 100644
--- a/sys-apps/pcsc-lite/pcsc-lite-1.8.25.ebuild
+++ b/sys-apps/pcsc-lite/pcsc-lite-1.8.26.ebuild
@@ -1,13 +1,14 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python{2_7,3_{5,6,7}} )
 
-inherit python-single-r1 systemd udev user multilib-minimal
+PYTHON_COMPAT=( python{3_6,3_7} )
+
+inherit python-single-r1 systemd udev multilib-minimal
 
 DESCRIPTION="PC/SC Architecture smartcard middleware library"
-HOMEPAGE="https://pcsclite.apdu.fr/"
+HOMEPAGE="https://pcsclite.apdu.fr https://github.com/LudovicRousseau/PCSC"
 
 SRC_URI="https://pcsclite.apdu.fr/files/${P}.tar.bz2"
 
@@ -20,22 +21,23 @@ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~s390 ~sh ~spa
 # 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 systemd +udev"
+IUSE="doc embedded libusb policykit selinux systemd +udev"
 
-REQUIRED_USE="^^ ( udev libusb )
-	python? ( ${PYTHON_REQUIRED_USE} )"
+REQUIRED_USE="^^ ( udev libusb ) ${PYTHON_REQUIRED_USE}"
 
 # No dependencies need the MULTILIB_DEPS because the libraries are actually
 # standalone, the deps are only needed for the daemon itself.
 DEPEND="libusb? ( virtual/libusb:1 )
 	udev? ( virtual/udev )
 	policykit? ( >=sys-auth/polkit-0.111 )
-	python? ( ${PYTHON_DEPS} )"
+	acct-group/openct
+	acct-group/pcscd
+	acct-user/pcscd
+	${PYTHON_DEPS}"
+
 RDEPEND="${DEPEND}
-	!<app-crypt/ccid-1.4.1-r1
-	!<sys-apps/baselayout-2
-	!<sys-apps/openrc-0.11.8
 	selinux? ( sec-policy/selinux-pcscd )"
+
 BDEPEND="virtual/pkgconfig"
 
 PATCHES=(
@@ -45,10 +47,7 @@ PATCHES=(
 DOCS=( AUTHORS 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
+	python-single-r1_pkg_setup
 }
 
 multilib_src_configure() {
@@ -57,6 +56,8 @@ multilib_src_configure() {
 		--enable-usbdropdir="${EPREFIX}/usr/$(get_libdir)/readers/usb" \
 		--enable-ipcdir=/run/pcscd \
 		--with-systemdsystemunitdir="$(systemd_get_systemunitdir)" \
+		$(use_enable doc documentation) \
+		$(multilib_native_use_enable embedded) \
 		$(multilib_native_use_enable systemd  libsystemd) \
 		$(multilib_native_use_enable udev libudev) \
 		$(multilib_native_use_enable libusb) \
@@ -69,17 +70,14 @@ multilib_src_install_all() {
 	newinitd "${FILESDIR}"/pcscd-init.7 pcscd
 
 	if use udev; then
+		exeinto "$(get_udevdir)"
+		newexe "${FILESDIR}"/pcscd-udev pcscd.sh
+
 		insinto "$(get_udevdir)"/rules.d
-		doins "${FILESDIR}"/99-pcscd-hotplug.rules
+		newins "${FILESDIR}"/99-pcscd-hotplug-r1.rules 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}" || die
-		fi
-	done
+	python_fix_shebang "${ED}"/usr/bin/pcsc-spy
 }
 
 pkg_postinst() {
@@ -95,9 +93,9 @@ pkg_postinst() {
 	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 "Hotplug support is provided by udev rules."
+		elog "When using OpenRC you additionally need to tell it to hotplug"
+		elog "pcscd by setting this variable in /etc/rc.conf:"
 		elog ""
 		elog "    rc_hotplug=\"pcscd\""
 	fi