commit:     17d493d3641774d998b8d0b15086881203e3e977
Author:     Marty E. Plummer <hanetzer <AT> startmail <DOT> com>
AuthorDate: Fri Apr 20 13:00:30 2018 +0000
Commit:     Anthony G. Basile <blueness <AT> gentoo <DOT> org>
CommitDate: Tue Apr 24 09:19:50 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=17d493d3

sys-devel/gdb: add explicit epatch

Also some formatting changes to keep the ebuild's aligned in layout,
sort eclasses.

Package-Manager: Portage-2.3.31, Repoman-2.3.9
Signed-off-by: Anthony G. Basile <blueness <AT> gentoo.org>

 sys-devel/gdb/gdb-8.0.1-r1.ebuild |  6 +++---
 sys-devel/gdb/gdb-8.0.1.ebuild    | 10 +++++++---
 sys-devel/gdb/gdb-8.0.ebuild      |  6 +++---
 sys-devel/gdb/gdb-8.1-r1.ebuild   |  6 +++---
 sys-devel/gdb/gdb-8.1.ebuild      |  6 +++---
 5 files changed, 19 insertions(+), 15 deletions(-)

diff --git a/sys-devel/gdb/gdb-8.0.1-r1.ebuild 
b/sys-devel/gdb/gdb-8.0.1-r1.ebuild
index f2a93879b15..f2de213b735 100644
--- a/sys-devel/gdb/gdb-8.0.1-r1.ebuild
+++ b/sys-devel/gdb/gdb-8.0.1-r1.ebuild
@@ -4,7 +4,7 @@
 EAPI=6
 PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
 
-inherit flag-o-matic eutils python-single-r1
+inherit epatch eutils flag-o-matic python-single-r1
 
 export CTARGET=${CTARGET:-${CHOST}}
 if [[ ${CTARGET} == ${CHOST} ]] ; then
@@ -53,8 +53,8 @@ PATCH_DEV="slyfox"
 DESCRIPTION="GNU debugger"
 HOMEPAGE="https://sourceware.org/gdb/";
 SRC_URI="${SRC_URI}
