unify/robustify config file tweaking

Package-Manager: portage-2.2_rc42/cvs/Linux x86_64

3 files changed, 25 insertions, 11 deletions

diff --git a/sys-apps/openrc/Manifest b/sys-apps/openrc/Manifest
index cc1495fe1ba4..7f0a8540abeb 100644
--- a/sys-apps/openrc/Manifest
+++ b/sys-apps/openrc/Manifest
@@ -30,14 +30,14 @@ EBUILD openrc-0.4.3-r1.ebuild 10401 RMD160 441494782af660a954102d347411d0905d9f2
 EBUILD openrc-0.4.3-r2.ebuild 10556 RMD160 2335ae861e4dc0c24c7a4948cc468545b93e8591 SHA1 56eb224e8b1c87f29ec19ef71554497191314308 SHA256 034a3b67c861b1b75f2cff8b58f7e220ae3f30158962bf0d1cae1cca64f263b2
 EBUILD openrc-0.4.3-r3.ebuild 11091 RMD160 17312849980c51bd48814dca356356f828db5e46 SHA1 edd7bb544ca510e9494e29b4dd9376c6bf0e7c28 SHA256 19828a957f6436924faddc91a3bac76555d01f2a047cd07c19bdfd6cac6eca8e
 EBUILD openrc-0.4.3-r4.ebuild 11196 RMD160 534248be8b72b188c2183b84f7658d93e3b43a0f SHA1 ea7174eccc245368139f6315fd675c04c90b14ac SHA256 f67aa1cdd9638fbf86dd3b85c96b2fb71cc60d0905dfc42916707457d09c2347
-EBUILD openrc-0.5.1.ebuild 12083 RMD160 14ddc5e05b88eab0dd0a36b9486b6289562e2b39 SHA1 f814a8d710606e69bc7b49aa84590265e86dc514 SHA256 256c6dbcfd3b5d94fef53f054afad676838cb89e9985219220df53d34fd63f8c
-EBUILD openrc-9999.ebuild 11971 RMD160 4da953392a5d3af5aaf0bd42da326a2a1787dc97 SHA1 fcf3dd97de5295147b5ccae9b5a2883fc0598906 SHA256 df0f419284fad939f541d02608717bc7f4f5e6fbb25cd9aa8b5888cdd81d32eb
+EBUILD openrc-0.5.1.ebuild 12190 RMD160 f45059ea7e02099b381640549dd6d8a0213a88ff SHA1 66ef5742ffb6aec9a850acb593e669a613d968c6 SHA256 a17a730003177620429469d6e928f71dfac338feabcbd59bc5d148c1f960b4a6
+EBUILD openrc-9999.ebuild 12078 RMD160 e1411aa7408031ffb7d39cd3aedc523203f66aff SHA1 fed93c6aeb069b8f8569bad6b8c94ff7eb309cb5 SHA256 f60032142ca3184b5ed02585f775de8a95b8d7272646ca79a865662c870e7068
 MISC ChangeLog 16368 RMD160 1f163c7802c617bba5b23dea420ebf56373b5546 SHA1 7c9530b4259380e3a223267f28e2c23ba1a405b6 SHA256 5b886ca5f513adb1d8765cbf01a835c7fd0655af1cae8c77273817ce1552b45d
 MISC metadata.xml 444 RMD160 068acedd094c2c5d58ecea4302edac0aa557432d SHA1 1aa8416c0503ead5131df53ed806537d7d0a83fc SHA256 c451116d52c9d88299956b4227cb24ec2353b2e1dd2eba1c9c532a4d3df91778
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.11 (GNU/Linux)
 
-iEYEARECAAYFAkrVsEkACgkQlPl3HsVfCDpd4gCeKHfYuAm9iO+9d2hVquin+nqf
-olAAn3+dcDE30che2sREX1RUFYi38SB+
-=coKr
+iEYEARECAAYFAkrWcaEACgkQlPl3HsVfCDrdcQCcDDbhBjA/G3cNZZMFyNP6rrBN
+BdEAn1ecxAe0fjCVYATkUqA7vi8oMtLU
+=z6ur
 -----END PGP SIGNATURE-----
