commit: 97299fcf41506a869c9a265a2c5e819e4d4b76b5 Author: Henning Schild <henning <AT> hennsch <DOT> de> AuthorDate: Wed Nov 9 17:52:32 2016 +0000 Commit: Michael Palimaka <kensington <AT> gentoo <DOT> org> CommitDate: Thu Nov 17 11:58:40 2016 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=97299fcf
sys-apps/pcsc-lite: clean up FILESDIR .../files/pcsc-lite-1.8.11-nopolkit.patch | 35 ---------------------- sys-apps/pcsc-lite/files/pcscd-init.5 | 23 -------------- sys-apps/pcsc-lite/files/pcscd-init.6 | 23 -------------- 3 files changed, 81 deletions(-) diff --git a/sys-apps/pcsc-lite/files/pcsc-lite-1.8.11-nopolkit.patch b/sys-apps/pcsc-lite/files/pcsc-lite-1.8.11-nopolkit.patch deleted file mode 100644 index 82fdb00..00000000 --- a/sys-apps/pcsc-lite/files/pcsc-lite-1.8.11-nopolkit.patch +++ /dev/null @@ -1,35 +0,0 @@ -Index: pcsc-lite-1.8.11/configure.ac -=================================================================== ---- pcsc-lite-1.8.11.orig/configure.ac -+++ pcsc-lite-1.8.11/configure.ac -@@ -284,16 +284,15 @@ fi - POLKIT_MINIMUM=0.111 - AC_ARG_ENABLE(polkit, - AS_HELP_STRING([--enable-polkit], -- [Build with polkit support]), -- use_polkit=$withval, use_polkit=no) --if test "$use_polkit" != "no"; then -- PKG_CHECK_MODULES(POLKIT, [polkit-gobject-1 >= $POLKIT_MINIMUM], [use_polkit=yes], [use_polkit=no]) -- if test "$use_polkit" != "no";then -+ [Build with polkit support])) -+if test "x$enable_polkit" != "xno"; then -+ PKG_CHECK_MODULES(POLKIT, [polkit-gobject-1 >= $POLKIT_MINIMUM], [enable_polkit=yes], [enable_polkit=no]) -+ if test "$enable_polkit" != "no";then - AC_DEFINE([HAVE_POLKIT], 1, [Build polkit access control support]) - polkit_policy_dir=$($PKG_CONFIG polkit-gobject-1 --variable=policydir) - AC_SUBST(POLICY_DIR, [$polkit_policy_dir]) - else -- use_polkit=no -+ enable_polkit=no - AC_MSG_ERROR([[ - *** - *** polkit >= $POLKIT_MINIMUM was not found. Access control will be disabled. -@@ -301,7 +300,7 @@ if test "$use_polkit" != "no"; then - *** ]]) - fi - fi --AM_CONDITIONAL(ENABLE_POLKIT, test "$use_polkit" != "no") -+AM_CONDITIONAL(ENABLE_POLKIT, test "$enable_polkit" != "no") - - # --with-systemdsystemunitdir=DIR - AC_ARG_WITH([systemdsystemunitdir], diff --git a/sys-apps/pcsc-lite/files/pcscd-init.5 b/sys-apps/pcsc-lite/files/pcscd-init.5 deleted file mode 100644 index aa750ab..00000000 --- a/sys-apps/pcsc-lite/files/pcscd-init.5 +++ /dev/null @@ -1,23 +0,0 @@ -#!/sbin/openrc-run -# Copyright 1999-2012 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -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 - use logger -} - -start_pre() { - checkpath -d -m 0755 -o pcscd:pcscd /var/run/pcscd -} diff --git a/sys-apps/pcsc-lite/files/pcscd-init.6 b/sys-apps/pcsc-lite/files/pcscd-init.6 deleted file mode 100644 index 5017199..00000000 --- a/sys-apps/pcsc-lite/files/pcscd-init.6 +++ /dev/null @@ -1,23 +0,0 @@ -#!/sbin/openrc-run -# Copyright 1999-2013 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -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 -}