* [gentoo-commits] gentoo-x86 commit in eclass: qt4.eclass
@ 2007-10-03 14:59 Caleb Tennis (caleb)
0 siblings, 0 replies; 31+ messages in thread
From: Caleb Tennis (caleb) @ 2007-10-03 14:59 UTC (permalink / raw
To: gentoo-commits
caleb 07/10/03 14:59:05
Modified: qt4.eclass
Log:
Add 4.3.2
Revision Changes Path
1.27 eclass/qt4.eclass
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/qt4.eclass?rev=1.27&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/qt4.eclass?rev=1.27&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/qt4.eclass?r1=1.26&r2=1.27
Index: qt4.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/qt4.eclass,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- qt4.eclass 14 Sep 2007 21:30:04 -0000 1.26
+++ qt4.eclass 3 Oct 2007 14:59:04 -0000 1.27
@@ -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.26 2007/09/14 21:30:04 caleb Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/qt4.eclass,v 1.27 2007/10/03 14:59:04 caleb Exp $
#
# Author Caleb Tennis <caleb@gentoo.org>
#
@@ -19,7 +19,7 @@
QTPKG="x11-libs/qt-"
QT4MAJORVERSIONS="4.3 4.2 4.1 4.0"
-QT4VERSIONS="4.3.1-r1 4.3.1 4.3.0-r2 4.3.0-r1 4.3.0 4.3.0_rc1 4.3.0_beta1 4.2.3-r1 4.2.3 4.2.2 4.2.1 4.2.0-r2 4.2.0-r1 4.2.0 4.1.4-r2 4.1.4-r1 4.1.4 4.1.3 4.1.2 4.1.1 4.1.0 4.0.1 4.0.0"
+QT4VERSIONS="4.3.2 4.3.1-r1 4.3.1 4.3.0-r2 4.3.0-r1 4.3.0 4.3.0_rc1 4.3.0_beta1 4.2.3-r1 4.2.3 4.2.2 4.2.1 4.2.0-r2 4.2.0-r1 4.2.0 4.1.4-r2 4.1.4-r1 4.1.4 4.1.3 4.1.2 4.1.1 4.1.0 4.0.1 4.0.0"
qt4_min_version() {
echo "|| ("
--
gentoo-commits@gentoo.org mailing list
^ permalink raw reply [flat|nested] 31+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: qt4.eclass
@ 2007-12-06 12:13 Caleb Tennis (caleb)
0 siblings, 0 replies; 31+ messages in thread
From: Caleb Tennis (caleb) @ 2007-12-06 12:13 UTC (permalink / raw
To: gentoo-commits
caleb 07/12/06 12:13:27
Modified: qt4.eclass
Log:
Add qt4 versions
Revision Changes Path
1.28 eclass/qt4.eclass
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/qt4.eclass?rev=1.28&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/qt4.eclass?rev=1.28&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/qt4.eclass?r1=1.27&r2=1.28
Index: qt4.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/qt4.eclass,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- qt4.eclass 3 Oct 2007 14:59:04 -0000 1.27
+++ qt4.eclass 6 Dec 2007 12:13:26 -0000 1.28
@@ -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.27 2007/10/03 14:59:04 caleb Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/qt4.eclass,v 1.28 2007/12/06 12:13:26 caleb Exp $
#
# Author Caleb Tennis <caleb@gentoo.org>
#
@@ -19,7 +19,7 @@
QTPKG="x11-libs/qt-"
QT4MAJORVERSIONS="4.3 4.2 4.1 4.0"
-QT4VERSIONS="4.3.2 4.3.1-r1 4.3.1 4.3.0-r2 4.3.0-r1 4.3.0 4.3.0_rc1 4.3.0_beta1 4.2.3-r1 4.2.3 4.2.2 4.2.1 4.2.0-r2 4.2.0-r1 4.2.0 4.1.4-r2 4.1.4-r1 4.1.4 4.1.3 4.1.2 4.1.1 4.1.0 4.0.1 4.0.0"
+QT4VERSIONS="4.3.3 4.3.2-r1 4.3.2 4.3.1-r1 4.3.1 4.3.0-r2 4.3.0-r1 4.3.0 4.3.0_rc1 4.3.0_beta1 4.2.3-r1 4.2.3 4.2.2 4.2.1 4.2.0-r2 4.2.0-r1 4.2.0 4.1.4-r2 4.1.4-r1 4.1.4 4.1.3 4.1.2 4.1.1 4.1.0 4.0.1 4.0.0"
qt4_min_version() {
echo "|| ("
--
gentoo-commits@gentoo.org mailing list
^ permalink raw reply [flat|nested] 31+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: qt4.eclass
@ 2007-12-14 0:31 Przemyslaw Maciag (troll)
0 siblings, 0 replies; 31+ messages in thread
From: Przemyslaw Maciag (troll) @ 2007-12-14 0:31 UTC (permalink / raw
To: gentoo-commits
troll 07/12/14 00:31:06
Modified: qt4.eclass
Log:
qt4.eclass enhancements (see #201772)
Revision Changes Path
1.29 eclass/qt4.eclass
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/qt4.eclass?rev=1.29&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/qt4.eclass?rev=1.29&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/qt4.eclass?r1=1.28&r2=1.29
Index: qt4.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/qt4.eclass,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- qt4.eclass 6 Dec 2007 12:13:26 -0000 1.28
+++ qt4.eclass 14 Dec 2007 00:31:05 -0000 1.29
@@ -1,26 +1,32 @@
# 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.28 2007/12/06 12:13:26 caleb Exp $
-#
-# Author Caleb Tennis <caleb@gentoo.org>
-#
-# This eclass is simple. Inherit it, and in your depend, do something like this:
-#
-# DEPEND="$(qt4_min_version 4)"
-#
-# and it handles the rest for you
-#
+# $Header: /var/cvsroot/gentoo-x86/eclass/qt4.eclass,v 1.29 2007/12/14 00:31:05 troll Exp $
+
+# @ECLASS: qt4.eclass
+# @MAINTAINER:
+# Caleb Tennis <caleb@gentoo.org>
+# @BLURB:
+# Eclass for Qt4 packages
+# @DESCRIPTION:
+# This eclass contains various functions that may be useful
+# when dealing with packages using Qt4 libraries.
+
# 08.16.06 - Renamed qt_min_* to qt4_min_* to avoid conflicts with the qt3 eclass.
# - Caleb Tennis <caleb@gentoo.org>
inherit eutils multilib toolchain-funcs versionator
-IUSE="${IUSE}"
-
QTPKG="x11-libs/qt-"
QT4MAJORVERSIONS="4.3 4.2 4.1 4.0"
QT4VERSIONS="4.3.3 4.3.2-r1 4.3.2 4.3.1-r1 4.3.1 4.3.0-r2 4.3.0-r1 4.3.0 4.3.0_rc1 4.3.0_beta1 4.2.3-r1 4.2.3 4.2.2 4.2.1 4.2.0-r2 4.2.0-r1 4.2.0 4.1.4-r2 4.1.4-r1 4.1.4 4.1.3 4.1.2 4.1.1 4.1.0 4.0.1 4.0.0"
+# @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 package can be build with qt-4.2 or higher.
qt4_min_version() {
echo "|| ("
qt4_min_version_list "$@"
@@ -53,24 +59,78 @@
echo "${VERSIONS}"
}
+# @FUNCTION: qt4_pkg_setup
+# @MAINTAINER:
+# Caleb Tennis <caleb@gentoo.org>
+# Przemyslaw Maciag <troll@gentoo.org>
+# @DESCRIPTION:
+# Default pkg_setup function for packages that depends on qt4. If you have to
+# create ebuilds own pkg_setup in your ebuild, call qt4_pkg_setup in it.
+# This function uses two global vars from ebuild:
+# - QT4_BUILT_WITH_USE_CHECK - contains use flags that need to be turned on for
+# =x11-libs/qt-4*
+# - QT4_OPTIONAL_BUILT_WITH_USE_CHECK - qt4 flags that provides some
+# functionality, but can alternatively be disabled in ${CATEGORY}/${PN}
+# (so qt4 don't have to be recompiled)
qt4_pkg_setup() {
+ local requiredflags=""
for x in ${QT4_BUILT_WITH_USE_CHECK}; do
- if ! built_with_use =x11-libs/qt-4* $x; then
- die "This package requires Qt4 to be built with the '${x}' use flag."
+ if ! built_with_use =x11-libs/qt-4* ${x}; then
+ requiredflags="${requiredflags} ${x}"
+ fi
+ done
+
+ local optionalflags=""
+ for x in ${QT4_OPTIONAL_BUILT_WITH_USE_CHECK}; do
+ if use ${x} && ! built_with_use =x11-libs/qt-4* ${x}; then
+ optionalflags="${optionalflags} ${x}"
fi
done
+
+ local diemessage=""
+ if [[ ${requiredflags} != "" ]]; then
+ eerror
+ eerror "(1) In order to compile ${CATEGORY}/${PN} first you need to build"
+ eerror "=x11-libs/qt-4* with USE=\"${requiredflags}\" flag(s)"
+ eerror
+ diemessage="(1) recompile qt4 with \"${requiredflags}\" USE flag(s) ; "
+ fi
+ if [[ ${optionalflags} != "" ]]; then
+ eerror
+ eerror "(2) You are trying to compile ${CATEGORY}/${PN} package with"
+ eerror "USE=\"${optionalflags}\""
+ eerror "while qt4 is built without this particular flag(s): it will"
+ eerror "not work."
+ eerror
+ eerror "Possible solutions to this problem are:"
+ eerror "a) install package ${CATEGORY}/${PN} without \"${optionalflags}\" USE flag(s)"
+ eerror "b) re-emerge qt4 with \"${optionalflags}\" USE flag(s)"
+ eerror
+ diemessage="${diemessage}(2) recompile qt4 with \"${optionalflags}\" USE flag(s) or disable them for ${PN} package\n"
+ fi
+
+ [[ ${diemessage} != "" ]] && die "can't emerge ${CATEGORY}/${PN}: ${diemessage}"
}
+# @FUNCTION: eqmake4
+# @USAGE: [.pro file] [additional parameters to qmake]
+# @MAINTAINER:
+# Przemyslaw Maciag <troll@gentoo.org>
+# Davide Pesavento <davidepesa@gmail.com>
+# @DESCRIPTION:
+# Runs qmake on the specified .pro file (defaults to
+# ${PN}.pro if eqmake4 was called with no argument).
+# Additional parameters are passed unmodified to qmake.
eqmake4() {
local LOGFILE="${T}/qmake-$$.out"
local projprofile="${1}"
- [ -z ${projprofile} ] && projprofile="${PN}.pro"
+ [[ -z ${projprofile} ]] && projprofile="${PN}.pro"
shift 1
ebegin "Processing qmake ${projprofile}"
# file exists?
- if [ ! -f ${projprofile} ]; then
+ if [[ ! -f ${projprofile} ]]; then
echo
eerror "Project .pro file \"${projprofile}\" does not exists"
eerror "qmake cannot handle non-existing .pro files"
@@ -86,9 +146,9 @@
# as a workaround for broken qmake, put everything into file
if has debug ${IUSE} && use debug; then
- echo -e "$CONFIG -= release\nCONFIG += no_fixpath debug" >> ${projprofile}
+ echo -e "\nCONFIG -= release\nCONFIG += no_fixpath debug" >> ${projprofile}
else
- echo -e "$CONFIG -= debug\nCONFIG += no_fixpath release" >> ${projprofile}
+ echo -e "\nCONFIG -= debug\nCONFIG += no_fixpath release" >> ${projprofile}
fi
/usr/bin/qmake ${projprofile} \
@@ -110,7 +170,7 @@
eend ${result}
# was qmake successful?
- if [ ${result} -ne 0 ]; then
+ if [[ ${result} -ne 0 ]]; then
echo
eerror "Running qmake on \"${projprofile}\" has failed"
echo
--
gentoo-commits@gentoo.org mailing list
^ permalink raw reply [flat|nested] 31+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: qt4.eclass
@ 2007-12-19 18:07 Caleb Tennis (caleb)
0 siblings, 0 replies; 31+ messages in thread
From: Caleb Tennis (caleb) @ 2007-12-19 18:07 UTC (permalink / raw
To: gentoo-commits
caleb 07/12/19 18:07:48
Modified: qt4.eclass
Log:
Add 4.4 series to eclass
Revision Changes Path
1.30 eclass/qt4.eclass
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/qt4.eclass?rev=1.30&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/qt4.eclass?rev=1.30&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/qt4.eclass?r1=1.29&r2=1.30
Index: qt4.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/qt4.eclass,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- qt4.eclass 14 Dec 2007 00:31:05 -0000 1.29
+++ qt4.eclass 19 Dec 2007 18:07:47 -0000 1.30
@@ -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.29 2007/12/14 00:31:05 troll Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/qt4.eclass,v 1.30 2007/12/19 18:07:47 caleb Exp $
# @ECLASS: qt4.eclass
# @MAINTAINER:
@@ -17,8 +17,8 @@
inherit eutils multilib toolchain-funcs versionator
QTPKG="x11-libs/qt-"
-QT4MAJORVERSIONS="4.3 4.2 4.1 4.0"
-QT4VERSIONS="4.3.3 4.3.2-r1 4.3.2 4.3.1-r1 4.3.1 4.3.0-r2 4.3.0-r1 4.3.0 4.3.0_rc1 4.3.0_beta1 4.2.3-r1 4.2.3 4.2.2 4.2.1 4.2.0-r2 4.2.0-r1 4.2.0 4.1.4-r2 4.1.4-r1 4.1.4 4.1.3 4.1.2 4.1.1 4.1.0 4.0.1 4.0.0"
+QT4MAJORVERSIONS="4.4 4.3 4.2 4.1 4.0"
+QT4VERSIONS="4.4.0_rc1 4.3.3 4.3.2-r1 4.3.2 4.3.1-r1 4.3.1 4.3.0-r2 4.3.0-r1 4.3.0 4.3.0_rc1 4.3.0_beta1 4.2.3-r1 4.2.3 4.2.2 4.2.1 4.2.0-r2 4.2.0-r1 4.2.0 4.1.4-r2 4.1.4-r1 4.1.4 4.1.3 4.1.2 4.1.1 4.1.0 4.0.1 4.0.0"
# @FUNCTION: qt4_min_version
# @USAGE: [minimum version]
@@ -39,7 +39,7 @@
case "${MINVER}" in
4|4.0|4.0.0) VERSIONS="=${QTPKG}4*";;
- 4.1|4.1.0|4.2|4.2.0)
+ 4.1|4.1.0|4.2|4.2.0|4.3|4.3.0|4.4|4.4.0)
for x in ${QT4MAJORVERSIONS}; do
if $(version_is_at_least "${MINVER}" "${x}"); then
VERSIONS="${VERSIONS} =${QTPKG}${x}*"
--
gentoo-commits@gentoo.org mailing list
^ permalink raw reply [flat|nested] 31+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: qt4.eclass
@ 2007-12-31 18:55 Caleb Tennis (caleb)
0 siblings, 0 replies; 31+ messages in thread
From: Caleb Tennis (caleb) @ 2007-12-31 18:55 UTC (permalink / raw
To: gentoo-commits
caleb 07/12/31 18:55:54
Modified: qt4.eclass
Log:
In qt4_min_version, if we have EAPI >= 1, then use a slot dep to make the dependency much nicer/easier to look at.
Also, in qt4_pkg_setup, if we are with Qt 4.4, do a little more scrutiny of the use flags since some use flags are not
used anymore in Qt 4.4, and some are now split into other packages.
Revision Changes Path
1.31 eclass/qt4.eclass
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/qt4.eclass?rev=1.31&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/qt4.eclass?rev=1.31&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/qt4.eclass?r1=1.30&r2=1.31
Index: qt4.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/qt4.eclass,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- qt4.eclass 19 Dec 2007 18:07:47 -0000 1.30
+++ qt4.eclass 31 Dec 2007 18:55:53 -0000 1.31
@@ -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.30 2007/12/19 18:07:47 caleb Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/qt4.eclass,v 1.31 2007/12/31 18:55:53 caleb Exp $
# @ECLASS: qt4.eclass
# @MAINTAINER:
@@ -28,9 +28,14 @@
# DEPEND="$(qt4_min_version 4.2)"
# if package can be build with qt-4.2 or higher.
qt4_min_version() {
- echo "|| ("
- qt4_min_version_list "$@"
- echo ")"
+ # This is much simpler for EAPI 1, we can use a slot dependency
+ if [[ "${EAPI}" -ge 1 ]]; then
+ echo ">=${QTPKG}${1}:4"
+ else
+ echo "|| ("
+ qt4_min_version_list "$@"
+ echo ")"
+ fi
}
qt4_min_version_list() {
@@ -72,10 +77,42 @@
# - QT4_OPTIONAL_BUILT_WITH_USE_CHECK - qt4 flags that provides some
# functionality, but can alternatively be disabled in ${CATEGORY}/${PN}
# (so qt4 don't have to be recompiled)
+#
+# flags to watch for for Qt4.4:
+# zlib png | opengl dbus qt3support | sqlite3 ssl
qt4_pkg_setup() {
+
+ QT4_BEST_VERSION="$(best_version =x11-libs/qt-4*)"
+ QT4_MINOR_VERSION="$(get_version_component_range 2 ${QT4_BEST_VERSION/*qt-/})"
+
local requiredflags=""
for x in ${QT4_BUILT_WITH_USE_CHECK}; do
- if ! built_with_use =x11-libs/qt-4* ${x}; then
+ if [[ "${QT4_MINOR_VERSION}" -ge 4 ]]; then
+ # The use flags are different in 4.4 and above, and it's a split package, so this is used to catch
+ # the various use flag combos specified in the ebuilds to make sure we don't error out.
+
+ if [[ ${x} == zlib || ${x} == png ]]; then
+ # Qt 4.4+ is built with zlib and png by default, so the use flags aren't needed
+ continue;
+ elif [[ ${x} == opengl || ${x} == dbus || ${x} == qt3support ]]; then
+ # Make sure the qt-${x} package has been already installed
+
+ if ! has_version x11-libs/qt-${x}; then
+ eerror "You must first install the x11-libs/qt-${x} package."
+ die
+ fi
+ elif [ ${x} == ssl ]; then
+ if [ ! has_version x11-libs/qt-core || ! built_with_use x11-libs/qt-core ssl ]; then
+ eerror "You must first install the x11-libs/qt-core package with the ssl flag enabled."
+ die
+ fi
+ elif [ ${x} == sqlite3 ]; then
+ if [ ! has_version x11-libs/qt-sql || ! built_with_use x11-libs/qt-sql sqlite ]; then
+ eerror "You must first install the x11-libs/qt-sql package with the sqlite flag enabled."
+ die
+ fi
+ fi
+ elif ! built_with_use =x11-libs/qt-4* ${x}; then
requiredflags="${requiredflags} ${x}"
fi
done
--
gentoo-commits@gentoo.org mailing list
^ permalink raw reply [flat|nested] 31+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: qt4.eclass
@ 2008-01-05 18:44 Caleb Tennis (caleb)
0 siblings, 0 replies; 31+ messages in thread
From: Caleb Tennis (caleb) @ 2008-01-05 18:44 UTC (permalink / raw
To: gentoo-commits
caleb 08/01/05 18:44:38
Modified: qt4.eclass
Log:
Fixes from bug #203955
Revision Changes Path
1.32 eclass/qt4.eclass
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/qt4.eclass?rev=1.32&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/qt4.eclass?rev=1.32&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/qt4.eclass?r1=1.31&r2=1.32
Index: qt4.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/qt4.eclass,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- qt4.eclass 31 Dec 2007 18:55:53 -0000 1.31
+++ qt4.eclass 5 Jan 2008 18:44:38 -0000 1.32
@@ -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.31 2007/12/31 18:55:53 caleb Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/qt4.eclass,v 1.32 2008/01/05 18:44:38 caleb Exp $
# @ECLASS: qt4.eclass
# @MAINTAINER:
@@ -99,17 +99,17 @@
if ! has_version x11-libs/qt-${x}; then
eerror "You must first install the x11-libs/qt-${x} package."
- die
+ die "Install x11-libs/qt-${x}"
fi
- elif [ ${x} == ssl ]; then
- if [ ! has_version x11-libs/qt-core || ! built_with_use x11-libs/qt-core ssl ]; then
+ elif [[ ${x} == ssl ]]; then
+ if ! has_version x11-libs/qt-core || ! built_with_use x11-libs/qt-core ssl; then
eerror "You must first install the x11-libs/qt-core package with the ssl flag enabled."
- die
+ die "Install x1-libs/qt-core with USE=\"ssl\""
fi
- elif [ ${x} == sqlite3 ]; then
- if [ ! has_version x11-libs/qt-sql || ! built_with_use x11-libs/qt-sql sqlite ]; then
+ elif [[ ${x} == sqlite3 ]]; then
+ if ! has_version x11-libs/qt-sql || ! built_with_use x11-libs/qt-sql sqlite; then
eerror "You must first install the x11-libs/qt-sql package with the sqlite flag enabled."
- die
+ die "Install x11-libs/qt-sql with USE="\sqlite\""
fi
fi
elif ! built_with_use =x11-libs/qt-4* ${x}; then
--
gentoo-commits@gentoo.org mailing list
^ permalink raw reply [flat|nested] 31+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: qt4.eclass
@ 2008-01-05 20:24 Sven Wegener (swegener)
0 siblings, 0 replies; 31+ messages in thread
From: Sven Wegener (swegener) @ 2008-01-05 20:24 UTC (permalink / raw
To: gentoo-commits
swegener 08/01/05 20:24:33
Modified: qt4.eclass
Log:
fix quoting
eclass/qt4.eclass: line 130: syntax error near unexpected token `('
eclass/qt4.eclass: line 130: ` eerror "(1) In order to compile ${CATEGORY}/${PN} first you need to build"'
Revision Changes Path
1.33 eclass/qt4.eclass
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/qt4.eclass?rev=1.33&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/qt4.eclass?rev=1.33&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/qt4.eclass?r1=1.32&r2=1.33
Index: qt4.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/qt4.eclass,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- qt4.eclass 5 Jan 2008 18:44:38 -0000 1.32
+++ qt4.eclass 5 Jan 2008 20:24:32 -0000 1.33
@@ -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.32 2008/01/05 18:44:38 caleb Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/qt4.eclass,v 1.33 2008/01/05 20:24:32 swegener Exp $
# @ECLASS: qt4.eclass
# @MAINTAINER:
@@ -109,7 +109,7 @@
elif [[ ${x} == sqlite3 ]]; then
if ! has_version x11-libs/qt-sql || ! built_with_use x11-libs/qt-sql sqlite; then
eerror "You must first install the x11-libs/qt-sql package with the sqlite flag enabled."
- die "Install x11-libs/qt-sql with USE="\sqlite\""
+ die "Install x11-libs/qt-sql with USE=\"sqlite\""
fi
fi
elif ! built_with_use =x11-libs/qt-4* ${x}; then
--
gentoo-commits@gentoo.org mailing list
^ permalink raw reply [flat|nested] 31+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: qt4.eclass
@ 2008-01-05 22:41 Caleb Tennis (caleb)
0 siblings, 0 replies; 31+ messages in thread
From: Caleb Tennis (caleb) @ 2008-01-05 22:41 UTC (permalink / raw
To: gentoo-commits
caleb 08/01/05 22:41:00
Modified: qt4.eclass
Log:
Typo fix
Revision Changes Path
1.34 eclass/qt4.eclass
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/qt4.eclass?rev=1.34&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/qt4.eclass?rev=1.34&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/qt4.eclass?r1=1.33&r2=1.34
Index: qt4.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/qt4.eclass,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- qt4.eclass 5 Jan 2008 20:24:32 -0000 1.33
+++ qt4.eclass 5 Jan 2008 22:41:00 -0000 1.34
@@ -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.33 2008/01/05 20:24:32 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/qt4.eclass,v 1.34 2008/01/05 22:41:00 caleb Exp $
# @ECLASS: qt4.eclass
# @MAINTAINER:
@@ -104,7 +104,7 @@
elif [[ ${x} == ssl ]]; then
if ! has_version x11-libs/qt-core || ! built_with_use x11-libs/qt-core ssl; then
eerror "You must first install the x11-libs/qt-core package with the ssl flag enabled."
- die "Install x1-libs/qt-core with USE=\"ssl\""
+ die "Install x11-libs/qt-core with USE=\"ssl\""
fi
elif [[ ${x} == sqlite3 ]]; then
if ! has_version x11-libs/qt-sql || ! built_with_use x11-libs/qt-sql sqlite; then
--
gentoo-commits@gentoo.org mailing list
^ permalink raw reply [flat|nested] 31+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: qt4.eclass
@ 2008-02-25 17:07 Caleb Tennis (caleb)
0 siblings, 0 replies; 31+ messages in thread
From: Caleb Tennis (caleb) @ 2008-02-25 17:07 UTC (permalink / raw
To: gentoo-commits
caleb 08/02/25 17:07:34
Modified: qt4.eclass
Log:
Fix qt4 eclass
Revision Changes Path
1.35 eclass/qt4.eclass
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/qt4.eclass?rev=1.35&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/qt4.eclass?rev=1.35&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/qt4.eclass?r1=1.34&r2=1.35
Index: qt4.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/qt4.eclass,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- qt4.eclass 5 Jan 2008 22:41:00 -0000 1.34
+++ qt4.eclass 25 Feb 2008 17:07:33 -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/qt4.eclass,v 1.34 2008/01/05 22:41:00 caleb Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/qt4.eclass,v 1.35 2008/02/25 17:07:33 caleb Exp $
# @ECLASS: qt4.eclass
# @MAINTAINER:
@@ -18,7 +18,7 @@
QTPKG="x11-libs/qt-"
QT4MAJORVERSIONS="4.4 4.3 4.2 4.1 4.0"
-QT4VERSIONS="4.4.0_rc1 4.3.3 4.3.2-r1 4.3.2 4.3.1-r1 4.3.1 4.3.0-r2 4.3.0-r1 4.3.0 4.3.0_rc1 4.3.0_beta1 4.2.3-r1 4.2.3 4.2.2 4.2.1 4.2.0-r2 4.2.0-r1 4.2.0 4.1.4-r2 4.1.4-r1 4.1.4 4.1.3 4.1.2 4.1.1 4.1.0 4.0.1 4.0.0"
+QT4VERSIONS="4.4.0_rc1 4.3.4 4.3.3 4.3.2-r1 4.3.2 4.3.1-r1 4.3.1 4.3.0-r2 4.3.0-r1 4.3.0 4.3.0_rc1 4.3.0_beta1 4.2.3-r1 4.2.3 4.2.2 4.2.1 4.2.0-r2 4.2.0-r1 4.2.0 4.1.4-r2 4.1.4-r1 4.1.4 4.1.3 4.1.2 4.1.1 4.1.0 4.0.1 4.0.0"
# @FUNCTION: qt4_min_version
# @USAGE: [minimum version]
--
gentoo-commits@lists.gentoo.org mailing list
^ permalink raw reply [flat|nested] 31+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: qt4.eclass
@ 2008-02-26 1:11 Diego Petteno (flameeyes)
0 siblings, 0 replies; 31+ messages in thread
From: Diego Petteno (flameeyes) @ 2008-02-26 1:11 UTC (permalink / raw
To: gentoo-commits
flameeyes 08/02/26 01:11:13
Modified: qt4.eclass
Log:
Quote arguments passed to eqmake or it will fail when passing
variables with whitespace on them.
Revision Changes Path
1.36 eclass/qt4.eclass
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/qt4.eclass?rev=1.36&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/qt4.eclass?rev=1.36&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/qt4.eclass?r1=1.35&r2=1.36
Index: qt4.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/qt4.eclass,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- qt4.eclass 25 Feb 2008 17:07:33 -0000 1.35
+++ qt4.eclass 26 Feb 2008 01:11:13 -0000 1.36
@@ -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.35 2008/02/25 17:07:33 caleb Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/qt4.eclass,v 1.36 2008/02/26 01:11:13 flameeyes Exp $
# @ECLASS: qt4.eclass
# @MAINTAINER:
@@ -201,7 +201,7 @@
QMAKE_LFLAGS_RELEASE="${LDFLAGS}" \
QMAKE_LFLAGS_DEBUG="${LDFLAGS}" \
QMAKE_RPATH= \
- ${@} >> ${LOGFILE} 2>&1
+ "${@}" >> ${LOGFILE} 2>&1
local result=$?
eend ${result}
--
gentoo-commits@lists.gentoo.org mailing list
^ permalink raw reply [flat|nested] 31+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: qt4.eclass
@ 2008-03-05 23:03 Ingmar Vanhassel (ingmar)
0 siblings, 0 replies; 31+ messages in thread
From: Ingmar Vanhassel (ingmar) @ 2008-03-05 23:03 UTC (permalink / raw
To: gentoo-commits
ingmar 08/03/05 23:03:24
Modified: qt4.eclass
Log:
qt4.eclass: Added Qt 4.4.0_beta1, fix EAPI handling (EAPI is a string, not necessarily a number).
Revision Changes Path
1.37 eclass/qt4.eclass
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/qt4.eclass?rev=1.37&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/qt4.eclass?rev=1.37&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/qt4.eclass?r1=1.36&r2=1.37
Index: qt4.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/qt4.eclass,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- qt4.eclass 26 Feb 2008 01:11:13 -0000 1.36
+++ qt4.eclass 5 Mar 2008 23:03:24 -0000 1.37
@@ -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.36 2008/02/26 01:11:13 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/qt4.eclass,v 1.37 2008/03/05 23:03:24 ingmar Exp $
# @ECLASS: qt4.eclass
# @MAINTAINER:
@@ -18,7 +18,7 @@
QTPKG="x11-libs/qt-"
QT4MAJORVERSIONS="4.4 4.3 4.2 4.1 4.0"
-QT4VERSIONS="4.4.0_rc1 4.3.4 4.3.3 4.3.2-r1 4.3.2 4.3.1-r1 4.3.1 4.3.0-r2 4.3.0-r1 4.3.0 4.3.0_rc1 4.3.0_beta1 4.2.3-r1 4.2.3 4.2.2 4.2.1 4.2.0-r2 4.2.0-r1 4.2.0 4.1.4-r2 4.1.4-r1 4.1.4 4.1.3 4.1.2 4.1.1 4.1.0 4.0.1 4.0.0"
+QT4VERSIONS="4.4.0_beta1 4.4.0_rc1 4.3.4 4.3.3 4.3.2-r1 4.3.2 4.3.1-r1 4.3.1 4.3.0-r2 4.3.0-r1 4.3.0 4.3.0_rc1 4.3.0_beta1 4.2.3-r1 4.2.3 4.2.2 4.2.1 4.2.0-r2 4.2.0-r1 4.2.0 4.1.4-r2 4.1.4-r1 4.1.4 4.1.3 4.1.2 4.1.1 4.1.0 4.0.1 4.0.0"
# @FUNCTION: qt4_min_version
# @USAGE: [minimum version]
@@ -26,16 +26,21 @@
# 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 package can be build with qt-4.2 or higher.
+# 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.
qt4_min_version() {
- # This is much simpler for EAPI 1, we can use a slot dependency
- if [[ "${EAPI}" -ge 1 ]]; then
- echo ">=${QTPKG}${1}:4"
- else
- echo "|| ("
- qt4_min_version_list "$@"
- echo ")"
- fi
+ case ${EAPI:-0} in
+ # EAPIs without SLOT dependencies
+ 0) echo "|| ("
+ qt4_min_version_list "$@"
+ echo ")"
+ ;;
+ # EAPIS with SLOT dependencies.
+ *) echo ">=${QTPKG}${1}:4"
+ ;;
+ esac
}
qt4_min_version_list() {
--
gentoo-commits@lists.gentoo.org mailing list
^ permalink raw reply [flat|nested] 31+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: qt4.eclass
@ 2008-03-06 1:23 Ingmar Vanhassel (ingmar)
0 siblings, 0 replies; 31+ messages in thread
From: Ingmar Vanhassel (ingmar) @ 2008-03-06 1:23 UTC (permalink / raw
To: gentoo-commits
ingmar 08/03/06 01:23:14
Modified: qt4.eclass
Log:
@BLURB needs to be one line
Revision Changes Path
1.38 eclass/qt4.eclass
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/qt4.eclass?rev=1.38&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/qt4.eclass?rev=1.38&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/qt4.eclass?r1=1.37&r2=1.38
Index: qt4.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/qt4.eclass,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -r1.37 -r1.38
--- qt4.eclass 5 Mar 2008 23:03:24 -0000 1.37
+++ qt4.eclass 6 Mar 2008 01:23:13 -0000 1.38
@@ -1,12 +1,11 @@
# 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.37 2008/03/05 23:03:24 ingmar Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/qt4.eclass,v 1.38 2008/03/06 01:23:13 ingmar Exp $
# @ECLASS: qt4.eclass
# @MAINTAINER:
# Caleb Tennis <caleb@gentoo.org>
-# @BLURB:
-# Eclass for Qt4 packages
+# @BLURB: Eclass for Qt4 packages
# @DESCRIPTION:
# This eclass contains various functions that may be useful
# when dealing with packages using Qt4 libraries.
--
gentoo-commits@lists.gentoo.org mailing list
^ permalink raw reply [flat|nested] 31+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: qt4.eclass
@ 2008-03-19 12:19 Ingmar Vanhassel (ingmar)
0 siblings, 0 replies; 31+ messages in thread
From: Ingmar Vanhassel (ingmar) @ 2008-03-19 12:19 UTC (permalink / raw
To: gentoo-commits
ingmar 08/03/19 12:19:51
Modified: qt4.eclass
Log:
Damn qt4_min_version junk.
Revision Changes Path
1.39 eclass/qt4.eclass
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/qt4.eclass?rev=1.39&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/qt4.eclass?rev=1.39&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/qt4.eclass?r1=1.38&r2=1.39
Index: qt4.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/qt4.eclass,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -r1.38 -r1.39
--- qt4.eclass 6 Mar 2008 01:23:13 -0000 1.38
+++ qt4.eclass 19 Mar 2008 12:19:51 -0000 1.39
@@ -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.38 2008/03/06 01:23:13 ingmar Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/qt4.eclass,v 1.39 2008/03/19 12:19:51 ingmar Exp $
# @ECLASS: qt4.eclass
# @MAINTAINER:
@@ -17,7 +17,7 @@
QTPKG="x11-libs/qt-"
QT4MAJORVERSIONS="4.4 4.3 4.2 4.1 4.0"
-QT4VERSIONS="4.4.0_beta1 4.4.0_rc1 4.3.4 4.3.3 4.3.2-r1 4.3.2 4.3.1-r1 4.3.1 4.3.0-r2 4.3.0-r1 4.3.0 4.3.0_rc1 4.3.0_beta1 4.2.3-r1 4.2.3 4.2.2 4.2.1 4.2.0-r2 4.2.0-r1 4.2.0 4.1.4-r2 4.1.4-r1 4.1.4 4.1.3 4.1.2 4.1.1 4.1.0 4.0.1 4.0.0"
+QT4VERSIONS="4.4.0_beta1 4.4.0_rc1 4.3.4-r1 4.3.4 4.3.3 4.3.2-r1 4.3.2 4.3.1-r1 4.3.1 4.3.0-r2 4.3.0-r1 4.3.0 4.3.0_rc1 4.3.0_beta1 4.2.3-r1 4.2.3 4.2.2 4.2.1 4.2.0-r2 4.2.0-r1 4.2.0 4.1.4-r2 4.1.4-r1 4.1.4 4.1.3 4.1.2 4.1.1 4.1.0 4.0.1 4.0.0"
# @FUNCTION: qt4_min_version
# @USAGE: [minimum version]
--
gentoo-commits@lists.gentoo.org mailing list
^ permalink raw reply [flat|nested] 31+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: qt4.eclass
@ 2008-05-15 17:29 Ingmar Vanhassel (ingmar)
0 siblings, 0 replies; 31+ messages in thread
From: Ingmar Vanhassel (ingmar) @ 2008-05-15 17:29 UTC (permalink / raw
To: gentoo-commits
ingmar 08/05/15 17:29:00
Modified: qt4.eclass
Log:
Damn qt4_min_version junk, take #2.
Revision Changes Path
1.40 eclass/qt4.eclass
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/qt4.eclass?rev=1.40&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/qt4.eclass?rev=1.40&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/qt4.eclass?r1=1.39&r2=1.40
Index: qt4.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/qt4.eclass,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -r1.39 -r1.40
--- qt4.eclass 19 Mar 2008 12:19:51 -0000 1.39
+++ qt4.eclass 15 May 2008 17:28:59 -0000 1.40
@@ -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.39 2008/03/19 12:19:51 ingmar Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/qt4.eclass,v 1.40 2008/05/15 17:28:59 ingmar Exp $
# @ECLASS: qt4.eclass
# @MAINTAINER:
@@ -17,7 +17,7 @@
QTPKG="x11-libs/qt-"
QT4MAJORVERSIONS="4.4 4.3 4.2 4.1 4.0"
-QT4VERSIONS="4.4.0_beta1 4.4.0_rc1 4.3.4-r1 4.3.4 4.3.3 4.3.2-r1 4.3.2 4.3.1-r1 4.3.1 4.3.0-r2 4.3.0-r1 4.3.0 4.3.0_rc1 4.3.0_beta1 4.2.3-r1 4.2.3 4.2.2 4.2.1 4.2.0-r2 4.2.0-r1 4.2.0 4.1.4-r2 4.1.4-r1 4.1.4 4.1.3 4.1.2 4.1.1 4.1.0 4.0.1 4.0.0"
+QT4VERSIONS="4.4.0 4.4.0_beta1 4.4.0_rc1 4.3.4-r1 4.3.4 4.3.3 4.3.2-r1 4.3.2 4.3.1-r1 4.3.1 4.3.0-r2 4.3.0-r1 4.3.0 4.3.0_rc1 4.3.0_beta1 4.2.3-r1 4.2.3 4.2.2 4.2.1 4.2.0-r2 4.2.0-r1 4.2.0 4.1.4-r2 4.1.4-r1 4.1.4 4.1.3 4.1.2 4.1.1 4.1.0 4.0.1 4.0.0"
# @FUNCTION: qt4_min_version
# @USAGE: [minimum version]
--
gentoo-commits@lists.gentoo.org mailing list
^ permalink raw reply [flat|nested] 31+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: qt4.eclass
@ 2008-06-21 15:12 Sven Wegener (swegener)
0 siblings, 0 replies; 31+ messages in thread
From: Sven Wegener (swegener) @ 2008-06-21 15:12 UTC (permalink / raw
To: gentoo-commits
swegener 08/06/21 15:12:49
Modified: qt4.eclass
Log:
don't use command substitution, like all good boys do
Revision Changes Path
1.41 eclass/qt4.eclass
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/qt4.eclass?rev=1.41&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/qt4.eclass?rev=1.41&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/qt4.eclass?r1=1.40&r2=1.41
Index: qt4.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/qt4.eclass,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -r1.40 -r1.41
--- qt4.eclass 15 May 2008 17:28:59 -0000 1.40
+++ qt4.eclass 21 Jun 2008 15:12:48 -0000 1.41
@@ -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.40 2008/05/15 17:28:59 ingmar Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/qt4.eclass,v 1.41 2008/06/21 15:12:48 swegener Exp $
# @ECLASS: qt4.eclass
# @MAINTAINER:
@@ -50,14 +50,14 @@
4|4.0|4.0.0) VERSIONS="=${QTPKG}4*";;
4.1|4.1.0|4.2|4.2.0|4.3|4.3.0|4.4|4.4.0)
for x in ${QT4MAJORVERSIONS}; do
- if $(version_is_at_least "${MINVER}" "${x}"); then
+ if version_is_at_least "${MINVER}" "${x}"; then
VERSIONS="${VERSIONS} =${QTPKG}${x}*"
fi
done
;;
4*)
for x in ${QT4VERSIONS}; do
- if $(version_is_at_least "${MINVER}" "${x}"); then
+ if version_is_at_least "${MINVER}" "${x}"; then
VERSIONS="${VERSIONS} =${QTPKG}${x}"
fi
done
--
gentoo-commits@lists.gentoo.org mailing list
^ permalink raw reply [flat|nested] 31+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: qt4.eclass
@ 2008-07-08 16:02 Thomas Anderson (gentoofan23)
0 siblings, 0 replies; 31+ messages in thread
From: Thomas Anderson (gentoofan23) @ 2008-07-08 16:02 UTC (permalink / raw
To: gentoo-commits
gentoofan23 08/07/08 16:02:04
Modified: qt4.eclass
Log:
Add new QT4_BUILT_WITH_USE_CHECK targets, guiaccessibility and qt3accessibility. Refactor QT4_BUILT_WITH_USE_CHECK code to use case statements
Revision Changes Path
1.42 eclass/qt4.eclass
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/qt4.eclass?rev=1.42&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/qt4.eclass?rev=1.42&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/qt4.eclass?r1=1.41&r2=1.42
Index: qt4.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/qt4.eclass,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -r1.41 -r1.42
--- qt4.eclass 21 Jun 2008 15:12:48 -0000 1.41
+++ qt4.eclass 8 Jul 2008 16:02:03 -0000 1.42
@@ -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.41 2008/06/21 15:12:48 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/qt4.eclass,v 1.42 2008/07/08 16:02:03 gentoofan23 Exp $
# @ECLASS: qt4.eclass
# @MAINTAINER:
@@ -95,29 +95,50 @@
# The use flags are different in 4.4 and above, and it's a split package, so this is used to catch
# the various use flag combos specified in the ebuilds to make sure we don't error out.
- if [[ ${x} == zlib || ${x} == png ]]; then
- # Qt 4.4+ is built with zlib and png by default, so the use flags aren't needed
- continue;
- elif [[ ${x} == opengl || ${x} == dbus || ${x} == qt3support ]]; then
- # Make sure the qt-${x} package has been already installed
+ case ${x} in
+ zlib|png|gif)
+ # Qt 4.4+ is built with zlib, png, and gif by default, so the use flags aren't needed
+ ;;
+ opengl|dbus|qt3support)
+ # Make sure the qt-${x} package has been already installed
if ! has_version x11-libs/qt-${x}; then
eerror "You must first install the x11-libs/qt-${x} package."
die "Install x11-libs/qt-${x}"
fi
- elif [[ ${x} == ssl ]]; then
+ ;;
+ ssl)
if ! has_version x11-libs/qt-core || ! built_with_use x11-libs/qt-core ssl; then
eerror "You must first install the x11-libs/qt-core package with the ssl flag enabled."
die "Install x11-libs/qt-core with USE=\"ssl\""
fi
- elif [[ ${x} == sqlite3 ]]; then
+ ;;
+ sqlite3)
if ! has_version x11-libs/qt-sql || ! built_with_use x11-libs/qt-sql sqlite; then
eerror "You must first install the x11-libs/qt-sql package with the sqlite flag enabled."
die "Install x11-libs/qt-sql with USE=\"sqlite\""
fi
+ ;;
+ guiaccessibility)
+ if ! has_version x11-libs/qt-gui || ! built_with_use x11-libs/qt-gui accessibility; then
+ eerror "You must first install the x11-libs/qt-gui package with the accessibility flag enabled."
+ die "Install x11-libs/qt-gui with USE=\"accessibility\""
+ fi
+ ;;
+
+ qt3accessibility)
+ if ! has_version x11-libs/qt-qt3support || ! built_with_use x11-libs/qt-qt3support accessibility; then
+ eerror "You must first install the x11-libs/qt-qt3support package with the accessibility flag enabled."
+ die "Install x11-libs/qt-qt3support with USE=\"accessibility\""
+ fi
+ ;;
+ esac
+ else
+ ${x} == guiaccessibility && x=${x#gui}
+ ${x} == qt3accessibility && x=${x#qt3}
+ if ! built_with_use =x11-libs/qt-4* ${x}; then
+ requiredflags="${requiredflags} ${x}"
fi
- elif ! built_with_use =x11-libs/qt-4* ${x}; then
- requiredflags="${requiredflags} ${x}"
fi
done
--
gentoo-commits@lists.gentoo.org mailing list
^ permalink raw reply [flat|nested] 31+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: qt4.eclass
@ 2008-07-11 21:09 Thomas Anderson (gentoofan23)
0 siblings, 0 replies; 31+ messages in thread
From: Thomas Anderson (gentoofan23) @ 2008-07-11 21:09 UTC (permalink / raw
To: gentoo-commits
gentoofan23 08/07/11 21:09:40
Modified: qt4.eclass
Log:
Fix bug #231469, I fail.
Revision Changes Path
1.43 eclass/qt4.eclass
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/qt4.eclass?rev=1.43&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/qt4.eclass?rev=1.43&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/qt4.eclass?r1=1.42&r2=1.43
Index: qt4.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/qt4.eclass,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -r1.42 -r1.43
--- qt4.eclass 8 Jul 2008 16:02:03 -0000 1.42
+++ qt4.eclass 11 Jul 2008 21:09:39 -0000 1.43
@@ -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.42 2008/07/08 16:02:03 gentoofan23 Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/qt4.eclass,v 1.43 2008/07/11 21:09:39 gentoofan23 Exp $
# @ECLASS: qt4.eclass
# @MAINTAINER:
@@ -134,8 +134,8 @@
;;
esac
else
- ${x} == guiaccessibility && x=${x#gui}
- ${x} == qt3accessibility && x=${x#qt3}
+ [[ ${x} == guiaccessibility ]] && x=${x#gui}
+ [[ ${x} == qt3accessibility ]] && x=${x#qt3}
if ! built_with_use =x11-libs/qt-4* ${x}; then
requiredflags="${requiredflags} ${x}"
fi
--
gentoo-commits@lists.gentoo.org mailing list
^ permalink raw reply [flat|nested] 31+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: qt4.eclass
@ 2008-07-17 0:03 Bo Oersted Andresen (zlin)
0 siblings, 0 replies; 31+ messages in thread
From: Bo Oersted Andresen (zlin) @ 2008-07-17 0:03 UTC (permalink / raw
To: gentoo-commits
zlin 08/07/17 00:03:33
Modified: qt4.eclass
Log:
Try to handle all flags in QT4{,_OPTIONAL}_BUILT_WITH_USE properly for split qt to avoid duplicating the same code in pkg_setup in lots of ebuilds. See bugs #217161 and #229193.
Revision Changes Path
1.44 eclass/qt4.eclass
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/qt4.eclass?rev=1.44&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/qt4.eclass?rev=1.44&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/qt4.eclass?r1=1.43&r2=1.44
Index: qt4.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/qt4.eclass,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -r1.43 -r1.44
--- qt4.eclass 11 Jul 2008 21:09:39 -0000 1.43
+++ qt4.eclass 17 Jul 2008 00:03:33 -0000 1.44
@@ -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.43 2008/07/11 21:09:39 gentoofan23 Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/qt4.eclass,v 1.44 2008/07/17 00:03:33 zlin Exp $
# @ECLASS: qt4.eclass
# @MAINTAINER:
@@ -17,7 +17,12 @@
QTPKG="x11-libs/qt-"
QT4MAJORVERSIONS="4.4 4.3 4.2 4.1 4.0"
-QT4VERSIONS="4.4.0 4.4.0_beta1 4.4.0_rc1 4.3.4-r1 4.3.4 4.3.3 4.3.2-r1 4.3.2 4.3.1-r1 4.3.1 4.3.0-r2 4.3.0-r1 4.3.0 4.3.0_rc1 4.3.0_beta1 4.2.3-r1 4.2.3 4.2.2 4.2.1 4.2.0-r2 4.2.0-r1 4.2.0 4.1.4-r2 4.1.4-r1 4.1.4 4.1.3 4.1.2 4.1.1 4.1.0 4.0.1 4.0.0"
+QT4VERSIONS="4.4.0 4.4.0_beta1 4.4.0_rc1
+ 4.3.4-r1 4.3.4 4.3.3 4.3.2-r1 4.3.2 4.3.1-r1 4.3.1
+ 4.3.0-r2 4.3.0-r1 4.3.0 4.3.0_rc1 4.3.0_beta1
+ 4.2.3-r1 4.2.3 4.2.2 4.2.1 4.2.0-r2 4.2.0-r1 4.2.0
+ 4.1.4-r2 4.1.4-r1 4.1.4 4.1.3 4.1.2 4.1.1 4.1.0
+ 4.0.1 4.0.0"
# @FUNCTION: qt4_min_version
# @USAGE: [minimum version]
@@ -68,6 +73,57 @@
echo "${VERSIONS}"
}
+qt4_monolithic_to_split_flag() {
+ case ${1} in
+ zlib)
+ # Qt 4.4+ is always built with zlib enabled, so this flag isn't needed
+ ;;
+ gif|jpeg|png)
+ # qt-gui always installs with these enabled
+ checkpkgs+=" x11-libs/qt-gui"
+ ;;
+ dbus|opengl)
+ # Make sure the qt-${1} package has been installed already
+ checkpkgs+=" x11-libs/qt-${1}"
+ ;;
+ qt3support)
+ checkpkgs+=" x11-libs/qt-${1}"
+ checkflags+=" x11-libs/qt-core:${1} x11-libs/qt-gui:${1} x11-libs/qt-sql:${1}"
+ ;;
+ ssl)
+ # qt-core controls this flag
+ checkflags+=" x11-libs/qt-core:${1}"
+ ;;
+ cups|mng|nas|nis|tiff|xinerama|input_devices_wacom)
+ # qt-gui controls these flags
+ checkflags+=" x11-libs/qt-gui:${1}"
+ ;;
+ firebird|mysql|odbc|postgres|sqlite3)
+ # qt-sql controls these flags. sqlite2 is no longer supported so it uses sqlite instead of sqlite3.
+ checkflags+=" x11-libs/qt-sql:${1%3}"
+ ;;
+ accessibility)
+ eerror "(QA message): Use guiaccessibility and/or qt3accessibility to specify which of qt-gui and qt-qt3support are relevant for this package."
+ # deal with this gracefully by checking the flag for what is available
+ for y in gui qt3support; do
+ has_version x11-libs/qt-${y} && checkflags+=" x11-libs/qt-${y}:${1}"
+ done
+ ;;
+ guiaccessibility)
+ checkflags+=" x11-libs/qt-gui:accessibility"
+ ;;
+ qt3accessibility)
+ checkflags+=" x11-libs/qt-qt3support:accessibility"
+ ;;
+ debug|doc|examples|glib|pch|sqlite|*)
+ # packages probably shouldn't be checking these flags so we don't handle them currently
+ eerror "qt4.eclass currently doesn't handle the use flag ${1} in QT4_BUILT_WITH_USE_CHECK for qt-4.4. This is either an"
+ eerror "eclass bug or an ebuild bug. Please report it at http://bugs.gentoo.org/"
+ ((fatalerrors+=1))
+ ;;
+ esac
+}
+
# @FUNCTION: qt4_pkg_setup
# @MAINTAINER:
# Caleb Tennis <caleb@gentoo.org>
@@ -85,57 +141,20 @@
# flags to watch for for Qt4.4:
# zlib png | opengl dbus qt3support | sqlite3 ssl
qt4_pkg_setup() {
+ local x y checkpkgs checkflags fatalerrors=0 requiredflags=""
- QT4_BEST_VERSION="$(best_version =x11-libs/qt-4*)"
- QT4_MINOR_VERSION="$(get_version_component_range 2 ${QT4_BEST_VERSION/*qt-/})"
+ # lots of has_version calls can be very expensive
+ if [[ -n ${QT4_BUILT_WITH_USE_CHECK}${QT4_OPTIONAL_BUILT_WITH_USE_CHECK} ]]; then
+ has_version x11-libs/qt-core && local QT44=true
+ fi
- local requiredflags=""
for x in ${QT4_BUILT_WITH_USE_CHECK}; do
- if [[ "${QT4_MINOR_VERSION}" -ge 4 ]]; then
- # The use flags are different in 4.4 and above, and it's a split package, so this is used to catch
- # the various use flag combos specified in the ebuilds to make sure we don't error out.
-
-
- case ${x} in
- zlib|png|gif)
- # Qt 4.4+ is built with zlib, png, and gif by default, so the use flags aren't needed
- ;;
- opengl|dbus|qt3support)
- # Make sure the qt-${x} package has been already installed
- if ! has_version x11-libs/qt-${x}; then
- eerror "You must first install the x11-libs/qt-${x} package."
- die "Install x11-libs/qt-${x}"
- fi
- ;;
- ssl)
- if ! has_version x11-libs/qt-core || ! built_with_use x11-libs/qt-core ssl; then
- eerror "You must first install the x11-libs/qt-core package with the ssl flag enabled."
- die "Install x11-libs/qt-core with USE=\"ssl\""
- fi
- ;;
- sqlite3)
- if ! has_version x11-libs/qt-sql || ! built_with_use x11-libs/qt-sql sqlite; then
- eerror "You must first install the x11-libs/qt-sql package with the sqlite flag enabled."
- die "Install x11-libs/qt-sql with USE=\"sqlite\""
- fi
- ;;
- guiaccessibility)
- if ! has_version x11-libs/qt-gui || ! built_with_use x11-libs/qt-gui accessibility; then
- eerror "You must first install the x11-libs/qt-gui package with the accessibility flag enabled."
- die "Install x11-libs/qt-gui with USE=\"accessibility\""
- fi
- ;;
-
- qt3accessibility)
- if ! has_version x11-libs/qt-qt3support || ! built_with_use x11-libs/qt-qt3support accessibility; then
- eerror "You must first install the x11-libs/qt-qt3support package with the accessibility flag enabled."
- die "Install x11-libs/qt-qt3support with USE=\"accessibility\""
- fi
- ;;
- esac
+ if [[ -n ${QT44} ]]; then
+ # The use flags are different in 4.4 and above, and it's split packages, so this is used to catch
+ # the various use flag combos specified in the ebuilds to make sure we don't error out for no reason.
+ qt4_monolithic_to_split_flag ${x}
else
- [[ ${x} == guiaccessibility ]] && x=${x#gui}
- [[ ${x} == qt3accessibility ]] && x=${x#qt3}
+ [[ ${x} == *accessibility ]] && x=${x#gui} && x=${x#qt3}
if ! built_with_use =x11-libs/qt-4* ${x}; then
requiredflags="${requiredflags} ${x}"
fi
@@ -144,20 +163,50 @@
local optionalflags=""
for x in ${QT4_OPTIONAL_BUILT_WITH_USE_CHECK}; do
- if use ${x} && ! built_with_use =x11-libs/qt-4* ${x}; then
- optionalflags="${optionalflags} ${x}"
+ if use ${x}; then
+ if [[ -n ${QT44} ]]; then
+ # The use flags are different in 4.4 and above, and it's split packages, so this is used to catch
+ # the various use flag combos specified in the ebuilds to make sure we don't error out for no reason.
+ qt4_monolithic_to_split_flag ${x}
+ elif ! built_with_use =x11-libs/qt-4* ${x}; then
+ optionalflags="${optionalflags} ${x}"
+ fi
+ fi
+ done
+
+ # The use flags are different in 4.4 and above, and it's split packages, so this is used to catch
+ # the various use flag combos specified in the ebuilds to make sure we don't error out for no reason.
+ for y in ${checkpkgs}; do
+ if ! has_version ${y}; then
+ eerror "You must first install the ${y} package. It should be added to the dependencies for this package (${CATEGORY}/${PN}). See bug #217161."
+ ((fatalerrors+=1))
+ fi
+ done
+ for y in ${checkflags}; do
+ if ! has_version ${y%:*}; then
+ eerror "You must first install the ${y%:*} package with the ${y##*:} flag enabled."
+ eerror "It should be added to the dependencies for this package (${CATEGORY}/${PN}). See bug #217161."
+ ((fatalerrors+=1))
+ else
+ if ! built_with_use ${y%:*} ${y##*:}; then
+ eerror "You must first install the ${y%:*} package with the ${y##*:} flag enabled."
+ ((fatalerrors+=1))
+ fi
fi
done
local diemessage=""
- if [[ ${requiredflags} != "" ]]; then
+ if [[ ${fatalerrors} -ne 0 ]]; then
+ diemessage="${fatalerrors} fatal errors were detected. Please read the above error messages and act accordingly."
+ fi
+ if [[ -n ${requiredflags} ]]; then
eerror
eerror "(1) In order to compile ${CATEGORY}/${PN} first you need to build"
eerror "=x11-libs/qt-4* with USE=\"${requiredflags}\" flag(s)"
eerror
diemessage="(1) recompile qt4 with \"${requiredflags}\" USE flag(s) ; "
fi
- if [[ ${optionalflags} != "" ]]; then
+ if [[ -n ${optionalflags} ]]; then
eerror
eerror "(2) You are trying to compile ${CATEGORY}/${PN} package with"
eerror "USE=\"${optionalflags}\""
@@ -171,7 +220,7 @@
diemessage="${diemessage}(2) recompile qt4 with \"${optionalflags}\" USE flag(s) or disable them for ${PN} package\n"
fi
- [[ ${diemessage} != "" ]] && die "can't emerge ${CATEGORY}/${PN}: ${diemessage}"
+ [[ -n ${diemessage} ]] && die "can't install ${CATEGORY}/${PN}: ${diemessage}"
}
# @FUNCTION: eqmake4
--
gentoo-commits@lists.gentoo.org mailing list
^ permalink raw reply [flat|nested] 31+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: qt4.eclass
@ 2008-07-26 23:47 Carsten Lohrke (carlo)
0 siblings, 0 replies; 31+ messages in thread
From: Carsten Lohrke (carlo) @ 2008-07-26 23:47 UTC (permalink / raw
To: gentoo-commits
carlo 08/07/26 23:47:04
Modified: qt4.eclass
Log:
add 4.3.5
Revision Changes Path
1.45 eclass/qt4.eclass
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/qt4.eclass?rev=1.45&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/qt4.eclass?rev=1.45&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/qt4.eclass?r1=1.44&r2=1.45
Index: qt4.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/qt4.eclass,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -r1.44 -r1.45
--- qt4.eclass 17 Jul 2008 00:03:33 -0000 1.44
+++ qt4.eclass 26 Jul 2008 23:47:03 -0000 1.45
@@ -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.44 2008/07/17 00:03:33 zlin Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/qt4.eclass,v 1.45 2008/07/26 23:47:03 carlo Exp $
# @ECLASS: qt4.eclass
# @MAINTAINER:
@@ -18,7 +18,7 @@
QTPKG="x11-libs/qt-"
QT4MAJORVERSIONS="4.4 4.3 4.2 4.1 4.0"
QT4VERSIONS="4.4.0 4.4.0_beta1 4.4.0_rc1
- 4.3.4-r1 4.3.4 4.3.3 4.3.2-r1 4.3.2 4.3.1-r1 4.3.1
+ 4.3.4-r1 4.3.5 4.3.4 4.3.3 4.3.2-r1 4.3.2 4.3.1-r1 4.3.1
4.3.0-r2 4.3.0-r1 4.3.0 4.3.0_rc1 4.3.0_beta1
4.2.3-r1 4.2.3 4.2.2 4.2.1 4.2.0-r2 4.2.0-r1 4.2.0
4.1.4-r2 4.1.4-r1 4.1.4 4.1.3 4.1.2 4.1.1 4.1.0
^ permalink raw reply [flat|nested] 31+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: qt4.eclass
@ 2008-09-21 1:21 Ben de Groot (yngwin)
0 siblings, 0 replies; 31+ messages in thread
From: Ben de Groot (yngwin) @ 2008-09-21 1:21 UTC (permalink / raw
To: gentoo-commits
yngwin 08/09/21 01:21:10
Modified: qt4.eclass
Log:
Adding 4.4.2 to qtversions in qt4.eclass
Revision Changes Path
1.49 eclass/qt4.eclass
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/qt4.eclass?rev=1.49&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/qt4.eclass?rev=1.49&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/qt4.eclass?r1=1.48&r2=1.49
Index: qt4.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/qt4.eclass,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -r1.48 -r1.49
--- qt4.eclass 3 Aug 2008 20:47:27 -0000 1.48
+++ qt4.eclass 21 Sep 2008 01:21:09 -0000 1.49
@@ -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.48 2008/08/03 20:47:27 carlo Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/qt4.eclass,v 1.49 2008/09/21 01:21:09 yngwin Exp $
# @ECLASS: qt4.eclass
# @MAINTAINER:
@@ -17,7 +17,7 @@
QTPKG="x11-libs/qt-"
QT4MAJORVERSIONS="4.4 4.3 4.2 4.1 4.0"
-QT4VERSIONS="4.4.1 4.4.0 4.4.0_beta1 4.4.0_rc1
+QT4VERSIONS="4.4.2 4.4.1 4.4.0 4.4.0_beta1 4.4.0_rc1
4.3.4-r1 4.3.5 4.3.4 4.3.3 4.3.2-r1 4.3.2 4.3.1-r1 4.3.1
4.3.0-r2 4.3.0-r1 4.3.0 4.3.0_rc1 4.3.0_beta1
4.2.3-r1 4.2.3 4.2.2 4.2.1 4.2.0-r2 4.2.0-r1 4.2.0
^ permalink raw reply [flat|nested] 31+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: qt4.eclass
@ 2009-02-25 18:23 Markos Chandras (hwoarang)
0 siblings, 0 replies; 31+ messages in thread
From: Markos Chandras (hwoarang) @ 2009-02-25 18:23 UTC (permalink / raw
To: gentoo-commits
hwoarang 09/02/25 18:23:56
Modified: qt4.eclass
Log:
Fixed pre-stripped issues when using qmake ( thanks to idl0r )
Revision Changes Path
1.50 eclass/qt4.eclass
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/qt4.eclass?rev=1.50&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/qt4.eclass?rev=1.50&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/qt4.eclass?r1=1.49&r2=1.50
Index: qt4.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/qt4.eclass,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -r1.49 -r1.50
--- qt4.eclass 21 Sep 2008 01:21:09 -0000 1.49
+++ qt4.eclass 25 Feb 2009 18:23:56 -0000 1.50
@@ -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.49 2008/09/21 01:21:09 yngwin Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/qt4.eclass,v 1.50 2009/02/25 18:23:56 hwoarang Exp $
# @ECLASS: qt4.eclass
# @MAINTAINER:
@@ -271,6 +271,7 @@
QMAKE_LFLAGS_RELEASE="${LDFLAGS}" \
QMAKE_LFLAGS_DEBUG="${LDFLAGS}" \
QMAKE_RPATH= \
+ QMAKE_STRIP= \
"${@}" >> ${LOGFILE} 2>&1
local result=$?
^ permalink raw reply [flat|nested] 31+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: qt4.eclass
@ 2009-03-14 15:31 Ben de Groot (yngwin)
0 siblings, 0 replies; 31+ messages in thread
From: Ben de Groot (yngwin) @ 2009-03-14 15:31 UTC (permalink / raw
To: gentoo-commits
yngwin 09/03/14 15:31:28
Modified: qt4.eclass
Log:
Update qt4.eclass
Revision Changes Path
1.51 eclass/qt4.eclass
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/qt4.eclass?rev=1.51&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/qt4.eclass?rev=1.51&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/qt4.eclass?r1=1.50&r2=1.51
Index: qt4.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/qt4.eclass,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -r1.50 -r1.51
--- qt4.eclass 25 Feb 2009 18:23:56 -0000 1.50
+++ qt4.eclass 14 Mar 2009 15:31:28 -0000 1.51
@@ -1,73 +1,20 @@
-# Copyright 2005 Gentoo Foundation
+# Copyright 2005-2009 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/qt4.eclass,v 1.50 2009/02/25 18:23:56 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/qt4.eclass,v 1.51 2009/03/14 15:31:28 yngwin Exp $
# @ECLASS: qt4.eclass
# @MAINTAINER:
-# Caleb Tennis <caleb@gentoo.org>
+# Ben de Groot <yngwin@gentoo.org>,
+# Markos Chandras <hwoarang@gentoo.org>,
+# Caleb Tennis <caleb@gentoo.org>,
+# Przemyslaw Maciag <troll@gentoo.org>,
+# Davide Pesavento <davidepesa@gmail.com>
# @BLURB: Eclass for Qt4 packages
# @DESCRIPTION:
# This eclass contains various functions that may be useful
# when dealing with packages using Qt4 libraries.
-# 08.16.06 - Renamed qt_min_* to qt4_min_* to avoid conflicts with the qt3 eclass.
-# - Caleb Tennis <caleb@gentoo.org>
-
-inherit eutils multilib toolchain-funcs versionator
-
-QTPKG="x11-libs/qt-"
-QT4MAJORVERSIONS="4.4 4.3 4.2 4.1 4.0"
-QT4VERSIONS="4.4.2 4.4.1 4.4.0 4.4.0_beta1 4.4.0_rc1
- 4.3.4-r1 4.3.5 4.3.4 4.3.3 4.3.2-r1 4.3.2 4.3.1-r1 4.3.1
- 4.3.0-r2 4.3.0-r1 4.3.0 4.3.0_rc1 4.3.0_beta1
- 4.2.3-r1 4.2.3 4.2.2 4.2.1 4.2.0-r2 4.2.0-r1 4.2.0
- 4.1.4-r2 4.1.4-r1 4.1.4 4.1.3 4.1.2 4.1.1 4.1.0
- 4.0.1 4.0.0"
-
-# @FUNCTION: qt4_min_version
-# @USAGE: [minimum version]
-# @DESCRIPTION:
-# This function is deprecated. Use slot dependencies instead.
-qt4_min_version() {
- local deps="$@"
- ewarn "${CATEGORY}/${PF}: qt4_min_version() is deprecated. Use slot dependencies instead."
- case ${EAPI:-0} in
- # EAPIs without SLOT dependencies
- 0) echo "|| ("
- qt4_min_version_list "${deps}"
- echo ")"
- ;;
- # EAPIS with SLOT dependencies.
- *) echo ">=${QTPKG}${1}:4"
- ;;
- esac
-}
-
-qt4_min_version_list() {
- local MINVER="$1"
- local VERSIONS=""
-
- case "${MINVER}" in
- 4|4.0|4.0.0) VERSIONS="=${QTPKG}4*";;
- 4.1|4.1.0|4.2|4.2.0|4.3|4.3.0|4.4|4.4.0)
- for x in ${QT4MAJORVERSIONS}; do
- if version_is_at_least "${MINVER}" "${x}"; then
- VERSIONS="${VERSIONS} =${QTPKG}${x}*"
- fi
- done
- ;;
- 4*)
- for x in ${QT4VERSIONS}; do
- if version_is_at_least "${MINVER}" "${x}"; then
- VERSIONS="${VERSIONS} =${QTPKG}${x}"
- fi
- done
- ;;
- *) VERSIONS="=${QTPKG}4*";;
- esac
-
- echo "${VERSIONS}"
-}
+inherit base eutils multilib toolchain-funcs versionator
qt4_monolithic_to_split_flag() {
case ${1} in
@@ -121,9 +68,6 @@
}
# @FUNCTION: qt4_pkg_setup
-# @MAINTAINER:
-# Caleb Tennis <caleb@gentoo.org>
-# Przemyslaw Maciag <troll@gentoo.org>
# @DESCRIPTION:
# Default pkg_setup function for packages that depends on qt4. If you have to
# create ebuilds own pkg_setup in your ebuild, call qt4_pkg_setup in it.
@@ -134,6 +78,8 @@
# functionality, but can alternatively be disabled in ${CATEGORY}/${PN}
# (so qt4 don't have to be recompiled)
#
+# NOTE: Using the above vars is now deprecated in favor of eapi-2 use deps
+#
# flags to watch for for Qt4.4:
# zlib png | opengl dbus qt3support | sqlite3 ssl
qt4_pkg_setup() {
@@ -141,6 +87,9 @@
# lots of has_version calls can be very expensive
if [[ -n ${QT4_BUILT_WITH_USE_CHECK}${QT4_OPTIONAL_BUILT_WITH_USE_CHECK} ]]; then
+ ewarn "QA notice: The QT4_BUILT_WITH_USE functionality is deprecated and"
+ ewarn "will be removed from future versions of qt4.eclass. Please update"
+ ewarn "the ebuild to use eapi-2 use dependencies instead."
has_version x11-libs/qt-core && local QT44=true
fi
@@ -219,11 +168,55 @@
[[ -n ${diemessage} ]] && die "can't install ${CATEGORY}/${PN}: ${diemessage}"
}
+# @ECLASS-VARIABLE: PATCHES
+# @DESCRIPTION:
+# In case you have patches to apply, specify them in the PATCHES variable.
+# Make sure to specify the full path. This variable is necessary for the
+# src_prepare phase.
+# example:
+# PATCHES="${FILESDIR}/mypatch.patch
+# ${FILESDIR}/mypatch2.patch"
+#
+# @FUNCTION: qt4_src_prepare
+# @DESCRIPTION:
+# Default src_prepare function for packages that depend on qt4. If you have to
+# override src_prepare in your ebuild, you should call qt4_src_prepare in it,
+# otherwise autopatcher will not work!
+qt4_src_prepare() {
+ debug-print-function $FUNCNAME "$@"
+ base_src_prepare
+}
+
+# @FUNCTION: qt4_src_configure
+# @DESCRIPTION:
+# Default src_configure function for packages that depend on qt4. If you have to
+# override src_configure in your ebuild, call qt4_src_configure in it.
+qt4_src_configure() {
+ debug-print-function $FUNCNAME "$@"
+ eqmake4
+}
+
+# @FUNCTION: qt4_src_compile
+# @DESCRIPTION:
+# Default src_compile function for packages that depend on qt4. If you have to
+# override src_compile in your ebuild (probably you don't need to), call
+# qt4_src_compile in it.
+qt4_src_compile() {
+ debug-print-function $FUNCNAME "$@"
+ case "${EAPI:-0}" in
+ 2)
+ emake || die "emake failed"
+ ;;
+ 0|1)
+ qt4_src_prepare
+ qt4_src_configure
+ emake || die "emake failed"
+ ;;
+ esac
+}
+
# @FUNCTION: eqmake4
# @USAGE: [.pro file] [additional parameters to qmake]
-# @MAINTAINER:
-# Przemyslaw Maciag <troll@gentoo.org>
-# Davide Pesavento <davidepesa@gmail.com>
# @DESCRIPTION:
# Runs qmake on the specified .pro file (defaults to
# ${PN}.pro if eqmake4 was called with no argument).
@@ -290,4 +283,11 @@
return ${result}
}
-EXPORT_FUNCTIONS pkg_setup
+case ${EAPI:-0} in
+ 2)
+ EXPORT_FUNCTIONS pkg_setup src_prepare src_configure src_compile
+ ;;
+ 0|1)
+ EXPORT_FUNCTIONS pkg_setup src_compile
+ ;;
+esac
^ permalink raw reply [flat|nested] 31+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: qt4.eclass
@ 2009-03-14 23:30 Ben de Groot (yngwin)
0 siblings, 0 replies; 31+ messages in thread
From: Ben de Groot (yngwin) @ 2009-03-14 23:30 UTC (permalink / raw
To: gentoo-commits
yngwin 09/03/14 23:30:05
Modified: qt4.eclass
Log:
Reverting qt4.eclass additions of src_configure and src_compile, which have wider implications then i realized on my previous commit. But qt4_src_prepare stays, for autopatch functionality. And QT4_BUILT_WITH_USE stuff remains deprecated. Use EAPI=2 use deps pretty please! I also hope this commit message is verbose enough to satisfy Donnie ;-)
Revision Changes Path
1.52 eclass/qt4.eclass
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/qt4.eclass?rev=1.52&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/qt4.eclass?rev=1.52&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/qt4.eclass?r1=1.51&r2=1.52
Index: qt4.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/qt4.eclass,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -r1.51 -r1.52
--- qt4.eclass 14 Mar 2009 15:31:28 -0000 1.51
+++ qt4.eclass 14 Mar 2009 23:30:05 -0000 1.52
@@ -1,6 +1,6 @@
# Copyright 2005-2009 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/qt4.eclass,v 1.51 2009/03/14 15:31:28 yngwin Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/qt4.eclass,v 1.52 2009/03/14 23:30:05 yngwin Exp $
# @ECLASS: qt4.eclass
# @MAINTAINER:
@@ -191,29 +191,29 @@
# @DESCRIPTION:
# Default src_configure function for packages that depend on qt4. If you have to
# override src_configure in your ebuild, call qt4_src_configure in it.
-qt4_src_configure() {
- debug-print-function $FUNCNAME "$@"
- eqmake4
-}
+#qt4_src_configure() {
+# debug-print-function $FUNCNAME "$@"
+# eqmake4
+#}
# @FUNCTION: qt4_src_compile
# @DESCRIPTION:
# Default src_compile function for packages that depend on qt4. If you have to
# override src_compile in your ebuild (probably you don't need to), call
# qt4_src_compile in it.
-qt4_src_compile() {
- debug-print-function $FUNCNAME "$@"
- case "${EAPI:-0}" in
- 2)
- emake || die "emake failed"
- ;;
- 0|1)
- qt4_src_prepare
- qt4_src_configure
- emake || die "emake failed"
- ;;
- esac
-}
+#qt4_src_compile() {
+# debug-print-function $FUNCNAME "$@"
+# case "${EAPI:-0}" in
+# 2)
+# emake || die "emake failed"
+# ;;
+# 0|1)
+# qt4_src_prepare
+# qt4_src_configure
+# emake || die "emake failed"
+# ;;
+# esac
+#}
# @FUNCTION: eqmake4
# @USAGE: [.pro file] [additional parameters to qmake]
@@ -285,9 +285,9 @@
case ${EAPI:-0} in
2)
- EXPORT_FUNCTIONS pkg_setup src_prepare src_configure src_compile
+ EXPORT_FUNCTIONS pkg_setup src_prepare
;;
0|1)
- EXPORT_FUNCTIONS pkg_setup src_compile
+ EXPORT_FUNCTIONS pkg_setup
;;
esac
^ permalink raw reply [flat|nested] 31+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: qt4.eclass
@ 2009-05-09 12:45 Markos Chandras (hwoarang)
0 siblings, 0 replies; 31+ messages in thread
From: Markos Chandras (hwoarang) @ 2009-05-09 12:45 UTC (permalink / raw
To: gentoo-commits
hwoarang 09/05/09 12:45:40
Modified: qt4.eclass
Log:
New eqmake4. Fixes bug #244692 . Thanks to Davide Pesavento <davidepesa@gmail.com> for all the patches
Revision Changes Path
1.53 eclass/qt4.eclass
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/qt4.eclass?rev=1.53&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/qt4.eclass?rev=1.53&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/qt4.eclass?r1=1.52&r2=1.53
Index: qt4.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/qt4.eclass,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -r1.52 -r1.53
--- qt4.eclass 14 Mar 2009 23:30:05 -0000 1.52
+++ qt4.eclass 9 May 2009 12:45:40 -0000 1.53
@@ -1,6 +1,6 @@
-# Copyright 2005-2009 Gentoo Foundation
+-e # Copyright 2005-2009 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/qt4.eclass,v 1.52 2009/03/14 23:30:05 yngwin Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/qt4.eclass,v 1.53 2009/05/09 12:45:40 hwoarang Exp $
# @ECLASS: qt4.eclass
# @MAINTAINER:
@@ -218,40 +218,76 @@
# @FUNCTION: eqmake4
# @USAGE: [.pro file] [additional parameters to qmake]
# @DESCRIPTION:
-# Runs qmake on the specified .pro file (defaults to
-# ${PN}.pro if eqmake4 was called with no argument).
-# Additional parameters are passed unmodified to qmake.
+# Runs qmake on the specified .pro file (defaults to ${PN}.pro if called
+# without arguments). Additional parameters are appended unmodified to
+# qmake command line. For recursive build systems, i.e. those based on
+# the subdirs template, you should run eqmake4 on the top-level project
+# file only, unless you have strong reasons to do things differently.
+# During the building, qmake will be automatically re-invoked with the
+# right arguments on every directory specified inside the top-level
+# project file by the SUBDIRS variable.
eqmake4() {
- local LOGFILE="${T}/qmake-$$.out"
- local projprofile="${1}"
- [[ -z ${projprofile} ]] && projprofile="${PN}.pro"
- shift 1
+ local projectfile="${1:-${PN}.pro}"
+ shift
- ebegin "Processing qmake ${projprofile}"
-
- # file exists?
- if [[ ! -f ${projprofile} ]]; then
- echo
- eerror "Project .pro file \"${projprofile}\" does not exists"
- eerror "qmake cannot handle non-existing .pro files"
+ if [[ ! -f ${projectfile} ]]; then
echo
- eerror "This shouldn't happen - please send a bug report to bugs.gentoo.org"
+ eerror "Project file '${projectfile#${WORKDIR}/}' does not exists!"
+ eerror "eqmake4 cannot handle non-existing project files."
+ eerror
+ eerror "This shouldn't happen - please send a bug report to http://bugs.gentoo.org/"
echo
- die "Project file not found in ${PN} sources"
+ die "Project file not found in ${CATEGORY}/${PN} sources."
fi
- echo >> ${LOGFILE}
- echo "****** qmake ${projprofile} ******" >> ${LOGFILE}
- echo >> ${LOGFILE}
+ ebegin "Running qmake on ${projectfile}"
- # as a workaround for broken qmake, put everything into file
+ # make sure CONFIG variable is correctly set for both release and debug builds
+ local CONFIG_ADD="release"
+ local CONFIG_REMOVE="debug"
if has debug ${IUSE} && use debug; then
- echo -e "\nCONFIG -= release\nCONFIG += no_fixpath debug" >> ${projprofile}
- else
- echo -e "\nCONFIG -= debug\nCONFIG += no_fixpath release" >> ${projprofile}
+ CONFIG_ADD="debug"
+ CONFIG_REMOVE="release"
fi
+ local awkscript='BEGIN {
+ printf "### eqmake4 was here ###\n" > file;
+ fixed=0;
+ }
+ /^[[:blank:]]*CONFIG[[:blank:]]*[\+\*]?=/ {
+ for (i=1; i <= NF; i++) {
+ if ($i ~ rem || $i ~ /debug_and_release/)
+ { $i=add; fixed=1; }
+ }
+ }
+ /^[[:blank:]]*CONFIG[[:blank:]]*-=/ {
+ for (i=1; i <= NF; i++) {
+ if ($i ~ add) { $i=rem; fixed=1; }
+ }
+ }
+ {
+ print >> file;
+ }
+ END {
+ printf "CONFIG -= debug_and_release %s\n", rem >> file;
+ printf "CONFIG += %s\n", add >> file;
+ print fixed;
+ }'
+ local file=
+ while read file; do
+ grep -q '^### eqmake4 was here ###$' "${file}" && continue
+ local retval=$({
+ rm -f "${file}" || echo "FAILED"
+ awk -v file="${file}" -- "${awkscript}" add=${CONFIG_ADD} rem=${CONFIG_REMOVE} || echo "FAILED"
+ } < "${file}")
+ if [[ ${retval} == 1 ]]; then
+ einfo " Fixed CONFIG in ${file}"
+ elif [[ ${retval} != 0 ]]; then
+ eerror " An error occurred while processing ${file}"
+ die "eqmake4 failed to process '${file}'."
+ fi
+ done < <(find "$(dirname "${projectfile}")" -type f -name "*.pr[io]" -printf '%P\n' 2>/dev/null)
- /usr/bin/qmake ${projprofile} \
+ /usr/bin/qmake -makefile -nocache \
QTDIR=/usr/$(get_libdir) \
QMAKE=/usr/bin/qmake \
QMAKE_CC=$(tc-getCC) \
@@ -265,22 +301,20 @@
QMAKE_LFLAGS_DEBUG="${LDFLAGS}" \
QMAKE_RPATH= \
QMAKE_STRIP= \
- "${@}" >> ${LOGFILE} 2>&1
+ "${projectfile}" "${@}"
- local result=$?
- eend ${result}
+ eend $?
# was qmake successful?
- if [[ ${result} -ne 0 ]]; then
- echo
- eerror "Running qmake on \"${projprofile}\" has failed"
+ if [[ $? -ne 0 ]]; then
echo
- eerror "This shouldn't happen - please send a bug report to bugs.gentoo.org"
+ eerror "Running qmake on '${projectfile#${WORKDIR}/}' has failed!"
+ eerror "This shouldn't happen - please send a bug report to http://bugs.gentoo.org/"
echo
- die "qmake failed on ${projprofile}"
+ die "qmake failed on '${projectfile}'."
fi
- return ${result}
+ return 0
}
case ${EAPI:-0} in
^ permalink raw reply [flat|nested] 31+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: qt4.eclass
@ 2009-05-09 14:59 Markos Chandras (hwoarang)
0 siblings, 0 replies; 31+ messages in thread
From: Markos Chandras (hwoarang) @ 2009-05-09 14:59 UTC (permalink / raw
To: gentoo-commits
hwoarang 09/05/09 14:59:03
Modified: qt4.eclass
Log:
Fixed typo
Revision Changes Path
1.54 eclass/qt4.eclass
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/qt4.eclass?rev=1.54&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/qt4.eclass?rev=1.54&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/qt4.eclass?r1=1.53&r2=1.54
Index: qt4.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/qt4.eclass,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -r1.53 -r1.54
--- qt4.eclass 9 May 2009 12:45:40 -0000 1.53
+++ qt4.eclass 9 May 2009 14:59:03 -0000 1.54
@@ -1,6 +1,6 @@
--e # Copyright 2005-2009 Gentoo Foundation
+# Copyright 2005-2009 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/qt4.eclass,v 1.53 2009/05/09 12:45:40 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/qt4.eclass,v 1.54 2009/05/09 14:59:03 hwoarang Exp $
# @ECLASS: qt4.eclass
# @MAINTAINER:
^ permalink raw reply [flat|nested] 31+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: qt4.eclass
@ 2009-05-12 10:35 Markos Chandras (hwoarang)
0 siblings, 0 replies; 31+ messages in thread
From: Markos Chandras (hwoarang) @ 2009-05-12 10:35 UTC (permalink / raw
To: gentoo-commits
hwoarang 09/05/12 10:35:32
Modified: qt4.eclass
Log:
Minor fix on eclass
Revision Changes Path
1.55 eclass/qt4.eclass
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/qt4.eclass?rev=1.55&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/qt4.eclass?rev=1.55&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/qt4.eclass?r1=1.54&r2=1.55
Index: qt4.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/qt4.eclass,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -r1.54 -r1.55
--- qt4.eclass 9 May 2009 14:59:03 -0000 1.54
+++ qt4.eclass 12 May 2009 10:35:32 -0000 1.55
@@ -1,6 +1,6 @@
# Copyright 2005-2009 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/qt4.eclass,v 1.54 2009/05/09 14:59:03 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/qt4.eclass,v 1.55 2009/05/12 10:35:32 hwoarang Exp $
# @ECLASS: qt4.eclass
# @MAINTAINER:
@@ -272,8 +272,9 @@
printf "CONFIG += %s\n", add >> file;
print fixed;
}'
- local file=
- while read file; do
+ local filepath=
+ while read filepath; do
+ local file="${filepath#./}"
grep -q '^### eqmake4 was here ###$' "${file}" && continue
local retval=$({
rm -f "${file}" || echo "FAILED"
@@ -285,7 +286,7 @@
eerror " An error occurred while processing ${file}"
die "eqmake4 failed to process '${file}'."
fi
- done < <(find "$(dirname "${projectfile}")" -type f -name "*.pr[io]" -printf '%P\n' 2>/dev/null)
+ done < <(find "$(dirname "${projectfile}")" -type f -name "*.pr[io]" 2>/dev/null)
/usr/bin/qmake -makefile -nocache \
QTDIR=/usr/$(get_libdir) \
^ permalink raw reply [flat|nested] 31+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: qt4.eclass
@ 2009-05-12 10:41 Markos Chandras (hwoarang)
0 siblings, 0 replies; 31+ messages in thread
From: Markos Chandras (hwoarang) @ 2009-05-12 10:41 UTC (permalink / raw
To: gentoo-commits
hwoarang 09/05/12 10:41:03
Modified: qt4.eclass
Log:
Use export XDG_CONFIG_HOME="${T}" to avoid sandbox violations
Revision Changes Path
1.56 eclass/qt4.eclass
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/qt4.eclass?rev=1.56&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/qt4.eclass?rev=1.56&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/qt4.eclass?r1=1.55&r2=1.56
Index: qt4.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/qt4.eclass,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -r1.55 -r1.56
--- qt4.eclass 12 May 2009 10:35:32 -0000 1.55
+++ qt4.eclass 12 May 2009 10:41:03 -0000 1.56
@@ -1,6 +1,6 @@
# Copyright 2005-2009 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/qt4.eclass,v 1.55 2009/05/12 10:35:32 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/qt4.eclass,v 1.56 2009/05/12 10:41:03 hwoarang Exp $
# @ECLASS: qt4.eclass
# @MAINTAINER:
@@ -16,6 +16,8 @@
inherit base eutils multilib toolchain-funcs versionator
+export XDG_CONFIG_HOME="${T}"
+
qt4_monolithic_to_split_flag() {
case ${1} in
zlib)
^ permalink raw reply [flat|nested] 31+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: qt4.eclass
@ 2009-05-17 15:18 Markos Chandras (hwoarang)
0 siblings, 0 replies; 31+ messages in thread
From: Markos Chandras (hwoarang) @ 2009-05-17 15:18 UTC (permalink / raw
To: gentoo-commits
hwoarang 09/05/17 15:18:58
Modified: qt4.eclass
Log:
Minor fix on CONFIG variable. Fixes bug 269631
Revision Changes Path
1.57 eclass/qt4.eclass
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/qt4.eclass?rev=1.57&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/qt4.eclass?rev=1.57&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/qt4.eclass?r1=1.56&r2=1.57
Index: qt4.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/qt4.eclass,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -r1.56 -r1.57
--- qt4.eclass 12 May 2009 10:41:03 -0000 1.56
+++ qt4.eclass 17 May 2009 15:18:58 -0000 1.57
@@ -1,6 +1,6 @@
# Copyright 2005-2009 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/qt4.eclass,v 1.56 2009/05/12 10:41:03 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/qt4.eclass,v 1.57 2009/05/17 15:18:58 hwoarang Exp $
# @ECLASS: qt4.eclass
# @MAINTAINER:
@@ -270,7 +270,7 @@
print >> file;
}
END {
- printf "CONFIG -= debug_and_release %s\n", rem >> file;
+ printf "\nCONFIG -= debug_and_release %s\n", rem >> file;
printf "CONFIG += %s\n", add >> file;
print fixed;
}'
^ permalink raw reply [flat|nested] 31+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: qt4.eclass
@ 2009-11-21 11:44 Tomas Chvatal (scarabeus)
0 siblings, 0 replies; 31+ messages in thread
From: Tomas Chvatal (scarabeus) @ 2009-11-21 11:44 UTC (permalink / raw
To: gentoo-commits
scarabeus 09/11/21 11:44:25
Modified: qt4.eclass
Log:
Update comment for PATCHES variable array so it reflect the reality.
Revision Changes Path
1.60 eclass/qt4.eclass
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/qt4.eclass?rev=1.60&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/qt4.eclass?rev=1.60&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/qt4.eclass?r1=1.59&r2=1.60
Index: qt4.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/qt4.eclass,v
retrieving revision 1.59
retrieving revision 1.60
diff -u -r1.59 -r1.60
--- qt4.eclass 10 Nov 2009 00:56:29 -0000 1.59
+++ qt4.eclass 21 Nov 2009 11:44:25 -0000 1.60
@@ -1,6 +1,6 @@
# Copyright 2005-2009 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/qt4.eclass,v 1.59 2009/11/10 00:56:29 spatz Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/qt4.eclass,v 1.60 2009/11/21 11:44:25 scarabeus Exp $
# @ECLASS: qt4.eclass
# @MAINTAINER:
@@ -176,8 +176,10 @@
# Make sure to specify the full path. This variable is necessary for the
# src_prepare phase.
# example:
-# PATCHES="${FILESDIR}/mypatch.patch
-# ${FILESDIR}/mypatch2.patch"
+# PATCHES=(
+# "${FILESDIR}/mypatch.patch"
+# "${FILESDIR}/mypatch2.patch"
+# )
#
# @FUNCTION: qt4_src_prepare
# @DESCRIPTION:
^ permalink raw reply [flat|nested] 31+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: qt4.eclass
@ 2010-01-14 21:15 Jonathan Callen (abcd)
0 siblings, 0 replies; 31+ messages in thread
From: Jonathan Callen (abcd) @ 2010-01-14 21:15 UTC (permalink / raw
To: gentoo-commits
abcd 10/01/14 21:15:23
Modified: qt4.eclass
Log:
Add EAPI=3 & prefix support to qt4.eclass
Revision Changes Path
1.61 eclass/qt4.eclass
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/qt4.eclass?rev=1.61&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/qt4.eclass?rev=1.61&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/qt4.eclass?r1=1.60&r2=1.61
Index: qt4.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/qt4.eclass,v
retrieving revision 1.60
retrieving revision 1.61
diff -u -r1.60 -r1.61
--- qt4.eclass 21 Nov 2009 11:44:25 -0000 1.60
+++ qt4.eclass 14 Jan 2010 21:15:22 -0000 1.61
@@ -1,6 +1,6 @@
# Copyright 2005-2009 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/qt4.eclass,v 1.60 2009/11/21 11:44:25 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/qt4.eclass,v 1.61 2010/01/14 21:15:22 abcd Exp $
# @ECLASS: qt4.eclass
# @MAINTAINER:
@@ -203,6 +203,8 @@
# right arguments on every directory specified inside the top-level
# project file by the SUBDIRS variable.
eqmake4() {
+ has "${EAPI:-0}" 0 1 2 && use !prefix && EPREFIX=
+
local projectfile="${1:-${PN}.pro}"
shift
@@ -264,9 +266,9 @@
fi
done < <(find "$(dirname "${projectfile}")" -type f -name "*.pr[io]" 2>/dev/null)
- /usr/bin/qmake -makefile -nocache \
- QTDIR=/usr/$(get_libdir) \
- QMAKE=/usr/bin/qmake \
+ "${EPREFIX}"/usr/bin/qmake -makefile -nocache \
+ QTDIR="${EPREFIX}"/usr/$(get_libdir) \
+ QMAKE="${EPREFIX}"/usr/bin/qmake \
QMAKE_CC=$(tc-getCC) \
QMAKE_CXX=$(tc-getCXX) \
QMAKE_LINK=$(tc-getCXX) \
@@ -294,7 +296,7 @@
}
case ${EAPI:-0} in
- 2)
+ 2|3)
EXPORT_FUNCTIONS pkg_setup src_prepare
;;
0|1)
^ permalink raw reply [flat|nested] 31+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: qt4.eclass
@ 2010-08-14 22:55 Alex Alexander (wired)
0 siblings, 0 replies; 31+ messages in thread
From: Alex Alexander (wired) @ 2010-08-14 22:55 UTC (permalink / raw
To: gentoo-commits
wired 10/08/14 22:55:28
Modified: qt4.eclass
Log:
added deprecation notice
Revision Changes Path
1.62 eclass/qt4.eclass
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/qt4.eclass?rev=1.62&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/qt4.eclass?rev=1.62&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/qt4.eclass?r1=1.61&r2=1.62
Index: qt4.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/qt4.eclass,v
retrieving revision 1.61
retrieving revision 1.62
diff -u -r1.61 -r1.62
--- qt4.eclass 14 Jan 2010 21:15:22 -0000 1.61
+++ qt4.eclass 14 Aug 2010 22:55:27 -0000 1.62
@@ -1,6 +1,10 @@
# Copyright 2005-2009 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/qt4.eclass,v 1.61 2010/01/14 21:15:22 abcd Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/qt4.eclass,v 1.62 2010/08/14 22:55:27 wired Exp $
+
+# @DEPRECATED
+# This eclass has been superseded by qt4-r2
+# Please modify your ebuilds to use that instead
# @ECLASS: qt4.eclass
# @MAINTAINER:
^ permalink raw reply [flat|nested] 31+ messages in thread
end of thread, other threads:[~2010-08-14 22:55 UTC | newest]
Thread overview: 31+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2008-03-06 1:23 [gentoo-commits] gentoo-x86 commit in eclass: qt4.eclass Ingmar Vanhassel (ingmar)
-- strict thread matches above, loose matches on Subject: below --
2010-08-14 22:55 Alex Alexander (wired)
2010-01-14 21:15 Jonathan Callen (abcd)
2009-11-21 11:44 Tomas Chvatal (scarabeus)
2009-05-17 15:18 Markos Chandras (hwoarang)
2009-05-12 10:41 Markos Chandras (hwoarang)
2009-05-12 10:35 Markos Chandras (hwoarang)
2009-05-09 14:59 Markos Chandras (hwoarang)
2009-05-09 12:45 Markos Chandras (hwoarang)
2009-03-14 23:30 Ben de Groot (yngwin)
2009-03-14 15:31 Ben de Groot (yngwin)
2009-02-25 18:23 Markos Chandras (hwoarang)
2008-09-21 1:21 Ben de Groot (yngwin)
2008-07-26 23:47 Carsten Lohrke (carlo)
2008-07-17 0:03 Bo Oersted Andresen (zlin)
2008-07-11 21:09 Thomas Anderson (gentoofan23)
2008-07-08 16:02 Thomas Anderson (gentoofan23)
2008-06-21 15:12 Sven Wegener (swegener)
2008-05-15 17:29 Ingmar Vanhassel (ingmar)
2008-03-19 12:19 Ingmar Vanhassel (ingmar)
2008-03-05 23:03 Ingmar Vanhassel (ingmar)
2008-02-26 1:11 Diego Petteno (flameeyes)
2008-02-25 17:07 Caleb Tennis (caleb)
2008-01-05 22:41 Caleb Tennis (caleb)
2008-01-05 20:24 Sven Wegener (swegener)
2008-01-05 18:44 Caleb Tennis (caleb)
2007-12-31 18:55 Caleb Tennis (caleb)
2007-12-19 18:07 Caleb Tennis (caleb)
2007-12-14 0:31 Przemyslaw Maciag (troll)
2007-12-06 12:13 Caleb Tennis (caleb)
2007-10-03 14:59 Caleb Tennis (caleb)
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox