dev-db/mariadb: Add patch to 10.1 series for atomic detection

Patch borrowed from Debian's build

Bug: https://bugs.gentoo.org/650758
Package-Manager: Portage-2.3.36, Repoman-2.3.9

diff --git a/dev-db/mariadb/Manifest b/dev-db/mariadb/Manifest
index dc419758e478219b64f4c35e49b1713a4022da24..519c1f1986b6c828523c8478c8ede5b104afea6b 100644 (file)
--- a/dev-db/mariadb/Manifest
+++ b/dev-db/mariadb/Manifest
@@ -10,3 +10,4 @@ DIST mariadb-5.5.60.tar.gz 45822878 BLAKE2B 150a2d7108db2db18d66b56d961b05f8746f
 DIST mysql-extras-20160721-1526Z.tar.bz2 301788 BLAKE2B 23ef75d0122e9e18382f708a86c61624e0437fad593b7f02ccb2b3939d710404e18e3b70617ed400e5f6947d3a92d2867a5f7d98bf61597442e99989f60ca4f7 SHA512 c7450039780e4e2684c932ba7c291c1de25dd1a64e4c6e88aa13b790768b4100955f36ae4a3bf983569ea23b43be02da6dad3d5985c1163ec9e8aa91f0efd85d
 DIST mysql-extras-20170926-1321Z.tar.bz2 312466 BLAKE2B 3e3e19a905961570cea9c1eb14dec3780da80409e996b1aeddb08625da875f5d08798a862cb1b80566b0d8be0d9ec2aab0a390ca90f991203c9871538b11f00a SHA512 556e782ccc40d8cffb2fde8c46038c90023440c07785ec667f898afdb8c802faeb4dbfe8b3918a1e563b46d1dc8c0de1172f7843ce08ee1ded435b344f8f0cf5
 DIST mysql-extras-20180308-1938Z.tar.bz2 318238 BLAKE2B 003389434dc52d5e49be77d0e70edfce664d5011a6dbc280bebc1d958a6626ecf7457a720dc66a6b692e2f7796f36fc55cc7048cee78278aa1fe6f82659ccf07 SHA512 12e39c97ebb23e8ae3db5f4a344779fe47f59e32d7e39258f1d8f527ef5ab7470cd6dda0b2980f67472ae4a10a21249aed87eeac18e7fea58c22aebd7f838d2c
+DIST mysql-extras-20180515-0123Z.tar.bz2 320380 BLAKE2B a56e3ef19f4e30628fea9889dbb55379a8c92f08c9c493fe3f524b98fabf3505150fbe7cc65f97fc8b75632b5dd7360ddb9bd1542714c5e9916f94c2792ff3db SHA512 3e0b36ab4cb3f2e7d30f1fb2d8d3a916439611f1714475f2ab0480ba51176f47dcccd40931de4bd0a46b0aca6dfcb62cfc92b6939eed2e61628947bf664008ee

diff --git a/dev-db/mariadb/mariadb-10.1.31-r1.ebuild b/dev-db/mariadb/mariadb-10.1.31-r1.ebuild
index 7b86ca62c035c800bdf35253d982f57856e0e5ce..d37fe3d7fbd536b6734fee3e1148b7ce281c933c 100644 (file)
--- a/dev-db/mariadb/mariadb-10.1.31-r1.ebuild
+++ b/dev-db/mariadb/mariadb-10.1.31-r1.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
-MY_EXTRAS_VER="20180308-1938Z"
+MY_EXTRAS_VER="20180515-0123Z"
 # The wsrep API version must match between upstream WSREP and sys-cluster/galera major number
 WSREP_REVISION="25"
 SUBSLOT="18"
@@ -23,7 +23,7 @@ REQUIRED_USE="jdbc? ( extraengine server !static ) server? ( tokudb? ( jemalloc
 # REMEMBER: also update eclass/mysql*.eclass before committing!
 KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ~ppc ppc64 ~s390 ~sh ~sparc x86 ~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}"
