sys-kernel/genkernel: git-2->git-r3, general cleanup.

Swapped eutils for epatch, as its the only function 'from' eutils
actually used.

Package-Manager: Portage-2.3.31, Repoman-2.3.9
(cherry picked from commit 05f68bebf4b0a8129e5a3b0159972e1f80c453b4)
Signed-off-by: Robin H. Johnson <robbat2@gentoo.org>
Closes: https://github.com/gentoo/gentoo/pull/8112

12 files changed, 70 insertions, 166 deletions

diff --git a/sys-kernel/genkernel/genkernel-3.4.52.3.ebuild b/sys-kernel/genkernel/genkernel-3.4.52.3.ebuild
index 3ccaa2a85bfe..d68852ad3a7d 100644
--- a/sys-kernel/genkernel/genkernel-3.4.52.3.ebuild
+++ b/sys-kernel/genkernel/genkernel-3.4.52.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 # genkernel-9999        -> latest Git branch "master"
@@ -6,6 +6,8 @@
 
 EAPI=5 # approved 2012.09.11, required by all profiles since 2014.03.12
 
+inherit bash-completion-r1 epatch
+
 VERSION_BUSYBOX='1.20.2'
 VERSION_DMRAID='1.0.0.rc16-3'
 VERSION_MDADM='3.1.5'
@@ -34,13 +36,11 @@ COMMON_URI="${DM_HOME}/dmraid-${VERSION_DMRAID}.tar.bz2
 
 if [[ ${PV} == 9999* ]]
 then
-	EGIT_REPO_URI="git://anongit.gentoo.org/proj/${PN}.git
-		https://anongit.gentoo.org/git/proj/${PN}.git"
-	inherit git-2 bash-completion-r1 eutils
-	S="${WORKDIR}/${PN}"
+	EGIT_REPO_URI="https://anongit.gentoo.org/git/proj/${PN}.git"
+	inherit git-r3
+	S="${WORKDIR}/${P}"
 	SRC_URI="${COMMON_URI}"
 else
-	inherit bash-completion-r1 eutils
 	SRC_URI="https://dev.gentoo.org/~zerochaos/distfiles/${P}.tar.xz
 		${COMMON_URI}"
 	KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86"
@@ -77,14 +77,6 @@ pkg_pretend() {
 	fi
 }
 
