[gentoo-commits] proj/kde:master commit in: kde-base/pykde4/, Documentation/package.unmask/, ...

[gentoo-commits] proj/kde:master commit in: kde-base/pykde4/, Documentation/package.unmask/, ...

[Johannes Huber]

commit:     61f3959cb286a9c91e6f55cad3b42767ce2a3621
Author:     Johannes Huber <johu <AT> gentoo <DOT> org>
AuthorDate: Mon Jan  9 18:14:28 2012 +0000
Commit:     Johannes Huber <johu <AT> gentoo <DOT> org>
CommitDate: Mon Jan  9 18:15:24 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=61f3959c

[kde-base/pykde4] Bump deps, remove failing patch, bug #398223.

(Portage version: 2.2.0_alpha84/git/Linux x86_64, unsigned Manifest commit)

---
 .../package.keywords/.kde-live/kdedeps-live        |    4 ++++
 Documentation/package.keywords/kde-live.keywords   |    4 ++++
 Documentation/package.unmask/kde-live              |    4 ++++
 kde-base/pykde4/pykde4-4.8.49.9999.ebuild          |    4 ----
 kde-base/pykde4/pykde4-9999.ebuild                 |   10 +++-------
 sets/kdedeps-live                                  |    4 ++++
 6 files changed, 19 insertions(+), 11 deletions(-)

diff --git a/Documentation/package.keywords/.kde-live/kdedeps-live b/Documentation/package.keywords/.kde-live/kdedeps-live
index 5c56563..573ffe3 100644
--- a/Documentation/package.keywords/.kde-live/kdedeps-live
+++ b/Documentation/package.keywords/.kde-live/kdedeps-live
@@ -18,3 +18,7 @@
 #>=dev-libs/rasqal-0.9.20
 #~dev-libs/soprano-9999
 #media-libs/raptor:2
+
+# kde-base/pykde4 deps
+>=dev-python/PyQt4-4.9
+>=dev-python/sip-4.13.1

diff --git a/Documentation/package.keywords/kde-live.keywords b/Documentation/package.keywords/kde-live.keywords
index 596efb9..2e5d9d1 100644
--- a/Documentation/package.keywords/kde-live.keywords
+++ b/Documentation/package.keywords/kde-live.keywords
@@ -140,6 +140,10 @@
 #>=dev-libs/rasqal-0.9.20
 #~dev-libs/soprano-9999
 #media-libs/raptor:2
+
+# kde-base/pykde4 deps
+>=dev-python/PyQt4-4.9
+>=dev-python/sip-4.13.1
 ~kde-base/analitza-9999 **
 ~kde-base/blinken-9999 **
 ~kde-base/cantor-9999 **

diff --git a/Documentation/package.unmask/kde-live b/Documentation/package.unmask/kde-live
index c5dcf82..26dbae6 100644
--- a/Documentation/package.unmask/kde-live
+++ b/Documentation/package.unmask/kde-live
@@ -140,6 +140,10 @@
 #>=dev-libs/rasqal-0.9.20
 #~dev-libs/soprano-9999
 #media-libs/raptor:2
+
+# kde-base/pykde4 deps
+>=dev-python/PyQt4-4.9
+>=dev-python/sip-4.13.1
 ~kde-base/analitza-9999
 ~kde-base/blinken-9999
 ~kde-base/cantor-9999

diff --git a/kde-base/pykde4/pykde4-4.8.49.9999.ebuild b/kde-base/pykde4/pykde4-4.8.49.9999.ebuild
index 916e24b..8ec12a0 100644
--- a/kde-base/pykde4/pykde4-4.8.49.9999.ebuild
+++ b/kde-base/pykde4/pykde4-4.8.49.9999.ebuild
@@ -29,10 +29,6 @@ DEPEND="${RDEPEND}
 	sys-devel/libtool
 "
 
-PATCHES=(
-	"${FILESDIR}"/${PN}-4.6.3-python-3.2.patch
-)
-
 pkg_setup() {
 	python_pkg_setup
 	kde4-base_pkg_setup

diff --git a/kde-base/pykde4/pykde4-9999.ebuild b/kde-base/pykde4/pykde4-9999.ebuild
index 916e24b..d1c34d2 100644
--- a/kde-base/pykde4/pykde4-9999.ebuild
+++ b/kde-base/pykde4/pykde4-9999.ebuild
@@ -19,20 +19,16 @@ IUSE="debug doc examples semantic-desktop"
 
 # blocker added due to compatibility issues and error during compile time
 RDEPEND="
-	>=dev-python/sip-4.12.3-r2
+	>=dev-python/sip-4.13.1
 	$(add_kdebase_dep kdelibs 'opengl,semantic-desktop=')
 	semantic-desktop? ( $(add_kdebase_dep kdepimlibs 'semantic-desktop') )
-	aqua? ( >=dev-python/PyQt4-4.8.2[dbus,declarative,sql,svg,webkit,aqua] )
-	!aqua? ( >=dev-python/PyQt4-4.8.2[dbus,declarative,sql,svg,webkit,X] )
+	aqua? ( >=dev-python/PyQt4-4.9[dbus,declarative,sql,svg,webkit,aqua] )
+	!aqua? ( >=dev-python/PyQt4-4.9[dbus,declarative,sql,svg,webkit,X] )
 "
 DEPEND="${RDEPEND}
 	sys-devel/libtool
 "
 
-PATCHES=(
-	"${FILESDIR}"/${PN}-4.6.3-python-3.2.patch
-)
-
 pkg_setup() {
 	python_pkg_setup
 	kde4-base_pkg_setup

diff --git a/sets/kdedeps-live b/sets/kdedeps-live
index 94fa01f..d249ae2 100644
--- a/sets/kdedeps-live
+++ b/sets/kdedeps-live
@@ -18,3 +18,7 @@
 #>=dev-libs/rasqal-0.9.20
 #~dev-libs/soprano-9999
 #media-libs/raptor:2
+
+# kde-base/pykde4 deps
+>=dev-python/PyQt4-4.9
+>=dev-python/sip-4.13.1