diff --git a/sys-apps/openrc/openrc-0.5.1.ebuild b/sys-apps/openrc/openrc-0.5.1.ebuild
index b1baa905e959..fd0637cee468 100644
--- a/sys-apps/openrc/openrc-0.5.1.ebuild
+++ b/sys-apps/openrc/openrc-0.5.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/openrc/openrc-0.5.1.ebuild,v 1.3 2009/10/14 11:04:35 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/openrc/openrc-0.5.1.ebuild,v 1.4 2009/10/15 00:49:31 vapier Exp $
 
 EAPI="1"
 
@@ -88,6 +88,13 @@ src_compile() {
 	emake ${MAKE_ARGS} || die "emake ${MAKE_ARGS} failed"
 }
 
+set_conf() {
+	local file="${D}/$1" var=$2 val=NO u
+	shift 2
+	for u ; do use $u && val=YES ; done
+	sed -i -r -e "/^#?${var}=/{s:=([\"'])?[^ ]*\1:=\1${val}\1:;s:^#::}" "${file}"
+}
+
 src_install() {
 	emake ${MAKE_ARGS} DESTDIR="${D}" install || die
 
@@ -106,10 +113,10 @@ src_install() {
 	mv "${D}/etc/runlevels" "${D}/usr/share/${PN}"
 
 	# Setup unicode defaults for silly unicode users
-	use unicode && sed -i -r -e '/^#?unicode=/s:NO:YES:' "${D}"/etc/rc.conf
+	set_conf /etc/rc.conf unicode unicode
 
 	# Cater to the norm
-	(use x86 || use amd64) && sed -i -e '/^windowkeys=/s:NO:YES:' "${D}"/etc/conf.d/keymaps
+	set_conf /etc/conf.d/keymaps windowkeys x86 amd64
 
 	# Support for logfile rotation
 	insinto /etc/logrotate.d
diff --git a/sys-apps/openrc/openrc-9999.ebuild b/sys-apps/openrc/openrc-9999.ebuild
index ef4e8cf930c9..1f054ecddc32 100644
--- a/sys-apps/openrc/openrc-9999.ebuild
+++ b/sys-apps/openrc/openrc-9999.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/openrc/openrc-9999.ebuild,v 1.53 2009/10/14 11:04:35 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/openrc/openrc-9999.ebuild,v 1.54 2009/10/15 00:49:31 vapier Exp $
 
 EAPI="1"
 
@@ -86,6 +86,13 @@ src_compile() {
 	emake ${MAKE_ARGS} || die "emake ${MAKE_ARGS} failed"
 }
 
+set_conf() {
+	local file="${D}/$1" var=$2 val=NO u
+	shift 2
+	for u ; do use $u && val=YES ; done
+	sed -i -r -e "/^#?${var}=/{s:=([\"'])?[^ ]*\1:=\1${val}\1:;s:^#::}" "${file}"
+}
+
 src_install() {
 	emake ${MAKE_ARGS} DESTDIR="${D}" install || die
 
@@ -104,10 +111,10 @@ src_install() {
 	mv "${D}/etc/runlevels" "${D}/usr/share/${PN}"
 
 	# Setup unicode defaults for silly unicode users
-	use unicode && sed -i -r -e '/^#?unicode=/s:NO:YES:' "${D}"/etc/rc.conf
+	set_conf /etc/rc.conf unicode unicode
 
 	# Cater to the norm
-	(use x86 || use amd64) && sed -i -e '/^windowkeys=/s:NO:YES:' "${D}"/etc/conf.d/keymaps
+	set_conf /etc/conf.d/keymaps windowkeys x86 amd64
 
 	# Support for logfile rotation
 	insinto /etc/logrotate.d