Version bump and install pmvarrun to bin instead of sbin (#330995).

Package-Manager: portage-2.1.9.25/cvs/Linux x86_64

6 files changed, 33 insertions, 87 deletions

diff --git a/sys-auth/pam_mount/ChangeLog b/sys-auth/pam_mount/ChangeLog
index 1ac33495fef2..42bd99d95140 100644
--- a/sys-auth/pam_mount/ChangeLog
+++ b/sys-auth/pam_mount/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sys-auth/pam_mount
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-auth/pam_mount/ChangeLog,v 1.46 2010/10/05 11:32:01 hanno Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-auth/pam_mount/ChangeLog,v 1.47 2010/11/28 01:56:52 hanno Exp $
+
+*pam_mount-2.6 (28 Nov 2010)
+
+  28 Nov 2010; Hanno Boeck <hanno@gentoo.org> +pam_mount-2.6.ebuild,
+  +files/pam_mount-2.6-pmvarrun-bin.diff:
+  Version bump and install pmvarrun to bin instead of sbin (#330995).
 
 *pam_mount-2.5 (05 Oct 2010)
 
diff --git a/sys-auth/pam_mount/Manifest b/sys-auth/pam_mount/Manifest
index 0f50f71532c1..ed4b81176da1 100644
--- a/sys-auth/pam_mount/Manifest
+++ b/sys-auth/pam_mount/Manifest
@@ -1,22 +1,19 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-DIST pam_mount-1.33.tar.bz2 329619 RMD160 dc2921ec15e9bc9065fbcc29421d82e72d267b6f SHA1 e7b303c29cccc61fbe8524fc897a273b461e5889 SHA256 fd408ff25c861940f8b3a9bfa9cbdae3ce4419320855fc83ddad73f74372b288
-DIST pam_mount-2.0.tar.xz 283664 RMD160 68131f966acc6bda772ab17f34ac9d5ad9132215 SHA1 a093afc9f1a33ed242da1f72cae7b6d27241e7b7 SHA256 dcdcbae5aacb09aa33f669ece0f3f69059b7048289a3578ec3c696ec56eaf6fb
+AUX pam_mount-2.6-pmvarrun-bin.diff 352 RMD160 414165bfa7789dcee4a5b97b2503377a2d321f03 SHA1 b696f57cd9a16866bc816cee0c13e63f0669f2f8 SHA256 fcfbaad208c3b0ffcd83ca56de6d5e03d753f7e3f49d402dcd2442c106731e02
 DIST pam_mount-2.1.tar.xz 283760 RMD160 b370523a1705f1c18b938bc26a93fd797b45d557 SHA1 b9452927c7b54dcde585b454cd9f4da958bd7bb0 SHA256 c0c87efeaa2c3007784cc7a6e82db3ad4ae65f8588a7e6d02dfbd460bb1f0925
-DIST pam_mount-2.4.tar.xz 286320 RMD160 670d37dd748d49398b9036ad311df110a372ff41 SHA1 5fd6657bf66631930afc9a7b84e868fec99937ed SHA256 3b8a63d295d0939e47a7e40fc4f571a207b02297708a6faba8cde6124027dd9c
 DIST pam_mount-2.5.tar.xz 288644 RMD160 8b2562e3dc0cad7ec283387330019c51aae6dff9 SHA1 cd76420873728a018e50bc01fd3fb9f0da599cd7 SHA256 7fa248a98ffa49dc6d8ceae1b45088571b6845d7831cae95fc75ccbcca3afb26
-EBUILD pam_mount-1.33.ebuild 941 RMD160 0495e4c3bd290fc8dbeff8257e5dcaf0fd568c76 SHA1 d11abdaa6311c97f43f86fe157b6324ef327ec01 SHA256 430acce0388420d6e2051732268d3fc2ade426a25c3ae692e312e88ecee56891
-EBUILD pam_mount-2.0.ebuild 947 RMD160 b606797e52162888301ca3f21e501f42a5b84c24 SHA1 5f66d497f1598d984b747352d50cdcaf8b45a888 SHA256 89293370eb8bb73dece6bb9c0ef712c4e3814594c856a33fc5c1f06b78660bfb
+DIST pam_mount-2.6.tar.xz 284984 RMD160 b3ffab9a05c8463d3ac694dbdfbe30380abfa5cc SHA1 a825152621d26ff27a748936c7b743d973305221 SHA256 35918a867f5cc1c3a4f534c713d90cf7c591376b658e41c582f58611d769b1e2
 EBUILD pam_mount-2.1.ebuild 964 RMD160 103c403046d0a9d95c86bbf8f263305cbaf9dff5 SHA1 0636a48f120779f6ca4c1848d56764b821a9945e SHA256 e92b235a5cb6031e708a4ba47bf4cbf88392c50d93f186c53eac0f336008eb27
-EBUILD pam_mount-2.4.ebuild 966 RMD160 b4649284d4847d463f2b41f16a19c0e6db035ebb SHA1 7bc9b6fcfa7c874a438e88bd42d56942b64382a9 SHA256 38ef2b843ce68da0d43823b8b1545cf6199ce940bb9688d6cf1a46edf3c9c8bb
 EBUILD pam_mount-2.5.ebuild 966 RMD160 6f6b95f7b5e886ccc49d19f7e06503247093ea95 SHA1 4eed36ddfed4264332e9e90c3e7526a62187ff4e SHA256 db679341f91f0f2e71ea6efb06b3ac2c5a82474d991a65d15b7aa066569fa4d7
-MISC ChangeLog 6071 RMD160 4a7681bcdc9f15a4243a8524938feef0e2883e1e SHA1 9c78a4911c1cc2852abfb42f9e2cb8f6691e08ae SHA256 be39394473ad24bcbcedac784d51d77528846e518c6e45263a709a19f0734045
+EBUILD pam_mount-2.6.ebuild 1062 RMD160 950df87f9353f5256043983981a49b83d2159230 SHA1 47cb622d5b7704078e95df1f1db190cc5bf3647b SHA256 a6ba9d6a0034ff1f88e4a5ed71805e8964e33376ebb12949e17391b48189c50a
+MISC ChangeLog 6283 RMD160 5e61644e926a517a40b3ea5daefae9471f35a08f SHA1 7b96797cc8cd68d15da9904e44dfd8865eb8fc05 SHA256 e0fd46a92cb1e66771fc72e45c1d97144191cbf34c510c128c175526ba4f8bb5
 MISC metadata.xml 217 RMD160 3b01d5dab901ee93217f72b711954d3cccbb1717 SHA1 e304788b60dd2cf214d360a21d267e8635474d98 SHA256 2f5dfc1eb79d2d9ee02663da6e1449f499c3a37b7f4cc2391e18d7789a314669
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.16 (GNU/Linux)
 
-iEYEARECAAYFAkyrDLcACgkQr2QksT29OyCEcwCfVHIzWZB2msfLP7rf+bEUE3k2
-9bsAoJbzoyabFGdgDb7WRNOWtzspxnG5
-=WWCv
+iEYEARECAAYFAkzxtukACgkQr2QksT29OyACYACfUPYjVlqUV3hdmZEDKafDgev3
+jmsAn14IXG88TSIzUWrqWQ3Ai5FBIhuZ
+=8krU
 -----END PGP SIGNATURE-----
diff --git a/sys-auth/pam_mount/files/pam_mount-2.6-pmvarrun-bin.diff b/sys-auth/pam_mount/files/pam_mount-2.6-pmvarrun-bin.diff
new file mode 100644
index 000000000000..322b86a10c47
--- /dev/null
+++ b/sys-auth/pam_mount/files/pam_mount-2.6-pmvarrun-bin.diff
@@ -0,0 +1,12 @@
+--- pam_mount-2.6-vanilla/src/Makefile.am	2010-11-23 02:47:43.365455635 +0100
++++ pam_mount-2.6/src/Makefile.am	2010-11-23 02:48:30.226227213 +0100
+@@ -8,7 +8,8 @@
+ 
+ moduledir		= @PAM_MODDIR@
+ module_LTLIBRARIES	= pam_mount.la
+-sbin_PROGRAMS		= pmvarrun
++sbin_PROGRAMS		=
++bin_PROGRAMS		= pmvarrun
+ if HAVE_LIBCRYPTO
+ sbin_PROGRAMS		+= pmt-ehd
+ endif
diff --git a/sys-auth/pam_mount/pam_mount-1.33.ebuild b/sys-auth/pam_mount/pam_mount-1.33.ebuild
deleted file mode 100644
index 79a0c2b12da1..000000000000
--- a/sys-auth/pam_mount/pam_mount-1.33.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-auth/pam_mount/pam_mount-1.33.ebuild,v 1.1 2010/01/10 15:51:34 hanno Exp $
-
-inherit multilib
-
-DESCRIPTION="A PAM module that can mount volumes for a user session"
-HOMEPAGE="http://pam-mount.sourceforge.net"
-SRC_URI="mirror://sourceforge/pam-mount/${P}.tar.bz2"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-
-IUSE="crypt"
-DEPEND=">=sys-libs/pam-0.99
-	dev-libs/openssl
-	>=sys-libs/libhx-3.2
-	dev-libs/libxml2
-	dev-util/pkgconfig"
-RDEPEND=">=sys-libs/pam-0.99
-	dev-libs/openssl
-	>=sys-libs/libhx-3.2
-	dev-libs/libxml2
-	>=sys-fs/cryptsetup-1.0.5
-	sys-process/lsof"
-
-src_compile() {
-	econf --with-slibdir="/$(get_libdir)" || die "econf failed"
-	emake || die "emake failed"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "make install failed"
-	dodoc doc/*.txt || die "dodoc failed"
-}
diff --git a/sys-auth/pam_mount/pam_mount-2.0.ebuild b/sys-auth/pam_mount/pam_mount-2.0.ebuild
deleted file mode 100644
index 098c71ee08cc..000000000000
--- a/sys-auth/pam_mount/pam_mount-2.0.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-auth/pam_mount/pam_mount-2.0.ebuild,v 1.2 2010/04/23 20:35:10 hanno Exp $
-
-EAPI=3
-
-inherit multilib
-
-DESCRIPTION="A PAM module that can mount volumes for a user session"
-HOMEPAGE="http://pam-mount.sourceforge.net"
-SRC_URI="mirror://sourceforge/pam-mount/${P}.tar.xz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-
-IUSE="crypt"
-DEPEND=">=sys-libs/pam-0.99
-	dev-libs/openssl
-	>=sys-libs/libhx-3.4
-	dev-libs/libxml2
-	>=sys-fs/cryptsetup-1.1.0
-	dev-util/pkgconfig"
-RDEPEND=">=sys-libs/pam-0.99
-	dev-libs/openssl
-	>=sys-libs/libhx-3.4
-	dev-libs/libxml2
-	>=sys-fs/cryptsetup-1.1.0
-	sys-process/lsof"
-
-src_configure() {
-	econf --with-slibdir="/$(get_libdir)" || die "econf failed"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "make install failed"
-	dodoc doc/*.txt || die "dodoc failed"
-}
diff --git a/sys-auth/pam_mount/pam_mount-2.4.ebuild b/sys-auth/pam_mount/pam_mount-2.6.ebuild
index b1fb1b6ea0fb..eed10181b07b 100644
--- a/sys-auth/pam_mount/pam_mount-2.4.ebuild
+++ b/sys-auth/pam_mount/pam_mount-2.6.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-auth/pam_mount/pam_mount-2.4.ebuild,v 1.1 2010/07/31 14:52:55 hanno Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-auth/pam_mount/pam_mount-2.6.ebuild,v 1.1 2010/11/28 01:56:52 hanno Exp $
 
 EAPI=3
 
-inherit multilib
+inherit multilib autotools
 
 DESCRIPTION="A PAM module that can mount volumes for a user session"
 HOMEPAGE="http://pam-mount.sourceforge.net"
@@ -29,6 +29,11 @@ RDEPEND=">=sys-libs/pam-0.99
 	>=sys-fs/cryptsetup-1.1.0
 	sys-process/lsof"
 
+src_prepare() {
+	epatch "${FILESDIR}/pam_mount-2.6-pmvarrun-bin.diff"
+	eautoreconf
+}
+
 src_configure() {
 	econf --with-slibdir="/$(get_libdir)" || die "econf failed"
 }