From 31af91da8911c6b843218a48af8f8b06e43e1e6f Mon Sep 17 00:00:00 2001
From: David Michael <david.michael@coreos.com>
Date: Fri, 10 Mar 2017 13:13:43 -0800
Subject: [PATCH] sys-fs/lvm2: apply CoreOS changes and bump

There is a dependency loop when systemd is build with cryptsetup
like systemd -> cryptsetup -> lvm2 -> baselayout -> systemd.  Since
CoreOS always installs a good baselayout, it makes sense drop the
lvm2 dependency and turn it into a conflict with bad versions.  It
also has a runtime dependency loop on systemd, so make that into a
build dependency.

This also stabilizes the version that was being used by arm64,
updating amd64, to bring the architectures into alignment.
---
 .../profiles/coreos/arm64/package.accept_keywords           | 1 -
 .../{lvm2-2.02.145-r2.ebuild => lvm2-2.02.145-r3.ebuild}    | 6 +++---
 2 files changed, 3 insertions(+), 4 deletions(-)
 rename sdk_container/src/third_party/coreos-overlay/sys-fs/lvm2/{lvm2-2.02.145-r2.ebuild => lvm2-2.02.145-r3.ebuild} (98%)

diff --git a/sdk_container/src/third_party/coreos-overlay/profiles/coreos/arm64/package.accept_keywords b/sdk_container/src/third_party/coreos-overlay/profiles/coreos/arm64/package.accept_keywords
index c667b23a36..ce8020ef36 100644
--- a/sdk_container/src/third_party/coreos-overlay/profiles/coreos/arm64/package.accept_keywords
+++ b/sdk_container/src/third_party/coreos-overlay/profiles/coreos/arm64/package.accept_keywords
@@ -41,7 +41,6 @@
 =sys-devel/bison-3.0.4-r1 ~arm64
 =sys-fs/cryptsetup-1.7.2 **
 =sys-fs/lsscsi-0.28 **
-=sys-fs/lvm2-2.02.145-r2 ~arm64
 =sys-fs/mdadm-3.4 **
 =sys-fs/quota-4.02 **
 =sys-fs/squashfs-tools-4.3-r2 ~arm64
diff --git a/sdk_container/src/third_party/coreos-overlay/sys-fs/lvm2/lvm2-2.02.145-r2.ebuild b/sdk_container/src/third_party/coreos-overlay/sys-fs/lvm2/lvm2-2.02.145-r3.ebuild
similarity index 98%
rename from sdk_container/src/third_party/coreos-overlay/sys-fs/lvm2/lvm2-2.02.145-r2.ebuild
rename to sdk_container/src/third_party/coreos-overlay/sys-fs/lvm2/lvm2-2.02.145-r3.ebuild
index acda6d06bb..d6037e9197 100644
--- a/sdk_container/src/third_party/coreos-overlay/sys-fs/lvm2/lvm2-2.02.145-r2.ebuild
+++ b/sdk_container/src/third_party/coreos-overlay/sys-fs/lvm2/lvm2-2.02.145-r3.ebuild
@@ -11,7 +11,7 @@ SRC_URI="ftp://sourceware.org/pub/lvm2/${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"
+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 corosync lvm1 lvm2create_initrd openais selinux +udev +thin device-mapper-only"
 REQUIRED_USE="device-mapper-only? ( !clvm !cman !corosync !lvm1 !lvm2create_initrd !openais !thin )
 	systemd? ( udev )
@@ -26,13 +26,12 @@ DEPEND_COMMON="
 	)
 
 	readline? ( sys-libs/readline:0= )
-	systemd? ( >=sys-apps/systemd-205:0= )
 	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/baselayout-2.2
 	!<sys-apps/openrc-0.11
 	!<sys-fs/cryptsetup-1.1.2
 	!!sys-fs/clvm
@@ -46,6 +45,7 @@ DEPEND="${DEPEND_COMMON}
 	virtual/pkgconfig
 	>=sys-devel/binutils-2.20.1-r1
 	sys-devel/autoconf-archive
+	systemd? ( >=sys-apps/systemd-205:0= )
 	static? (
 		selinux? ( sys-libs/libselinux[static-libs] )
 		udev? ( >=sys-fs/eudev-3.1.2[static-libs] )