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 3152C13800E for ; Thu, 2 Aug 2012 16:45:46 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 2EF92E06B7; Thu, 2 Aug 2012 16:45:36 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id DE926E06B7 for ; Thu, 2 Aug 2012 16:45:35 +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 28A6C1B402F for ; Thu, 2 Aug 2012 16:45:35 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id DE414E543C for ; Thu, 2 Aug 2012 16:45:33 +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: <1343925867.06531b5838944f8a0cb0cfd4e5320fb66ffba813.kensington@gentoo> Subject: [gentoo-commits] proj/kde:master commit in: kde-base/marble/ X-VCS-Repository: proj/kde X-VCS-Files: kde-base/marble/marble-4.8.49.9999.ebuild kde-base/marble/marble-4.8.5.ebuild kde-base/marble/marble-4.9.49.9999.ebuild kde-base/marble/marble-9999.ebuild X-VCS-Directories: kde-base/marble/ X-VCS-Committer: kensington X-VCS-Committer-Name: Michael Palimaka X-VCS-Revision: 06531b5838944f8a0cb0cfd4e5320fb66ffba813 X-VCS-Branch: master Date: Thu, 2 Aug 2012 16:45:33 +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: bebc3b76-877a-4b1f-b76b-70ab93023637 X-Archives-Hash: 7e37e71e520378db386c539db147301b commit: 06531b5838944f8a0cb0cfd4e5320fb66ffba813 Author: Michael Palimaka gentoo org> AuthorDate: Thu Aug 2 16:44:27 2012 +0000 Commit: Michael Palimaka gentoo org> CommitDate: Thu Aug 2 16:44:27 2012 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=06531b58 [kde-base/marble] Fix dependencies, thanks to Bash Vi gmail.com> in bug #429346. (Portage version: 2.1.11.9/git/Linux x86_64, unsigned Manifest commit) --- kde-base/marble/marble-4.8.49.9999.ebuild | 21 +++++++++++++++------ kde-base/marble/marble-4.8.5.ebuild | 21 +++++++++++++++------ kde-base/marble/marble-4.9.49.9999.ebuild | 21 +++++++++++++++------ kde-base/marble/marble-9999.ebuild | 21 +++++++++++++++------ 4 files changed, 60 insertions(+), 24 deletions(-) diff --git a/kde-base/marble/marble-4.8.49.9999.ebuild b/kde-base/marble/marble-4.8.49.9999.ebuild index 2d28dbe..81b1e1a 100644 --- a/kde-base/marble/marble-4.8.49.9999.ebuild +++ b/kde-base/marble/marble-4.8.49.9999.ebuild @@ -13,15 +13,18 @@ inherit kde4-base python DESCRIPTION="Generic geographical map widget" KEYWORDS="" -IUSE="debug designer-plugin gps +kde plasma python" +IUSE="debug designer-plugin gps +kde plasma python test" -# tests fail / segfault. Last checked for 4.2.88 -# RESTRICT=test +# tests fail / segfault. Last checked for 4.9.0 +RESTRICT="test" -DEPEND=" +RDEPEND=" x11-libs/qt-core:4 + x11-libs/qt-declarative:4 x11-libs/qt-gui:4[dbus] x11-libs/qt-script:4 + x11-libs/qt-sql:4 + x11-libs/qt-svg:4 x11-libs/qt-webkit:4 gps? ( >=sci-geosciences/gpsd-2.95[qt4] ) python? ( @@ -29,10 +32,12 @@ DEPEND=" kde? ( $(add_kdebase_dep pykde4) ) ) " -RDEPEND="${DEPEND} +DEPEND=" + ${RDEPEND} + test? ( x11-libs/qt-test:4 ) " # the qt dependencies are needed because with USE=-kde nothing is pulled in -# by default... bug 414165 +# by default... bugs 414165 & 414165 REQUIRED_USE=" plasma? ( kde ) @@ -60,6 +65,7 @@ src_configure() { $(cmake-utils_use_with gps libgps) $(cmake-utils_use !kde QTONLY) $(cmake-utils_use_with plasma) + -DBUILD_MARBLE_TESTS=OFF -DWITH_liblocation=0 $(use kde && cmake-utils_use_with python PyKDE4) ) @@ -71,6 +77,9 @@ src_test() { if use kde; then elog "Marble tests can only be run in the qt-only version" else + local mycmakeargs=( + -DBUILD_MARBLE_TESTS=ON + ) kde4-base_src_test fi } diff --git a/kde-base/marble/marble-4.8.5.ebuild b/kde-base/marble/marble-4.8.5.ebuild index db64755..d471c5f 100644 --- a/kde-base/marble/marble-4.8.5.ebuild +++ b/kde-base/marble/marble-4.8.5.ebuild @@ -13,15 +13,18 @@ inherit kde4-base python DESCRIPTION="Generic geographical map widget" KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux" -IUSE="debug designer-plugin gps +kde plasma python" +IUSE="debug designer-plugin gps +kde plasma python test" -# tests fail / segfault. Last checked for 4.2.88 -# RESTRICT=test +# tests fail / segfault. Last checked for 4.9.0 +RESTRICT="test" -DEPEND=" +RDEPEND=" x11-libs/qt-core:4 + x11-libs/qt-declarative:4 x11-libs/qt-gui:4[dbus] x11-libs/qt-script:4 + x11-libs/qt-sql:4 + x11-libs/qt-svg:4 x11-libs/qt-webkit:4 gps? ( >=sci-geosciences/gpsd-2.95[qt4] ) python? ( @@ -29,10 +32,12 @@ DEPEND=" kde? ( $(add_kdebase_dep pykde4) ) ) " -RDEPEND="${DEPEND} +DEPEND=" + ${RDEPEND} + test? ( x11-libs/qt-test:4 ) " # the qt dependencies are needed because with USE=-kde nothing is pulled in -# by default... bug 414165 +# by default... bugs 414165 & 414165 REQUIRED_USE=" plasma? ( kde ) @@ -60,6 +65,7 @@ src_configure() { $(cmake-utils_use_with gps libgps) $(cmake-utils_use !kde QTONLY) $(cmake-utils_use_with plasma) + -DBUILD_MARBLE_TESTS=OFF -DWITH_liblocation=0 $(use kde && cmake-utils_use_with python PyKDE4) ) @@ -71,6 +77,9 @@ src_test() { if use kde; then elog "Marble tests can only be run in the qt-only version" else + local mycmakeargs=( + -DBUILD_MARBLE_TESTS=ON + ) kde4-base_src_test fi } diff --git a/kde-base/marble/marble-4.9.49.9999.ebuild b/kde-base/marble/marble-4.9.49.9999.ebuild index 2d28dbe..81b1e1a 100644 --- a/kde-base/marble/marble-4.9.49.9999.ebuild +++ b/kde-base/marble/marble-4.9.49.9999.ebuild @@ -13,15 +13,18 @@ inherit kde4-base python DESCRIPTION="Generic geographical map widget" KEYWORDS="" -IUSE="debug designer-plugin gps +kde plasma python" +IUSE="debug designer-plugin gps +kde plasma python test" -# tests fail / segfault. Last checked for 4.2.88 -# RESTRICT=test +# tests fail / segfault. Last checked for 4.9.0 +RESTRICT="test" -DEPEND=" +RDEPEND=" x11-libs/qt-core:4 + x11-libs/qt-declarative:4 x11-libs/qt-gui:4[dbus] x11-libs/qt-script:4 + x11-libs/qt-sql:4 + x11-libs/qt-svg:4 x11-libs/qt-webkit:4 gps? ( >=sci-geosciences/gpsd-2.95[qt4] ) python? ( @@ -29,10 +32,12 @@ DEPEND=" kde? ( $(add_kdebase_dep pykde4) ) ) " -RDEPEND="${DEPEND} +DEPEND=" + ${RDEPEND} + test? ( x11-libs/qt-test:4 ) " # the qt dependencies are needed because with USE=-kde nothing is pulled in -# by default... bug 414165 +# by default... bugs 414165 & 414165 REQUIRED_USE=" plasma? ( kde ) @@ -60,6 +65,7 @@ src_configure() { $(cmake-utils_use_with gps libgps) $(cmake-utils_use !kde QTONLY) $(cmake-utils_use_with plasma) + -DBUILD_MARBLE_TESTS=OFF -DWITH_liblocation=0 $(use kde && cmake-utils_use_with python PyKDE4) ) @@ -71,6 +77,9 @@ src_test() { if use kde; then elog "Marble tests can only be run in the qt-only version" else + local mycmakeargs=( + -DBUILD_MARBLE_TESTS=ON + ) kde4-base_src_test fi } diff --git a/kde-base/marble/marble-9999.ebuild b/kde-base/marble/marble-9999.ebuild index 2d28dbe..81b1e1a 100644 --- a/kde-base/marble/marble-9999.ebuild +++ b/kde-base/marble/marble-9999.ebuild @@ -13,15 +13,18 @@ inherit kde4-base python DESCRIPTION="Generic geographical map widget" KEYWORDS="" -IUSE="debug designer-plugin gps +kde plasma python" +IUSE="debug designer-plugin gps +kde plasma python test" -# tests fail / segfault. Last checked for 4.2.88 -# RESTRICT=test +# tests fail / segfault. Last checked for 4.9.0 +RESTRICT="test" -DEPEND=" +RDEPEND=" x11-libs/qt-core:4 + x11-libs/qt-declarative:4 x11-libs/qt-gui:4[dbus] x11-libs/qt-script:4 + x11-libs/qt-sql:4 + x11-libs/qt-svg:4 x11-libs/qt-webkit:4 gps? ( >=sci-geosciences/gpsd-2.95[qt4] ) python? ( @@ -29,10 +32,12 @@ DEPEND=" kde? ( $(add_kdebase_dep pykde4) ) ) " -RDEPEND="${DEPEND} +DEPEND=" + ${RDEPEND} + test? ( x11-libs/qt-test:4 ) " # the qt dependencies are needed because with USE=-kde nothing is pulled in -# by default... bug 414165 +# by default... bugs 414165 & 414165 REQUIRED_USE=" plasma? ( kde ) @@ -60,6 +65,7 @@ src_configure() { $(cmake-utils_use_with gps libgps) $(cmake-utils_use !kde QTONLY) $(cmake-utils_use_with plasma) + -DBUILD_MARBLE_TESTS=OFF -DWITH_liblocation=0 $(use kde && cmake-utils_use_with python PyKDE4) ) @@ -71,6 +77,9 @@ src_test() { if use kde; then elog "Marble tests can only be run in the qt-only version" else + local mycmakeargs=( + -DBUILD_MARBLE_TESTS=ON + ) kde4-base_src_test fi }