| 1 |
commit: d4bf958663d7ba80b14ee05e3abc962a201d7dbd |
| 2 |
Author: Michael Palimaka <kensington <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Wed May 29 15:48:53 2013 +0000 |
| 4 |
Commit: Michael Palimaka <kensington <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Wed May 29 15:48:53 2013 +0000 |
| 6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=d4bf9586 |
| 7 |
|
| 8 |
[kde-base/superkaramba] Migrate to python-single-r1. Add missing dependencies. |
| 9 |
|
| 10 |
Package-Manager: portage-2.1.12.2 |
| 11 |
|
| 12 |
--- |
| 13 |
.../superkaramba/superkaramba-4.10.49.9999.ebuild | 20 +++++++++++++------- |
| 14 |
kde-base/superkaramba/superkaramba-9999.ebuild | 20 +++++++++++++------- |
| 15 |
2 files changed, 26 insertions(+), 14 deletions(-) |
| 16 |
|
| 17 |
diff --git a/kde-base/superkaramba/superkaramba-4.10.49.9999.ebuild b/kde-base/superkaramba/superkaramba-4.10.49.9999.ebuild |
| 18 |
index 9a450fa..917c16e 100644 |
| 19 |
--- a/kde-base/superkaramba/superkaramba-4.10.49.9999.ebuild |
| 20 |
+++ b/kde-base/superkaramba/superkaramba-4.10.49.9999.ebuild |
| 21 |
@@ -4,29 +4,35 @@ |
| 22 |
|
| 23 |
EAPI=5 |
| 24 |
|
| 25 |
-PYTHON_DEPEND="python? 2" |
| 26 |
-inherit python kde4-base |
| 27 |
+PYTHON_COMPAT=( python{2_5,2_6,2_7} ) |
| 28 |
+inherit python-single-r1 kde4-base |
| 29 |
|
| 30 |
DESCRIPTION="A tool to create interactive applets for the KDE desktop." |
| 31 |
KEYWORDS="" |
| 32 |
IUSE="debug python" |
| 33 |
|
| 34 |
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" |
| 35 |
+ |
| 36 |
DEPEND=" |
| 37 |
media-libs/qimageblitz |
| 38 |
- python? ( $(add_kdebase_dep pykde4) ) |
| 39 |
+ x11-libs/libX11 |
| 40 |
+ x11-libs/libXrender |
| 41 |
+ python? ( |
| 42 |
+ ${PYTHON_DEPEND} |
| 43 |
+ $(add_kdebase_dep pykde4 "${PYTHON_USEDEP}") |
| 44 |
+ ) |
| 45 |
" |
| 46 |
RDEPEND="${DEPEND} |
| 47 |
- python? ( $(add_kdebase_dep krosspython) ) |
| 48 |
+ python? ( $(add_kdebase_dep krosspython "${PYTHON_USEDEP}") ) |
| 49 |
" |
| 50 |
|
| 51 |
pkg_setup() { |
| 52 |
- python_set_active_version 2 |
| 53 |
- python_pkg_setup |
| 54 |
+ python-single-r1_pkg_setup |
| 55 |
kde4-base_pkg_setup |
| 56 |
} |
| 57 |
|
| 58 |
src_configure() { |
| 59 |
- mycmakeargs=( |
| 60 |
+ local mycmakeargs=( |
| 61 |
$(cmake-utils_use_with python PythonLibs) |
| 62 |
) |
| 63 |
|
| 64 |
|
| 65 |
diff --git a/kde-base/superkaramba/superkaramba-9999.ebuild b/kde-base/superkaramba/superkaramba-9999.ebuild |
| 66 |
index 9a450fa..917c16e 100644 |
| 67 |
--- a/kde-base/superkaramba/superkaramba-9999.ebuild |
| 68 |
+++ b/kde-base/superkaramba/superkaramba-9999.ebuild |
| 69 |
@@ -4,29 +4,35 @@ |
| 70 |
|
| 71 |
EAPI=5 |
| 72 |
|
| 73 |
-PYTHON_DEPEND="python? 2" |
| 74 |
-inherit python kde4-base |
| 75 |
+PYTHON_COMPAT=( python{2_5,2_6,2_7} ) |
| 76 |
+inherit python-single-r1 kde4-base |
| 77 |
|
| 78 |
DESCRIPTION="A tool to create interactive applets for the KDE desktop." |
| 79 |
KEYWORDS="" |
| 80 |
IUSE="debug python" |
| 81 |
|
| 82 |
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" |
| 83 |
+ |
| 84 |
DEPEND=" |
| 85 |
media-libs/qimageblitz |
| 86 |
- python? ( $(add_kdebase_dep pykde4) ) |
| 87 |
+ x11-libs/libX11 |
| 88 |
+ x11-libs/libXrender |
| 89 |
+ python? ( |
| 90 |
+ ${PYTHON_DEPEND} |
| 91 |
+ $(add_kdebase_dep pykde4 "${PYTHON_USEDEP}") |
| 92 |
+ ) |
| 93 |
" |
| 94 |
RDEPEND="${DEPEND} |
| 95 |
- python? ( $(add_kdebase_dep krosspython) ) |
| 96 |
+ python? ( $(add_kdebase_dep krosspython "${PYTHON_USEDEP}") ) |
| 97 |
" |
| 98 |
|
| 99 |
pkg_setup() { |
| 100 |
- python_set_active_version 2 |
| 101 |
- python_pkg_setup |
| 102 |
+ python-single-r1_pkg_setup |
| 103 |
kde4-base_pkg_setup |
| 104 |
} |
| 105 |
|
| 106 |
src_configure() { |
| 107 |
- mycmakeargs=( |
| 108 |
+ local mycmakeargs=( |
| 109 |
$(cmake-utils_use_with python PythonLibs) |
| 110 |
) |
Archives