From bcbe825eddc9375f384241dc6b01a98d2254d77e Mon Sep 17 00:00:00 2001
From: V3n3RiX <venerix@redcorelinux.org>
Date: Sun, 23 Jul 2017 14:42:18 +0100
Subject: install all dkms modules under /lib/modules/4.9.39-redcore/extra/dkms

---
 .../bbswitch-dkms/bbswitch-dkms-0.8-r1706.ebuild   | 45 +++++++++++++++++
 sys-kernel/bbswitch-dkms/bbswitch-dkms-0.8.ebuild  | 45 -----------------
 .../files/bbswitch-dkms-0.8-conf.patch             |  2 +-
 .../broadcom-sta-dkms-6.30.223.271-r1706.ebuild    | 56 ++++++++++++++++++++++
 .../broadcom-sta-dkms-6.30.223.271.ebuild          | 56 ----------------------
 sys-kernel/broadcom-sta-dkms/files/dkms.conf       |  2 +-
 .../files/nvidia-drivers-dkms-381.22-conf.patch    |  8 ++--
 .../nvidia-drivers-dkms-381.22-r1706.ebuild        | 46 ++++++++++++++++++
 .../nvidia-drivers-dkms-381.22.ebuild              | 46 ------------------
 sys-kernel/spl-dkms/files/dkms.conf                |  4 +-
 sys-kernel/spl-dkms/spl-dkms-0.6.5.9-r1706.ebuild  | 53 ++++++++++++++++++++
 sys-kernel/spl-dkms/spl-dkms-0.6.5.9.ebuild        | 53 --------------------
 sys-kernel/tp_smapi-dkms/files/dkms.conf           |  4 +-
 .../tp_smapi-dkms/tp_smapi-dkms-0.42-r1706.ebuild  | 47 ++++++++++++++++++
 sys-kernel/tp_smapi-dkms/tp_smapi-dkms-0.42.ebuild | 47 ------------------
 sys-kernel/vhba-dkms/files/dkms.conf               |  2 +-
 .../vhba-dkms/vhba-dkms-20140928-r1706.ebuild      | 46 ++++++++++++++++++
 sys-kernel/vhba-dkms/vhba-dkms-20140928.ebuild     | 46 ------------------
 sys-kernel/virtualbox-guest-dkms/files/dkms.patch  | 19 ++++++--
 sys-kernel/virtualbox-modules-dkms/files/dkms.conf |  8 ++--
 sys-kernel/zfs-dkms/files/dkms.conf                | 12 ++---
 sys-kernel/zfs-dkms/zfs-dkms-0.6.5.9-r1706.ebuild  | 53 ++++++++++++++++++++
 sys-kernel/zfs-dkms/zfs-dkms-0.6.5.9.ebuild        | 53 --------------------
 23 files changed, 383 insertions(+), 370 deletions(-)
 create mode 100644 sys-kernel/bbswitch-dkms/bbswitch-dkms-0.8-r1706.ebuild
 delete mode 100644 sys-kernel/bbswitch-dkms/bbswitch-dkms-0.8.ebuild
 create mode 100644 sys-kernel/broadcom-sta-dkms/broadcom-sta-dkms-6.30.223.271-r1706.ebuild
 delete mode 100644 sys-kernel/broadcom-sta-dkms/broadcom-sta-dkms-6.30.223.271.ebuild
 create mode 100644 sys-kernel/nvidia-drivers-dkms/nvidia-drivers-dkms-381.22-r1706.ebuild
 delete mode 100644 sys-kernel/nvidia-drivers-dkms/nvidia-drivers-dkms-381.22.ebuild
 create mode 100644 sys-kernel/spl-dkms/spl-dkms-0.6.5.9-r1706.ebuild
 delete mode 100644 sys-kernel/spl-dkms/spl-dkms-0.6.5.9.ebuild
 create mode 100644 sys-kernel/tp_smapi-dkms/tp_smapi-dkms-0.42-r1706.ebuild
 delete mode 100644 sys-kernel/tp_smapi-dkms/tp_smapi-dkms-0.42.ebuild
 create mode 100644 sys-kernel/vhba-dkms/vhba-dkms-20140928-r1706.ebuild
 delete mode 100644 sys-kernel/vhba-dkms/vhba-dkms-20140928.ebuild
 create mode 100644 sys-kernel/zfs-dkms/zfs-dkms-0.6.5.9-r1706.ebuild
 delete mode 100644 sys-kernel/zfs-dkms/zfs-dkms-0.6.5.9.ebuild

