| 1 |
commit: 61f3959cb286a9c91e6f55cad3b42767ce2a3621 |
| 2 |
Author: Johannes Huber <johu <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Mon Jan 9 18:14:28 2012 +0000 |
| 4 |
Commit: Johannes Huber <johu <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Mon Jan 9 18:15:24 2012 +0000 |
| 6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=61f3959c |
| 7 |
|
| 8 |
[kde-base/pykde4] Bump deps, remove failing patch, bug #398223. |
| 9 |
|
| 10 |
(Portage version: 2.2.0_alpha84/git/Linux x86_64, unsigned Manifest commit) |
| 11 |
|
| 12 |
--- |
| 13 |
.../package.keywords/.kde-live/kdedeps-live | 4 ++++ |
| 14 |
Documentation/package.keywords/kde-live.keywords | 4 ++++ |
| 15 |
Documentation/package.unmask/kde-live | 4 ++++ |
| 16 |
kde-base/pykde4/pykde4-4.8.49.9999.ebuild | 4 ---- |
| 17 |
kde-base/pykde4/pykde4-9999.ebuild | 10 +++------- |
| 18 |
sets/kdedeps-live | 4 ++++ |
| 19 |
6 files changed, 19 insertions(+), 11 deletions(-) |
| 20 |
|
| 21 |
diff --git a/Documentation/package.keywords/.kde-live/kdedeps-live b/Documentation/package.keywords/.kde-live/kdedeps-live |
| 22 |
index 5c56563..573ffe3 100644 |
| 23 |
--- a/Documentation/package.keywords/.kde-live/kdedeps-live |
| 24 |
+++ b/Documentation/package.keywords/.kde-live/kdedeps-live |
| 25 |
@@ -18,3 +18,7 @@ |
| 26 |
#>=dev-libs/rasqal-0.9.20 |
| 27 |
#~dev-libs/soprano-9999 |
| 28 |
#media-libs/raptor:2 |
| 29 |
+ |
| 30 |
+# kde-base/pykde4 deps |
| 31 |
+>=dev-python/PyQt4-4.9 |
| 32 |
+>=dev-python/sip-4.13.1 |
| 33 |
|
| 34 |
diff --git a/Documentation/package.keywords/kde-live.keywords b/Documentation/package.keywords/kde-live.keywords |
| 35 |
index 596efb9..2e5d9d1 100644 |
| 36 |
--- a/Documentation/package.keywords/kde-live.keywords |
| 37 |
+++ b/Documentation/package.keywords/kde-live.keywords |
| 38 |
@@ -140,6 +140,10 @@ |
| 39 |
#>=dev-libs/rasqal-0.9.20 |
| 40 |
#~dev-libs/soprano-9999 |
| 41 |
#media-libs/raptor:2 |
| 42 |
+ |
| 43 |
+# kde-base/pykde4 deps |
| 44 |
+>=dev-python/PyQt4-4.9 |
| 45 |
+>=dev-python/sip-4.13.1 |
| 46 |
~kde-base/analitza-9999 ** |
| 47 |
~kde-base/blinken-9999 ** |
| 48 |
~kde-base/cantor-9999 ** |
| 49 |
|
| 50 |
diff --git a/Documentation/package.unmask/kde-live b/Documentation/package.unmask/kde-live |
| 51 |
index c5dcf82..26dbae6 100644 |
| 52 |
--- a/Documentation/package.unmask/kde-live |
| 53 |
+++ b/Documentation/package.unmask/kde-live |
| 54 |
@@ -140,6 +140,10 @@ |
| 55 |
#>=dev-libs/rasqal-0.9.20 |
| 56 |
#~dev-libs/soprano-9999 |
| 57 |
#media-libs/raptor:2 |
| 58 |
+ |
| 59 |
+# kde-base/pykde4 deps |
| 60 |
+>=dev-python/PyQt4-4.9 |
| 61 |
+>=dev-python/sip-4.13.1 |
| 62 |
~kde-base/analitza-9999 |
| 63 |
~kde-base/blinken-9999 |
| 64 |
~kde-base/cantor-9999 |
| 65 |
|
| 66 |
diff --git a/kde-base/pykde4/pykde4-4.8.49.9999.ebuild b/kde-base/pykde4/pykde4-4.8.49.9999.ebuild |
| 67 |
index 916e24b..8ec12a0 100644 |
| 68 |
--- a/kde-base/pykde4/pykde4-4.8.49.9999.ebuild |
| 69 |
+++ b/kde-base/pykde4/pykde4-4.8.49.9999.ebuild |
| 70 |
@@ -29,10 +29,6 @@ DEPEND="${RDEPEND} |
| 71 |
sys-devel/libtool |
| 72 |
" |
| 73 |
|
| 74 |
-PATCHES=( |
| 75 |
- "${FILESDIR}"/${PN}-4.6.3-python-3.2.patch |
| 76 |
-) |
| 77 |
- |
| 78 |
pkg_setup() { |
| 79 |
python_pkg_setup |
| 80 |
kde4-base_pkg_setup |
| 81 |
|
| 82 |
diff --git a/kde-base/pykde4/pykde4-9999.ebuild b/kde-base/pykde4/pykde4-9999.ebuild |
| 83 |
index 916e24b..d1c34d2 100644 |
| 84 |
--- a/kde-base/pykde4/pykde4-9999.ebuild |
| 85 |
+++ b/kde-base/pykde4/pykde4-9999.ebuild |
| 86 |
@@ -19,20 +19,16 @@ IUSE="debug doc examples semantic-desktop" |
| 87 |
|
| 88 |
# blocker added due to compatibility issues and error during compile time |
| 89 |
RDEPEND=" |
| 90 |
- >=dev-python/sip-4.12.3-r2 |
| 91 |
+ >=dev-python/sip-4.13.1 |
| 92 |
$(add_kdebase_dep kdelibs 'opengl,semantic-desktop=') |
| 93 |
semantic-desktop? ( $(add_kdebase_dep kdepimlibs 'semantic-desktop') ) |
| 94 |
- aqua? ( >=dev-python/PyQt4-4.8.2[dbus,declarative,sql,svg,webkit,aqua] ) |
| 95 |
- !aqua? ( >=dev-python/PyQt4-4.8.2[dbus,declarative,sql,svg,webkit,X] ) |
| 96 |
+ aqua? ( >=dev-python/PyQt4-4.9[dbus,declarative,sql,svg,webkit,aqua] ) |
| 97 |
+ !aqua? ( >=dev-python/PyQt4-4.9[dbus,declarative,sql,svg,webkit,X] ) |
| 98 |
" |
| 99 |
DEPEND="${RDEPEND} |
| 100 |
sys-devel/libtool |
| 101 |
" |
| 102 |
|
| 103 |
-PATCHES=( |
| 104 |
- "${FILESDIR}"/${PN}-4.6.3-python-3.2.patch |
| 105 |
-) |
| 106 |
- |
| 107 |
pkg_setup() { |
| 108 |
python_pkg_setup |
| 109 |
kde4-base_pkg_setup |
| 110 |
|
| 111 |
diff --git a/sets/kdedeps-live b/sets/kdedeps-live |
| 112 |
index 94fa01f..d249ae2 100644 |
| 113 |
--- a/sets/kdedeps-live |
| 114 |
+++ b/sets/kdedeps-live |
| 115 |
@@ -18,3 +18,7 @@ |
| 116 |
#>=dev-libs/rasqal-0.9.20 |
| 117 |
#~dev-libs/soprano-9999 |
| 118 |
#media-libs/raptor:2 |
| 119 |
+ |
| 120 |
+# kde-base/pykde4 deps |
| 121 |
+>=dev-python/PyQt4-4.9 |
| 122 |
+>=dev-python/sip-4.13.1 |
Archives