Version bump. Fix configure logic for cache since it's tied to thin-provisioning-tools.

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

5 files changed, 436 insertions, 9 deletions

diff --git a/sys-fs/lvm2/ChangeLog b/sys-fs/lvm2/ChangeLog
index 2065ac6519cd..f7a2c254aad1 100644
--- a/sys-fs/lvm2/ChangeLog
+++ b/sys-fs/lvm2/ChangeLog
@@ -1,6 +1,14 @@
 # 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.356 2014/07/25 19:50:59 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/lvm2/ChangeLog,v 1.357 2014/07/30 17:11:27 ssuominen Exp $
+
+*lvm2-2.02.108 (30 Jul 2014)
+
+  30 Jul 2014; Samuli Suominen <ssuominen@gentoo.org>
+  +files/lvm2-2.02.108-example.conf.in.patch,
+  +files/lvm2-2.02.108-static-pkgconfig-libs.patch, +lvm2-2.02.108.ebuild:
+  Version bump. Fix configure logic for cache since it's tied to thin-
+  provisioning-tools.
 
   25 Jul 2014; Samuli Suominen <ssuominen@gentoo.org> lvm2-2.02.103.ebuild,
   lvm2-2.02.105-r2.ebuild, lvm2-2.02.106.ebuild, lvm2-2.02.107.ebuild:
diff --git a/sys-fs/lvm2/Manifest b/sys-fs/lvm2/Manifest
index 707be3fe84e9..ea7bf3d7571f 100644
--- a/sys-fs/lvm2/Manifest
+++ b/sys-fs/lvm2/Manifest
@@ -21,6 +21,8 @@ AUX lvm2-2.02.105-static-pkgconfig-libs.patch 3382 SHA256 cc3cbe1b1511eac87a4915
 AUX lvm2-2.02.106-pthread-pkgconfig.patch 615 SHA256 a33febfc3afbaaea1806afd252c28e48c7359f6136a1353103ac94d7a681fd71 SHA512 44db7e1c2b19d458d6e71519b1a3b878c20265e0527fb5edbf3874ed1c529383b888568af10e6a2099c3cf683384cc106aef0c392fd60d48a18af8cee89f360c WHIRLPOOL 544c51e7a305400a41869447e0e9bfd015f5a64437acc143ceb1dffd98a05846fdd31f07d0f56028fb6867e34237a487ace16e6afa692e3126e3353ce1e34f10
 AUX lvm2-2.02.106-static-pkgconfig-libs.patch 3151 SHA256 5215599d8b83e3a73782255747e8fb98faacd6c6606836b4f2ea5ccfd1e98066 SHA512 a00c03a3deae2898f5f3692aa797834601066fa1b444d0606a08e6ed6cfb57e41843da9bda41d2489bf206c6a13149e90d199e75a97ecfa5a05f612a770f4c7a WHIRLPOOL 315daddcd1135d68c0bf433ea913741985d3af1784d2658df02c7c46c5e452c18a6069dfc0ee2261231eedbdca2dde9f2c468bbf177a2135080be058b074e6ae
 AUX lvm2-2.02.107-static-pkgconfig-libs.patch 3607 SHA256 b3efe76e670fd45e363c62bc8a9965eff4bb1c12e98b6eebdf3b8690de24ddca SHA512 6cd6bbe2ff2dbbe012c20043f3b31e42cacc3379838358c58891ec8ce9593ced29a14fbb9e96b9c76e1b245c5aec2e38a26d3a599c78ff18c3d920e89f1d2f72 WHIRLPOOL 4acf0777694df20886b4e6bf06c91a86041f6e4d888c49dc26f582cd6220504550f54ea5d94c220a3a16b4768933e45e901f274dfaf616083db741aab81b612b
