From: Michał Górny <mgorny@gentoo.org>
Date: Sun, 6 Dec 2015 20:30:00 +0000 (+0100)
Subject: [QA] dev-db/xtrabackup-bin: Fix global-scope 'use' call, #566528
X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=917c688b69ccd109023d8f2c22dd76aad7e14841;p=gentoo.git

[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 555e2aa3cdf0..9c9125cc2ba9 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 c31eec49530c..8cd30efb424b 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 90b932955691..0b845e28f2e2 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