public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] proj/kde:master commit in: kde-base/marble/
@ 2011-10-25 17:58 Alexey Shvetsov
  0 siblings, 0 replies; 28+ messages in thread
From: Alexey Shvetsov @ 2011-10-25 17:58 UTC (permalink / raw
  To: gentoo-commits

commit:     5c3c5aaaa79ea85718e3a036060ccd1b69c1b40f
Author:     Alexey Shvetsov <alexxy <AT> gentoo <DOT> org>
AuthorDate: Tue Oct 25 17:56:24 2011 +0000
Commit:     Alexey Shvetsov <alexxy <AT> gentoo <DOT> org>
CommitDate: Tue Oct 25 17:56:24 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=5c3c5aaa

[kde-base/marble] simplify src_prepare for :live

(Portage version: 2.2.0_alpha71/git/Linux x86_64, signed Manifest commit with key F82F92E6)

---
 kde-base/marble/marble-9999.ebuild |    2 --
 1 files changed, 0 insertions(+), 2 deletions(-)

diff --git a/kde-base/marble/marble-9999.ebuild b/kde-base/marble/marble-9999.ebuild
index b947cca..b4f1435 100644
--- a/kde-base/marble/marble-9999.ebuild
+++ b/kde-base/marble/marble-9999.ebuild
@@ -39,8 +39,6 @@ pkg_setup() {
 src_prepare() {
 	kde4-base_src_prepare
 	python_convert_shebangs -r $(python_get_version) .
-
-	find "${S}/marble/src/bindings/python/sip" -name "*.sip" | xargs -- sed -i 's/#include <marble\//#include </'
 }
 
 src_configure() {



^ permalink raw reply related	[flat|nested] 28+ messages in thread
* [gentoo-commits] proj/kde:master commit in: kde-base/marble/
@ 2014-09-18 18:10 Michael Palimaka
  0 siblings, 0 replies; 28+ messages in thread
From: Michael Palimaka @ 2014-09-18 18:10 UTC (permalink / raw
  To: gentoo-commits

commit:     28ba3505748931fe2cf66056aa43a9a37237583c
Author:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
AuthorDate: Thu Sep 18 18:10:32 2014 +0000
Commit:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Thu Sep 18 18:10:32 2014 +0000
URL:        http://sources.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=28ba3505

[kde-base/marble] Add phonon USE flag wrt bug #520384.

Phonon is required for KDE build and optional for Qt-only build.
Build fails with qtphonon (which is deprecated anyway).

Package-Manager: portage-2.2.10

---
 kde-base/marble/marble-4.14.49.9999.ebuild | 5 ++++-
 kde-base/marble/metadata.xml               | 1 +
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/kde-base/marble/marble-4.14.49.9999.ebuild b/kde-base/marble/marble-4.14.49.9999.ebuild
index 6de83c1..6a1f8da 100644
--- a/kde-base/marble/marble-4.14.49.9999.ebuild
+++ b/kde-base/marble/marble-4.14.49.9999.ebuild
@@ -13,7 +13,7 @@ inherit kde4-base python-single-r1
 DESCRIPTION="Generic geographical map widget"
 HOMEPAGE="http://marble.kde.org/"
 KEYWORDS=""
-IUSE="debug designer-plugin gps +kde plasma python shapefile test zip"
+IUSE="debug designer-plugin gps +kde phonon plasma python shapefile test zip"
 
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
@@ -30,6 +30,8 @@ RDEPEND="
 	dev-qt/qtsvg:4
 	dev-qt/qtwebkit:4
 	gps? ( >=sci-geosciences/gpsd-2.95[qt4] )
+	kde? ( media-libs/phonon[qt4] )
+	phonon? ( media-libs/phonon[qt4] )
 	python? (
 		${PYTHON_DEPS}
 		>=dev-python/PyQt4-4.4.4-r1[${PYTHON_USEDEP}]
@@ -64,6 +66,7 @@ src_configure() {
 		$(cmake-utils_use_with python SIP)
 		$(cmake-utils_use_with gps libgps)
 		$(cmake-utils_use !kde QTONLY)
+		$(cmake-utils_use_with phonon)
 		$(cmake-utils_use_with plasma)
 		$(cmake-utils_use_with shapefile libshp)
 		$(cmake-utils_use_with zip quazip)

diff --git a/kde-base/marble/metadata.xml b/kde-base/marble/metadata.xml
index 8de6bc8..3431dc8 100644
--- a/kde-base/marble/metadata.xml
+++ b/kde-base/marble/metadata.xml
@@ -3,6 +3,7 @@
 <pkgmetadata>
 	<use>
 		<flag name="designer-plugin">Enable designer plugin</flag>
+		<flag name="phonon">Enable sound support via <pkg>media-libs/phonon</pkg></flag>
 		<flag name="shapefile">Enable support for ESRI shapefiles</flag>
 		<flag name="zip">Enable support for reading and displaying .kmz files</flag>
 	</use>


^ permalink raw reply related	[flat|nested] 28+ messages in thread
* [gentoo-commits] proj/kde:master commit in: kde-base/marble/
@ 2014-05-01 22:46 Johannes Huber
  0 siblings, 0 replies; 28+ messages in thread
From: Johannes Huber @ 2014-05-01 22:46 UTC (permalink / raw
  To: gentoo-commits

commit:     732487c2a971e5ca716dbf31cb27ee69d92065d3
Author:     Johannes Huber <johu <AT> gentoo <DOT> org>
AuthorDate: Thu May  1 22:35:51 2014 +0000
Commit:     Johannes Huber <johu <AT> gentoo <DOT> org>
CommitDate: Thu May  1 22:35:51 2014 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=732487c2

[kde-base/marble] Drop Python 2.6 support

Package-Manager: portage-2.2.10

---
 kde-base/marble/marble-4.13.49.9999.ebuild | 2 +-
 kde-base/marble/marble-4.9999.ebuild       | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/kde-base/marble/marble-4.13.49.9999.ebuild b/kde-base/marble/marble-4.13.49.9999.ebuild
index 0cbfc54..6de83c1 100644
--- a/kde-base/marble/marble-4.13.49.9999.ebuild
+++ b/kde-base/marble/marble-4.13.49.9999.ebuild
@@ -7,7 +7,7 @@ EAPI=5
 KDE_HANDBOOK="optional"
 KDE_REQUIRED="optional"
 CPPUNIT_REQUIRED="optional"
-PYTHON_COMPAT=( python{2_6,2_7} )
+PYTHON_COMPAT=( python2_7 )
 inherit kde4-base python-single-r1
 
 DESCRIPTION="Generic geographical map widget"

diff --git a/kde-base/marble/marble-4.9999.ebuild b/kde-base/marble/marble-4.9999.ebuild
index 0cbfc54..6de83c1 100644
--- a/kde-base/marble/marble-4.9999.ebuild
+++ b/kde-base/marble/marble-4.9999.ebuild
@@ -7,7 +7,7 @@ EAPI=5
 KDE_HANDBOOK="optional"
 KDE_REQUIRED="optional"
 CPPUNIT_REQUIRED="optional"
-PYTHON_COMPAT=( python{2_6,2_7} )
+PYTHON_COMPAT=( python2_7 )
 inherit kde4-base python-single-r1
 
 DESCRIPTION="Generic geographical map widget"


^ permalink raw reply related	[flat|nested] 28+ messages in thread
* [gentoo-commits] proj/kde:master commit in: kde-base/marble/
@ 2014-01-18 17:45 Michael Palimaka
  0 siblings, 0 replies; 28+ messages in thread
From: Michael Palimaka @ 2014-01-18 17:45 UTC (permalink / raw
  To: gentoo-commits

commit:     8650e385ead750d73793957ac8afc9086d6d6f29
Author:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
AuthorDate: Sat Jan 18 17:45:16 2014 +0000
Commit:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Sat Jan 18 17:45:16 2014 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=8650e385

[kde-base/marble] Improve python handling a bit.

Package-Manager: portage-2.2.7

---
 kde-base/marble/marble-4.11.49.9999.ebuild | 9 +++++----
 kde-base/marble/marble-4.12.49.9999.ebuild | 9 +++++----
 kde-base/marble/marble-9999.ebuild         | 9 +++++----
 3 files changed, 15 insertions(+), 12 deletions(-)

diff --git a/kde-base/marble/marble-4.11.49.9999.ebuild b/kde-base/marble/marble-4.11.49.9999.ebuild
index ddd7499..0cbfc54 100644
--- a/kde-base/marble/marble-4.11.49.9999.ebuild
+++ b/kde-base/marble/marble-4.11.49.9999.ebuild
@@ -8,13 +8,15 @@ KDE_HANDBOOK="optional"
 KDE_REQUIRED="optional"
 CPPUNIT_REQUIRED="optional"
 PYTHON_COMPAT=( python{2_6,2_7} )
-inherit kde4-base python-r1
+inherit kde4-base python-single-r1
 
 DESCRIPTION="Generic geographical map widget"
 HOMEPAGE="http://marble.kde.org/"
 KEYWORDS=""
 IUSE="debug designer-plugin gps +kde plasma python shapefile test zip"
 
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
 # tests fail / segfault. Last checked for 4.9.0
 RESTRICT="test"
 
@@ -50,15 +52,15 @@ REQUIRED_USE="
 
 pkg_setup() {
 	kde4-base_pkg_setup
-	python_setup
+	use python && python-single-r1_pkg_setup
 }
 
 src_configure() {
 	local mycmakeargs=(
 		$(cmake-utils_use_with designer-plugin DESIGNER_PLUGIN)
 		$(cmake-utils_use python EXPERIMENTAL_PYTHON_BINDINGS)
-		$(cmake-utils_use_with python PyQt4)
 		$(cmake-utils_use_with python PythonLibrary)
+		$(cmake-utils_use_with python PyQt4)
 		$(cmake-utils_use_with python SIP)
 		$(cmake-utils_use_with gps libgps)
 		$(cmake-utils_use !kde QTONLY)
@@ -68,7 +70,6 @@ src_configure() {
 		-DBUILD_MARBLE_TESTS=OFF
 		-DWITH_liblocation=0
 		-DWITH_QextSerialPort=OFF
-		$(use kde && cmake-utils_use_with python PyKDE4)
 	)
 
 	kde4-base_src_configure

diff --git a/kde-base/marble/marble-4.12.49.9999.ebuild b/kde-base/marble/marble-4.12.49.9999.ebuild
index ddd7499..0cbfc54 100644
--- a/kde-base/marble/marble-4.12.49.9999.ebuild
+++ b/kde-base/marble/marble-4.12.49.9999.ebuild
@@ -8,13 +8,15 @@ KDE_HANDBOOK="optional"
 KDE_REQUIRED="optional"
 CPPUNIT_REQUIRED="optional"
 PYTHON_COMPAT=( python{2_6,2_7} )
-inherit kde4-base python-r1
+inherit kde4-base python-single-r1
 
 DESCRIPTION="Generic geographical map widget"
 HOMEPAGE="http://marble.kde.org/"
 KEYWORDS=""
 IUSE="debug designer-plugin gps +kde plasma python shapefile test zip"
 
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
 # tests fail / segfault. Last checked for 4.9.0
 RESTRICT="test"
 
@@ -50,15 +52,15 @@ REQUIRED_USE="
 
 pkg_setup() {
 	kde4-base_pkg_setup
-	python_setup
+	use python && python-single-r1_pkg_setup
 }
 
 src_configure() {
 	local mycmakeargs=(
 		$(cmake-utils_use_with designer-plugin DESIGNER_PLUGIN)
 		$(cmake-utils_use python EXPERIMENTAL_PYTHON_BINDINGS)
-		$(cmake-utils_use_with python PyQt4)
 		$(cmake-utils_use_with python PythonLibrary)
+		$(cmake-utils_use_with python PyQt4)
 		$(cmake-utils_use_with python SIP)
 		$(cmake-utils_use_with gps libgps)
 		$(cmake-utils_use !kde QTONLY)
@@ -68,7 +70,6 @@ src_configure() {
 		-DBUILD_MARBLE_TESTS=OFF
 		-DWITH_liblocation=0
 		-DWITH_QextSerialPort=OFF
-		$(use kde && cmake-utils_use_with python PyKDE4)
 	)
 
 	kde4-base_src_configure

diff --git a/kde-base/marble/marble-9999.ebuild b/kde-base/marble/marble-9999.ebuild
index ddd7499..0cbfc54 100644
--- a/kde-base/marble/marble-9999.ebuild
+++ b/kde-base/marble/marble-9999.ebuild
@@ -8,13 +8,15 @@ KDE_HANDBOOK="optional"
 KDE_REQUIRED="optional"
 CPPUNIT_REQUIRED="optional"
 PYTHON_COMPAT=( python{2_6,2_7} )
-inherit kde4-base python-r1
+inherit kde4-base python-single-r1
 
 DESCRIPTION="Generic geographical map widget"
 HOMEPAGE="http://marble.kde.org/"
 KEYWORDS=""
 IUSE="debug designer-plugin gps +kde plasma python shapefile test zip"
 
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
 # tests fail / segfault. Last checked for 4.9.0
 RESTRICT="test"
 
@@ -50,15 +52,15 @@ REQUIRED_USE="
 
 pkg_setup() {
 	kde4-base_pkg_setup
-	python_setup
+	use python && python-single-r1_pkg_setup
 }
 
 src_configure() {
 	local mycmakeargs=(
 		$(cmake-utils_use_with designer-plugin DESIGNER_PLUGIN)
 		$(cmake-utils_use python EXPERIMENTAL_PYTHON_BINDINGS)
-		$(cmake-utils_use_with python PyQt4)
 		$(cmake-utils_use_with python PythonLibrary)
+		$(cmake-utils_use_with python PyQt4)
 		$(cmake-utils_use_with python SIP)
 		$(cmake-utils_use_with gps libgps)
 		$(cmake-utils_use !kde QTONLY)
@@ -68,7 +70,6 @@ src_configure() {
 		-DBUILD_MARBLE_TESTS=OFF
 		-DWITH_liblocation=0
 		-DWITH_QextSerialPort=OFF
-		$(use kde && cmake-utils_use_with python PyKDE4)
 	)
 
 	kde4-base_src_configure


^ permalink raw reply related	[flat|nested] 28+ messages in thread
* [gentoo-commits] proj/kde:master commit in: kde-base/marble/
@ 2014-01-06  2:30 Chris Reffett
  0 siblings, 0 replies; 28+ messages in thread
From: Chris Reffett @ 2014-01-06  2:30 UTC (permalink / raw
  To: gentoo-commits

commit:     d942fffa250075400ccb4f28491f6a558b8def65
Author:     Chris Reffett <creffett <AT> gentoo <DOT> org>
AuthorDate: Mon Jan  6 02:29:16 2014 +0000
Commit:     Chris Reffett <creffett <AT> gentoo <DOT> org>
CommitDate: Mon Jan  6 02:29:16 2014 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=d942fffa

[kde-base/marble] Convert to python-r1.eclass

Package-Manager: portage-2.2.7

---
 kde-base/marble/marble-4.11.49.9999.ebuild | 17 ++++++-----------
 kde-base/marble/marble-4.11.5.ebuild       | 17 ++++++-----------
 kde-base/marble/marble-4.12.49.9999.ebuild | 17 ++++++-----------
 kde-base/marble/marble-9999.ebuild         | 17 ++++++-----------
 4 files changed, 24 insertions(+), 44 deletions(-)

diff --git a/kde-base/marble/marble-4.11.49.9999.ebuild b/kde-base/marble/marble-4.11.49.9999.ebuild
index 69d003c..ddd7499 100644
--- a/kde-base/marble/marble-4.11.49.9999.ebuild
+++ b/kde-base/marble/marble-4.11.49.9999.ebuild
@@ -7,8 +7,8 @@ EAPI=5
 KDE_HANDBOOK="optional"
 KDE_REQUIRED="optional"
 CPPUNIT_REQUIRED="optional"
-PYTHON_DEPEND="python? 2"
-inherit kde4-base python
+PYTHON_COMPAT=( python{2_6,2_7} )
+inherit kde4-base python-r1
 
 DESCRIPTION="Generic geographical map widget"
 HOMEPAGE="http://marble.kde.org/"
@@ -29,8 +29,9 @@ RDEPEND="
 	dev-qt/qtwebkit:4
 	gps? ( >=sci-geosciences/gpsd-2.95[qt4] )
 	python? (
-		>=dev-python/PyQt4-4.4.4-r1
-		kde? ( $(add_kdebase_dep pykde4) )
+		${PYTHON_DEPS}
+		>=dev-python/PyQt4-4.4.4-r1[${PYTHON_USEDEP}]
+		kde? ( $(add_kdebase_dep pykde4 "${PYTHON_USEDEP}" ) )
 	)
 	shapefile? ( sci-libs/shapelib )
 	zip? ( dev-libs/quazip )
@@ -48,14 +49,8 @@ REQUIRED_USE="
 "
 
 pkg_setup() {
-	python_set_active_version 2
 	kde4-base_pkg_setup
-	python_pkg_setup
-}
-
-src_prepare() {
-	kde4-base_src_prepare
-	python_convert_shebangs -r $(python_get_version) .
+	python_setup
 }
 
 src_configure() {

diff --git a/kde-base/marble/marble-4.11.5.ebuild b/kde-base/marble/marble-4.11.5.ebuild
index adc21b3..a24a36e 100644
--- a/kde-base/marble/marble-4.11.5.ebuild
+++ b/kde-base/marble/marble-4.11.5.ebuild
@@ -7,8 +7,8 @@ EAPI=5
 KDE_HANDBOOK="optional"
 KDE_REQUIRED="optional"
 CPPUNIT_REQUIRED="optional"
-PYTHON_DEPEND="python? 2"
-inherit kde4-base python
+PYTHON_COMPAT=( python{2_6,2_7} )
+inherit kde4-base python-r1
 
 DESCRIPTION="Generic geographical map widget"
 HOMEPAGE="http://marble.kde.org/"
@@ -29,8 +29,9 @@ RDEPEND="
 	dev-qt/qtwebkit:4
 	gps? ( >=sci-geosciences/gpsd-2.95[qt4] )
 	python? (
-		>=dev-python/PyQt4-4.4.4-r1
-		kde? ( $(add_kdebase_dep pykde4) )
+		${PYTHON_DEPS}
+		>=dev-python/PyQt4-4.4.4-r1[${PYTHON_USEDEP}]
+		kde? ( $(add_kdebase_dep pykde4 "${PYTHON_USEDEP}" ) )
 	)
 	shapefile? ( sci-libs/shapelib )
 	zip? ( dev-libs/quazip )
@@ -48,14 +49,8 @@ REQUIRED_USE="
 "
 
 pkg_setup() {
-	python_set_active_version 2
 	kde4-base_pkg_setup
-	python_pkg_setup
-}
-
-src_prepare() {
-	kde4-base_src_prepare
-	python_convert_shebangs -r $(python_get_version) .
+	python_setup
 }
 
 src_configure() {

diff --git a/kde-base/marble/marble-4.12.49.9999.ebuild b/kde-base/marble/marble-4.12.49.9999.ebuild
index 69d003c..ddd7499 100644
--- a/kde-base/marble/marble-4.12.49.9999.ebuild
+++ b/kde-base/marble/marble-4.12.49.9999.ebuild
@@ -7,8 +7,8 @@ EAPI=5
 KDE_HANDBOOK="optional"
 KDE_REQUIRED="optional"
 CPPUNIT_REQUIRED="optional"
-PYTHON_DEPEND="python? 2"
-inherit kde4-base python
+PYTHON_COMPAT=( python{2_6,2_7} )
+inherit kde4-base python-r1
 
 DESCRIPTION="Generic geographical map widget"
 HOMEPAGE="http://marble.kde.org/"
@@ -29,8 +29,9 @@ RDEPEND="
 	dev-qt/qtwebkit:4
 	gps? ( >=sci-geosciences/gpsd-2.95[qt4] )
 	python? (
-		>=dev-python/PyQt4-4.4.4-r1
-		kde? ( $(add_kdebase_dep pykde4) )
+		${PYTHON_DEPS}
+		>=dev-python/PyQt4-4.4.4-r1[${PYTHON_USEDEP}]
+		kde? ( $(add_kdebase_dep pykde4 "${PYTHON_USEDEP}" ) )
 	)
 	shapefile? ( sci-libs/shapelib )
 	zip? ( dev-libs/quazip )
@@ -48,14 +49,8 @@ REQUIRED_USE="
 "
 
 pkg_setup() {
-	python_set_active_version 2
 	kde4-base_pkg_setup
-	python_pkg_setup
-}
-
-src_prepare() {
-	kde4-base_src_prepare
-	python_convert_shebangs -r $(python_get_version) .
+	python_setup
 }
 
 src_configure() {

diff --git a/kde-base/marble/marble-9999.ebuild b/kde-base/marble/marble-9999.ebuild
index 69d003c..ddd7499 100644
--- a/kde-base/marble/marble-9999.ebuild
+++ b/kde-base/marble/marble-9999.ebuild
@@ -7,8 +7,8 @@ EAPI=5
 KDE_HANDBOOK="optional"
 KDE_REQUIRED="optional"
 CPPUNIT_REQUIRED="optional"
-PYTHON_DEPEND="python? 2"
-inherit kde4-base python
+PYTHON_COMPAT=( python{2_6,2_7} )
+inherit kde4-base python-r1
 
 DESCRIPTION="Generic geographical map widget"
 HOMEPAGE="http://marble.kde.org/"
@@ -29,8 +29,9 @@ RDEPEND="
 	dev-qt/qtwebkit:4
 	gps? ( >=sci-geosciences/gpsd-2.95[qt4] )
 	python? (
-		>=dev-python/PyQt4-4.4.4-r1
-		kde? ( $(add_kdebase_dep pykde4) )
+		${PYTHON_DEPS}
+		>=dev-python/PyQt4-4.4.4-r1[${PYTHON_USEDEP}]
+		kde? ( $(add_kdebase_dep pykde4 "${PYTHON_USEDEP}" ) )
 	)
 	shapefile? ( sci-libs/shapelib )
 	zip? ( dev-libs/quazip )
@@ -48,14 +49,8 @@ REQUIRED_USE="
 "
 
 pkg_setup() {
-	python_set_active_version 2
 	kde4-base_pkg_setup
-	python_pkg_setup
-}
-
-src_prepare() {
-	kde4-base_src_prepare
-	python_convert_shebangs -r $(python_get_version) .
+	python_setup
 }
 
 src_configure() {


^ permalink raw reply related	[flat|nested] 28+ messages in thread
* [gentoo-commits] proj/kde:master commit in: kde-base/marble/
@ 2013-09-08 13:13 Michael Palimaka
  0 siblings, 0 replies; 28+ messages in thread
From: Michael Palimaka @ 2013-09-08 13:13 UTC (permalink / raw
  To: gentoo-commits

commit:     8c006d00beae8aede7446b8f76f8d722e58786f8
Author:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
AuthorDate: Sun Sep  8 13:10:22 2013 +0000
Commit:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Sun Sep  8 13:10:22 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=8c006d00

[kde-base/marble] Sync with portage.

Package-Manager: portage-2.2.1

---
 kde-base/marble/marble-4.11.49.9999.ebuild | 3 ++-
 kde-base/marble/marble-9999.ebuild         | 3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/kde-base/marble/marble-4.11.49.9999.ebuild b/kde-base/marble/marble-4.11.49.9999.ebuild
index dc2df63..1aefbb8 100644
--- a/kde-base/marble/marble-4.11.49.9999.ebuild
+++ b/kde-base/marble/marble-4.11.49.9999.ebuild
@@ -20,8 +20,9 @@ RESTRICT="test"
 
 RDEPEND="
 	dev-qt/qtcore:4
+	dev-qt/qtdbus:4
 	dev-qt/qtdeclarative:4
-	dev-qt/qtgui:4[dbus(+)]
+	dev-qt/qtgui:4
 	dev-qt/qtscript:4
 	dev-qt/qtsql:4
 	dev-qt/qtsvg:4

diff --git a/kde-base/marble/marble-9999.ebuild b/kde-base/marble/marble-9999.ebuild
index dc2df63..1aefbb8 100644
--- a/kde-base/marble/marble-9999.ebuild
+++ b/kde-base/marble/marble-9999.ebuild
@@ -20,8 +20,9 @@ RESTRICT="test"
 
 RDEPEND="
 	dev-qt/qtcore:4
+	dev-qt/qtdbus:4
 	dev-qt/qtdeclarative:4
-	dev-qt/qtgui:4[dbus(+)]
+	dev-qt/qtgui:4
 	dev-qt/qtscript:4
 	dev-qt/qtsql:4
 	dev-qt/qtsvg:4


^ permalink raw reply related	[flat|nested] 28+ messages in thread
* [gentoo-commits] proj/kde:master commit in: kde-base/marble/
@ 2013-08-19 13:23 Michael Palimaka
  0 siblings, 0 replies; 28+ messages in thread
From: Michael Palimaka @ 2013-08-19 13:23 UTC (permalink / raw
  To: gentoo-commits

commit:     30ce1b3067ccb0dc3efeea99f212c95297c06b32
Author:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
AuthorDate: Mon Aug 19 13:21:03 2013 +0000
Commit:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Mon Aug 19 13:21:03 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=30ce1b30

[kde-base/marble] Fix automagic dependency wrt bug #481608.

Package-Manager: portage-2.2.0

---
 kde-base/marble/marble-4.11.49.9999.ebuild | 4 +++-
 kde-base/marble/marble-9999.ebuild         | 4 +++-
 kde-base/marble/metadata.xml               | 1 +
 3 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/kde-base/marble/marble-4.11.49.9999.ebuild b/kde-base/marble/marble-4.11.49.9999.ebuild
index a7cd421..dc2df63 100644
--- a/kde-base/marble/marble-4.11.49.9999.ebuild
+++ b/kde-base/marble/marble-4.11.49.9999.ebuild
@@ -13,7 +13,7 @@ inherit kde4-base python
 DESCRIPTION="Generic geographical map widget"
 HOMEPAGE="http://marble.kde.org/"
 KEYWORDS=""
-IUSE="debug designer-plugin gps +kde plasma python shapefile test"
+IUSE="debug designer-plugin gps +kde plasma python shapefile test zip"
 
 # tests fail / segfault. Last checked for 4.9.0
 RESTRICT="test"
@@ -32,6 +32,7 @@ RDEPEND="
 		kde? ( $(add_kdebase_dep pykde4) )
 	)
 	shapefile? ( sci-libs/shapelib )
+	zip? ( dev-libs/quazip )
 "
 DEPEND="
 	${RDEPEND}
@@ -67,6 +68,7 @@ src_configure() {
 		$(cmake-utils_use !kde QTONLY)
 		$(cmake-utils_use_with plasma)
 		$(cmake-utils_use_with shapefile libshp)
+		$(cmake-utils_use_with zip quazip)
 		-DBUILD_MARBLE_TESTS=OFF
 		-DWITH_liblocation=0
 		-DWITH_QextSerialPort=OFF

diff --git a/kde-base/marble/marble-9999.ebuild b/kde-base/marble/marble-9999.ebuild
index a7cd421..dc2df63 100644
--- a/kde-base/marble/marble-9999.ebuild
+++ b/kde-base/marble/marble-9999.ebuild
@@ -13,7 +13,7 @@ inherit kde4-base python
 DESCRIPTION="Generic geographical map widget"
 HOMEPAGE="http://marble.kde.org/"
 KEYWORDS=""
-IUSE="debug designer-plugin gps +kde plasma python shapefile test"
+IUSE="debug designer-plugin gps +kde plasma python shapefile test zip"
 
 # tests fail / segfault. Last checked for 4.9.0
 RESTRICT="test"
@@ -32,6 +32,7 @@ RDEPEND="
 		kde? ( $(add_kdebase_dep pykde4) )
 	)
 	shapefile? ( sci-libs/shapelib )
+	zip? ( dev-libs/quazip )
 "
 DEPEND="
 	${RDEPEND}
@@ -67,6 +68,7 @@ src_configure() {
 		$(cmake-utils_use !kde QTONLY)
 		$(cmake-utils_use_with plasma)
 		$(cmake-utils_use_with shapefile libshp)
+		$(cmake-utils_use_with zip quazip)
 		-DBUILD_MARBLE_TESTS=OFF
 		-DWITH_liblocation=0
 		-DWITH_QextSerialPort=OFF

diff --git a/kde-base/marble/metadata.xml b/kde-base/marble/metadata.xml
index 90fe1d9..bb57c89 100644
--- a/kde-base/marble/metadata.xml
+++ b/kde-base/marble/metadata.xml
@@ -4,6 +4,7 @@
 <use>
 	<flag name="designer-plugin">Enable designer plugin</flag>
 	<flag name="shapefile">Enable support for ESRI shapefiles</flag>
+	<flag name="zip">Enable support for reading and displaying .kmz files</flag>
 </use>
 <herd>kde</herd>
 </pkgmetadata>


^ permalink raw reply related	[flat|nested] 28+ messages in thread
* [gentoo-commits] proj/kde:master commit in: kde-base/marble/
@ 2013-07-31 16:39 Johannes Huber
  0 siblings, 0 replies; 28+ messages in thread
From: Johannes Huber @ 2013-07-31 16:39 UTC (permalink / raw
  To: gentoo-commits

commit:     0bac7cf35443e998075797fc2d4faf4c56bc1056
Author:     Johannes Huber <johu <AT> gentoo <DOT> org>
AuthorDate: Wed Jul 31 16:38:39 2013 +0000
Commit:     Johannes Huber <johu <AT> gentoo <DOT> org>
CommitDate: Wed Jul 31 16:38:39 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=0bac7cf3

[kde-base/marble] Update HOMEPAGE wrt bug #478512.

Package-Manager: portage-2.2.0_alpha191

---
 kde-base/marble/marble-4.10.97.ebuild      | 1 +
 kde-base/marble/marble-4.11.49.9999.ebuild | 1 +
 kde-base/marble/marble-9999.ebuild         | 1 +
 3 files changed, 3 insertions(+)

diff --git a/kde-base/marble/marble-4.10.97.ebuild b/kde-base/marble/marble-4.10.97.ebuild
index 4dc3a55..7be9399 100644
--- a/kde-base/marble/marble-4.10.97.ebuild
+++ b/kde-base/marble/marble-4.10.97.ebuild
@@ -11,6 +11,7 @@ PYTHON_DEPEND="python? 2"
 inherit kde4-base python
 
 DESCRIPTION="Generic geographical map widget"
+HOMEPAGE="http://marble.kde.org/"
 KEYWORDS=" ~amd64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="debug designer-plugin gps +kde plasma python shapefile test"
 

diff --git a/kde-base/marble/marble-4.11.49.9999.ebuild b/kde-base/marble/marble-4.11.49.9999.ebuild
index 12feae8..a7cd421 100644
--- a/kde-base/marble/marble-4.11.49.9999.ebuild
+++ b/kde-base/marble/marble-4.11.49.9999.ebuild
@@ -11,6 +11,7 @@ PYTHON_DEPEND="python? 2"
 inherit kde4-base python
 
 DESCRIPTION="Generic geographical map widget"
+HOMEPAGE="http://marble.kde.org/"
 KEYWORDS=""
 IUSE="debug designer-plugin gps +kde plasma python shapefile test"
 

diff --git a/kde-base/marble/marble-9999.ebuild b/kde-base/marble/marble-9999.ebuild
index 12feae8..a7cd421 100644
--- a/kde-base/marble/marble-9999.ebuild
+++ b/kde-base/marble/marble-9999.ebuild
@@ -11,6 +11,7 @@ PYTHON_DEPEND="python? 2"
 inherit kde4-base python
 
 DESCRIPTION="Generic geographical map widget"
+HOMEPAGE="http://marble.kde.org/"
 KEYWORDS=""
 IUSE="debug designer-plugin gps +kde plasma python shapefile test"
 


^ permalink raw reply related	[flat|nested] 28+ messages in thread
* [gentoo-commits] proj/kde:master commit in: kde-base/marble/
@ 2013-04-13 17:06 Michael Palimaka
  0 siblings, 0 replies; 28+ messages in thread
From: Michael Palimaka @ 2013-04-13 17:06 UTC (permalink / raw
  To: gentoo-commits

commit:     a669b8cc112738cf615d95acd1e87a461efcc1ee
Author:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
AuthorDate: Sat Apr 13 15:45:08 2013 +0000
Commit:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Sat Apr 13 15:45:08 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=a669b8cc

[kde-base/marble] Disable broken support for QextSerialPort to avoid build failure wrt bug #465382.

Package-Manager: portage-2.1.11.62

---
 kde-base/marble/marble-4.10.49.9999.ebuild |    1 +
 kde-base/marble/marble-9999.ebuild         |    1 +
 2 files changed, 2 insertions(+), 0 deletions(-)

diff --git a/kde-base/marble/marble-4.10.49.9999.ebuild b/kde-base/marble/marble-4.10.49.9999.ebuild
index 7efe2ba..8ffc717 100644
--- a/kde-base/marble/marble-4.10.49.9999.ebuild
+++ b/kde-base/marble/marble-4.10.49.9999.ebuild
@@ -68,6 +68,7 @@ src_configure() {
 		$(cmake-utils_use_with shapefile libshp)
 		-DBUILD_MARBLE_TESTS=OFF
 		-DWITH_liblocation=0
+		-DWITH_QextSerialPort=OFF
 		$(use kde && cmake-utils_use_with python PyKDE4)
 	)
 

diff --git a/kde-base/marble/marble-9999.ebuild b/kde-base/marble/marble-9999.ebuild
index 7efe2ba..8ffc717 100644
--- a/kde-base/marble/marble-9999.ebuild
+++ b/kde-base/marble/marble-9999.ebuild
@@ -68,6 +68,7 @@ src_configure() {
 		$(cmake-utils_use_with shapefile libshp)
 		-DBUILD_MARBLE_TESTS=OFF
 		-DWITH_liblocation=0
+		-DWITH_QextSerialPort=OFF
 		$(use kde && cmake-utils_use_with python PyKDE4)
 	)
 


^ permalink raw reply related	[flat|nested] 28+ messages in thread
* [gentoo-commits] proj/kde:master commit in: kde-base/marble/
@ 2012-08-02 16:59 Michael Palimaka
  0 siblings, 0 replies; 28+ messages in thread
From: Michael Palimaka @ 2012-08-02 16:59 UTC (permalink / raw
  To: gentoo-commits

commit:     4626358b278084a48b0bde42276245543b38caca
Author:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
AuthorDate: Thu Aug  2 16:58:12 2012 +0000
Commit:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Thu Aug  2 16:58:12 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=4626358b

[kde-base/marble] Fix comment.

(Portage version: 2.1.11.9/git/Linux x86_64, unsigned Manifest commit)

---
 kde-base/marble/marble-4.8.49.9999.ebuild |    2 +-
 kde-base/marble/marble-4.8.5.ebuild       |    2 +-
 kde-base/marble/marble-4.9.49.9999.ebuild |    2 +-
 kde-base/marble/marble-9999.ebuild        |    2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/kde-base/marble/marble-4.8.49.9999.ebuild b/kde-base/marble/marble-4.8.49.9999.ebuild
index 81b1e1a..2bd013c 100644
--- a/kde-base/marble/marble-4.8.49.9999.ebuild
+++ b/kde-base/marble/marble-4.8.49.9999.ebuild
@@ -37,7 +37,7 @@ DEPEND="
 	test? ( x11-libs/qt-test:4 )
 "
 # the qt dependencies are needed because with USE=-kde nothing is pulled in
-# by default... bugs 414165 & 414165
+# by default... bugs 414165 & 429346
 
 REQUIRED_USE="
 	plasma? ( kde )

diff --git a/kde-base/marble/marble-4.8.5.ebuild b/kde-base/marble/marble-4.8.5.ebuild
index d471c5f..3502eae 100644
--- a/kde-base/marble/marble-4.8.5.ebuild
+++ b/kde-base/marble/marble-4.8.5.ebuild
@@ -37,7 +37,7 @@ DEPEND="
 	test? ( x11-libs/qt-test:4 )
 "
 # the qt dependencies are needed because with USE=-kde nothing is pulled in
-# by default... bugs 414165 & 414165
+# by default... bugs 414165 & 429346
 
 REQUIRED_USE="
 	plasma? ( kde )

diff --git a/kde-base/marble/marble-4.9.49.9999.ebuild b/kde-base/marble/marble-4.9.49.9999.ebuild
index 81b1e1a..2bd013c 100644
--- a/kde-base/marble/marble-4.9.49.9999.ebuild
+++ b/kde-base/marble/marble-4.9.49.9999.ebuild
@@ -37,7 +37,7 @@ DEPEND="
 	test? ( x11-libs/qt-test:4 )
 "
 # the qt dependencies are needed because with USE=-kde nothing is pulled in
-# by default... bugs 414165 & 414165
+# by default... bugs 414165 & 429346
 
 REQUIRED_USE="
 	plasma? ( kde )

diff --git a/kde-base/marble/marble-9999.ebuild b/kde-base/marble/marble-9999.ebuild
index 81b1e1a..2bd013c 100644
--- a/kde-base/marble/marble-9999.ebuild
+++ b/kde-base/marble/marble-9999.ebuild
@@ -37,7 +37,7 @@ DEPEND="
 	test? ( x11-libs/qt-test:4 )
 "
 # the qt dependencies are needed because with USE=-kde nothing is pulled in
-# by default... bugs 414165 & 414165
+# by default... bugs 414165 & 429346
 
 REQUIRED_USE="
 	plasma? ( kde )


^ permalink raw reply related	[flat|nested] 28+ messages in thread
* [gentoo-commits] proj/kde:master commit in: kde-base/marble/
@ 2012-08-02 16:45 Michael Palimaka
  0 siblings, 0 replies; 28+ messages in thread
From: Michael Palimaka @ 2012-08-02 16:45 UTC (permalink / raw
  To: gentoo-commits

commit:     06531b5838944f8a0cb0cfd4e5320fb66ffba813
Author:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
AuthorDate: Thu Aug  2 16:44:27 2012 +0000
Commit:     Michael Palimaka <kensington <AT> gentoo <DOT> 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 <bash.vi <AT> 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
 }


^ permalink raw reply related	[flat|nested] 28+ messages in thread
* [gentoo-commits] proj/kde:master commit in: kde-base/marble/
@ 2012-07-14 18:01 Michael Palimaka
  0 siblings, 0 replies; 28+ messages in thread
From: Michael Palimaka @ 2012-07-14 18:01 UTC (permalink / raw
  To: gentoo-commits

commit:     70a6d52349b502856e4bcf74ef96d7441af7ebd6
Author:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
AuthorDate: Sat Jul 14 17:58:41 2012 +0000
Commit:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Sat Jul 14 17:58:41 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=70a6d523

[kde-base/marble] Add Qt slot deps.

(Portage version: 2.1.11.5/git/Linux x86_64, unsigned Manifest commit)

---
 kde-base/marble/marble-4.8.49.9999.ebuild |    8 ++++----
 kde-base/marble/marble-4.8.95.ebuild      |    8 ++++----
 kde-base/marble/marble-4.8.97.ebuild      |    8 ++++----
 kde-base/marble/marble-4.9.49.9999.ebuild |    8 ++++----
 kde-base/marble/marble-9999.ebuild        |    8 ++++----
 5 files changed, 20 insertions(+), 20 deletions(-)

diff --git a/kde-base/marble/marble-4.8.49.9999.ebuild b/kde-base/marble/marble-4.8.49.9999.ebuild
index 0351efb..2d28dbe 100644
--- a/kde-base/marble/marble-4.8.49.9999.ebuild
+++ b/kde-base/marble/marble-4.8.49.9999.ebuild
@@ -19,10 +19,10 @@ IUSE="debug designer-plugin gps +kde plasma python"
 # RESTRICT=test
 
 DEPEND="
-	x11-libs/qt-core
-	x11-libs/qt-gui[dbus]
-	x11-libs/qt-script
-	x11-libs/qt-webkit
+	x11-libs/qt-core:4
+	x11-libs/qt-gui:4[dbus]
+	x11-libs/qt-script:4
+	x11-libs/qt-webkit:4
 	gps? ( >=sci-geosciences/gpsd-2.95[qt4] )
 	python? (
 		>=dev-python/PyQt4-4.4.4-r1

diff --git a/kde-base/marble/marble-4.8.95.ebuild b/kde-base/marble/marble-4.8.95.ebuild
index e491ef6..8ff65c1 100644
--- a/kde-base/marble/marble-4.8.95.ebuild
+++ b/kde-base/marble/marble-4.8.95.ebuild
@@ -19,10 +19,10 @@ IUSE="debug designer-plugin gps +kde plasma python"
 # RESTRICT=test
 
 DEPEND="
-	x11-libs/qt-core
-	x11-libs/qt-gui[dbus]
-	x11-libs/qt-script
-	x11-libs/qt-webkit
+	x11-libs/qt-core:4
+	x11-libs/qt-gui:4[dbus]
+	x11-libs/qt-script:4
+	x11-libs/qt-webkit:4
 	gps? ( >=sci-geosciences/gpsd-2.95[qt4] )
 	python? (
 		>=dev-python/PyQt4-4.4.4-r1

diff --git a/kde-base/marble/marble-4.8.97.ebuild b/kde-base/marble/marble-4.8.97.ebuild
index e491ef6..8ff65c1 100644
--- a/kde-base/marble/marble-4.8.97.ebuild
+++ b/kde-base/marble/marble-4.8.97.ebuild
@@ -19,10 +19,10 @@ IUSE="debug designer-plugin gps +kde plasma python"
 # RESTRICT=test
 
 DEPEND="
-	x11-libs/qt-core
-	x11-libs/qt-gui[dbus]
-	x11-libs/qt-script
-	x11-libs/qt-webkit
+	x11-libs/qt-core:4
+	x11-libs/qt-gui:4[dbus]
+	x11-libs/qt-script:4
+	x11-libs/qt-webkit:4
 	gps? ( >=sci-geosciences/gpsd-2.95[qt4] )
 	python? (
 		>=dev-python/PyQt4-4.4.4-r1

diff --git a/kde-base/marble/marble-4.9.49.9999.ebuild b/kde-base/marble/marble-4.9.49.9999.ebuild
index 0351efb..2d28dbe 100644
--- a/kde-base/marble/marble-4.9.49.9999.ebuild
+++ b/kde-base/marble/marble-4.9.49.9999.ebuild
@@ -19,10 +19,10 @@ IUSE="debug designer-plugin gps +kde plasma python"
 # RESTRICT=test
 
 DEPEND="
-	x11-libs/qt-core
-	x11-libs/qt-gui[dbus]
-	x11-libs/qt-script
-	x11-libs/qt-webkit
+	x11-libs/qt-core:4
+	x11-libs/qt-gui:4[dbus]
+	x11-libs/qt-script:4
+	x11-libs/qt-webkit:4
 	gps? ( >=sci-geosciences/gpsd-2.95[qt4] )
 	python? (
 		>=dev-python/PyQt4-4.4.4-r1

diff --git a/kde-base/marble/marble-9999.ebuild b/kde-base/marble/marble-9999.ebuild
index 0351efb..2d28dbe 100644
--- a/kde-base/marble/marble-9999.ebuild
+++ b/kde-base/marble/marble-9999.ebuild
@@ -19,10 +19,10 @@ IUSE="debug designer-plugin gps +kde plasma python"
 # RESTRICT=test
 
 DEPEND="
-	x11-libs/qt-core
-	x11-libs/qt-gui[dbus]
-	x11-libs/qt-script
-	x11-libs/qt-webkit
+	x11-libs/qt-core:4
+	x11-libs/qt-gui:4[dbus]
+	x11-libs/qt-script:4
+	x11-libs/qt-webkit:4
 	gps? ( >=sci-geosciences/gpsd-2.95[qt4] )
 	python? (
 		>=dev-python/PyQt4-4.4.4-r1



^ permalink raw reply related	[flat|nested] 28+ messages in thread
* [gentoo-commits] proj/kde:master commit in: kde-base/marble/
@ 2012-07-06 20:54 Andreas Hüttel
  0 siblings, 0 replies; 28+ messages in thread
From: Andreas Hüttel @ 2012-07-06 20:54 UTC (permalink / raw
  To: gentoo-commits

commit:     228492c3e25970499556c9197412233a4dd61880
Author:     Andreas K. Huettel (dilfridge) <mail <AT> akhuettel <DOT> de>
AuthorDate: Fri Jul  6 20:55:08 2012 +0000
Commit:     Andreas Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Fri Jul  6 20:55:22 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=228492c3

[kde-base/marble] Add manual qt dependencies for the USE=-kde case, bug 414165

(Portage version: 2.2.0_alpha116/git/Linux x86_64, unsigned Manifest commit)

---
 kde-base/marble/marble-4.8.49.9999.ebuild |    6 ++++++
 kde-base/marble/marble-4.8.95.ebuild      |    6 ++++++
 kde-base/marble/marble-4.9.49.9999.ebuild |    6 ++++++
 kde-base/marble/marble-9999.ebuild        |    6 ++++++
 4 files changed, 24 insertions(+), 0 deletions(-)

diff --git a/kde-base/marble/marble-4.8.49.9999.ebuild b/kde-base/marble/marble-4.8.49.9999.ebuild
index cbe9698..0351efb 100644
--- a/kde-base/marble/marble-4.8.49.9999.ebuild
+++ b/kde-base/marble/marble-4.8.49.9999.ebuild
@@ -19,6 +19,10 @@ IUSE="debug designer-plugin gps +kde plasma python"
 # RESTRICT=test
 
 DEPEND="
+	x11-libs/qt-core
+	x11-libs/qt-gui[dbus]
+	x11-libs/qt-script
+	x11-libs/qt-webkit
 	gps? ( >=sci-geosciences/gpsd-2.95[qt4] )
 	python? (
 		>=dev-python/PyQt4-4.4.4-r1
@@ -27,6 +31,8 @@ DEPEND="
 "
 RDEPEND="${DEPEND}
 "
+# the qt dependencies are needed because with USE=-kde nothing is pulled in
+# by default... bug 414165
 
 REQUIRED_USE="
 	plasma? ( kde )

diff --git a/kde-base/marble/marble-4.8.95.ebuild b/kde-base/marble/marble-4.8.95.ebuild
index 49bd9e0..e491ef6 100644
--- a/kde-base/marble/marble-4.8.95.ebuild
+++ b/kde-base/marble/marble-4.8.95.ebuild
@@ -19,6 +19,10 @@ IUSE="debug designer-plugin gps +kde plasma python"
 # RESTRICT=test
 
 DEPEND="
+	x11-libs/qt-core
+	x11-libs/qt-gui[dbus]
+	x11-libs/qt-script
+	x11-libs/qt-webkit
 	gps? ( >=sci-geosciences/gpsd-2.95[qt4] )
 	python? (
 		>=dev-python/PyQt4-4.4.4-r1
@@ -27,6 +31,8 @@ DEPEND="
 "
 RDEPEND="${DEPEND}
 "
+# the qt dependencies are needed because with USE=-kde nothing is pulled in
+# by default... bug 414165
 
 REQUIRED_USE="
 	plasma? ( kde )

diff --git a/kde-base/marble/marble-4.9.49.9999.ebuild b/kde-base/marble/marble-4.9.49.9999.ebuild
index cbe9698..0351efb 100644
--- a/kde-base/marble/marble-4.9.49.9999.ebuild
+++ b/kde-base/marble/marble-4.9.49.9999.ebuild
@@ -19,6 +19,10 @@ IUSE="debug designer-plugin gps +kde plasma python"
 # RESTRICT=test
 
 DEPEND="
+	x11-libs/qt-core
+	x11-libs/qt-gui[dbus]
+	x11-libs/qt-script
+	x11-libs/qt-webkit
 	gps? ( >=sci-geosciences/gpsd-2.95[qt4] )
 	python? (
 		>=dev-python/PyQt4-4.4.4-r1
@@ -27,6 +31,8 @@ DEPEND="
 "
 RDEPEND="${DEPEND}
 "
+# the qt dependencies are needed because with USE=-kde nothing is pulled in
+# by default... bug 414165
 
 REQUIRED_USE="
 	plasma? ( kde )

diff --git a/kde-base/marble/marble-9999.ebuild b/kde-base/marble/marble-9999.ebuild
index cbe9698..0351efb 100644
--- a/kde-base/marble/marble-9999.ebuild
+++ b/kde-base/marble/marble-9999.ebuild
@@ -19,6 +19,10 @@ IUSE="debug designer-plugin gps +kde plasma python"
 # RESTRICT=test
 
 DEPEND="
+	x11-libs/qt-core
+	x11-libs/qt-gui[dbus]
+	x11-libs/qt-script
+	x11-libs/qt-webkit
 	gps? ( >=sci-geosciences/gpsd-2.95[qt4] )
 	python? (
 		>=dev-python/PyQt4-4.4.4-r1
@@ -27,6 +31,8 @@ DEPEND="
 "
 RDEPEND="${DEPEND}
 "
+# the qt dependencies are needed because with USE=-kde nothing is pulled in
+# by default... bug 414165
 
 REQUIRED_USE="
 	plasma? ( kde )



^ permalink raw reply related	[flat|nested] 28+ messages in thread
* [gentoo-commits] proj/kde:master commit in: kde-base/marble/
@ 2012-06-28 12:11 Michael Palimaka
  0 siblings, 0 replies; 28+ messages in thread
From: Michael Palimaka @ 2012-06-28 12:11 UTC (permalink / raw
  To: gentoo-commits

commit:     1bdccd0506962120ea551b8c41c25d94924bf56d
Author:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
AuthorDate: Thu Jun 28 12:09:37 2012 +0000
Commit:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Thu Jun 28 12:09:37 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=1bdccd05

[kde-base/marble] Remove 4.8.80 that somehow reappeared when bumping 4.9.49.9999.

(Portage version: 2.1.11.3/git/Linux x86_64, unsigned Manifest commit)

---
 kde-base/marble/marble-4.8.80.ebuild |   70 ----------------------------------
 1 files changed, 0 insertions(+), 70 deletions(-)

diff --git a/kde-base/marble/marble-4.8.80.ebuild b/kde-base/marble/marble-4.8.80.ebuild
deleted file mode 100644
index 49bd9e0..0000000
--- a/kde-base/marble/marble-4.8.80.ebuild
+++ /dev/null
@@ -1,70 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=4
-
-KDE_HANDBOOK="optional"
-KDE_REQUIRED="optional"
-CPPUNIT_REQUIRED="optional"
-PYTHON_DEPEND="python? 2"
-KDE_SCM="git"
-inherit kde4-base python
-
-DESCRIPTION="Generic geographical map widget"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="debug designer-plugin gps +kde plasma python"
-
-# tests fail / segfault. Last checked for 4.2.88
-# RESTRICT=test
-
-DEPEND="
-	gps? ( >=sci-geosciences/gpsd-2.95[qt4] )
-	python? (
-		>=dev-python/PyQt4-4.4.4-r1
-		kde? ( $(add_kdebase_dep pykde4) )
-	)
-"
-RDEPEND="${DEPEND}
-"
-
-REQUIRED_USE="
-	plasma? ( kde )
-	python? ( kde )
-"
-
-pkg_setup() {
-	python_set_active_version 2
-	kde4-base_pkg_setup
-	python_pkg_setup
-}
-
-src_prepare() {
-	kde4-base_src_prepare
-	python_convert_shebangs -r $(python_get_version) .
-}
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake-utils_use_with designer-plugin DESIGNER_PLUGIN)
-		$(cmake-utils_use python EXPERIMENTAL_PYTHON_BINDINGS)
-		$(cmake-utils_use_with python PyQt4)
-		$(cmake-utils_use_with python PythonLibrary)
-		$(cmake-utils_use_with python SIP)
-		$(cmake-utils_use_with gps libgps)
-		$(cmake-utils_use !kde QTONLY)
-		$(cmake-utils_use_with plasma)
-		-DWITH_liblocation=0
-		$(use kde && cmake-utils_use_with python PyKDE4)
-	)
-
-	kde4-base_src_configure
-}
-
-src_test() {
-	if use kde; then
-		elog "Marble tests can only be run in the qt-only version"
-	else
-		kde4-base_src_test
-	fi
-}



^ permalink raw reply related	[flat|nested] 28+ messages in thread
* [gentoo-commits] proj/kde:master commit in: kde-base/marble/
@ 2012-05-04 20:44 Johannes Huber
  0 siblings, 0 replies; 28+ messages in thread
From: Johannes Huber @ 2012-05-04 20:44 UTC (permalink / raw
  To: gentoo-commits

commit:     15b12359f84cece96aa054863ba28979ce334268
Author:     Johannes Huber <johu <AT> gentoo <DOT> org>
AuthorDate: Fri May  4 20:43:49 2012 +0000
Commit:     Johannes Huber <johu <AT> gentoo <DOT> org>
CommitDate: Fri May  4 20:43:49 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=15b12359

[kde-base/marble] Remove useless sed which fails and produces an 'no input files' message. The cause of the sed is fixed upstream since 2008/11/16. Fixes bug #414635.

(Portage version: 2.2.0_alpha101/git/Linux x86_64, unsigned Manifest commit)

---
 kde-base/marble/marble-4.8.49.9999.ebuild |    2 --
 kde-base/marble/marble-9999.ebuild        |    2 --
 2 files changed, 0 insertions(+), 4 deletions(-)

diff --git a/kde-base/marble/marble-4.8.49.9999.ebuild b/kde-base/marble/marble-4.8.49.9999.ebuild
index e7711d2..cbe9698 100644
--- a/kde-base/marble/marble-4.8.49.9999.ebuild
+++ b/kde-base/marble/marble-4.8.49.9999.ebuild
@@ -42,8 +42,6 @@ pkg_setup() {
 src_prepare() {
 	kde4-base_src_prepare
 	python_convert_shebangs -r $(python_get_version) .
-
-	find "${S}/marble/src/bindings/python/sip" -name "*.sip" | xargs -- sed -i 's/#include <marble\//#include </'
 }
 
 src_configure() {

diff --git a/kde-base/marble/marble-9999.ebuild b/kde-base/marble/marble-9999.ebuild
index e7711d2..cbe9698 100644
--- a/kde-base/marble/marble-9999.ebuild
+++ b/kde-base/marble/marble-9999.ebuild
@@ -42,8 +42,6 @@ pkg_setup() {
 src_prepare() {
 	kde4-base_src_prepare
 	python_convert_shebangs -r $(python_get_version) .
-
-	find "${S}/marble/src/bindings/python/sip" -name "*.sip" | xargs -- sed -i 's/#include <marble\//#include </'
 }
 
 src_configure() {



^ permalink raw reply related	[flat|nested] 28+ messages in thread
* [gentoo-commits] proj/kde:master commit in: kde-base/marble/
@ 2012-05-01 11:21 Johannes Huber
  0 siblings, 0 replies; 28+ messages in thread
From: Johannes Huber @ 2012-05-01 11:21 UTC (permalink / raw
  To: gentoo-commits

commit:     80e88ad560e256fd6a6b4747b6d4d28519295e06
Author:     Johannes Huber <johu <AT> gentoo <DOT> org>
AuthorDate: Tue May  1 11:16:30 2012 +0000
Commit:     Johannes Huber <johu <AT> gentoo <DOT> org>
CommitDate: Tue May  1 11:16:30 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=80e88ad5

[kde-base/marble] Cleanup header.

(Portage version: 2.2.0_alpha101/git/Linux x86_64, unsigned Manifest commit)

---
 kde-base/marble/marble-4.8.3.ebuild       |    2 +-
 kde-base/marble/marble-4.8.49.9999.ebuild |    2 +-
 kde-base/marble/marble-9999.ebuild        |    2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/kde-base/marble/marble-4.8.3.ebuild b/kde-base/marble/marble-4.8.3.ebuild
index 0a2340d..797d12e 100644
--- a/kde-base/marble/marble-4.8.3.ebuild
+++ b/kde-base/marble/marble-4.8.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/marble/marble-4.7.3.ebuild,v 1.2 2011/11/03 10:52:25 tampakrap Exp $
+# $Header: $
 
 EAPI=4
 

diff --git a/kde-base/marble/marble-4.8.49.9999.ebuild b/kde-base/marble/marble-4.8.49.9999.ebuild
index 3348d07..e7711d2 100644
--- a/kde-base/marble/marble-4.8.49.9999.ebuild
+++ b/kde-base/marble/marble-4.8.49.9999.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/marble/marble-4.7.3.ebuild,v 1.2 2011/11/03 10:52:25 tampakrap Exp $
+# $Header: $
 
 EAPI=4
 

diff --git a/kde-base/marble/marble-9999.ebuild b/kde-base/marble/marble-9999.ebuild
index 3348d07..e7711d2 100644
--- a/kde-base/marble/marble-9999.ebuild
+++ b/kde-base/marble/marble-9999.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/marble/marble-4.7.3.ebuild,v 1.2 2011/11/03 10:52:25 tampakrap Exp $
+# $Header: $
 
 EAPI=4
 



^ permalink raw reply related	[flat|nested] 28+ messages in thread
* [gentoo-commits] proj/kde:master commit in: kde-base/marble/
@ 2012-03-23  9:59 Johannes Huber
  0 siblings, 0 replies; 28+ messages in thread
From: Johannes Huber @ 2012-03-23  9:59 UTC (permalink / raw
  To: gentoo-commits

commit:     240c2dd86b505677880092c5313495783513befb
Author:     Johannes Huber <johu <AT> gentoo <DOT> org>
AuthorDate: Fri Mar 23 09:52:38 2012 +0000
Commit:     Johannes Huber <johu <AT> gentoo <DOT> org>
CommitDate: Fri Mar 23 09:59:00 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=240c2dd8

[kde-base/marble] Add required use by Ian Delaney <johneed <AT> hotmail.com> fixes bug 405469.

(Portage version: 2.2.0_alpha93/git/Linux x86_64, unsigned Manifest commit)

---
 kde-base/marble/marble-4.8.49.9999.ebuild |    5 ++++-
 kde-base/marble/marble-9999.ebuild        |    5 ++++-
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/kde-base/marble/marble-4.8.49.9999.ebuild b/kde-base/marble/marble-4.8.49.9999.ebuild
index f5c21eb..3348d07 100644
--- a/kde-base/marble/marble-4.8.49.9999.ebuild
+++ b/kde-base/marble/marble-4.8.49.9999.ebuild
@@ -28,7 +28,10 @@ DEPEND="
 RDEPEND="${DEPEND}
 "
 
-REQUIRED_USE="plasma? ( kde )"
+REQUIRED_USE="
+	plasma? ( kde )
+	python? ( kde )
+"
 
 pkg_setup() {
 	python_set_active_version 2

diff --git a/kde-base/marble/marble-9999.ebuild b/kde-base/marble/marble-9999.ebuild
index f5c21eb..3348d07 100644
--- a/kde-base/marble/marble-9999.ebuild
+++ b/kde-base/marble/marble-9999.ebuild
@@ -28,7 +28,10 @@ DEPEND="
 RDEPEND="${DEPEND}
 "
 
-REQUIRED_USE="plasma? ( kde )"
+REQUIRED_USE="
+	plasma? ( kde )
+	python? ( kde )
+"
 
 pkg_setup() {
 	python_set_active_version 2



^ permalink raw reply related	[flat|nested] 28+ messages in thread
* [gentoo-commits] proj/kde:master commit in: kde-base/marble/
@ 2012-01-08 13:54 Johannes Huber
  0 siblings, 0 replies; 28+ messages in thread
From: Johannes Huber @ 2012-01-08 13:54 UTC (permalink / raw
  To: gentoo-commits

commit:     78129e90bf1c4497c4dc4272d1a727bfec398b19
Author:     Johannes Huber <johu <AT> gentoo <DOT> org>
AuthorDate: Sun Jan  8 13:53:15 2012 +0000
Commit:     Johannes Huber <johu <AT> gentoo <DOT> org>
CommitDate: Sun Jan  8 13:53:15 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=78129e90

[kde-base/marble] Fix whitespace.

(Portage version: 2.2.0_alpha84/git/Linux x86_64, unsigned Manifest commit)

---
 kde-base/marble/marble-4.7.97.ebuild      |    2 +-
 kde-base/marble/marble-4.8.49.9999.ebuild |    2 +-
 kde-base/marble/marble-9999.ebuild        |    2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/kde-base/marble/marble-4.7.97.ebuild b/kde-base/marble/marble-4.7.97.ebuild
index 70919cb..03dc69f 100644
--- a/kde-base/marble/marble-4.7.97.ebuild
+++ b/kde-base/marble/marble-4.7.97.ebuild
@@ -61,7 +61,7 @@ src_configure() {
 }
 
 src_test() {
-	if use kde; then 
+	if use kde; then
 		elog "Marble tests can only be run in the qt-only version"
 	else
 		kde4-base_src_test

diff --git a/kde-base/marble/marble-4.8.49.9999.ebuild b/kde-base/marble/marble-4.8.49.9999.ebuild
index e8e8f67..c092028 100644
--- a/kde-base/marble/marble-4.8.49.9999.ebuild
+++ b/kde-base/marble/marble-4.8.49.9999.ebuild
@@ -61,7 +61,7 @@ src_configure() {
 }
 
 src_test() {
-	if use kde; then 
+	if use kde; then
 		elog "Marble tests can only be run in the qt-only version"
 	else
 		kde4-base_src_test

diff --git a/kde-base/marble/marble-9999.ebuild b/kde-base/marble/marble-9999.ebuild
index e8e8f67..c092028 100644
--- a/kde-base/marble/marble-9999.ebuild
+++ b/kde-base/marble/marble-9999.ebuild
@@ -61,7 +61,7 @@ src_configure() {
 }
 
 src_test() {
-	if use kde; then 
+	if use kde; then
 		elog "Marble tests can only be run in the qt-only version"
 	else
 		kde4-base_src_test



^ permalink raw reply related	[flat|nested] 28+ messages in thread
* [gentoo-commits] proj/kde:master commit in: kde-base/marble/
@ 2011-12-11 14:07 Andreas Hüttel
  0 siblings, 0 replies; 28+ messages in thread
From: Andreas Hüttel @ 2011-12-11 14:07 UTC (permalink / raw
  To: gentoo-commits

commit:     16a4889aa9d0165bcb2dfa12fed5340e15df538b
Author:     Andreas K. Huettel (dilfridge) <dilfridge <AT> gentoo <DOT> org>
AuthorDate: Sun Dec 11 14:08:55 2011 +0000
Commit:     Andreas Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Sun Dec 11 14:08:55 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=16a4889a

[kde-base/marble] Try the tests again (after talking to upstream)

(Portage version: 2.1.10.40/git/Linux x86_64, unsigned Manifest commit)

---
 kde-base/marble/marble-4.7.90.ebuild |   10 +++++++++-
 kde-base/marble/marble-9999.ebuild   |   10 +++++++++-
 2 files changed, 18 insertions(+), 2 deletions(-)

diff --git a/kde-base/marble/marble-4.7.90.ebuild b/kde-base/marble/marble-4.7.90.ebuild
index 2b2b0a5..70919cb 100644
--- a/kde-base/marble/marble-4.7.90.ebuild
+++ b/kde-base/marble/marble-4.7.90.ebuild
@@ -16,7 +16,7 @@ KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="debug designer-plugin gps +kde plasma python"
 
 # tests fail / segfault. Last checked for 4.2.88
-RESTRICT=test
+# RESTRICT=test
 
 DEPEND="
 	gps? ( >=sci-geosciences/gpsd-2.95[qt4] )
@@ -59,3 +59,11 @@ src_configure() {
 
 	kde4-base_src_configure
 }
+
+src_test() {
+	if use kde; then 
+		elog "Marble tests can only be run in the qt-only version"
+	else
+		kde4-base_src_test
+	fi
+}

diff --git a/kde-base/marble/marble-9999.ebuild b/kde-base/marble/marble-9999.ebuild
index 3671cd4..e8e8f67 100644
--- a/kde-base/marble/marble-9999.ebuild
+++ b/kde-base/marble/marble-9999.ebuild
@@ -16,7 +16,7 @@ KEYWORDS=""
 IUSE="debug designer-plugin gps +kde plasma python"
 
 # tests fail / segfault. Last checked for 4.2.88
-RESTRICT=test
+# RESTRICT=test
 
 DEPEND="
 	gps? ( >=sci-geosciences/gpsd-2.95[qt4] )
@@ -59,3 +59,11 @@ src_configure() {
 
 	kde4-base_src_configure
 }
+
+src_test() {
+	if use kde; then 
+		elog "Marble tests can only be run in the qt-only version"
+	else
+		kde4-base_src_test
+	fi
+}



^ permalink raw reply related	[flat|nested] 28+ messages in thread
* [gentoo-commits] proj/kde:master commit in: kde-base/marble/
@ 2011-11-07  8:33 Alexey Shvetsov
  0 siblings, 0 replies; 28+ messages in thread
From: Alexey Shvetsov @ 2011-11-07  8:33 UTC (permalink / raw
  To: gentoo-commits

commit:     3a48425db15483d6a6b2132d58de8b37f689dc1f
Author:     Alexey Shvetsov <alexxy <AT> gentoo <DOT> org>
AuthorDate: Mon Nov  7 08:32:43 2011 +0000
Commit:     Alexey Shvetsov <alexxy <AT> gentoo <DOT> org>
CommitDate: Mon Nov  7 08:32:43 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=3a48425d

[kde-base/marble] Patch was merged

(Portage version: 2.2.0_alpha72/git/Linux x86_64, unsigned Manifest commit)

---
 kde-base/marble/marble-9999.ebuild |    4 ----
 1 files changed, 0 insertions(+), 4 deletions(-)

diff --git a/kde-base/marble/marble-9999.ebuild b/kde-base/marble/marble-9999.ebuild
index e66e234..3671cd4 100644
--- a/kde-base/marble/marble-9999.ebuild
+++ b/kde-base/marble/marble-9999.ebuild
@@ -30,10 +30,6 @@ RDEPEND="${DEPEND}
 
 REQUIRED_USE="plasma? ( kde )"
 
-PATCHES=(
-	"${FILESDIR}/${PN}-4.7-magic-r1.patch"
-)
-
 pkg_setup() {
 	python_set_active_version 2
 	kde4-base_pkg_setup



^ permalink raw reply related	[flat|nested] 28+ messages in thread
* [gentoo-commits] proj/kde:master commit in: kde-base/marble/
@ 2011-11-03 17:11 Andreas Hüttel
  0 siblings, 0 replies; 28+ messages in thread
From: Andreas Hüttel @ 2011-11-03 17:11 UTC (permalink / raw
  To: gentoo-commits

commit:     b782d52008d0096712edc86497ce04693d774e12
Author:     Andreas K. Huettel <andreas.huettel <AT> physik <DOT> uni-r <DOT> de>
AuthorDate: Thu Nov  3 17:10:17 2011 +0000
Commit:     Andreas Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Thu Nov  3 17:10:17 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=b782d520

[kde-base/marble] Dont try to install non-existing FindMarbleWidget.cmake

(Portage version: 2.1.10.32/git/Linux x86_64, signed Manifest commit with key 7887F787)

---
 kde-base/marble/marble-4.7.49.9999.ebuild |   10 +---------
 kde-base/marble/marble-9999.ebuild        |   10 ++++++++--
 2 files changed, 9 insertions(+), 11 deletions(-)

diff --git a/kde-base/marble/marble-4.7.49.9999.ebuild b/kde-base/marble/marble-4.7.49.9999.ebuild
index bf31559..e66e234 100644
--- a/kde-base/marble/marble-4.7.49.9999.ebuild
+++ b/kde-base/marble/marble-4.7.49.9999.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/marble/marble-4.7.0-r1.ebuild,v 1.1 2011/07/31 18:24:35 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/marble/marble-4.7.3.ebuild,v 1.2 2011/11/03 10:52:25 tampakrap Exp $
 
 EAPI=4
 
@@ -63,11 +63,3 @@ src_configure() {
 
 	kde4-base_src_configure
 }
-
-src_install() {
-	if use plasma; then
-		insinto /usr/share/apps/cmake/modules
-		doins "${S}"/cmake/modules/FindMarbleWidget.cmake
-	fi
-	kde4-base_src_install
-}

diff --git a/kde-base/marble/marble-9999.ebuild b/kde-base/marble/marble-9999.ebuild
index b4f1435..e66e234 100644
--- a/kde-base/marble/marble-9999.ebuild
+++ b/kde-base/marble/marble-9999.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/marble/marble-4.7.0-r1.ebuild,v 1.1 2011/07/31 18:24:35 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/marble/marble-4.7.3.ebuild,v 1.2 2011/11/03 10:52:25 tampakrap Exp $
 
 EAPI=4
 
@@ -30,6 +30,10 @@ RDEPEND="${DEPEND}
 
 REQUIRED_USE="plasma? ( kde )"
 
+PATCHES=(
+	"${FILESDIR}/${PN}-4.7-magic-r1.patch"
+)
+
 pkg_setup() {
 	python_set_active_version 2
 	kde4-base_pkg_setup
@@ -39,10 +43,12 @@ pkg_setup() {
 src_prepare() {
 	kde4-base_src_prepare
 	python_convert_shebangs -r $(python_get_version) .
+
+	find "${S}/marble/src/bindings/python/sip" -name "*.sip" | xargs -- sed -i 's/#include <marble\//#include </'
 }
 
 src_configure() {
-	mycmakeargs=(
+	local mycmakeargs=(
 		$(cmake-utils_use_with designer-plugin DESIGNER_PLUGIN)
 		$(cmake-utils_use python EXPERIMENTAL_PYTHON_BINDINGS)
 		$(cmake-utils_use_with python PyQt4)



^ permalink raw reply related	[flat|nested] 28+ messages in thread
* [gentoo-commits] proj/kde:master commit in: kde-base/marble/
@ 2011-10-25 17:56 Alexey Shvetsov
  0 siblings, 0 replies; 28+ messages in thread
From: Alexey Shvetsov @ 2011-10-25 17:56 UTC (permalink / raw
  To: gentoo-commits

commit:     af4471838c878bdb8021a3dba2b11908e86bb953
Author:     Alexey Shvetsov <alexxy <AT> gentoo <DOT> org>
AuthorDate: Tue Oct 25 17:55:02 2011 +0000
Commit:     Alexey Shvetsov <alexxy <AT> gentoo <DOT> org>
CommitDate: Tue Oct 25 17:55:02 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=af447183

[kde-base/marble] drop src_install for :live

(Portage version: 2.2.0_alpha71/git/Linux x86_64, signed Manifest commit with key F82F92E6)

---
 kde-base/marble/marble-9999.ebuild |    8 --------
 1 files changed, 0 insertions(+), 8 deletions(-)

diff --git a/kde-base/marble/marble-9999.ebuild b/kde-base/marble/marble-9999.ebuild
index 181d881..b947cca 100644
--- a/kde-base/marble/marble-9999.ebuild
+++ b/kde-base/marble/marble-9999.ebuild
@@ -59,11 +59,3 @@ src_configure() {
 
 	kde4-base_src_configure
 }
-
-src_install() {
-	if use plasma; then
-		insinto /usr/share/apps/cmake/modules
-		doins "${S}"/cmake/modules/FindMarbleWidget.cmake
-	fi
-	kde4-base_src_install
-}



^ permalink raw reply related	[flat|nested] 28+ messages in thread
* [gentoo-commits] proj/kde:master commit in: kde-base/marble/
@ 2011-10-25 17:50 Alexey Shvetsov
  0 siblings, 0 replies; 28+ messages in thread
From: Alexey Shvetsov @ 2011-10-25 17:50 UTC (permalink / raw
  To: gentoo-commits

commit:     9652af493c7434f1d90d31afc61dc30b383ec728
Author:     Alexey Shvetsov <alexxy <AT> gentoo <DOT> org>
AuthorDate: Tue Oct 25 17:47:56 2011 +0000
Commit:     Alexey Shvetsov <alexxy <AT> gentoo <DOT> org>
CommitDate: Tue Oct 25 17:47:56 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=9652af49

[kde-base/marble] Fix die python_pkg_setup() not called

(Portage version: 2.2.0_alpha71/git/Linux x86_64, signed Manifest commit with key F82F92E6)

---
 kde-base/marble/marble-4.7.49.9999.ebuild |    1 +
 kde-base/marble/marble-9999.ebuild        |    1 +
 2 files changed, 2 insertions(+), 0 deletions(-)

diff --git a/kde-base/marble/marble-4.7.49.9999.ebuild b/kde-base/marble/marble-4.7.49.9999.ebuild
index 07f0ae1..bf31559 100644
--- a/kde-base/marble/marble-4.7.49.9999.ebuild
+++ b/kde-base/marble/marble-4.7.49.9999.ebuild
@@ -37,6 +37,7 @@ PATCHES=(
 pkg_setup() {
 	python_set_active_version 2
 	kde4-base_pkg_setup
+	python_pkg_setup
 }
 
 src_prepare() {

diff --git a/kde-base/marble/marble-9999.ebuild b/kde-base/marble/marble-9999.ebuild
index e517c4c..181d881 100644
--- a/kde-base/marble/marble-9999.ebuild
+++ b/kde-base/marble/marble-9999.ebuild
@@ -33,6 +33,7 @@ REQUIRED_USE="plasma? ( kde )"
 pkg_setup() {
 	python_set_active_version 2
 	kde4-base_pkg_setup
+	python_pkg_setup
 }
 
 src_prepare() {



^ permalink raw reply related	[flat|nested] 28+ messages in thread
* [gentoo-commits] proj/kde:master commit in: kde-base/marble/
@ 2011-10-16 20:17 Andreas Hüttel
  0 siblings, 0 replies; 28+ messages in thread
From: Andreas Hüttel @ 2011-10-16 20:17 UTC (permalink / raw
  To: gentoo-commits

commit:     edf1c3404fd3ed4631a8df81fada4d97ec4a55a4
Author:     Andreas K. Huettel (dilfridge) <mail <AT> akhuettel <DOT> de>
AuthorDate: Sun Oct 16 20:17:55 2011 +0000
Commit:     Andreas Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Sun Oct 16 20:17:55 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=edf1c340

[kde-base/marble] no patching in live

(Portage version: 2.1.10.27/git/Linux x86_64, signed Manifest commit with key B6C5F7DE)

---
 kde-base/marble/marble-9999.ebuild |    4 ----
 1 files changed, 0 insertions(+), 4 deletions(-)

diff --git a/kde-base/marble/marble-9999.ebuild b/kde-base/marble/marble-9999.ebuild
index 37acfd7..9d936ac 100644
--- a/kde-base/marble/marble-9999.ebuild
+++ b/kde-base/marble/marble-9999.ebuild
@@ -28,10 +28,6 @@ DEPEND="
 RDEPEND="${DEPEND}
 "
 
-PATCHES=(
-			"${FILESDIR}/${PN}-4.7-magic-r1.patch"
-)
-
 pkg_setup() {
 	python_set_active_version 2
 	kde4-base_pkg_setup



^ permalink raw reply related	[flat|nested] 28+ messages in thread
* [gentoo-commits] proj/kde:master commit in: kde-base/marble/
@ 2011-09-07 21:43 Alexey Shvetsov
  0 siblings, 0 replies; 28+ messages in thread
From: Alexey Shvetsov @ 2011-09-07 21:43 UTC (permalink / raw
  To: gentoo-commits

commit:     4298191fcbfb84822dc27dcd5e98993fb8fcf2a2
Author:     Alexey Shvetsov <alexxy <AT> gentoo <DOT> org>
AuthorDate: Wed Sep  7 21:35:05 2011 +0000
Commit:     Alexey Shvetsov <alexxy <AT> gentoo <DOT> org>
CommitDate: Wed Sep  7 21:35:05 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=4298191f

[kde-base/marble] Drop old blockers

(Portage version: 2.2.0_alpha54/git/Linux x86_64, signed Manifest commit with key F82F92E6)

---
 kde-base/marble/marble-4.7.49.9999.ebuild |    1 -
 kde-base/marble/marble-9999.ebuild        |    1 -
 2 files changed, 0 insertions(+), 2 deletions(-)

diff --git a/kde-base/marble/marble-4.7.49.9999.ebuild b/kde-base/marble/marble-4.7.49.9999.ebuild
index 2646f51..e5d263b 100644
--- a/kde-base/marble/marble-4.7.49.9999.ebuild
+++ b/kde-base/marble/marble-4.7.49.9999.ebuild
@@ -26,7 +26,6 @@ DEPEND="
 	)
 "
 RDEPEND="${DEPEND}
-	!sci-geosciences/marble
 "
 
 PATCHES=(

diff --git a/kde-base/marble/marble-9999.ebuild b/kde-base/marble/marble-9999.ebuild
index 2646f51..e5d263b 100644
--- a/kde-base/marble/marble-9999.ebuild
+++ b/kde-base/marble/marble-9999.ebuild
@@ -26,7 +26,6 @@ DEPEND="
 	)
 "
 RDEPEND="${DEPEND}
-	!sci-geosciences/marble
 "
 
 PATCHES=(



^ permalink raw reply related	[flat|nested] 28+ messages in thread
* [gentoo-commits] proj/kde:master commit in: kde-base/marble/
@ 2011-05-30  4:54 Jorge Manuel B. S. Vicetto
  0 siblings, 0 replies; 28+ messages in thread
From: Jorge Manuel B. S. Vicetto @ 2011-05-30  4:54 UTC (permalink / raw
  To: gentoo-commits

commit:     304109dcd04be0428d1e9bd5b6c5a5c1334d572e
Author:     Jorge Manuel B. S. Vicetto (jmbsvicetto) <jmbsvicetto <AT> gentoo <DOT> org>
AuthorDate: Mon May 30 04:29:55 2011 +0000
Commit:     Jorge Manuel B. S. Vicetto <jmbsvicetto <AT> gentoo <DOT> org>
CommitDate: Mon May 30 04:29:55 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=304109dc

[kde-base/marble] 4.6.80 version bump.

(Portage version: 2.2.0_alpha35/git/Linux x86_64, signed Manifest commit with key BB0E6E98)

---
 kde-base/marble/marble-4.6.80.ebuild |   68 ++++++++++++++++++++++++++++++++++
 1 files changed, 68 insertions(+), 0 deletions(-)

diff --git a/kde-base/marble/marble-4.6.80.ebuild b/kde-base/marble/marble-4.6.80.ebuild
new file mode 100644
index 0000000..0f301b1
--- /dev/null
+++ b/kde-base/marble/marble-4.6.80.ebuild
@@ -0,0 +1,68 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI="3"
+
+KDE_HANDBOOK="optional"
+CPPUNIT_REQUIRED="optional"
+PYTHON_DEPEND="python? 2"
+KDE_SCM="git"
+inherit kde4-base python
+
+DESCRIPTION="Generic geographical map widget"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="debug designer-plugin gps plasma python"
+
+# tests fail / segfault. Last checked for 4.2.88
+RESTRICT=test
+
+DEPEND="
+	gps? ( >=sci-geosciences/gpsd-2.95[qt4] )
+	python? (
+		>=dev-python/PyQt4-4.4.4-r1
+		$(add_kdebase_dep pykde4)
+	)
+"
+RDEPEND="${DEPEND}
+	!kdeprefix? ( !sci-geosciences/marble )
+"
+
+PATCHES=( "${FILESDIR}/${PN}-4.6.2-magic.patch" )
+# note that this patch will not work if we ever make a qt-only build
+
+pkg_setup() {
+	python_set_active_version 2
+	kde4-base_pkg_setup
+}
+
+src_prepare() {
+	kde4-base_src_prepare
+	python_convert_shebangs -r $(python_get_version) .
+}
+
+src_configure() {
+	mycmakeargs=(
+		$(cmake-utils_use_with designer-plugin DESIGNER_PLUGIN)
+		$(cmake-utils_use_with plasma)
+		$(cmake-utils_use python EXPERIMENTAL_PYTHON_BINDINGS)
+		$(cmake-utils_use_with python PyKDE4)
+		$(cmake-utils_use_with python PyQt4)
+		$(cmake-utils_use_with python PythonLibrary)
+		$(cmake-utils_use_with python SIP)
+		$(cmake-utils_use_with gps libgps)
+		-DWITH_liblocation=0
+	)
+
+	find "${S}/marble/src/bindings/python/sip" -name "*.sip" | xargs -- sed -i 's/#include <marble\//#include </'
+
+	kde4-base_src_configure
+}
+
+src_install() {
+	if use plasma; then
+		insinto "${KDEDIR}"/share/apps/cmake/modules
+		doins "${S}"/cmake/modules/FindMarbleWidget.cmake
+	fi
+	kde4-base_src_install
+}



^ permalink raw reply related	[flat|nested] 28+ messages in thread
* [gentoo-commits] proj/kde:master commit in: kde-base/marble/
@ 2011-04-11 19:14 Tomas Chvatal
  0 siblings, 0 replies; 28+ messages in thread
From: Tomas Chvatal @ 2011-04-11 19:14 UTC (permalink / raw
  To: gentoo-commits

commit:     68f8cbf78c7c64c4c89f0bf1ccb7c475f8dbb1a6
Author:     Tomas Chvatal <scarabeus <AT> gentoo <DOT> org>
AuthorDate: Mon Apr 11 19:14:13 2011 +0000
Commit:     Tomas Chvatal <scarabeus <AT> gentoo <DOT> org>
CommitDate: Mon Apr 11 19:14:13 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=68f8cbf7

[marble] Try to unfck the eclass calls.

---
 kde-base/marble/marble-4.6.9999.ebuild |   18 ++++++++++++------
 kde-base/marble/marble-9999.ebuild     |   14 +++++++-------
 2 files changed, 19 insertions(+), 13 deletions(-)

diff --git a/kde-base/marble/marble-4.6.9999.ebuild b/kde-base/marble/marble-4.6.9999.ebuild
index 8c5e769..2287ced 100644
--- a/kde-base/marble/marble-4.6.9999.ebuild
+++ b/kde-base/marble/marble-4.6.9999.ebuild
@@ -5,10 +5,16 @@
 EAPI=3
 
 KDE_HANDBOOK="optional"
-KMNAME="kdeedu"
 CPPUNIT_REQUIRED="optional"
 PYTHON_DEPEND="python? 2"
-inherit python kde4-meta
+if [[ ${PV} == *9999 ]]; then
+	KDE_SCM="git"
+	eclass="kde4-base"
+else
+	KMNAME="kdeedu"
+	eclass="kde4-meta"
+fi
+inherit ${eclass} python
 
 DESCRIPTION="Generic geographical map widget"
 KEYWORDS=""
@@ -33,11 +39,11 @@ PATCHES=( "${FILESDIR}/${PN}-4.6.2-magic.patch" )
 
 pkg_setup() {
 	python_set_active_version 2
-	kde4-meta_pkg_setup
+	${eclass}_pkg_setup
 }
 
 src_prepare() {
-	kde4-meta_src_prepare
+	${eclass}_src_prepare
 	python_convert_shebangs -r $(python_get_version) .
 }
 
@@ -56,7 +62,7 @@ src_configure() {
 
 	find "${S}/marble/src/bindings/python/sip" -name "*.sip" | xargs -- sed -i 's/#include <marble\//#include </'
 
-	kde4-meta_src_configure
+	${eclass}_src_configure
 }
 
 src_install() {
@@ -64,5 +70,5 @@ src_install() {
 		insinto "${KDEDIR}"/share/apps/cmake/modules
 		doins "${S}"/cmake/modules/FindMarbleWidget.cmake
 	fi
-	kde4-meta_src_install
+	${eclass}_src_install
 }

diff --git a/kde-base/marble/marble-9999.ebuild b/kde-base/marble/marble-9999.ebuild
index e4a4707..2287ced 100644
--- a/kde-base/marble/marble-9999.ebuild
+++ b/kde-base/marble/marble-9999.ebuild
@@ -9,12 +9,12 @@ CPPUNIT_REQUIRED="optional"
 PYTHON_DEPEND="python? 2"
 if [[ ${PV} == *9999 ]]; then
 	KDE_SCM="git"
-	inherit kde4-base
+	eclass="kde4-base"
 else
 	KMNAME="kdeedu"
-	inherit kde4-meta
+	eclass="kde4-meta"
 fi
-inherit python
+inherit ${eclass} python
 
 DESCRIPTION="Generic geographical map widget"
 KEYWORDS=""
@@ -39,11 +39,11 @@ PATCHES=( "${FILESDIR}/${PN}-4.6.2-magic.patch" )
 
 pkg_setup() {
 	python_set_active_version 2
-	kde4-meta_pkg_setup
+	${eclass}_pkg_setup
 }
 
 src_prepare() {
-	kde4-meta_src_prepare
+	${eclass}_src_prepare
 	python_convert_shebangs -r $(python_get_version) .
 }
 
@@ -62,7 +62,7 @@ src_configure() {
 
 	find "${S}/marble/src/bindings/python/sip" -name "*.sip" | xargs -- sed -i 's/#include <marble\//#include </'
 
-	kde4-meta_src_configure
+	${eclass}_src_configure
 }
 
 src_install() {
@@ -70,5 +70,5 @@ src_install() {
 		insinto "${KDEDIR}"/share/apps/cmake/modules
 		doins "${S}"/cmake/modules/FindMarbleWidget.cmake
 	fi
-	kde4-meta_src_install
+	${eclass}_src_install
 }



^ permalink raw reply related	[flat|nested] 28+ messages in thread
* [gentoo-commits] proj/kde:master commit in: kde-base/marble/
@ 2011-03-27  9:59 Tomas Chvatal
  0 siblings, 0 replies; 28+ messages in thread
From: Tomas Chvatal @ 2011-03-27  9:59 UTC (permalink / raw
  To: gentoo-commits

commit:     458a5bcf28d4f0f026b7020edbf932f91da72a36
Author:     Tomas Chvatal <scarabeus <AT> gentoo <DOT> org>
AuthorDate: Sun Mar 27 09:59:35 2011 +0000
Commit:     Tomas Chvatal <scarabeus <AT> gentoo <DOT> org>
CommitDate: Sun Mar 27 09:59:35 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=458a5bcf

[kde-base/marble] depend on gpsd[qt4], per bug #359877.

---
 kde-base/marble/marble-4.6.9999.ebuild |    2 +-
 kde-base/marble/marble-9999.ebuild     |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/kde-base/marble/marble-4.6.9999.ebuild b/kde-base/marble/marble-4.6.9999.ebuild
index 8e8ef4c..4011bb4 100644
--- a/kde-base/marble/marble-4.6.9999.ebuild
+++ b/kde-base/marble/marble-4.6.9999.ebuild
@@ -18,7 +18,7 @@ IUSE="debug designer-plugin gps plasma python"
 RESTRICT=test
 
 DEPEND="
-	gps? ( >=sci-geosciences/gpsd-2.95 )
+	gps? ( >=sci-geosciences/gpsd-2.95[qt4] )
 	python? (
 		>=dev-python/PyQt4-4.4.4-r1
 		$(add_kdebase_dep pykde4)

diff --git a/kde-base/marble/marble-9999.ebuild b/kde-base/marble/marble-9999.ebuild
index 8e8ef4c..4011bb4 100644
--- a/kde-base/marble/marble-9999.ebuild
+++ b/kde-base/marble/marble-9999.ebuild
@@ -18,7 +18,7 @@ IUSE="debug designer-plugin gps plasma python"
 RESTRICT=test
 
 DEPEND="
-	gps? ( >=sci-geosciences/gpsd-2.95 )
+	gps? ( >=sci-geosciences/gpsd-2.95[qt4] )
 	python? (
 		>=dev-python/PyQt4-4.4.4-r1
 		$(add_kdebase_dep pykde4)



^ permalink raw reply related	[flat|nested] 28+ messages in thread
end of thread, other threads:[~2014-09-18 18:10 UTC | newest]

Thread overview: 28+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-10-25 17:58 [gentoo-commits] proj/kde:master commit in: kde-base/marble/ Alexey Shvetsov
  -- strict thread matches above, loose matches on Subject: below --
2014-09-18 18:10 Michael Palimaka
2014-05-01 22:46 Johannes Huber
2014-01-18 17:45 Michael Palimaka
2014-01-06  2:30 Chris Reffett
2013-09-08 13:13 Michael Palimaka
2013-08-19 13:23 Michael Palimaka
2013-07-31 16:39 Johannes Huber
2013-04-13 17:06 Michael Palimaka
2012-08-02 16:59 Michael Palimaka
2012-08-02 16:45 Michael Palimaka
2012-07-14 18:01 Michael Palimaka
2012-07-06 20:54 Andreas Hüttel
2012-06-28 12:11 Michael Palimaka
2012-05-04 20:44 Johannes Huber
2012-05-01 11:21 Johannes Huber
2012-03-23  9:59 Johannes Huber
2012-01-08 13:54 Johannes Huber
2011-12-11 14:07 Andreas Hüttel
2011-11-07  8:33 Alexey Shvetsov
2011-11-03 17:11 Andreas Hüttel
2011-10-25 17:56 Alexey Shvetsov
2011-10-25 17:50 Alexey Shvetsov
2011-10-16 20:17 Andreas Hüttel
2011-09-07 21:43 Alexey Shvetsov
2011-05-30  4:54 Jorge Manuel B. S. Vicetto
2011-04-11 19:14 Tomas Chvatal
2011-03-27  9:59 Tomas Chvatal

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