[gentoo-commits] proj/kde:master commit in: kde-misc/pate/, kde-base/system-config-printer-kde/, kde-base/krosspython/, ...

[Jonathan Callen]

commit:     0cfcfccfccf6890c502680b90fb2dd81e8df0f4d
Author:     Jonathan Callen <abcd <AT> gentoo <DOT> org>
AuthorDate: Fri Oct 28 20:08:52 2011 +0000
Commit:     Jonathan Callen <abcd <AT> gentoo <DOT> org>
CommitDate: Fri Oct 28 20:08:52 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=0cfcfccf

Ensure that python_pkg_setup is always called in EAPI=4 packages that inherit python.eclass

---
 app-portage/kportagetray/kportagetray-0.2.4.ebuild |    1 +
 app-portage/kportagetray/kportagetray-9999.ebuild  |    1 +
 kde-base/kajongg/kajongg-4.7.49.9999.ebuild        |    5 +++++
 kde-base/kajongg/kajongg-9999.ebuild               |    5 +++++
 .../krosspython/krosspython-4.7.49.9999.ebuild     |    1 +
 kde-base/krosspython/krosspython-9999.ebuild       |    1 +
 kde-base/lokalize/lokalize-4.7.49.9999.ebuild      |    1 +
 kde-base/lokalize/lokalize-9999.ebuild             |    3 ++-
 .../superkaramba/superkaramba-4.7.49.9999.ebuild   |    3 ++-
 kde-base/superkaramba/superkaramba-9999.ebuild     |    3 ++-
 .../system-config-printer-kde-4.7.49.9999.ebuild   |    2 +-
 .../system-config-printer-kde-9999.ebuild          |    2 +-
 kde-misc/pate/pate-9999.ebuild                     |    1 +
 13 files changed, 24 insertions(+), 5 deletions(-)

diff --git a/app-portage/kportagetray/kportagetray-0.2.4.ebuild b/app-portage/kportagetray/kportagetray-0.2.4.ebuild
index 27da029..6840898 100644
--- a/app-portage/kportagetray/kportagetray-0.2.4.ebuild
+++ b/app-portage/kportagetray/kportagetray-0.2.4.ebuild
@@ -34,6 +34,7 @@ RDEPEND="${DEPEND}
 
 pkg_setup() {
 	python_set_active_version 2
+	python_pkg_setup
 	kde4-base_pkg_setup
 }
 

diff --git a/app-portage/kportagetray/kportagetray-9999.ebuild b/app-portage/kportagetray/kportagetray-9999.ebuild
index cafd6e9..81a1e6c 100644
--- a/app-portage/kportagetray/kportagetray-9999.ebuild
+++ b/app-portage/kportagetray/kportagetray-9999.ebuild
@@ -34,6 +34,7 @@ RDEPEND="${DEPEND}
 
 pkg_setup() {
 	python_set_active_version 2
+	python_pkg_setup
 	kde4-base_pkg_setup
 }
 

diff --git a/kde-base/kajongg/kajongg-4.7.49.9999.ebuild b/kde-base/kajongg/kajongg-4.7.49.9999.ebuild
index 4112b14..7d7bf43 100644
--- a/kde-base/kajongg/kajongg-4.7.49.9999.ebuild
+++ b/kde-base/kajongg/kajongg-4.7.49.9999.ebuild
@@ -21,3 +21,8 @@ RDEPEND="${DEPEND}
 	$(add_kdebase_dep libkmahjongg)
 	>=dev-python/twisted-8.2.0
 "
+
+pkg_setup() {
+	python_pkg_setup
+	kde4-meta_pkg_setup
+}

diff --git a/kde-base/kajongg/kajongg-9999.ebuild b/kde-base/kajongg/kajongg-9999.ebuild
index 4112b14..7d7bf43 100644
--- a/kde-base/kajongg/kajongg-9999.ebuild
+++ b/kde-base/kajongg/kajongg-9999.ebuild
@@ -21,3 +21,8 @@ RDEPEND="${DEPEND}
 	$(add_kdebase_dep libkmahjongg)
 	>=dev-python/twisted-8.2.0
 "
+
+pkg_setup() {
+	python_pkg_setup
+	kde4-meta_pkg_setup
+}

diff --git a/kde-base/krosspython/krosspython-4.7.49.9999.ebuild b/kde-base/krosspython/krosspython-4.7.49.9999.ebuild
index 0c329c7..77faf3c 100644
--- a/kde-base/krosspython/krosspython-4.7.49.9999.ebuild
+++ b/kde-base/krosspython/krosspython-4.7.49.9999.ebuild
@@ -16,5 +16,6 @@ IUSE="debug"
 
 pkg_setup() {
 	python_set_active_version 2
+	python_pkg_setup
 	kde4-meta_pkg_setup
 }