diff --git a/sys-kernel/bbswitch-dkms/bbswitch-dkms-0.8-r1706.ebuild b/sys-kernel/bbswitch-dkms/bbswitch-dkms-0.8-r1706.ebuild
new file mode 100644
index 00000000..b02911ec
--- /dev/null
+++ b/sys-kernel/bbswitch-dkms/bbswitch-dkms-0.8-r1706.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/bbswitch-dkms/bbswitch-dkms-0.8.ebuild b/sys-kernel/bbswitch-dkms/bbswitch-dkms-0.8.ebuild
deleted file mode 100644
index b02911ec..00000000
--- a/sys-kernel/bbswitch-dkms/bbswitch-dkms-0.8.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/files/bbswitch-dkms-0.8-conf.patch b/sys-kernel/bbswitch-dkms/files/bbswitch-dkms-0.8-conf.patch
index 4b1447a4..2afeb051 100644
--- a/sys-kernel/bbswitch-dkms/files/bbswitch-dkms-0.8-conf.patch
+++ b/sys-kernel/bbswitch-dkms/files/bbswitch-dkms-0.8-conf.patch
@@ -21,7 +21,7 @@ diff -Nur a/dkms.conf b/dkms.conf
 +CLEAN="make clean"
 +
 +BUILT_MODULE_NAME[0]="bbswitch"
-+DEST_MODULE_LOCATION[0]="/kernel/drivers/acpi"
++DEST_MODULE_LOCATION[0]="/extra/dkms"
 diff -Nur a/Makefile.dkms b/Makefile.dkms
 --- a/Makefile.dkms	2013-12-04 23:22:06.000000000 +0000
 +++ b/Makefile.dkms	1970-01-01 01:00:00.000000000 +0100
diff --git a/sys-kernel/broadcom-sta-dkms/broadcom-sta-dkms-6.30.223.271-r1706.ebuild b/sys-kernel/broadcom-sta-dkms/broadcom-sta-dkms-6.30.223.271-r1706.ebuild
new file mode 100644
index 00000000..566d93ed
--- /dev/null
+++ b/sys-kernel/broadcom-sta-dkms/broadcom-sta-dkms-6.30.223.271-r1706.ebuild
@@ -0,0 +1,56 @@
+# 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="x86? ( ${SRC_BASE}-nodebug-pcoem-${PV//\./_}.tar.gz )
+	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 x86"
+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-r3-linux-4.7.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.ebuild b/sys-kernel/broadcom-sta-dkms/broadcom-sta-dkms-6.30.223.271.ebuild
deleted file mode 100644
index 566d93ed..00000000
--- a/sys-kernel/broadcom-sta-dkms/broadcom-sta-dkms-6.30.223.271.ebuild
+++ /dev/null
@@ -1,56 +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="x86? ( ${SRC_BASE}-nodebug-pcoem-${PV//\./_}.tar.gz )
-	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 x86"
-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-r3-linux-4.7.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/files/dkms.conf b/sys-kernel/broadcom-sta-dkms/files/dkms.conf
index f10e1c5a..362d2a28 100644
--- a/sys-kernel/broadcom-sta-dkms/files/dkms.conf
+++ b/sys-kernel/broadcom-sta-dkms/files/dkms.conf
@@ -3,6 +3,6 @@ PACKAGE_VERSION="6.30.223.271"
 MAKE[0]="make KVER=$kernelver"
 MAKE[0]="make KV_FULL=$kernelver"
 BUILT_MODULE_NAME[0]="wl"
-DEST_MODULE_LOCATION[0]="/kernel/net/wireless"
+DEST_MODULE_LOCATION[0]="/extra/dkms"
 AUTOINSTALL="YES"
 
diff --git a/sys-kernel/nvidia-drivers-dkms/files/nvidia-drivers-dkms-381.22-conf.patch b/sys-kernel/nvidia-drivers-dkms/files/nvidia-drivers-dkms-381.22-conf.patch
index a48450a1..3a859247 100644
--- a/sys-kernel/nvidia-drivers-dkms/files/nvidia-drivers-dkms-381.22-conf.patch
+++ b/sys-kernel/nvidia-drivers-dkms/files/nvidia-drivers-dkms-381.22-conf.patch
@@ -18,11 +18,11 @@ diff -Nur a/kernel/dkms.conf b/kernel/dkms.conf
  # The list of kernel modules will be generated by nvidia-installer at runtime.
 -__DKMS_MODULES
 +BUILT_MODULE_NAME[0]="nvidia"
