[gentoo-commits] proj/kde:master commit in: kde-base/marble/

public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed

From: "Michael Palimaka" <kensington@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] proj/kde:master commit in: kde-base/marble/
Date: Sat, 18 Jan 2014 17:45:32 +0000 (UTC)	[thread overview]
Message-ID: <1390067116.8650e385ead750d73793957ac8afc9086d6d6f29.kensington@gentoo> (raw)

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

next             reply	other threads:[~2014-01-18 17:45 UTC|newest]

Thread overview: 28+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2014-01-18 17:45 Michael Palimaka [this message]
  -- strict thread matches above, loose matches on Subject: below --
2014-09-18 18:10 [gentoo-commits] proj/kde:master commit in: kde-base/marble/ Michael Palimaka
2014-05-01 22:46 Johannes Huber
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:58 Alexey Shvetsov
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

find likely ancestor, descendant, or conflicting patches for this message:
( dfblob:ddd7499 dfblob:0cbfc54 dfblob:ddd7499 dfblob:0cbfc54
dfblob:ddd7499 dfblob:0cbfc54 )
 OR (
bs:"[gentoo-commits] proj/kde:master commit in: kde-base/marble/" )
	(help)

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1390067116.8650e385ead750d73793957ac8afc9086d6d6f29.kensington@gentoo \
    --to=kensington@gentoo.org \
    --cc=gentoo-commits@lists.gentoo.org \
    --cc=gentoo-dev@lists.gentoo.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link

Be sure your reply has a Subject: header at the top and a blank line before the message body.

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