1 |
commit: 586b79141ea7ae54e65950874ab08198a15814b4 |
2 |
Author: Marty E. Plummer <hanetzer <AT> startmail <DOT> com> |
3 |
AuthorDate: Fri Apr 20 13:16:48 2018 +0000 |
4 |
Commit: Anthony G. Basile <blueness <AT> gentoo <DOT> org> |
5 |
CommitDate: Tue Apr 24 09:19:50 2018 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=586b7914 |
7 |
|
8 |
sys-devel/gdb: explicit epatch, git-2->git-r3, EAPI=6 |
9 |
|
10 |
Also some formatting changes to keep the ebuilds aligned in layout. |
11 |
|
12 |
Package-Manager: Portage-2.3.31, Repoman-2.3.9 |
13 |
Signed-off-by: Anthony G. Basile <blueness <AT> gentoo.org> |
14 |
|
15 |
sys-devel/gdb/gdb-8.0.1-r1.ebuild | 2 +- |
16 |
sys-devel/gdb/gdb-8.0.1.ebuild | 2 +- |
17 |
sys-devel/gdb/gdb-8.0.ebuild | 2 +- |
18 |
sys-devel/gdb/gdb-8.1-r1.ebuild | 2 +- |
19 |
sys-devel/gdb/gdb-8.1.ebuild | 2 +- |
20 |
sys-devel/gdb/gdb-9999.ebuild | 18 ++++++++++++------ |
21 |
6 files changed, 17 insertions(+), 11 deletions(-) |
22 |
|
23 |
diff --git a/sys-devel/gdb/gdb-8.0.1-r1.ebuild b/sys-devel/gdb/gdb-8.0.1-r1.ebuild |
24 |
index f2de213b735..a03b9344102 100644 |
25 |
--- a/sys-devel/gdb/gdb-8.0.1-r1.ebuild |
26 |
+++ b/sys-devel/gdb/gdb-8.0.1-r1.ebuild |
27 |
@@ -20,7 +20,7 @@ case ${PV} in |
28 |
9999*) |
29 |
# live git tree |
30 |
EGIT_REPO_URI="git://sourceware.org/git/binutils-gdb.git" |
31 |
- inherit git-2 |
32 |
+ inherit git-r3 |
33 |
SRC_URI="" |
34 |
;; |
35 |
*.*.50.2???????) |
36 |
|
37 |
diff --git a/sys-devel/gdb/gdb-8.0.1.ebuild b/sys-devel/gdb/gdb-8.0.1.ebuild |
38 |
index c961c9df536..84138d2c934 100644 |
39 |
--- a/sys-devel/gdb/gdb-8.0.1.ebuild |
40 |
+++ b/sys-devel/gdb/gdb-8.0.1.ebuild |
41 |
@@ -20,7 +20,7 @@ case ${PV} in |
42 |
9999*) |
43 |
# live git tree |
44 |
EGIT_REPO_URI="git://sourceware.org/git/binutils-gdb.git" |
45 |
- inherit git-2 |
46 |
+ inherit git-r3 |
47 |
SRC_URI="" |
48 |
;; |
49 |
*.*.50.2???????) |
50 |
|
51 |
diff --git a/sys-devel/gdb/gdb-8.0.ebuild b/sys-devel/gdb/gdb-8.0.ebuild |
52 |
index 5ceaef60550..447d9073015 100644 |
53 |
--- a/sys-devel/gdb/gdb-8.0.ebuild |
54 |
+++ b/sys-devel/gdb/gdb-8.0.ebuild |
55 |
@@ -20,7 +20,7 @@ case ${PV} in |
56 |
9999*) |
57 |
# live git tree |
58 |
EGIT_REPO_URI="git://sourceware.org/git/binutils-gdb.git" |
59 |
- inherit git-2 |
60 |
+ inherit git-r3 |
61 |
SRC_URI="" |
62 |
;; |
63 |
*.*.50.2???????) |
64 |
|
65 |
diff --git a/sys-devel/gdb/gdb-8.1-r1.ebuild b/sys-devel/gdb/gdb-8.1-r1.ebuild |
66 |
index cd11a56608a..6c7a856e418 100644 |
67 |
--- a/sys-devel/gdb/gdb-8.1-r1.ebuild |
68 |
+++ b/sys-devel/gdb/gdb-8.1-r1.ebuild |
69 |
@@ -20,7 +20,7 @@ case ${PV} in |
70 |
9999*) |
71 |
# live git tree |
72 |
EGIT_REPO_URI="git://sourceware.org/git/binutils-gdb.git" |
73 |
- inherit git-2 |
74 |
+ inherit git-r3 |
75 |
SRC_URI="" |
76 |
;; |
77 |
*.*.50.2???????) |
78 |
|
79 |
diff --git a/sys-devel/gdb/gdb-8.1.ebuild b/sys-devel/gdb/gdb-8.1.ebuild |
80 |
index cd11a56608a..6c7a856e418 100644 |
81 |
--- a/sys-devel/gdb/gdb-8.1.ebuild |
82 |
+++ b/sys-devel/gdb/gdb-8.1.ebuild |
83 |
@@ -20,7 +20,7 @@ case ${PV} in |
84 |
9999*) |
85 |
# live git tree |
86 |
EGIT_REPO_URI="git://sourceware.org/git/binutils-gdb.git" |
87 |
- inherit git-2 |
88 |
+ inherit git-r3 |
89 |
SRC_URI="" |
90 |
;; |
91 |
*.*.50.2???????) |
92 |
|
93 |
diff --git a/sys-devel/gdb/gdb-9999.ebuild b/sys-devel/gdb/gdb-9999.ebuild |
94 |
index 553005830a8..69024483547 100644 |
95 |
--- a/sys-devel/gdb/gdb-9999.ebuild |
96 |
+++ b/sys-devel/gdb/gdb-9999.ebuild |
97 |
@@ -1,10 +1,10 @@ |
98 |
# Copyright 1999-2018 Gentoo Foundation |
99 |
# Distributed under the terms of the GNU General Public License v2 |
100 |
|
101 |
-EAPI="5" |
102 |
-PYTHON_COMPAT=( python{2_7,3_4,3_5} ) |
103 |
+EAPI=6 |
104 |
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} ) |
105 |
|
106 |
-inherit flag-o-matic eutils python-single-r1 |
107 |
+inherit epatch eutils flag-o-matic python-single-r1 |
108 |
|
109 |
export CTARGET=${CTARGET:-${CHOST}} |
110 |
if [[ ${CTARGET} == ${CHOST} ]] ; then |
111 |
@@ -20,7 +20,7 @@ case ${PV} in |
112 |
9999*) |
113 |
# live git tree |
114 |
EGIT_REPO_URI="git://sourceware.org/git/binutils-gdb.git" |
115 |
- inherit git-2 |
116 |
+ inherit git-r3 |
117 |
SRC_URI="" |
118 |
;; |
119 |
*.*.50.2???????) |
120 |
@@ -49,9 +49,13 @@ case ${PV} in |
121 |
esac |
122 |
|
123 |
PATCH_VER="" |
124 |
+PATCH_DEV="" |
125 |
DESCRIPTION="GNU debugger" |
126 |
HOMEPAGE="https://sourceware.org/gdb/" |
127 |
-SRC_URI="${SRC_URI} ${PATCH_VER:+mirror://gentoo/${P}-patches-${PATCH_VER}.tar.xz}" |
128 |
+SRC_URI="${SRC_URI} |
129 |
+ ${PATCH_DEV:+https://dev.gentoo.org/~${PATCH_DEV}/distfiles/${P}-patches-${PATCH_VER}.tar.xz} |
130 |
+ ${PATCH_VER:+mirror://gentoo/${P}-patches-${PATCH_VER}.tar.xz} |
131 |
+" |
132 |
|
133 |
LICENSE="GPL-2 LGPL-2" |
134 |
SLOT="0" |
135 |
@@ -91,7 +95,9 @@ pkg_setup() { |
136 |
src_prepare() { |
137 |
[[ -n ${RPM} ]] && rpm_spec_epatch "${WORKDIR}"/gdb.spec |
138 |
! use vanilla && [[ -n ${PATCH_VER} ]] && EPATCH_SUFFIX="patch" epatch "${WORKDIR}"/patch |
139 |
- epatch_user |
140 |
+ |
141 |
+ default |
142 |
+ |
143 |
strip-linguas -u bfd/po opcodes/po |
144 |
} |