-+DEST_MODULE_LOCATION[0]="/kernel/drivers/video"
++DEST_MODULE_LOCATION[0]="/extra/dkms"
 +BUILT_MODULE_NAME[1]="nvidia-uvm"
-+DEST_MODULE_LOCATION[1]="/kernel/drivers/video"
++DEST_MODULE_LOCATION[1]="/extra/dkms"
 +BUILT_MODULE_NAME[2]="nvidia-modeset"
-+DEST_MODULE_LOCATION[2]="/kernel/drivers/video"
++DEST_MODULE_LOCATION[2]="/extra/dkms"
 +BUILT_MODULE_NAME[3]="nvidia-drm"
-+DEST_MODULE_LOCATION[3]="/kernel/drivers/video"
++DEST_MODULE_LOCATION[3]="/extra/dkms"
 +
diff --git a/sys-kernel/nvidia-drivers-dkms/nvidia-drivers-dkms-381.22-r1706.ebuild b/sys-kernel/nvidia-drivers-dkms/nvidia-drivers-dkms-381.22-r1706.ebuild
new file mode 100644
index 00000000..b1c31c79
--- /dev/null
+++ b/sys-kernel/nvidia-drivers-dkms/nvidia-drivers-dkms-381.22-r1706.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit eutils
+
+NV_URI="http://us.download.nvidia.com/XFree86/"
+AMD64_NV_PACKAGE="NVIDIA-Linux-x86_64-${PV}"
+
+DESCRIPTION="NVIDIA driver sources for linux"
+HOMEPAGE="http://www.nvidia.com/"
+SRC_URI="amd64? ( ${NV_URI}Linux-x86_64/${PV}/${AMD64_NV_PACKAGE}.run )"
+
+LICENSE="GPL-2 NVIDIA-r2"
+SLOT="0"
+KEYWORDS="amd64"
+IUSE=""
+
+DEPEND="sys-kernel/dkms"
+RDEPEND="${DEPEND}"
+
+S="${WORKDIR}/${AMD64_NV_PACKAGE}"
+
+src_unpack() {
+	sh ${DISTDIR}/${AMD64_NV_PACKAGE}.run --extract-only
+}
+
+src_prepare() {
+	epatch ${FILESDIR}/${P}-conf.patch
+}
+
+src_install() {
+	dodir /usr/src/${P}
+	insinto /usr/src/${P}
+	doins -r "${S}"/kernel/*
+}
+
+pkg_postinst() {
+	dkms add ${PN}/${PV}
+}
+
+pkg_prerm() {
+	dkms remove ${PN}/${PV} --all
+}
diff --git a/sys-kernel/nvidia-drivers-dkms/nvidia-drivers-dkms-381.22.ebuild b/sys-kernel/nvidia-drivers-dkms/nvidia-drivers-dkms-381.22.ebuild
deleted file mode 100644
index b1c31c79..00000000
--- a/sys-kernel/nvidia-drivers-dkms/nvidia-drivers-dkms-381.22.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit eutils
-
-NV_URI="http://us.download.nvidia.com/XFree86/"
-AMD64_NV_PACKAGE="NVIDIA-Linux-x86_64-${PV}"
-
-DESCRIPTION="NVIDIA driver sources for linux"
-HOMEPAGE="http://www.nvidia.com/"
-SRC_URI="amd64? ( ${NV_URI}Linux-x86_64/${PV}/${AMD64_NV_PACKAGE}.run )"
-
-LICENSE="GPL-2 NVIDIA-r2"
-SLOT="0"
-KEYWORDS="amd64"
-IUSE=""
-
-DEPEND="sys-kernel/dkms"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/${AMD64_NV_PACKAGE}"
-
-src_unpack() {
-	sh ${DISTDIR}/${AMD64_NV_PACKAGE}.run --extract-only
-}
-
-src_prepare() {
-	epatch ${FILESDIR}/${P}-conf.patch
-}
-
-src_install() {
-	dodir /usr/src/${P}
-	insinto /usr/src/${P}
-	doins -r "${S}"/kernel/*
-}
-
-pkg_postinst() {
-	dkms add ${PN}/${PV}
-}
-
-pkg_prerm() {
-	dkms remove ${PN}/${PV} --all
-}
diff --git a/sys-kernel/spl-dkms/files/dkms.conf b/sys-kernel/spl-dkms/files/dkms.conf
index 8ac2b1a7..dd24ee17 100644
--- a/sys-kernel/spl-dkms/files/dkms.conf
+++ b/sys-kernel/spl-dkms/files/dkms.conf
@@ -51,7 +51,7 @@ STRIP[0]="$(
 STRIP[1]="${STRIP[0]}"
 BUILT_MODULE_NAME[0]="spl"
 BUILT_MODULE_LOCATION[0]="module/spl/"
-DEST_MODULE_LOCATION[0]="/extra/spl/spl"
+DEST_MODULE_LOCATION[0]="/extra/dkms"
 BUILT_MODULE_NAME[1]="splat"
 BUILT_MODULE_LOCATION[1]="module/splat/"
-DEST_MODULE_LOCATION[1]="/extra/splat/splat"
+DEST_MODULE_LOCATION[1]="/extra/dkms"
diff --git a/sys-kernel/spl-dkms/spl-dkms-0.6.5.9-r1706.ebuild b/sys-kernel/spl-dkms/spl-dkms-0.6.5.9-r1706.ebuild
new file mode 100644
index 00000000..092e2431
--- /dev/null
+++ b/sys-kernel/spl-dkms/spl-dkms-0.6.5.9-r1706.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit eutils
+
+MY_PN="spl"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="Solaris Porting Layer sources for linux"
+HOMEPAGE="http://zfsonlinux.org/"
+SRC_URI="https://github.com/zfsonlinux/zfs/releases/download/zfs-${PV}/${MY_P}.tar.gz"
+
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="amd64"
+IUSE=""
+DEPEND="sys-kernel/dkms"
+RDEPEND="${DEPEND}"
+
+S="${WORKDIR}/${MY_P}"
+
+src_prepare() {
+	:
+}
+
+src_configure() {
+	:
+}
+
+src_compile() {
+	:
+}
+
+src_install() {
+	cp "${FILESDIR}/dkms.conf" "${S}" || die
+	dodir /usr/src/${P}
+	insinto /usr/src/${P}
+	doins -r ${S}/*
+	fperms 0755 /usr/src/${P}/configure
+	fperms 0755 /usr/src/${P}/scripts/dkms.mkconf
+	fperms 0755 /usr/src/${P}/scripts/dkms.postbuild
+}
+
+pkg_postinst() {
+	dkms add ${PN}/${PV}
+}
+
+pkg_prerm() {
+	dkms remove ${PN}/${PV} --all
+}
diff --git a/sys-kernel/spl-dkms/spl-dkms-0.6.5.9.ebuild b/sys-kernel/spl-dkms/spl-dkms-0.6.5.9.ebuild
deleted file mode 100644
index 092e2431..00000000
--- a/sys-kernel/spl-dkms/spl-dkms-0.6.5.9.ebuild
+++ /dev/null
@@ -1,53 +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="spl"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="Solaris Porting Layer sources for linux"
-HOMEPAGE="http://zfsonlinux.org/"
-SRC_URI="https://github.com/zfsonlinux/zfs/releases/download/zfs-${PV}/${MY_P}.tar.gz"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="amd64"
-IUSE=""
-DEPEND="sys-kernel/dkms"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/${MY_P}"
-
-src_prepare() {
-	:
-}
-
-src_configure() {
-	:
-}
-
-src_compile() {
-	:
-}
-
-src_install() {
-	cp "${FILESDIR}/dkms.conf" "${S}" || die
-	dodir /usr/src/${P}
-	insinto /usr/src/${P}
-	doins -r ${S}/*
-	fperms 0755 /usr/src/${P}/configure
-	fperms 0755 /usr/src/${P}/scripts/dkms.mkconf
-	fperms 0755 /usr/src/${P}/scripts/dkms.postbuild
-}
-
-pkg_postinst() {
-	dkms add ${PN}/${PV}
-}
-
-pkg_prerm() {
-	dkms remove ${PN}/${PV} --all
-}
diff --git a/sys-kernel/tp_smapi-dkms/files/dkms.conf b/sys-kernel/tp_smapi-dkms/files/dkms.conf
index b6bedb49..554235a0 100644
--- a/sys-kernel/tp_smapi-dkms/files/dkms.conf
+++ b/sys-kernel/tp_smapi-dkms/files/dkms.conf
@@ -3,7 +3,7 @@ PACKAGE_VERSION="0.42"
 MAKE[0]="make KVER=$kernelver"
 MAKE[0]="make KV_FULL=$kernelver"
 BUILT_MODULE_NAME[0]="tp_smapi"
-DEST_MODULE_LOCATION[0]="/extra"
+DEST_MODULE_LOCATION[0]="/extra/dkms"
 BUILT_MODULE_NAME[1]="thinkpad_ec"
-DEST_MODULE_LOCATION[1]="/extra"
+DEST_MODULE_LOCATION[1]="/extra/dkms"
 AUTOINSTALL="YES"
diff --git a/sys-kernel/tp_smapi-dkms/tp_smapi-dkms-0.42-r1706.ebuild b/sys-kernel/tp_smapi-dkms/tp_smapi-dkms-0.42-r1706.ebuild
new file mode 100644
index 00000000..90df1ff3
--- /dev/null
+++ b/sys-kernel/tp_smapi-dkms/tp_smapi-dkms-0.42-r1706.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit eutils
+
+MY_PN="tp_smapi"
+MY_P="${MY_PN}-${PVR}"
+DESCRIPTION="IBM ThinkPad SMAPI BIOS driver"
+HOMEPAGE="https://github.com/evgeni/${MY_PN}/"
+SRC_URI="${HOMEPAGE}/releases/download/${MY_PN}/${PV}/${MY_PN}-${PV}.tgz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE=""
+
+DEPEND="sys-kernel/dkms"
+RDEPEND="${DEPEND}"
+
+S="${WORKDIR}/${MY_P}"
+
+
+src_prepare(){
+	:
+}
+
+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/tp_smapi-dkms/tp_smapi-dkms-0.42.ebuild b/sys-kernel/tp_smapi-dkms/tp_smapi-dkms-0.42.ebuild
deleted file mode 100644
index 90df1ff3..00000000
--- a/sys-kernel/tp_smapi-dkms/tp_smapi-dkms-0.42.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit eutils
-
-MY_PN="tp_smapi"
-MY_P="${MY_PN}-${PVR}"
-DESCRIPTION="IBM ThinkPad SMAPI BIOS driver"
-HOMEPAGE="https://github.com/evgeni/${MY_PN}/"
-SRC_URI="${HOMEPAGE}/releases/download/${MY_PN}/${PV}/${MY_PN}-${PV}.tgz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-DEPEND="sys-kernel/dkms"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/${MY_P}"
-
-
-src_prepare(){
-	:
-}
-
-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/files/dkms.conf b/sys-kernel/vhba-dkms/files/dkms.conf
index 3f49d266..b5cf58d9 100644
--- a/sys-kernel/vhba-dkms/files/dkms.conf
+++ b/sys-kernel/vhba-dkms/files/dkms.conf
@@ -3,5 +3,5 @@ PACKAGE_VERSION="20140928"
 MAKE[0]="make KVER=$kernelver"
 MAKE[0]="make KV_FULL=$kernelver"
 BUILT_MODULE_NAME[0]="vhba"
-DEST_MODULE_LOCATION[0]="/extra"
+DEST_MODULE_LOCATION[0]="/extra/dkms"
 AUTOINSTALL="YES"
diff --git a/sys-kernel/vhba-dkms/vhba-dkms-20140928-r1706.ebuild b/sys-kernel/vhba-dkms/vhba-dkms-20140928-r1706.ebuild
new file mode 100644
index 00000000..bb5f4dc9
--- /dev/null
+++ b/sys-kernel/vhba-dkms/vhba-dkms-20140928-r1706.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-kernel/vhba-dkms/vhba-dkms-20140928.ebuild b/sys-kernel/vhba-dkms/vhba-dkms-20140928.ebuild
deleted file mode 100644
index bb5f4dc9..00000000
--- a/sys-kernel/vhba-dkms/vhba-dkms-20140928.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/virtualbox-guest-dkms/files/dkms.patch b/sys-kernel/virtualbox-guest-dkms/files/dkms.patch
index e9d2e3a9..819e76f1 100644
--- a/sys-kernel/virtualbox-guest-dkms/files/dkms.patch
+++ b/sys-kernel/virtualbox-guest-dkms/files/dkms.patch
@@ -1,7 +1,7 @@
 diff -Nur a/dkms.conf b/dkms.conf
---- a/dkms.conf	2016-10-25 17:45:45.245376701 +0100
-+++ b/dkms.conf	2016-10-25 17:46:28.523379606 +0100
-@@ -14,8 +14,8 @@
+--- a/dkms.conf	2017-07-18 12:50:58.000000000 +0100
++++ b/dkms.conf	2017-07-23 14:40:45.746169005 +0100
+@@ -14,18 +14,18 @@
  # hope that it will be useful, but WITHOUT ANY WARRANTY of any kind.
  #
  
@@ -12,3 +12,16 @@ diff -Nur a/dkms.conf b/dkms.conf
  AUTOINSTALL=yes
  
  BUILT_MODULE_NAME[0]="vboxguest"
+ BUILT_MODULE_LOCATION[0]="vboxguest"
+-DEST_MODULE_LOCATION[0]="/kernel/misc"
++DEST_MODULE_LOCATION[0]="/extra/dkms"
+ 
+ BUILT_MODULE_NAME[1]="vboxsf"
+ BUILT_MODULE_LOCATION[1]="vboxsf"
+-DEST_MODULE_LOCATION[1]="/kernel/misc"
++DEST_MODULE_LOCATION[1]="/extra/dkms"
+ 
+ BUILT_MODULE_NAME[2]="vboxvideo"
+ BUILT_MODULE_LOCATION[2]="vboxvideo"
+-DEST_MODULE_LOCATION[2]="/kernel/misc"
++DEST_MODULE_LOCATION[2]="/extra/dkms"
diff --git a/sys-kernel/virtualbox-modules-dkms/files/dkms.conf b/sys-kernel/virtualbox-modules-dkms/files/dkms.conf
index 99dd46eb..5f6fe6a9 100644
--- a/sys-kernel/virtualbox-modules-dkms/files/dkms.conf
+++ b/sys-kernel/virtualbox-modules-dkms/files/dkms.conf
@@ -5,11 +5,11 @@ AUTOINSTALL="yes"
 MAKE[0]="'make' -j`nproc` KERNEL_UNAME=${kernelver}"
 
 BUILT_MODULE_NAME[0]="vboxdrv"
-DEST_MODULE_LOCATION[0]="/kernel/misc"
+DEST_MODULE_LOCATION[0]="/extra/dkms"
 BUILT_MODULE_NAME[1]="vboxnetflt"
-DEST_MODULE_LOCATION[1]="/kernel/misc"
+DEST_MODULE_LOCATION[1]="/extra/dkms"
 BUILT_MODULE_NAME[2]="vboxnetadp"
-DEST_MODULE_LOCATION[2]="/kernel/misc"
+DEST_MODULE_LOCATION[2]="/extra/dkms"
 BUILT_MODULE_NAME[3]="vboxpci"
-DEST_MODULE_LOCATION[3]="/kernel/misc"
+DEST_MODULE_LOCATION[3]="/extra/dkms"
 
diff --git a/sys-kernel/zfs-dkms/files/dkms.conf b/sys-kernel/zfs-dkms/files/dkms.conf
index a5b3e9f9..1d96fb47 100644
--- a/sys-kernel/zfs-dkms/files/dkms.conf
+++ b/sys-kernel/zfs-dkms/files/dkms.conf
@@ -51,19 +51,19 @@ STRIP[4]="${STRIP[0]}"
 STRIP[5]="${STRIP[0]}"
 BUILT_MODULE_NAME[0]="zavl"
 BUILT_MODULE_LOCATION[0]="module/avl/"
-DEST_MODULE_LOCATION[0]="/extra/avl/avl"
+DEST_MODULE_LOCATION[0]="/extra/dkms"
 BUILT_MODULE_NAME[1]="znvpair"
 BUILT_MODULE_LOCATION[1]="module/nvpair/"
-DEST_MODULE_LOCATION[1]="/extra/nvpair/znvpair"
+DEST_MODULE_LOCATION[1]="/extra/dkms"
 BUILT_MODULE_NAME[2]="zunicode"
 BUILT_MODULE_LOCATION[2]="module/unicode/"
-DEST_MODULE_LOCATION[2]="/extra/unicode/zunicode"
+DEST_MODULE_LOCATION[2]="/extra/dkms"
 BUILT_MODULE_NAME[3]="zcommon"
 BUILT_MODULE_LOCATION[3]="module/zcommon/"
-DEST_MODULE_LOCATION[3]="/extra/zcommon/zcommon"
+DEST_MODULE_LOCATION[3]="/extra/dkms"
 BUILT_MODULE_NAME[4]="zfs"
 BUILT_MODULE_LOCATION[4]="module/zfs/"
-DEST_MODULE_LOCATION[4]="/extra/zfs/zfs"
+DEST_MODULE_LOCATION[4]="/extra/dkms"
 BUILT_MODULE_NAME[5]="zpios"
 BUILT_MODULE_LOCATION[5]="module/zpios/"
-DEST_MODULE_LOCATION[5]="/extra/zpios/zpios"
+DEST_MODULE_LOCATION[5]="/extra/dkms"
diff --git a/sys-kernel/zfs-dkms/zfs-dkms-0.6.5.9-r1706.ebuild b/sys-kernel/zfs-dkms/zfs-dkms-0.6.5.9-r1706.ebuild
new file mode 100644
index 00000000..c25f3b9b
--- /dev/null
+++ b/sys-kernel/zfs-dkms/zfs-dkms-0.6.5.9-r1706.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit eutils
+
+MY_PN="zfs"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="ZFS sources for linux"
+HOMEPAGE="http://zfsonlinux.org/"
+SRC_URI="https://github.com/zfsonlinux/zfs/releases/download/zfs-${PV}/${MY_P}.tar.gz"
+
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="amd64"
+IUSE=""
+DEPEND="sys-kernel/dkms"
+RDEPEND="${DEPEND}"
+
+S="${WORKDIR}/${MY_P}"
+
+src_prepare() {
+	:
+}
+
+src_configure() {
+	:
+}
+
+src_compile() {
+	:
+}
+
+src_install() {
+	cp "${FILESDIR}/dkms.conf" "${S}" || die
+	dodir /usr/src/${P}
+	insinto /usr/src/${P}
+	doins -r ${S}/*
+	fperms 0755 /usr/src/${P}/configure
+	fperms 0755 /usr/src/${P}/scripts/dkms.mkconf
+	fperms 0755 /usr/src/${P}/scripts/dkms.postbuild
+}
+
+pkg_postinst() {
+	dkms add ${PN}/${PV}
+}
+
+pkg_prerm() {
+	dkms remove ${PN}/${PV} --all
+}
diff --git a/sys-kernel/zfs-dkms/zfs-dkms-0.6.5.9.ebuild b/sys-kernel/zfs-dkms/zfs-dkms-0.6.5.9.ebuild
deleted file mode 100644
index c25f3b9b..00000000
--- a/sys-kernel/zfs-dkms/zfs-dkms-0.6.5.9.ebuild
+++ /dev/null
@@ -1,53 +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="zfs"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="ZFS sources for linux"
-HOMEPAGE="http://zfsonlinux.org/"
-SRC_URI="https://github.com/zfsonlinux/zfs/releases/download/zfs-${PV}/${MY_P}.tar.gz"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="amd64"
-IUSE=""
-DEPEND="sys-kernel/dkms"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/${MY_P}"
-
-src_prepare() {
-	:
-}
-
-src_configure() {
-	:
-}
-
-src_compile() {
-	:
-}
-
-src_install() {
-	cp "${FILESDIR}/dkms.conf" "${S}" || die
-	dodir /usr/src/${P}
-	insinto /usr/src/${P}
-	doins -r ${S}/*
-	fperms 0755 /usr/src/${P}/configure
-	fperms 0755 /usr/src/${P}/scripts/dkms.mkconf
-	fperms 0755 /usr/src/${P}/scripts/dkms.postbuild
-}
-
-pkg_postinst() {
-	dkms add ${PN}/${PV}
-}
-
-pkg_prerm() {
-	dkms remove ${PN}/${PV} --all
-}
-- 
cgit v1.2.3