Gentoo Archives: gentoo-commits

From: "Michał Górny" <mgorny@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: games-action/bzflag/
Date: Wed, 15 Aug 2018 10:33:21
Message-Id: 1534329176.a16511e49693c90e077c8e0f4162faae214980ff.mgorny@gentoo
1 commit: a16511e49693c90e077c8e0f4162faae214980ff
2 Author: Marty E. Plummer <hanetzer <AT> startmail <DOT> com>
3 AuthorDate: Wed Aug 1 09:58:49 2018 +0000
4 Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
5 CommitDate: Wed Aug 15 10:32:56 2018 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a16511e4
7
8 games-action/bzflag: use arrays for myconf
9
10 Also added ${EPREFIX} to --libdir for prefix support
11
12 Package-Manager: Portage-2.3.44, Repoman-2.3.10
13
14 games-action/bzflag/bzflag-2.4.12.ebuild | 10 +++++-----
15 games-action/bzflag/bzflag-2.4.14.ebuild | 14 +++++++-------
16 2 files changed, 12 insertions(+), 12 deletions(-)
17
18 diff --git a/games-action/bzflag/bzflag-2.4.12.ebuild b/games-action/bzflag/bzflag-2.4.12.ebuild
19 index 08d5a225478..7fdb07496ab 100644
20 --- a/games-action/bzflag/bzflag-2.4.12.ebuild
21 +++ b/games-action/bzflag/bzflag-2.4.12.ebuild
22 @@ -39,18 +39,18 @@ src_prepare() {
23 }
24
25 src_configure() {
26 - local myconf
27 + local myconf=(
28 + $(use_enable upnp UPnP)
29 + )
30
31 if use dedicated ; then
32 ewarn
33 ewarn "You are building a server-only copy of BZFlag"
34 ewarn
35 - myconf="--disable-client --without-SDL"
36 + myconf+=( --disable-client --without-SDL )
37 fi
38
39 - econf \
40 - $(use_enable upnp UPnP) \
41 - ${myconf}
42 + econf "${myconf[@]}"
43 }
44
45 src_install() {
46
47 diff --git a/games-action/bzflag/bzflag-2.4.14.ebuild b/games-action/bzflag/bzflag-2.4.14.ebuild
48 index eaa3094992c..68787097d15 100644
49 --- a/games-action/bzflag/bzflag-2.4.14.ebuild
50 +++ b/games-action/bzflag/bzflag-2.4.14.ebuild
51 @@ -40,21 +40,21 @@ src_prepare() {
52 }
53
54 src_configure() {
55 - local myconf
56 + local myconf=(
57 + $(use_enable upnp UPnP)
58 + --libdir="${EPREFIX}"/usr/$(get_libdir)/${PN}
59 + )
60
61 if use dedicated ; then
62 ewarn
63 ewarn "You are building a server-only copy of BZFlag"
64 ewarn
65 - myconf="--disable-client --without-SDL"
66 + myconf+=( --disable-client --without-SDL )
67 else
68 - myconf="--with-SDL=2"
69 + myconf=( --with-SDL=2 )
70 fi
71
72 - econf \
73 - $(use_enable upnp UPnP) \
74 - --libdir=/usr/$(get_libdir)/${PN} \
75 - ${myconf}
76 + econf "${myconf[@]}"
77 }
78
79 src_install() {