commit: 2ce54e2a2bdde33bac5e8e2267d15c33283ebb3b
Author: Davide Pesavento <pesa <AT> gentoo <DOT> org>
AuthorDate: Sat Sep 27 21:30:47 2014 +0000
Commit: Davide Pesavento <pesa <AT> gentoo <DOT> org>
CommitDate: Sat Sep 27 21:30:47 2014 +0000
URL: http://sources.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=2ce54e2a
[dev-qt/qtlocation] Split the QtPositioning module into its own package.
---
dev-qt/qtlocation/metadata.xml | 4 ---
dev-qt/qtlocation/qtlocation-5.9999.ebuild | 38 +++++++++-------------
dev-qt/{qtlocation => qtpositioning}/Manifest | 0
dev-qt/{qtlocation => qtpositioning}/metadata.xml | 0
.../qtpositioning-5.3.2.ebuild} | 22 ++++++-------
.../qtpositioning-5.3.9999.ebuild} | 22 ++++++-------
.../qtpositioning-5.4.0_alpha.ebuild} | 23 +++++++------
.../qtpositioning-5.4.9999.ebuild} | 23 +++++++------
.../qtpositioning-5.9999.ebuild} | 22 ++++++-------
9 files changed, 70 insertions(+), 84 deletions(-)
diff --git a/dev-qt/qtlocation/metadata.xml b/dev-qt/qtlocation/metadata.xml
index 6f68672..9d5bff1 100644
--- a/dev-qt/qtlocation/metadata.xml
+++ b/dev-qt/qtlocation/metadata.xml
@@ -2,10 +2,6 @@
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd";>
<pkgmetadata>
<herd>qt</herd>
- <use>
- <flag name="geoclue">Use enhanced location information from
<pkg>app-misc/geoclue</pkg></flag>
- <flag name="qml">Build QML bindings</flag>
- </use>
<upstream>
<bugs-to>https://bugreports.qt-project.org/</bugs-to>
<doc>http://qt-project.org/doc/</doc>
diff --git a/dev-qt/qtlocation/qtlocation-5.9999.ebuild
b/dev-qt/qtlocation/qtlocation-5.9999.ebuild
index 5b8989f..a28bc3c 100644
--- a/dev-qt/qtlocation/qtlocation-5.9999.ebuild
+++ b/dev-qt/qtlocation/qtlocation-5.9999.ebuild
@@ -6,7 +6,7 @@ EAPI=5
inherit qt5-build
-DESCRIPTION="Physical position determination library for the Qt5 framework"
+DESCRIPTION="The Location module for the Qt5 framework"
if [[ ${QT5_BUILD_TYPE} == live ]]; then
KEYWORDS=""
@@ -14,28 +14,20 @@ else
KEYWORDS="~amd64 ~x86"
fi
-# FIXME: src/3rdparty/poly2tri doesn't respect CXX and CXXFLAGS
-# TODO: plugins (geoclue-satellite, gypsy)
-IUSE="geoclue qml"
+IUSE=""
-RDEPEND="
+DEPEND="
>=dev-qt/qtcore-${PV}:5[debug=]
- geoclue? (
- app-misc/geoclue:0
- dev-libs/glib:2
- )
- qml? (
- >=dev-qt/qtdeclarative-${PV}:5[debug=]
- >=dev-qt/qtgui-${PV}:5[debug=]
- >=dev-qt/qtnetwork-${PV}:5[debug=]
- )
+ >=dev-qt/qtdeclarative-${PV}:5[debug=]
+ >=dev-qt/qtgui-${PV}:5[debug=]
+ >=dev-qt/qtnetwork-${PV}:5[debug=]
+ >=dev-qt/qtpositioning-${PV}:5[debug=]
"
-DEPEND="${RDEPEND}"
-
-src_prepare() {
- qt_use_compile_test geoclue
- qt_use_disable_mod qml quick \
- src/src.pro
-
- qt5-build_src_prepare
-}
+RDEPEND="${DEPEND}"
+
+QT5_TARGET_SUBDIRS=(
+ src/3rdparty
+ src/location
+ src/imports/location
+ src/plugins/geoservices
+)
diff --git a/dev-qt/qtlocation/Manifest b/dev-qt/qtpositioning/Manifest
similarity index 100%
rename from dev-qt/qtlocation/Manifest
rename to dev-qt/qtpositioning/Manifest
diff --git a/dev-qt/qtlocation/metadata.xml b/dev-qt/qtpositioning/metadata.xml
similarity index 100%
copy from dev-qt/qtlocation/metadata.xml
copy to dev-qt/qtpositioning/metadata.xml
diff --git a/dev-qt/qtlocation/qtlocation-5.3.2.ebuild
b/dev-qt/qtpositioning/qtpositioning-5.3.2.ebuild
similarity index 58%
copy from dev-qt/qtlocation/qtlocation-5.3.2.ebuild
copy to dev-qt/qtpositioning/qtpositioning-5.3.2.ebuild
index c0b4916..79bc51f 100644
--- a/dev-qt/qtlocation/qtlocation-5.3.2.ebuild
+++ b/dev-qt/qtpositioning/qtpositioning-5.3.2.ebuild
@@ -4,6 +4,8 @@
EAPI=5
+QT5_MODULE="qtlocation"
+
inherit qt5-build
DESCRIPTION="Physical position determination library for the Qt5 framework"
@@ -14,8 +16,7 @@ else
KEYWORDS="~amd64 ~x86"
fi
-# FIXME: src/3rdparty/poly2tri doesn't respect CXX and CXXFLAGS
-# TODO: plugins (geoclue-satellite, gypsy)
+# TODO: src/plugins/position/gypsy
IUSE="geoclue qml"
RDEPEND="
@@ -24,17 +25,16 @@ RDEPEND="
app-misc/geoclue:0
dev-libs/glib:2
)
- qml? (
- >=dev-qt/qtdeclarative-${PV}:5[debug=]
- >=dev-qt/qtnetwork-${PV}:5[debug=]
- )
+ qml? ( >=dev-qt/qtdeclarative-${PV}:5[debug=] )
"
DEPEND="${RDEPEND}"
-src_prepare() {
- qt_use_compile_test geoclue
- qt_use_disable_mod qml quick \
- src/src.pro
+QT5_TARGET_SUBDIRS=(
+ src/positioning
+ src/plugins/position/positionpoll
+)
- qt5-build_src_prepare
+pkg_setup() {
+ use geoclue && QT5_TARGET_SUBDIRS+=(src/plugins/position/geoclue)
+ use qml && QT5_TARGET_SUBDIRS+=(src/imports/positioning)
}
diff --git a/dev-qt/qtlocation/qtlocation-5.3.9999.ebuild
b/dev-qt/qtpositioning/qtpositioning-5.3.9999.ebuild
similarity index 58%
rename from dev-qt/qtlocation/qtlocation-5.3.9999.ebuild
rename to dev-qt/qtpositioning/qtpositioning-5.3.9999.ebuild
index c0b4916..79bc51f 100644
--- a/dev-qt/qtlocation/qtlocation-5.3.9999.ebuild
+++ b/dev-qt/qtpositioning/qtpositioning-5.3.9999.ebuild
@@ -4,6 +4,8 @@
EAPI=5
+QT5_MODULE="qtlocation"
+
inherit qt5-build
DESCRIPTION="Physical position determination library for the Qt5 framework"
@@ -14,8 +16,7 @@ else
KEYWORDS="~amd64 ~x86"
fi
-# FIXME: src/3rdparty/poly2tri doesn't respect CXX and CXXFLAGS
-# TODO: plugins (geoclue-satellite, gypsy)
+# TODO: src/plugins/position/gypsy
IUSE="geoclue qml"
RDEPEND="
@@ -24,17 +25,16 @@ RDEPEND="
app-misc/geoclue:0
dev-libs/glib:2
)
- qml? (
- >=dev-qt/qtdeclarative-${PV}:5[debug=]
- >=dev-qt/qtnetwork-${PV}:5[debug=]
- )
+ qml? ( >=dev-qt/qtdeclarative-${PV}:5[debug=] )
"
DEPEND="${RDEPEND}"
-src_prepare() {
- qt_use_compile_test geoclue
- qt_use_disable_mod qml quick \
- src/src.pro
+QT5_TARGET_SUBDIRS=(
+ src/positioning
+ src/plugins/position/positionpoll
+)
- qt5-build_src_prepare
+pkg_setup() {
+ use geoclue && QT5_TARGET_SUBDIRS+=(src/plugins/position/geoclue)
+ use qml && QT5_TARGET_SUBDIRS+=(src/imports/positioning)
}
diff --git a/dev-qt/qtlocation/qtlocation-5.4.0_alpha.ebuild
b/dev-qt/qtpositioning/qtpositioning-5.4.0_alpha.ebuild
similarity index 57%
rename from dev-qt/qtlocation/qtlocation-5.4.0_alpha.ebuild
rename to dev-qt/qtpositioning/qtpositioning-5.4.0_alpha.ebuild
index 5b8989f..79bc51f 100644
--- a/dev-qt/qtlocation/qtlocation-5.4.0_alpha.ebuild
+++ b/dev-qt/qtpositioning/qtpositioning-5.4.0_alpha.ebuild
@@ -4,6 +4,8 @@
EAPI=5
+QT5_MODULE="qtlocation"
+
inherit qt5-build
DESCRIPTION="Physical position determination library for the Qt5 framework"
@@ -14,8 +16,7 @@ else
KEYWORDS="~amd64 ~x86"
fi
-# FIXME: src/3rdparty/poly2tri doesn't respect CXX and CXXFLAGS
-# TODO: plugins (geoclue-satellite, gypsy)
+# TODO: src/plugins/position/gypsy
IUSE="geoclue qml"
RDEPEND="
@@ -24,18 +25,16 @@ RDEPEND="
app-misc/geoclue:0
dev-libs/glib:2
)
- qml? (
- >=dev-qt/qtdeclarative-${PV}:5[debug=]
- >=dev-qt/qtgui-${PV}:5[debug=]
- >=dev-qt/qtnetwork-${PV}:5[debug=]
- )
+ qml? ( >=dev-qt/qtdeclarative-${PV}:5[debug=] )
"
DEPEND="${RDEPEND}"
-src_prepare() {
- qt_use_compile_test geoclue
- qt_use_disable_mod qml quick \
- src/src.pro
+QT5_TARGET_SUBDIRS=(
+ src/positioning
+ src/plugins/position/positionpoll
+)
- qt5-build_src_prepare
+pkg_setup() {
+ use geoclue && QT5_TARGET_SUBDIRS+=(src/plugins/position/geoclue)
+ use qml && QT5_TARGET_SUBDIRS+=(src/imports/positioning)
}
diff --git a/dev-qt/qtlocation/qtlocation-5.4.9999.ebuild
b/dev-qt/qtpositioning/qtpositioning-5.4.9999.ebuild
similarity index 57%
rename from dev-qt/qtlocation/qtlocation-5.4.9999.ebuild
rename to dev-qt/qtpositioning/qtpositioning-5.4.9999.ebuild
index 5b8989f..79bc51f 100644
--- a/dev-qt/qtlocation/qtlocation-5.4.9999.ebuild
+++ b/dev-qt/qtpositioning/qtpositioning-5.4.9999.ebuild
@@ -4,6 +4,8 @@
EAPI=5
+QT5_MODULE="qtlocation"
+
inherit qt5-build
DESCRIPTION="Physical position determination library for the Qt5 framework"
@@ -14,8 +16,7 @@ else
KEYWORDS="~amd64 ~x86"
fi
-# FIXME: src/3rdparty/poly2tri doesn't respect CXX and CXXFLAGS
-# TODO: plugins (geoclue-satellite, gypsy)
+# TODO: src/plugins/position/gypsy
IUSE="geoclue qml"
RDEPEND="
@@ -24,18 +25,16 @@ RDEPEND="
app-misc/geoclue:0
dev-libs/glib:2
)
- qml? (
- >=dev-qt/qtdeclarative-${PV}:5[debug=]
- >=dev-qt/qtgui-${PV}:5[debug=]
- >=dev-qt/qtnetwork-${PV}:5[debug=]
- )
+ qml? ( >=dev-qt/qtdeclarative-${PV}:5[debug=] )
"
DEPEND="${RDEPEND}"
-src_prepare() {
- qt_use_compile_test geoclue
- qt_use_disable_mod qml quick \
- src/src.pro
+QT5_TARGET_SUBDIRS=(
+ src/positioning
+ src/plugins/position/positionpoll
+)
- qt5-build_src_prepare
+pkg_setup() {
+ use geoclue && QT5_TARGET_SUBDIRS+=(src/plugins/position/geoclue)
+ use qml && QT5_TARGET_SUBDIRS+=(src/imports/positioning)
}
diff --git a/dev-qt/qtlocation/qtlocation-5.3.2.ebuild
b/dev-qt/qtpositioning/qtpositioning-5.9999.ebuild
similarity index 58%
rename from dev-qt/qtlocation/qtlocation-5.3.2.ebuild
rename to dev-qt/qtpositioning/qtpositioning-5.9999.ebuild
index c0b4916..79bc51f 100644
--- a/dev-qt/qtlocation/qtlocation-5.3.2.ebuild
+++ b/dev-qt/qtpositioning/qtpositioning-5.9999.ebuild
@@ -4,6 +4,8 @@
EAPI=5
+QT5_MODULE="qtlocation"
+
inherit qt5-build
DESCRIPTION="Physical position determination library for the Qt5 framework"
@@ -14,8 +16,7 @@ else
KEYWORDS="~amd64 ~x86"
fi
-# FIXME: src/3rdparty/poly2tri doesn't respect CXX and CXXFLAGS
-# TODO: plugins (geoclue-satellite, gypsy)
+# TODO: src/plugins/position/gypsy
IUSE="geoclue qml"
RDEPEND="
@@ -24,17 +25,16 @@ RDEPEND="
app-misc/geoclue:0
dev-libs/glib:2
)
- qml? (
- >=dev-qt/qtdeclarative-${PV}:5[debug=]
- >=dev-qt/qtnetwork-${PV}:5[debug=]
- )
+ qml? ( >=dev-qt/qtdeclarative-${PV}:5[debug=] )
"
DEPEND="${RDEPEND}"
-src_prepare() {
- qt_use_compile_test geoclue
- qt_use_disable_mod qml quick \
- src/src.pro
+QT5_TARGET_SUBDIRS=(
+ src/positioning
+ src/plugins/position/positionpoll
+)
- qt5-build_src_prepare
+pkg_setup() {
+ use geoclue && QT5_TARGET_SUBDIRS+=(src/plugins/position/geoclue)
+ use qml && QT5_TARGET_SUBDIRS+=(src/imports/positioning)
}
