Bug #316571: Bring in libudev for devmapper.

Package-Manager: portage-2.2_rc67/cvs/Linux i686

4 files changed, 36 insertions, 4 deletions

diff --git a/sys-fs/cryptsetup/ChangeLog b/sys-fs/cryptsetup/ChangeLog
index ce05b3918d72..4d2ea18e26a8 100644
--- a/sys-fs/cryptsetup/ChangeLog
+++ b/sys-fs/cryptsetup/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sys-fs/cryptsetup
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/cryptsetup/ChangeLog,v 1.79 2010/02/14 00:10:59 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/cryptsetup/ChangeLog,v 1.80 2010/04/23 19:35:04 robbat2 Exp $
+
+  23 Apr 2010; Robin H. Johnson <robbat2@gentoo.org>
+  +files/1.1.0-libudev.patch, cryptsetup-1.1.0.ebuild:
+  Bug #316571: Bring in libudev for devmapper.
 
 *cryptsetup-1.1.0 (14 Feb 2010)
 
diff --git a/sys-fs/cryptsetup/Manifest b/sys-fs/cryptsetup/Manifest
index db82a4fa035a..30ca98724325 100644
--- a/sys-fs/cryptsetup/Manifest
+++ b/sys-fs/cryptsetup/Manifest
@@ -4,6 +4,7 @@ AUX 1.0.5-dmcrypt.confd 3029 RMD160 c84d92a58923ce88a60ab1e8fcc88910b0689df6 SHA
 AUX 1.0.5-dmcrypt.rc 660 RMD160 f1af3b07db2eaf938fd21b8ef4b23068f2fac78a SHA1 c297587c68d84611a8fec444d3a98443105efee7 SHA256 11518d0d26572b07f43e7ad69f638e93546656b9f14b647d9825ab8b4619906d
 AUX 1.0.6-dmcrypt.confd 3141 RMD160 64d4d4d7df03d301632851bee5969d11a61d57b1 SHA1 e44c783fd42076c7976cdb9bbf2c5280382ffa31 SHA256 9a962e482ead52e7636c0b99145a420f817c73efb6d506cb8322e555e5515325
 AUX 1.0.6-r2-dm-crypt-start.sh 8092 RMD160 d61f1cf13e75c105065f8ca6c6a9afe12eedbcaa SHA1 fc4b6580063cd3758ada2d1ddfced3e005c8fabf SHA256 56004bef91b8fad57fe67fec19427dd7c48e01c8e1ba7ff60f8c370295775fdc
+AUX 1.1.0-libudev.patch 964 RMD160 362e8bf35a2f6c022404f515811befa80121e779 SHA1 fd70e437a50a04ee6b37e8c36cee75aa9fa59e8c SHA256 02529608ee3743ada736ae3a6205c363cb1777ca5d72c5824287ec99fe9fe5f7
 AUX 1.1.0_rc3-static-no-selinux.patch 813 RMD160 a9e476edd9bfe12e4663962198e3ed28f43877a3 SHA1 f26e3e356848d098c70f0857a04945fb264ae844 SHA256 7ec5067c5b05b478f45cdd35953827e4696011104f533b3339d18c4becc1985a
 AUX cryptfs.confd 1337 RMD160 f98acce860d95d69e8e95d9bab32ba5bb5bef421 SHA1 5e7b239e549b6def07af968d02b300ec36d8aac1 SHA256 8c8e815297eb20140ae7d4d555d3bfdd373ad368adf179841516430da370505c
 AUX cryptsetup-1.0.6-udevsettle.patch 561 RMD160 613da67876c1c20c3ea3687ec425b31551ae57d1 SHA1 cd0177fa53f4d6f605522f53a98c57286162859f SHA256 80c4914071769dedc20198425b4ea528ec22264ff4c54516a9e5722a8e671f60
@@ -20,6 +21,6 @@ EBUILD cryptsetup-1.0.5-r1.ebuild 2967 RMD160 e3d53062c60387d7ed59c864a842de457f
 EBUILD cryptsetup-1.0.6-r2.ebuild 3150 RMD160 997496f32ffb972a4d21efb80cb0ccedf2a53197 SHA1 8cbe4f6a69a72faf4916f1992a4ee3febd04114e SHA256 cad92c053518bb11a2acd9e806e471117c462187c8a02f5258e933e093ab2a66
 EBUILD cryptsetup-1.0.7-r1.ebuild 3018 RMD160 2287bad817297bdfd972f3a8747d3c70be3955c6 SHA1 2cdd53dc478dfba7fba3050a2b134b52a1b65489 SHA256 7886a41d8aec79ef373a815f9860a57fbcbdf08a0323eee92cae45f423164f4d
 EBUILD cryptsetup-1.0.7.ebuild 3056 RMD160 69eb9e5572e3e0a4492dc4f470c067dc660e0a80 SHA1 777fc921347d9d4cc3f295b6021ea7aa822bed80 SHA256 bb6659123697cd5911e0535bcc913a2ad7c649f6458e29ded30304af5dd6eb01
