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

["Michael Palimaka" <kensington@gentoo.org>]

commit:     d4bf958663d7ba80b14ee05e3abc962a201d7dbd
Author:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
AuthorDate: Wed May 29 15:48:53 2013 +0000
Commit:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Wed May 29 15:48:53 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=d4bf9586

[kde-base/superkaramba] Migrate to python-single-r1. Add missing dependencies.

Package-Manager: portage-2.1.12.2

---
 .../superkaramba/superkaramba-4.10.49.9999.ebuild    | 20 +++++++++++++-------
 kde-base/superkaramba/superkaramba-9999.ebuild       | 20 +++++++++++++-------
 2 files changed, 26 insertions(+), 14 deletions(-)

diff --git a/kde-base/superkaramba/superkaramba-4.10.49.9999.ebuild b/kde-base/superkaramba/superkaramba-4.10.49.9999.ebuild
index 9a450fa..917c16e 100644
--- a/kde-base/superkaramba/superkaramba-4.10.49.9999.ebuild
+++ b/kde-base/superkaramba/superkaramba-4.10.49.9999.ebuild
@@ -4,29 +4,35 @@
 
 EAPI=5
 
-PYTHON_DEPEND="python? 2"
-inherit python kde4-base
+PYTHON_COMPAT=( python{2_5,2_6,2_7} )
+inherit python-single-r1 kde4-base
 
 DESCRIPTION="A tool to create interactive applets for the KDE desktop."
 KEYWORDS=""
 IUSE="debug python"
 
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
 DEPEND="
 	media-libs/qimageblitz
-	python? ( $(add_kdebase_dep pykde4) )
+	x11-libs/libX11
+	x11-libs/libXrender
+	python? (
+		${PYTHON_DEPEND}
+		$(add_kdebase_dep pykde4 "${PYTHON_USEDEP}")
+	)
 "
 RDEPEND="${DEPEND}
-	python? ( $(add_kdebase_dep krosspython) )
+	python? ( $(add_kdebase_dep krosspython "${PYTHON_USEDEP}") )
 "
 
 pkg_setup() {
-	python_set_active_version 2
-	python_pkg_setup
+	python-single-r1_pkg_setup
 	kde4-base_pkg_setup
 }
 
 src_configure() {
-	mycmakeargs=(
+	local mycmakeargs=(
 		$(cmake-utils_use_with python PythonLibs)
 	)
 

diff --git a/kde-base/superkaramba/superkaramba-9999.ebuild b/kde-base/superkaramba/superkaramba-9999.ebuild
index 9a450fa..917c16e 100644
--- a/kde-base/superkaramba/superkaramba-9999.ebuild
+++ b/kde-base/superkaramba/superkaramba-9999.ebuild
@@ -4,29 +4,35 @@
 
 EAPI=5
 
-PYTHON_DEPEND="python? 2"
-inherit python kde4-base
+PYTHON_COMPAT=( python{2_5,2_6,2_7} )
+inherit python-single-r1 kde4-base
 
 DESCRIPTION="A tool to create interactive applets for the KDE desktop."
 KEYWORDS=""
 IUSE="debug python"
 
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
 DEPEND="
 	media-libs/qimageblitz
-	python? ( $(add_kdebase_dep pykde4) )
+	x11-libs/libX11
+	x11-libs/libXrender
+	python? (
+		${PYTHON_DEPEND}
+		$(add_kdebase_dep pykde4 "${PYTHON_USEDEP}")
+	)
 "
 RDEPEND="${DEPEND}
-	python? ( $(add_kdebase_dep krosspython) )
+	python? ( $(add_kdebase_dep krosspython "${PYTHON_USEDEP}") )
 "
 
 pkg_setup() {
-	python_set_active_version 2
-	python_pkg_setup
+	python-single-r1_pkg_setup
 	kde4-base_pkg_setup
 }
 
 src_configure() {
-	mycmakeargs=(
+	local mycmakeargs=(
 		$(cmake-utils_use_with python PythonLibs)
 	)