+AUX lvm2-2.02.108-example.conf.in.patch 1681 SHA256 c9e0b46965f68c25495e21ca9504699031ed88dbb69407a08d53569ddc88ae4c SHA512 b4e983892b7ff47e5e7617376197daa62cfd063cf398235dc4a436fd9025ec4b1e263d7418e2c2943d53be494cba4209e9d4230d54a78762b0ca526f92e9746c WHIRLPOOL 0fc73d8e6f47596fa1789118aefebf931fb217342259da838d701bdeb96f21d7de59f29ac81c3c0f4a00db711e86b9fac6b4c889cf05ffc90ad8fd5a9ef77cd1
+AUX lvm2-2.02.108-static-pkgconfig-libs.patch 3302 SHA256 5cbdb4c4db1a77767a8cf3a89490eb0e21a2d4cc7729a8ffb099e4d0746e2775 SHA512 246f1029f9346d6bc57c2062c8a223535d0b832fa6bd86947b8b91b094dbc388706a9914f9ca0531666f77e73544612e2819335435b7576b4e91cdb1b0e4f041 WHIRLPOOL 53e723bdcfe07f668abf6fe9e6093ae38d81b01bd10ade0b40a037d44c367a6945ed86d14d70c2af8af6e7063763fd3620591b5c7384bd255b98cceb7ee192f3
 AUX lvm2-2.02.56-lvm2create_initrd.patch 2032 SHA256 b892d0544e05350e78ea400c16e6fd3657671d9bdf50bfae70505fd79bdda081 SHA512 b2a1705fa6b962027ebc5047583547489afe8ef8d8977c6284a28d0a8b0e05e20e6c48bd6c02a8bb02de9cfb40ac2d6e2a4b8ed8ef8c4ae7b6ea9a29bc4194de WHIRLPOOL cb533df528be0aae4bf50966285ef7a238f810d955ee86d5b446f43944d093732eff6ef8178d1654c4a2c075049ffc11994a99de6291bab1140cb8812be8b8a0
 AUX lvm2-2.02.63-always-make-static-libdm.patch 1420 SHA256 1c498b5efce77ed16bbbfcd9e0ec6da404a9c70c7ad0959ed7b60733adfcfc21 SHA512 67735af9e51369d5b3b400cab4f9ffa25f8dea1c1ec3d01855cb3c5aeade5c39a35eeed43f3a665204fe6bbba4ca43baecd845330bf26d023064b94ca3d1317c WHIRLPOOL f273c893acedfd658e7947abb5f4b528f15de9808ae3862ec8a9189ba7de4ea6998dc67dbc7af642ca3a27bba2ef8eabfd48337f532145f88500988f564313b1
 AUX lvm2-2.02.67-createinitrd.patch 660 SHA256 d59f5642fff9d9575227bfd0b3d103d928a6f7b08b417d6c458704171f11da39 SHA512 17fbba5d34ece5c1c25ef35fa3bbc3d6fcd20b44bd766c049bbc120853a8d60c9544db5790645a7814db5c272fd12d383699a8a9be6f4e9c56a7c0a1bb29ade2 WHIRLPOOL b358a31a9ee669a4fccf42280da5342c214932bfd83deee92d41351eb37dc6c0b2e5dc7419f2304128b5d285fed92db5b2e1634a71bbf1310d36b54d1a353bb0
@@ -34,20 +36,22 @@ DIST LVM2.2.02.103.tgz 1343887 SHA256 71c5a2e8842ed2f13f52e02b44eb183110a3410ded
 DIST LVM2.2.02.105.tgz 1374752 SHA256 d0700c7000ff6375c1c36cb2a89b97b9ae6757f4219fa9ec65f313d13d71e51e SHA512 fb2f4eaceb8e643c7e081b6d8d77daf387960c39f880f5600df40c7eb32d7908835114b8619805a814fc1c59ce920fa36d9afa72314dfabcb69ddf134833e1fa WHIRLPOOL b0dfea302e0afced489d96d14a04bddc48cfff540d26f69217787fe95b571d5600647162da84a95c6cb42e02fb83473a00257ab73e920b9a1b3c46f5ab12f02d
 DIST LVM2.2.02.106.tgz 1426030 SHA256 6c83df279c2190543be750cda278c7d3e875dcadb5cbdc44c19f6040d718285b SHA512 52cfbe86ec89cebc639c6446195bba546fc5576165a38c5db6adf0d8aba6309a3140562d9c6a8bdc4ba415d91bb307989cdbb787cf4ec68dcacdcccbda71ae07 WHIRLPOOL 5853cd3e64ede16e21ee66a664cae222f707406e85379e051e72bf9264c8b6da83af9be7634d8d93c07bd772c395dc278ff37b55adc40f50b6e4c432e8e7a593
 DIST LVM2.2.02.107.tgz 1462424 SHA256 b1d6890e7a23c7a0bb7ed6be7f17a5e8f819da71d93f4a0b123661fe0f028820 SHA512 896c0f34d0134dfd985345e42e1381865e27ebdb7fa33b1e4ccf0b4dbd00bc708931f6827756778567092376ecb7f77bade7f93461a61b5e1e6b15c40b575bdd WHIRLPOOL c85c82e875c52a297cb8fd02eb7942906fee369506e5c51888a06c8c29361f5db2b59161d36ea085326fd83dc6371d6573bf298bd2d21c3aecacfcab674ebf6e
