From e5ff0d1f729392b6a4ac2e76a304091f857c79d2 Mon Sep 17 00:00:00 2001
From: V3n3RiX <venerix@redcorelinux.org>
Date: Sun, 29 Oct 2017 18:51:45 +0000
Subject: more revbumps for redcore 1710

---
 sys-apps/baselayout/baselayout-2.2-r1708.ebuild    | 262 ------------------
 sys-apps/baselayout/baselayout-2.2-r1710.ebuild    | 262 ++++++++++++++++++
 sys-apps/lsb-release/lsb-release-1.4-r1708.ebuild  |  41 ---
 sys-apps/lsb-release/lsb-release-1.4-r1710.ebuild  |  41 +++
 .../grub-config-redcore-1708-r2.ebuild             |  36 ---
 .../grub-config-redcore-1710.ebuild                |  36 +++
 sys-boot/grub/grub-2.02-r1708.ebuild               | 296 ---------------------
 sys-boot/grub/grub-2.02-r1710.ebuild               | 296 +++++++++++++++++++++
 .../bbswitch-dkms/bbswitch-dkms-0.8-r1708.ebuild   |  45 ----
 .../bbswitch-dkms/bbswitch-dkms-0.8-r1710.ebuild   |  45 ++++
 .../broadcom-sta-dkms-6.30.223.271-r1708.ebuild    |  58 ----
 .../broadcom-sta-dkms-6.30.223.271-r1710.ebuild    |  58 ++++
 .../dracut-config-redcore-1708-r2.ebuild           |  36 ---
 .../dracut-config-redcore-1710.ebuild              |  36 +++
 sys-kernel/dracut/dracut-044-r1708.ebuild          | 272 -------------------
 sys-kernel/dracut/dracut-044-r1710.ebuild          | 272 +++++++++++++++++++
 sys-kernel/vhba-dkms/files/dkms.conf               |   2 +-
 .../vhba-dkms/vhba-dkms-20170610-r1708.ebuild      |  46 ----
 .../vhba-dkms/vhba-dkms-20170610-r1710.ebuild      |  46 ++++
 sys-power/bbswitch/bbswitch-0.8-r1708.ebuild       |  24 --
 sys-power/bbswitch/bbswitch-0.8-r1710.ebuild       |  24 ++
 21 files changed, 1117 insertions(+), 1117 deletions(-)
 delete mode 100644 sys-apps/baselayout/baselayout-2.2-r1708.ebuild
 create mode 100644 sys-apps/baselayout/baselayout-2.2-r1710.ebuild
 delete mode 100644 sys-apps/lsb-release/lsb-release-1.4-r1708.ebuild
 create mode 100644 sys-apps/lsb-release/lsb-release-1.4-r1710.ebuild
 delete mode 100644 sys-boot/grub-config-redcore/grub-config-redcore-1708-r2.ebuild
 create mode 100644 sys-boot/grub-config-redcore/grub-config-redcore-1710.ebuild
 delete mode 100644 sys-boot/grub/grub-2.02-r1708.ebuild
 create mode 100644 sys-boot/grub/grub-2.02-r1710.ebuild
 delete mode 100644 sys-kernel/bbswitch-dkms/bbswitch-dkms-0.8-r1708.ebuild
 create mode 100644 sys-kernel/bbswitch-dkms/bbswitch-dkms-0.8-r1710.ebuild
 delete mode 100644 sys-kernel/broadcom-sta-dkms/broadcom-sta-dkms-6.30.223.271-r1708.ebuild
 create mode 100644 sys-kernel/broadcom-sta-dkms/broadcom-sta-dkms-6.30.223.271-r1710.ebuild
 delete mode 100644 sys-kernel/dracut-config-redcore/dracut-config-redcore-1708-r2.ebuild
 create mode 100644 sys-kernel/dracut-config-redcore/dracut-config-redcore-1710.ebuild
 delete mode 100644 sys-kernel/dracut/dracut-044-r1708.ebuild
 create mode 100644 sys-kernel/dracut/dracut-044-r1710.ebuild
 delete mode 100644 sys-kernel/vhba-dkms/vhba-dkms-20170610-r1708.ebuild
 create mode 100644 sys-kernel/vhba-dkms/vhba-dkms-20170610-r1710.ebuild
 delete mode 100644 sys-power/bbswitch/bbswitch-0.8-r1708.ebuild
 create mode 100644 sys-power/bbswitch/bbswitch-0.8-r1710.ebuild

