summaryrefslogtreecommitdiff
path: root/eclass
diff options
context:
space:
mode:
authorMike Frysinger <vapier@gentoo.org>2004-10-31 20:10:44 +0000
committerMike Frysinger <vapier@gentoo.org>2004-10-31 20:10:44 +0000
commit53b0e5b1d40cbe9047b202f113da6c5a65758255 (patch)
tree864fa7b6271287f0a08d33f739017336935748cb /eclass
parentBuilds with 1.5, doesn't require mozilla anymore, installs .so files in a sen... (diff)
downloadgentoo-2-53b0e5b1d40cbe9047b202f113da6c5a65758255.tar.gz
gentoo-2-53b0e5b1d40cbe9047b202f113da6c5a65758255.tar.bz2
gentoo-2-53b0e5b1d40cbe9047b202f113da6c5a65758255.zip
stop using old WANT_AUTOTOOL_#_# syntax
Diffstat (limited to 'eclass')
-rw-r--r--eclass/kde-functions.eclass19
-rw-r--r--eclass/vim.eclass4
2 files changed, 9 insertions, 14 deletions
diff --git a/eclass/kde-functions.eclass b/eclass/kde-functions.eclass
index 588c80acdb37..5f7b630bd3f8 100644
--- a/eclass/kde-functions.eclass
+++ b/eclass/kde-functions.eclass
@@ -1,6 +1,6 @@
# Copyright 1999-2004 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/kde-functions.eclass,v 1.73 2004/09/15 12:47:11 caleb Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/kde-functions.eclass,v 1.74 2004/10/31 20:08:48 vapier Exp $
#
# Author Dan Armak <danarmak@gentoo.org>
#
@@ -14,15 +14,12 @@ need-automake() {
debug-print-function $FUNCNAME $*
- unset WANT_AUTOMAKE_1_4
- unset WANT_AUTOMAKE_1_5
- unset WANT_AUTOMAKE_1_6
unset WANT_AUTOMAKE
case $1 in
- 1.4) export WANT_AUTOMAKE_1_4=1;;
- 1.5) export WANT_AUTOMAKE_1_5=1;;
- 1.6) export WANT_AUTOMAKE_1_6=1;;
+ 1.4) export WANT_AUTOMAKE=1.4;;
+ 1.5) export WANT_AUTOMAKE=1.5;;
+ 1.6) export WANT_AUTOMAKE=1.6;;
1.7) export WANT_AUTOMAKE='1.7';;
*) echo "!!! $FUNCNAME: Error: unrecognized automake version $1 requested";;
esac
@@ -33,12 +30,10 @@ need-autoconf() {
debug-print-function $FUNCNAME $*
- unset WANT_AUTOCONF_2_1
- unset WANT_AUTOCONF_2_5
-
+ unset WANT_AUTOCONF
case $1 in
- 2.1) export WANT_AUTOCONF_2_1=1;;
- 2.5) export WANT_AUTOCONF_2_5=1;;
+ 2.1) export WANT_AUTOCONF=2.1;;
+ 2.5) export WANT_AUTOCONF=2.5;;
*) echo "!!! $FUNCNAME: Error: unrecognized autoconf version $1 requested";;
esac
diff --git a/eclass/vim.eclass b/eclass/vim.eclass
index 220fd6b497b1..6b9678335a35 100644
--- a/eclass/vim.eclass
+++ b/eclass/vim.eclass
@@ -1,6 +1,6 @@
# Copyright 1999-2004 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/vim.eclass,v 1.77 2004/10/19 19:51:12 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/vim.eclass,v 1.78 2004/10/31 20:08:49 vapier Exp $
# Authors:
# Ryan Phillips <rphillips@gentoo.org>
@@ -254,7 +254,7 @@ src_compile() {
grep -q ^autoconf: src/Makefile && confrule=autoconf
# autoconf-2.13 needed for this package -- bug 35319
# except it seems we actually need 2.5 now -- bug 53777
- WANT_AUTOCONF_2_5=yes WANT_AUTOCONF=2.5 \
+ WANT_AUTOCONF=2.5 \
make -C src $confrule || die "make $confrule failed"
# This should fix a sandbox violation (see bug 24447)