+DIST LVM2.2.02.108.tgz 1480663 SHA256 84056902e616fae83eeb4f405e45cec4862c3e73da124af4a1748e1ff071aa66 SHA512 a55cb6e0ae9d57374b7a4dcc30b6b7607ab7657d19317f50254abc68bdbcab8d16ab70d7503858e94e308e52d6f565d105f69173b74e8afceeec7aca275fe771 WHIRLPOOL 07da7bb48457dc0b12e74a91dac6d8f37a2c183bf30e3f9faf5116263c5015814ab70c3a71fa837dfe1bba3775443e511586940e09089269a0ee4152a1ce88dc
 EBUILD lvm2-2.02.103.ebuild 7452 SHA256 aaf76ae6bd66284db6f21d62f77c4845d75c15755d1f467f164ee80c33282b46 SHA512 0203a15f3539c35ddc9cbe650f1855eedc3847f59cf32b0d986cc606b13c75e67fe5af316b444b968bc127a93250c3d5738a17652a689e2646c2e2685ab6a492 WHIRLPOOL e29e8dbe10a1e70604b65e4c96fd95f940eb818b1a9fbb93e0ca10454b3f5cfd35fd7e928f603fa175273c23a68317f3ba768690122c3f45db6d191d584ba39c
 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
-MISC ChangeLog 68675 SHA256 d746300a782b59ddf0a9b5dbbaaa65406423a684e56d8df5c8c9cb753d940d9d SHA512 db4a1966a919ef9fa953a71a4623d3bf5daf8544647e52cab6e17b9d45c8f3a9bc141c622cbbf71fcca27ecf5749f24e0c33aaacc5f751917a820c106de5d116 WHIRLPOOL 02b768a5a7e0eb57821f9ca3ace4bb2dcaab28c55c9dee9d6320efdca7d9de476338f9370294789af6e114a8f4111131325b762d7209213d057344765ec51950
+EBUILD lvm2-2.02.108.ebuild 8891 SHA256 24af4733f45a569ee2a46deedd613f8329ae11193c660d3a7425d14440f07a37 SHA512 d36d32d4c5230215dd0c16282e0f1e992264ff8565c471d905819a1b2eaf1974c18a38620b9cbf34824824fe564ff1b4c4ddc3fe680fd2ef959ddc67b7db06ec WHIRLPOOL ae94ed511cf2adf843a1b934095330a11043c8f46e6b1c041eaf2a8f6d4ce0e40ad1770d8be483a1386628a2e3d8684dae65d53abc7f231bc10a664ede2587ad
+MISC ChangeLog 68974 SHA256 c114d52604a5b31cc0ce711e41666565531d185579ba158d036cb65f2bf407e4 SHA512 1d39033643196cbd49db3cfbd213080cef65bd2ee5193bf154a6dc399a41b2948017b8157d6e11001cd03d52a67498bb7dc83c91ba14713a609af8bf2278ba0a WHIRLPOOL 6f938dae1f76033f6e3f9fc280fe16ccaec97fccf6b8e0c3234d7af045e218deeb320da265b78e5dba7ba4cf5f999b284f7d3fe379419ac3452876f67c00d789
 MISC metadata.xml 995 SHA256 a2be36b695dab8ef65772af8d808cdc7a5c5855e2c9104060e7232e21b984216 SHA512 642abe2a196ffeaf3a67530befa8dc123f1e3e1238bf55d38c0affea82ab5b2f9e56da6b303410845c625494a59323ac8570f40e0f8a406db76295059958361a WHIRLPOOL cba3a6dd12fafc4719050082ee740d03ef0ed68e074b556a0c1f15f4a7b328d9b826d2b7ab3d3f19546de92e907a3fd466792db67423cb8630d5313154d5b6f2
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQEcBAEBCAAGBQJT0rUlAAoJEEdUh39IaPFNWBAH/jnVOjLsK5kQZhrC/EkcGhcL
-Um9rxRwjGH3YiqxmEcPa4ZD/QV/WQxM1ONuPK3b0HDzWSYTPSj75FUVFXkU5XiOf
-cOo/5wezvlSe8ZMRpm6/qpduTPOiROgkTqJrU2vmzaSZw9dF3llkNlz1k7/8OpJh
-KAn5CW/yfLDCauuJ8KAppDo1EoBUpq/bRrEjt52iSDRYd2kneaEKfbkL40WZLTKO
-dRI05rEW7zg3lNOT4aHF4yixuUVBypgzU5Lw6iMEpNkDwJLUCFRsoj75CcaGcQHN
-FtRrqaf0UXVPa0viBCFHEv+B6QHZ4xeIZvN6s3DeHUpmGtrhmIucbnYgNjWSv8k=
-=+g7k
+iQEcBAEBCAAGBQJT2Sc+AAoJEEdUh39IaPFNkcYH+gMogoDYSV+V1Xdrl+vqWcQa
+hs6TnjxXBGzFXW/yNPRw0PxwLj103AKzp5LIMWWlpsRfTNgHpOssfk8WZ0o2J0AA
+RLBu0AJqb3h6Ki01ws/KVoH7dRjUqlBJtrIamVIRosuhpV/ajfva1aHlSjdmfCTl
+hQNi5vABu2RiXpS/Hnzd4+VFEN0i7VQBs5KbuaRbWF7N/d6IT0KnSjn0v8b0u1yY
+jKWFo7doGbxffxmn7B2S/Qdx7FzMdyWGJezRvrjz70JmKJXBqZiz3pJkopJJs5x/
+RuWCHGDKVVVs5mS2tGXFxTKAx8mZPn6YkkwS+XGtiZzapRWQuGy2SVYaA7J8VGc=
+=0x6L
 -----END PGP SIGNATURE-----