+MY_PATCH_DIR="${WORKDIR%/}/mysql-extras-${MY_EXTRAS_VER}"
 
 PATCHES=(
        "${MY_PATCH_DIR}"/20006_all_cmake_elib-mariadb-10.1.27.patch
@@ -33,6 +33,7 @@ PATCHES=(
        "${MY_PATCH_DIR}"/20025_all_mariadb-10.1.26-gssapi-detect.patch
        "${MY_PATCH_DIR}"/20029_all_mariadb-10.1.31-enable-numa.patch
        "${MY_PATCH_DIR}"/20033_all_mariadb-10.1.31-xtradb-sst.patch
+       "${MY_PATCH_DIR}"/20035_all_mariadb-10.1-atomic-detection.patch
 )
 
 COMMON_DEPEND="

diff --git a/dev-db/mariadb/mariadb-10.1.33.ebuild b/dev-db/mariadb/mariadb-10.1.33.ebuild
index ce4d15d2d12d70df8aa3e9246292bef07193032f..9b0cc566681a4cbdbff7d5cb08f70afac9a8019b 100644 (file)
--- a/dev-db/mariadb/mariadb-10.1.33.ebuild
+++ b/dev-db/mariadb/mariadb-10.1.33.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
-MY_EXTRAS_VER="20180308-1938Z"
+MY_EXTRAS_VER="20180515-0123Z"
 # The wsrep API version must match between upstream WSREP and sys-cluster/galera major number
 WSREP_REVISION="25"
 SUBSLOT="18"
@@ -23,7 +23,11 @@ REQUIRED_USE="jdbc? ( extraengine server !static ) server? ( tokudb? ( jemalloc
 # REMEMBER: also update eclass/mysql*.eclass before committing!
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~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}"
+if [[ ${MY_EXTRAS_VER} == "live" ]] ; then
+       MY_PATCH_DIR="${WORKDIR%/}/mysql-extras"
+else
+       MY_PATCH_DIR="${WORKDIR%/}/mysql-extras-${MY_EXTRAS_VER}"
+fi
 
 PATCHES=(
        "${MY_PATCH_DIR}"/20006_all_cmake_elib-mariadb-10.1.27.patch
@@ -32,6 +36,7 @@ PATCHES=(
        "${MY_PATCH_DIR}"/20018_all_mariadb-10.1.16-without-clientlibs-tools.patch
        "${MY_PATCH_DIR}"/20025_all_mariadb-10.1.26-gssapi-detect.patch
        "${MY_PATCH_DIR}"/20029_all_mariadb-10.1.31-enable-numa.patch
+       "${MY_PATCH_DIR}"/20035_all_mariadb-10.1-atomic-detection.patch
 )
 
 COMMON_DEPEND="

diff --git a/dev-db/mariadb/mariadb-10.2.14.ebuild b/dev-db/mariadb/mariadb-10.2.14.ebuild
index 893927aa17978437d50366d8146f70940cb78162..459ddfd64db65089c37f1a8c932d4bcaedda4ee4 100644 (file)
--- a/dev-db/mariadb/mariadb-10.2.14.ebuild
+++ b/dev-db/mariadb/mariadb-10.2.14.ebuild
@@ -50,9 +50,13 @@ KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-li
 S="${WORKDIR}/mysql"
 
 if [[ "${MY_EXTRAS_VER}" == "live" ]] ; then
-       MY_PATCH_DIR="${WORKDIR}/mysql-extras"
+       MY_PATCH_DIR="${WORKDIR%/}/mysql-extras"
+       inherit git-r3
+       EGIT_REPO_URI="git://anongit.gentoo.org/proj/mysql-extras.git"
+       EGIT_CHECKOUT_DIR="${WORKDIR%/}/mysql-extras"
+       EGIT_CLONE_TYPE=shallow
 else
-       MY_PATCH_DIR="${WORKDIR}/mysql-extras-${MY_EXTRAS_VER}"
+       MY_PATCH_DIR="${WORKDIR%/}/mysql-extras-${MY_EXTRAS_VER}"
 fi
 
 PATCHES=(
@@ -60,6 +64,7 @@ PATCHES=(
        "${MY_PATCH_DIR}"/20018_all_mariadb-10.2.9-without-clientlibs-tools.patch
        "${MY_PATCH_DIR}"/20024_all_mariadb-10.2.6-mysql_st-regression.patch
        "${MY_PATCH_DIR}"/20025_all_mariadb-10.2.6-gssapi-detect.patch
+       "${MY_PATCH_DIR}"/20035_all_mariadb-10.1-atomic-detection.patch
 )
 
 # Be warned, *DEPEND are version-dependant
@@ -248,9 +253,9 @@ pkg_postinst() {
 src_unpack() {
        unpack ${A}
        # Grab the patches
-       [[ "${MY_EXTRAS_VER}" == "live" ]] && S="${WORKDIR}/mysql-extras" git-r3_src_unpack
+       [[ "${MY_EXTRAS_VER}" == "live" ]] && S="${WORKDIR%/}/mysql-extras" git-r3_src_unpack
 
-       mv -f "${WORKDIR}/${P}" "${S}" || die
+       mv -f "${WORKDIR%/}/${P}" "${S}" || die
 }
 
 src_prepare() {