summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBernard Cafarelli <voyageur@gentoo.org>2012-06-19 09:06:40 +0000
committerBernard Cafarelli <voyageur@gentoo.org>2012-06-19 09:06:40 +0000
commitdeb61632ddb933faedfd7c1b4afe241ed6f47e67 (patch)
tree5db88f01ea453240e8df5d00a6e003b18684221a
parentmarked x86 per bug 419083 (diff)
downloadgentoo-2-deb61632ddb933faedfd7c1b4afe241ed6f47e67.tar.gz
gentoo-2-deb61632ddb933faedfd7c1b4afe241ed6f47e67.tar.bz2
gentoo-2-deb61632ddb933faedfd7c1b4afe241ed6f47e67.zip
Revert to built_with_use for correct libobjc detection and EAPI 0 ebuilds support
-rw-r--r--eclass/ChangeLog6
-rw-r--r--eclass/gnustep-base.eclass5
2 files changed, 8 insertions, 3 deletions
diff --git a/eclass/ChangeLog b/eclass/ChangeLog
index 60189a1a7477..7a0045cb7ca7 100644
--- a/eclass/ChangeLog
+++ b/eclass/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for eclass directory
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.318 2012/06/18 21:33:50 pesa Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.319 2012/06/19 09:06:40 voyageur Exp $
+
+ 19 Jun 2012; Bernard Cafarelli <voyageur@gentoo.org> gnustep-base.eclass:
+ Revert to built_with_use for correct libobjc detection and EAPI 0 ebuilds
+ support
18 Jun 2012; Davide Pesavento <pesa@gentoo.org> qt4-build.eclass:
Update from qt overlay: drop USE=c++0x from qt-webkit, stop adding USE=qpa to
diff --git a/eclass/gnustep-base.eclass b/eclass/gnustep-base.eclass
index 0443ace1c942..a6b8e2d3dc24 100644
--- a/eclass/gnustep-base.eclass
+++ b/eclass/gnustep-base.eclass
@@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/gnustep-base.eclass,v 1.25 2012/05/29 08:05:05 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/gnustep-base.eclass,v 1.26 2012/06/19 09:06:40 voyageur Exp $
# @ECLASS: gnustep-base.eclass
# @MAINTAINER:
@@ -157,7 +157,8 @@ egnustep_env() {
&& GS_ENV=( "${GS_ENV[@]}" "debug=yes" ) \
|| GS_ENV=( "${GS_ENV[@]}" "debug=no" )
- if grep -q libobjc.so.4 "${GS_MAKEFILES}"/config.make;
+ # About 20 gnustep packages still use EAPI 0
+ if built_with_use gnustep-base/gnustep-make libobjc2;
then
# Set clang for packages that do not respect gnustep-make
# settings (gnustep-base's configure for example)