From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 47CDD13832E for ; Thu, 18 Aug 2016 12:45:02 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id B566A21C012; Thu, 18 Aug 2016 12:44:59 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 31A1521C012 for ; Thu, 18 Aug 2016 12:44:59 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id A21E6340940 for ; Thu, 18 Aug 2016 12:44:57 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id F28AD7D8 for ; Thu, 18 Aug 2016 12:44:54 +0000 (UTC) From: "Michael Palimaka" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Michael Palimaka" Message-ID: <1471384742.d8288236756f2eec94d9b0fb98c6b8cea8398040.kensington@gentoo> Subject: [gentoo-commits] proj/kde:master commit in: kde-apps/marble/ X-VCS-Repository: proj/kde X-VCS-Files: kde-apps/marble/marble-16.07.90.ebuild kde-apps/marble/marble-16.08.49.9999.ebuild kde-apps/marble/marble-9999.ebuild kde-apps/marble/metadata.xml X-VCS-Directories: kde-apps/marble/ X-VCS-Committer: kensington X-VCS-Committer-Name: Michael Palimaka X-VCS-Revision: d8288236756f2eec94d9b0fb98c6b8cea8398040 X-VCS-Branch: master Date: Thu, 18 Aug 2016 12:44:54 +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: 85a64bb0-099e-4ec5-a583-d323a6ed21c1 X-Archives-Hash: 97c3959a6d6e5d357c14f30a72ebad49 commit: d8288236756f2eec94d9b0fb98c6b8cea8398040 Author: Andreas Sturmlechner gmail com> AuthorDate: Tue Aug 16 20:46:49 2016 +0000 Commit: Michael Palimaka gentoo org> CommitDate: Tue Aug 16 21:59:02 2016 +0000 URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=d8288236 kde-apps/marble: Add USE=dbus,positioning fix DEPENDs, DESCRIPTION - Add Qt5SerialPort to aprs DEPENDs now that it's in tree - Add Qt5{Location,Positioning} support, same USE naming as in PyQt5 - Other packages are using 'designer' so bring marble in line - Disable marble-qt if USE=kde, it only adds confusion - Drop unused and deprecated Qt5OpenGL - Improve DESCRIPTION Package-Manager: portage-2.2.28 kde-apps/marble/marble-16.07.90.ebuild | 36 ++++++++++++++++++++--------- kde-apps/marble/marble-16.08.49.9999.ebuild | 36 ++++++++++++++++++++--------- kde-apps/marble/marble-9999.ebuild | 36 ++++++++++++++++++++--------- kde-apps/marble/metadata.xml | 3 ++- 4 files changed, 77 insertions(+), 34 deletions(-) diff --git a/kde-apps/marble/marble-16.07.90.ebuild b/kde-apps/marble/marble-16.07.90.ebuild index 1dbf794..862dcda 100644 --- a/kde-apps/marble/marble-16.07.90.ebuild +++ b/kde-apps/marble/marble-16.07.90.ebuild @@ -9,22 +9,18 @@ KDE_TEST="forceoptional" VIRTUALX_REQUIRED="test" inherit kde5 -DESCRIPTION="Generic geographical map widget" +DESCRIPTION="Virtual Globe and World Atlas to learn more about Earth" HOMEPAGE="https://marble.kde.org/" KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux" -IUSE="aprs designer-plugin gps +kde phonon shapefile" +IUSE="aprs +dbus designer gps +kde phonon +positioning shapefile" -# FIXME (new packages): -# libwlocate, WLAN-based geolocation -# qextserialport, interface to old fashioned serial ports +# FIXME (new package): libwlocate, WLAN-based geolocation RDEPEND=" $(add_qt_dep qtconcurrent) - $(add_qt_dep qtdbus) $(add_qt_dep qtdeclarative) $(add_qt_dep qtgui) $(add_qt_dep qtnetwork) - $(add_qt_dep qtopengl) $(add_qt_dep qtprintsupport) $(add_qt_dep qtscript) $(add_qt_dep qtsql) @@ -32,7 +28,10 @@ RDEPEND=" $(add_qt_dep qtwebkit) $(add_qt_dep qtwidgets) $(add_qt_dep qtxml) - gps? ( >=sci-geosciences/gpsd-2.95 ) + aprs? ( $(add_qt_dep qtserialport) ) + dbus? ( $(add_qt_dep qtdbus) ) + designer? ( $(add_qt_dep designer) ) + gps? ( sci-geosciences/gpsd ) kde? ( $(add_frameworks_dep kconfig) $(add_frameworks_dep kconfigwidgets) @@ -47,6 +46,10 @@ RDEPEND=" $(add_frameworks_dep kwallet) ) phonon? ( media-libs/phonon[qt5] ) + positioning? ( + $(add_qt_dep qtlocation) + $(add_qt_dep qtpositioning) + ) shapefile? ( sci-libs/shapelib ) " DEPEND="${RDEPEND} @@ -56,17 +59,28 @@ DEPEND="${RDEPEND} # bug 588320 RESTRICT=test +src_prepare() { + if use kde; then + sed -e "/add_subdirectory(marble-qt)/ s/^/#DONT/" \ + -i src/apps/CMakeLists.txt \ + || die "Failed to disable marble-qt" + fi + + kde5_src_prepare +} + src_configure() { local mycmakeargs=( $(cmake-utils_use_find_package aprs Perl) + $(cmake-utils_use_find_package positioning Qt5Location) + $(cmake-utils_use_find_package positioning Qt5Positioning) -DBUILD_MARBLE_TESTS=$(usex test) - -DWITH_DESIGNER_PLUGIN=$(usex designer-plugin) + -DWITH_DESIGNER_PLUGIN=$(usex designer) -DWITH_libgps=$(usex gps) -DWITH_KF5=$(usex kde) -DWITH_Phonon=$(usex phonon) -DWITH_libshp=$(usex shapefile) - -DWITH_QextSerialPort=OFF - -DWITH_liblocation=0 + -DWITH_libwlocate=OFF ) kde5_src_configure } diff --git a/kde-apps/marble/marble-16.08.49.9999.ebuild b/kde-apps/marble/marble-16.08.49.9999.ebuild index 06dd32b..c94aae4 100644 --- a/kde-apps/marble/marble-16.08.49.9999.ebuild +++ b/kde-apps/marble/marble-16.08.49.9999.ebuild @@ -9,22 +9,18 @@ KDE_TEST="forceoptional" VIRTUALX_REQUIRED="test" inherit kde5 -DESCRIPTION="Generic geographical map widget" +DESCRIPTION="Virtual Globe and World Atlas to learn more about Earth" HOMEPAGE="https://marble.kde.org/" KEYWORDS="" -IUSE="aprs designer-plugin gps +kde phonon shapefile" +IUSE="aprs +dbus designer gps +kde phonon +positioning shapefile" -# FIXME (new packages): -# libwlocate, WLAN-based geolocation -# qextserialport, interface to old fashioned serial ports +# FIXME (new package): libwlocate, WLAN-based geolocation RDEPEND=" $(add_qt_dep qtconcurrent) - $(add_qt_dep qtdbus) $(add_qt_dep qtdeclarative) $(add_qt_dep qtgui) $(add_qt_dep qtnetwork) - $(add_qt_dep qtopengl) $(add_qt_dep qtprintsupport) $(add_qt_dep qtscript) $(add_qt_dep qtsql) @@ -32,7 +28,10 @@ RDEPEND=" $(add_qt_dep qtwebkit) $(add_qt_dep qtwidgets) $(add_qt_dep qtxml) - gps? ( >=sci-geosciences/gpsd-2.95 ) + aprs? ( $(add_qt_dep qtserialport) ) + dbus? ( $(add_qt_dep qtdbus) ) + designer? ( $(add_qt_dep designer) ) + gps? ( sci-geosciences/gpsd ) kde? ( $(add_frameworks_dep kconfig) $(add_frameworks_dep kconfigwidgets) @@ -47,6 +46,10 @@ RDEPEND=" $(add_frameworks_dep kwallet) ) phonon? ( media-libs/phonon[qt5] ) + positioning? ( + $(add_qt_dep qtlocation) + $(add_qt_dep qtpositioning) + ) shapefile? ( sci-libs/shapelib ) " DEPEND="${RDEPEND} @@ -56,17 +59,28 @@ DEPEND="${RDEPEND} # bug 588320 RESTRICT=test +src_prepare() { + if use kde; then + sed -e "/add_subdirectory(marble-qt)/ s/^/#DONT/" \ + -i src/apps/CMakeLists.txt \ + || die "Failed to disable marble-qt" + fi + + kde5_src_prepare +} + src_configure() { local mycmakeargs=( $(cmake-utils_use_find_package aprs Perl) + $(cmake-utils_use_find_package positioning Qt5Location) + $(cmake-utils_use_find_package positioning Qt5Positioning) -DBUILD_MARBLE_TESTS=$(usex test) - -DWITH_DESIGNER_PLUGIN=$(usex designer-plugin) + -DWITH_DESIGNER_PLUGIN=$(usex designer) -DWITH_libgps=$(usex gps) -DWITH_KF5=$(usex kde) -DWITH_Phonon=$(usex phonon) -DWITH_libshp=$(usex shapefile) - -DWITH_QextSerialPort=OFF - -DWITH_liblocation=0 + -DWITH_libwlocate=OFF ) kde5_src_configure } diff --git a/kde-apps/marble/marble-9999.ebuild b/kde-apps/marble/marble-9999.ebuild index 06dd32b..c94aae4 100644 --- a/kde-apps/marble/marble-9999.ebuild +++ b/kde-apps/marble/marble-9999.ebuild @@ -9,22 +9,18 @@ KDE_TEST="forceoptional" VIRTUALX_REQUIRED="test" inherit kde5 -DESCRIPTION="Generic geographical map widget" +DESCRIPTION="Virtual Globe and World Atlas to learn more about Earth" HOMEPAGE="https://marble.kde.org/" KEYWORDS="" -IUSE="aprs designer-plugin gps +kde phonon shapefile" +IUSE="aprs +dbus designer gps +kde phonon +positioning shapefile" -# FIXME (new packages): -# libwlocate, WLAN-based geolocation -# qextserialport, interface to old fashioned serial ports +# FIXME (new package): libwlocate, WLAN-based geolocation RDEPEND=" $(add_qt_dep qtconcurrent) - $(add_qt_dep qtdbus) $(add_qt_dep qtdeclarative) $(add_qt_dep qtgui) $(add_qt_dep qtnetwork) - $(add_qt_dep qtopengl) $(add_qt_dep qtprintsupport) $(add_qt_dep qtscript) $(add_qt_dep qtsql) @@ -32,7 +28,10 @@ RDEPEND=" $(add_qt_dep qtwebkit) $(add_qt_dep qtwidgets) $(add_qt_dep qtxml) - gps? ( >=sci-geosciences/gpsd-2.95 ) + aprs? ( $(add_qt_dep qtserialport) ) + dbus? ( $(add_qt_dep qtdbus) ) + designer? ( $(add_qt_dep designer) ) + gps? ( sci-geosciences/gpsd ) kde? ( $(add_frameworks_dep kconfig) $(add_frameworks_dep kconfigwidgets) @@ -47,6 +46,10 @@ RDEPEND=" $(add_frameworks_dep kwallet) ) phonon? ( media-libs/phonon[qt5] ) + positioning? ( + $(add_qt_dep qtlocation) + $(add_qt_dep qtpositioning) + ) shapefile? ( sci-libs/shapelib ) " DEPEND="${RDEPEND} @@ -56,17 +59,28 @@ DEPEND="${RDEPEND} # bug 588320 RESTRICT=test +src_prepare() { + if use kde; then + sed -e "/add_subdirectory(marble-qt)/ s/^/#DONT/" \ + -i src/apps/CMakeLists.txt \ + || die "Failed to disable marble-qt" + fi + + kde5_src_prepare +} + src_configure() { local mycmakeargs=( $(cmake-utils_use_find_package aprs Perl) + $(cmake-utils_use_find_package positioning Qt5Location) + $(cmake-utils_use_find_package positioning Qt5Positioning) -DBUILD_MARBLE_TESTS=$(usex test) - -DWITH_DESIGNER_PLUGIN=$(usex designer-plugin) + -DWITH_DESIGNER_PLUGIN=$(usex designer) -DWITH_libgps=$(usex gps) -DWITH_KF5=$(usex kde) -DWITH_Phonon=$(usex phonon) -DWITH_libshp=$(usex shapefile) - -DWITH_QextSerialPort=OFF - -DWITH_liblocation=0 + -DWITH_libwlocate=OFF ) kde5_src_configure } diff --git a/kde-apps/marble/metadata.xml b/kde-apps/marble/metadata.xml index 5f70c96..e6bb965 100644 --- a/kde-apps/marble/metadata.xml +++ b/kde-apps/marble/metadata.xml @@ -7,8 +7,9 @@ Enable support for APRS data sources - Enable designer plugin + Install plugin for dev-qt/designer Enable sound support via media-libs/phonon + Enable position information via dev-qt/qtpositioning and dev-qt/qtlocation Enable support for ESRI shapefiles