From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id 57F171381F3 for ; Sat, 13 Apr 2013 19:31:51 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id DB995E09EE; Sat, 13 Apr 2013 19:31:50 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 69D43E09EE for ; Sat, 13 Apr 2013 19:31:50 +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 569FB33DF1D for ; Sat, 13 Apr 2013 19:31:49 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id E9D84E4073 for ; Sat, 13 Apr 2013 19:31:47 +0000 (UTC) From: "Davide Pesavento" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Davide Pesavento" Message-ID: <1365881378.74b5a74758064c7a7dd9c145c87fc9c99fb3ee05.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/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: 74b5a74758064c7a7dd9c145c87fc9c99fb3ee05 X-VCS-Branch: master Date: Sat, 13 Apr 2013 19:31:47 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 8d1018e3-a055-4c07-90e2-cb2f909cdd7a X-Archives-Hash: 61e6ffe44d61b20a10670ee8142d93ff commit: 74b5a74758064c7a7dd9c145c87fc9c99fb3ee05 Author: Davide Pesavento gmail com> AuthorDate: Sat Apr 13 19:29:38 2013 +0000 Commit: Davide Pesavento gentoo org> CommitDate: Sat Apr 13 19:29:38 2013 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=74b5a747 [net-libs/qmf] Several updates to match current upstream git. o Make icu optional (\o/) o Make zlib optional o Update patch for tests o Qt >= 4.8 is now required Package-Manager: portage-2.2.0_alpha173 --- net-libs/qmf/files/qmf-tests.patch | 15 ++++--------- net-libs/qmf/qmf-9999.ebuild | 39 +++++++++++++++++++++++------------ 2 files changed, 30 insertions(+), 24 deletions(-) diff --git a/net-libs/qmf/files/qmf-tests.patch b/net-libs/qmf/files/qmf-tests.patch index 6262d19..38a7f4c 100644 --- a/net-libs/qmf/files/qmf-tests.patch +++ b/net-libs/qmf/files/qmf-tests.patch @@ -1,18 +1,13 @@ 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 @@ +--- qmf-9999.orig/tests/tests.pri 2013-04-13 12:05:32.323423194 -0700 ++++ qmf-9999/tests/tests.pri 2013-04-13 12:09:25.068513480 -0700 +@@ -11,7 +11,8 @@ INCLUDEPATH += . $$QMFPATH $$QMFPATH/support LIBS += -L$$QMFPATH/build macx:LIBS += -F$$QMFPATH/build --!symbian:QMAKE_LFLAGS += -Wl,-rpath,$$QMFPATH -+!symbian:QMAKE_LFLAGS += -Wl,-rpath,\\\$$ORIGIN/$$QMFPATH/build - - symbian { - TARGET.CAPABILITY = ReadUserData WriteUserData ReadDeviceData WriteDeviceData -@@ -19,3 +19,5 @@ +-QMAKE_LFLAGS += -Wl,-rpath,$$QMFPATH ++QMAKE_LFLAGS += -Wl,-rpath,\\\$$ORIGIN/$$QMFPATH/build include(../common.pri) +DESTDIR = -+ diff --git a/net-libs/qmf/qmf-9999.ebuild b/net-libs/qmf/qmf-9999.ebuild index 8c18c01..ca2ac3b 100644 --- a/net-libs/qmf/qmf-9999.ebuild +++ b/net-libs/qmf/qmf-9999.ebuild @@ -21,24 +21,23 @@ HOMEPAGE="http://qt.gitorious.org/qt-labs/messagingframework" LICENSE="LGPL-2.1" SLOT="0" KEYWORDS="" -IUSE="debug doc examples test" +IUSE="debug doc examples icu test zlib" RDEPEND=" - dev-libs/icu:= - sys-libs/zlib - >=dev-qt/qtcore-4.6.0:4 - >=dev-qt/qtgui-4.6.0:4 - >=dev-qt/qtsql-4.6.0:4 - examples? ( >=dev-qt/qtwebkit-4.6.0:4 ) + >=dev-qt/qtcore-4.8:4 + >=dev-qt/qtgui-4.8:4 + >=dev-qt/qtsql-4.8:4 + examples? ( >=dev-qt/qtwebkit-4.8:4 ) + icu? ( dev-libs/icu:= ) + zlib? ( sys-libs/zlib ) " DEPEND="${RDEPEND} virtual/pkgconfig - test? ( >=dev-qt/qttest-4.6.0:4 ) + test? ( >=dev-qt/qttest-4.8:4 ) !!