diff --git a/kde-base/krosspython/krosspython-9999.ebuild b/kde-base/krosspython/krosspython-9999.ebuild
index 0c329c7..77faf3c 100644
--- a/kde-base/krosspython/krosspython-9999.ebuild
+++ b/kde-base/krosspython/krosspython-9999.ebuild
@@ -16,5 +16,6 @@ IUSE="debug"
 
 pkg_setup() {
 	python_set_active_version 2
+	python_pkg_setup
 	kde4-meta_pkg_setup
 }

diff --git a/kde-base/lokalize/lokalize-4.7.49.9999.ebuild b/kde-base/lokalize/lokalize-4.7.49.9999.ebuild
index 5b51463..2f53da3 100644
--- a/kde-base/lokalize/lokalize-4.7.49.9999.ebuild
+++ b/kde-base/lokalize/lokalize-4.7.49.9999.ebuild
@@ -28,6 +28,7 @@ PATCHES=( "${FILESDIR}/${PN}"-4.6.5-hunspell.patch )
 
 pkg_setup() {
 	kde4-meta_pkg_setup
+	python_pkg_setup
 	python_set_active_version 2
 }
 

diff --git a/kde-base/lokalize/lokalize-9999.ebuild b/kde-base/lokalize/lokalize-9999.ebuild
index d335d14..bf79cec 100644
--- a/kde-base/lokalize/lokalize-9999.ebuild
+++ b/kde-base/lokalize/lokalize-9999.ebuild
@@ -25,8 +25,9 @@ RDEPEND="${DEPEND}
 "
 
 pkg_setup() {
-	kde4-meta_pkg_setup
 	python_set_active_version 2
+	python_pkg_setup
+	kde4-meta_pkg_setup
 }
 
 src_install() {

diff --git a/kde-base/superkaramba/superkaramba-4.7.49.9999.ebuild b/kde-base/superkaramba/superkaramba-4.7.49.9999.ebuild
index 717c33d..c0af792 100644
--- a/kde-base/superkaramba/superkaramba-4.7.49.9999.ebuild
+++ b/kde-base/superkaramba/superkaramba-4.7.49.9999.ebuild
@@ -29,8 +29,9 @@ RDEPEND="${DEPEND}
 PATCHES=( "${FILESDIR}/${PN}-as-needed.patch" )
 
 pkg_setup() {
-	${kde_eclass}_pkg_setup
 	python_set_active_version 2
+	python_pkg_setup
+	${kde_eclass}_pkg_setup
 }
 
 src_configure() {

diff --git a/kde-base/superkaramba/superkaramba-9999.ebuild b/kde-base/superkaramba/superkaramba-9999.ebuild
index ecbad99..d6178b8 100644
--- a/kde-base/superkaramba/superkaramba-9999.ebuild
+++ b/kde-base/superkaramba/superkaramba-9999.ebuild
@@ -23,8 +23,9 @@ RDEPEND="${DEPEND}
 PATCHES=( "${FILESDIR}/${PN}-as-needed.patch" )
 
 pkg_setup() {
-	kde4-base_pkg_setup
 	python_set_active_version 2
+	python_pkg_setup
+	kde4-base_pkg_setup
 }
 
 src_configure() {

diff --git a/kde-base/system-config-printer-kde/system-config-printer-kde-4.7.49.9999.ebuild b/kde-base/system-config-printer-kde/system-config-printer-kde-4.7.49.9999.ebuild
index d9465a3..50e9612 100644
--- a/kde-base/system-config-printer-kde/system-config-printer-kde-4.7.49.9999.ebuild
+++ b/kde-base/system-config-printer-kde/system-config-printer-kde-4.7.49.9999.ebuild
@@ -22,9 +22,9 @@ RDEPEND="${DEPEND}
 "
 
 pkg_setup() {
-	kde4-meta_pkg_setup
 	python_set_active_version 2
 	python_pkg_setup
+	kde4-meta_pkg_setup
 }
 
 src_install() {

diff --git a/kde-base/system-config-printer-kde/system-config-printer-kde-9999.ebuild b/kde-base/system-config-printer-kde/system-config-printer-kde-9999.ebuild
index d9465a3..50e9612 100644
--- a/kde-base/system-config-printer-kde/system-config-printer-kde-9999.ebuild
+++ b/kde-base/system-config-printer-kde/system-config-printer-kde-9999.ebuild
@@ -22,9 +22,9 @@ RDEPEND="${DEPEND}
 "
 
 pkg_setup() {
-	kde4-meta_pkg_setup
 	python_set_active_version 2
 	python_pkg_setup
+	kde4-meta_pkg_setup
 }
 
 src_install() {

diff --git a/kde-misc/pate/pate-9999.ebuild b/kde-misc/pate/pate-9999.ebuild
index 18c49f2..f25bbf4 100644
--- a/kde-misc/pate/pate-9999.ebuild
+++ b/kde-misc/pate/pate-9999.ebuild
@@ -25,5 +25,6 @@ RDEPEND="${DEPEND}"
 
 pkg_setup() {
 	python_set_active_version 2
+	python_pkg_setup
 	kde4-base_pkg_setup
 }