From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 5E5CB1382C5 for ; Mon, 23 Apr 2018 20:37:37 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 73292E0B60; Mon, 23 Apr 2018 20:37:36 +0000 (UTC) Received: from smtp.gentoo.org (dev.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 307A9E0B60 for ; Mon, 23 Apr 2018 20:37:35 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 3895D335C43 for ; Mon, 23 Apr 2018 20:37:34 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id AD11327F for ; Mon, 23 Apr 2018 20:37:32 +0000 (UTC) From: "Robin H. Johnson" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Robin H. Johnson" Message-ID: <1524515846.6f009d160c20ac91c237820def11bd6528f519e7.robbat2@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sys-kernel/genkernel/ X-VCS-Repository: repo/gentoo X-VCS-Files: sys-kernel/genkernel/genkernel-3.4.52.3.ebuild sys-kernel/genkernel/genkernel-3.4.52.4-r1.ebuild sys-kernel/genkernel/genkernel-3.4.52.4-r2.ebuild sys-kernel/genkernel/genkernel-3.5.1.1.ebuild sys-kernel/genkernel/genkernel-3.5.2.0-r1.ebuild sys-kernel/genkernel/genkernel-3.5.2.1.ebuild sys-kernel/genkernel/genkernel-3.5.2.2.ebuild sys-kernel/genkernel/genkernel-3.5.2.3.ebuild sys-kernel/genkernel/genkernel-3.5.2.4.ebuild sys-kernel/genkernel/genkernel-3.5.2.5.ebuild sys-kernel/genkernel/genkernel-3.5.3.2.ebuild sys-kernel/genkernel/genkernel-9999.ebuild X-VCS-Directories: sys-kernel/genkernel/ X-VCS-Committer: robbat2 X-VCS-Committer-Name: Robin H. Johnson X-VCS-Revision: 6f009d160c20ac91c237820def11bd6528f519e7 X-VCS-Branch: master Date: Mon, 23 Apr 2018 20:37:32 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 4dd542ae-1ab1-4c2b-96a3-f9bc357172a9 X-Archives-Hash: ec64426584fc7351e1cde94ff3002c50 commit: 6f009d160c20ac91c237820def11bd6528f519e7 Author: Marty E. Plummer startmail com> AuthorDate: Mon Apr 23 01:47:18 2018 +0000 Commit: Robin H. Johnson gentoo org> CommitDate: Mon Apr 23 20:37:26 2018 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6f009d16 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 gentoo.org> Closes: https://github.com/gentoo/gentoo/pull/8112 sys-kernel/genkernel/genkernel-3.4.52.3.ebuild | 20 ++++++-------------- sys-kernel/genkernel/genkernel-3.4.52.4-r1.ebuild | 20 ++++++-------------- sys-kernel/genkernel/genkernel-3.4.52.4-r2.ebuild | 20 ++++++-------------- sys-kernel/genkernel/genkernel-3.5.1.1.ebuild | 20 ++++++-------------- sys-kernel/genkernel/genkernel-3.5.2.0-r1.ebuild | 20 ++++++-------------- sys-kernel/genkernel/genkernel-3.5.2.1.ebuild | 20 ++++++-------------- sys-kernel/genkernel/genkernel-3.5.2.2.ebuild | 20 ++++++-------------- sys-kernel/genkernel/genkernel-3.5.2.3.ebuild | 20 ++++++-------------- sys-kernel/genkernel/genkernel-3.5.2.4.ebuild | 20 ++++++-------------- sys-kernel/genkernel/genkernel-3.5.2.5.ebuild | 20 ++++++-------------- sys-kernel/genkernel/genkernel-3.5.3.2.ebuild | 16 ++++------------ sys-kernel/genkernel/genkernel-9999.ebuild | 20 ++++++-------------- 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 3ccaa2a85bf..d68852ad3a7 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 19782837c8b..c33c583ed95 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 1a919d3d126..017c88e0784 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 bed5f3fcaea..7dca6926ea2 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 412593ca904..a4053e31111 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 412593ca904..a4053e31111 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 412593ca904..a4053e31111 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 412593ca904..a4053e31111 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 412593ca904..a4053e31111 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 412593ca904..a4053e31111 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 3e7468aabcf..8f31925c7a0 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 412593ca904..a4053e31111 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"