--- runit-2.1.2-r1.ebuild	2017-02-28 21:50:50.000000000 +0200
+++ runit-2.1.2-r1.ebuild	2017-03-06 06:57:27.409304328 +0200
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -49,7 +49,7 @@
 	einstalldocs
 	doman ../man/*.[18]
 
-dodir /etc/runit
+	dodir /etc/runit
 	exeinto /etc/runit
 	doexe "${FILESDIR}"/ctrlaltdel
 	newexe "${FILESDIR}"/1-${PV} 1
@@ -83,32 +83,30 @@
 			mv -f "${EROOT}"etc/sv "${EROOT}"etc/sv.bak || die
 			ewarn "${EROOT}etc/sv was moved to ${EROOT}etc/sv.bak"
 		fi
-		mv "${EROOT}"etc/runit/runsvdir/all "${EROOT}"etc/sv|| die
-		ln -sf "${EROOT}"etc/sv "${EROOT}"etc/runit/runsvdir/all || die
+		mv "${EROOT}"etc/runit/runsvdir/all "${EROOT}"etc/sv || die
+		ln -snf ../../sv "${EROOT}"etc/runit/runsvdir/all || die
 		cp -a "${EROOT}"etc/runit/runsvdir "${T}" || die
 		touch "${T}"/make_var_service || die
 	fi
+
+	if has_version '<sys-process/runit-2.1.2'; then
+		pre_212=yes
+	fi
 }
 
 default_config() {
-	local sv="${EROOT}"etc/sv
-	local service="${EROOT}"etc/service
-	mkdir -p "${service}" || die
-	for x in tty1 tty2 tty3 tty4 tty5 tty6; do
-	ln -sf "${sv}"/getty-$x "${service}"/getty-$x || die
-	done
-	einfo "The links to services runit will supervise are installed"
-	einfo "in $service."
-	einfo "If you need multiple runlevels, please see the documentation"
-	einfo "for how to set them up."
-	einfo
+	if [ ! -e "${EROOT}"etc/runit/runsvdir/current ]; then
+		mkdir -p "${EROOT}"etc/runit/runsvdir/default || die
+		ln -snf default "${EROOT}"etc/runit/runsvdir/current || die
+	fi
+	ln -snf runit/runsvdir/current "${EROOT}"etc/service || die
 }
 
 migrate_from_211() {
 	# Create /etc/service and /var/service if requested
 	if [ -e "${T}"/make_var_service ]; then
-		ln -sf "${EROOT}"etc/runit/runsvdir/current "${EROOT}"etc/service || die
-		ln -sf "${EROOT}"etc/runit/runsvdir/current "${EROOT}"var/service || die
+		ln -snf runit/runsvdir/current "${EROOT}"etc/service || die
+		ln -snf ../etc/runit/runsvdir/current "${EROOT}"var/service || die
 	fi
 	if [ -d "${T}"/runsvdir ]; then
 		cp -a "${T}"/runsvdir "${EROOT}"etc/runit || die
@@ -116,12 +114,6 @@
 	return 0
 }
 
-pkg_preinst() {
-	if  has_version '<sys-process/runit-2.1.2'; then
-		pre_212=yes
-	fi
-}
-
 pkg_postinst() {
 	if [[ -z $REPLACING_VERSIONS ]]; then
 		default_config
@@ -144,9 +136,9 @@
 
 	if [ -L "${EROOT}"etc/runit/runsvdir/all ]; then
 		ewarn "${EROOT}etc/runit/runsvdir/all has moved to"
-		iewarn "${EROOT}etc/sv."
+		ewarn "${EROOT}etc/sv."
 		ewarn "Any symbolic links under ${EROOT}etc/runit/runsvdir"
-		ewarn "which point to services through ../all should be updated to"
+		ewarn "which point to services through ${EROOT}etc/runit/runsvdir/all should be updated to"
 		ewarn "point to them through ${EROOT}etc/sv."
 		ewarn "Once that is done, ${EROOT}etc/runit/runsvdir/all should be"
 		ewarn "removed."