Fix build with USE=-crypt, bug 379267

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

4 files changed, 44 insertions, 20 deletions

diff --git a/sys-auth/pam_mount/ChangeLog b/sys-auth/pam_mount/ChangeLog
index 3349912c8d94..29fc1f44dc0e 100644
--- a/sys-auth/pam_mount/ChangeLog
+++ b/sys-auth/pam_mount/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sys-auth/pam_mount
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-auth/pam_mount/ChangeLog,v 1.55 2011/08/14 18:31:29 hanno Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-auth/pam_mount/ChangeLog,v 1.56 2011/08/18 00:03:00 mattst88 Exp $
+
+  18 Aug 2011; Matt Turner <mattst88@gentoo.org> pam_mount-2.11.ebuild,
+  +files/pam_mount-2.11-fix-build-without-cryptsetup.patch:
+  Fix build with USE=-crypt, bug 379267
 
 *pam_mount-2.11 (14 Aug 2011)
 
diff --git a/sys-auth/pam_mount/Manifest b/sys-auth/pam_mount/Manifest
index e69cb2fae251..105d5ed0e717 100644
--- a/sys-auth/pam_mount/Manifest
+++ b/sys-auth/pam_mount/Manifest
@@ -1,6 +1,7 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA1
 
+AUX pam_mount-2.11-fix-build-without-cryptsetup.patch 720 RMD160 b1edda85dd3cb43a3f3e53bbbfaef41b81feb350 SHA1 8a1c699038e7e5310a93ed841375ef7875cdc26e SHA256 79f9e663a37e2d979f49d9d04bbf4abb6ed1418863b292c5b05091397d2b22f8
 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.10.tar.xz 284152 RMD160 d3305107e75a00fb420672f49b6e06965345c14d SHA1 3ef6fbb077454d6ee5bd3737bf6f99c78be36e83 SHA256 e0241950ee4753e0110dba13a68b8f1dc3c059c45a253452cdb67584d60c361c
@@ -10,26 +11,16 @@ DIST pam_mount-2.6.tar.xz 284984 RMD160 b3ffab9a05c8463d3ac694dbdfbe30380abfa5cc
 DIST pam_mount-2.8.tar.xz 283280 RMD160 258f96a0f1ac569777d921923d41cbf90cd93d5d SHA1 2b2c60553601c390abe98162213ed8a5bdbf5cce SHA256 720ee7d7969189e2bcf8b9c0ac51049e7f6219c95b79049bb9042c6ef21a457b
 EBUILD pam_mount-2.1.ebuild 964 RMD160 103c403046d0a9d95c86bbf8f263305cbaf9dff5 SHA1 0636a48f120779f6ca4c1848d56764b821a9945e SHA256 e92b235a5cb6031e708a4ba47bf4cbf88392c50d93f186c53eac0f336008eb27
 EBUILD pam_mount-2.10.ebuild 992 RMD160 b6eabb73374c5f6cf39915c153f5eabfdc73bea6 SHA1 503ad08e55e85e271a5fe75ff46258f4e1c000b9 SHA256 1397983e01102bedef4b2f367871a67e5ce1c0d22dccc7b78dc96f2209b446e7
-EBUILD pam_mount-2.11.ebuild 990 RMD160 c966cdb31cd09e22bb5b1d863a32938a82fa3070 SHA1 1f1ace2590eea34c3773ae4598324fc4e187e46d SHA256 4ef91d106a23bd80a14b7023a6f6acb9f2bea1d5e6aba772120dcc67a1246ddb
+EBUILD pam_mount-2.11.ebuild 1081 RMD160 ad22d7ed073fb9a7a887dc7d794bbbea2bbe2550 SHA1 d755a95f30208f31b8beac9a622959907604fb1e SHA256 186d53ed627b62743aa94baf56c6c864937cf5d6ff579c5303dce989904c6728
 EBUILD pam_mount-2.5.ebuild 966 RMD160 6f6b95f7b5e886ccc49d19f7e06503247093ea95 SHA1 4eed36ddfed4264332e9e90c3e7526a62187ff4e SHA256 db679341f91f0f2e71ea6efb06b3ac2c5a82474d991a65d15b7aa066569fa4d7
 EBUILD pam_mount-2.6.ebuild 1065 RMD160 19419327806e2b254211a892f22107c2c7859022 SHA1 c6b6058d622eaf7724898ddf5e6f21186465649b SHA256 22e2e93eb53ba79af43cd118c4dbbabc7c275ca84fe6ebb75131cc0bdf84dad0
 EBUILD pam_mount-2.8.ebuild 969 RMD160 9f6df469045df37f533fc38e98fe8be9e461bd2d SHA1 858d7a4ec2b23a005f3866fd7e5ed63e40e56c3c SHA256 014e04ba87bd9a1d6e835578443b233cef3489cb86caf0a9e6930efc33cabcc6
-MISC ChangeLog 7294 RMD160 4aaa10478eb19220e14daf9be3cab9adc41e803d SHA1 1a4d083a37dba066b254e5f9c10bc70a9c449e83 SHA256 9268b9f496b51184c24c5abcefc9bb8aac77305c4081a2c40f96737038f0f0c2
+MISC ChangeLog 7470 RMD160 0db25dd08bd08685b32072e9caf72591624f799b SHA1 d06c48e8cfaae9ce9eb87091bea9d2af325034e8 SHA256 d609f3928930a2d6bb03c8390e73c96b544cd091e47becda32cd766b0a5dfdda
 MISC metadata.xml 306 RMD160 e978846bab8b82090c98ed93f27dfb9292758796 SHA1 fea16e4b6ba9fa1db3c0202c0f2437014df28625 SHA256 4b4755f4eba84d790ef46a20909202805f891a00c2d0362b5a8bd172bbc5c82f
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.18 (GNU/Linux)
+Version: GnuPG v2.0.17 (GNU/Linux)
 
