From 175d6308e801575bc921dde5500401e36805eb9b Mon Sep 17 00:00:00 2001
From: Henry Gebhardt <hsggebhardt@googlemail.com>
Date: Sat, 1 Sep 2012 17:59:05 -0400
Subject: baselayout-systemd: /etc/os-release is now installed by
 baselayout-2.2

---
 sys-apps/baselayout-systemd/Manifest               |   4 +-
 .../baselayout-systemd/baselayout-systemd-1.ebuild | 144 ---------------------
 .../baselayout-systemd/baselayout-systemd-2.ebuild | 132 +++++++++++++++++++
 3 files changed, 134 insertions(+), 146 deletions(-)
 delete mode 100644 sys-apps/baselayout-systemd/baselayout-systemd-1.ebuild
 create mode 100644 sys-apps/baselayout-systemd/baselayout-systemd-2.ebuild

diff --git a/sys-apps/baselayout-systemd/Manifest b/sys-apps/baselayout-systemd/Manifest
index 935759a..1f0b5bb 100644
--- a/sys-apps/baselayout-systemd/Manifest
+++ b/sys-apps/baselayout-systemd/Manifest
@@ -1,2 +1,2 @@
-EBUILD baselayout-systemd-1.ebuild 3407 RMD160 563fdbd3fe72799e4bf65415095708040ee9a152 SHA1 3416afb6eea240e8bba2ea587f023db28629c38d SHA256 9882404656e4eac9a3a360f60f8be3316937d69fb8a2012165a7f49e053cdf85
-MISC metadata.xml 561 RMD160 bfdb1a962cf3c21cb538efd7c443c8797ec06aa6 SHA1 733ab5f6d757cf5018fbeeddd60f465f5acae1c0 SHA256 545fa104c21104c630bda9cd87ed00bc848a237bcc0aca2a24a638ef955d3e53
+EBUILD baselayout-systemd-2.ebuild 2954 SHA256 75ada6dfaed68bb00a1cf154f7765ca7c6bff3e2a2a9a99280a4f04e859a3f9c SHA512 03ceb385ffe57683fa359b48d2d2c84329fe48ffa84dcbe8dea70072b204241445ceaa13d4bce97b7a2d8a87184d7ea123ba119f7e602a709c0a9d5d36262888 WHIRLPOOL a39883e526abdd1f7af1f8984cd6324fcadb863370122ce6f8215d3ecd6613e9add9b5d6f334722c9dadfd2ce3d2f4803d6120e7464d85b0f3ba8e519938d51d
+MISC metadata.xml 561 SHA256 545fa104c21104c630bda9cd87ed00bc848a237bcc0aca2a24a638ef955d3e53 SHA512 665e51076824f32b315d56911dba1a813bb6ed5a1b93e2ff9af8c48c628214676ecdfa356fd3d17fd9ee34a533e6eb424aec1cb37b7a2cd92dbb2ceb3e30f975 WHIRLPOOL c30f8e18db248fba2776b75f839f15708fb5da16721fa5a18acaaede25915424a7a41f5b1d96875bffa741a65c16a6ce5ae97ced611165925cfa0dba8fbd7dda
diff --git a/sys-apps/baselayout-systemd/baselayout-systemd-1.ebuild b/sys-apps/baselayout-systemd/baselayout-systemd-1.ebuild
deleted file mode 100644
index 4e9ff4c..0000000
--- a/sys-apps/baselayout-systemd/baselayout-systemd-1.ebuild
+++ /dev/null
@@ -1,144 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=4
-
-DESCRIPTION="Standard system configuration files"
-HOMEPAGE="http://0pointer.de/blog/projects/the-new-configuration-files.html"
-SRC_URI=""
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64"
-
-# guess: guess the configuration from existing file, from openrc, or by
-# 	executing commands, in that order
-IUSE="+guess"
-
-DEPEND=""
-RDEPEND="${DEPEND}"
-
-parse_value() {
-	local vname="$1"
-	local fname="$2"
-	local value
-
-	test -e "${fname}" || return
-
-	value="$(grep -i "^${vname}" "${fname}")"
-	value="${value#*=}"
-	value="${value#\"}"
-	value="${value%\"}"
-	value="${value#\'}"
-	value="${value%\'}"
-
-	echo -n "${value}"
-}
-
-claim-file() {
-	local fname="$1"
-	local bname="$(basename "${fname}")"
-
-	if test -e "${fname}"; then
-		cat "${fname}" >"${bname}"
-	else
-		return 1
-	fi
-}
-
-etc-hostname() {
-	claim-file /etc/hostname && return
-
-	local hostname
-	local fname=/etc/conf.d/hostname
-
-	use guess || ewarn "/etc/hostname must be manually created"
-	use guess || return
-
-	if test -e "${fname}"; then
-		echo "$(parse_value hostname "${fname}")" >hostname
-	else
-		echo "$(hostname)" >hostname
-	fi
-
-	einfo "guessed hostname: \"$(cat hostname)\""
-}
-
-print-if-nonempty-k-v-new-file() {
-	print_if_nonempty_k_v_file="$1"
-	test -e "$1" && rm "$1"
-}
-
-print-if-nonempty-k-v() {
-	local str="$@"
-	local key="${str%%=*}"
-	local value="${str#*=}"
-
-	test -n "${value}" &&
-		echo "${key}=${value}" >>"${print_if_nonempty_k_v_file}"
-
-	return 0
-}
-
-etc-vconsole.conf() {
-	claim-file /etc/vconsole.conf && return
-
-	use guess || return
-
-	#local vc_unicode="`parse_value unicode /etc/rc.conf`"
-	#local utf8="YES"
-	local vc_font="`parse_value consolefont /etc/conf.d/consolefont`"
-	local vc_font_map="`parse_value consoletranslation /etc/conf.d/consolefont`"
-	local vc_font_unimap="`parse_value unicodemap /etc/conf.d/consolefont`"
-	local vc_keymap="`parse_value keymap /etc/conf.d/keymaps`"
-	local vc_keymap_toggle="`parse_value keymap_toggle /etc/vconsole.conf`"
-
-	print-if-nonempty-k-v-new-file vconsole.conf
-	print-if-nonempty-k-v KEYMAP="$vc_keymap"
-	print-if-nonempty-k-v KEYMAP_TOGGLE="$vc_keymap_toggle"
-	print-if-nonempty-k-v FONT="$vc_font"
-	print-if-nonempty-k-v FONT_MAP="$vc_font_map"
-	print-if-nonempty-k-v FONT_UNIMAP="$vc_font_unimap"
-}
-
-etc-locale.conf() {
-	claim-file /etc/locale.conf && return
-
-	use guess || return
-
-	local fname=/etc/profile.env
-
-	print-if-nonempty-k-v-new-file locale.conf
-	for vn in LANG LC_CTYPE LC_NUMERIC LC_TIME LC_COLLATE LC_MONETARY \
-		LC_MESSAGES LC_PAPER LC_NAME LC_ADDRESS LC_TELEPHONE LC_MEASUREMENT \
-		LC_IDENTIFICATION; do
-		print-if-nonempty-k-v ${vn}="$(parse_value "export $vn" "${fname}")"
-	done
-}
-
-etc-os-release() {
-	# VERSION and VERSION_ID can be unset for rolling releases
-	print-if-nonempty-k-v-new-file os-release
-	print-if-nonempty-k-v NAME=Gentoo
-	print-if-nonempty-k-v ID=gentoo
-	print-if-nonempty-k-v PRETTY_NAME=\"Gentoo Linux\"
-	print-if-nonempty-k-v ANSI_COLOR=\"1\;32\"
-	print-if-nonempty-k-v HOME_URL=\"http://www.gentoo.org/\"
-	print-if-nonempty-k-v BUG_REPORT_URL=\"https://bugs.gentoo.org/\"
-}
-
-src_unpack() {
-	mkdir -p "${S}"
-}
-
-src_configure() {
-	etc-hostname && einfo "hostname"
-	etc-vconsole.conf && einfo "vconsole.conf"
-	etc-locale.conf && einfo "locale.conf"
-	etc-os-release && einfo "os-release"
-}
-
-src_install() {
-	insinto /etc
-	doins *
-}
diff --git a/sys-apps/baselayout-systemd/baselayout-systemd-2.ebuild b/sys-apps/baselayout-systemd/baselayout-systemd-2.ebuild
new file mode 100644
index 0000000..fa1ad48
--- /dev/null
+++ b/sys-apps/baselayout-systemd/baselayout-systemd-2.ebuild
@@ -0,0 +1,132 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=4
+
+DESCRIPTION="Standard system configuration files"
+HOMEPAGE="http://0pointer.de/blog/projects/the-new-configuration-files.html"
+SRC_URI=""
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64"
+
+# guess: guess the configuration from existing file, from openrc, or by
+# 	executing commands, in that order
+IUSE="+guess"
+
+DEPEND=""
+RDEPEND="${DEPEND}"
+
+parse_value() {
+	local vname="$1"
+	local fname="$2"
+	local value
+
+	test -e "${fname}" || return
+
+	value="$(grep -i "^${vname}" "${fname}")"
+	value="${value#*=}"
+	value="${value#\"}"
+	value="${value%\"}"
+	value="${value#\'}"
+	value="${value%\'}"
+
+	echo -n "${value}"
+}
+
+claim-file() {
+	local fname="$1"
+	local bname="$(basename "${fname}")"
+
+	if test -e "${fname}"; then
+		cat "${fname}" >"${bname}"
+	else
+		return 1
+	fi
+}
+
+etc-hostname() {
+	claim-file /etc/hostname && return
+
+	local hostname
+	local fname=/etc/conf.d/hostname
+
+	use guess || ewarn "/etc/hostname must be manually created"
+	use guess || return
+
+	if test -e "${fname}"; then
+		echo "$(parse_value hostname "${fname}")" >hostname
+	else
+		echo "$(hostname)" >hostname
+	fi
+
+	einfo "guessed hostname: \"$(cat hostname)\""
+}
+
+print-if-nonempty-k-v-new-file() {
+	print_if_nonempty_k_v_file="$1"
+	test -e "$1" && rm "$1"
+}
+
+print-if-nonempty-k-v() {
+	local str="$@"
+	local key="${str%%=*}"
+	local value="${str#*=}"
+
+	test -n "${value}" &&
+		echo "${key}=${value}" >>"${print_if_nonempty_k_v_file}"
+
+	return 0
+}
+
+etc-vconsole.conf() {
+	claim-file /etc/vconsole.conf && return
+
+	use guess || return
+
+	#local vc_unicode="`parse_value unicode /etc/rc.conf`"
+	#local utf8="YES"
+	local vc_font="`parse_value consolefont /etc/conf.d/consolefont`"
+	local vc_font_map="`parse_value consoletranslation /etc/conf.d/consolefont`"
+	local vc_font_unimap="`parse_value unicodemap /etc/conf.d/consolefont`"
+	local vc_keymap="`parse_value keymap /etc/conf.d/keymaps`"
+	local vc_keymap_toggle="`parse_value keymap_toggle /etc/vconsole.conf`"
+
+	print-if-nonempty-k-v-new-file vconsole.conf
+	print-if-nonempty-k-v KEYMAP="$vc_keymap"
+	print-if-nonempty-k-v KEYMAP_TOGGLE="$vc_keymap_toggle"
+	print-if-nonempty-k-v FONT="$vc_font"
+	print-if-nonempty-k-v FONT_MAP="$vc_font_map"
+	print-if-nonempty-k-v FONT_UNIMAP="$vc_font_unimap"
+}
+
+etc-locale.conf() {
+	claim-file /etc/locale.conf && return
+
+	use guess || return
+
+	local fname=/etc/profile.env
+
+	print-if-nonempty-k-v-new-file locale.conf
+	for vn in LANG LC_CTYPE LC_NUMERIC LC_TIME LC_COLLATE LC_MONETARY \
+		LC_MESSAGES LC_PAPER LC_NAME LC_ADDRESS LC_TELEPHONE LC_MEASUREMENT \
+		LC_IDENTIFICATION; do
+		print-if-nonempty-k-v ${vn}="$(parse_value "export $vn" "${fname}")"
+	done
+}
+
+src_unpack() {
+	mkdir -p "${S}"
+}
+
+src_configure() {
+	etc-hostname && einfo "hostname"
+	etc-vconsole.conf && einfo "vconsole.conf"
+	etc-locale.conf && einfo "locale.conf"
+}
+
+src_install() {
+	insinto /etc
+	doins *
+}
-- 
cgit v1.2.3-65-gdbad