diff options
| author |   Diego Elio Pettenò <flameeyes@gentoo.org> | 2006-09-23 00:23:15 +0000 |
|---|---|---|
| committer | Diego Elio Pettenò <flameeyes@gentoo.org> | 2006-09-23 00:23:15 +0000 |
| commit | c0cfa5d3b983b211f60a863b9de9e000bf27dc73 (patch) | |
| tree | a81d57ed2806b52db0151a70d1e0d6a36992bc76 /eclass | |
| parent | Stable on Alpha + ia64, bug 147682. (diff) | |
| download | gentoo-2-c0cfa5d3b983b211f60a863b9de9e000bf27dc73.tar.gz gentoo-2-c0cfa5d3b983b211f60a863b9de9e000bf27dc73.tar.bz2 gentoo-2-c0cfa5d3b983b211f60a863b9de9e000bf27dc73.zip | |
Don't use need-auto{make,conf} anymore; echo a message when they are being used. See bug #148719.
Diffstat (limited to 'eclass')
| -rw-r--r-- | eclass/kde-functions.eclass | 32 |
1 files changed, 8 insertions, 24 deletions
diff --git a/eclass/kde-functions.eclass b/eclass/kde-functions.eclass index fe2fa3716612..28332755e8f2 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.142 2006/07/03 13:05:21 kevquinn Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/kde-functions.eclass,v 1.143 2006/09/23 00:23:15 flameeyes Exp $ # # Author Dan Armak <danarmak@gentoo.org> # @@ -393,6 +393,8 @@ need-automake() { debug-print-function $FUNCNAME $* + echo "Please don't use need-automake function anymore, see bug #148719." + unset WANT_AUTOMAKE case $1 in @@ -409,6 +411,8 @@ need-autoconf() { debug-print-function $FUNCNAME $* + echo "Please don't use need-autoconf function anymore, see bug #148719." + unset WANT_AUTOCONF case $1 in 2.1) export WANT_AUTOCONF=2.1;; @@ -675,26 +679,6 @@ need-kde() { # determine install locations set-kdedir ${KDEVER} - # ask for autotools - case "${KDEVER}" in - 3.1.[234]) # Newer 3.1.x versions are built with automake 1.7, and have errors when using 1.6 - need-automake 1.7 - need-autoconf 2.5 - ;; - 3.1*) # actually, newer 3.0.x stuff uses this too, but i want to make a clean switch - need-automake 1.6 - need-autoconf 2.5 - ;; - 3*) # a generic call for need-kde 3 - automake 1.7 works most often - need-autoconf 2.5 - need-automake 1.7 - ;; - 5*) - need-autoconf 2.5 - need-automake 1.7 - ;; - esac - if [ "${RDEPEND-unset}" != "unset" ] ; then x_DEPEND="${RDEPEND}" else @@ -840,15 +824,15 @@ need-qt() { fi case ${QTVER} in - 2*) + 2*) DEPEND="${DEPEND} =x11-libs/${QT}-2.3*" RDEPEND="${x_DEPEND} =x11-libs/${QT}-2.3*" ;; - 3*) + 3*) DEPEND="${DEPEND} $(qt_min_version ${QTVER})" RDEPEND="${x_DEPEND} $(qt_min_version ${QTVER})" ;; - *) echo "!!! error: $FUNCNAME() called with invalid parameter: \"$QTVER\", please report bug" && exit 1;; + *) echo "!!! error: $FUNCNAME() called with invalid parameter: \"$QTVER\", please report bug" && exit 1;; esac } |