diff options
| author | Michael Palimaka <kensington@gentoo.org> | 2014-01-19 04:45:16 +1100 |
|---|---|---|
| committer | Michael Palimaka <kensington@gentoo.org> | 2014-01-19 04:45:16 +1100 |
| commit | 8650e385ead750d73793957ac8afc9086d6d6f29 (patch) | |
| tree | 0a598b6b99cd7de4f7651220744fac220f7c1594 | |
| parent | efd08f30b33902521438aaf2e717ccad9680778c (diff) | |
| download | kde-8650e385ead750d73793957ac8afc9086d6d6f29.tar.gz kde-8650e385ead750d73793957ac8afc9086d6d6f29.tar.bz2 kde-8650e385ead750d73793957ac8afc9086d6d6f29.zip | |
[kde-base/marble] Improve python handling a bit.
Package-Manager: portage-2.2.7
| -rw-r--r-- | kde-base/marble/marble-4.11.49.9999.ebuild | 9 | ||||
| -rw-r--r-- | kde-base/marble/marble-4.12.49.9999.ebuild | 9 | ||||
| -rw-r--r-- | 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 ddd7499aa67..0cbfc54e8d4 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 ddd7499aa67..0cbfc54e8d4 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 ddd7499aa67..0cbfc54e8d4 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 |