Gentoo Archives: gentoo-commits

From: Brian Evans <grknight@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] proj/mysql:master commit in: dev-db/mariadb/
Date: Thu, 02 Mar 2017 14:30:39
Message-Id: 1488464469.39ab769f6d87723262d1f55a96ff9e1af73e67a3.grknight@gentoo
1 commit: 39ab769f6d87723262d1f55a96ff9e1af73e67a3
2 Author: Brian Evans <grknight <AT> gentoo <DOT> org>
3 AuthorDate: Thu Mar 2 14:21:09 2017 +0000
4 Commit: Brian Evans <grknight <AT> gentoo <DOT> org>
5 CommitDate: Thu Mar 2 14:21:09 2017 +0000
6 URL: https://gitweb.gentoo.org/proj/mysql.git/commit/?id=39ab769f
7
8 dev-db/mariadb: Drop $Id$ header and x86-freebsd
9
10 dev-db/mariadb/mariadb-10.0.25.ebuild | 5 ++---
11 dev-db/mariadb/mariadb-10.1.12.ebuild | 5 ++---
12 dev-db/mariadb/mariadb-10.1.13.ebuild | 5 ++---
13 dev-db/mariadb/mariadb-10.1.14.ebuild | 9 +++++----
14 dev-db/mariadb/mariadb-5.1.67.ebuild | 5 ++---
15 dev-db/mariadb/mariadb-5.2.14.ebuild | 5 ++---
16 dev-db/mariadb/mariadb-5.3.12.ebuild | 5 ++---
17 dev-db/mariadb/mariadb-5.5.49.ebuild | 5 ++---
18 dev-db/mariadb/mariadb-9999.ebuild | 3 +--
19 9 files changed, 20 insertions(+), 27 deletions(-)
20
21 diff --git a/dev-db/mariadb/mariadb-10.0.25.ebuild b/dev-db/mariadb/mariadb-10.0.25.ebuild
22 index 22b5004..791bdcd 100644
23 --- a/dev-db/mariadb/mariadb-10.0.25.ebuild
24 +++ b/dev-db/mariadb/mariadb-10.0.25.ebuild
25 @@ -1,6 +1,5 @@
26 -# Copyright 1999-2016 Gentoo Foundation
27 +# Copyright 1999-2017 Gentoo Foundation
28 # Distributed under the terms of the GNU General Public License v2
29 -# $Id$
30
31 EAPI="6"
32 MY_EXTRAS_VER="20151223-1501Z"
33 @@ -18,7 +17,7 @@ RESTRICT="!bindist? ( bindist )"
34 REQUIRED_USE="server? ( tokudb? ( jemalloc ) ) static? ( !pam )"
35
36 # REMEMBER: also update eclass/mysql*.eclass before committing!
37 -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
38 +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
39
40 MY_PATCH_DIR="${WORKDIR}/mysql-extras-${MY_EXTRAS_VER}"
41 PATCHES=(
42
43 diff --git a/dev-db/mariadb/mariadb-10.1.12.ebuild b/dev-db/mariadb/mariadb-10.1.12.ebuild
44 index 198a9b2..613209b 100644
45 --- a/dev-db/mariadb/mariadb-10.1.12.ebuild
46 +++ b/dev-db/mariadb/mariadb-10.1.12.ebuild
47 @@ -1,6 +1,5 @@
48 -# Copyright 1999-2016 Gentoo Foundation
49 +# Copyright 1999-2017 Gentoo Foundation
50 # Distributed under the terms of the GNU General Public License v2
51 -# $Id$
52
53 EAPI="6"
54 MY_EXTRAS_VER="20160131-0252Z"
55 @@ -20,7 +19,7 @@ RESTRICT="!bindist? ( bindist )"
56 REQUIRED_USE="server? ( tokudb? ( jemalloc ) ) static? ( !pam ) "
57
58 # REMEMBER: also update eclass/mysql*.eclass before committing!
59 -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~hppa ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
60 +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~hppa ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
61
62 MY_PATCH_DIR="${WORKDIR}/mysql-extras-${MY_EXTRAS_VER}"
63
64
65 diff --git a/dev-db/mariadb/mariadb-10.1.13.ebuild b/dev-db/mariadb/mariadb-10.1.13.ebuild
66 index 198a9b2..613209b 100644
67 --- a/dev-db/mariadb/mariadb-10.1.13.ebuild
68 +++ b/dev-db/mariadb/mariadb-10.1.13.ebuild
69 @@ -1,6 +1,5 @@
70 -# Copyright 1999-2016 Gentoo Foundation
71 +# Copyright 1999-2017 Gentoo Foundation
72 # Distributed under the terms of the GNU General Public License v2
73 -# $Id$
74
75 EAPI="6"
76 MY_EXTRAS_VER="20160131-0252Z"
77 @@ -20,7 +19,7 @@ RESTRICT="!bindist? ( bindist )"
78 REQUIRED_USE="server? ( tokudb? ( jemalloc ) ) static? ( !pam ) "
79
80 # REMEMBER: also update eclass/mysql*.eclass before committing!
81 -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~hppa ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
82 +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~hppa ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
83
84 MY_PATCH_DIR="${WORKDIR}/mysql-extras-${MY_EXTRAS_VER}"
85
86
87 diff --git a/dev-db/mariadb/mariadb-10.1.14.ebuild b/dev-db/mariadb/mariadb-10.1.14.ebuild
88 index 539f3c5..7774cbb 100644
89 --- a/dev-db/mariadb/mariadb-10.1.14.ebuild
90 +++ b/dev-db/mariadb/mariadb-10.1.14.ebuild
91 @@ -1,6 +1,5 @@
92 -# Copyright 1999-2016 Gentoo Foundation
93 +# Copyright 1999-2017 Gentoo Foundation
94 # Distributed under the terms of the GNU General Public License v2
95 -# $Id$
96
97 EAPI="6"
98 MY_EXTRAS_VER="20160131-0252Z"
99 @@ -20,7 +19,7 @@ RESTRICT="!bindist? ( bindist )"
100 REQUIRED_USE="server? ( tokudb? ( jemalloc ) ) static? ( !pam ) "
101
102 # REMEMBER: also update eclass/mysql*.eclass before committing!
103 -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~hppa ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
104 +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~hppa ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
105
106 MY_PATCH_DIR="${WORKDIR}/mysql-extras-${MY_EXTRAS_VER}"
107
108 @@ -73,7 +72,9 @@ RDEPEND="${RDEPEND} ${COMMON_DEPEND}
109 # xtrabackup-bin causes a circular dependency if DBD-mysql is not already installed
110 PDEPEND="galera? ( sst-xtrabackup? ( >=dev-db/xtrabackup-bin-2.2.4 ) )"
111
112 -MULTILIB_WRAPPED_HEADERS+=( /usr/include/mysql/mysql_version.h )
113 +MULTILIB_WRAPPED_HEADERS+=( /usr/include/mysql/mysql_version.h
114 + /usr/include/mysql/private/probes_mysql_nodtrace.h
115 + /usr/include/mysql/private/probes_mysql_dtrace.h )
116
117 src_configure(){
118 # bug 508724 mariadb cannot use ld.gold
119
120 diff --git a/dev-db/mariadb/mariadb-5.1.67.ebuild b/dev-db/mariadb/mariadb-5.1.67.ebuild
121 index bb24fc9..a3ef7aa 100644
122 --- a/dev-db/mariadb/mariadb-5.1.67.ebuild
123 +++ b/dev-db/mariadb/mariadb-5.1.67.ebuild
124 @@ -1,6 +1,5 @@
125 -# Copyright 1999-2013 Gentoo Foundation
126 +# Copyright 1999-2017 Gentoo Foundation
127 # Distributed under the terms of the GNU General Public License v2
128 -# $Id$
129
130 EAPI="4"
131 MY_EXTRAS_VER="20121101-2319Z"
132 @@ -13,7 +12,7 @@ inherit toolchain-funcs mysql-v2
133 IUSE="$IUSE"
134
135 # REMEMBER: also update eclass/mysql*.eclass before committing!
136 -KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
137 +KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
138
139 # When MY_EXTRAS is bumped, the index should be revised to exclude these.
140 EPATCH_EXCLUDE=''
141
142 diff --git a/dev-db/mariadb/mariadb-5.2.14.ebuild b/dev-db/mariadb/mariadb-5.2.14.ebuild
143 index bb24fc9..a3ef7aa 100644
144 --- a/dev-db/mariadb/mariadb-5.2.14.ebuild
145 +++ b/dev-db/mariadb/mariadb-5.2.14.ebuild
146 @@ -1,6 +1,5 @@
147 -# Copyright 1999-2013 Gentoo Foundation
148 +# Copyright 1999-2017 Gentoo Foundation
149 # Distributed under the terms of the GNU General Public License v2
150 -# $Id$
151
152 EAPI="4"
153 MY_EXTRAS_VER="20121101-2319Z"
154 @@ -13,7 +12,7 @@ inherit toolchain-funcs mysql-v2
155 IUSE="$IUSE"
156
157 # REMEMBER: also update eclass/mysql*.eclass before committing!
158 -KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
159 +KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
160
161 # When MY_EXTRAS is bumped, the index should be revised to exclude these.
162 EPATCH_EXCLUDE=''
163
164 diff --git a/dev-db/mariadb/mariadb-5.3.12.ebuild b/dev-db/mariadb/mariadb-5.3.12.ebuild
165 index bb24fc9..a3ef7aa 100644
166 --- a/dev-db/mariadb/mariadb-5.3.12.ebuild
167 +++ b/dev-db/mariadb/mariadb-5.3.12.ebuild
168 @@ -1,6 +1,5 @@
169 -# Copyright 1999-2013 Gentoo Foundation
170 +# Copyright 1999-2017 Gentoo Foundation
171 # Distributed under the terms of the GNU General Public License v2
172 -# $Id$
173
174 EAPI="4"
175 MY_EXTRAS_VER="20121101-2319Z"
176 @@ -13,7 +12,7 @@ inherit toolchain-funcs mysql-v2
177 IUSE="$IUSE"
178
179 # REMEMBER: also update eclass/mysql*.eclass before committing!
180 -KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
181 +KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
182
183 # When MY_EXTRAS is bumped, the index should be revised to exclude these.
184 EPATCH_EXCLUDE=''
185
186 diff --git a/dev-db/mariadb/mariadb-5.5.49.ebuild b/dev-db/mariadb/mariadb-5.5.49.ebuild
187 index d3fb539..669f672 100644
188 --- a/dev-db/mariadb/mariadb-5.5.49.ebuild
189 +++ b/dev-db/mariadb/mariadb-5.5.49.ebuild
190 @@ -1,6 +1,5 @@
191 -# Copyright 1999-2016 Gentoo Foundation
192 +# Copyright 1999-2017 Gentoo Foundation
193 # Distributed under the terms of the GNU General Public License v2
194 -# $Id$
195
196 EAPI="5"
197 MY_EXTRAS_VER="20150509-1847Z"
198 @@ -13,7 +12,7 @@ inherit toolchain-funcs mysql-v2
199 IUSE="$IUSE"
200
201 # REMEMBER: also update eclass/mysql*.eclass before committing!
202 -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
203 +KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
204
205 # When MY_EXTRAS is bumped, the index should be revised to exclude these.
206 EPATCH_EXCLUDE=''
207
208 diff --git a/dev-db/mariadb/mariadb-9999.ebuild b/dev-db/mariadb/mariadb-9999.ebuild
209 index 6237b3d..71781c1 100644
210 --- a/dev-db/mariadb/mariadb-9999.ebuild
211 +++ b/dev-db/mariadb/mariadb-9999.ebuild
212 @@ -1,6 +1,5 @@
213 -# Copyright 1999-2016 Gentoo Foundation
214 +# Copyright 1999-2017 Gentoo Foundation
215 # Distributed under the terms of the GNU General Public License v2
216 -# $Id$
217
218 EAPI="6"
219 MY_EXTRAS_VER="none"