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

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 555e2aa3cdf0fcbc3ad9348295a730afb521cd9e..9c9125cc2ba999782dbae44aaba1a8d29919ec81 100644 (file)
--- 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 c31eec49530c0211e7d60a2df1a126f84cdd8dd4..8cd30efb424bb095d0edbf30d354fdf7a7e475ac 100644 (file)
--- 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 90b932955691a7998f9a84ad6ea17445bf8dbb05..0b845e28f2e2c2d72f5db7b1d4227c51f1f20c8c 100644 (file)
--- 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