| 1 |
commit: 917c688b69ccd109023d8f2c22dd76aad7e14841 |
| 2 |
Author: Michał Górny <mgorny <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sun Dec 6 20:30:00 2015 +0000 |
| 4 |
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sun Dec 6 21:55:14 2015 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=917c688b |
| 7 |
|
| 8 |
[QA] dev-db/xtrabackup-bin: Fix global-scope 'use' call, #566528 |
| 9 |
|
| 10 |
dev-db/xtrabackup-bin/xtrabackup-bin-2.1.9.ebuild | 14 +++++++++----- |
| 11 |
dev-db/xtrabackup-bin/xtrabackup-bin-2.2.12.ebuild | 14 +++++++++----- |
| 12 |
dev-db/xtrabackup-bin/xtrabackup-bin-2.2.5.ebuild | 14 +++++++++----- |
| 13 |
3 files changed, 27 insertions(+), 15 deletions(-) |
| 14 |
|
| 15 |
diff --git a/dev-db/xtrabackup-bin/xtrabackup-bin-2.1.9.ebuild b/dev-db/xtrabackup-bin/xtrabackup-bin-2.1.9.ebuild |
| 16 |
index 555e2aa..9c9125c 100644 |
| 17 |
--- a/dev-db/xtrabackup-bin/xtrabackup-bin-2.1.9.ebuild |
| 18 |
+++ b/dev-db/xtrabackup-bin/xtrabackup-bin-2.1.9.ebuild |
| 19 |
@@ -33,11 +33,15 @@ RDEPEND="dev-libs/libaio |
| 20 |
dev-libs/libgpg-error |
| 21 |
dev-perl/DBD-mysql" |
| 22 |
|
| 23 |
-if use amd64; then |
| 24 |
- S="${WORKDIR}/${MY_P}-Linux-x86_64" |
| 25 |
-elif use x86; then |
| 26 |
- S="${WORKDIR}/${MY_P}-Linux-i686" |
| 27 |
-fi |
| 28 |
+src_unpack() { |
| 29 |
+ default |
| 30 |
+ |
| 31 |
+ if use amd64; then |
| 32 |
+ S="${WORKDIR}/${MY_P}-Linux-x86_64" |
| 33 |
+ elif use x86; then |
| 34 |
+ S="${WORKDIR}/${MY_P}-Linux-i686" |
| 35 |
+ fi |
| 36 |
+} |
| 37 |
|
| 38 |
src_prepare() { |
| 39 |
# bug 501904 - CVE-2014-2029 |
| 40 |
|
| 41 |
diff --git a/dev-db/xtrabackup-bin/xtrabackup-bin-2.2.12.ebuild b/dev-db/xtrabackup-bin/xtrabackup-bin-2.2.12.ebuild |
| 42 |
index c31eec4..8cd30ef 100644 |
| 43 |
--- a/dev-db/xtrabackup-bin/xtrabackup-bin-2.2.12.ebuild |
| 44 |
+++ b/dev-db/xtrabackup-bin/xtrabackup-bin-2.2.12.ebuild |
| 45 |
@@ -32,11 +32,15 @@ RDEPEND="dev-libs/libaio |
| 46 |
dev-perl/DBD-mysql |
| 47 |
sys-libs/zlib" |
| 48 |
|
| 49 |
-if use amd64; then |
| 50 |
- S="${WORKDIR}/${MY_P}-Linux-x86_64" |
| 51 |
-elif use x86; then |
| 52 |
- S="${WORKDIR}/${MY_P}-Linux-i686" |
| 53 |
-fi |
| 54 |
+src_unpack() { |
| 55 |
+ default |
| 56 |
+ |
| 57 |
+ if use amd64; then |
| 58 |
+ S="${WORKDIR}/${MY_P}-Linux-x86_64" |
| 59 |
+ elif use x86; then |
| 60 |
+ S="${WORKDIR}/${MY_P}-Linux-i686" |
| 61 |
+ fi |
| 62 |
+} |
| 63 |
|
| 64 |
src_prepare() { |
| 65 |
# bug 501904 - CVE-2014-2029 |
| 66 |
|
| 67 |
diff --git a/dev-db/xtrabackup-bin/xtrabackup-bin-2.2.5.ebuild b/dev-db/xtrabackup-bin/xtrabackup-bin-2.2.5.ebuild |
| 68 |
index 90b9329..0b845e2 100644 |
| 69 |
--- a/dev-db/xtrabackup-bin/xtrabackup-bin-2.2.5.ebuild |
| 70 |
+++ b/dev-db/xtrabackup-bin/xtrabackup-bin-2.2.5.ebuild |
| 71 |
@@ -34,11 +34,15 @@ RDEPEND="dev-libs/libaio |
| 72 |
dev-perl/DBD-mysql |
| 73 |
sys-libs/zlib" |
| 74 |
|
| 75 |
-if use amd64; then |
| 76 |
- S="${WORKDIR}/${MY_P}-Linux-x86_64" |
| 77 |
-elif use x86; then |
| 78 |
- S="${WORKDIR}/${MY_P}-Linux-i686" |
| 79 |
-fi |
| 80 |
+src_unpack() { |
| 81 |
+ default |
| 82 |
+ |
| 83 |
+ if use amd64; then |
| 84 |
+ S="${WORKDIR}/${MY_P}-Linux-x86_64" |
| 85 |
+ elif use x86; then |
| 86 |
+ S="${WORKDIR}/${MY_P}-Linux-i686" |
| 87 |
+ fi |
| 88 |
+} |
| 89 |
|
| 90 |
src_prepare() { |
| 91 |
# bug 501904 - CVE-2014-2029 |
Archives