diff --git a/sys-apps/baselayout/baselayout-2.2-r1708.ebuild b/sys-apps/baselayout/baselayout-2.2-r1708.ebuild
deleted file mode 100644
index 0b096e7a..00000000
--- a/sys-apps/baselayout/baselayout-2.2-r1708.ebuild
+++ /dev/null
@@ -1,262 +0,0 @@
-# Copyright 1999-2012 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.2 2012/08/23 21:47:35 vapier Exp $
-
-inherit eutils multilib
-
-DESCRIPTION="Filesystem baselayout and init scripts"
-HOMEPAGE="http://www.gentoo.org/"
-SRC_URI="mirror://gentoo/${P}.tar.bz2
-	http://dev.gentoo.org/~vapier/dist/${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"
-
-pkg_setup() {
-	multilib_layout
-}
-
-# Create our multilib dirs - the Makefile has no knowledge of this
-multilib_warn() {
-	local syms=$1 dirs=$2 def_libdir=$3
-
-	[ -z "${syms}${dirs}" ] && return
-
-	ewarn "Your system profile has SYMLINK_LIB=${SYMLINK_LIB}, so that means"
-	if [ -z "${syms}" ] ; then
-		ewarn "you need to have these paths as symlinks to ${def_libdir}:"
-		ewarn "$1"
-	fi
-}
-multilib_layout() {
-	local libdir libdirs=$(get_all_libdirs) def_libdir=$(get_abi_LIBDIR $DEFAULT_ABI)
-	: ${libdirs:=lib}	# it isn't that we don't trust multilib.eclass...
-
-	[ -z "${def_libdir}" ] && die "your DEFAULT_ABI=$DEFAULT_ABI appears to be invalid"
-
-	# figure out which paths should be symlinks and which should be directories
-	local dirs syms exp d
-	for libdir in ${libdirs} ; do
-		exp=( {,usr/,usr/local/}${libdir} )
-		for d in "${exp[@]/#/${ROOT}}" ; do
-			# most things should be dirs
-			if [ "${SYMLINK_LIB}" = "yes" ] && [ "${libdir}" = "lib" ] ; then
-				[ ! -h "${d}" ] && [ -e "${d}" ] && dirs+=" ${d}"
-			else
-				[ -h "${d}" ] && syms+=" ${d}"
-			fi
-		done
-	done
-	if [ -n "${syms}${dirs}" ] ; then
-		ewarn "Your system profile has SYMLINK_LIB=${SYMLINK_LIB:-no}, so that means you need to"
-		ewarn "have these paths configured as follows:"
-		[ -n "${dirs}" ] && ewarn "symlinks to '${def_libdir}':${dirs}"
-		[ -n "${syms}" ] && ewarn "directories:${syms}"
-		ewarn "The ebuild will attempt to fix these, but only for trivial conversions."
-		ewarn "If things fail, you will need to manually create/move the directories."
-		echo
-	fi
-
-	# setup symlinks and dirs where we expect them to be; do not migrate
-	# data ... just fall over in that case.
-	local prefix
-	for prefix in "${ROOT}"{,usr/,usr/local/} ; do
-		if [ "${SYMLINK_LIB}" = yes ] ; then
-			# we need to make sure "lib" points to the native libdir
-			if [ -h "${prefix}lib" ] ; then
-				# it's already a symlink!  assume it's pointing to right place ...
-				continue
-			elif [ -d "${prefix}lib" ] ; then
-				# "lib" is a dir, so need to convert to a symlink
-				ewarn "Converting ${prefix}lib from a dir to a symlink"
-				rm -f "${prefix}lib"/.keep
-				if rmdir "${prefix}lib" 2>/dev/null ; then
-					ln -s ${def_libdir} "${prefix}lib" || die
-				else
-					die "non-empty dir found where we needed a symlink: ${prefix}lib"
-				fi
-			else
-				# nothing exists, so just set it up sanely
-				ewarn "Initializing ${prefix}lib as a symlink"
-				mkdir -p "${prefix}" || die
-				rm -f "${prefix}lib" || die
-				ln -s ${def_libdir} "${prefix}lib" || die
-				mkdir -p "${prefix}${def_libdir}" #423571
-			fi
-		else
-			# we need to make sure "lib" is a dir
-			if [ -h "${prefix}lib" ] ; then
-				# "lib" is a symlink, so need to convert to a dir
-				ewarn "Converting ${prefix}lib from a symlink to a dir"
-				rm -f "${prefix}lib" || die
-				if [ -d "${prefix}lib32" ] ; then
-					ewarn "Migrating ${prefix}lib32 to ${prefix}lib"
-					mv "${prefix}lib32" "${prefix}lib" || die
-				else
-					mkdir -p "${prefix}lib" || die
-				fi
-			elif [ -d "${prefix}lib" ] ; then
-				# make sure the old "lib" ABI location does not exist; we
-				# only symlinked the lib dir on systems where we moved it
-				# to "lib32" ...
-				case ${CHOST} in
-				i?86*|x86_64*|powerpc*|sparc*|s390*)
-					if [ -d "${prefix}lib32" ] ; then
-						rm -f "${prefix}lib32"/.keep
-						if ! rmdir "${prefix}lib32" 2>/dev/null ; then
-							ewarn "You need to merge ${prefix}lib32 into ${prefix}lib"
-							die "non-empty dir found where there should be none: ${prefix}lib32"
-						fi
-					fi
-					;;
-				esac
-			else
-				# nothing exists, so just set it up sanely
-				ewarn "Initializing ${prefix}lib as a dir"
-				mkdir -p "${prefix}" || die
-				rm -f "${prefix}lib" || die
-				ln -s ${def_libdir} "${prefix}lib" || die
-			fi
-		fi
-	done
-}
-
-pkg_preinst() {
-	# Bug #217848 - 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/* 2>/dev/null
-
-	# This is written in src_install (so it's in CONTENTS), but punt all
-	# pending updates to avoid user having to do etc-update (and make the
-	# pkg_postinst logic simpler).
-	rm -f "${ROOT}"/etc/._cfg????_gentoo-release
-
-	# 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.
-	multilib_layout
-	if use build ; then
-		emake -C "${D}/usr/share/${PN}" DESTDIR="${ROOT}" layout || die
-	fi
-	rm -f "${D}"/usr/share/${PN}/Makefile
-
-	# Kogaion customization, protect /etc/hosts from removal (from older ebuilds)
-	local etc_hosts="${ROOT}/etc/hosts"
-	if [ -e "${etc_hosts}" ]; then
-		cp -p "${etc_hosts}" "${etc_hosts}.baselayout_ebuild_backup" # don't die
-	fi
-}
-
-src_unpack() {
-	unpack ${A}
-
-	cd "${S}"
-	epatch "${FILESDIR}/${PN}-redcore.patch"
-}
-
-src_install() {
-	# Setup /run directory, this is missing from original baselayout
-	dodir /run
-
-	emake \
-		OS=$(usex kernel_FreeBSD BSD Linux) \
-		DESTDIR="${D}" \
-		install || die
-	dodoc ChangeLog.svn
-
-	# need the makefile in pkg_preinst
-	insinto /usr/share/${PN}
-	doins Makefile || die
-
-	# handle multilib paths.  do it here because we want this behavior
-	# regardless of the C library that you're using.  we do explicitly
-	# list paths which the native ldconfig searches, but this isn't
-	# problematic as it doesn't change the resulting ld.so.cache or
-	# take longer to generate.  similarly, listing both the native
-	# path and the symlinked path doesn't change the resulting cache.
-	local libdir ldpaths
-	for libdir in $(get_all_libdirs) ; do
-		ldpaths+=":/${libdir}:/usr/${libdir}:/usr/local/${libdir}"
-	done
-	echo "LDPATH='${ldpaths#:}'" >> "${D}"/etc/env.d/00basic
-
-	# rc-scripts version for testing of features that *should* be present
-	echo "Redcore Linux 1708 - Gamma Crucis" > "${D}"/etc/gentoo-release
-
-	# Sabayon customization, install /etc/hosts separately (to .example)
-	mv "${D}"/etc/hosts "${D}"/etc/hosts.example || die "cannot move /etc/hosts"
-
-}
-
-pkg_postinst() {
-	local x
-
-	# We installed some files to /usr/share/baselayout instead of /etc to stop
-	# (1) overwriting the user's settings
-	# (2) screwing things up when attempting to merge files
-	# (3) accidentally packaging up personal files with quickpkg
-	# If they don't exist then we install them
-	for x in master.passwd passwd shadow group fstab ; do
-		[ -e "${ROOT}etc/${x}" ] && continue
-		[ -e "${ROOT}usr/share/baselayout/${x}" ] || continue
-		cp -p "${ROOT}usr/share/baselayout/${x}" "${ROOT}"etc
-	done
-
-	# Force shadow permissions to not be world-readable #260993
-	for x in shadow ; do
-		[ -e "${ROOT}etc/${x}" ] && chmod o-rwx "${ROOT}etc/${x}"
-	done
-
-	# Take care of the etc-update for the user
-	if [ -e "${ROOT}"/etc/._cfg0000_gentoo-release ] ; then
-		mv "${ROOT}"/etc/._cfg0000_gentoo-release "${ROOT}"/etc/gentoo-release
-	fi
-
-	# whine about users that lack passwords #193541
-	if [[ -e ${ROOT}/etc/shadow ]] ; then
-		local bad_users=$(sed -n '/^[^:]*::/s|^\([^:]*\)::.*|\1|p' "${ROOT}"/etc/shadow)
-		if [[ -n ${bad_users} ]] ; then
-			echo
-			ewarn "The following users lack passwords!"
-			ewarn ${bad_users}
-		fi
-	fi
-
-	# baselayout leaves behind a lot of .keep files, so let's clean them up
-	find "${ROOT}"/lib*/rcscripts/ -name .keep -exec rm -f {} + 2>/dev/null
-	find "${ROOT}"/lib*/rcscripts/ -depth -type d -exec rmdir {} + 2>/dev/null
-
-	# whine about users with invalid shells #215698
-	if [[ -e ${ROOT}/etc/passwd ]] ; then
-		local bad_shells=$(awk -F: 'system("test -e " $7) { print $1 " - " $7}' /etc/passwd | sort)
-		if [[ -n ${bad_shells} ]] ; then
-			echo
-			ewarn "The following users have non-existent shells!"
-			ewarn "${bad_shells}"
-		fi
-	fi
-
-	# Sabayon customization, copy /etc/hosts back in place if it doesn't exist
-	local etc_hosts="${ROOT}/etc/hosts"
-	if [ -e "${etc_hosts}.baselayout_ebuild_backup" ]; then
-		cp -p "${etc_hosts}.baselayout_ebuild_backup" "${etc_hosts}" # don't die
-	elif [ ! -e "${etc_hosts}" ]; then
-		cp -p "${etc_hosts}.example" "${etc_hosts}" # don't die
-	fi
-	chown root:root "${etc_hosts}" # don't die
-
-	# http://bugs.gentoo.org/361349
-	if use kernel_linux; then
-		mkdir -p "${ROOT}"/run
-
-		if ! grep -qs "^tmpfs.*/run " "${ROOT}"/proc/mounts ; then
-			echo
-			ewarn "You should reboot the system now to get /run mounted with tmpfs!"
-		fi
-	fi
-}
diff --git a/sys-apps/baselayout/baselayout-2.2-r1710.ebuild b/sys-apps/baselayout/baselayout-2.2-r1710.ebuild
new file mode 100644
index 00000000..2817045c
--- /dev/null
+++ b/sys-apps/baselayout/baselayout-2.2-r1710.ebuild
@@ -0,0 +1,262 @@
+# Copyright 1999-2012 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.2 2012/08/23 21:47:35 vapier Exp $
+
+inherit eutils multilib
+
+DESCRIPTION="Filesystem baselayout and init scripts"
+HOMEPAGE="http://www.gentoo.org/"
+SRC_URI="mirror://gentoo/${P}.tar.bz2
+	http://dev.gentoo.org/~vapier/dist/${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"
+
+pkg_setup() {
+	multilib_layout
+}
+
+# Create our multilib dirs - the Makefile has no knowledge of this
+multilib_warn() {
+	local syms=$1 dirs=$2 def_libdir=$3
+
+	[ -z "${syms}${dirs}" ] && return
+
+	ewarn "Your system profile has SYMLINK_LIB=${SYMLINK_LIB}, so that means"
+	if [ -z "${syms}" ] ; then
+		ewarn "you need to have these paths as symlinks to ${def_libdir}:"
+		ewarn "$1"
+	fi
+}
+multilib_layout() {
+	local libdir libdirs=$(get_all_libdirs) def_libdir=$(get_abi_LIBDIR $DEFAULT_ABI)
+	: ${libdirs:=lib}	# it isn't that we don't trust multilib.eclass...
+
+	[ -z "${def_libdir}" ] && die "your DEFAULT_ABI=$DEFAULT_ABI appears to be invalid"
+
+	# figure out which paths should be symlinks and which should be directories
+	local dirs syms exp d
+	for libdir in ${libdirs} ; do
+		exp=( {,usr/,usr/local/}${libdir} )
+		for d in "${exp[@]/#/${ROOT}}" ; do
+			# most things should be dirs
+			if [ "${SYMLINK_LIB}" = "yes" ] && [ "${libdir}" = "lib" ] ; then
+				[ ! -h "${d}" ] && [ -e "${d}" ] && dirs+=" ${d}"
+			else
+				[ -h "${d}" ] && syms+=" ${d}"
+			fi
+		done
+	done
+	if [ -n "${syms}${dirs}" ] ; then
+		ewarn "Your system profile has SYMLINK_LIB=${SYMLINK_LIB:-no}, so that means you need to"
+		ewarn "have these paths configured as follows:"
+		[ -n "${dirs}" ] && ewarn "symlinks to '${def_libdir}':${dirs}"
+		[ -n "${syms}" ] && ewarn "directories:${syms}"
+		ewarn "The ebuild will attempt to fix these, but only for trivial conversions."
+		ewarn "If things fail, you will need to manually create/move the directories."
+		echo
+	fi
+
+	# setup symlinks and dirs where we expect them to be; do not migrate
+	# data ... just fall over in that case.
+	local prefix
+	for prefix in "${ROOT}"{,usr/,usr/local/} ; do
+		if [ "${SYMLINK_LIB}" = yes ] ; then
+			# we need to make sure "lib" points to the native libdir
+			if [ -h "${prefix}lib" ] ; then
+				# it's already a symlink!  assume it's pointing to right place ...
+				continue
+			elif [ -d "${prefix}lib" ] ; then
+				# "lib" is a dir, so need to convert to a symlink
+				ewarn "Converting ${prefix}lib from a dir to a symlink"
+				rm -f "${prefix}lib"/.keep
+				if rmdir "${prefix}lib" 2>/dev/null ; then
+					ln -s ${def_libdir} "${prefix}lib" || die
+				else
+					die "non-empty dir found where we needed a symlink: ${prefix}lib"
+				fi
+			else
+				# nothing exists, so just set it up sanely
+				ewarn "Initializing ${prefix}lib as a symlink"
+				mkdir -p "${prefix}" || die
+				rm -f "${prefix}lib" || die
+				ln -s ${def_libdir} "${prefix}lib" || die
+				mkdir -p "${prefix}${def_libdir}" #423571
+			fi
+		else
+			# we need to make sure "lib" is a dir
+			if [ -h "${prefix}lib" ] ; then
+				# "lib" is a symlink, so need to convert to a dir
+				ewarn "Converting ${prefix}lib from a symlink to a dir"
+				rm -f "${prefix}lib" || die
+				if [ -d "${prefix}lib32" ] ; then
+					ewarn "Migrating ${prefix}lib32 to ${prefix}lib"
+					mv "${prefix}lib32" "${prefix}lib" || die
+				else
+					mkdir -p "${prefix}lib" || die
+				fi
+			elif [ -d "${prefix}lib" ] ; then
+				# make sure the old "lib" ABI location does not exist; we
+				# only symlinked the lib dir on systems where we moved it
+				# to "lib32" ...
+				case ${CHOST} in
+				i?86*|x86_64*|powerpc*|sparc*|s390*)
+					if [ -d "${prefix}lib32" ] ; then
+						rm -f "${prefix}lib32"/.keep
+						if ! rmdir "${prefix}lib32" 2>/dev/null ; then
+							ewarn "You need to merge ${prefix}lib32 into ${prefix}lib"
+							die "non-empty dir found where there should be none: ${prefix}lib32"
+						fi
+					fi
+					;;
+				esac
+			else
+				# nothing exists, so just set it up sanely
+				ewarn "Initializing ${prefix}lib as a dir"
+				mkdir -p "${prefix}" || die
+				rm -f "${prefix}lib" || die
+				ln -s ${def_libdir} "${prefix}lib" || die
+			fi
+		fi
+	done
+}
+
+pkg_preinst() {
+	# Bug #217848 - 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/* 2>/dev/null
+
+	# This is written in src_install (so it's in CONTENTS), but punt all
+	# pending updates to avoid user having to do etc-update (and make the
+	# pkg_postinst logic simpler).
+	rm -f "${ROOT}"/etc/._cfg????_gentoo-release
+
+	# 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.
+	multilib_layout
+	if use build ; then
+		emake -C "${D}/usr/share/${PN}" DESTDIR="${ROOT}" layout || die
+	fi
+	rm -f "${D}"/usr/share/${PN}/Makefile
+
+	# Kogaion customization, protect /etc/hosts from removal (from older ebuilds)
+	local etc_hosts="${ROOT}/etc/hosts"
+	if [ -e "${etc_hosts}" ]; then
+		cp -p "${etc_hosts}" "${etc_hosts}.baselayout_ebuild_backup" # don't die
+	fi
+}
+
+src_unpack() {
+	unpack ${A}
+
+	cd "${S}"
+	epatch "${FILESDIR}/${PN}-redcore.patch"
+}
+
+src_install() {
+	# Setup /run directory, this is missing from original baselayout
+	dodir /run
+
+	emake \
+		OS=$(usex kernel_FreeBSD BSD Linux) \
+		DESTDIR="${D}" \
+		install || die
+	dodoc ChangeLog.svn
+
+	# need the makefile in pkg_preinst
+	insinto /usr/share/${PN}
+	doins Makefile || die
+
+	# handle multilib paths.  do it here because we want this behavior
+	# regardless of the C library that you're using.  we do explicitly
+	# list paths which the native ldconfig searches, but this isn't
+	# problematic as it doesn't change the resulting ld.so.cache or
+	# take longer to generate.  similarly, listing both the native
+	# path and the symlinked path doesn't change the resulting cache.
+	local libdir ldpaths
+	for libdir in $(get_all_libdirs) ; do
+		ldpaths+=":/${libdir}:/usr/${libdir}:/usr/local/${libdir}"
+	done
+	echo "LDPATH='${ldpaths#:}'" >> "${D}"/etc/env.d/00basic
+
+	# rc-scripts version for testing of features that *should* be present
+	echo "Redcore Linux 1710 - Helvetios" > "${D}"/etc/gentoo-release
+
+	# Sabayon customization, install /etc/hosts separately (to .example)
+	mv "${D}"/etc/hosts "${D}"/etc/hosts.example || die "cannot move /etc/hosts"
+
+}
+
+pkg_postinst() {
+	local x
+
+	# We installed some files to /usr/share/baselayout instead of /etc to stop
+	# (1) overwriting the user's settings
+	# (2) screwing things up when attempting to merge files
+	# (3) accidentally packaging up personal files with quickpkg
+	# If they don't exist then we install them
+	for x in master.passwd passwd shadow group fstab ; do
+		[ -e "${ROOT}etc/${x}" ] && continue
+		[ -e "${ROOT}usr/share/baselayout/${x}" ] || continue
+		cp -p "${ROOT}usr/share/baselayout/${x}" "${ROOT}"etc
+	done
+
+	# Force shadow permissions to not be world-readable #260993
+	for x in shadow ; do
+		[ -e "${ROOT}etc/${x}" ] && chmod o-rwx "${ROOT}etc/${x}"
+	done
+
+	# Take care of the etc-update for the user
+	if [ -e "${ROOT}"/etc/._cfg0000_gentoo-release ] ; then
+		mv "${ROOT}"/etc/._cfg0000_gentoo-release "${ROOT}"/etc/gentoo-release
+	fi
+
+	# whine about users that lack passwords #193541
+	if [[ -e ${ROOT}/etc/shadow ]] ; then
+		local bad_users=$(sed -n '/^[^:]*::/s|^\([^:]*\)::.*|\1|p' "${ROOT}"/etc/shadow)
+		if [[ -n ${bad_users} ]] ; then
+			echo
+			ewarn "The following users lack passwords!"
+			ewarn ${bad_users}
+		fi
+	fi
+
+	# baselayout leaves behind a lot of .keep files, so let's clean them up
+	find "${ROOT}"/lib*/rcscripts/ -name .keep -exec rm -f {} + 2>/dev/null
+	find "${ROOT}"/lib*/rcscripts/ -depth -type d -exec rmdir {} + 2>/dev/null
+
+	# whine about users with invalid shells #215698
+	if [[ -e ${ROOT}/etc/passwd ]] ; then
+		local bad_shells=$(awk -F: 'system("test -e " $7) { print $1 " - " $7}' /etc/passwd | sort)
+		if [[ -n ${bad_shells} ]] ; then
+			echo
+			ewarn "The following users have non-existent shells!"
+			ewarn "${bad_shells}"
+		fi
+	fi
+
+	# Sabayon customization, copy /etc/hosts back in place if it doesn't exist
+	local etc_hosts="${ROOT}/etc/hosts"
+	if [ -e "${etc_hosts}.baselayout_ebuild_backup" ]; then
+		cp -p "${etc_hosts}.baselayout_ebuild_backup" "${etc_hosts}" # don't die
+	elif [ ! -e "${etc_hosts}" ]; then
+		cp -p "${etc_hosts}.example" "${etc_hosts}" # don't die
+	fi
+	chown root:root "${etc_hosts}" # don't die
+
+	# http://bugs.gentoo.org/361349
+	if use kernel_linux; then
+		mkdir -p "${ROOT}"/run
+
+		if ! grep -qs "^tmpfs.*/run " "${ROOT}"/proc/mounts ; then
+			echo
+			ewarn "You should reboot the system now to get /run mounted with tmpfs!"
+		fi
+	fi
+}
diff --git a/sys-apps/lsb-release/lsb-release-1.4-r1708.ebuild b/sys-apps/lsb-release/lsb-release-1.4-r1708.ebuild
deleted file mode 100644
index 2ced1f05..00000000
--- a/sys-apps/lsb-release/lsb-release-1.4-r1708.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2013 Sabayon
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-inherit eutils
-
-DESCRIPTION="LSB version query program"
-HOMEPAGE="http://www.linuxbase.org/"
-SRC_URI="mirror://sourceforge/lsb/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86"
-IUSE=""
-
-# Perl isn't needed at runtime, it is just used to generate the man page.
-DEPEND="dev-lang/perl"
-RDEPEND=""
-
-src_unpack() {
-	unpack ${A}
-
-	cd "${S}"
-	epatch "${FILESDIR}/${PN}-redcore-version.patch"
-}
-
-src_install() {
-	emake \
-		prefix="${D}/usr" \
-		mandir="${D}/usr/share/man" \
-		install \
-		|| die "emake install failed"
-
-	mkdir -p "${D}/etc"
-	cat > "${D}/etc/lsb-release" <<- EOF
-		DISTRIB_ID="Redcore"
-		DISTRIB_RELEASE="1708"
-		DISTRIB_CODENAME="Gamma Crucis"
-		DISTRIB_DESCRIPTION="Redcore 1708 Gamma Crucis"
-	EOF
-}
diff --git a/sys-apps/lsb-release/lsb-release-1.4-r1710.ebuild b/sys-apps/lsb-release/lsb-release-1.4-r1710.ebuild
new file mode 100644
index 00000000..c10f2071
--- /dev/null
+++ b/sys-apps/lsb-release/lsb-release-1.4-r1710.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2013 Sabayon
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+inherit eutils
+
+DESCRIPTION="LSB version query program"
+HOMEPAGE="http://www.linuxbase.org/"
+SRC_URI="mirror://sourceforge/lsb/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86"
+IUSE=""
+
+# Perl isn't needed at runtime, it is just used to generate the man page.
+DEPEND="dev-lang/perl"
+RDEPEND=""
+
+src_unpack() {
+	unpack ${A}
+
+	cd "${S}"
+	epatch "${FILESDIR}/${PN}-redcore-version.patch"
+}
+
+src_install() {
+	emake \
+		prefix="${D}/usr" \
+		mandir="${D}/usr/share/man" \
+		install \
+		|| die "emake install failed"
+
+	mkdir -p "${D}/etc"
+	cat > "${D}/etc/lsb-release" <<- EOF
+		DISTRIB_ID="Redcore"
+		DISTRIB_RELEASE="1710"
+		DISTRIB_CODENAME="Helvetios"
+		DISTRIB_DESCRIPTION="Redcore 1710 Helvetios"
+	EOF
+}
diff --git a/sys-boot/grub-config-redcore/grub-config-redcore-1708-r2.ebuild b/sys-boot/grub-config-redcore/grub-config-redcore-1708-r2.ebuild
deleted file mode 100644
index b40fa95e..00000000
--- a/sys-boot/grub-config-redcore/grub-config-redcore-1708-r2.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=5
-
-DESCRIPTION="Redcore Linux GRUB configuration files"
-HOMEPAGE=""
-SRC_URI=""
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RDEPEND="sys-boot/grub"
-
-S="${FILESDIR}"
-
-src_install() {
-	dodir "/etc/default" || die
-	insinto "/etc/default" || die
-	doins -r "${S}/"* || die
-}
-
-pkg_preinst() {
-	if [[ -f ""${ROOT}"etc/default/grub" ]]; then
-		cp -avx ""${ROOT}"etc/default/grub" ""${ROOT}"etc/default/grub.backup"
-	fi
-}
-
-pkg_postinst() {
-	elog "Your previous GRUB configuration was saved as /etc/default/grub.backup"
-	elog "Please adjust the new configuration to suit you and regenerate the GRUB menu"
-	elog "by using : /usr/sbin/grub2-mkconfig -o /boot/grub/grub.cfg"
-}
diff --git a/sys-boot/grub-config-redcore/grub-config-redcore-1710.ebuild b/sys-boot/grub-config-redcore/grub-config-redcore-1710.ebuild
new file mode 100644
index 00000000..b40fa95e
--- /dev/null
+++ b/sys-boot/grub-config-redcore/grub-config-redcore-1710.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=5
+
+DESCRIPTION="Redcore Linux GRUB configuration files"
+HOMEPAGE=""
+SRC_URI=""
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE=""
+
+RDEPEND="sys-boot/grub"
+
+S="${FILESDIR}"
+
+src_install() {
+	dodir "/etc/default" || die
+	insinto "/etc/default" || die
+	doins -r "${S}/"* || die
+}
+
+pkg_preinst() {
+	if [[ -f ""${ROOT}"etc/default/grub" ]]; then
+		cp -avx ""${ROOT}"etc/default/grub" ""${ROOT}"etc/default/grub.backup"
+	fi
+}
+
+pkg_postinst() {
+	elog "Your previous GRUB configuration was saved as /etc/default/grub.backup"
+	elog "Please adjust the new configuration to suit you and regenerate the GRUB menu"
+	elog "by using : /usr/sbin/grub2-mkconfig -o /boot/grub/grub.cfg"
+}
diff --git a/sys-boot/grub/grub-2.02-r1708.ebuild b/sys-boot/grub/grub-2.02-r1708.ebuild
deleted file mode 100644
index dacfc3d5..00000000
--- a/sys-boot/grub/grub-2.02-r1708.ebuild
+++ /dev/null
@@ -1,296 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-if [[ ${PV} == 9999  ]]; then
-	GRUB_AUTOGEN=1
-fi
-
-if [[ -n ${GRUB_AUTOGEN} ]]; then
-	PYTHON_COMPAT=( python{2_7,3_3,3_4,3_5} )
-	WANT_LIBTOOL=none
-	inherit autotools python-any-r1
-fi
-
-inherit autotools bash-completion-r1 flag-o-matic multibuild pax-utils toolchain-funcs versionator
-
-if [[ ${PV} != 9999 ]]; then
-	if [[ ${PV} == *_alpha* || ${PV} == *_beta* || ${PV} == *_rc* ]]; then
-		# The quote style is to work with <=bash-4.2 and >=bash-4.3 #503860
-		MY_P=${P/_/'~'}
-		SRC_URI="mirror://gnu-alpha/${PN}/${MY_P}.tar.xz"
-		S=${WORKDIR}/${MY_P}
-	else
-		SRC_URI="mirror://gnu/${PN}/${P}.tar.xz"
-		S=${WORKDIR}/${P%_*}
-	fi
-	KEYWORDS="amd64 ~arm64 x86"
-else
-	inherit git-r3
-	EGIT_REPO_URI="git://git.sv.gnu.org/grub.git
-		http://git.savannah.gnu.org/r/grub.git"
-fi
-
-PATCHES=(
-	"${FILESDIR}"/gfxpayload.patch
-	"${FILESDIR}"/grub-2.02_beta2-KERNEL_GLOBS.patch
-)
-
-DEJAVU=dejavu-sans-ttf-2.37
-UNIFONT=unifont-9.0.06
-SRC_URI+=" fonts? ( mirror://gnu/unifont/${UNIFONT}/${UNIFONT}.pcf.gz )
-	themes? ( mirror://sourceforge/dejavu/${DEJAVU}.zip )"
-
-DESCRIPTION="GNU GRUB boot loader"
-HOMEPAGE="https://www.gnu.org/software/grub/"
-
-# Includes licenses for dejavu and unifont
-LICENSE="GPL-3 fonts? ( GPL-2-with-font-exception ) themes? ( BitstreamVera )"
-SLOT="2/${PVR}"
-IUSE="debug device-mapper doc efiemu +fonts mount multislot nls static sdl test +themes truetype libzfs"
-
-GRUB_ALL_PLATFORMS=( coreboot efi-32 efi-64 emu ieee1275 loongson multiboot qemu qemu-mips pc uboot xen xen-32 )
-IUSE+=" ${GRUB_ALL_PLATFORMS[@]/#/grub_platforms_}"
-
-REQUIRED_USE="
-	grub_platforms_coreboot? ( fonts )
-	grub_platforms_qemu? ( fonts )
-	grub_platforms_ieee1275? ( fonts )
-	grub_platforms_loongson? ( fonts )
-"
-
-# os-prober: Used on runtime to detect other OSes
-# xorriso (dev-libs/libisoburn): Used on runtime for mkrescue
-RDEPEND="
-	app-arch/xz-utils
-	>=sys-libs/ncurses-5.2-r5:0=
-	debug? (
-		sdl? ( media-libs/libsdl )
-	)
-	device-mapper? ( >=sys-fs/lvm2-2.02.45 )
-	libzfs? ( sys-fs/zfs )
-	mount? ( sys-fs/fuse )
-	truetype? ( media-libs/freetype:2= )
-	ppc? ( sys-apps/ibm-powerpc-utils sys-apps/powerpc-utils )
-	ppc64? ( sys-apps/ibm-powerpc-utils sys-apps/powerpc-utils )
-"
-DEPEND="${RDEPEND}
-	${PYTHON_DEPS}
-	app-misc/pax-utils
-	sys-devel/flex
-	sys-devel/bison
-	sys-apps/help2man
-	sys-apps/texinfo
-	sys-boot/grub-config-redcore
-	fonts? ( media-libs/freetype:2 )
-	grub_platforms_xen? ( app-emulation/xen-tools:= )
-	grub_platforms_xen-32? ( app-emulation/xen-tools:= )
-	static? (
-		app-arch/xz-utils[static-libs(+)]
-		truetype? (
-			app-arch/bzip2[static-libs(+)]
-			media-libs/freetype[static-libs(+)]
-			sys-libs/zlib[static-libs(+)]
-		)
-	)
-	test? (
-		app-admin/genromfs
-		app-arch/cpio
-		app-arch/lzop
-		app-emulation/qemu
-		dev-libs/libisoburn
-		sys-apps/miscfiles
-		sys-block/parted
-		sys-fs/squashfs-tools
-	)
-	themes? (
-		app-arch/unzip
-		media-libs/freetype:2
-	)
-"
-RDEPEND+="
-	kernel_linux? (
-		grub_platforms_efi-32? ( sys-boot/efibootmgr )
-		grub_platforms_efi-64? ( sys-boot/efibootmgr )
-	)
-	!multislot? ( !sys-boot/grub:0 !sys-boot/grub-static )
-	nls? ( sys-devel/gettext )
-"
-
-DEPEND+=" !!=media-libs/freetype-2.5.4"
-
-RESTRICT="strip !test? ( test )"
-
-QA_EXECSTACK="usr/bin/grub*-emu* usr/lib/grub/*"
-QA_WX_LOAD="usr/lib/grub/*"
-QA_MULTILIB_PATHS="usr/lib/grub/.*"
-
-src_unpack() {
-	if [[ ${PV} == 9999 ]]; then
-		git-r3_src_unpack
-	fi
-	default
-}
-
-src_prepare() {
-	default
-
-	sed -i -e /autoreconf/d autogen.sh || die
-
-	if use multislot; then
-		# fix texinfo file name, bug 416035
-		sed -i -e 's/^\* GRUB:/* GRUB2:/' -e 's/(grub)/(grub2)/' docs/grub.texi || die
-	fi
-
-	# Nothing in Gentoo packages 'american-english' in the exact path
-	# wanted for the test, but all that is needed is a compressible text
-	# file, and we do have 'words' from miscfiles in the same path.
-	sed -i \
-		-e '/CFILESSRC.*=/s,american-english,words,' \
-		tests/util/grub-fs-tester.in \
-		|| die
-
-	if [[ -n ${GRUB_AUTOGEN} ]]; then
-		python_setup
-		bash autogen.sh || die
-		autopoint() { :; }
-		eautoreconf
-	fi
-}
-
-grub_do() {
-	multibuild_foreach_variant run_in_build_dir "$@"
-}
-
-grub_do_once() {
-	multibuild_for_best_variant run_in_build_dir "$@"
-}
-
-grub_configure() {
-	local platform
-
-	case ${MULTIBUILD_VARIANT} in
-		efi*) platform=efi ;;
-		xen*) platform=xen ;;
-		guessed) ;;
-		*) platform=${MULTIBUILD_VARIANT} ;;
-	esac
-
-	case ${MULTIBUILD_VARIANT} in
-		*-32)
-			if [[ ${CTARGET:-${CHOST}} == x86_64* ]]; then
-				local CTARGET=i386
-			fi ;;
-		*-64)
-			if [[ ${CTARGET:-${CHOST}} == i?86* ]]; then
-				local CTARGET=x86_64
-				local -x TARGET_CFLAGS="-Os -march=x86-64 ${TARGET_CFLAGS}"
-				local -x TARGET_CPPFLAGS="-march=x86-64 ${TARGET_CPPFLAGS}"
-			fi ;;
-	esac
-
-	local myeconfargs=(
-		--disable-werror
-		--program-prefix=
-		--libdir="${EPREFIX}"/usr/lib
-		--htmldir="${EPREFIX}"/usr/share/doc/${PF}/html
-		$(use_enable debug mm-debug)
-		$(use_enable device-mapper)
-		$(use_enable mount grub-mount)
-		$(use_enable nls)
-		$(use_enable themes grub-themes)
-		$(use_enable truetype grub-mkfont)
-		$(use_enable libzfs)
-		$(use sdl && use_enable debug grub-emu-sdl)
-		${platform:+--with-platform=}${platform}
-
-		# Let configure detect this where supported
-		$(usex efiemu '' '--disable-efiemu')
-	)
-
-	if use multislot; then
-		myeconfargs+=( --program-transform-name="s,grub,grub2," )
-	fi
-
-	# Set up font symlinks
-	ln -s "${WORKDIR}/${UNIFONT}.pcf" unifont.pcf || die
-	if use themes; then
-		ln -s "${WORKDIR}/${DEJAVU}/ttf/DejaVuSans.ttf" DejaVuSans.ttf || die
-	fi
-
-	local ECONF_SOURCE="${S}"
-	econf "${myeconfargs[@]}"
-}
-
-src_configure() {
-	# Bug 508758.
-	replace-flags -O3 -O2
-
-	# We don't want to leak flags onto boot code.
-	export HOST_CCASFLAGS=${CCASFLAGS}
-	export HOST_CFLAGS=${CFLAGS}
-	export HOST_CPPFLAGS=${CPPFLAGS}
-	export HOST_LDFLAGS=${LDFLAGS}
-	unset CCASFLAGS CFLAGS CPPFLAGS LDFLAGS
-
-	use static && HOST_LDFLAGS+=" -static"
-
-	tc-ld-disable-gold #439082 #466536 #526348
-	export TARGET_LDFLAGS="${TARGET_LDFLAGS} ${LDFLAGS}"
-	unset LDFLAGS
-
-	tc-export CC NM OBJCOPY RANLIB STRIP
-	tc-export BUILD_CC # Bug 485592
-
-	MULTIBUILD_VARIANTS=()
-	local p
-	for p in "${GRUB_ALL_PLATFORMS[@]}"; do
-		use "grub_platforms_${p}" && MULTIBUILD_VARIANTS+=( "${p}" )
-	done
-	[[ ${#MULTIBUILD_VARIANTS[@]} -eq 0 ]] && MULTIBUILD_VARIANTS=( guessed )
-	grub_do grub_configure
-}
-
-src_compile() {
-	# Sandbox bug 404013.
-	use libzfs && addpredict /etc/dfs:/dev/zfs
-
-	grub_do emake
-	use doc && grub_do_once emake -C docs html
-}
-
-src_test() {
-	# The qemu dependency is a bit complex.
-	# You will need to adjust QEMU_SOFTMMU_TARGETS to match the cpu/platform.
-	grub_do emake check
-}
-
-src_install() {
-	grub_do emake install DESTDIR="${D}" bashcompletiondir="$(get_bashcompdir)"
-	use doc && grub_do_once emake -C docs install-html DESTDIR="${D}"
-
-	einstalldocs
-
-	if use multislot; then
-		mv "${ED%/}"/usr/share/info/grub{,2}.info || die
-	fi
-}
-
-pkg_postinst() {
-	elog "For information on how to configure GRUB2 please refer to the guide:"
-	elog "    https://wiki.gentoo.org/wiki/GRUB2_Quick_Start"
-
-	if has_version 'sys-boot/grub:0'; then
-		elog "A migration guide for GRUB Legacy users is available:"
-		elog "    https://wiki.gentoo.org/wiki/GRUB2_Migration"
-	fi
-
-	if [[ -z ${REPLACING_VERSIONS} ]]; then
-		elog
-		elog "You may consider installing the following optional packages:"
-		optfeature "Detect other operating systems (grub-mkconfig)" sys-boot/os-prober
-		optfeature "Create rescue media (grub-mkrescue)" dev-libs/libisoburn
-		optfeature "Enable RAID device detection" sys-fs/mdadm
-	fi
-}
diff --git a/sys-boot/grub/grub-2.02-r1710.ebuild b/sys-boot/grub/grub-2.02-r1710.ebuild
new file mode 100644
index 00000000..dacfc3d5
--- /dev/null
+++ b/sys-boot/grub/grub-2.02-r1710.ebuild
@@ -0,0 +1,296 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+if [[ ${PV} == 9999  ]]; then
+	GRUB_AUTOGEN=1
+fi
+
+if [[ -n ${GRUB_AUTOGEN} ]]; then
+	PYTHON_COMPAT=( python{2_7,3_3,3_4,3_5} )
+	WANT_LIBTOOL=none
+	inherit autotools python-any-r1
+fi
+
+inherit autotools bash-completion-r1 flag-o-matic multibuild pax-utils toolchain-funcs versionator
+
+if [[ ${PV} != 9999 ]]; then
+	if [[ ${PV} == *_alpha* || ${PV} == *_beta* || ${PV} == *_rc* ]]; then
+		# The quote style is to work with <=bash-4.2 and >=bash-4.3 #503860
+		MY_P=${P/_/'~'}
+		SRC_URI="mirror://gnu-alpha/${PN}/${MY_P}.tar.xz"
+		S=${WORKDIR}/${MY_P}
+	else
+		SRC_URI="mirror://gnu/${PN}/${P}.tar.xz"
+		S=${WORKDIR}/${P%_*}
+	fi
+	KEYWORDS="amd64 ~arm64 x86"
+else
+	inherit git-r3
+	EGIT_REPO_URI="git://git.sv.gnu.org/grub.git
+		http://git.savannah.gnu.org/r/grub.git"
+fi
+
+PATCHES=(
+	"${FILESDIR}"/gfxpayload.patch
+	"${FILESDIR}"/grub-2.02_beta2-KERNEL_GLOBS.patch
+)
+
+DEJAVU=dejavu-sans-ttf-2.37
+UNIFONT=unifont-9.0.06
+SRC_URI+=" fonts? ( mirror://gnu/unifont/${UNIFONT}/${UNIFONT}.pcf.gz )
+	themes? ( mirror://sourceforge/dejavu/${DEJAVU}.zip )"
+
+DESCRIPTION="GNU GRUB boot loader"
+HOMEPAGE="https://www.gnu.org/software/grub/"
+
+# Includes licenses for dejavu and unifont
+LICENSE="GPL-3 fonts? ( GPL-2-with-font-exception ) themes? ( BitstreamVera )"
+SLOT="2/${PVR}"
+IUSE="debug device-mapper doc efiemu +fonts mount multislot nls static sdl test +themes truetype libzfs"
+
+GRUB_ALL_PLATFORMS=( coreboot efi-32 efi-64 emu ieee1275 loongson multiboot qemu qemu-mips pc uboot xen xen-32 )
+IUSE+=" ${GRUB_ALL_PLATFORMS[@]/#/grub_platforms_}"
+
+REQUIRED_USE="
+	grub_platforms_coreboot? ( fonts )
+	grub_platforms_qemu? ( fonts )
+	grub_platforms_ieee1275? ( fonts )
+	grub_platforms_loongson? ( fonts )
+"
+
+# os-prober: Used on runtime to detect other OSes
+# xorriso (dev-libs/libisoburn): Used on runtime for mkrescue
+RDEPEND="
+	app-arch/xz-utils
+	>=sys-libs/ncurses-5.2-r5:0=
+	debug? (
+		sdl? ( media-libs/libsdl )
+	)
+	device-mapper? ( >=sys-fs/lvm2-2.02.45 )
+	libzfs? ( sys-fs/zfs )
+	mount? ( sys-fs/fuse )
+	truetype? ( media-libs/freetype:2= )
+	ppc? ( sys-apps/ibm-powerpc-utils sys-apps/powerpc-utils )
+	ppc64? ( sys-apps/ibm-powerpc-utils sys-apps/powerpc-utils )
+"
+DEPEND="${RDEPEND}
+	${PYTHON_DEPS}
+	app-misc/pax-utils
+	sys-devel/flex
+	sys-devel/bison
+	sys-apps/help2man
+	sys-apps/texinfo
+	sys-boot/grub-config-redcore
+	fonts? ( media-libs/freetype:2 )
+	grub_platforms_xen? ( app-emulation/xen-tools:= )
+	grub_platforms_xen-32? ( app-emulation/xen-tools:= )
+	static? (
+		app-arch/xz-utils[static-libs(+)]
+		truetype? (
+			app-arch/bzip2[static-libs(+)]
+			media-libs/freetype[static-libs(+)]
+			sys-libs/zlib[static-libs(+)]
+		)
+	)
+	test? (
+		app-admin/genromfs
+		app-arch/cpio
+		app-arch/lzop
+		app-emulation/qemu
+		dev-libs/libisoburn
+		sys-apps/miscfiles
+		sys-block/parted
+		sys-fs/squashfs-tools
+	)
+	themes? (
+		app-arch/unzip
+		media-libs/freetype:2
+	)
+"
+RDEPEND+="
+	kernel_linux? (
+		grub_platforms_efi-32? ( sys-boot/efibootmgr )
+		grub_platforms_efi-64? ( sys-boot/efibootmgr )
+	)
+	!multislot? ( !sys-boot/grub:0 !sys-boot/grub-static )
+	nls? ( sys-devel/gettext )
+"
+
+DEPEND+=" !!=media-libs/freetype-2.5.4"
+
+RESTRICT="strip !test? ( test )"
+
+QA_EXECSTACK="usr/bin/grub*-emu* usr/lib/grub/*"
+QA_WX_LOAD="usr/lib/grub/*"
+QA_MULTILIB_PATHS="usr/lib/grub/.*"
+
+src_unpack() {
+	if [[ ${PV} == 9999 ]]; then
+		git-r3_src_unpack
+	fi
+	default
+}
+
+src_prepare() {
+	default
+
+	sed -i -e /autoreconf/d autogen.sh || die
+
+	if use multislot; then
+		# fix texinfo file name, bug 416035
+		sed -i -e 's/^\* GRUB:/* GRUB2:/' -e 's/(grub)/(grub2)/' docs/grub.texi || die
+	fi
+
+	# Nothing in Gentoo packages 'american-english' in the exact path
+	# wanted for the test, but all that is needed is a compressible text
+	# file, and we do have 'words' from miscfiles in the same path.
+	sed -i \
+		-e '/CFILESSRC.*=/s,american-english,words,' \
+		tests/util/grub-fs-tester.in \
+		|| die
+
+	if [[ -n ${GRUB_AUTOGEN} ]]; then
+		python_setup
+		bash autogen.sh || die
+		autopoint() { :; }
+		eautoreconf
+	fi
+}
+
+grub_do() {
+	multibuild_foreach_variant run_in_build_dir "$@"
+}
+
+grub_do_once() {
+	multibuild_for_best_variant run_in_build_dir "$@"
+}
+
+grub_configure() {
+	local platform
+
+	case ${MULTIBUILD_VARIANT} in
+		efi*) platform=efi ;;
+		xen*) platform=xen ;;
+		guessed) ;;
+		*) platform=${MULTIBUILD_VARIANT} ;;
+	esac
+
+	case ${MULTIBUILD_VARIANT} in
+		*-32)
+			if [[ ${CTARGET:-${CHOST}} == x86_64* ]]; then
+				local CTARGET=i386
+			fi ;;
+		*-64)
+			if [[ ${CTARGET:-${CHOST}} == i?86* ]]; then
+				local CTARGET=x86_64
+				local -x TARGET_CFLAGS="-Os -march=x86-64 ${TARGET_CFLAGS}"
+				local -x TARGET_CPPFLAGS="-march=x86-64 ${TARGET_CPPFLAGS}"
+			fi ;;
+	esac
+
+	local myeconfargs=(
+		--disable-werror
+		--program-prefix=
+		--libdir="${EPREFIX}"/usr/lib
+		--htmldir="${EPREFIX}"/usr/share/doc/${PF}/html
+		$(use_enable debug mm-debug)
+		$(use_enable device-mapper)
+		$(use_enable mount grub-mount)
+		$(use_enable nls)
+		$(use_enable themes grub-themes)
+		$(use_enable truetype grub-mkfont)
+		$(use_enable libzfs)
+		$(use sdl && use_enable debug grub-emu-sdl)
+		${platform:+--with-platform=}${platform}
+
+		# Let configure detect this where supported
+		$(usex efiemu '' '--disable-efiemu')
+	)
+
+	if use multislot; then
+		myeconfargs+=( --program-transform-name="s,grub,grub2," )
+	fi
+
+	# Set up font symlinks
+	ln -s "${WORKDIR}/${UNIFONT}.pcf" unifont.pcf || die
+	if use themes; then
+		ln -s "${WORKDIR}/${DEJAVU}/ttf/DejaVuSans.ttf" DejaVuSans.ttf || die
+	fi
+
+	local ECONF_SOURCE="${S}"
+	econf "${myeconfargs[@]}"
+}
+
+src_configure() {
+	# Bug 508758.
+	replace-flags -O3 -O2
+
+	# We don't want to leak flags onto boot code.
+	export HOST_CCASFLAGS=${CCASFLAGS}
+	export HOST_CFLAGS=${CFLAGS}
+	export HOST_CPPFLAGS=${CPPFLAGS}
+	export HOST_LDFLAGS=${LDFLAGS}
+	unset CCASFLAGS CFLAGS CPPFLAGS LDFLAGS
+
+	use static && HOST_LDFLAGS+=" -static"
+
+	tc-ld-disable-gold #439082 #466536 #526348
+	export TARGET_LDFLAGS="${TARGET_LDFLAGS} ${LDFLAGS}"
+	unset LDFLAGS
+
+	tc-export CC NM OBJCOPY RANLIB STRIP
+	tc-export BUILD_CC # Bug 485592
+
+	MULTIBUILD_VARIANTS=()
+	local p
+	for p in "${GRUB_ALL_PLATFORMS[@]}"; do
+		use "grub_platforms_${p}" && MULTIBUILD_VARIANTS+=( "${p}" )
+	done
+	[[ ${#MULTIBUILD_VARIANTS[@]} -eq 0 ]] && MULTIBUILD_VARIANTS=( guessed )
+	grub_do grub_configure
+}
+
+src_compile() {
+	# Sandbox bug 404013.
+	use libzfs && addpredict /etc/dfs:/dev/zfs
+
+	grub_do emake
+	use doc && grub_do_once emake -C docs html
+}
+
+src_test() {
+	# The qemu dependency is a bit complex.
+	# You will need to adjust QEMU_SOFTMMU_TARGETS to match the cpu/platform.
+	grub_do emake check
+}
+
+src_install() {
+	grub_do emake install DESTDIR="${D}" bashcompletiondir="$(get_bashcompdir)"
+	use doc && grub_do_once emake -C docs install-html DESTDIR="${D}"
+
+	einstalldocs
+
+	if use multislot; then
+		mv "${ED%/}"/usr/share/info/grub{,2}.info || die
+	fi
+}
+
+pkg_postinst() {
+	elog "For information on how to configure GRUB2 please refer to the guide:"
+	elog "    https://wiki.gentoo.org/wiki/GRUB2_Quick_Start"
+
+	if has_version 'sys-boot/grub:0'; then
+		elog "A migration guide for GRUB Legacy users is available:"
+		elog "    https://wiki.gentoo.org/wiki/GRUB2_Migration"
+	fi
+
+	if [[ -z ${REPLACING_VERSIONS} ]]; then
+		elog
+		elog "You may consider installing the following optional packages:"
+		optfeature "Detect other operating systems (grub-mkconfig)" sys-boot/os-prober
+		optfeature "Create rescue media (grub-mkrescue)" dev-libs/libisoburn
+		optfeature "Enable RAID device detection" sys-fs/mdadm
+	fi
+}
diff --git a/sys-kernel/bbswitch-dkms/bbswitch-dkms-0.8-r1708.ebuild b/sys-kernel/bbswitch-dkms/bbswitch-dkms-0.8-r1708.ebuild
deleted file mode 100644
index b02911ec..00000000
--- a/sys-kernel/bbswitch-dkms/bbswitch-dkms-0.8-r1708.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit eutils
-
-MY_PN="bbswitch"
-DESCRIPTION="BBswitch sources for linux"
-HOMEPAGE="https://github.com/Bumblebee-Project/bbswitch"
-SRC_URI="https://github.com/Bumblebee-Project/${MY_PN}/archive/v${PV}.tar.gz -> ${MY_PN}-${PV}.tar.gz"
-
-SLOT="0"
-LICENSE="GPL-3+"
-KEYWORDS="amd64"
-IUSE=""
-DEPEND="sys-kernel/dkms"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/${MY_PN}-${PV}"
-
-src_prepare() {
-	# Fix build failure, bug #513542
-	sed -i 's/^KDIR.*$/KDIR\ \:= \/usr\/src\/linux/g' Makefile
-	epatch ${FILESDIR}/${P}-conf.patch
-}
-
-src_compile() {
-	:
-}
-
-src_install() {
-	dodir /usr/src/${P}
-	insinto /usr/src/${P}
-	doins -r ${S}/*
-}
-
-pkg_postinst() {
-	dkms add ${PN}/${PV}
-}
-
-pkg_prerm() {
-	dkms remove ${PN}/${PV} --all
-}
diff --git a/sys-kernel/bbswitch-dkms/bbswitch-dkms-0.8-r1710.ebuild b/sys-kernel/bbswitch-dkms/bbswitch-dkms-0.8-r1710.ebuild
new file mode 100644
index 00000000..b02911ec
--- /dev/null
+++ b/sys-kernel/bbswitch-dkms/bbswitch-dkms-0.8-r1710.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit eutils
+
+MY_PN="bbswitch"
+DESCRIPTION="BBswitch sources for linux"
+HOMEPAGE="https://github.com/Bumblebee-Project/bbswitch"
+SRC_URI="https://github.com/Bumblebee-Project/${MY_PN}/archive/v${PV}.tar.gz -> ${MY_PN}-${PV}.tar.gz"
+
+SLOT="0"
+LICENSE="GPL-3+"
+KEYWORDS="amd64"
+IUSE=""
+DEPEND="sys-kernel/dkms"
+RDEPEND="${DEPEND}"
+
+S="${WORKDIR}/${MY_PN}-${PV}"
+
+src_prepare() {
+	# Fix build failure, bug #513542
+	sed -i 's/^KDIR.*$/KDIR\ \:= \/usr\/src\/linux/g' Makefile
+	epatch ${FILESDIR}/${P}-conf.patch
+}
+
+src_compile() {
+	:
+}
+
+src_install() {
+	dodir /usr/src/${P}
+	insinto /usr/src/${P}
+	doins -r ${S}/*
+}
+
+pkg_postinst() {
+	dkms add ${PN}/${PV}
+}
+
+pkg_prerm() {
+	dkms remove ${PN}/${PV} --all
+}
diff --git a/sys-kernel/broadcom-sta-dkms/broadcom-sta-dkms-6.30.223.271-r1708.ebuild b/sys-kernel/broadcom-sta-dkms/broadcom-sta-dkms-6.30.223.271-r1708.ebuild
deleted file mode 100644
index 1cabceeb..00000000
--- a/sys-kernel/broadcom-sta-dkms/broadcom-sta-dkms-6.30.223.271-r1708.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-inherit eutils
-
-DESCRIPTION="Broadcom's IEEE 802.11a/b/g/n hybrid Linux device driver source"
-HOMEPAGE="http://www.broadcom.com/support/802.11/"
-SRC_BASE="http://www.broadcom.com/docs/linux_sta/hybrid-v35"
-SRC_URI="amd64? ( ${SRC_BASE}_64-nodebug-pcoem-${PV//\./_}.tar.gz )
-	http://www.broadcom.com/docs/linux_sta/README_${PV}.txt -> README-${P}.txt"
-
-LICENSE="Broadcom"
-KEYWORDS="amd64"
-SLOT="0"
-RESTRICT="mirror"
-
-DEPEND="sys-kernel/dkms"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}"
-
-src_prepare() {
-	cp "${FILESDIR}"/dkms.conf "${S}" || die
-	
-	epatch \
-		"${FILESDIR}/broadcom-sta-6.30.223.141-makefile.patch" \
-		"${FILESDIR}/broadcom-sta-6.30.223.141-eth-to-wlan.patch" \
-		"${FILESDIR}/broadcom-sta-6.30.223.141-gcc.patch" \
-		"${FILESDIR}/broadcom-sta-6.30.223.248-r3-Wno-date-time.patch" \
-		"${FILESDIR}/broadcom-sta-6.30.223.271-r1-linux-3.18.patch" \
-		"${FILESDIR}/broadcom-sta-6.30.223.271-r2-linux-4.3-v2.patch" \
-		"${FILESDIR}/broadcom-sta-6.30.223.271-r4-linux-4.7.patch" \
-		"${FILESDIR}/broadcom-sta-6.30.223.271-r4-linux-4.8.patch" \
-		"${FILESDIR}/broadcom-sta-6.30.223.271-r4-linux-4.11.patch" \
-		"${FILESDIR}/broadcom-sta-6.30.223.271-r4-linux-4.12.patch"
-
-	epatch_user
-}
-
-src_compile(){
-    :
-}
-
-src_install() {
-    dodir /usr/src/${P}
-    insinto /usr/src/${P}
-    doins -r "${S}"/*
-}
-
-pkg_postinst() {
-    dkms add ${PN}/${PV}
-}
-
-pkg_prerm() {
-    dkms remove ${PN}/${PV} --all
-}
diff --git a/sys-kernel/broadcom-sta-dkms/broadcom-sta-dkms-6.30.223.271-r1710.ebuild b/sys-kernel/broadcom-sta-dkms/broadcom-sta-dkms-6.30.223.271-r1710.ebuild
new file mode 100644
index 00000000..1cabceeb
--- /dev/null
+++ b/sys-kernel/broadcom-sta-dkms/broadcom-sta-dkms-6.30.223.271-r1710.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit eutils
+
+DESCRIPTION="Broadcom's IEEE 802.11a/b/g/n hybrid Linux device driver source"
+HOMEPAGE="http://www.broadcom.com/support/802.11/"
+SRC_BASE="http://www.broadcom.com/docs/linux_sta/hybrid-v35"
+SRC_URI="amd64? ( ${SRC_BASE}_64-nodebug-pcoem-${PV//\./_}.tar.gz )
+	http://www.broadcom.com/docs/linux_sta/README_${PV}.txt -> README-${P}.txt"
+
+LICENSE="Broadcom"
+KEYWORDS="amd64"
+SLOT="0"
+RESTRICT="mirror"
+
+DEPEND="sys-kernel/dkms"
+RDEPEND="${DEPEND}"
+
+S="${WORKDIR}"
+
+src_prepare() {
+	cp "${FILESDIR}"/dkms.conf "${S}" || die
+	
+	epatch \
+		"${FILESDIR}/broadcom-sta-6.30.223.141-makefile.patch" \
+		"${FILESDIR}/broadcom-sta-6.30.223.141-eth-to-wlan.patch" \
+		"${FILESDIR}/broadcom-sta-6.30.223.141-gcc.patch" \
+		"${FILESDIR}/broadcom-sta-6.30.223.248-r3-Wno-date-time.patch" \
+		"${FILESDIR}/broadcom-sta-6.30.223.271-r1-linux-3.18.patch" \
+		"${FILESDIR}/broadcom-sta-6.30.223.271-r2-linux-4.3-v2.patch" \
+		"${FILESDIR}/broadcom-sta-6.30.223.271-r4-linux-4.7.patch" \
+		"${FILESDIR}/broadcom-sta-6.30.223.271-r4-linux-4.8.patch" \
+		"${FILESDIR}/broadcom-sta-6.30.223.271-r4-linux-4.11.patch" \
+		"${FILESDIR}/broadcom-sta-6.30.223.271-r4-linux-4.12.patch"
+
+	epatch_user
+}
+
+src_compile(){
+    :
+}
+
+src_install() {
+    dodir /usr/src/${P}
+    insinto /usr/src/${P}
+    doins -r "${S}"/*
+}
+
+pkg_postinst() {
+    dkms add ${PN}/${PV}
+}
+
+pkg_prerm() {
+    dkms remove ${PN}/${PV} --all
+}
diff --git a/sys-kernel/dracut-config-redcore/dracut-config-redcore-1708-r2.ebuild b/sys-kernel/dracut-config-redcore/dracut-config-redcore-1708-r2.ebuild
deleted file mode 100644
index caae14ed..00000000
--- a/sys-kernel/dracut-config-redcore/dracut-config-redcore-1708-r2.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=5
-
-DESCRIPTION="Redcore Linux Dracut configuration files"
-HOMEPAGE=""
-SRC_URI=""
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RDEPEND="sys-boot/grub"
-
-S="${FILESDIR}"
-
-src_install() {
-	dodir "/etc/dracut.conf.d" || die
-	insinto "/etc/dracut.conf.d" || die
-	doins -r "${S}/"* || die
-}
-
-pkg_preinst() {
-	if [[ -f ""${ROOT}"etc/dracut.conf.d/redcore-dracut.conf" ]]; then
-		cp -avx ""${ROOT}"etc/dracut.conf.d/redcore-dracut.conf" ""${ROOT}"etc/dracut.conf.d/redcore-dracut.conf.backup"
-	fi
-}
-
-pkg_postinst() {
-	elog "Your previous Dracut configuration was saved as /etc/dracut.conf.d/redcore-dracut.conf.backup"
-	elog "Please adjust the new configuration to suit you and regenerate the Dracut initramfs image"
-	elog "by using : /usr/bin/dracut -f"
-}
diff --git a/sys-kernel/dracut-config-redcore/dracut-config-redcore-1710.ebuild b/sys-kernel/dracut-config-redcore/dracut-config-redcore-1710.ebuild
new file mode 100644
index 00000000..caae14ed
--- /dev/null
+++ b/sys-kernel/dracut-config-redcore/dracut-config-redcore-1710.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=5
+
+DESCRIPTION="Redcore Linux Dracut configuration files"
+HOMEPAGE=""
+SRC_URI=""
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE=""
+
+RDEPEND="sys-boot/grub"
+
+S="${FILESDIR}"
+
+src_install() {
+	dodir "/etc/dracut.conf.d" || die
+	insinto "/etc/dracut.conf.d" || die
+	doins -r "${S}/"* || die
+}
+
+pkg_preinst() {
+	if [[ -f ""${ROOT}"etc/dracut.conf.d/redcore-dracut.conf" ]]; then
+		cp -avx ""${ROOT}"etc/dracut.conf.d/redcore-dracut.conf" ""${ROOT}"etc/dracut.conf.d/redcore-dracut.conf.backup"
+	fi
+}
+
+pkg_postinst() {
+	elog "Your previous Dracut configuration was saved as /etc/dracut.conf.d/redcore-dracut.conf.backup"
+	elog "Please adjust the new configuration to suit you and regenerate the Dracut initramfs image"
+	elog "by using : /usr/bin/dracut -f"
+}
diff --git a/sys-kernel/dracut/dracut-044-r1708.ebuild b/sys-kernel/dracut/dracut-044-r1708.ebuild
deleted file mode 100644
index 0b3c7d17..00000000
--- a/sys-kernel/dracut/dracut-044-r1708.ebuild
+++ /dev/null
@@ -1,272 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit bash-completion-r1 eutils linux-info multilib systemd
-
-DESCRIPTION="Generic initramfs generation tool"
-HOMEPAGE="https://dracut.wiki.kernel.org"
-SRC_URI="mirror://kernel/linux/utils/boot/${PN}/${P}.tar.xz"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="debug +microcode selinux +splash systemd"
-
-RESTRICT="test"
-
-CDEPEND="virtual/udev
-	microcode? (
-		sys-firmware/intel-microcode
-		sys-kernel/linux-firmware
-	)
-	splash? (
-		sys-boot/plymouth
-	)
-	systemd? ( >=sys-apps/systemd-199 )
-	sys-kernel/dracut-config-redcore
-	"
-RDEPEND="${CDEPEND}
-	app-arch/cpio
-	>=app-shells/bash-4.0
-	>sys-apps/kmod-5[tools]
-	|| (
-		>=sys-apps/sysvinit-2.87-r3
-		sys-apps/systemd[sysv-utils]
-		sys-apps/systemd-sysv-utils
-	)
-	>=sys-apps/util-linux-2.21
-
-	debug? ( dev-util/strace )
-	selinux? (
-		sys-libs/libselinux
-		sys-libs/libsepol
-		sec-policy/selinux-dracut
-	)
-	"
-DEPEND="${CDEPEND}
-	app-text/asciidoc
-	>=dev-libs/libxslt-1.1.26
-	app-text/docbook-xml-dtd:4.5
-	>=app-text/docbook-xsl-stylesheets-1.75.2
-	virtual/pkgconfig
-	"
-
-DOCS=( AUTHORS HACKING NEWS README README.generic README.kernel README.modules
-	README.testsuite TODO )
-MY_LIBDIR=/usr/lib
-QA_MULTILIB_PATHS="
-	usr/lib/dracut/dracut-install
-	usr/lib/dracut/skipcpio
-	"
-
-PATCHES=(
-	"${FILESDIR}"/044-0001-base-dracut-lib.sh-dev_unit_name-guard-against-dev-b.patch
-	"${FILESDIR}"/044-0002-systemd-initrd-add-initrd-root-device.target.patch
-	"${FILESDIR}"/044-0003-50-dracut.install-use-bin-bash-shebang.patch
-	"${FILESDIR}"/044-0004-redcore-change-default-initramfs-name.patch
-)
-
-#
-# Helper functions
-#
-
-# Removes module from modules.d.
-# $1 = module name
-# Module name can be specified without number prefix.
-rm_module() {
-	local force m
-	[[ $1 = -f ]] && force=-f
-
-	for m in $@; do
-		if [[ $m =~ ^[0-9][0-9][^\ ]*$ ]]; then
-			rm ${force} --interactive=never -r "${modules_dir}"/$m
-		else
-			rm ${force} --interactive=never -r "${modules_dir}"/[0-9][0-9]$m
-		fi
-	done
-}
-
-src_prepare() {
-	local libdirs="/$(get_libdir) /usr/$(get_libdir)"
-	if [[ ${SYMLINK_LIB} = yes ]]; then
-		# Preserve lib -> lib64 symlinks in initramfs
-		[[ $libdirs =~ /lib\  ]] || libdirs+=" /lib /usr/lib"
-	fi
-	einfo "Setting libdirs to \"${libdirs}\" ..."
-	sed -e "3alibdirs=\"${libdirs}\"" \
-		-i "${S}/dracut.conf.d/gentoo.conf.example" || die
-
-	local udevdir="$("$(tc-getPKG_CONFIG)" udev --variable=udevdir)"
-	einfo "Setting udevdir to ${udevdir}..."
-	sed -r -e "s|^(udevdir=).*$|\1${udevdir}|" \
-			-i "${S}/dracut.conf.d/gentoo.conf.example" || die
-
-	if use systemd; then
-		local systemdutildir="$(systemd_get_utildir)"
-		local systemdsystemunitdir="$(systemd_get_unitdir)"
-		local systemdsystemconfdir="$("$(tc-getPKG_CONFIG)" systemd \
-			--variable=systemdsystemconfdir)"
-		[[ ${systemdsystemconfdir} ]] \
-			|| systemdsystemconfdir=/etc/systemd/system
-		einfo "Setting systemdutildir to ${systemdutildir} and ..."
-		sed -e "5asystemdutildir=\"${systemdutildir}\"" \
-			-i "${S}/dracut.conf.d/gentoo.conf.example" || die
-		einfo "Setting systemdsystemunitdir to ${systemdsystemunitdir} and..."
-		sed -e "6asystemdsystemunitdir=\"${systemdsystemunitdir}\"" \
-			-i "${S}/dracut.conf.d/gentoo.conf.example" || die
-		einfo "Setting systemdsystemconfdir to ${systemdsystemconfdir}..."
-		sed -e "7asystemdsystemconfdir=\"${systemdsystemconfdir}\"" \
-			-i "${S}/dracut.conf.d/gentoo.conf.example" || die
-	else
-		local systemdutildir="/lib/systemd"
-		einfo "Setting systemdutildir for standalone udev to" \
-			"${systemdutildir}..."
-		sed -e "5asystemdutildir=\"${systemdutildir}\"" \
-			-i "${S}/dracut.conf.d/gentoo.conf.example" || die
-	fi
-
-	epatch "${PATCHES[@]}"
-
-	epatch_user
-}
-
-src_configure() {
-	local myconf=(
-		--libdir="${MY_LIBDIR}"
-		--bashcompletiondir="$(get_bashcompdir)"
-	)
-
-	if use systemd; then
-		myconf+=( --systemdsystemunitdir="$(systemd_get_unitdir)" )
-	fi
-
-	econf "${myconf[@]}"
-}
-
-src_compile() {
-	tc-export CC
-	emake doc install/dracut-install skipcpio/skipcpio
-}
-
-src_install() {
-	default
-
-	local my_libdir="${MY_LIBDIR}"
-	local dracutlibdir="${my_libdir#/}/dracut"
-
-	echo "DRACUT_VERSION=$PVR" > "${D%/}/${dracutlibdir}/dracut-version.sh"
-
-	insinto "${dracutlibdir}/dracut.conf.d/"
-	newins dracut.conf.d/gentoo.conf.example gentoo.conf
-
-	insinto /etc/logrotate.d
-	newins dracut.logrotate dracut
-	
-	dodir /var/lib/dracut/overlay
-
-	dohtml dracut.html
-
-	if ! use systemd; then
-		# Scripts in kernel/install.d are systemd-specific
-		rm -r "${D%/}/${my_libdir}/kernel" || die
-	fi
-
-	#
-	# Modules
-	#
-	local module
-	modules_dir="${D%/}/${dracutlibdir}/modules.d"
-
-	use debug || rm_module 95debug
-	use selinux || rm_module 98selinux
-
-	if use systemd; then
-		# With systemd following modules do not make sense
-		rm_module 96securityfs 97masterkey 98integrity
-	else
-		rm_module 00systemd 98dracut-systemd
-		# Without systemd following modules do not make sense
-		rm_module 00systemd-bootchart 01systemd-initrd 02systemd-networkd
-	fi
-
-	# Remove modules which won't work for sure
-	rm_module 95fcoe # no tools
-	# fips module depends on masked app-crypt/hmaccalc
-	rm_module 01fips 02fips-aesni
-}
-
-pkg_postinst() {
-	if linux-info_get_any_version && linux_config_exists; then
-		ewarn ""
-		ewarn "If the following test report contains a missing kernel"
-		ewarn "configuration option, you should reconfigure and rebuild your"
-		ewarn "kernel before booting image generated with this Dracut version."
-		ewarn ""
-
-		local CONFIG_CHECK="~BLK_DEV_INITRD ~DEVTMPFS"
-
-		# Kernel configuration options descriptions:
-		local desc_DEVTMPFS="Maintain a devtmpfs filesystem to mount at /dev"
-		local desc_BLK_DEV_INITRD="Initial RAM filesystem and RAM disk "\
-"(initramfs/initrd) support"
-
-		local opt desc
-
-		# Generate ERROR_* variables for check_extra_config.
-		for opt in ${CONFIG_CHECK}; do
-			opt=${opt#\~}
-			desc=desc_${opt}
-			eval "local ERROR_${opt}='CONFIG_${opt}: \"${!desc}\"" \
-				"is missing and REQUIRED'"
-		done
-
-		check_extra_config
-		echo
-	else
-		ewarn ""
-		ewarn "Your kernel configuration couldn't be checked.  Do you have"
-		ewarn "/usr/src/linux/.config file there?  Please check manually if"
-		ewarn "following options are enabled:"
-		ewarn ""
-		ewarn "  CONFIG_BLK_DEV_INITRD"
-		ewarn "  CONFIG_DEVTMPFS"
-		ewarn ""
-	fi
-
-	elog "To get additional features, a number of optional runtime"
-	elog "dependencies may be installed:"
-	elog ""
-	optfeature "Networking support"  net-misc/curl "net-misc/dhcp[client]" \
-		sys-apps/iproute2
-	optfeature \
-		"Measure performance of the boot process for later visualisation" \
-		app-benchmarks/bootchart2 app-admin/killproc sys-process/acct
-	optfeature "Scan for Btrfs on block devices"  sys-fs/btrfs-progs
-	optfeature "Load kernel modules and drop this privilege for real init" \
-		sys-libs/libcap
-	optfeature "Support CIFS" net-fs/cifs-utils
-	optfeature "Decrypt devices encrypted with cryptsetup/LUKS" \
-		"sys-fs/cryptsetup[-static-libs]"
-	optfeature "Support for GPG-encrypted keys for crypt module" \
-		app-crypt/gnupg
-	optfeature \
-		"Allows use of dash instead of default bash (on your own risk)" \
-		app-shells/dash
-	optfeature "Framebuffer splash (media-gfx/splashutils)" \
-		media-gfx/splashutils
-	optfeature "Support iSCSI" sys-block/open-iscsi
-	optfeature "Support Logical Volume Manager" sys-fs/lvm2
-	optfeature "Support MD devices, also known as software RAID devices" \
-		sys-fs/mdadm
-	optfeature "Support Device Mapper multipathing" sys-fs/multipath-tools
-	optfeature "Plymouth boot splash"  '>=sys-boot/plymouth-0.8.5-r5'
-	optfeature "Support network block devices" sys-block/nbd
-	optfeature "Support NFS" net-fs/nfs-utils net-nds/rpcbind
-	optfeature \
-		"Install ssh and scp along with config files and specified keys" \
-		net-misc/openssh
-	optfeature "Enable logging with syslog-ng or rsyslog" app-admin/syslog-ng \
-		app-admin/rsyslog
-}
diff --git a/sys-kernel/dracut/dracut-044-r1710.ebuild b/sys-kernel/dracut/dracut-044-r1710.ebuild
new file mode 100644
index 00000000..0b3c7d17
--- /dev/null
+++ b/sys-kernel/dracut/dracut-044-r1710.ebuild
@@ -0,0 +1,272 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit bash-completion-r1 eutils linux-info multilib systemd
+
+DESCRIPTION="Generic initramfs generation tool"
+HOMEPAGE="https://dracut.wiki.kernel.org"
+SRC_URI="mirror://kernel/linux/utils/boot/${PN}/${P}.tar.xz"
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE="debug +microcode selinux +splash systemd"
+
+RESTRICT="test"
+
+CDEPEND="virtual/udev
+	microcode? (
+		sys-firmware/intel-microcode
+		sys-kernel/linux-firmware
+	)
+	splash? (
+		sys-boot/plymouth
+	)
+	systemd? ( >=sys-apps/systemd-199 )
+	sys-kernel/dracut-config-redcore
+	"
+RDEPEND="${CDEPEND}
+	app-arch/cpio
+	>=app-shells/bash-4.0
+	>sys-apps/kmod-5[tools]
+	|| (
+		>=sys-apps/sysvinit-2.87-r3
+		sys-apps/systemd[sysv-utils]
+		sys-apps/systemd-sysv-utils
+	)
+	>=sys-apps/util-linux-2.21
+
+	debug? ( dev-util/strace )
+	selinux? (
+		sys-libs/libselinux
+		sys-libs/libsepol
+		sec-policy/selinux-dracut
+	)
+	"
+DEPEND="${CDEPEND}
+	app-text/asciidoc
+	>=dev-libs/libxslt-1.1.26
+	app-text/docbook-xml-dtd:4.5
+	>=app-text/docbook-xsl-stylesheets-1.75.2
+	virtual/pkgconfig
+	"
+
+DOCS=( AUTHORS HACKING NEWS README README.generic README.kernel README.modules
+	README.testsuite TODO )
+MY_LIBDIR=/usr/lib
+QA_MULTILIB_PATHS="
+	usr/lib/dracut/dracut-install
+	usr/lib/dracut/skipcpio
+	"
+
+PATCHES=(
+	"${FILESDIR}"/044-0001-base-dracut-lib.sh-dev_unit_name-guard-against-dev-b.patch
+	"${FILESDIR}"/044-0002-systemd-initrd-add-initrd-root-device.target.patch
+	"${FILESDIR}"/044-0003-50-dracut.install-use-bin-bash-shebang.patch
+	"${FILESDIR}"/044-0004-redcore-change-default-initramfs-name.patch
+)
+
+#
+# Helper functions
+#
+
+# Removes module from modules.d.
+# $1 = module name
+# Module name can be specified without number prefix.
+rm_module() {
+	local force m
+	[[ $1 = -f ]] && force=-f
+
+	for m in $@; do
+		if [[ $m =~ ^[0-9][0-9][^\ ]*$ ]]; then
+			rm ${force} --interactive=never -r "${modules_dir}"/$m
+		else
+			rm ${force} --interactive=never -r "${modules_dir}"/[0-9][0-9]$m
+		fi
+	done
+}
+
+src_prepare() {
+	local libdirs="/$(get_libdir) /usr/$(get_libdir)"
+	if [[ ${SYMLINK_LIB} = yes ]]; then
+		# Preserve lib -> lib64 symlinks in initramfs
+		[[ $libdirs =~ /lib\  ]] || libdirs+=" /lib /usr/lib"
+	fi
+	einfo "Setting libdirs to \"${libdirs}\" ..."
+	sed -e "3alibdirs=\"${libdirs}\"" \
+		-i "${S}/dracut.conf.d/gentoo.conf.example" || die
+
+	local udevdir="$("$(tc-getPKG_CONFIG)" udev --variable=udevdir)"
+	einfo "Setting udevdir to ${udevdir}..."
+	sed -r -e "s|^(udevdir=).*$|\1${udevdir}|" \
+			-i "${S}/dracut.conf.d/gentoo.conf.example" || die
+
+	if use systemd; then
+		local systemdutildir="$(systemd_get_utildir)"
+		local systemdsystemunitdir="$(systemd_get_unitdir)"
+		local systemdsystemconfdir="$("$(tc-getPKG_CONFIG)" systemd \
+			--variable=systemdsystemconfdir)"
+		[[ ${systemdsystemconfdir} ]] \
+			|| systemdsystemconfdir=/etc/systemd/system
+		einfo "Setting systemdutildir to ${systemdutildir} and ..."
+		sed -e "5asystemdutildir=\"${systemdutildir}\"" \
+			-i "${S}/dracut.conf.d/gentoo.conf.example" || die
+		einfo "Setting systemdsystemunitdir to ${systemdsystemunitdir} and..."
+		sed -e "6asystemdsystemunitdir=\"${systemdsystemunitdir}\"" \
+			-i "${S}/dracut.conf.d/gentoo.conf.example" || die
+		einfo "Setting systemdsystemconfdir to ${systemdsystemconfdir}..."
+		sed -e "7asystemdsystemconfdir=\"${systemdsystemconfdir}\"" \
+			-i "${S}/dracut.conf.d/gentoo.conf.example" || die
+	else
+		local systemdutildir="/lib/systemd"
+		einfo "Setting systemdutildir for standalone udev to" \
+			"${systemdutildir}..."
+		sed -e "5asystemdutildir=\"${systemdutildir}\"" \
+			-i "${S}/dracut.conf.d/gentoo.conf.example" || die
+	fi
+
+	epatch "${PATCHES[@]}"
+
+	epatch_user
+}
+
+src_configure() {
+	local myconf=(
+		--libdir="${MY_LIBDIR}"
+		--bashcompletiondir="$(get_bashcompdir)"
+	)
+
+	if use systemd; then
+		myconf+=( --systemdsystemunitdir="$(systemd_get_unitdir)" )
+	fi
+
+	econf "${myconf[@]}"
+}
+
+src_compile() {
+	tc-export CC
+	emake doc install/dracut-install skipcpio/skipcpio
+}
+
+src_install() {
+	default
+
+	local my_libdir="${MY_LIBDIR}"
+	local dracutlibdir="${my_libdir#/}/dracut"
+
+	echo "DRACUT_VERSION=$PVR" > "${D%/}/${dracutlibdir}/dracut-version.sh"
+
+	insinto "${dracutlibdir}/dracut.conf.d/"
+	newins dracut.conf.d/gentoo.conf.example gentoo.conf
+
+	insinto /etc/logrotate.d
+	newins dracut.logrotate dracut
+	
+	dodir /var/lib/dracut/overlay
+
+	dohtml dracut.html
+
+	if ! use systemd; then
+		# Scripts in kernel/install.d are systemd-specific
+		rm -r "${D%/}/${my_libdir}/kernel" || die
+	fi
+
+	#
+	# Modules
+	#
+	local module
+	modules_dir="${D%/}/${dracutlibdir}/modules.d"
+
+	use debug || rm_module 95debug
+	use selinux || rm_module 98selinux
+
+	if use systemd; then
+		# With systemd following modules do not make sense
+		rm_module 96securityfs 97masterkey 98integrity
+	else
+		rm_module 00systemd 98dracut-systemd
+		# Without systemd following modules do not make sense
+		rm_module 00systemd-bootchart 01systemd-initrd 02systemd-networkd
+	fi
+
+	# Remove modules which won't work for sure
+	rm_module 95fcoe # no tools
+	# fips module depends on masked app-crypt/hmaccalc
+	rm_module 01fips 02fips-aesni
+}
+
+pkg_postinst() {
+	if linux-info_get_any_version && linux_config_exists; then
+		ewarn ""
+		ewarn "If the following test report contains a missing kernel"
+		ewarn "configuration option, you should reconfigure and rebuild your"
+		ewarn "kernel before booting image generated with this Dracut version."
+		ewarn ""
+
+		local CONFIG_CHECK="~BLK_DEV_INITRD ~DEVTMPFS"
+
+		# Kernel configuration options descriptions:
+		local desc_DEVTMPFS="Maintain a devtmpfs filesystem to mount at /dev"
+		local desc_BLK_DEV_INITRD="Initial RAM filesystem and RAM disk "\
+"(initramfs/initrd) support"
+
+		local opt desc
+
+		# Generate ERROR_* variables for check_extra_config.
+		for opt in ${CONFIG_CHECK}; do
+			opt=${opt#\~}
+			desc=desc_${opt}
+			eval "local ERROR_${opt}='CONFIG_${opt}: \"${!desc}\"" \
+				"is missing and REQUIRED'"
+		done
+
+		check_extra_config
+		echo
+	else
+		ewarn ""
+		ewarn "Your kernel configuration couldn't be checked.  Do you have"
+		ewarn "/usr/src/linux/.config file there?  Please check manually if"
+		ewarn "following options are enabled:"
+		ewarn ""
+		ewarn "  CONFIG_BLK_DEV_INITRD"
+		ewarn "  CONFIG_DEVTMPFS"
+		ewarn ""
+	fi
+
+	elog "To get additional features, a number of optional runtime"
+	elog "dependencies may be installed:"
+	elog ""
+	optfeature "Networking support"  net-misc/curl "net-misc/dhcp[client]" \
+		sys-apps/iproute2
+	optfeature \
+		"Measure performance of the boot process for later visualisation" \
+		app-benchmarks/bootchart2 app-admin/killproc sys-process/acct
+	optfeature "Scan for Btrfs on block devices"  sys-fs/btrfs-progs
+	optfeature "Load kernel modules and drop this privilege for real init" \
+		sys-libs/libcap
+	optfeature "Support CIFS" net-fs/cifs-utils
+	optfeature "Decrypt devices encrypted with cryptsetup/LUKS" \
+		"sys-fs/cryptsetup[-static-libs]"
+	optfeature "Support for GPG-encrypted keys for crypt module" \
+		app-crypt/gnupg
+	optfeature \
+		"Allows use of dash instead of default bash (on your own risk)" \
+		app-shells/dash
+	optfeature "Framebuffer splash (media-gfx/splashutils)" \
+		media-gfx/splashutils
+	optfeature "Support iSCSI" sys-block/open-iscsi
+	optfeature "Support Logical Volume Manager" sys-fs/lvm2
+	optfeature "Support MD devices, also known as software RAID devices" \
+		sys-fs/mdadm
+	optfeature "Support Device Mapper multipathing" sys-fs/multipath-tools
+	optfeature "Plymouth boot splash"  '>=sys-boot/plymouth-0.8.5-r5'
+	optfeature "Support network block devices" sys-block/nbd
+	optfeature "Support NFS" net-fs/nfs-utils net-nds/rpcbind
+	optfeature \
+		"Install ssh and scp along with config files and specified keys" \
+		net-misc/openssh
+	optfeature "Enable logging with syslog-ng or rsyslog" app-admin/syslog-ng \
+		app-admin/rsyslog
+}
diff --git a/sys-kernel/vhba-dkms/files/dkms.conf b/sys-kernel/vhba-dkms/files/dkms.conf
index b5cf58d9..897d014d 100644
--- a/sys-kernel/vhba-dkms/files/dkms.conf
+++ b/sys-kernel/vhba-dkms/files/dkms.conf
@@ -1,5 +1,5 @@
 PACKAGE_NAME="vhba-dkms"
-PACKAGE_VERSION="20140928"
+PACKAGE_VERSION="20170610"
 MAKE[0]="make KVER=$kernelver"
 MAKE[0]="make KV_FULL=$kernelver"
 BUILT_MODULE_NAME[0]="vhba"
diff --git a/sys-kernel/vhba-dkms/vhba-dkms-20170610-r1708.ebuild b/sys-kernel/vhba-dkms/vhba-dkms-20170610-r1708.ebuild
deleted file mode 100644
index bb5f4dc9..00000000
--- a/sys-kernel/vhba-dkms/vhba-dkms-20170610-r1708.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-inherit eutils
-
-MY_P=vhba-module-${PV}
-DESCRIPTION="Virtual (SCSI) Host Bus Adapter kernel module for the CDEmu suite sources"
-HOMEPAGE="http://cdemu.org"
-SRC_URI="mirror://sourceforge/cdemu/${MY_P}.tar.bz2"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="amd64 ~hppa x86"
-IUSE=""
-
-DEPEND="sys-kernel/dkms"
-RDEPEND="${DEPEND}"
-
-S=${WORKDIR}/${MY_P}
-
-src_prepare() {
-	sed -e '/ccflags/s/-Werror$/-Wall/' \
-		-i Makefile || die "sed failed"
-}
-
-src_compile() {
-	:
-}
-
-src_install() {
-	cp "${FILESDIR}/dkms.conf" "${S}" || die
-	dodir /usr/src/${P}
-	insinto /usr/src/${P}
-	doins -r "${S}"/*
-}
-
-pkg_postinst() {
-	dkms add ${PN}/${PV}
-}
-
-pkg_prerm() {
-	dkms remove ${PN}/${PV} --all
-}
-
diff --git a/sys-kernel/vhba-dkms/vhba-dkms-20170610-r1710.ebuild b/sys-kernel/vhba-dkms/vhba-dkms-20170610-r1710.ebuild
new file mode 100644
index 00000000..bb5f4dc9
--- /dev/null
+++ b/sys-kernel/vhba-dkms/vhba-dkms-20170610-r1710.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+
+inherit eutils
+
+MY_P=vhba-module-${PV}
+DESCRIPTION="Virtual (SCSI) Host Bus Adapter kernel module for the CDEmu suite sources"
+HOMEPAGE="http://cdemu.org"
+SRC_URI="mirror://sourceforge/cdemu/${MY_P}.tar.bz2"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="amd64 ~hppa x86"
+IUSE=""
+
+DEPEND="sys-kernel/dkms"
+RDEPEND="${DEPEND}"
+
+S=${WORKDIR}/${MY_P}
+
+src_prepare() {
+	sed -e '/ccflags/s/-Werror$/-Wall/' \
+		-i Makefile || die "sed failed"
+}
+
+src_compile() {
+	:
+}
+
+src_install() {
+	cp "${FILESDIR}/dkms.conf" "${S}" || die
+	dodir /usr/src/${P}
+	insinto /usr/src/${P}
+	doins -r "${S}"/*
+}
+
+pkg_postinst() {
+	dkms add ${PN}/${PV}
+}
+
+pkg_prerm() {
+	dkms remove ${PN}/${PV} --all
+}
+
diff --git a/sys-power/bbswitch/bbswitch-0.8-r1708.ebuild b/sys-power/bbswitch/bbswitch-0.8-r1708.ebuild
deleted file mode 100644
index b0a25a9f..00000000
--- a/sys-power/bbswitch/bbswitch-0.8-r1708.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit eutils
-
-DESCRIPTION="Toggle discrete NVIDIA Optimus graphics card"
-HOMEPAGE="https://github.com/Bumblebee-Project/bbswitch"
-SLOT="0"
-LICENSE="GPL-3+"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-DEPEND="~sys-kernel/${PN}-dkms-${PV}"
-RDEPEND="${DEPEND}"
-
-S=${WORKDIR}
-
-src_install() {
-	insinto /etc/modprobe.d
-	newins "${FILESDIR}"/bbswitch.modprobe bbswitch.conf
-}
diff --git a/sys-power/bbswitch/bbswitch-0.8-r1710.ebuild b/sys-power/bbswitch/bbswitch-0.8-r1710.ebuild
new file mode 100644
index 00000000..b0a25a9f
--- /dev/null
+++ b/sys-power/bbswitch/bbswitch-0.8-r1710.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit eutils
+
+DESCRIPTION="Toggle discrete NVIDIA Optimus graphics card"
+HOMEPAGE="https://github.com/Bumblebee-Project/bbswitch"
+SLOT="0"
+LICENSE="GPL-3+"
+KEYWORDS="amd64 x86"
+IUSE=""
+
+DEPEND="~sys-kernel/${PN}-dkms-${PV}"
+RDEPEND="${DEPEND}"
+
+S=${WORKDIR}
+
+src_install() {
+	insinto /etc/modprobe.d
+	newins "${FILESDIR}"/bbswitch.modprobe bbswitch.conf
+}
-- 
cgit v1.2.3