Index: baselayout-2.0.0.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-apps/baselayout/baselayout-2.0.0.ebuild,v
retrieving revision 1.2
diff -u -b -B -r1.2 baselayout-2.0.0.ebuild
--- baselayout-2.0.0.ebuild	8 Apr 2008 01:31:19 -0000	1.2
+++ baselayout-2.0.0.ebuild	17 Apr 2008 17:11:53 -0000
@@ -17,6 +17,13 @@
 PDEPEND="sys-apps/openrc"
 
 pkg_preinst() {
+	# Since the remap_dns_vars() called by pkg_preinst() of the baselayout-1.x
+	# ebuild copies all the real configs from the user's /etc/conf.d into
+	# ${D}, it makes them all appear to be the default versions. In order
+	# to protect them from being unmerged after this upgrade, modify their
+	# timestamps.
+	touch "${ROOT}"/etc/conf.d/*
+
 	# We need to install directories and maybe some dev nodes when building
 	# stages, but they cannot be in CONTENTS.
 	# Also, we cannot reference $S as binpkg will break so we do this.