-EBUILD cryptsetup-1.1.0.ebuild 2910 RMD160 80ba2b3f17852c3dc3ec5d39dbc1875d59cb8178 SHA1 b0dd8a2ddc0bf994bf5c94c9c9d238fac7df7ef3 SHA256 2c5dae928ec54e91f23e865f477301d94699954311b13315b189726d55eea08b
-MISC ChangeLog 11285 RMD160 971f7771e9afe6e58f50b053fe3e4036d59cb74b SHA1 e73691c8c0a5c51c8ba3188a9d1166aeeabd8091 SHA256 bf1fd2d62f0d37c5acbcd9e1bab1e2f7332cb661dce69737b925a1c4bb2c4f32
+EBUILD cryptsetup-1.1.0.ebuild 2952 RMD160 4f790c0b7388319bc4935237a301868f443b0303 SHA1 23859d8a72aea30d92ac5c6ed63c8d63648fe6ac SHA256 7d90181d116cf2debeec1b17e4bd5e6ee12b3823f8e6af4c11a7e80ba209c0cf
+MISC ChangeLog 11441 RMD160 3f4fa0b687b2c672710779e3911beb2bf232e6dc SHA1 3e928c0df9dbd82d9d09a12cff826480e83ba492 SHA256 1e697e8d96b9d83d6f5fc8714280ec886c721f0c07027cf2de878b4c16c93472
 MISC metadata.xml 239 RMD160 81512c49e64b6e70c7b746ba09d3e6fce4c7bc89 SHA1 c4085a72e46fe6bcea5bdff780007791eae6db4b SHA256 aebd5282fb892100f348eba1ed27edd27e7296356897c6f5314674f8abb4b51a
diff --git a/sys-fs/cryptsetup/cryptsetup-1.1.0.ebuild b/sys-fs/cryptsetup/cryptsetup-1.1.0.ebuild
index 04d0c52672b2..4744e5b10903 100644
--- a/sys-fs/cryptsetup/cryptsetup-1.1.0.ebuild
+++ b/sys-fs/cryptsetup/cryptsetup-1.1.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/cryptsetup/cryptsetup-1.1.0.ebuild,v 1.1 2010/02/14 00:10:59 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/cryptsetup/cryptsetup-1.1.0.ebuild,v 1.2 2010/04/23 19:35:04 robbat2 Exp $
 
 EAPI=2
 
@@ -43,6 +43,7 @@ pkg_setup() {
 
 src_prepare() {
 	epatch "${FILESDIR}"/1.1.0_rc3-static-no-selinux.patch
+	epatch "${FILESDIR}"/1.1.0-libudev.patch
 	eautoreconf
 }
 
diff --git a/sys-fs/cryptsetup/files/1.1.0-libudev.patch b/sys-fs/cryptsetup/files/1.1.0-libudev.patch
new file mode 100644
index 000000000000..12d589e4eb06
--- /dev/null
+++ b/sys-fs/cryptsetup/files/1.1.0-libudev.patch
@@ -0,0 +1,26 @@
+diff -ur cryptsetup-1.1.0.orig/configure.in cryptsetup-1.1.0/configure.in
+--- cryptsetup-1.1.0.orig/configure.in	2010-04-23 21:39:29.000000000 +0300
++++ cryptsetup-1.1.0/configure.in	2010-04-23 21:38:18.000000000 +0300
+@@ -62,6 +62,11 @@
+ 
+ dnl ==========================================================================
+ 
++saved_LIBS=$LIBS
++AC_CHECK_LIB([udev], [udev_queue_get_udev_is_active])
++AC_SUBST(UDEV_LIBS, $LIBS)
++LIBS=$saved_LIBS
++
+ AC_ARG_ENABLE(shared-library,
+ [  --disable-shared-library
+                           disable building of shared cryptsetup library],,
+diff -ur cryptsetup-1.1.0.orig/lib/Makefile.am cryptsetup-1.1.0/lib/Makefile.am
+--- cryptsetup-1.1.0.orig/lib/Makefile.am	2009-12-30 18:29:28.000000000 +0200
++++ cryptsetup-1.1.0/lib/Makefile.am	2010-04-23 21:41:34.000000000 +0300
+@@ -33,6 +33,7 @@
+ libcryptsetup_la_LIBADD = \
+ 	@UUID_LIBS@				\
+ 	@DEVMAPPER_LIBS@			\
++	@UDEV_LIBS@				\
+ 	@LIBGCRYPT_LIBS@			\
+ 	../luks/libluks.la
+