diff options
| author |   Carsten Lohrke <carlo@gentoo.org> | 2008-07-28 22:10:16 +0000 |
|---|---|---|
| committer | Carsten Lohrke <carlo@gentoo.org> | 2008-07-28 22:10:16 +0000 |
| commit | 3ec1f2dbb00367c123ea3a46098c5c9dbd12b063 (patch) | |
| tree | 02feacb0f64c8fc4cebb751b05a4ea3254b9a4ec | |
| parent | QA: Get rid of deprecated qt_min_version(). (diff) | |
| download | historical-3ec1f2dbb00367c123ea3a46098c5c9dbd12b063.tar.gz historical-3ec1f2dbb00367c123ea3a46098c5c9dbd12b063.tar.bz2 historical-3ec1f2dbb00367c123ea3a46098c5c9dbd12b063.zip | |
Mark qt_min_version() and qt4_min_version() as deprecated.
| -rw-r--r-- | eclass/qt3.eclass | 11 | ||||
| -rw-r--r-- | eclass/qt4.eclass | 12 |
2 files changed, 9 insertions, 14 deletions
diff --git a/eclass/qt3.eclass b/eclass/qt3.eclass index f9946a26548d..07668599f4d7 100644 --- a/eclass/qt3.eclass +++ b/eclass/qt3.eclass @@ -1,6 +1,6 @@ # Copyright 2005 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/qt3.eclass,v 1.34 2008/07/26 23:13:30 carlo Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/qt3.eclass,v 1.35 2008/07/28 22:10:16 carlo Exp $ # @ECLASS: qt3.eclass # @MAINTAINER: @@ -10,7 +10,7 @@ # This eclass contains various functions that may be useful # when dealing with packages using Qt3 libraries. -inherit toolchain-funcs versionator +inherit toolchain-funcs versionator eutils QTPKG="x11-libs/qt-" QT3MAJORVERSIONS="3.3 3.2 3.1 3.0" @@ -26,11 +26,10 @@ addpredict "${QTDIR}/etc/settings" # @FUNCTION: qt_min_version # @USAGE: [minimum version] # @DESCRIPTION: -# This function is simple. In your depend, do something like this: -# DEPEND="$(qt_min_version 3.1)" -# and it handles the rest for you. Currently, the eclass assumes -# that a minimum version of Qt3 is not satisfied by Qt4. +# This function is deprecated. Use slot dependencies instead. qt_min_version() { + ewarn "qt_min_version() is deprecated. Use slot dependencies instead." + epause local list=$(qt_min_version_list "$@") if [[ ${list%% *} == "${list}" ]]; then echo "${list}" diff --git a/eclass/qt4.eclass b/eclass/qt4.eclass index ff21760eb106..57a3f828b3cb 100644 --- a/eclass/qt4.eclass +++ b/eclass/qt4.eclass @@ -1,6 +1,6 @@ # Copyright 2005 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/qt4.eclass,v 1.45 2008/07/26 23:47:03 carlo Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/qt4.eclass,v 1.46 2008/07/28 22:10:16 carlo Exp $ # @ECLASS: qt4.eclass # @MAINTAINER: @@ -27,14 +27,10 @@ QT4VERSIONS="4.4.0 4.4.0_beta1 4.4.0_rc1 # @FUNCTION: qt4_min_version # @USAGE: [minimum version] # @DESCRIPTION: -# This function should be called in package DEPENDs whenever it depends on qt4. -# Simple example - in your depend, do something like this: -# DEPEND="$(qt4_min_version 4.2)" -# if the package can be build with qt-4.2 or higher. -# -# For builds that use an EAPI with support for SLOT dependencies, this will -# return a SLOT dependency, rather than a list of versions. +# This function is deprecated. Use slot dependencies instead. qt4_min_version() { + ewarn "qt4_min_version() is deprecated. Use slot dependencies instead." + epause case ${EAPI:-0} in # EAPIs without SLOT dependencies 0) echo "|| (" |