-iQIcBAEBCAAGBQJOSBSFAAoJEKWIAHK7tR5CaKUP/0gryt1KFFh2FrbFm5Vt+LlC
-aYptvABSIOLNYz/Y44ctxw5hENFpIKOCLh2jw+QcvPXf3KbgrdnxesrWv3XFVHCr
-7Es0IfzU8WuAHaLpoH9UZi11ZFfWbKSsJ5ZLCOpY6OKRRoHRc4Cq5jY0cXHFpPp1
-tX8oFXKj3PihEFMY96eAIDiuQVbPyF242y7K+jBK2CBRMYrgDNfD3tZnVuoQjE6c
-MPCZrP9dva464MN8cLs1tg+JF0s04HksCP/+31ZOuEuJydegF+Q9toBlZOCQHNm9
-RAKr8ePA+3hSQdWjgq9y9tTFphchyJzYghtB+FYq7vADM+P340uZqovDZJ2NJP29
-PNi4tE08G/Auy03eSBjaZE2TuvnHwyxD0mQEIi0JPK3gON3P3AyXTjXRzVKMXTlW
-31aSGr9x+mPSkwdUpkzipiMyiKR2YQ1IyNRop78sNIMv16NmQEg7jrqzN6Iednjm
-y6o4hvnsFc9tpoKqcjHwmkoDRkpEYVPTz8ttdbnlbSgof8GBDrihpds1rylOvGdU
-L4NdXZLiOFiyF+DQob+HEAh/yhpK+WitZvtcKaO1XS9EieO/wzGwlBMSJnf2Mapx
-QlM12rMaVDSUCH9cg+Gp+hUJAJvjbgs52UzhBCNbIZFp/qZYpMXk9aCF0ykJUUYK
-PJEQc6g8fyUTCyI1A3Cl
-=JSAQ
+iEYEARECAAYFAk5MVsAACgkQTVUdg23rv53r8ACePInyFyCkmed04Y1NaY8dVBt/
+/AoAoJn7WXpYO6SeP/Tgtk0TX6zcw9Eg
+=7M5w
 -----END PGP SIGNATURE-----
diff --git a/sys-auth/pam_mount/files/pam_mount-2.11-fix-build-without-cryptsetup.patch b/sys-auth/pam_mount/files/pam_mount-2.11-fix-build-without-cryptsetup.patch
new file mode 100644
index 000000000000..5f422e234265
--- /dev/null
+++ b/sys-auth/pam_mount/files/pam_mount-2.11-fix-build-without-cryptsetup.patch
@@ -0,0 +1,25 @@
+From a3b07a52a41b17dacbc1b703b6dd331cd1cf6e61 Mon Sep 17 00:00:00 2001
+From: Jan Engelhardt <jengelh@medozas.de>
+Date: Tue, 16 Aug 2011 07:28:21 +0200
+Subject: [PATCH] build: make build of pmt-ehd dependent upon HAVE_LIBCRYPTSETUP
+
+---
+ src/Makefile.am   |    2 +-
+ 2 files changed, 5 insertions(+), 2 deletions(-)
+
+diff --git a/src/Makefile.am b/src/Makefile.am
+index 347d475..38e8395 100644
+--- a/src/Makefile.am
++++ b/src/Makefile.am
+@@ -8,7 +8,7 @@ AM_CFLAGS = ${regular_CFLAGS} ${GCC_FVISIBILITY_HIDDEN} \
+ moduledir		= @PAM_MODDIR@
+ module_LTLIBRARIES	= pam_mount.la
+ sbin_PROGRAMS		= pmvarrun
+-if HAVE_LIBCRYPTO
++if HAVE_LIBCRYPTSETUP
+ sbin_PROGRAMS		+= pmt-ehd
+ endif
+ ssbin_PROGRAMS		= mount.crypt
+-- 
+1.7.3.4
+
diff --git a/sys-auth/pam_mount/pam_mount-2.11.ebuild b/sys-auth/pam_mount/pam_mount-2.11.ebuild
index dd1c76d589d4..4b28a902b28d 100644
--- a/sys-auth/pam_mount/pam_mount-2.11.ebuild
+++ b/sys-auth/pam_mount/pam_mount-2.11.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2011 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.11.ebuild,v 1.1 2011/08/14 18:31:29 hanno Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-auth/pam_mount/pam_mount-2.11.ebuild,v 1.2 2011/08/18 00:03:00 mattst88 Exp $
 
 EAPI=4
 
-inherit multilib
+inherit eutils multilib
 
 DESCRIPTION="A PAM module that can mount volumes for a user session"
 HOMEPAGE="http://pam-mount.sourceforge.net"
@@ -27,6 +27,10 @@ DEPEND="${COMMON_DEPEND}
 	app-arch/xz-utils"
 RDEPEND="${COMMON_DEPEND}"
 
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-fix-build-without-cryptsetup.patch
+}
+
 src_configure() {
 	econf --with-slibdir="/$(get_libdir)" \
 			$(use_with crypt cryptsetup) \