-       
${PATCH_DEV:+https://dev.gentoo.org/~${PATCH_DEV}/distfiles/${P}-patches-${PATCH_VER}.tar.xz}
-       ${PATCH_VER:+mirror://gentoo/${P}-patches-${PATCH_VER}.tar.xz}
+       
${PATCH_DEV:+https://dev.gentoo.org/~${PATCH_DEV}/distfiles/${PN}-8.0.1-patches-${PATCH_VER}.tar.xz}
+       ${PATCH_VER:+mirror://gentoo/${PN}-8.0.1-patches-${PATCH_VER}.tar.xz}
 "
 
 LICENSE="GPL-2 LGPL-2"

diff --git a/sys-devel/gdb/gdb-8.0.1.ebuild b/sys-devel/gdb/gdb-8.0.1.ebuild
index 6e1aa11c9e2..c961c9df536 100644
--- a/sys-devel/gdb/gdb-8.0.1.ebuild
+++ b/sys-devel/gdb/gdb-8.0.1.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
 
-inherit flag-o-matic eutils python-single-r1
+inherit epatch eutils flag-o-matic python-single-r1
 
 export CTARGET=${CTARGET:-${CHOST}}
 if [[ ${CTARGET} == ${CHOST} ]] ; then
@@ -49,9 +49,13 @@ case ${PV} in
 esac
 
 PATCH_VER=""
+PATCH_DEV=""
 DESCRIPTION="GNU debugger"
 HOMEPAGE="https://sourceware.org/gdb/";
-SRC_URI="${SRC_URI} 
${PATCH_VER:+mirror://gentoo/${P}-patches-${PATCH_VER}.tar.xz}"
+SRC_URI="${SRC_URI}
+       
${PATCH_DEV:+https://dev.gentoo.org/~${PATCH_DEV}/distfiles/${PN}-8.0.1-patches-${PATCH_VER}.tar.xz}
+       ${PATCH_VER:+mirror://gentoo/${PN}-8.0.1-patches-${PATCH_VER}.tar.xz}
+"
 
 LICENSE="GPL-2 LGPL-2"
 SLOT="0"

diff --git a/sys-devel/gdb/gdb-8.0.ebuild b/sys-devel/gdb/gdb-8.0.ebuild
index 82503642289..5ceaef60550 100644
--- a/sys-devel/gdb/gdb-8.0.ebuild
+++ b/sys-devel/gdb/gdb-8.0.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="6"
+EAPI=6
 PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
 
-inherit flag-o-matic eutils python-single-r1
+inherit epatch eutils flag-o-matic python-single-r1
 
 export CTARGET=${CTARGET:-${CHOST}}
 if [[ ${CTARGET} == ${CHOST} ]] ; then

diff --git a/sys-devel/gdb/gdb-8.1-r1.ebuild b/sys-devel/gdb/gdb-8.1-r1.ebuild
index cd7fc728f51..cd11a56608a 100644
--- a/sys-devel/gdb/gdb-8.1-r1.ebuild
+++ b/sys-devel/gdb/gdb-8.1-r1.ebuild
@@ -4,7 +4,7 @@
 EAPI=6
 PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
 
-inherit flag-o-matic eutils python-single-r1
+inherit epatch eutils flag-o-matic python-single-r1
 
 export CTARGET=${CTARGET:-${CHOST}}
 if [[ ${CTARGET} == ${CHOST} ]] ; then
@@ -53,8 +53,8 @@ PATCH_DEV="slyfox"
 DESCRIPTION="GNU debugger"
 HOMEPAGE="https://sourceware.org/gdb/";
 SRC_URI="${SRC_URI}
-       
${PATCH_DEV:+https://dev.gentoo.org/~${PATCH_DEV}/distfiles/${P}-patches-${PATCH_VER}.tar.xz}
-       ${PATCH_VER:+mirror://gentoo/${P}-patches-${PATCH_VER}.tar.xz}
+       
${PATCH_DEV:+https://dev.gentoo.org/~${PATCH_DEV}/distfiles/${PN}-8.1-patches-${PATCH_VER}.tar.xz}
+       ${PATCH_VER:+mirror://gentoo/${PN}-8.1-patches-${PATCH_VER}.tar.xz}
 "
 
 LICENSE="GPL-2 LGPL-2"

diff --git a/sys-devel/gdb/gdb-8.1.ebuild b/sys-devel/gdb/gdb-8.1.ebuild
index 6ad71b2755a..cd11a56608a 100644
--- a/sys-devel/gdb/gdb-8.1.ebuild
+++ b/sys-devel/gdb/gdb-8.1.ebuild
@@ -4,7 +4,7 @@
 EAPI=6
 PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
 
-inherit flag-o-matic eutils python-single-r1
+inherit epatch eutils flag-o-matic python-single-r1
 
 export CTARGET=${CTARGET:-${CHOST}}
 if [[ ${CTARGET} == ${CHOST} ]] ; then
@@ -53,8 +53,8 @@ PATCH_DEV="slyfox"
 DESCRIPTION="GNU debugger"
 HOMEPAGE="https://sourceware.org/gdb/";
 SRC_URI="${SRC_URI}
-       
${PATCH_DEV:+https://dev.gentoo.org/~${PATCH_DEV}/distfiles/${PN}-8.0.1-patches-${PATCH_VER}.tar.xz}
-       ${PATCH_VER:+mirror://gentoo/${PN}-8.0.1-patches-${PATCH_VER}.tar.xz}
+       
${PATCH_DEV:+https://dev.gentoo.org/~${PATCH_DEV}/distfiles/${PN}-8.1-patches-${PATCH_VER}.tar.xz}
+       ${PATCH_VER:+mirror://gentoo/${PN}-8.1-patches-${PATCH_VER}.tar.xz}
 "
 
 LICENSE="GPL-2 LGPL-2"

Reply via email to