Gentoo Archives: gentoo-commits

From: Brian Evans <grknight@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-php/ZendFramework/
Date: Mon, 31 Aug 2015 23:54:23
Message-Id: 1441065242.a4eaf71affe7bc4c15093282c229922927cfbb3b.grknight@gentoo
1 commit: a4eaf71affe7bc4c15093282c229922927cfbb3b
2 Author: Brian Evans <grknight <AT> gentoo <DOT> org>
3 AuthorDate: Mon Aug 31 23:54:02 2015 +0000
4 Commit: Brian Evans <grknight <AT> gentoo <DOT> org>
5 CommitDate: Mon Aug 31 23:54:02 2015 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a4eaf71a
7
8 dev-php/ZendFramework: add src_unpack to move unpacked archive Bug 558982
9
10 The minimal USE has a separate archive which needs to be moved to S
11
12 Package-Manager: portage-2.2.20.1
13
14 dev-php/ZendFramework/ZendFramework-1.12.9.ebuild | 8 +++++++-
15 1 file changed, 7 insertions(+), 1 deletion(-)
16
17 diff --git a/dev-php/ZendFramework/ZendFramework-1.12.9.ebuild b/dev-php/ZendFramework/ZendFramework-1.12.9.ebuild
18 index d4b445b..f26758c 100644
19 --- a/dev-php/ZendFramework/ZendFramework-1.12.9.ebuild
20 +++ b/dev-php/ZendFramework/ZendFramework-1.12.9.ebuild
21 @@ -24,9 +24,15 @@ IUSE="cli doc examples minimal"
22 DEPEND="cli? ( dev-lang/php:*[simplexml,tokenizer] )"
23 RDEPEND="${DEPEND}"
24
25 +src_unpack() {
26 + default
27 + if use minimal ; then
28 + mv "${WORKDIR}/${P}-minimal" "${S}" || die
29 + fi
30 +}
31 +
32 src_prepare() {
33 if use minimal ; then
34 - S="${WORKDIR}/${P}-minimal"
35 if use doc ; then
36 mv "${WORKDIR}/${P}/documentation" "${S}"
37 fi