Add patch to build with OpenPAM, and change dependency from sys-libs/pam to virtual/pam.

Package-Manager: portage-2.1.5_rc10

4 files changed, 40 insertions, 5 deletions

diff --git a/sys-auth/pam_usb/ChangeLog b/sys-auth/pam_usb/ChangeLog
index 99a832fa07a1..b5743325f7c7 100644
--- a/sys-auth/pam_usb/ChangeLog
+++ b/sys-auth/pam_usb/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sys-auth/pam_usb
 # Copyright 2000-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-auth/pam_usb/ChangeLog,v 1.12 2008/03/24 15:43:08 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-auth/pam_usb/ChangeLog,v 1.13 2008/05/15 01:39:48 flameeyes Exp $
+
+  15 May 2008; Diego Pettenò <flameeyes@gentoo.org>
+  +files/pam_usb-0.4.2-openpam.patch, pam_usb-0.4.2.ebuild:
+  Add patch to build with OpenPAM, and change dependency from sys-libs/pam
+  to virtual/pam.
 
   24 Mar 2008; Raúl Porcel <armin76@gentoo.org> pam_usb-0.3.1.ebuild,
   pam_usb-0.3.2.ebuild, pam_usb-0.4.0.ebuild, pam_usb-0.4.1.ebuild,
diff --git a/sys-auth/pam_usb/Manifest b/sys-auth/pam_usb/Manifest
index 5ca50c260316..fba683d62fa6 100644
--- a/sys-auth/pam_usb/Manifest
+++ b/sys-auth/pam_usb/Manifest
@@ -1,3 +1,7 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+AUX pam_usb-0.4.2-openpam.patch 346 RMD160 b7a24592fdc738146beb7bacbee9b11e4156485e SHA1 44f189e4cc92312aed19e50d7a94f6d0c039a0be SHA256 eff35065f36cd742a60d273aaf65d004b1fc2caa0822f3da33ce85a409da8618
 DIST pam_usb-0.3.1.tar.gz 26626 RMD160 e3504793834c9d8915927ffccaf18bd171a3fb9e SHA1 7030c68727d9050897a6f8a194032fc2561300cb SHA256 6e30403879ec19196e18de414075fa15c8adb0741e3c08b048e128243a55304d
 DIST pam_usb-0.3.2.tar.gz 26659 RMD160 848041fdad7c6466ce9c7149c1cd4ff678d8ae8c SHA1 d154f384ac55671144cc726ac07b32bcaa49a9de SHA256 79d713c1411443c095526795a481e4f6660b7c5c6713739b9df1bd6a034b8212
 DIST pam_usb-0.4.0.tar.gz 31889 RMD160 b68e61c2d42c936c691e251d7d6293aaf567cda6 SHA1 38fdb85f1fd3c69c92b04dc5183a87ac44b56066 SHA256 6166aa915c0504e6d982748c3fc2413659ab5fa30d8a106de6127abfd17cd107
@@ -7,6 +11,13 @@ EBUILD pam_usb-0.3.1.ebuild 894 RMD160 8c37862138f9398818d10abcdf1b1ca68de57d10
 EBUILD pam_usb-0.3.2.ebuild 909 RMD160 5bfe2d405bffd252e43728700a2b9053783477c0 SHA1 1cfcca1a09edc52b8afab284b0a68e6175d3c369 SHA256 f08d47463370533f8de83dcdbcad8f9be7e217117b96bfd08bcae8f6ed7cbec1
 EBUILD pam_usb-0.4.0.ebuild 1412 RMD160 313495144125364862b0405ac736a081e9172d26 SHA1 3576843c43c1a0c269d9e557671f25e047fc815c SHA256 97788f34bb883ad09759209fac2def87cab7d3c95ffaa453551ed2c2c79fe852
 EBUILD pam_usb-0.4.1.ebuild 1410 RMD160 befca67157f655dc51fc56f8651cde6759897e02 SHA1 1b7dc1111fd3837a36c61444f6286d575acf9126 SHA256 1089502c18f86201c75835deeda4297c7e5a08949e9c4cd0dd148154a1e32145
