diff options
Diffstat (limited to 'sys-apps/pcsc-lite')
| -rw-r--r-- | sys-apps/pcsc-lite/ChangeLog | 9 | ||||
| -rw-r--r-- | sys-apps/pcsc-lite/files/pcsc-lite-1.8.11-nopolkit.patch | 35 | ||||
| -rw-r--r-- | sys-apps/pcsc-lite/pcsc-lite-1.8.11-r1.ebuild (renamed from sys-apps/pcsc-lite/pcsc-lite-1.8.11.ebuild) | 7 |
3 files changed, 48 insertions, 3 deletions
diff --git a/sys-apps/pcsc-lite/ChangeLog b/sys-apps/pcsc-lite/ChangeLog index 07e27105cd5e..a7159cb5571f 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-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/pcsc-lite/ChangeLog,v 1.169 2014/02/15 08:53:38 ssuominen Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/pcsc-lite/ChangeLog,v 1.170 2014/02/15 11:59:48 flameeyes Exp $ + +*pcsc-lite-1.8.11-r1 (15 Feb 2014) + + 15 Feb 2014; Diego E. Pettenò <flameeyes@gentoo.org> + +files/pcsc-lite-1.8.11-nopolkit.patch, +pcsc-lite-1.8.11-r1.ebuild, + -pcsc-lite-1.8.11.ebuild: + Bump to fix USE=-policykit (bug #501358). 15 Feb 2014; Samuli Suominen <ssuominen@gentoo.org> pcsc-lite-1.8.11.ebuild: Punt useless --disable-silent-rules which is implied by eapi5. Use get_udevdir 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 new file mode 100644 index 000000000000..82fdb00d9ff1 --- /dev/null +++ b/sys-apps/pcsc-lite/files/pcsc-lite-1.8.11-nopolkit.patch @@ -0,0 +1,35 @@ +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/pcsc-lite-1.8.11.ebuild b/sys-apps/pcsc-lite/pcsc-lite-1.8.11-r1.ebuild index c3dbb3a2a623..69dfaffdec57 100644 --- a/sys-apps/pcsc-lite/pcsc-lite-1.8.11.ebuild +++ b/sys-apps/pcsc-lite/pcsc-lite-1.8.11-r1.ebuild @@ -1,10 +1,10 @@ # Copyright 1999-2014 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.11.ebuild,v 1.2 2014/02/15 08:53:38 ssuominen Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/pcsc-lite/pcsc-lite-1.8.11-r1.ebuild,v 1.1 2014/02/15 11:59:48 flameeyes Exp $ EAPI="5" -inherit eutils multilib systemd udev user +inherit eutils multilib systemd udev user autotools DESCRIPTION="PC/SC Architecture smartcard middleware library" HOMEPAGE="http://pcsclite.alioth.debian.org/" @@ -45,6 +45,9 @@ pkg_setup() { src_prepare() { epatch "${FILESDIR}"/${P}-polkit-pcscd.patch + epatch "${FILESDIR}"/${P}-nopolkit.patch + + eautoreconf } src_configure() { |