commit: 39ab769f6d87723262d1f55a96ff9e1af73e67a3
Author: Brian Evans <grknight <AT> gentoo <DOT> org>
AuthorDate: Thu Mar 2 14:21:09 2017 +0000
Commit: Brian Evans <grknight <AT> gentoo <DOT> org>
CommitDate: Thu Mar 2 14:21:09 2017 +0000
URL: https://gitweb.gentoo.org/proj/mysql.git/commit/?id=39ab769f
dev-db/mariadb: Drop $Id$ header and x86-freebsd
dev-db/mariadb/mariadb-10.0.25.ebuild | 5 ++---
dev-db/mariadb/mariadb-10.1.12.ebuild | 5 ++---
dev-db/mariadb/mariadb-10.1.13.ebuild | 5 ++---
dev-db/mariadb/mariadb-10.1.14.ebuild | 9 +++++----
dev-db/mariadb/mariadb-5.1.67.ebuild | 5 ++---
dev-db/mariadb/mariadb-5.2.14.ebuild | 5 ++---
dev-db/mariadb/mariadb-5.3.12.ebuild | 5 ++---
dev-db/mariadb/mariadb-5.5.49.ebuild | 5 ++---
dev-db/mariadb/mariadb-9999.ebuild | 3 +--
9 files changed, 20 insertions(+), 27 deletions(-)
diff --git a/dev-db/mariadb/mariadb-10.0.25.ebuild
b/dev-db/mariadb/mariadb-10.0.25.ebuild
index 22b5004..791bdcd 100644
--- a/dev-db/mariadb/mariadb-10.0.25.ebuild
+++ b/dev-db/mariadb/mariadb-10.0.25.ebuild
@@ -1,6 +1,5 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI="6"
MY_EXTRAS_VER="20151223-1501Z"
@@ -18,7 +17,7 @@ RESTRICT="!bindist? ( bindist )"
REQUIRED_USE="server? ( tokudb? ( jemalloc ) ) static? ( !pam )"
# REMEMBER: also update eclass/mysql*.eclass before committing!
-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"
+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"
MY_PATCH_DIR="${WORKDIR}/mysql-extras-${MY_EXTRAS_VER}"
PATCHES=(
diff --git a/dev-db/mariadb/mariadb-10.1.12.ebuild
b/dev-db/mariadb/mariadb-10.1.12.ebuild
index 198a9b2..613209b 100644
--- a/dev-db/mariadb/mariadb-10.1.12.ebuild
+++ b/dev-db/mariadb/mariadb-10.1.12.ebuild
@@ -1,6 +1,5 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI="6"
MY_EXTRAS_VER="20160131-0252Z"
@@ -20,7 +19,7 @@ RESTRICT="!bindist? ( bindist )"
REQUIRED_USE="server? ( tokudb? ( jemalloc ) ) static? ( !pam ) "
# REMEMBER: also update eclass/mysql*.eclass before committing!
-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"
+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"
MY_PATCH_DIR="${WORKDIR}/mysql-extras-${MY_EXTRAS_VER}"
diff --git a/dev-db/mariadb/mariadb-10.1.13.ebuild
b/dev-db/mariadb/mariadb-10.1.13.ebuild
index 198a9b2..613209b 100644
--- a/dev-db/mariadb/mariadb-10.1.13.ebuild
+++ b/dev-db/mariadb/mariadb-10.1.13.ebuild
@@ -1,6 +1,5 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI="6"
MY_EXTRAS_VER="20160131-0252Z"
@@ -20,7 +19,7 @@ RESTRICT="!bindist? ( bindist )"
REQUIRED_USE="server? ( tokudb? ( jemalloc ) ) static? ( !pam ) "
# REMEMBER: also update eclass/mysql*.eclass before committing!
-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"
+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"
MY_PATCH_DIR="${WORKDIR}/mysql-extras-${MY_EXTRAS_VER}"
diff --git a/dev-db/mariadb/mariadb-10.1.14.ebuild
b/dev-db/mariadb/mariadb-10.1.14.ebuild
index 539f3c5..7774cbb 100644
--- a/dev-db/mariadb/mariadb-10.1.14.ebuild
+++ b/dev-db/mariadb/mariadb-10.1.14.ebuild
@@ -1,6 +1,5 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI="6"
MY_EXTRAS_VER="20160131-0252Z"
@@ -20,7 +19,7 @@ RESTRICT="!bindist? ( bindist )"
REQUIRED_USE="server? ( tokudb? ( jemalloc ) ) static? ( !pam ) "
# REMEMBER: also update eclass/mysql*.eclass before committing!
-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"
+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"
MY_PATCH_DIR="${WORKDIR}/mysql-extras-${MY_EXTRAS_VER}"
@@ -73,7 +72,9 @@ RDEPEND="${RDEPEND} ${COMMON_DEPEND}
# xtrabackup-bin causes a circular dependency if DBD-mysql is not already
installed
PDEPEND="galera? ( sst-xtrabackup? ( >=dev-db/xtrabackup-bin-2.2.4 ) )"
-MULTILIB_WRAPPED_HEADERS+=( /usr/include/mysql/mysql_version.h )
+MULTILIB_WRAPPED_HEADERS+=( /usr/include/mysql/mysql_version.h
+ /usr/include/mysql/private/probes_mysql_nodtrace.h
+ /usr/include/mysql/private/probes_mysql_dtrace.h )
src_configure(){
# bug 508724 mariadb cannot use ld.gold
diff --git a/dev-db/mariadb/mariadb-5.1.67.ebuild
b/dev-db/mariadb/mariadb-5.1.67.ebuild
index bb24fc9..a3ef7aa 100644
--- a/dev-db/mariadb/mariadb-5.1.67.ebuild
+++ b/dev-db/mariadb/mariadb-5.1.67.ebuild
@@ -1,6 +1,5 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI="4"
MY_EXTRAS_VER="20121101-2319Z"
@@ -13,7 +12,7 @@ inherit toolchain-funcs mysql-v2
IUSE="$IUSE"
# REMEMBER: also update eclass/mysql*.eclass before committing!
-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"
+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"
# When MY_EXTRAS is bumped, the index should be revised to exclude these.
EPATCH_EXCLUDE=''
diff --git a/dev-db/mariadb/mariadb-5.2.14.ebuild
b/dev-db/mariadb/mariadb-5.2.14.ebuild
index bb24fc9..a3ef7aa 100644
--- a/dev-db/mariadb/mariadb-5.2.14.ebuild
+++ b/dev-db/mariadb/mariadb-5.2.14.ebuild
@@ -1,6 +1,5 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI="4"
MY_EXTRAS_VER="20121101-2319Z"
@@ -13,7 +12,7 @@ inherit toolchain-funcs mysql-v2
IUSE="$IUSE"
# REMEMBER: also update eclass/mysql*.eclass before committing!
-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"
+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"
# When MY_EXTRAS is bumped, the index should be revised to exclude these.
EPATCH_EXCLUDE=''
diff --git a/dev-db/mariadb/mariadb-5.3.12.ebuild
b/dev-db/mariadb/mariadb-5.3.12.ebuild
index bb24fc9..a3ef7aa 100644
--- a/dev-db/mariadb/mariadb-5.3.12.ebuild
+++ b/dev-db/mariadb/mariadb-5.3.12.ebuild
@@ -1,6 +1,5 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI="4"
MY_EXTRAS_VER="20121101-2319Z"
@@ -13,7 +12,7 @@ inherit toolchain-funcs mysql-v2
IUSE="$IUSE"
# REMEMBER: also update eclass/mysql*.eclass before committing!
-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"
+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"
# When MY_EXTRAS is bumped, the index should be revised to exclude these.
EPATCH_EXCLUDE=''
diff --git a/dev-db/mariadb/mariadb-5.5.49.ebuild
b/dev-db/mariadb/mariadb-5.5.49.ebuild
index d3fb539..669f672 100644
--- a/dev-db/mariadb/mariadb-5.5.49.ebuild
+++ b/dev-db/mariadb/mariadb-5.5.49.ebuild
@@ -1,6 +1,5 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI="5"
MY_EXTRAS_VER="20150509-1847Z"
@@ -13,7 +12,7 @@ inherit toolchain-funcs mysql-v2
IUSE="$IUSE"
# REMEMBER: also update eclass/mysql*.eclass before committing!
-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"
+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"
# When MY_EXTRAS is bumped, the index should be revised to exclude these.
EPATCH_EXCLUDE=''
diff --git a/dev-db/mariadb/mariadb-9999.ebuild
b/dev-db/mariadb/mariadb-9999.ebuild
index 6237b3d..71781c1 100644
--- a/dev-db/mariadb/mariadb-9999.ebuild
+++ b/dev-db/mariadb/mariadb-9999.ebuild
@@ -1,6 +1,5 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI="6"
MY_EXTRAS_VER="none"
