public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] proj/qt:master commit in: dev-qt/qtnetwork/, dev-qt/qtgui/, dev-qt/qtcore/, dev-qt/qtconcurrent/, ...
@ 2013-03-16 23:41 Davide Pesavento
  0 siblings, 0 replies; 2+ messages in thread
From: Davide Pesavento @ 2013-03-16 23:41 UTC (permalink / raw
  To: gentoo-commits

commit:     e58de16ac0435db4228c26e72ec321424ff4993f
Author:     Davide Pesavento <davidepesa <AT> gmail <DOT> com>
AuthorDate: Sat Mar 16 23:39:59 2013 +0000
Commit:     Davide Pesavento <pesa <AT> gentoo <DOT> 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
 


^ permalink raw reply related	[flat|nested] 2+ messages in thread

* [gentoo-commits] proj/qt:master commit in: dev-qt/qtnetwork/, dev-qt/qtgui/, dev-qt/qtcore/, dev-qt/qtconcurrent/, ...
@ 2013-03-25  3:14 Davide Pesavento
  0 siblings, 0 replies; 2+ messages in thread
From: Davide Pesavento @ 2013-03-25  3:14 UTC (permalink / raw
  To: gentoo-commits

commit:     4b6f8ca7ac4d36bfac09738ed427638460b9f6a9
Author:     Davide Pesavento <davidepesa <AT> gmail <DOT> com>
AuthorDate: Mon Mar 25 03:11:46 2013 +0000
Commit:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
CommitDate: Mon Mar 25 03:11:46 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=4b6f8ca7

[qtbase] Bump to 5.1.9999

The stable branch of qtbase now contains what will become Qt 5.1

---
 ....0.9999.ebuild => qtconcurrent-5.1.9999.ebuild} |    0
 ...core-5.0.9999.ebuild => qtcore-5.1.9999.ebuild} |    0
 ...dbus-5.0.9999.ebuild => qtdbus-5.1.9999.ebuild} |    0
 ...qtgui-5.0.9999.ebuild => qtgui-5.1.9999.ebuild} |    0
 ...k-5.0.9999.ebuild => qtnetwork-5.1.9999.ebuild} |    0
 ...gl-5.0.9999.ebuild => qtopengl-5.1.9999.ebuild} |    0
 ....9999.ebuild => qtprintsupport-5.1.9999.ebuild} |    0
 ...qtsql-5.0.9999.ebuild => qtsql-5.1.9999.ebuild} |    0
 ...test-5.0.9999.ebuild => qttest-5.1.9999.ebuild} |    0
 ...s-5.0.9999.ebuild => qtwidgets-5.1.9999.ebuild} |    0
 ...qtxml-5.0.9999.ebuild => qtxml-5.1.9999.ebuild} |    0
 11 files changed, 0 insertions(+), 0 deletions(-)

diff --git a/dev-qt/qtconcurrent/qtconcurrent-5.0.9999.ebuild b/dev-qt/qtconcurrent/qtconcurrent-5.1.9999.ebuild
similarity index 100%
rename from dev-qt/qtconcurrent/qtconcurrent-5.0.9999.ebuild
rename to dev-qt/qtconcurrent/qtconcurrent-5.1.9999.ebuild

diff --git a/dev-qt/qtcore/qtcore-5.0.9999.ebuild b/dev-qt/qtcore/qtcore-5.1.9999.ebuild
similarity index 100%
rename from dev-qt/qtcore/qtcore-5.0.9999.ebuild
rename to dev-qt/qtcore/qtcore-5.1.9999.ebuild

diff --git a/dev-qt/qtdbus/qtdbus-5.0.9999.ebuild b/dev-qt/qtdbus/qtdbus-5.1.9999.ebuild
similarity index 100%
rename from dev-qt/qtdbus/qtdbus-5.0.9999.ebuild
rename to dev-qt/qtdbus/qtdbus-5.1.9999.ebuild

diff --git a/dev-qt/qtgui/qtgui-5.0.9999.ebuild b/dev-qt/qtgui/qtgui-5.1.9999.ebuild
similarity index 100%
rename from dev-qt/qtgui/qtgui-5.0.9999.ebuild
rename to dev-qt/qtgui/qtgui-5.1.9999.ebuild

diff --git a/dev-qt/qtnetwork/qtnetwork-5.0.9999.ebuild b/dev-qt/qtnetwork/qtnetwork-5.1.9999.ebuild
similarity index 100%
rename from dev-qt/qtnetwork/qtnetwork-5.0.9999.ebuild
rename to dev-qt/qtnetwork/qtnetwork-5.1.9999.ebuild

diff --git a/dev-qt/qtopengl/qtopengl-5.0.9999.ebuild b/dev-qt/qtopengl/qtopengl-5.1.9999.ebuild
similarity index 100%
rename from dev-qt/qtopengl/qtopengl-5.0.9999.ebuild
rename to dev-qt/qtopengl/qtopengl-5.1.9999.ebuild

diff --git a/dev-qt/qtprintsupport/qtprintsupport-5.0.9999.ebuild b/dev-qt/qtprintsupport/qtprintsupport-5.1.9999.ebuild
similarity index 100%
rename from dev-qt/qtprintsupport/qtprintsupport-5.0.9999.ebuild
rename to dev-qt/qtprintsupport/qtprintsupport-5.1.9999.ebuild

diff --git a/dev-qt/qtsql/qtsql-5.0.9999.ebuild b/dev-qt/qtsql/qtsql-5.1.9999.ebuild
similarity index 100%
rename from dev-qt/qtsql/qtsql-5.0.9999.ebuild
rename to dev-qt/qtsql/qtsql-5.1.9999.ebuild

diff --git a/dev-qt/qttest/qttest-5.0.9999.ebuild b/dev-qt/qttest/qttest-5.1.9999.ebuild
similarity index 100%
rename from dev-qt/qttest/qttest-5.0.9999.ebuild
rename to dev-qt/qttest/qttest-5.1.9999.ebuild

diff --git a/dev-qt/qtwidgets/qtwidgets-5.0.9999.ebuild b/dev-qt/qtwidgets/qtwidgets-5.1.9999.ebuild
similarity index 100%
rename from dev-qt/qtwidgets/qtwidgets-5.0.9999.ebuild
rename to dev-qt/qtwidgets/qtwidgets-5.1.9999.ebuild

diff --git a/dev-qt/qtxml/qtxml-5.0.9999.ebuild b/dev-qt/qtxml/qtxml-5.1.9999.ebuild
similarity index 100%
rename from dev-qt/qtxml/qtxml-5.0.9999.ebuild
rename to dev-qt/qtxml/qtxml-5.1.9999.ebuild


^ permalink raw reply	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2013-03-25  3:14 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2013-03-16 23:41 [gentoo-commits] proj/qt:master commit in: dev-qt/qtnetwork/, dev-qt/qtgui/, dev-qt/qtcore/, dev-qt/qtconcurrent/, Davide Pesavento
  -- strict thread matches above, loose matches on Subject: below --
2013-03-25  3:14 Davide Pesavento

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox