[gentoo-commits] repo/gentoo:master commit in: dev-db/xtrabackup-bin/

[Michał Górny]

commit:     917c688b69ccd109023d8f2c22dd76aad7e14841
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Sun Dec  6 20:30:00 2015 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Sun Dec  6 21:55:14 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=917c688b

[QA] dev-db/xtrabackup-bin: Fix global-scope 'use' call, #566528

 dev-db/xtrabackup-bin/xtrabackup-bin-2.1.9.ebuild  | 14 +++++++++-----
 dev-db/xtrabackup-bin/xtrabackup-bin-2.2.12.ebuild | 14 +++++++++-----
 dev-db/xtrabackup-bin/xtrabackup-bin-2.2.5.ebuild  | 14 +++++++++-----
 3 files changed, 27 insertions(+), 15 deletions(-)

diff --git a/dev-db/xtrabackup-bin/xtrabackup-bin-2.1.9.ebuild 
b/dev-db/xtrabackup-bin/xtrabackup-bin-2.1.9.ebuild
index 555e2aa..9c9125c 100644
--- a/dev-db/xtrabackup-bin/xtrabackup-bin-2.1.9.ebuild
+++ b/dev-db/xtrabackup-bin/xtrabackup-bin-2.1.9.ebuild
@@ -33,11 +33,15 @@ RDEPEND="dev-libs/libaio
        dev-libs/libgpg-error
        dev-perl/DBD-mysql"
 
-if use amd64; then
-       S="${WORKDIR}/${MY_P}-Linux-x86_64"
-elif use x86; then
-       S="${WORKDIR}/${MY_P}-Linux-i686"
-fi
+src_unpack() {
+       default
+
+       if use amd64; then
+               S="${WORKDIR}/${MY_P}-Linux-x86_64"
+       elif use x86; then
+               S="${WORKDIR}/${MY_P}-Linux-i686"
+       fi
+}
 
 src_prepare() {
        # bug 501904 - CVE-2014-2029

diff --git a/dev-db/xtrabackup-bin/xtrabackup-bin-2.2.12.ebuild 
b/dev-db/xtrabackup-bin/xtrabackup-bin-2.2.12.ebuild
index c31eec4..8cd30ef 100644
--- a/dev-db/xtrabackup-bin/xtrabackup-bin-2.2.12.ebuild
+++ b/dev-db/xtrabackup-bin/xtrabackup-bin-2.2.12.ebuild
@@ -32,11 +32,15 @@ RDEPEND="dev-libs/libaio
        dev-perl/DBD-mysql
        sys-libs/zlib"
 
-if use amd64; then
-       S="${WORKDIR}/${MY_P}-Linux-x86_64"
-elif use x86; then
-       S="${WORKDIR}/${MY_P}-Linux-i686"
-fi
+src_unpack() {
+       default
+
+       if use amd64; then
+               S="${WORKDIR}/${MY_P}-Linux-x86_64"
+       elif use x86; then
+               S="${WORKDIR}/${MY_P}-Linux-i686"
+       fi
+}
 
 src_prepare() {
        # bug 501904 - CVE-2014-2029

diff --git a/dev-db/xtrabackup-bin/xtrabackup-bin-2.2.5.ebuild 
b/dev-db/xtrabackup-bin/xtrabackup-bin-2.2.5.ebuild
index 90b9329..0b845e2 100644
--- a/dev-db/xtrabackup-bin/xtrabackup-bin-2.2.5.ebuild
+++ b/dev-db/xtrabackup-bin/xtrabackup-bin-2.2.5.ebuild
@@ -34,11 +34,15 @@ RDEPEND="dev-libs/libaio
        dev-perl/DBD-mysql
        sys-libs/zlib"
 
-if use amd64; then
-       S="${WORKDIR}/${MY_P}-Linux-x86_64"
-elif use x86; then
-       S="${WORKDIR}/${MY_P}-Linux-i686"
-fi
+src_unpack() {
+       default
+
+       if use amd64; then
+               S="${WORKDIR}/${MY_P}-Linux-x86_64"
+       elif use x86; then
+               S="${WORKDIR}/${MY_P}-Linux-i686"
+       fi
+}
 
 src_prepare() {
        # bug 501904 - CVE-2014-2029