From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id 545931384B4 for ; Sun, 6 Dec 2015 21:55:33 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id F1CF8E089A; Sun, 6 Dec 2015 21:55:30 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 5C97DE089E for ; Sun, 6 Dec 2015 21:55:30 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 6FFA6340756 for ; Sun, 6 Dec 2015 21:55:28 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id D9FB99A1 for ; Sun, 6 Dec 2015 21:55:25 +0000 (UTC) From: "Michał Górny" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Michał Górny" Message-ID: <1449438914.917c688b69ccd109023d8f2c22dd76aad7e14841.mgorny@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-db/xtrabackup-bin/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-db/xtrabackup-bin/xtrabackup-bin-2.1.9.ebuild dev-db/xtrabackup-bin/xtrabackup-bin-2.2.12.ebuild dev-db/xtrabackup-bin/xtrabackup-bin-2.2.5.ebuild X-VCS-Directories: dev-db/xtrabackup-bin/ X-VCS-Committer: mgorny X-VCS-Committer-Name: Michał Górny X-VCS-Revision: 917c688b69ccd109023d8f2c22dd76aad7e14841 X-VCS-Branch: master Date: Sun, 6 Dec 2015 21:55:25 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 64786fd8-a4bc-4cc3-9bb5-a971016be576 X-Archives-Hash: dc7163b77aa143c594f52ad455b30e01 commit: 917c688b69ccd109023d8f2c22dd76aad7e14841 Author: Michał Górny gentoo org> AuthorDate: Sun Dec 6 20:30:00 2015 +0000 Commit: Michał Górny gentoo 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