Bug #293272: Parallel compile fix for case where no LVM/DM was already present on the system. Thanks to Stephan Hartmann <stha09@googlemail.com> for the fix.

Package-Manager: portage-2.2_rc51/cvs/Linux x86_64

4 files changed, 22 insertions, 16 deletions

diff --git a/sys-fs/lvm2/ChangeLog b/sys-fs/lvm2/ChangeLog
index 97aa5b1e7d66..ee077ec71d75 100644
--- a/sys-fs/lvm2/ChangeLog
+++ b/sys-fs/lvm2/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sys-fs/lvm2
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/lvm2/ChangeLog,v 1.183 2009/11/29 22:07:49 josejx Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/lvm2/ChangeLog,v 1.184 2009/11/29 22:35:00 robbat2 Exp $
+
+  29 Nov 2009; Robin H. Johnson <robbat2@gentoo.org> lvm2-2.02.51-r1.ebuild,
+  lvm2-2.02.51-r2.ebuild:
+  Bug #293272: Parallel compile fix for case where no LVM/DM was already
+  present on the system. Thanks to Stephan Hartmann <stha09@googlemail.com>
+  for the fix.
 
   29 Nov 2009; Joseph Jezak <josejx@gentoo.org> lvm2-2.02.51-r1.ebuild:
   Marked ppc/ppc64 for bug #287658.
diff --git a/sys-fs/lvm2/Manifest b/sys-fs/lvm2/Manifest
index 02c6c4c4eff3..a5e087587f57 100644
--- a/sys-fs/lvm2/Manifest
+++ b/sys-fs/lvm2/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX 1.02.22-dmeventd.initd 536 RMD160 2f65a288b735035e6b2451c71ab432a525b19b3a SHA1 5413ad7eaf63a5e7c52f1b21138422f9e4fd6186 SHA256 c9dcee15ce55961e5df7928c350ae1c6db6e78c30d87f7fafa6ba4b016dd9191
 AUX 64-device-mapper.rules-1.02.22-r5 1010 RMD160 3dbb70b60b0c86a77fb9d0e8a0a9cd16a7dd03cc SHA1 fec62b9d4357fe4160e3d017c103767b6c9bf232 SHA256 7c92c2ff3c8dee6588ac51f8367a7b4bcb31d42f2d306ed08ce01be809b9ffcd
 AUX 64-device-mapper.rules-1.02.49-r2 1104 RMD160 61acc7a3f39313df82a82fd4062e8eb10ee384cf SHA1 c6c6fa203982fcfaf11b4c9e4e79c5dd19dda6c3 SHA256 8fb11cac5757f16f67a62e3ee6ec7d986ee77fa020da7589142ac7efd6d24ac2
@@ -65,15 +62,8 @@ EBUILD lvm2-2.02.49-r1.ebuild 6403 RMD160 08428b7737465270d7609c4b9eb96f11d5e3b3
 EBUILD lvm2-2.02.49-r2.ebuild 6431 RMD160 7a260be0af552bfd8f2e5218ffb7fa7d035dbc18 SHA1 76e407ee20014d92e8e833f80ebc1ee332963c1a SHA256 737712a15c251064fe4e06e833b08b98b0f5ba62c02c82028c51077394ac2c5f
 EBUILD lvm2-2.02.49-r3.ebuild 6372 RMD160 24323e1b0e54d9a0b90d1089ef13d38a35ff5e8f SHA1 24dfb5d77ea676712df1bddd23ed3814fae0945c SHA256 784e2f6f0bb4c7083523a9b4cf995bb0eed2c283ba7b740f304bdab969357d00
 EBUILD lvm2-2.02.49.ebuild 6338 RMD160 9d5c898a0eee19d4d9a751db817f6cef9b8e803a SHA1 d4e4fcb39b6a844aaa622b265d9ff658aeba2e90 SHA256 ebb8b0c905b5d5d54984ed4336b3a969dba515766c59307021e7d7d8775322ce
