From a4d47bc2c0129a0fcad7e83c2565fe1b49ff6dde Mon Sep 17 00:00:00 2001 From: Samuli Suominen Date: Fri, 25 May 2012 11:09:52 +0000 Subject: Use Python 2.x for pamusb-conf and pamusb-agent tools wrt #413025 by "samuraiii" (Portage version: 2.2.0_alpha107/cvs/Linux x86_64) --- sys-auth/pam_usb/ChangeLog | 6 +++++- sys-auth/pam_usb/pam_usb-0.5.0.ebuild | 15 +++++++++++---- 2 files changed, 16 insertions(+), 5 deletions(-) (limited to 'sys-auth') diff --git a/sys-auth/pam_usb/ChangeLog b/sys-auth/pam_usb/ChangeLog index e2604946d647..8bfba888c62b 100644 --- a/sys-auth/pam_usb/ChangeLog +++ b/sys-auth/pam_usb/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for sys-auth/pam_usb # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-auth/pam_usb/ChangeLog,v 1.24 2012/05/04 18:57:21 jdhore Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-auth/pam_usb/ChangeLog,v 1.25 2012/05/25 11:09:52 ssuominen Exp $ + + 25 May 2012; Samuli Suominen pam_usb-0.5.0.ebuild: + Use Python 2.x for pamusb-conf and pamusb-agent tools wrt #413025 by + "samuraiii" 04 May 2012; Jeff Horelick pam_usb-0.5.0.ebuild: dev-util/pkgconfig -> virtual/pkgconfig diff --git a/sys-auth/pam_usb/pam_usb-0.5.0.ebuild b/sys-auth/pam_usb/pam_usb-0.5.0.ebuild index 1a70b9ce2460..92b57ae9e49a 100644 --- a/sys-auth/pam_usb/pam_usb-0.5.0.ebuild +++ b/sys-auth/pam_usb/pam_usb-0.5.0.ebuild @@ -1,9 +1,12 @@ # Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-auth/pam_usb/pam_usb-0.5.0.ebuild,v 1.6 2012/05/04 18:57:21 jdhore Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-auth/pam_usb/pam_usb-0.5.0.ebuild,v 1.7 2012/05/25 11:09:52 ssuominen Exp $ EAPI=4 -inherit eutils pam toolchain-funcs + +PYTHON_DEPEND="2:2.6" + +inherit eutils pam python toolchain-funcs DESCRIPTION="A pam module to provide authentication using USB device" HOMEPAGE="http://pamusb.org/" @@ -14,7 +17,6 @@ SLOT="0" KEYWORDS="~amd64 ~x86" IUSE="" -# FIXME: pmount: http://bugs.gentoo.org/show_bug.cgi?id=358935#c5 COMMON_DEPEND="dev-libs/libxml2 sys-apps/dbus virtual/pam" @@ -27,9 +29,14 @@ RDEPEND="${COMMON_DEPEND} DEPEND="${COMMON_DEPEND} virtual/pkgconfig" +pkg_setup() { + python_set_active_version 2 + python_pkg_setup +} + src_prepare() { - # FIXME: push upstream: http://bugs.gentoo.org/show_bug.cgi?id=358935#c6 epatch "${FILESDIR}"/${P}-openpam.patch + python_convert_shebangs 2 tools/pamusb-{conf,agent} #413025 } src_compile() { -- cgit v1.2.3-65-gdbad