Use /bin/true instead of /usr/bin/true in scripts/blk_availability_systemd_red_hat.service.in because Gentoo doesn't have the so called usr -merge wrt #517514 by Markos Chandras. Enable "use_lvmetad = 1" by default in lvm.conf with USE="systemd lvmetad -device-mapper-only" wrt #514196 by Pacho Ramos.

Package-Manager: portage-2.2.10/cvs/Linux x86_64
Manifest-Sign-Key: 0x4868F14D

3 files changed, 26 insertions, 13 deletions

diff --git a/sys-fs/lvm2/ChangeLog b/sys-fs/lvm2/ChangeLog
index f7a2c254aad1..d6f9259dd327 100644
--- a/sys-fs/lvm2/ChangeLog
+++ b/sys-fs/lvm2/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for sys-fs/lvm2
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/lvm2/ChangeLog,v 1.357 2014/07/30 17:11:27 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/lvm2/ChangeLog,v 1.358 2014/07/30 17:23:37 ssuominen Exp $
+
+  30 Jul 2014; Samuli Suominen <ssuominen@gentoo.org> lvm2-2.02.108.ebuild:
+  Use /bin/true instead of /usr/bin/true in
+  scripts/blk_availability_systemd_red_hat.service.in because Gentoo doesn't
+  have the so called usr -merge wrt #517514 by Markos Chandras. Enable
+  "use_lvmetad = 1" by default in lvm.conf with USE="systemd lvmetad -device-
+  mapper-only" wrt #514196 by Pacho Ramos.
 
 *lvm2-2.02.108 (30 Jul 2014)
 
diff --git a/sys-fs/lvm2/Manifest b/sys-fs/lvm2/Manifest
index ea7bf3d7571f..1c30639aa93d 100644
--- a/sys-fs/lvm2/Manifest
+++ b/sys-fs/lvm2/Manifest
@@ -41,17 +41,17 @@ EBUILD lvm2-2.02.103.ebuild 7452 SHA256 aaf76ae6bd66284db6f21d62f77c4845d75c1575
 EBUILD lvm2-2.02.105-r2.ebuild 8559 SHA256 7671468ca5ca84f7511e6fbc9bf1ea19d16ffb88107cb869978ccf761de2579b SHA512 df81be6d6f98eb278d1861862867ac3ee3b407642bafd024906610a885dfabd6e23e772f03e54a72f05e7137b421fb14fd17c2f28c6705ab3b14a8c96ea7a5ea WHIRLPOOL a517709a098a056db803cabc952f0dd13cdbf433e03d44eca7a621548ba707a935895ced4b159263886bbf37f2852bb66f38a9dabae068974a142300d2a0e99a
 EBUILD lvm2-2.02.106.ebuild 8881 SHA256 473f968cf758d005d87db10e7438e7785b713bd81aa35ca22947d2113ec4ebef SHA512 fe07a1faf8360e5754ce8ee40b5581cf663f1b97fc99a2ab8eb1d5a626254aa391f574b334516814223c49bb2f7a7b4c444a16ca1341144851d4c1d5df5bf260 WHIRLPOOL 8b804012dd35752abebb62c07e8a1156a1eacf917ee69b628b2f15433f9bb0cc2ce63a57a08b34fcd561816d94d6c5cb5ceb0b384661d7c5804c68779e2179ca
 EBUILD lvm2-2.02.107.ebuild 8881 SHA256 78e37931dedf72b6312f47fd4fae93c428c290ce01c6602f5155568c83be6920 SHA512 b49a4c9411f8dbecace6373eefcc165f66566097e0f686a614168fc4d9ca39cab75f184e268d8459399bf8c651deb9df12a742d77fc48eb1397b0426cab56a60 WHIRLPOOL 9c5c45b03e24ac7f12a1b61717cf3c739ab36c346fbd4a69a9ad9bdbd6cbdffb2b122c3b6d87129a8d4729583ba35153ea434f66b2b5d998db7f3090305c7f45
