Gentoo Archives: gentoo-commits

From: Gilles Dartiguelongue <eva@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] proj/gnome:master commit in: eclass/
Date: Thu, 27 Dec 2012 22:20:01
Message-Id: 1356645827.f3c55f4fd61a2abccd1d7c528d76804e45da88a9.eva@gentoo
1 commit: f3c55f4fd61a2abccd1d7c528d76804e45da88a9
2 Author: Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
3 AuthorDate: Thu Dec 27 22:03:47 2012 +0000
4 Commit: Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
5 CommitDate: Thu Dec 27 22:03:47 2012 +0000
6 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=f3c55f4f
7
8 eclass/gnome2.eclass: switch IUSE tests to in_iuse, bug #383901
9
10 ---
11 eclass/gnome2.eclass | 4 ++--
12 1 files changed, 2 insertions(+), 2 deletions(-)
13
14 diff --git a/eclass/gnome2.eclass b/eclass/gnome2.eclass
15 index 70eb491..e263232 100644
16 --- a/eclass/gnome2.eclass
17 +++ b/eclass/gnome2.eclass
18 @@ -158,7 +158,7 @@ gnome2_src_configure() {
19 # rebuild docs.
20 # Preserve old behavior for older EAPI.
21 if grep -q "enable-gtk-doc" ${ECONF_SOURCE:-.}/configure ; then
22 - if has ${EAPI-0} 0 1 2 3 4 && has doc ${IUSE} ; then
23 + if has ${EAPI:-0} 0 1 2 3 4 && in_iuse doc ; then
24 G2CONF="${G2CONF} $(use_enable doc gtk-doc)"
25 else
26 G2CONF="${G2CONF} --disable-gtk-doc"
27 @@ -266,7 +266,7 @@ gnome2_src_install() {
28 if has ${EAPI:-0} 0 1 2 3 4; then
29 if [[ "${GNOME2_LA_PUNT}" != "no" ]]; then
30 ebegin "Removing .la files"
31 - if ! { has static-libs ${IUSE//+} && use static-libs; }; then
32 + if ! { in_iuse static-libs && use static-libs; }; then
33 find "${D}" -name '*.la' -exec rm -f {} + || die "la file removal failed"
34 fi
35 eend