-EBUILD lvm2-2.02.51-r1.ebuild 6494 RMD160 7d2e60073439a31bedd932990e547eede4c56748 SHA1 70a882d57fa2f0c5df536499566ce9cb20244564 SHA256 1ab50be96f307760e2db691cd340ffd366746bfaab9e4bf625e3a1f3fa91e62f
-EBUILD lvm2-2.02.51-r2.ebuild 6619 RMD160 3cc9db3d7928c90d6c16e06e45501a7a4abf9d05 SHA1 3179a20b0cb309e78bb0d034b1c45a95aded5baa SHA256 6310335a07fd9288119e24b0f7e053ad45ce351a6141a33379451e4f808ec60e
+EBUILD lvm2-2.02.51-r1.ebuild 6600 RMD160 ef590b3250a7e1da698236a66f2d75c57ee1c38f SHA1 2e88b68a90736de85984594250b9d35e29f1ec7a SHA256 1a543a3b3ef4003a651674ba18dab40ea7171310a8fa23a3f8d01013da2a308f
+EBUILD lvm2-2.02.51-r2.ebuild 6724 RMD160 025b636bad7edf3b1239b429ce3c53a379e5c88a SHA1 ee91101f583985cb8a6ebf77de5f59adcb84cbdf SHA256 61e8b1fc73c6b0690b0ec0c5cf6109db8beb009439fc29a8bc0c85dbe184b9fe
 EBUILD lvm2-2.02.51.ebuild 6374 RMD160 d78f74edba8bcd89132674476865ff5aebdf0727 SHA1 0841e2a6941720864cb2400a539055ea00b4daca SHA256 d06c72cf94bffdad5df089d214f1a288de2d1d8c709ddf53b353660a221fa847
-MISC ChangeLog 31438 RMD160 20260f8b95918f4b509404232fc38f9387faa56d SHA1 a04011680a615aaef790d863f5e7db07c019d915 SHA256 4cc5ba8ee7dba9bca9179e002d14368aa96c8b1faf9e4b7d994264aeafb34e59
+MISC ChangeLog 31707 RMD160 cf5959ccfc3bd0eaff98eadc9034a87ded0946b3 SHA1 839e11b353b7e05b1672679c6b14bf1f78fc2223 SHA256 37e7f737f590d7d113de0f2e370b07a5c5bd664ef3a6c70eadf868e33b322c80
 MISC metadata.xml 792 RMD160 f60db9169ee273ca2f97fa5e69d4e5329e988164 SHA1 42f85f30477c65a164a11e172db7e250f442dca5 SHA256 87ced5a3a6102985f7c2a619dd52f65e62ae916f8921c8e7115a25452cd44b7f
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.11 (GNU/Linux)
-
-iEYEARECAAYFAksS8JsACgkQcsIHjyDViGRLeQCaAwJdkZ9+Ldslo4FBG3MccEBA
-ukoAoK1vnN0A3/JCIPoLjIlXeoN/17SH
-=Ipcl
------END PGP SIGNATURE-----
diff --git a/sys-fs/lvm2/lvm2-2.02.51-r1.ebuild b/sys-fs/lvm2/lvm2-2.02.51-r1.ebuild
index b909935e4d83..cafeb7e27802 100644
--- a/sys-fs/lvm2/lvm2-2.02.51-r1.ebuild
+++ b/sys-fs/lvm2/lvm2-2.02.51-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/lvm2/lvm2-2.02.51-r1.ebuild,v 1.10 2009/11/29 22:07:49 josejx Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/lvm2/lvm2-2.02.51-r1.ebuild,v 1.11 2009/11/29 22:35:00 robbat2 Exp $
 
 EAPI=2
 inherit eutils multilib toolchain-funcs autotools
@@ -140,6 +140,11 @@ src_compile() {
 	emake || die "failed to build lib"
 	popd
 
+	einfo "Doing dmeventd"
+	pushd daemons/dmeventd
+	emake device-mapper || die "failed to build lib"
+	popd
+
 	einfo "Doing main build"
 	emake || die "compile problem"
 }
diff --git a/sys-fs/lvm2/lvm2-2.02.51-r2.ebuild b/sys-fs/lvm2/lvm2-2.02.51-r2.ebuild
index 03fac1503ad0..28146c69c0c5 100644
--- a/sys-fs/lvm2/lvm2-2.02.51-r2.ebuild
+++ b/sys-fs/lvm2/lvm2-2.02.51-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/lvm2/lvm2-2.02.51-r2.ebuild,v 1.3 2009/11/09 21:44:13 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/lvm2/lvm2-2.02.51-r2.ebuild,v 1.4 2009/11/29 22:35:00 robbat2 Exp $
 
 EAPI=2
 inherit eutils multilib toolchain-funcs autotools
@@ -140,6 +140,11 @@ src_compile() {
 	emake || die "failed to build lib"
 	popd
 
+	einfo "Doing dmeventd"
+	pushd daemons/dmeventd
+	emake device-mapper || die "failed to build lib"
+	popd
+
 	einfo "Doing main build"
 	emake || die "compile problem"
 }