diff --git a/sys-fs/lvm2/files/lvm2-2.02.108-example.conf.in.patch b/sys-fs/lvm2/files/lvm2-2.02.108-example.conf.in.patch
new file mode 100644
index 000000000000..af5a5afe258d
--- /dev/null
+++ b/sys-fs/lvm2/files/lvm2-2.02.108-example.conf.in.patch
@@ -0,0 +1,50 @@
+Maintainer note: Forward ported without editing from lvm2-2.02.99-example.conf.in.patch to apply cleanly.
+
+--- conf/example.conf.in
++++ conf/example.conf.in
+@@ -105,6 +105,10 @@
+     # By default we accept every block device:
+     # filter = [ "a/.*/" ]
+ 
++    # Gentoo: we exclude /dev/nbd by default, because it makes a lot of kernel
++    # noise when you probed while not available.
++    filter = [ "r|/dev/nbd.*|", "a/.*/" ]
++
+     # Exclude the cdrom drive
+     # filter = [ "r|/dev/cdrom|" ]
+ 
+@@ -522,7 +526,8 @@
+     # e.g. vgscan.lvm1 and they will stop working after you start using
+     # the new lvm2 on-disk metadata format.
+     # The default value is set when the tools are built.
+-    # fallback_to_lvm1 = 0
++    # Gentoo: the LVM tools are a seperate package.
++    fallback_to_lvm1 = 0
+ 
+     # The default metadata format that commands should use - "lvm1" or "lvm2".
+     # The command line override is -M1 or -M2.
+@@ -1182,12 +1187,13 @@
+ 
+ # Metadata settings
+ #
+-# metadata {
++metadata {
+     # Default number of copies of metadata to hold on each PV.  0, 1 or 2.
+     # You might want to override it from the command line with 0 
+     # when running pvcreate on new PVs which are to be added to large VGs.
+ 
+-    # pvmetadatacopies = 1
++    # Gentoo: enable for data safety, but PV resize is then disabled.
++    # pvmetadatacopies = 2
+ 
+     # Default number of copies of metadata to maintain for each VG.
+     # If set to a non-zero value, LVM automatically chooses which of
+@@ -1222,7 +1228,7 @@
+     # the supplied toolset to make changes (e.g. vgcfgrestore).
+ 
+     # dirs = [ "/etc/lvm/metadata", "/mnt/disk2/lvm/metadata2" ]
+-#}
++}
+ 
+ # Event daemon
+ #
diff --git a/sys-fs/lvm2/files/lvm2-2.02.108-static-pkgconfig-libs.patch b/sys-fs/lvm2/files/lvm2-2.02.108-static-pkgconfig-libs.patch
new file mode 100644
index 000000000000..3ab699868a5d
--- /dev/null
+++ b/sys-fs/lvm2/files/lvm2-2.02.108-static-pkgconfig-libs.patch
@@ -0,0 +1,104 @@
+Maintainer note: Forward ported without editing from lvm2-2.02.107-static-pkgconfig-libs.patch to apply cleanly.
+
+--- configure.in
++++ configure.in
+@@ -1067,6 +1067,7 @@
+ 			   fi])
+ 	if test "$BLKID_WIPING" = yes; then
+ 		BLKID_PC="blkid"
++		BLKID_STATIC_LIBS=`$PKG_CONFIG --static --libs $BLKID_PC`
+ 		AC_DEFINE([BLKID_WIPING_SUPPORT], 1, [Define to 1 to use libblkid detection of signatures when wiping.])
+ 	fi
+ fi
+@@ -1092,6 +1093,7 @@
+ if test "$UDEV_SYNC" = yes; then
+ 	pkg_config_init
+ 	PKG_CHECK_MODULES(UDEV, libudev >= 143, [UDEV_PC="libudev"])
++	UDEV_STATIC_LIBS=`$PKG_CONFIG --static --libs libudev`
+ 	AC_DEFINE([UDEV_SYNC_SUPPORT], 1, [Define to 1 to enable synchronisation with udev processing.])
+ fi
+ 
+@@ -1312,19 +1314,32 @@
+ if test "$SELINUX" = yes; then
+ 	AC_CHECK_LIB([sepol], [sepol_check_context], [
+ 		AC_DEFINE([HAVE_SEPOL], 1, [Define to 1 if sepol_check_context is available.])
+-		SELINUX_LIBS="-lsepol"])
++		SEPOL_LIBS="-lsepol"])
++
++	dnl -- init pkgconfig if required
++	if  test x$PKGCONFIG_INIT != x1; then
++		pkg_config_init
++	fi
++	PKG_CHECK_MODULES(SELINUX, libselinux, [
++		SELINUX_PC="libselinux"
++		SELINUX_STATIC_LIBS=`$PKG_CONFIG --static --libs libselinux`
++		SELINUX_LIBS="$SELINUX_LIBS $SEPOL_LIBS"
++		AC_DEFINE([HAVE_SELINUX], 1, [Define to 1 to include support for selinux.])
++	],[
++		dnl -- old non-pkgconfig method, is buggy with static builds
+ 
+ 	AC_CHECK_LIB([selinux], [is_selinux_enabled], [
+ 		AC_CHECK_HEADERS([selinux/selinux.h],, hard_bailout)
+ 		AC_CHECK_HEADERS([selinux/label.h])
+ 		AC_DEFINE([HAVE_SELINUX], 1, [Define to 1 to include support for selinux.])
+-		SELINUX_LIBS="-lselinux $SELINUX_LIBS"
++		SELINUX_LIBS="-lselinux $SEPOL_LIBS"
+ 		SELINUX_PC="libselinux"
+ 		HAVE_SELINUX=yes ], [
+ 		AC_MSG_WARN(Disabling selinux)
+ 		SELINUX_LIBS=
+ 		SELINUX_PC=
+ 		HAVE_SELINUX=no ])
++	])
+ fi
+ 
+ ################################################################################
+@@ -1626,6 +1641,7 @@
+ ################################################################################
+ AC_SUBST(APPLIB)
+ AC_SUBST(AWK)
++AC_SUBST(BLKID_STATIC_LIBS)
+ AC_SUBST(BLKID_PC)
+ AC_SUBST(BLKID_WIPING)
+ AC_SUBST(BUILD_CMIRRORD)
+@@ -1721,6 +1737,7 @@
+ AC_SUBST(SALCK_CFLAGS)
+ AC_SUBST(SALCK_LIBS)
+ AC_SUBST(SELINUX_LIBS)
++AC_SUBST(SELINUX_STATIC_LIBS)
+ AC_SUBST(SELINUX_PC)
+ AC_SUBST(SNAPSHOTS)
+ AC_SUBST(STATICDIR)
+@@ -1735,6 +1752,7 @@
+ AC_SUBST(CACHE_DUMP_CMD)
+ AC_SUBST(CACHE_REPAIR_CMD)
+ AC_SUBST(CACHE_RESTORE_CMD)
++AC_SUBST(UDEV_STATIC_LIBS)
+ AC_SUBST(UDEV_PC)
+ AC_SUBST(UDEV_RULES)
+ AC_SUBST(UDEV_SYNC)
+--- make.tmpl.in
++++ make.tmpl.in
+@@ -43,7 +43,7 @@
+ 
+ LIBS = @LIBS@
+ # Extra libraries always linked with static binaries
+-STATIC_LIBS = $(SELINUX_LIBS) $(UDEV_LIBS) $(BLKID_LIBS)
++STATIC_LIBS = $(SELINUX_STATIC_LIBS) $(UDEV_STATIC_LIBS) $(BLKID_STATIC_LIBS)
+ DEFS += @DEFS@
+ # FIXME set this only where it's needed, not globally?
+ CFLAGS += @CFLAGS@
+@@ -57,10 +57,13 @@
+ PTHREAD_LIBS = @PTHREAD_LIBS@
+ READLINE_LIBS = @READLINE_LIBS@
+ SELINUX_LIBS = @SELINUX_LIBS@
++SELINUX_STATIC_LIBS = @SELINUX_STATIC_LIBS@
+ UDEV_CFLAGS = @UDEV_CFLAGS@
+ UDEV_LIBS = @UDEV_LIBS@
++UDEV_STATIC_LIBS = @UDEV_STATIC_LIBS@
+ BLKID_CFLAGS = @BLKID_CFLAGS@
+ BLKID_LIBS = @BLKID_LIBS@
++BLKID_STATIC_LIBS = @BLKID_STATIC_LIBS@
+ TESTING = @TESTING@
+ 
+ # Setup directory variables
diff --git a/sys-fs/lvm2/lvm2-2.02.108.ebuild b/sys-fs/lvm2/lvm2-2.02.108.ebuild
new file mode 100644
index 000000000000..260380ac2079
--- /dev/null
+++ b/sys-fs/lvm2/lvm2-2.02.108.ebuild
@@ -0,0 +1,261 @@
+# 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 $
+
+EAPI=5
+inherit autotools eutils linux-info multilib systemd toolchain-funcs udev flag-o-matic
+
+DESCRIPTION="User-land utilities for LVM2 (device-mapper) software."
+HOMEPAGE="http://sources.redhat.com/lvm2/"
+SRC_URI="ftp://sources.redhat.com/pub/lvm2/${PN/lvm/LVM}.${PV}.tgz
+	ftp://sources.redhat.com/pub/lvm2/old/${PN/lvm/LVM}.${PV}.tgz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux"
+IUSE="readline static static-libs systemd clvm cman lvm1 lvm2create_initrd selinux +udev +thin device-mapper-only"
+REQUIRED_USE="device-mapper-only? ( !clvm !cman !lvm1 !lvm2create_initrd !thin )"
+
+DEPEND_COMMON="clvm? ( cman? ( =sys-cluster/cman-3* ) =sys-cluster/libdlm-3* )
+	readline? ( sys-libs/readline )
+	udev? ( >=virtual/libudev-208:=[static-libs?] )"
+# /run is now required for locking during early boot. /var cannot be assumed to
+# be available -- thus, pull in recent enough baselayout for /run.
+# This version of LVM is incompatible with cryptsetup <1.1.2.
+RDEPEND="${DEPEND_COMMON}
+	>=sys-apps/baselayout-2.2
+	!<sys-apps/openrc-0.11
+	!<sys-fs/cryptsetup-1.1.2
+	!!sys-fs/clvm
+	!!sys-fs/lvm-user
+	>=sys-apps/util-linux-2.16
+	lvm2create_initrd? ( sys-apps/makedev )
+	thin? ( >=sys-block/thin-provisioning-tools-0.3.0 )"
+# note: thin- 0.3.0 is required to avoid --disable-thin_check_needs_check
+DEPEND="${DEPEND_COMMON}
+	virtual/pkgconfig
+	>=sys-devel/binutils-2.20.1-r1
+	static? (
+		selinux? ( sys-libs/libselinux[static-libs] )
+		udev? ( >=virtual/libudev-208:=[static-libs] )
+		>=sys-apps/util-linux-2.16[static-libs]
+	)"
+
+S=${WORKDIR}/${PN/lvm/LVM}.${PV}
+
+pkg_setup() {
+	local CONFIG_CHECK="~SYSVIPC"
+
+	if use udev; then
+		local WARNING_SYSVIPC="CONFIG_SYSVIPC:\tis not set (required for udev sync)\n"
+		if linux_config_exists; then
+			local uevent_helper_path=$(linux_chkconfig_string UEVENT_HELPER_PATH)
+			if [ -n "${uevent_helper_path}" ] && [ "${uevent_helper_path}" != '""' ]; then
+				ewarn "It's recommended to set an empty value to the following kernel config option:"
+				ewarn "CONFIG_UEVENT_HELPER_PATH=${uevent_helper_path}"
+			fi
+		fi
+	fi
+
+	check_extra_config
+
+	# 1. Genkernel no longer copies /sbin/lvm blindly.
+	if use static; then
+		elog "Warning, we no longer overwrite /sbin/lvm and /sbin/dmsetup with"
+		elog "their static versions. If you need the static binaries,"
+		elog "you must append .static to the filename!"
+	fi
+}
+
+src_prepare() {
+	# Gentoo specific modification(s):
+	epatch "${FILESDIR}"/${PN}-2.02.108-example.conf.in.patch
+
+	sed -i \
+		-e "1iAR = $(tc-getAR)" \
+		-e "s:CC ?= @CC@:CC = $(tc-getCC):" \
+		make.tmpl.in || die #444082
+
+	sed -i -e '/FLAG/s:-O2::' configure{.in,} || die #480212
+
+	# 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
+	epatch "${FILESDIR}"/${PN}-2.02.67-createinitrd.patch #301331
+	epatch "${FILESDIR}"/${PN}-2.02.99-locale-muck.patch #330373
+	epatch "${FILESDIR}"/${PN}-2.02.70-asneeded.patch # -Wl,--as-needed
+	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
+	use thin || { sed -i -e '/^install_lvm2/s:install_man7::' man/Makefile.in || die; }
+
+	eautoreconf
+}
+
+src_configure() {
+	filter-flags -flto
+	local myconf
+	local buildmode
+
+	myconf="${myconf} $(use_enable !device-mapper-only dmeventd)"
+	myconf="${myconf} $(use_enable !device-mapper-only cmdlib)"
+	myconf="${myconf} $(use_enable !device-mapper-only applib)"
+	myconf="${myconf} $(use_enable !device-mapper-only fsadm)"
+	myconf="${myconf} $(use_enable !device-mapper-only lvmetad)"
+	use device-mapper-only && myconf="${myconf} --disable-udev-systemd-background-jobs"
+
+	# Most of this package does weird stuff.
+	# The build options are tristate, and --without is NOT supported
+	# options: 'none', 'internal', 'shared'
+	if use static; then
+		buildmode="internal"
+		# This only causes the .static versions to become available
+		myconf="${myconf} --enable-static_link"
+	else
+		buildmode="shared"
+	fi
+	dmbuildmode=$(use !device-mapper-only && echo internal || echo none)
+
+	# dmeventd requires mirrors to be internal, and snapshot available
+	# so we cannot disable them
+	myconf="${myconf} --with-mirrors=${dmbuildmode}"
+	myconf="${myconf} --with-snapshots=${dmbuildmode}"
+	if use thin; then
+		myconf="${myconf} --with-thin=internal --with-cache=internal"
+		local texec
+		for texec in check dump repair restore; do
+			myconf="${myconf} --with-thin-${texec}=${EPREFIX}/sbin/thin_${texec}"
+			myconf="${myconf} --with-cache-${texec}=${EPREFIX}/sbin/cache_${texec}"
+		done
+	else
+		myconf="${myconf} --with-thin=none --with-cache=none"
+	fi
+
+	if use lvm1; then
+		myconf="${myconf} --with-lvm1=${buildmode}"
+	else
+		myconf="${myconf} --with-lvm1=none"
+	fi
+
+	# disable O_DIRECT support on hppa, breaks pv detection (#99532)
+	use hppa && myconf="${myconf} --disable-o_direct"
+
+	if use clvm; then
+		myconf="${myconf} --with-cluster=${buildmode}"
+		# 4-state! Make sure we get it right, per bug 210879
+		# Valid options are: none, cman, gulm, all
+		#
+		# 2009/02:
+		# gulm is removed now, now dual-state:
+		# cman, none
+		# all still exists, but is not needed
+		#
+		# 2009/07:
+		# TODO: add corosync and re-enable ALL
+		local clvmd=""
+		use cman && clvmd="cman"
+		#clvmd="${clvmd/cmangulm/all}"
+		[ -z "${clvmd}" ] && clvmd="none"
+		myconf="${myconf} --with-clvmd=${clvmd}"
+		myconf="${myconf} --with-pool=${buildmode}"
+	else
+		myconf="${myconf} --with-clvmd=none --with-cluster=none"
+	fi
+
+	econf \
+		$(use_enable readline) \
+		$(use_enable selinux) \
+		--enable-pkgconfig \
+		--with-confdir="${EPREFIX}"/etc \
+		--exec-prefix="${EPREFIX}" \
+		--sbindir="${EPREFIX}/sbin" \
+		--with-staticdir="${EPREFIX}"/sbin \
+		--libdir="${EPREFIX}/$(get_libdir)" \
+		--with-usrlibdir="${EPREFIX}/usr/$(get_libdir)" \
+		--with-default-dm-run-dir=/run \
+		--with-default-run-dir=/run/lvm \
+		--with-default-locking-dir=/run/lock/lvm \
+		--with-default-pid-dir=/run \
+		$(use_enable udev udev_rules) \
+		$(use_enable udev udev_sync) \
+		$(use_with udev udevdir "$(get_udevdir)"/rules.d) \
+		$(use_enable systemd udev-systemd-background-jobs) \
+		"$(systemd_with_unitdir)" \
+		${myconf} \
+		CLDFLAGS="${LDFLAGS}"
+}
+
+src_compile() {
+	pushd include >/dev/null
+	emake
+	popd >/dev/null
+
+	if use device-mapper-only ; then
+		emake device-mapper
+	else
+		emake
+		emake CC="$(tc-getCC)" -C scripts lvm2_activation_generator_systemd_red_hat
+	fi
+}
+
+src_install() {
+	local inst
+	INSTALL_TARGETS="install install_systemd_units install_systemd_generators install_tmpfiles_configuration"
+	use device-mapper-only && INSTALL_TARGETS="install_device-mapper"
+	for inst in ${INSTALL_TARGETS}; do
+		emake DESTDIR="${D}" ${inst}
+	done
+
+	newinitd "${FILESDIR}"/device-mapper.rc-2.02.105-r2 device-mapper
+	newconfd "${FILESDIR}"/device-mapper.conf-1.02.22-r3 device-mapper
+
+	if use !device-mapper-only ; then
+		newinitd "${FILESDIR}"/dmeventd.initd-2.02.67-r1 dmeventd
+		newinitd "${FILESDIR}"/lvm.rc-2.02.105-r2 lvm
+		newconfd "${FILESDIR}"/lvm.confd-2.02.28-r2 lvm
+
+		newinitd "${FILESDIR}"/lvm-monitoring.initd-2.02.105-r2 lvm-monitoring
+		newinitd "${FILESDIR}"/lvmetad.initd-2.02.105-r2 lvmetad
+	fi
+
+	if use clvm; then
+		newinitd "${FILESDIR}"/clvmd.rc-2.02.39 clvmd
+		newconfd "${FILESDIR}"/clvmd.confd-2.02.39 clvmd
+	fi
+
+	if use static-libs; then
+		dolib.a libdm/ioctl/libdevmapper.a
+		dolib.a libdaemon/client/libdaemonclient.a #462908
+		#gen_usr_ldscript libdevmapper.so
+		dolib.a daemons/dmeventd/libdevmapper-event.a
+		#gen_usr_ldscript libdevmapper-event.so
+	else
+		rm -f "${ED}"usr/$(get_libdir)/{libdevmapper-event,liblvm2cmd,liblvm2app,libdevmapper}.a
+	fi
+
+	if use lvm2create_initrd; then
+		dosbin scripts/lvm2create_initrd/lvm2create_initrd
+		doman scripts/lvm2create_initrd/lvm2create_initrd.8
+		newdoc scripts/lvm2create_initrd/README README.lvm2create_initrd
+	fi
+
+	insinto /etc
+	doins "${FILESDIR}"/dmtab
+
+	dodoc README VERSION* WHATS_NEW WHATS_NEW_DM doc/*.{c,txt} conf/*.conf
+}
+
+pkg_postinst() {
+	ewarn "Make sure the \"lvm\" init script is in the runlevels:"
+	ewarn "# rc-update add lvm boot"
+	ewarn
+	ewarn "Make sure to enable lvmetad in /etc/lvm/lvm.conf if you want"
+	ewarn "to enable lvm autoactivation and metadata caching."
+}
+
+src_test() {
+	einfo "Tests are disabled because of device-node mucking, if you want to"
+	einfo "run tests, compile the package and see ${S}/tests"
+}