diff options
| author | V3n3RiX <venerix@redcorelinux.org> | 2018-05-15 13:19:56 +0100 |
|---|---|---|
| committer | V3n3RiX <venerix@redcorelinux.org> | 2018-05-15 13:19:56 +0100 |
| commit | d302a5d7fc9caafba5c8a404f2891bb6ccdec311 (patch) | |
| tree | 2a3ee43f080d1d0086964de8c29ccf1021fdfda7 /dev-db/mariadb/mariadb-10.2.14.ebuild | |
| parent | ea31ad0ed5501d0bf92267c35beaf06ac016bad2 (diff) | |
gentoo resync : 15.05.2018
Diffstat (limited to 'dev-db/mariadb/mariadb-10.2.14.ebuild')
| -rw-r--r-- | dev-db/mariadb/mariadb-10.2.14.ebuild | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/dev-db/mariadb/mariadb-10.2.14.ebuild b/dev-db/mariadb/mariadb-10.2.14.ebuild index 893927aa1797..459ddfd64db6 100644 --- 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() { |