sys-devel/gdb: explicit epatch, git-2->git-r3, EAPI=6

Also some formatting changes to keep the ebuilds aligned in layout.

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

diff --git a/sys-devel/gdb/gdb-8.0.1-r1.ebuild b/sys-devel/gdb/gdb-8.0.1-r1.ebuild
index f2de213b735cace82368932d99732437217e8a99..a03b93441024e646fc24e18b3245452572fe0734 100644 (file)
--- a/sys-devel/gdb/gdb-8.0.1-r1.ebuild
+++ b/sys-devel/gdb/gdb-8.0.1-r1.ebuild
@@ -20,7 +20,7 @@ case ${PV} in
 9999*)
        # live git tree
        EGIT_REPO_URI="git://sourceware.org/git/binutils-gdb.git"
-       inherit git-2
+       inherit git-r3
        SRC_URI=""
        ;;
 *.*.50.2???????)

diff --git a/sys-devel/gdb/gdb-8.0.1.ebuild b/sys-devel/gdb/gdb-8.0.1.ebuild
index c961c9df536d6ff9b8f205b845706d6e54893c48..84138d2c9341351da46c1d7277e31a76b2582bdd 100644 (file)
--- a/sys-devel/gdb/gdb-8.0.1.ebuild
+++ b/sys-devel/gdb/gdb-8.0.1.ebuild
@@ -20,7 +20,7 @@ case ${PV} in
 9999*)
        # live git tree
        EGIT_REPO_URI="git://sourceware.org/git/binutils-gdb.git"
-       inherit git-2
+       inherit git-r3
        SRC_URI=""
        ;;
 *.*.50.2???????)

diff --git a/sys-devel/gdb/gdb-8.0.ebuild b/sys-devel/gdb/gdb-8.0.ebuild
index 5ceaef6055015b1b88e091181fde05be1d8d3380..447d9073015fbc7f3559db88bf5674a3f04350a5 100644 (file)
--- a/sys-devel/gdb/gdb-8.0.ebuild
+++ b/sys-devel/gdb/gdb-8.0.ebuild
@@ -20,7 +20,7 @@ case ${PV} in
 9999*)
        # live git tree
        EGIT_REPO_URI="git://sourceware.org/git/binutils-gdb.git"
-       inherit git-2
+       inherit git-r3
        SRC_URI=""
        ;;
 *.*.50.2???????)

diff --git a/sys-devel/gdb/gdb-8.1-r1.ebuild b/sys-devel/gdb/gdb-8.1-r1.ebuild
index cd11a56608a9d77cd8e6b1d6e8e1666985a5ab11..6c7a856e418afd1bf643e83d4278693cfc58f719 100644 (file)
--- a/sys-devel/gdb/gdb-8.1-r1.ebuild
+++ b/sys-devel/gdb/gdb-8.1-r1.ebuild
@@ -20,7 +20,7 @@ case ${PV} in
 9999*)
        # live git tree
        EGIT_REPO_URI="git://sourceware.org/git/binutils-gdb.git"
-       inherit git-2
+       inherit git-r3
        SRC_URI=""
        ;;
 *.*.50.2???????)

diff --git a/sys-devel/gdb/gdb-8.1.ebuild b/sys-devel/gdb/gdb-8.1.ebuild
index cd11a56608a9d77cd8e6b1d6e8e1666985a5ab11..6c7a856e418afd1bf643e83d4278693cfc58f719 100644 (file)
--- a/sys-devel/gdb/gdb-8.1.ebuild
+++ b/sys-devel/gdb/gdb-8.1.ebuild
@@ -20,7 +20,7 @@ case ${PV} in
 9999*)
        # live git tree
        EGIT_REPO_URI="git://sourceware.org/git/binutils-gdb.git"
-       inherit git-2
+       inherit git-r3
        SRC_URI=""
        ;;
 *.*.50.2???????)

diff --git a/sys-devel/gdb/gdb-9999.ebuild b/sys-devel/gdb/gdb-9999.ebuild
index 553005830a8ddccb86b95533b6938face3bd123b..690244835479b64f3315043889faf685952aa146 100644 (file)
--- a/sys-devel/gdb/gdb-9999.ebuild
+++ b/sys-devel/gdb/gdb-9999.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="5"
-PYTHON_COMPAT=( python{2_7,3_4,3_5} )
+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
@@ -20,7 +20,7 @@ case ${PV} in
 9999*)
        # live git tree
        EGIT_REPO_URI="git://sourceware.org/git/binutils-gdb.git"
-       inherit git-2
+       inherit git-r3
        SRC_URI=""
        ;;
 *.*.50.2???????)
@@ -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/${P}-patches-${PATCH_VER}.tar.xz}
+       ${PATCH_VER:+mirror://gentoo/${P}-patches-${PATCH_VER}.tar.xz}
+"
 
 LICENSE="GPL-2 LGPL-2"
 SLOT="0"
@@ -91,7 +95,9 @@ pkg_setup() {
 src_prepare() {
        [[ -n ${RPM} ]] && rpm_spec_epatch "${WORKDIR}"/gdb.spec
        ! use vanilla && [[ -n ${PATCH_VER} ]] && EPATCH_SUFFIX="patch" epatch "${WORKDIR}"/patch
-       epatch_user
+
+       default
+
        strip-linguas -u bfd/po opcodes/po
 }