-src_unpack() {
-	if [[ ${PV} == 9999* ]] ; then
-		git-2_src_unpack
-	else
-		unpack ${P}.tar.xz
-	fi
-}
-
 src_prepare() {
 	if [[ ${PV} == 9999* ]] ; then
 		einfo "Producing ChangeLog from Git history..."
diff --git a/sys-kernel/genkernel/genkernel-3.4.52.4-r1.ebuild b/sys-kernel/genkernel/genkernel-3.4.52.4-r1.ebuild
index 19782837c8b3..c33c583ed958 100644
--- a/sys-kernel/genkernel/genkernel-3.4.52.4-r1.ebuild
+++ b/sys-kernel/genkernel/genkernel-3.4.52.4-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 # genkernel-9999        -> latest Git branch "master"
@@ -6,6 +6,8 @@
 
 EAPI=5 # approved 2012.09.11, required by all profiles since 2014.03.12
 
+inherit bash-completion-r1 epatch
+
 VERSION_BUSYBOX='1.20.2'
 VERSION_DMRAID='1.0.0.rc16-3'
 VERSION_MDADM='3.1.5'
@@ -34,13 +36,11 @@ COMMON_URI="${DM_HOME}/dmraid-${VERSION_DMRAID}.tar.bz2
 
 if [[ ${PV} == 9999* ]]
 then
-	EGIT_REPO_URI="git://anongit.gentoo.org/proj/${PN}.git
-		https://anongit.gentoo.org/git/proj/${PN}.git"
-	inherit git-2 bash-completion-r1 eutils
-	S="${WORKDIR}/${PN}"
+	EGIT_REPO_URI="https://anongit.gentoo.org/git/proj/${PN}.git"
+	inherit git-r3
+	S="${WORKDIR}/${P}"
 	SRC_URI="${COMMON_URI}"
 else
-	inherit bash-completion-r1 eutils
 	SRC_URI="https://dev.gentoo.org/~zerochaos/distfiles/${P}.tar.xz
 		${COMMON_URI}"
 	KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 s390 ~sh ~sparc ~x86"
@@ -77,14 +77,6 @@ pkg_pretend() {
 	fi
 }
 
-src_unpack() {
-	if [[ ${PV} == 9999* ]] ; then
-		git-2_src_unpack
-	else
-		unpack ${P}.tar.xz
-	fi
-}
-
 src_prepare() {
 	if [[ ${PV} == 9999* ]] ; then
 		einfo "Producing ChangeLog from Git history..."
diff --git a/sys-kernel/genkernel/genkernel-3.4.52.4-r2.ebuild b/sys-kernel/genkernel/genkernel-3.4.52.4-r2.ebuild
index 1a919d3d126f..017c88e07847 100644
--- a/sys-kernel/genkernel/genkernel-3.4.52.4-r2.ebuild
+++ b/sys-kernel/genkernel/genkernel-3.4.52.4-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 # genkernel-9999        -> latest Git branch "master"
@@ -6,6 +6,8 @@
 
 EAPI=5 # approved 2012.09.11, required by all profiles since 2014.03.12
 
+inherit bash-completion-r1 epatch
+
 VERSION_BUSYBOX='1.20.2'
 VERSION_DMRAID='1.0.0.rc16-3'
 VERSION_MDADM='3.1.5'
@@ -34,13 +36,11 @@ COMMON_URI="${DM_HOME}/dmraid-${VERSION_DMRAID}.tar.bz2
 
 if [[ ${PV} == 9999* ]]
 then
-	EGIT_REPO_URI="git://anongit.gentoo.org/proj/${PN}.git
-		https://anongit.gentoo.org/git/proj/${PN}.git"
-	inherit git-2 bash-completion-r1 eutils
-	S="${WORKDIR}/${PN}"
+	EGIT_REPO_URI="https://anongit.gentoo.org/git/proj/${PN}.git"
+	inherit git-r3
+	S="${WORKDIR}/${P}"
 	SRC_URI="${COMMON_URI}"
 else
-	inherit bash-completion-r1 eutils
 	SRC_URI="https://dev.gentoo.org/~zerochaos/distfiles/${P}.tar.xz
 		${COMMON_URI}"
 	KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86"
@@ -77,14 +77,6 @@ pkg_pretend() {
 	fi
 }
 
-src_unpack() {
-	if [[ ${PV} == 9999* ]] ; then
-		git-2_src_unpack
-	else
-		unpack ${P}.tar.xz
-	fi
-}
-
 src_prepare() {
 	if [[ ${PV} == 9999* ]] ; then
 		einfo "Producing ChangeLog from Git history..."
diff --git a/sys-kernel/genkernel/genkernel-3.5.1.1.ebuild b/sys-kernel/genkernel/genkernel-3.5.1.1.ebuild
index bed5f3fcaea4..7dca6926ea2a 100644
--- a/sys-kernel/genkernel/genkernel-3.5.1.1.ebuild
+++ b/sys-kernel/genkernel/genkernel-3.5.1.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 # genkernel-9999        -> latest Git branch "master"
@@ -6,6 +6,8 @@
 
 EAPI=5 # approved 2012.09.11, required by all profiles since 2014.03.12
 
+inherit bash-completion-r1 epatch
+
 VERSION_BUSYBOX='1.26.0'
 VERSION_DMRAID='1.0.0.rc16-3'
 VERSION_MDADM='3.1.5'
@@ -34,13 +36,11 @@ COMMON_URI="${DM_HOME}/dmraid-${VERSION_DMRAID}.tar.bz2
 
 if [[ ${PV} == 9999* ]]
 then
-	EGIT_REPO_URI="git://anongit.gentoo.org/proj/${PN}.git
-		https://anongit.gentoo.org/git/proj/${PN}.git"
-	inherit git-2 bash-completion-r1 eutils
-	S="${WORKDIR}/${PN}"
+	EGIT_REPO_URI="https://anongit.gentoo.org/git/proj/${PN}.git"
+	inherit git-r3
+	S="${WORKDIR}/${P}"
 	SRC_URI="${COMMON_URI}"
 else
-	inherit bash-completion-r1 eutils
 	SRC_URI="mirror://gentoo/${P}.tar.xz
 		${COMMON_URI}"
 	KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
@@ -78,14 +78,6 @@ pkg_pretend() {
 	fi
 }
 
-src_unpack() {
-	if [[ ${PV} == 9999* ]] ; then
-		git-2_src_unpack
-	else
-		unpack ${P}.tar.xz
-	fi
-}
-
 src_prepare() {
 	if [[ ${PV} == 9999* ]] ; then
 		einfo "Updating version tag"
diff --git a/sys-kernel/genkernel/genkernel-3.5.2.0-r1.ebuild b/sys-kernel/genkernel/genkernel-3.5.2.0-r1.ebuild
index 412593ca9044..a4053e311118 100644
--- a/sys-kernel/genkernel/genkernel-3.5.2.0-r1.ebuild
+++ b/sys-kernel/genkernel/genkernel-3.5.2.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 # genkernel-9999        -> latest Git branch "master"
@@ -6,6 +6,8 @@
 
 EAPI=5 # approved 2012.09.11, required by all profiles since 2014.03.12
 
+inherit bash-completion-r1 epatch
+
 VERSION_BUSYBOX='1.27.2' # warning, be sure to bump patches
 VERSION_DMRAID='1.0.0.rc16-3' # warning, be sure to bump patches
 VERSION_MDADM='4.0' # warning, be sure to bump patches
@@ -34,13 +36,11 @@ COMMON_URI="${DM_HOME}/dmraid-${VERSION_DMRAID}.tar.bz2
 
 if [[ ${PV} == 9999* ]]
 then
-	EGIT_REPO_URI="git://anongit.gentoo.org/proj/${PN}.git
-		https://anongit.gentoo.org/git/proj/${PN}.git"
-	inherit git-2 bash-completion-r1 eutils
-	S="${WORKDIR}/${PN}"
+	EGIT_REPO_URI="https://anongit.gentoo.org/git/proj/${PN}.git"
+	inherit git-r3
+	S="${WORKDIR}/${P}"
 	SRC_URI="${COMMON_URI}"
 else
-	inherit bash-completion-r1 eutils
 	SRC_URI="mirror://gentoo/${P}.tar.xz
 		${COMMON_URI}"
 	KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
@@ -79,14 +79,6 @@ pkg_pretend() {
 	fi
 }
 
-src_unpack() {
-	if [[ ${PV} == 9999* ]] ; then
-		git-2_src_unpack
-	else
-		unpack ${P}.tar.xz
-	fi
-}
-
 src_prepare() {
 	if [[ ${PV} == 9999* ]] ; then
 		einfo "Updating version tag"
diff --git a/sys-kernel/genkernel/genkernel-3.5.2.1.ebuild b/sys-kernel/genkernel/genkernel-3.5.2.1.ebuild
index 412593ca9044..a4053e311118 100644
--- a/sys-kernel/genkernel/genkernel-3.5.2.1.ebuild
+++ b/sys-kernel/genkernel/genkernel-3.5.2.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 # genkernel-9999        -> latest Git branch "master"
@@ -6,6 +6,8 @@
 
 EAPI=5 # approved 2012.09.11, required by all profiles since 2014.03.12
 
+inherit bash-completion-r1 epatch
+
 VERSION_BUSYBOX='1.27.2' # warning, be sure to bump patches
 VERSION_DMRAID='1.0.0.rc16-3' # warning, be sure to bump patches
 VERSION_MDADM='4.0' # warning, be sure to bump patches
@@ -34,13 +36,11 @@ COMMON_URI="${DM_HOME}/dmraid-${VERSION_DMRAID}.tar.bz2
 
 if [[ ${PV} == 9999* ]]
 then
-	EGIT_REPO_URI="git://anongit.gentoo.org/proj/${PN}.git
-		https://anongit.gentoo.org/git/proj/${PN}.git"
-	inherit git-2 bash-completion-r1 eutils
-	S="${WORKDIR}/${PN}"
+	EGIT_REPO_URI="https://anongit.gentoo.org/git/proj/${PN}.git"
+	inherit git-r3
+	S="${WORKDIR}/${P}"
 	SRC_URI="${COMMON_URI}"
 else
-	inherit bash-completion-r1 eutils
 	SRC_URI="mirror://gentoo/${P}.tar.xz
 		${COMMON_URI}"
 	KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
@@ -79,14 +79,6 @@ pkg_pretend() {
 	fi
 }
 
-src_unpack() {
-	if [[ ${PV} == 9999* ]] ; then
-		git-2_src_unpack
-	else
-		unpack ${P}.tar.xz
-	fi
-}
-
 src_prepare() {
 	if [[ ${PV} == 9999* ]] ; then
 		einfo "Updating version tag"
diff --git a/sys-kernel/genkernel/genkernel-3.5.2.2.ebuild b/sys-kernel/genkernel/genkernel-3.5.2.2.ebuild
index 412593ca9044..a4053e311118 100644
--- a/sys-kernel/genkernel/genkernel-3.5.2.2.ebuild
+++ b/sys-kernel/genkernel/genkernel-3.5.2.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 # genkernel-9999        -> latest Git branch "master"
@@ -6,6 +6,8 @@
 
 EAPI=5 # approved 2012.09.11, required by all profiles since 2014.03.12
 
+inherit bash-completion-r1 epatch
+
 VERSION_BUSYBOX='1.27.2' # warning, be sure to bump patches
 VERSION_DMRAID='1.0.0.rc16-3' # warning, be sure to bump patches
 VERSION_MDADM='4.0' # warning, be sure to bump patches
@@ -34,13 +36,11 @@ COMMON_URI="${DM_HOME}/dmraid-${VERSION_DMRAID}.tar.bz2
 
 if [[ ${PV} == 9999* ]]
 then
-	EGIT_REPO_URI="git://anongit.gentoo.org/proj/${PN}.git
-		https://anongit.gentoo.org/git/proj/${PN}.git"
-	inherit git-2 bash-completion-r1 eutils
-	S="${WORKDIR}/${PN}"
+	EGIT_REPO_URI="https://anongit.gentoo.org/git/proj/${PN}.git"
+	inherit git-r3
+	S="${WORKDIR}/${P}"
 	SRC_URI="${COMMON_URI}"
 else
-	inherit bash-completion-r1 eutils
 	SRC_URI="mirror://gentoo/${P}.tar.xz
 		${COMMON_URI}"
 	KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
@@ -79,14 +79,6 @@ pkg_pretend() {
 	fi
 }
 
-src_unpack() {
-	if [[ ${PV} == 9999* ]] ; then
-		git-2_src_unpack
-	else
-		unpack ${P}.tar.xz
-	fi
-}
-
 src_prepare() {
 	if [[ ${PV} == 9999* ]] ; then
 		einfo "Updating version tag"
diff --git a/sys-kernel/genkernel/genkernel-3.5.2.3.ebuild b/sys-kernel/genkernel/genkernel-3.5.2.3.ebuild
index 412593ca9044..a4053e311118 100644
--- a/sys-kernel/genkernel/genkernel-3.5.2.3.ebuild
+++ b/sys-kernel/genkernel/genkernel-3.5.2.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 # genkernel-9999        -> latest Git branch "master"
@@ -6,6 +6,8 @@
 
 EAPI=5 # approved 2012.09.11, required by all profiles since 2014.03.12
 
+inherit bash-completion-r1 epatch
+
 VERSION_BUSYBOX='1.27.2' # warning, be sure to bump patches
 VERSION_DMRAID='1.0.0.rc16-3' # warning, be sure to bump patches
 VERSION_MDADM='4.0' # warning, be sure to bump patches
@@ -34,13 +36,11 @@ COMMON_URI="${DM_HOME}/dmraid-${VERSION_DMRAID}.tar.bz2
 
 if [[ ${PV} == 9999* ]]
 then
-	EGIT_REPO_URI="git://anongit.gentoo.org/proj/${PN}.git
-		https://anongit.gentoo.org/git/proj/${PN}.git"
-	inherit git-2 bash-completion-r1 eutils
-	S="${WORKDIR}/${PN}"
+	EGIT_REPO_URI="https://anongit.gentoo.org/git/proj/${PN}.git"
+	inherit git-r3
+	S="${WORKDIR}/${P}"
 	SRC_URI="${COMMON_URI}"
 else
-	inherit bash-completion-r1 eutils
 	SRC_URI="mirror://gentoo/${P}.tar.xz
 		${COMMON_URI}"
 	KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
@@ -79,14 +79,6 @@ pkg_pretend() {
 	fi
 }
 
-src_unpack() {
-	if [[ ${PV} == 9999* ]] ; then
-		git-2_src_unpack
-	else
-		unpack ${P}.tar.xz
-	fi
-}
-
 src_prepare() {
 	if [[ ${PV} == 9999* ]] ; then
 		einfo "Updating version tag"
diff --git a/sys-kernel/genkernel/genkernel-3.5.2.4.ebuild b/sys-kernel/genkernel/genkernel-3.5.2.4.ebuild
index 412593ca9044..a4053e311118 100644
--- a/sys-kernel/genkernel/genkernel-3.5.2.4.ebuild
+++ b/sys-kernel/genkernel/genkernel-3.5.2.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 # genkernel-9999        -> latest Git branch "master"
@@ -6,6 +6,8 @@
 
 EAPI=5 # approved 2012.09.11, required by all profiles since 2014.03.12
 
+inherit bash-completion-r1 epatch
+
 VERSION_BUSYBOX='1.27.2' # warning, be sure to bump patches
 VERSION_DMRAID='1.0.0.rc16-3' # warning, be sure to bump patches
 VERSION_MDADM='4.0' # warning, be sure to bump patches
@@ -34,13 +36,11 @@ COMMON_URI="${DM_HOME}/dmraid-${VERSION_DMRAID}.tar.bz2
 
 if [[ ${PV} == 9999* ]]
 then
-	EGIT_REPO_URI="git://anongit.gentoo.org/proj/${PN}.git
-		https://anongit.gentoo.org/git/proj/${PN}.git"
-	inherit git-2 bash-completion-r1 eutils
-	S="${WORKDIR}/${PN}"
+	EGIT_REPO_URI="https://anongit.gentoo.org/git/proj/${PN}.git"
+	inherit git-r3
+	S="${WORKDIR}/${P}"
 	SRC_URI="${COMMON_URI}"
 else
-	inherit bash-completion-r1 eutils
 	SRC_URI="mirror://gentoo/${P}.tar.xz
 		${COMMON_URI}"
 	KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
@@ -79,14 +79,6 @@ pkg_pretend() {
 	fi
 }
 
-src_unpack() {
-	if [[ ${PV} == 9999* ]] ; then
-		git-2_src_unpack
-	else
-		unpack ${P}.tar.xz
-	fi
-}
-
 src_prepare() {
 	if [[ ${PV} == 9999* ]] ; then
 		einfo "Updating version tag"
diff --git a/sys-kernel/genkernel/genkernel-3.5.2.5.ebuild b/sys-kernel/genkernel/genkernel-3.5.2.5.ebuild
index 412593ca9044..a4053e311118 100644
--- a/sys-kernel/genkernel/genkernel-3.5.2.5.ebuild
+++ b/sys-kernel/genkernel/genkernel-3.5.2.5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 # genkernel-9999        -> latest Git branch "master"
@@ -6,6 +6,8 @@
 
 EAPI=5 # approved 2012.09.11, required by all profiles since 2014.03.12
 
+inherit bash-completion-r1 epatch
+
 VERSION_BUSYBOX='1.27.2' # warning, be sure to bump patches
 VERSION_DMRAID='1.0.0.rc16-3' # warning, be sure to bump patches
 VERSION_MDADM='4.0' # warning, be sure to bump patches
@@ -34,13 +36,11 @@ COMMON_URI="${DM_HOME}/dmraid-${VERSION_DMRAID}.tar.bz2
 
 if [[ ${PV} == 9999* ]]
 then
-	EGIT_REPO_URI="git://anongit.gentoo.org/proj/${PN}.git
-		https://anongit.gentoo.org/git/proj/${PN}.git"
-	inherit git-2 bash-completion-r1 eutils
-	S="${WORKDIR}/${PN}"
+	EGIT_REPO_URI="https://anongit.gentoo.org/git/proj/${PN}.git"
+	inherit git-r3
+	S="${WORKDIR}/${P}"
 	SRC_URI="${COMMON_URI}"
 else
-	inherit bash-completion-r1 eutils
 	SRC_URI="mirror://gentoo/${P}.tar.xz
 		${COMMON_URI}"
 	KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
@@ -79,14 +79,6 @@ pkg_pretend() {
 	fi
 }
 
-src_unpack() {
-	if [[ ${PV} == 9999* ]] ; then
-		git-2_src_unpack
-	else
-		unpack ${P}.tar.xz
-	fi
-}
-
 src_prepare() {
 	if [[ ${PV} == 9999* ]] ; then
 		einfo "Updating version tag"
diff --git a/sys-kernel/genkernel/genkernel-3.5.3.2.ebuild b/sys-kernel/genkernel/genkernel-3.5.3.2.ebuild
index 3e7468aabcfd..8f31925c7a06 100644
--- a/sys-kernel/genkernel/genkernel-3.5.3.2.ebuild
+++ b/sys-kernel/genkernel/genkernel-3.5.3.2.ebuild
@@ -6,6 +6,8 @@
 
 EAPI=5 # approved 2012.09.11, required by all profiles since 2014.03.12
 
+inherit bash-completion-r1 epatch
+
 VERSION_BUSYBOX='1.27.2' # warning, be sure to bump patches
 VERSION_DMRAID='1.0.0.rc16-3' # warning, be sure to bump patches
 VERSION_MDADM='4.0' # warning, be sure to bump patches
@@ -34,13 +36,11 @@ COMMON_URI="${DM_HOME}/dmraid-${VERSION_DMRAID}.tar.bz2
 
 if [[ ${PV} == 9999* ]]
 then
-	EGIT_REPO_URI="git://anongit.gentoo.org/proj/${PN}.git
-		https://anongit.gentoo.org/git/proj/${PN}.git"
-	inherit git-2 bash-completion-r1 eutils
+	EGIT_REPO_URI="https://anongit.gentoo.org/git/proj/${PN}.git"
+	inherit git-r3
 	S="${WORKDIR}/${PN}"
 	SRC_URI="${COMMON_URI}"
 else
-	inherit bash-completion-r1 eutils
 	SRC_URI="mirror://gentoo/${P}.tar.xz
 		${COMMON_URI}"
 	KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
@@ -79,14 +79,6 @@ pkg_pretend() {
 	fi
 }
 
-src_unpack() {
-	if [[ ${PV} == 9999* ]] ; then
-		git-2_src_unpack
-	else
-		unpack ${P}.tar.xz
-	fi
-}
-
 src_prepare() {
 	if [[ ${PV} == 9999* ]] ; then
 		einfo "Updating version tag"
diff --git a/sys-kernel/genkernel/genkernel-9999.ebuild b/sys-kernel/genkernel/genkernel-9999.ebuild
index 412593ca9044..a4053e311118 100644
--- a/sys-kernel/genkernel/genkernel-9999.ebuild
+++ b/sys-kernel/genkernel/genkernel-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 # genkernel-9999        -> latest Git branch "master"
@@ -6,6 +6,8 @@
 
 EAPI=5 # approved 2012.09.11, required by all profiles since 2014.03.12
 
+inherit bash-completion-r1 epatch
+
 VERSION_BUSYBOX='1.27.2' # warning, be sure to bump patches
 VERSION_DMRAID='1.0.0.rc16-3' # warning, be sure to bump patches
 VERSION_MDADM='4.0' # warning, be sure to bump patches
@@ -34,13 +36,11 @@ COMMON_URI="${DM_HOME}/dmraid-${VERSION_DMRAID}.tar.bz2
 
 if [[ ${PV} == 9999* ]]
 then
-	EGIT_REPO_URI="git://anongit.gentoo.org/proj/${PN}.git
-		https://anongit.gentoo.org/git/proj/${PN}.git"
-	inherit git-2 bash-completion-r1 eutils
-	S="${WORKDIR}/${PN}"
+	EGIT_REPO_URI="https://anongit.gentoo.org/git/proj/${PN}.git"
+	inherit git-r3
+	S="${WORKDIR}/${P}"
 	SRC_URI="${COMMON_URI}"
 else
-	inherit bash-completion-r1 eutils
 	SRC_URI="mirror://gentoo/${P}.tar.xz
 		${COMMON_URI}"
 	KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
@@ -79,14 +79,6 @@ pkg_pretend() {
 	fi
 }
 
-src_unpack() {
-	if [[ ${PV} == 9999* ]] ; then
-		git-2_src_unpack
-	else
-		unpack ${P}.tar.xz
-	fi
-}
-
 src_prepare() {
 	if [[ ${PV} == 9999* ]] ; then
 		einfo "Updating version tag"