summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSamuli Suominen <ssuominen@gentoo.org>2012-05-25 11:09:52 +0000
committerSamuli Suominen <ssuominen@gentoo.org>2012-05-25 11:09:52 +0000
commit5bdc3645594af5ad1c1834d6fe52df1f2282dd8c (patch)
tree9827a580c019a2dd024599bb9d8a357735aa4e96 /sys-auth
parentDon't require rspec for USE=doc. Fixes bug 417463. (diff)
downloadhistorical-5bdc3645594af5ad1c1834d6fe52df1f2282dd8c.tar.gz
historical-5bdc3645594af5ad1c1834d6fe52df1f2282dd8c.tar.bz2
historical-5bdc3645594af5ad1c1834d6fe52df1f2282dd8c.zip
Use Python 2.x for pamusb-conf and pamusb-agent tools wrt #413025 by "samuraiii"
Package-Manager: portage-2.2.0_alpha107/cvs/Linux x86_64
Diffstat (limited to 'sys-auth')
-rw-r--r--sys-auth/pam_usb/ChangeLog6
-rw-r--r--sys-auth/pam_usb/Manifest18
-rw-r--r--sys-auth/pam_usb/pam_usb-0.5.0.ebuild15
3 files changed, 32 insertions, 7 deletions
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 <ssuominen@gentoo.org> 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 <jdhore@gentoo.org> pam_usb-0.5.0.ebuild:
dev-util/pkgconfig -> virtual/pkgconfig
diff --git a/sys-auth/pam_usb/Manifest b/sys-auth/pam_usb/Manifest
index 9aa00416251f..22fd8f9f36b7 100644
--- a/sys-auth/pam_usb/Manifest
+++ b/sys-auth/pam_usb/Manifest
@@ -1,5 +1,19 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
AUX pam_usb-0.5.0-openpam.patch 266 RMD160 7f723d739a7e2996c1545b837d9efd3ad39fe2a9 SHA1 8106616fb7f2d449d5fc93f56b6e98a17730ed55 SHA256 c10afaaef611bf8e905145634a67b8b485a755abd5f833c77327abd08ae46461
DIST pam_usb-0.5.0.tar.gz 35233 RMD160 aab1a55fec9c5c360d7509ccd053d7d4f5ed4111 SHA1 97bf8ae15a0b0c39cfcd4d8a5f531781ad8c80e7 SHA256 011f9970730a9b9fad7a1a8205f4eb63e757282d80d8bc146ad455d492063cbc
-EBUILD pam_usb-0.5.0.ebuild 1122 RMD160 03a96756fd4624a4585c15b8a3b142a7af69254e SHA1 d7528f936fb4a0b408018b1a78696b71b32a4fb4 SHA256 6afe57b12c8e9420d5e3c285816cccaff5856c5120465a35ea443baf969f9fa8
-MISC ChangeLog 1140 RMD160 70f7520bfc50e97545116def73f295eaf45b614d SHA1 9b23b73fa314be2fe5367aef41dda614769239af SHA256 6381bc3a83715d1c5206a1799c61a78404ef4bc90079cf9c76eb0b3cc7a5ef49
+EBUILD pam_usb-0.5.0.ebuild 1141 RMD160 a00e2c0e154d2ad2dc1955a7dc15ceb54087c9f5 SHA1 220f7878d9573ff0b6ed2661ad982f63b111724c SHA256 aebafa710453cbcfd82c505e0acce5b779e642a66fa16ecb965b3b4132a81e31
+MISC ChangeLog 1305 RMD160 77776c2dd565d12d1a9e322e9cd9d6c93653298d SHA1 067efd4eebe2080ea7467aefc42260cab09c9cfb SHA256 e4cb622056dc457ebb4d67a0d1973fe90ffe3ed0a7db19a358def718673bcaea
MISC metadata.xml 509 RMD160 89a5209a4df0497e449a1684791c7b8dff1de971 SHA1 ae454e01334714830fee6a90c838b173211cef94 SHA256 4371fb31be6845a400828f9be3d206034e9fb9051e2aed5f7248f30ae0be4637
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.19 (GNU/Linux)
+
+iQEcBAEBAgAGBQJPv2iAAAoJEEdUh39IaPFNyCQH/iOqsXaI8qGCQCim/tMsfYFD
+B6XNhVOUga0gjug7NnIz2jpdJ1ch0xwUiJWeiQNAPFN0Ivtru5RuPHpA+l15uPgY
+Fvyvp9ibAkLxpdUOzCOrk7Z+c58BsmElF9pFs54TIUwVV9hFuVXaxgoaGlJG+ATF
+ngGSdinlm+jP+sLQcpFVjkrvM7s61uy4cn/W29V8BTHdPKVrL73OnK0OKV6KFuMY
+C7Ajo/slEfw29IHqrZwN9FH3epGyRPGsuo7jvPve3y/gkdTBmsdlajCUAJh4wvH+
+0nlzZpyYzLApPgDasKBQ3LakgEBMBOEOP/yZD0nwFA4qST9pbfU3xHuSL4/hFT0=
+=LkdF
+-----END PGP SIGNATURE-----
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() {