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

(Portage version: 2.1.9.25/cvs/Linux x86_64)

5 files changed, 26 insertions, 77 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/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"
 }