[gentoo-commits] gentoo-x86 commit in eclass: qt3.eclass qt4.eclass

[Carsten Lohrke (carlo)]

carlo       08/07/28 22:10:17

  Modified:             qt3.eclass qt4.eclass
  Log:
  Mark qt_min_version() and qt4_min_version() as deprecated.

Revision  Changes    Path
1.35                 eclass/qt3.eclass

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/qt3.eclass?rev=1.35&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/qt3.eclass?rev=1.35&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/qt3.eclass?r1=1.34&r2=1.35

Index: qt3.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/qt3.eclass,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- qt3.eclass	26 Jul 2008 23:13:30 -0000	1.34
+++ qt3.eclass	28 Jul 2008 22:10:16 -0000	1.35
@@ -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 @@
 # @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}"



1.46                 eclass/qt4.eclass

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/qt4.eclass?rev=1.46&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/qt4.eclass?rev=1.46&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/qt4.eclass?r1=1.45&r2=1.46

Index: qt4.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/qt4.eclass,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -r1.45 -r1.46
--- qt4.eclass	26 Jul 2008 23:47:03 -0000	1.45
+++ qt4.eclass	28 Jul 2008 22:10:16 -0000	1.46
@@ -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 @@
 # @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 "|| ("