-EBUILD pam_usb-0.4.2.ebuild 1412 RMD160 6cf2d178e31b9e8dcc92426c166700222bb29ee9 SHA1 e167777bf21e461f987553b99bbaa582ca7ca4c6 SHA256 908697bbd2d9c9ae092ef59426a39d0d96f34bb905ae437af1c961d6eea457bc
-MISC ChangeLog 3430 RMD160 5be4081cf5d3cd80385c4f38cf47da1e02067fa2 SHA1 e31ddd1be40acc8939c62331cdd69631274ec0c7 SHA256 724d08ba9548c3854602285d7ab7fec6b52cdceea2d62fa423e7337f98e5df9b
+EBUILD pam_usb-0.4.2.ebuild 1486 RMD160 a03fe8e47394a7ec86966bd190934de2febe4b75 SHA1 f2b31da5532dd19aa0c54aece0d9ffaf64e6a957 SHA256 6271560216f742a87746762ddc06168dd14008da2e633bb2fd9e1091fb1a15c5
+MISC ChangeLog 3639 RMD160 f75322b69374091574b0d1a327aa50c876ff0c12 SHA1 b56d7e3f383f0abfd8a20ba697efbc4477b234d7 SHA256 333028eaf9a0fa5fd25cbfe732d5edc23f2993bcfe2c21224de2214e9f83e36c
 MISC metadata.xml 607 RMD160 df11d32c67e43e50d472d8e0f19d96814d2053f6 SHA1 a46116ea356af9265c64925724731ac14acdb794 SHA256 e3c714455f74a535175feb57f38278c85d13af7b161fd54b9f5e1f0047a1ef82
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.9 (GNU/Linux)
+
+iEYEARECAAYFAkgrlGoACgkQAiZjviIA2XiobACgixiyib4uFAH8AudyD/HkhvSH
+9k8AoJnpE1HZZOpz/yVIhZCr2jAJFnNX
+=++pL
+-----END PGP SIGNATURE-----
diff --git a/sys-auth/pam_usb/files/pam_usb-0.4.2-openpam.patch b/sys-auth/pam_usb/files/pam_usb-0.4.2-openpam.patch
new file mode 100644
index 000000000000..ed3ea03f07e1
--- /dev/null
+++ b/sys-auth/pam_usb/files/pam_usb-0.4.2-openpam.patch
@@ -0,0 +1,13 @@
+Index: pam_usb-0.4.2/src/pam.c
+===================================================================
+--- pam_usb-0.4.2.orig/src/pam.c
++++ pam_usb-0.4.2/src/pam.c
+@@ -17,7 +17,7 @@
+ 
+ #define PAM_SM_AUTH
+ #include <security/pam_modules.h>
+-#include <security/_pam_macros.h>
++#include <security/pam_appl.h>
+ 
+ #include "version.h"
+ #include "conf.h"
diff --git a/sys-auth/pam_usb/pam_usb-0.4.2.ebuild b/sys-auth/pam_usb/pam_usb-0.4.2.ebuild
index 8e5f658e6e49..d82c8a6a11f9 100644
--- a/sys-auth/pam_usb/pam_usb-0.4.2.ebuild
+++ b/sys-auth/pam_usb/pam_usb-0.4.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 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.4.2.ebuild,v 1.2 2008/03/24 15:43:08 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-auth/pam_usb/pam_usb-0.4.2.ebuild,v 1.3 2008/05/15 01:39:48 flameeyes Exp $
 
 inherit eutils pam
 
@@ -14,7 +14,7 @@ KEYWORDS="~amd64 ~ppc ~x86"
 
 RDEPEND="
 	dev-libs/libxml2
-	>=sys-libs/pam-0.78-r3
+	virtual/pam
 	>=sys-apps/dbus-0.62-r2
 	>=sys-apps/hal-0.5.7.1-r3
 	>=sys-apps/pmount-0.9.13
@@ -26,6 +26,12 @@ DEPEND="
 	${RDEPEND}
 	dev-util/pkgconfig"
 
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}/${P}-openpam.patch"
+}
+
 src_install() {
 	dodir $(getpam_mod_dir) /usr/bin