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 C384A198005 for ; Sat, 16 Mar 2013 23:41:28 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 409A6E055D; Sat, 16 Mar 2013 23:41:23 +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 A815EE055D for ; Sat, 16 Mar 2013 23:41:22 +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 2F73533DADC for ; Sat, 16 Mar 2013 23:41:21 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id BED96E4079 for ; Sat, 16 Mar 2013 23:41:19 +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: <1363477199.e58de16ac0435db4228c26e72ec321424ff4993f.pesa@gentoo> Subject: [gentoo-commits] proj/qt:master commit in: dev-qt/qtnetwork/, dev-qt/qtgui/, dev-qt/qtcore/, dev-qt/qtconcurrent/, ... X-VCS-Repository: proj/qt X-VCS-Files: dev-qt/qtconcurrent/qtconcurrent-5.0.1.ebuild dev-qt/qtconcurrent/qtconcurrent-5.0.9999.ebuild dev-qt/qtconcurrent/qtconcurrent-5.9999.ebuild dev-qt/qtcore/qtcore-5.0.1.ebuild dev-qt/qtcore/qtcore-5.0.9999.ebuild dev-qt/qtcore/qtcore-5.9999.ebuild dev-qt/qtdbus/qtdbus-5.0.1.ebuild dev-qt/qtdbus/qtdbus-5.0.9999.ebuild dev-qt/qtdbus/qtdbus-5.9999.ebuild dev-qt/qtgui/qtgui-5.0.1.ebuild dev-qt/qtgui/qtgui-5.0.9999.ebuild dev-qt/qtgui/qtgui-5.9999.ebuild dev-qt/qtnetwork/qtnetwork-5.0.1.ebuild dev-qt/qtnetwork/qtnetwork-5.0.9999.ebuild dev-qt/qtnetwork/qtnetwork-5.9999.ebuild dev-qt/qtopengl/qtopengl-5.0.1.ebuild dev-qt/qtopengl/qtopengl-5.0.9999.ebuild dev-qt/qtopengl/qtopengl-5.9999.ebuild dev-qt/qtprintsupport/qtprintsupport-5.0.1.ebuild dev-qt/qtprintsupport/qtprintsupport-5.0.9999.ebuild dev-qt/qtprintsupport/qtprintsupport-5.9999.ebuild dev-qt/qtsql/qtsql-5.0.1.ebuild dev-qt/qtsql/qtsql-5.0.9999.ebuild dev-qt/qtsql/qtsql-5.9999.ebuild dev-qt/qttest/qttest-5.0.1.ebuild d ev-qt/qttest/qttest-5.0.9999.ebuild dev-qt/qttest/qttest-5.9999.ebuild dev-qt/qtwidgets/qtwidgets-5.0.1.ebuild dev-qt/qtwidgets/qtwidgets-5.0.9999.ebuild dev-qt/qtwidgets/qtwidgets-5.9999.ebuild dev-qt/qtxml/qtxml-5.0.1.ebuild dev-qt/qtxml/qtxml-5.0.9999.ebuild dev-qt/qtxml/qtxml-5.9999.ebuild eclass/qt5-build.eclass X-VCS-Directories: dev-qt/qtnetwork/ dev-qt/qtgui/ dev-qt/qtcore/ dev-qt/qtconcurrent/ dev-qt/qttest/ dev-qt/qtwidgets/ dev-qt/qtprintsupport/ dev-qt/qtxml/ dev-qt/qtopengl/ dev-qt/qtdbus/ eclass/ dev-qt/qtsql/ X-VCS-Committer: pesa X-VCS-Committer-Name: Davide Pesavento X-VCS-Revision: e58de16ac0435db4228c26e72ec321424ff4993f X-VCS-Branch: master Date: Sat, 16 Mar 2013 23:41:19 +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: a9b1fc31-a7c9-42f7-b3c5-faef1e166fe1 X-Archives-Hash: b1a48d5b336ae4872fe6749a69c0e92f commit: e58de16ac0435db4228c26e72ec321424ff4993f Author: Davide Pesavento gmail com> AuthorDate: Sat Mar 16 23:39:59 2013 +0000 Commit: Davide Pesavento gentoo org> CommitDate: Sat Mar 16 23:39:59 2013 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=e58de16a [qt5-build.eclass] Let individual ebuilds define their module (QT5_MODULE). --- dev-qt/qtconcurrent/qtconcurrent-5.0.1.ebuild | 2 + dev-qt/qtconcurrent/qtconcurrent-5.0.9999.ebuild | 2 + dev-qt/qtconcurrent/qtconcurrent-5.9999.ebuild | 2 + dev-qt/qtcore/qtcore-5.0.1.ebuild | 2 + dev-qt/qtcore/qtcore-5.0.9999.ebuild | 2 + dev-qt/qtcore/qtcore-5.9999.ebuild | 2 + dev-qt/qtdbus/qtdbus-5.0.1.ebuild | 2 + dev-qt/qtdbus/qtdbus-5.0.9999.ebuild | 2 + dev-qt/qtdbus/qtdbus-5.9999.ebuild | 2 + dev-qt/qtgui/qtgui-5.0.1.ebuild | 2 + dev-qt/qtgui/qtgui-5.0.9999.ebuild | 2 + dev-qt/qtgui/qtgui-5.9999.ebuild | 2 + dev-qt/qtnetwork/qtnetwork-5.0.1.ebuild | 2 + dev-qt/qtnetwork/qtnetwork-5.0.9999.ebuild | 2 + dev-qt/qtnetwork/qtnetwork-5.9999.ebuild | 2 + dev-qt/qtopengl/qtopengl-5.0.1.ebuild | 2 + dev-qt/qtopengl/qtopengl-5.0.9999.ebuild | 2 + dev-qt/qtopengl/qtopengl-5.9999.ebuild | 2 + dev-qt/qtprintsupport/qtprintsupport-5.0.1.ebuild | 2 + .../qtprintsupport/qtprintsupport-5.0.9999.ebuild | 2 + dev-qt/qtprintsupport/qtprintsupport-5.9999.ebuild | 2 + dev-qt/qtsql/qtsql-5.0.1.ebuild | 2 + dev-qt/qtsql/qtsql-5.0.9999.ebuild | 2 + dev-qt/qtsql/qtsql-5.9999.ebuild | 2 + dev-qt/qttest/qttest-5.0.1.ebuild | 2 + dev-qt/qttest/qttest-5.0.9999.ebuild | 2 + dev-qt/qttest/qttest-5.9999.ebuild | 2 + dev-qt/qtwidgets/qtwidgets-5.0.1.ebuild | 2 + dev-qt/qtwidgets/qtwidgets-5.0.9999.ebuild | 2 + dev-qt/qtwidgets/qtwidgets-5.9999.ebuild | 2 + dev-qt/qtxml/qtxml-5.0.1.ebuild | 2 + dev-qt/qtxml/qtxml-5.0.9999.ebuild | 2 + dev-qt/qtxml/qtxml-5.9999.ebuild | 2 + eclass/qt5-build.eclass | 29 +++++++++---------- 34 files changed, 80 insertions(+), 15 deletions(-) diff --git a/dev-qt/qtconcurrent/qtconcurrent-5.0.1.ebuild b/dev-qt/qtconcurrent/qtconcurrent-5.0.1.ebuild index 452103b..a244725 100644 --- a/dev-qt/qtconcurrent/qtconcurrent-5.0.1.ebuild +++ b/dev-qt/qtconcurrent/qtconcurrent-5.0.1.ebuild @@ -4,6 +4,8 @@ EAPI=5 +QT5_MODULE="qtbase" + inherit qt5-build DESCRIPTION="The Qt toolkit is a comprehensive C++ application development framework" diff --git a/dev-qt/qtconcurrent/qtconcurrent-5.0.9999.ebuild b/dev-qt/qtconcurrent/qtconcurrent-5.0.9999.ebuild index 452103b..a244725 100644 --- a/dev-qt/qtconcurrent/qtconcurrent-5.0.9999.ebuild +++ b/dev-qt/qtconcurrent/qtconcurrent-5.0.9999.ebuild @@ -4,6 +4,8 @@ EAPI=5 +QT5_MODULE="qtbase" + inherit qt5-build DESCRIPTION="The Qt toolkit is a comprehensive C++ application development framework" diff --git a/dev-qt/qtconcurrent/qtconcurrent-5.9999.ebuild b/dev-qt/qtconcurrent/qtconcurrent-5.9999.ebuild index 452103b..a244725 100644 --- a/dev-qt/qtconcurrent/qtconcurrent-5.9999.ebuild +++ b/dev-qt/qtconcurrent/qtconcurrent-5.9999.ebuild @@ -4,6 +4,8 @@ EAPI=5 +QT5_MODULE="qtbase" + inherit qt5-build DESCRIPTION="The Qt toolkit is a comprehensive C++ application development framework" diff --git a/dev-qt/qtcore/qtcore-5.0.1.ebuild b/dev-qt/qtcore/qtcore-5.0.1.ebuild index d6f9bd9..12918b5 100644 --- a/dev-qt/qtcore/qtcore-5.0.1.ebuild +++ b/dev-qt/qtcore/qtcore-5.0.1.ebuild @@ -4,6 +4,8 @@ EAPI=5 +QT5_MODULE="qtbase" + inherit qt5-build DESCRIPTION="The Qt toolkit is a comprehensive C++ application development framework" diff --git a/dev-qt/qtcore/qtcore-5.0.9999.ebuild b/dev-qt/qtcore/qtcore-5.0.9999.ebuild index d6f9bd9..12918b5 100644 --- a/dev-qt/qtcore/qtcore-5.0.9999.ebuild +++ b/dev-qt/qtcore/qtcore-5.0.9999.ebuild @@ -4,6 +4,8 @@ EAPI=5 +QT5_MODULE="qtbase" + inherit qt5-build DESCRIPTION="The Qt toolkit is a comprehensive C++ application development framework" diff --git a/dev-qt/qtcore/qtcore-5.9999.ebuild b/dev-qt/qtcore/qtcore-5.9999.ebuild index d6f9bd9..12918b5 100644 --- a/dev-qt/qtcore/qtcore-5.9999.ebuild +++ b/dev-qt/qtcore/qtcore-5.9999.ebuild @@ -4,6 +4,8 @@ EAPI=5 +QT5_MODULE="qtbase" + inherit qt5-build DESCRIPTION="The Qt toolkit is a comprehensive C++ application development framework" diff --git a/dev-qt/qtdbus/qtdbus-5.0.1.ebuild b/dev-qt/qtdbus/qtdbus-5.0.1.ebuild index 4db07b1..4584934 100644 --- a/dev-qt/qtdbus/qtdbus-5.0.1.ebuild +++ b/dev-qt/qtdbus/qtdbus-5.0.1.ebuild @@ -4,6 +4,8 @@ EAPI=5 +QT5_MODULE="qtbase" + inherit qt5-build DESCRIPTION="The Qt toolkit is a comprehensive C++ application development framework" diff --git a/dev-qt/qtdbus/qtdbus-5.0.9999.ebuild b/dev-qt/qtdbus/qtdbus-5.0.9999.ebuild index 4db07b1..4584934 100644 --- a/dev-qt/qtdbus/qtdbus-5.0.9999.ebuild +++ b/dev-qt/qtdbus/qtdbus-5.0.9999.ebuild @@ -4,6 +4,8 @@ EAPI=5 +QT5_MODULE="qtbase" + inherit qt5-build DESCRIPTION="The Qt toolkit is a comprehensive C++ application development framework" diff --git a/dev-qt/qtdbus/qtdbus-5.9999.ebuild b/dev-qt/qtdbus/qtdbus-5.9999.ebuild index 4db07b1..4584934 100644 --- a/dev-qt/qtdbus/qtdbus-5.9999.ebuild +++ b/dev-qt/qtdbus/qtdbus-5.9999.ebuild @@ -4,6 +4,8 @@ EAPI=5 +QT5_MODULE="qtbase" + inherit qt5-build DESCRIPTION="The Qt toolkit is a comprehensive C++ application development framework" diff --git a/dev-qt/qtgui/qtgui-5.0.1.ebuild b/dev-qt/qtgui/qtgui-5.0.1.ebuild index ae18165..2d8e04e 100644 --- a/dev-qt/qtgui/qtgui-5.0.1.ebuild +++ b/dev-qt/qtgui/qtgui-5.0.1.ebuild @@ -4,6 +4,8 @@ EAPI=5 +QT5_MODULE="qtbase" + inherit qt5-build DESCRIPTION="The Qt toolkit is a comprehensive C++ application development framework" diff --git a/dev-qt/qtgui/qtgui-5.0.9999.ebuild b/dev-qt/qtgui/qtgui-5.0.9999.ebuild index 8b6e3f7..1791abe 100644 --- a/dev-qt/qtgui/qtgui-5.0.9999.ebuild +++ b/dev-qt/qtgui/qtgui-5.0.9999.ebuild @@ -4,6 +4,8 @@ EAPI=5 +QT5_MODULE="qtbase" + inherit qt5-build DESCRIPTION="The Qt toolkit is a comprehensive C++ application development framework" diff --git a/dev-qt/qtgui/qtgui-5.9999.ebuild b/dev-qt/qtgui/qtgui-5.9999.ebuild index 8b6e3f7..1791abe 100644 --- a/dev-qt/qtgui/qtgui-5.9999.ebuild +++ b/dev-qt/qtgui/qtgui-5.9999.ebuild @@ -4,6 +4,8 @@ EAPI=5 +QT5_MODULE="qtbase" + inherit qt5-build DESCRIPTION="The Qt toolkit is a comprehensive C++ application development framework" diff --git a/dev-qt/qtnetwork/qtnetwork-5.0.1.ebuild b/dev-qt/qtnetwork/qtnetwork-5.0.1.ebuild index 101f1f4..5733909 100644 --- a/dev-qt/qtnetwork/qtnetwork-5.0.1.ebuild +++ b/dev-qt/qtnetwork/qtnetwork-5.0.1.ebuild @@ -4,6 +4,8 @@ EAPI=5 +QT5_MODULE="qtbase" + inherit qt5-build DESCRIPTION="The Qt toolkit is a comprehensive C++ application development framework" diff --git a/dev-qt/qtnetwork/qtnetwork-5.0.9999.ebuild b/dev-qt/qtnetwork/qtnetwork-5.0.9999.ebuild index 101f1f4..5733909 100644 --- a/dev-qt/qtnetwork/qtnetwork-5.0.9999.ebuild +++ b/dev-qt/qtnetwork/qtnetwork-5.0.9999.ebuild @@ -4,6 +4,8 @@ EAPI=5 +QT5_MODULE="qtbase" + inherit qt5-build DESCRIPTION="The Qt toolkit is a comprehensive C++ application development framework" diff --git a/dev-qt/qtnetwork/qtnetwork-5.9999.ebuild b/dev-qt/qtnetwork/qtnetwork-5.9999.ebuild index 101f1f4..5733909 100644 --- a/dev-qt/qtnetwork/qtnetwork-5.9999.ebuild +++ b/dev-qt/qtnetwork/qtnetwork-5.9999.ebuild @@ -4,6 +4,8 @@ EAPI=5 +QT5_MODULE="qtbase" + inherit qt5-build DESCRIPTION="The Qt toolkit is a comprehensive C++ application development framework" diff --git a/dev-qt/qtopengl/qtopengl-5.0.1.ebuild b/dev-qt/qtopengl/qtopengl-5.0.1.ebuild index b1eb21d..8b52a9e 100644 --- a/dev-qt/qtopengl/qtopengl-5.0.1.ebuild +++ b/dev-qt/qtopengl/qtopengl-5.0.1.ebuild @@ -4,6 +4,8 @@ EAPI=5 +QT5_MODULE="qtbase" + inherit qt5-build DESCRIPTION="The Qt toolkit is a comprehensive C++ application development framework" diff --git a/dev-qt/qtopengl/qtopengl-5.0.9999.ebuild b/dev-qt/qtopengl/qtopengl-5.0.9999.ebuild index b776faf..9000632 100644 --- a/dev-qt/qtopengl/qtopengl-5.0.9999.ebuild +++ b/dev-qt/qtopengl/qtopengl-5.0.9999.ebuild @@ -4,6 +4,8 @@ EAPI=5 +QT5_MODULE="qtbase" + inherit qt5-build DESCRIPTION="The Qt toolkit is a comprehensive C++ application development framework" diff --git a/dev-qt/qtopengl/qtopengl-5.9999.ebuild b/dev-qt/qtopengl/qtopengl-5.9999.ebuild index b776faf..9000632 100644 --- a/dev-qt/qtopengl/qtopengl-5.9999.ebuild +++ b/dev-qt/qtopengl/qtopengl-5.9999.ebuild @@ -4,6 +4,8 @@ EAPI=5 +QT5_MODULE="qtbase" + inherit qt5-build DESCRIPTION="The Qt toolkit is a comprehensive C++ application development framework" diff --git a/dev-qt/qtprintsupport/qtprintsupport-5.0.1.ebuild b/dev-qt/qtprintsupport/qtprintsupport-5.0.1.ebuild index d4d571e..dc32426 100644 --- a/dev-qt/qtprintsupport/qtprintsupport-5.0.1.ebuild +++ b/dev-qt/qtprintsupport/qtprintsupport-5.0.1.ebuild @@ -4,6 +4,8 @@ EAPI=5 +QT5_MODULE="qtbase" + inherit qt5-build DESCRIPTION="The Qt toolkit is a comprehensive C++ application development framework" diff --git a/dev-qt/qtprintsupport/qtprintsupport-5.0.9999.ebuild b/dev-qt/qtprintsupport/qtprintsupport-5.0.9999.ebuild index d4d571e..dc32426 100644 --- a/dev-qt/qtprintsupport/qtprintsupport-5.0.9999.ebuild +++ b/dev-qt/qtprintsupport/qtprintsupport-5.0.9999.ebuild @@ -4,6 +4,8 @@ EAPI=5 +QT5_MODULE="qtbase" + inherit qt5-build DESCRIPTION="The Qt toolkit is a comprehensive C++ application development framework" diff --git a/dev-qt/qtprintsupport/qtprintsupport-5.9999.ebuild b/dev-qt/qtprintsupport/qtprintsupport-5.9999.ebuild index d4d571e..dc32426 100644 --- a/dev-qt/qtprintsupport/qtprintsupport-5.9999.ebuild +++ b/dev-qt/qtprintsupport/qtprintsupport-5.9999.ebuild @@ -4,6 +4,8 @@ EAPI=5 +QT5_MODULE="qtbase" + inherit qt5-build DESCRIPTION="The Qt toolkit is a comprehensive C++ application development framework" diff --git a/dev-qt/qtsql/qtsql-5.0.1.ebuild b/dev-qt/qtsql/qtsql-5.0.1.ebuild index b057846..b946879 100644 --- a/dev-qt/qtsql/qtsql-5.0.1.ebuild +++ b/dev-qt/qtsql/qtsql-5.0.1.ebuild @@ -4,6 +4,8 @@ EAPI=5 +QT5_MODULE="qtbase" + inherit multilib qt5-build DESCRIPTION="The Qt toolkit is a comprehensive C++ application development framework" diff --git a/dev-qt/qtsql/qtsql-5.0.9999.ebuild b/dev-qt/qtsql/qtsql-5.0.9999.ebuild index b057846..b946879 100644 --- a/dev-qt/qtsql/qtsql-5.0.9999.ebuild +++ b/dev-qt/qtsql/qtsql-5.0.9999.ebuild @@ -4,6 +4,8 @@ EAPI=5 +QT5_MODULE="qtbase" + inherit multilib qt5-build DESCRIPTION="The Qt toolkit is a comprehensive C++ application development framework" diff --git a/dev-qt/qtsql/qtsql-5.9999.ebuild b/dev-qt/qtsql/qtsql-5.9999.ebuild index b057846..b946879 100644 --- a/dev-qt/qtsql/qtsql-5.9999.ebuild +++ b/dev-qt/qtsql/qtsql-5.9999.ebuild @@ -4,6 +4,8 @@ EAPI=5 +QT5_MODULE="qtbase" + inherit multilib qt5-build DESCRIPTION="The Qt toolkit is a comprehensive C++ application development framework" diff --git a/dev-qt/qttest/qttest-5.0.1.ebuild b/dev-qt/qttest/qttest-5.0.1.ebuild index 156bc79..7b4bc35 100644 --- a/dev-qt/qttest/qttest-5.0.1.ebuild +++ b/dev-qt/qttest/qttest-5.0.1.ebuild @@ -4,6 +4,8 @@ EAPI=5 +QT5_MODULE="qtbase" + inherit qt5-build DESCRIPTION="The Qt toolkit is a comprehensive C++ application development framework" diff --git a/dev-qt/qttest/qttest-5.0.9999.ebuild b/dev-qt/qttest/qttest-5.0.9999.ebuild index 156bc79..7b4bc35 100644 --- a/dev-qt/qttest/qttest-5.0.9999.ebuild +++ b/dev-qt/qttest/qttest-5.0.9999.ebuild @@ -4,6 +4,8 @@ EAPI=5 +QT5_MODULE="qtbase" + inherit qt5-build DESCRIPTION="The Qt toolkit is a comprehensive C++ application development framework" diff --git a/dev-qt/qttest/qttest-5.9999.ebuild b/dev-qt/qttest/qttest-5.9999.ebuild index 156bc79..7b4bc35 100644 --- a/dev-qt/qttest/qttest-5.9999.ebuild +++ b/dev-qt/qttest/qttest-5.9999.ebuild @@ -4,6 +4,8 @@ EAPI=5 +QT5_MODULE="qtbase" + inherit qt5-build DESCRIPTION="The Qt toolkit is a comprehensive C++ application development framework" diff --git a/dev-qt/qtwidgets/qtwidgets-5.0.1.ebuild b/dev-qt/qtwidgets/qtwidgets-5.0.1.ebuild index 2008335..8bf7b11 100644 --- a/dev-qt/qtwidgets/qtwidgets-5.0.1.ebuild +++ b/dev-qt/qtwidgets/qtwidgets-5.0.1.ebuild @@ -4,6 +4,8 @@ EAPI=5 +QT5_MODULE="qtbase" + inherit qt5-build DESCRIPTION="The Qt toolkit is a comprehensive C++ application development framework" diff --git a/dev-qt/qtwidgets/qtwidgets-5.0.9999.ebuild b/dev-qt/qtwidgets/qtwidgets-5.0.9999.ebuild index 2008335..8bf7b11 100644 --- a/dev-qt/qtwidgets/qtwidgets-5.0.9999.ebuild +++ b/dev-qt/qtwidgets/qtwidgets-5.0.9999.ebuild @@ -4,6 +4,8 @@ EAPI=5 +QT5_MODULE="qtbase" + inherit qt5-build DESCRIPTION="The Qt toolkit is a comprehensive C++ application development framework" diff --git a/dev-qt/qtwidgets/qtwidgets-5.9999.ebuild b/dev-qt/qtwidgets/qtwidgets-5.9999.ebuild index 2008335..8bf7b11 100644 --- a/dev-qt/qtwidgets/qtwidgets-5.9999.ebuild +++ b/dev-qt/qtwidgets/qtwidgets-5.9999.ebuild @@ -4,6 +4,8 @@ EAPI=5 +QT5_MODULE="qtbase" + inherit qt5-build DESCRIPTION="The Qt toolkit is a comprehensive C++ application development framework" diff --git a/dev-qt/qtxml/qtxml-5.0.1.ebuild b/dev-qt/qtxml/qtxml-5.0.1.ebuild index 631b5a9..c5b5fa9 100644 --- a/dev-qt/qtxml/qtxml-5.0.1.ebuild +++ b/dev-qt/qtxml/qtxml-5.0.1.ebuild @@ -4,6 +4,8 @@ EAPI=5 +QT5_MODULE="qtbase" + inherit qt5-build DESCRIPTION="The Qt toolkit is a comprehensive C++ application development framework" diff --git a/dev-qt/qtxml/qtxml-5.0.9999.ebuild b/dev-qt/qtxml/qtxml-5.0.9999.ebuild index 631b5a9..c5b5fa9 100644 --- a/dev-qt/qtxml/qtxml-5.0.9999.ebuild +++ b/dev-qt/qtxml/qtxml-5.0.9999.ebuild @@ -4,6 +4,8 @@ EAPI=5 +QT5_MODULE="qtbase" + inherit qt5-build DESCRIPTION="The Qt toolkit is a comprehensive C++ application development framework" diff --git a/dev-qt/qtxml/qtxml-5.9999.ebuild b/dev-qt/qtxml/qtxml-5.9999.ebuild index 631b5a9..c5b5fa9 100644 --- a/dev-qt/qtxml/qtxml-5.9999.ebuild +++ b/dev-qt/qtxml/qtxml-5.9999.ebuild @@ -4,6 +4,8 @@ EAPI=5 +QT5_MODULE="qtbase" + inherit qt5-build DESCRIPTION="The Qt toolkit is a comprehensive C++ application development framework" diff --git a/eclass/qt5-build.eclass b/eclass/qt5-build.eclass index 3c87f5c..dd3acab 100644 --- a/eclass/qt5-build.eclass +++ b/eclass/qt5-build.eclass @@ -23,36 +23,35 @@ HOMEPAGE="http://qt-project.org/ http://qt.digia.com/" LICENSE="|| ( LGPL-2.1 GPL-3 )" SLOT="5" -case ${PN#qt} in - concurrent|core|dbus|gui|network|opengl|printsupport|sql|test|widgets|xml) - EGIT_PROJECT="qtbase" - ;; - *) - EGIT_PROJECT="${PN/-}" - ;; -esac +# @ECLASS-VARIABLE: QT5_MODULE +# @DESCRIPTION: +# The upstream name of the module this package belongs to. Used for +# SRC_URI and EGIT_REPO_URI. Must be defined before inheriting the eclass. +: ${QT5_MODULE:=${PN}} case ${PV} in 5.9999) QT5_BUILD_TYPE="live" EGIT_BRANCH="dev" - inherit git-2 ;; 5.?.9999) QT5_BUILD_TYPE="live" EGIT_BRANCH="stable" - inherit git-2 ;; *) QT5_BUILD_TYPE="release" - MY_P="${EGIT_PROJECT}-opensource-src-${PV/_/-}" + MY_P="${QT5_MODULE}-opensource-src-${PV/_/-}" SRC_URI="http://releases.qt-project.org/qt5/${PV}/submodules_tar/${MY_P}.tar.xz" S=${WORKDIR}/${MY_P} ;; esac -EGIT_REPO_URI="git://gitorious.org/qt/${EGIT_PROJECT}.git - https://git.gitorious.org/qt/${EGIT_PROJECT}.git" +if [[ ${QT5_BUILD_TYPE} == "live" ]]; then + EGIT_PROJECT=${QT5_MODULE} + EGIT_REPO_URI="git://gitorious.org/qt/${EGIT_PROJECT}.git + https://git.gitorious.org/qt/${EGIT_PROJECT}.git" + inherit git-2 +fi IUSE="+c++11 debug test" @@ -160,7 +159,7 @@ qt5-build_src_unpack() { qt5-build_src_prepare() { qt5_prepare_env - if [[ ${EGIT_PROJECT} == "qtbase" ]]; then + if [[ ${QT5_MODULE} == "qtbase" ]]; then # Avoid unnecessary qmake recompilations sed -i -re "s|^if true;.*(\[ '\!').*(\"\\\$outpath/bin/qmake\".*)|if \1 -e \2 then|" \ configure || die "sed failed (skip qmake bootstrap)" @@ -218,7 +217,7 @@ qt5-build_src_configure() { mkdir -p "${QT5_BUILD_DIR}" || die pushd "${QT5_BUILD_DIR}" > /dev/null || die - if [[ ${EGIT_PROJECT} == "qtbase" ]]; then + if [[ ${QT5_MODULE} == "qtbase" ]]; then qt5_base_configure fi