-EBUILD lvm2-2.02.108.ebuild 8891 SHA256 24af4733f45a569ee2a46deedd613f8329ae11193c660d3a7425d14440f07a37 SHA512 d36d32d4c5230215dd0c16282e0f1e992264ff8565c471d905819a1b2eaf1974c18a38620b9cbf34824824fe564ff1b4c4ddc3fe680fd2ef959ddc67b7db06ec WHIRLPOOL ae94ed511cf2adf843a1b934095330a11043c8f46e6b1c041eaf2a8f6d4ce0e40ad1770d8be483a1386628a2e3d8684dae65d53abc7f231bc10a664ede2587ad
-MISC ChangeLog 68974 SHA256 c114d52604a5b31cc0ce711e41666565531d185579ba158d036cb65f2bf407e4 SHA512 1d39033643196cbd49db3cfbd213080cef65bd2ee5193bf154a6dc399a41b2948017b8157d6e11001cd03d52a67498bb7dc83c91ba14713a609af8bf2278ba0a WHIRLPOOL 6f938dae1f76033f6e3f9fc280fe16ccaec97fccf6b8e0c3234d7af045e218deeb320da265b78e5dba7ba4cf5f999b284f7d3fe379419ac3452876f67c00d789
+EBUILD lvm2-2.02.108.ebuild 9105 SHA256 7623f98b41426c272f450ecf6089b4d3f6433063c91acc44ac87ff253858684a SHA512 64cea33141ae8f4793d03587ac07b87940cec5ca5230fd0b315401cc6c77422361b76ad5d223c6ae4eda8f2e84a1cdeef746f9cb950352851cc6c82d7b604110 WHIRLPOOL 01a36e364b9492394b19e66bc5193eccb77cd3d43cec00931dd2538968c45c0aedeb76638d2f6e4ab4851cef31bff9b08ae37d4cb67881a19bf0d0b5423041fc
+MISC ChangeLog 69364 SHA256 bb31e0bef8cd0724b7f4ce5b10756bf5c64237b2617f491f8ea32e0e02c9d801 SHA512 907356218c056a9a7831e836fbd3e61648b824e2a0b19317a6d4b8ea58ef6af55c76f4bd1bd9e5be6612a53efb29e8076ad2b1938543bc3176fe30c45b800e1e WHIRLPOOL 9952a3654774353eefb3e141a6f001a4a42b877a22564e27bd8c06e2aed3b4cb8299476726d87ce8c3732f30fd48fadd952b29528011e86707162f6afbad2d58
 MISC metadata.xml 995 SHA256 a2be36b695dab8ef65772af8d808cdc7a5c5855e2c9104060e7232e21b984216 SHA512 642abe2a196ffeaf3a67530befa8dc123f1e3e1238bf55d38c0affea82ab5b2f9e56da6b303410845c625494a59323ac8570f40e0f8a406db76295059958361a WHIRLPOOL cba3a6dd12fafc4719050082ee740d03ef0ed68e074b556a0c1f15f4a7b328d9b826d2b7ab3d3f19546de92e907a3fd466792db67423cb8630d5313154d5b6f2
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQEcBAEBCAAGBQJT2Sc+AAoJEEdUh39IaPFNkcYH+gMogoDYSV+V1Xdrl+vqWcQa
-hs6TnjxXBGzFXW/yNPRw0PxwLj103AKzp5LIMWWlpsRfTNgHpOssfk8WZ0o2J0AA
-RLBu0AJqb3h6Ki01ws/KVoH7dRjUqlBJtrIamVIRosuhpV/ajfva1aHlSjdmfCTl
-hQNi5vABu2RiXpS/Hnzd4+VFEN0i7VQBs5KbuaRbWF7N/d6IT0KnSjn0v8b0u1yY
-jKWFo7doGbxffxmn7B2S/Qdx7FzMdyWGJezRvrjz70JmKJXBqZiz3pJkopJJs5x/
-RuWCHGDKVVVs5mS2tGXFxTKAx8mZPn6YkkwS+XGtiZzapRWQuGy2SVYaA7J8VGc=
-=0x6L
+iQEcBAEBCAAGBQJT2SoYAAoJEEdUh39IaPFNXfUH/RIn/aEp4HuDE3SdS6zo6pI6
+5HSMaXaxqn509wF6n4oOZ0CA9KRnPt/tnIkkfFSBQxMkViN/JcTLr/joOPyF5ViP
+bCAAx3nb7q4/A/UDAErrVi3YUYW8Wa5nVE9vK9YXHq6xk6O5MRsNgvNlLzSbg5p6
+7ESm5ohZOp9Ykcyupq4qVSeovwN/RwnktixZW/amds0WQj18eyI3CwumPMTvkfFC
+fva69nlxVDkys6P8sGZtO4vCiDGn0k28vuOgJrZJb604m9TLKCJA/MKVlmf6JxeA
+SBnlT7JwaWaIueVBiJyv0lY4f4X0373Pu4TNo0yi/3/yByd4B16gogIDMynF1wQ=
+=f1eL
 -----END PGP SIGNATURE-----
diff --git a/sys-fs/lvm2/lvm2-2.02.108.ebuild b/sys-fs/lvm2/lvm2-2.02.108.ebuild
index 260380ac2079..c226e6e6e2e7 100644
--- a/sys-fs/lvm2/lvm2-2.02.108.ebuild
+++ b/sys-fs/lvm2/lvm2-2.02.108.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/lvm2/lvm2-2.02.108.ebuild,v 1.1 2014/07/30 17:11:27 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/lvm2/lvm2-2.02.108.ebuild,v 1.2 2014/07/30 17:23:37 ssuominen Exp $
 
 EAPI=5
 inherit autotools eutils linux-info multilib systemd toolchain-funcs udev flag-o-matic
@@ -78,6 +78,12 @@ src_prepare() {
 
 	sed -i -e '/FLAG/s:-O2::' configure{.in,} || die #480212
 
+	if use systemd && use lvmetad && ! use device-mapper-only; then
+		sed -i -e '/use_lvmetad =/s:0:1:' conf/example.conf.in || die #514196
+	fi
+
+	sed -i -e 's:/usr/bin/true:/bin/true:' scripts/blk_availability_systemd_red_hat.service.in || die #517514
+
 	# For upstream -- review and forward:
 	epatch "${FILESDIR}"/${PN}-2.02.63-always-make-static-libdm.patch
 	epatch "${FILESDIR}"/${PN}-2.02.56-lvm2create_initrd.patch
@@ -87,8 +93,8 @@ src_prepare() {
 	epatch "${FILESDIR}"/${PN}-2.02.92-dynamic-static-ldflags.patch #332905
 	epatch "${FILESDIR}"/${PN}-2.02.108-static-pkgconfig-libs.patch #370217, #439414 + blkid
 	epatch "${FILESDIR}"/${PN}-2.02.106-pthread-pkgconfig.patch #492450
-	# Upstream never tested with USE="-thin" wrt #510202
-	sed -i -e 's|_man7: $(MAN8)|_man7: $(MAN7)|' man/Makefile.in || die
+
+	# Without thin-privision-tools, there is nothing to install for target install_man7:
 	use thin || { sed -i -e '/^install_lvm2/s:install_man7::' man/Makefile.in || die; }
 
 	eautoreconf