From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from pigeon.gentoo.org ([208.92.234.80] helo=lists.gentoo.org) by finch.gentoo.org with esmtp (Exim 4.60) (envelope-from ) id 1SFNkB-0007x8-Gl for garchives@archives.gentoo.org; Wed, 04 Apr 2012 10:47:15 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id E3AF7E0DDA; Wed, 4 Apr 2012 10:46:57 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 9C4DAE0DDA for ; Wed, 4 Apr 2012 10:46:57 +0000 (UTC) Received: from hornbill.gentoo.org (hornbill.gentoo.org [94.100.119.163]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id DB6E91B4005 for ; Wed, 4 Apr 2012 10:46:56 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id 9E8DDE5403 for ; Wed, 4 Apr 2012 10:46:55 +0000 (UTC) From: "Davide Pesavento" To: gentoo-commits@lists.gentoo.org Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Davide Pesavento" Message-ID: <1333536355.709e1d8a0bdf31d4711e00b3c4a17fe083ce1da6.pesa@gentoo> Subject: [gentoo-commits] proj/qt:master commit in: net-libs/qmf/, net-libs/qmf/files/ X-VCS-Repository: proj/qt X-VCS-Files: net-libs/qmf/files/qmf-tests.patch net-libs/qmf/files/qmf-use-standard-install-paths.patch net-libs/qmf/qmf-9999.ebuild X-VCS-Directories: net-libs/qmf/ net-libs/qmf/files/ X-VCS-Committer: pesa X-VCS-Committer-Name: Davide Pesavento X-VCS-Revision: 709e1d8a0bdf31d4711e00b3c4a17fe083ce1da6 X-VCS-Branch: master Date: Wed, 4 Apr 2012 10:46:55 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: quoted-printable X-Archives-Salt: 08c78eab-c6e8-4fff-95d0-68238c337227 X-Archives-Hash: b1dfbb7ffee12ba03715ecb3714bf565 commit: 709e1d8a0bdf31d4711e00b3c4a17fe083ce1da6 Author: Davide Pesavento gmail com> AuthorDate: Wed Apr 4 10:45:55 2012 +0000 Commit: Davide Pesavento gentoo org> CommitDate: Wed Apr 4 10:45:55 2012 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/qt.git;a=3Dco= mmit;h=3D709e1d8a [net-libs/qmf] Update patch and change installation paths to follow upstr= eam. --- net-libs/qmf/files/qmf-tests.patch | 18 ++ .../qmf/files/qmf-use-standard-install-paths.patch | 275 --------------= ------ net-libs/qmf/qmf-9999.ebuild | 47 ++-- 3 files changed, 46 insertions(+), 294 deletions(-) diff --git a/net-libs/qmf/files/qmf-tests.patch b/net-libs/qmf/files/qmf-= tests.patch new file mode 100644 index 0000000..6262d19 --- /dev/null +++ b/net-libs/qmf/files/qmf-tests.patch @@ -0,0 +1,18 @@ +diff -Naur qmf-9999.orig/tests/tests.pri qmf-9999/tests/tests.pri +--- qmf-9999.orig/tests/tests.pri 2012-04-04 01:56:41.220535387 +0200 ++++ qmf-9999/tests/tests.pri 2012-04-04 01:57:11.031162699 +0200 +@@ -11,7 +11,7 @@ + INCLUDEPATH +=3D . $$QMFPATH $$QMFPATH/support + LIBS +=3D -L$$QMFPATH/build + macx:LIBS +=3D -F$$QMFPATH/build +-!symbian:QMAKE_LFLAGS +=3D -Wl,-rpath,$$QMFPATH ++!symbian:QMAKE_LFLAGS +=3D -Wl,-rpath,\\\$$ORIGIN/$$QMFPATH/build +=20 + symbian { + TARGET.CAPABILITY =3D ReadUserData WriteUserData ReadDeviceData Wri= teDeviceData +@@ -19,3 +19,5 @@ +=20 + include(../common.pri) +=20 ++DESTDIR =3D ++ diff --git a/net-libs/qmf/files/qmf-use-standard-install-paths.patch b/ne= t-libs/qmf/files/qmf-use-standard-install-paths.patch deleted file mode 100644 index d387499..0000000 --- a/net-libs/qmf/files/qmf-use-standard-install-paths.patch +++ /dev/null @@ -1,275 +0,0 @@ -diff -Naur qmf-9999.orig/benchmarks/tst_messageserver/tst_messageserver.= pro qmf-9999/benchmarks/tst_messageserver/tst_messageserver.pro ---- qmf-9999.orig/benchmarks/tst_messageserver/tst_messageserver.pro 201= 1-10-28 00:16:42.818798066 +0200 -+++ qmf-9999/benchmarks/tst_messageserver/tst_messageserver.pro 2011-10-= 28 00:16:58.461602502 +0200 -@@ -3,7 +3,7 @@ - CONFIG +=3D qmfmessageserver qmfclient -=20 - TARGET =3D tst_messageserver=20 --target.path +=3D $$QMF_INSTALL_ROOT/tests -+target.path +=3D $$[QT_INSTALL_DATA]/tests -=20 - BASE=3D../../ - include($$BASE/common.pri) -diff -Naur qmf-9999.orig/examples/listfilterplugin/listfilterplugin.pro = qmf-9999/examples/listfilterplugin/listfilterplugin.pro ---- qmf-9999.orig/examples/listfilterplugin/listfilterplugin.pro 2011-10= -28 00:16:42.863797501 +0200 -+++ qmf-9999/examples/listfilterplugin/listfilterplugin.pro 2011-10-28 0= 0:16:58.461602503 +0200 -@@ -3,7 +3,7 @@ - CONFIG +=3D qmfclient plugin - QT =3D core -=20 --target.path +=3D $$QMF_INSTALL_ROOT/plugins/contentmanagers -+target.path +=3D $$[QT_INSTALL_PLUGINS]/contentmanagers -=20 - DEFINES +=3D PLUGIN_INTERNAL -=20 -diff -Naur qmf-9999.orig/examples/messagingaccounts/messagingaccounts.pr= o qmf-9999/examples/messagingaccounts/messagingaccounts.pro ---- qmf-9999.orig/examples/messagingaccounts/messagingaccounts.pro 2011-= 10-28 00:16:42.907796951 +0200 -+++ qmf-9999/examples/messagingaccounts/messagingaccounts.pro 2011-10-28= 00:16:58.461602503 +0200 -@@ -1,6 +1,6 @@ - TEMPLATE =3D app - TARGET =3D messagingaccounts --target.path +=3D $$QMF_INSTALL_ROOT/bin -+target.path +=3D $$[QT_INSTALL_BINS] - CONFIG +=3D qmfclient qmfmessageserver -=20 - DEPENDPATH +=3D . -diff -Naur qmf-9999.orig/examples/qtmail/app/app.pro qmf-9999/examples/q= tmail/app/app.pro ---- qmf-9999.orig/examples/qtmail/app/app.pro 2011-10-28 00:16:42.875797= 352 +0200 -+++ qmf-9999/examples/qtmail/app/app.pro 2011-10-28 00:16:58.461602503 += 0200 -@@ -1,7 +1,7 @@ - TEMPLATE =3D app - TARGET =3D qtmail=20 - CONFIG +=3D qmfutil qmfclient qmfmessageserver --target.path +=3D $$QMF_INSTALL_ROOT/bin -+target.path +=3D $$[QT_INSTALL_BINS] -=20 - DEPENDPATH +=3D .=20 -=20 -diff -Naur qmf-9999.orig/examples/qtmail/libs/qmfutil/qmfutil.pro qmf-99= 99/examples/qtmail/libs/qmfutil/qmfutil.pro ---- qmf-9999.orig/examples/qtmail/libs/qmfutil/qmfutil.pro 2011-10-28 00= :16:42.905796975 +0200 -+++ qmf-9999/examples/qtmail/libs/qmfutil/qmfutil.pro 2011-10-28 00:16:5= 8.461602503 +0200 -@@ -3,7 +3,7 @@ - CONFIG +=3D qmfclient - TARGET =3D qmfutil=20 -=20 --target.path +=3D $$QMF_INSTALL_ROOT/lib -+target.path +=3D $$[QT_INSTALL_LIBS] -=20 - DEFINES +=3D QMFUTIL_INTERNAL -=20 -diff -Naur qmf-9999.orig/examples/qtmail/plugins/composers/email/email.p= ro qmf-9999/examples/qtmail/plugins/composers/email/email.pro ---- qmf-9999.orig/examples/qtmail/plugins/composers/email/email.pro 2011= -10-28 00:16:42.865797477 +0200 -+++ qmf-9999/examples/qtmail/plugins/composers/email/email.pro 2011-10-2= 8 00:16:58.462602491 +0200 -@@ -2,7 +2,7 @@ - TARGET =3D emailcomposer=20 - CONFIG +=3D qmfclient qmfutil plugin -=20 --target.path +=3D $$QMF_INSTALL_ROOT/plugins/composers -+target.path +=3D $$[QT_INSTALL_PLUGINS]/composers -=20 - DEFINES +=3D PLUGIN_INTERNAL -=20 -diff -Naur qmf-9999.orig/examples/qtmail/plugins/viewers/generic/generic= .pro qmf-9999/examples/qtmail/plugins/viewers/generic/generic.pro ---- qmf-9999.orig/examples/qtmail/plugins/viewers/generic/generic.pro 20= 11-10-28 00:16:42.866797465 +0200 -+++ qmf-9999/examples/qtmail/plugins/viewers/generic/generic.pro 2011-10= -28 00:16:58.462602491 +0200 -@@ -2,7 +2,7 @@ - TARGET =3D genericviewer=20 - CONFIG +=3D qmfclient qmfutil plugin -=20 --target.path +=3D $$QMF_INSTALL_ROOT/plugins/viewers -+target.path +=3D $$[QT_INSTALL_PLUGINS]/viewers -=20 - # Use webkit to render mail if available - contains(QT_CONFIG,webkit){ -diff -Naur qmf-9999.orig/examples/serverobserver/serverobserver.pro qmf-= 9999/examples/serverobserver/serverobserver.pro ---- qmf-9999.orig/examples/serverobserver/serverobserver.pro 2011-10-28 = 00:16:42.863797501 +0200 -+++ qmf-9999/examples/serverobserver/serverobserver.pro 2011-10-28 00:16= :58.462602491 +0200 -@@ -1,6 +1,6 @@ - TEMPLATE =3D app - TARGET =3D serverobserver --target.path +=3D $$QMF_INSTALL_ROOT/bin -+target.path +=3D $$[QT_INSTALL_BINS] - CONFIG +=3D qmfclient qmfmessageserver -=20 - DEPENDPATH +=3D . -diff -Naur qmf-9999.orig/src/libraries/qmfclient/qmfclient.pro qmf-9999/= src/libraries/qmfclient/qmfclient.pro ---- qmf-9999.orig/src/libraries/qmfclient/qmfclient.pro 2011-10-28 00:16= :42.839797803 +0200 -+++ qmf-9999/src/libraries/qmfclient/qmfclient.pro 2011-10-28 00:16:58.4= 63602479 +0200 -@@ -4,8 +4,7 @@ - INSTALLS +=3D target - CONFIG +=3D link_pkgconfig -=20 --simulator:macx:target.path +=3D $$QMF_INSTALL_ROOT/Library/Frameworks --else:target.path +=3D $$QMF_INSTALL_ROOT/lib -+target.path +=3D $$[QT_INSTALL_LIBS] -=20 - DEFINES +=3D QT_BUILD_QCOP_LIB QMF_INTERNAL - win32: { -@@ -221,7 +220,7 @@ - libqtopiamail-zh_CN.ts \ - libqtopiamail-zh_TW.ts -=20 --header_files.path=3D$$QMF_INSTALL_ROOT/include/qmfclient -+header_files.path=3D$$[QT_INSTALL_HEADERS]/qmfclient - header_files.files=3D$$PUBLIC_HEADERS -=20 - INSTALLS +=3D header_files -@@ -236,7 +235,7 @@ - CONFIG +=3D create_pc create_prl - QMAKE_PKGCONFIG_LIBDIR =3D $$target.path - QMAKE_PKGCONFIG_INCDIR =3D $$header_files.path -- QMAKE_PKGCONFIG_DESTDIR =3D pkgconfig -+ QMAKE_PKGCONFIG_DESTDIR =3D ../pkgconfig - LIBS +=3D -licui18n -licuuc -licudata - PRIVATE_HEADERS +=3D support/qcharsetdetector_p.h \ - support/qcharsetdetector.h -diff -Naur qmf-9999.orig/src/libraries/qmfmessageserver/qmfmessageserver= .pro qmf-9999/src/libraries/qmfmessageserver/qmfmessageserver.pro ---- qmf-9999.orig/src/libraries/qmfmessageserver/qmfmessageserver.pro 20= 11-10-28 00:16:42.862797514 +0200 -+++ qmf-9999/src/libraries/qmfmessageserver/qmfmessageserver.pro 2011-10= -28 00:16:58.463602479 +0200 -@@ -3,7 +3,7 @@ - CONFIG +=3D qmfclient - TARGET =3D qmfmessageserver -=20 --target.path +=3D $$QMF_INSTALL_ROOT/lib -+target.path +=3D $$[QT_INSTALL_LIBS] -=20 - QT =3D core network - !contains(DEFINES,QMF_NO_MESSAGE_SERVICE_EDITOR):QT +=3D gui -@@ -48,7 +48,7 @@ - qmailtransport.cpp \ - qmailheartbeattimer_qtimer.cpp # NB: There are multiple impl= ementations -=20 --header_files.path=3D$$QMF_INSTALL_ROOT/include/qmfmessageserver -+header_files.path=3D$$[QT_INSTALL_HEADERS]/qmfmessageserver - header_files.files=3D$$PUBLIC_HEADERS -=20 - INSTALLS +=3D header_files -@@ -57,6 +57,6 @@ - CONFIG +=3D create_pc create_prl - QMAKE_PKGCONFIG_LIBDIR =3D $$target.path - QMAKE_PKGCONFIG_INCDIR =3D $$header_files.path -- QMAKE_PKGCONFIG_DESTDIR =3D pkgconfig -+ QMAKE_PKGCONFIG_DESTDIR =3D ../pkgconfig - } - include(../../../common.pri) -diff -Naur qmf-9999.orig/src/plugins/contentmanagers/qmfstoragemanager/q= mfstoragemanager.pro qmf-9999/src/plugins/contentmanagers/qmfstoragemanag= er/qmfstoragemanager.pro ---- qmf-9999.orig/src/plugins/contentmanagers/qmfstoragemanager/qmfstora= gemanager.pro 2011-10-28 00:16:42.831797902 +0200 -+++ qmf-9999/src/plugins/contentmanagers/qmfstoragemanager/qmfstorageman= ager.pro 2011-10-28 00:16:58.463602479 +0200 -@@ -3,7 +3,7 @@ - CONFIG +=3D qmfclient plugin - QT =3D core -=20 --target.path +=3D $$QMF_INSTALL_ROOT/plugins/contentmanagers -+target.path +=3D $$[QT_INSTALL_PLUGINS]/contentmanagers -=20 - DEFINES +=3D PLUGIN_INTERNAL -=20 -diff -Naur qmf-9999.orig/src/plugins/messageservices/imap/imap.pro qmf-9= 999/src/plugins/messageservices/imap/imap.pro ---- qmf-9999.orig/src/plugins/messageservices/imap/imap.pro 2011-10-28 0= 0:16:42.824797989 +0200 -+++ qmf-9999/src/plugins/messageservices/imap/imap.pro 2011-10-28 00:16:= 58.463602479 +0200 -@@ -2,7 +2,7 @@ - TARGET =3D imap=20 - CONFIG +=3D qmfmessageserver qmfclient plugin -=20 --target.path +=3D $$QMF_INSTALL_ROOT/plugins/messageservices -+target.path +=3D $$[QT_INSTALL_PLUGINS]/messageservices -=20 - QT +=3D core network -=20 -diff -Naur qmf-9999.orig/src/plugins/messageservices/pop/pop.pro qmf-999= 9/src/plugins/messageservices/pop/pop.pro ---- qmf-9999.orig/src/plugins/messageservices/pop/pop.pro 2011-10-28 00:= 16:42.829797928 +0200 -+++ qmf-9999/src/plugins/messageservices/pop/pop.pro 2011-10-28 00:16:58= .464602466 +0200 -@@ -2,7 +2,7 @@ - TARGET =3D pop=20 - CONFIG +=3D qmfclient qmfmessageserver plugin -=20 --target.path =3D $$QMF_INSTALL_ROOT/plugins/messageservices -+target.path =3D $$[QT_INSTALL_PLUGINS]/messageservices -=20 - QT =3D core network -=20 -diff -Naur qmf-9999.orig/src/plugins/messageservices/qmfsettings/qmfsett= ings.pro qmf-9999/src/plugins/messageservices/qmfsettings/qmfsettings.pro ---- qmf-9999.orig/src/plugins/messageservices/qmfsettings/qmfsettings.pr= o 2011-10-28 00:16:42.827797953 +0200 -+++ qmf-9999/src/plugins/messageservices/qmfsettings/qmfsettings.pro 201= 1-10-28 00:16:58.464602466 +0200 -@@ -2,7 +2,7 @@ - TARGET =3D qmfsettings - CONFIG +=3D qmfclient qmfmessageserver plugin -=20 --target.path +=3D $$QMF_INSTALL_ROOT/plugins/messageservices -+target.path +=3D $$[QT_INSTALL_PLUGINS]/messageservices -=20 - QT =3D core network -=20 -diff -Naur qmf-9999.orig/src/plugins/messageservices/smtp/smtp.pro qmf-9= 999/src/plugins/messageservices/smtp/smtp.pro ---- qmf-9999.orig/src/plugins/messageservices/smtp/smtp.pro 2011-10-28 0= 0:16:42.826797965 +0200 -+++ qmf-9999/src/plugins/messageservices/smtp/smtp.pro 2011-10-28 00:16:= 58.464602466 +0200 -@@ -3,7 +3,7 @@ -=20 - CONFIG +=3D qmfclient qmfmessageserver plugin -=20 --target.path +=3D $$QMF_INSTALL_ROOT/plugins/messageservices -+target.path +=3D $$[QT_INSTALL_PLUGINS]/messageservices -=20 - QT =3D core network -=20 -diff -Naur qmf-9999.orig/src/tools/messageserver/messageserver.pro qmf-9= 999/src/tools/messageserver/messageserver.pro ---- qmf-9999.orig/src/tools/messageserver/messageserver.pro 2011-10-28 0= 0:16:42.832797889 +0200 -+++ qmf-9999/src/tools/messageserver/messageserver.pro 2011-10-28 00:16:= 58.464602466 +0200 -@@ -14,7 +14,7 @@ - QT =3D core - !contains(DEFINES,QMF_NO_MESSAGE_SERVICE_EDITOR):QT +=3D gui -=20 --target.path +=3D $$QMF_INSTALL_ROOT/bin -+target.path +=3D $$[QT_INSTALL_BINS] -=20 - DEPENDPATH +=3D .=20 -=20 -diff -Naur qmf-9999.orig/tests/tests.pri qmf-9999/tests/tests.pri ---- qmf-9999.orig/tests/tests.pri 2011-10-28 00:16:42.804798239 +0200 -+++ qmf-9999/tests/tests.pri 2011-10-28 00:17:11.873434831 +0200 -@@ -4,14 +4,14 @@ - QMAKE_MACOSX_DEPLOYMENT_TARGET=3D10.5 - } -=20 --target.path+=3D$$QMF_INSTALL_ROOT/tests -+target.path+=3D$$[QT_INSTALL_DATA]/tests -=20 - QMFPATH=3D../../src/libraries/qmfclient - DEPENDPATH +=3D . - INCLUDEPATH +=3D . $$QMFPATH $$QMFPATH/support - LIBS +=3D -L$$QMFPATH/build - macx:LIBS +=3D -F$$QMFPATH/build --!symbian:QMAKE_LFLAGS +=3D -Wl,-rpath,$$QMFPATH -+!symbian:QMAKE_LFLAGS +=3D -Wl,-rpath,\\\$$ORIGIN/$$QMFPATH/build -=20 - symbian { - TARGET.CAPABILITY =3D ReadUserData WriteUserData ReadDeviceData Wri= teDeviceData -@@ -19,3 +19,5 @@ -=20 - include(../common.pri) -=20 -+DESTDIR =3D -+ -diff -Naur qmf-9999.orig/tests/tests.pro qmf-9999/tests/tests.pro ---- qmf-9999.orig/tests/tests.pro 2011-10-28 00:16:42.807798203 +0200 -+++ qmf-9999/tests/tests.pro 2011-10-28 00:16:58.465602453 +0200 -@@ -31,6 +31,6 @@ -=20 - # Install test file description - test_description.files =3D tests.xml --test_description.path =3D $$QMF_INSTALL_ROOT/tests -+test_description.path =3D $$[QT_INSTALL_DATA]/tests -=20 - INSTALLS +=3D test_description -diff -Naur qmf-9999.orig/tests/tst_python_email/tst_python_email.pro qmf= -9999/tests/tst_python_email/tst_python_email.pro ---- qmf-9999.orig/tests/tst_python_email/tst_python_email.pro 2011-10-28= 00:16:42.812798139 +0200 -+++ qmf-9999/tests/tst_python_email/tst_python_email.pro 2011-10-28 00:1= 6:58.476602315 +0200 -@@ -5,7 +5,7 @@ - !symbian { - DEFINES +=3D SRCDIR=3D\\\"$$_PRO_FILE_PWD_\\\" -=20 -- testdata.path =3D $$QMF_INSTALL_ROOT/tests/testdata -+ testdata.path =3D $$[QT_INSTALL_DATA]/tests/testdata - testdata.files =3D testdata/* -=20 - INSTALLS +=3D testdata diff --git a/net-libs/qmf/qmf-9999.ebuild b/net-libs/qmf/qmf-9999.ebuild index 7bfa02c..5323bc3 100644 --- a/net-libs/qmf/qmf-9999.ebuild +++ b/net-libs/qmf/qmf-9999.ebuild @@ -1,23 +1,20 @@ -# Copyright 1999-2011 Gentoo Foundation +# Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Header: $ =20 EAPI=3D4 =20 -if [[ ${PV} =3D=3D *9999 ]]; then +inherit qt4-r2 + +if [[ ${PV} =3D=3D *9999* ]]; then + inherit git-2 EGIT_REPO_URI=3D"git://gitorious.org/qt-labs/messagingframework.git https://git.gitorious.org/qt-labs/messagingframework.git" - SCM_ECLASS=3D"git-2" - SRC_URI=3D else - YYYYWW=3D"${PV#*_p}" - TAG=3D"${YYYYWW:0:4}W${YYYYWW:4:2}" - SRC_URI=3D"http://qt.gitorious.org/qt-labs/messagingframework/archive-t= arball/${TAG} -> ${P}.tar.gz" - S=3D"${WORKDIR}/qt-labs-messagingframework" + SRC_URI=3D"http://dev.gentoo.org/~pesa/distfiles/${P}.tar.gz" + S=3D${WORKDIR}/qt-labs-messagingframework fi =20 -inherit qt4-r2 ${SCM_ECLASS} - DESCRIPTION=3D"The Qt Messaging Framework" HOMEPAGE=3D"http://qt.gitorious.org/qt-labs/messagingframework" =20 @@ -29,24 +26,30 @@ IUSE=3D"debug doc examples test" RDEPEND=3D" dev-libs/icu sys-libs/zlib - >=3Dx11-libs/qt-gui-4.6.0 - >=3Dx11-libs/qt-sql-4.6.0 - examples? ( >=3Dx11-libs/qt-webkit-4.6.0 ) + >=3Dx11-libs/qt-core-4.6.0:4 + >=3Dx11-libs/qt-gui-4.6.0:4 + >=3Dx11-libs/qt-sql-4.6.0:4 + examples? ( >=3Dx11-libs/qt-webkit-4.6.0:4 ) " DEPEND=3D"${RDEPEND} dev-util/pkgconfig - test? ( >=3Dx11-libs/qt-test-4.6.0 ) + test? ( >=3Dx11-libs/qt-test-4.6.0:4 ) + !!>> Test phase [QTest]: ${CATEGORY}/${PF}" cd "${S}"/tests =20 einfo "Building tests" - eqmake4 && emake + eqmake4 QMF_INSTALL_ROOT=3D"${EPREFIX}/usr" + emake =20 einfo "Running tests" export QMF_DATA=3D"${T}" local fail=3Dfalse test=3D - for test in locks longstream longstring python_email qlogsystem \ + for test in locks longstream longstring python_email qcop qlogsystem \ qmailaddress qmailcodec qmaillog qmailmessage \ qmailmessagebody qmailmessageheader qmailmessagepart \ qmailnamespace qprivateimplementation; do @@ -83,8 +91,9 @@ src_install() { qt4-r2_src_install =20 if use doc; then + emake docs + dohtml -r doc/html/* - emake qch_docs dodoc doc/html/qmf.qch docompress -x /usr/share/doc/${PF}/qmf.qch fi