From 037d2841df78580a9e81a2f3e93eb808a96d108b Mon Sep 17 00:00:00 2001
From: Michael Marineau <michael.marineau@coreos.com>
Date: Tue, 27 Aug 2013 18:42:17 -0700
Subject: [PATCH] fix(sys-apps/baselayout): Sync baselayout with recent Gentoo
 updates.

baselayout no longer depends on openrc upstream so remove our
openrc/efunctions use flag and dependency. Depend on efunctions in
coreos-base instead.

Remove os-release and roll back gentoo-release since customizing them is
now handled by the set_lsb_release.
---
 ...base-0-r66.ebuild => coreos-base-0-r67.ebuild} |  0
 .../coreos-base/coreos-base/coreos-base-0.ebuild  |  1 +
 .../baselayout/baselayout-2.2-r100.ebuild         | 15 ++++-----------
 .../sys-apps/baselayout/files/os-release          |  5 -----
 4 files changed, 5 insertions(+), 16 deletions(-)
 rename sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-base/{coreos-base-0-r66.ebuild => coreos-base-0-r67.ebuild} (100%)
 delete mode 100644 sdk_container/src/third_party/coreos-overlay/sys-apps/baselayout/files/os-release

diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-base/coreos-base-0-r66.ebuild b/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-base/coreos-base-0-r67.ebuild
similarity index 100%
rename from sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-base/coreos-base-0-r66.ebuild
rename to sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-base/coreos-base-0-r67.ebuild
diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-base/coreos-base-0.ebuild b/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-base/coreos-base-0.ebuild
index 2012913b2c..33500ea930 100644
--- a/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-base/coreos-base-0.ebuild
+++ b/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-base/coreos-base-0.ebuild
@@ -18,6 +18,7 @@ IUSE="cros_host"
 # See pkg_setup below as well as http://crosbug.com/27413
 # and friends.
 DEPEND="sys-apps/baselayout
+	sys-apps/efunctions
 	!<sys-libs/timezone-data-2011d
 	!<=app-admin/sudo-1.8.2
 	!<sys-apps/mawk-1.3.4
diff --git a/sdk_container/src/third_party/coreos-overlay/sys-apps/baselayout/baselayout-2.2-r100.ebuild b/sdk_container/src/third_party/coreos-overlay/sys-apps/baselayout/baselayout-2.2-r100.ebuild
index 7a073d2c6a..87bec47c8d 100644
--- a/sdk_container/src/third_party/coreos-overlay/sys-apps/baselayout/baselayout-2.2-r100.ebuild
+++ b/sdk_container/src/third_party/coreos-overlay/sys-apps/baselayout/baselayout-2.2-r100.ebuild
@@ -1,8 +1,7 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/baselayout/baselayout-2.2.ebuild,v 1.14 2013/05/20 17:56:20 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/baselayout/baselayout-2.2.ebuild,v 1.16 2013/07/27 22:56:21 williamh Exp $
 
-EAPI=1
 inherit eutils multilib
 
 DESCRIPTION="Filesystem baselayout and init scripts"
@@ -12,11 +11,8 @@ SRC_URI="mirror://gentoo/${P}.tar.bz2
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
-IUSE="build kernel_linux +openrc"
-
-PDEPEND="openrc? ( sys-apps/openrc )
-	!openrc? ( sys-apps/efunctions )"
+KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
+IUSE="build kernel_linux"
 
 pkg_setup() {
 	multilib_layout
@@ -174,11 +170,8 @@ src_install() {
 	done
 	echo "LDPATH='${ldpaths#:}'" >> "${D}"/etc/env.d/00basic
 
-	# override our CoreOS specific files
 	# rc-scripts version for testing of features that *should* be present
-	echo "CoreOS Base System release ${PV}" > "${D}"/etc/gentoo-release
-	cp "${FILESDIR}/os-release" "${D}"/etc/
-	#cp "${FILESDIR}/gentoo-release" "${D}"/etc/
+	echo "Gentoo Base System release ${PV}" > "${D}"/etc/gentoo-release
 }
 
 pkg_postinst() {
diff --git a/sdk_container/src/third_party/coreos-overlay/sys-apps/baselayout/files/os-release b/sdk_container/src/third_party/coreos-overlay/sys-apps/baselayout/files/os-release
deleted file mode 100644
index 4ce9b5157e..0000000000
--- a/sdk_container/src/third_party/coreos-overlay/sys-apps/baselayout/files/os-release
+++ /dev/null
@@ -1,5 +0,0 @@
-NAME=CoreOS
-ID=coreos
-PRETTY_NAME="CoreOS Linux"
-ANSI_COLOR="1;32"
-HOME_URL="http://www.coreos.com/"