diff options
| author | Maciej Mrozowski <reavertm@gentoo.org> | 2011-01-09 21:43:48 +0100 |
|---|---|---|
| committer | Maciej Mrozowski <reavertm@gentoo.org> | 2011-01-09 21:51:54 +0100 |
| commit | a5e326bb4e2ebc10c2883cd9fbe95947e92a225c (patch) | |
| tree | 37dfe7d6a3b375c689a5070f652f4cb0e1fe56a7 /kde-base/pykde4/pykde4-4.6.9999.ebuild | |
| parent | 8ecfe6206b5a6686a258407297aad771b5bbf8d8 (diff) | |
| parent | 552119eb1d46cd72f57da4d0601bfcd192968db1 (diff) | |
| download | kde-a5e326bb4e2ebc10c2883cd9fbe95947e92a225c.tar.gz kde-a5e326bb4e2ebc10c2883cd9fbe95947e92a225c.tar.bz2 kde-a5e326bb4e2ebc10c2883cd9fbe95947e92a225c.zip | |
Merge branch 'master' into kde-git
Conflicts:
app-office/akonadi-server/Manifest
app-office/kexi/Manifest
app-office/koffice-libs/Manifest
app-office/koffice-meta/Manifest
app-office/kplato/Manifest
app-office/kpresenter/Manifest
app-office/kspread/Manifest
kde-base/kdeartwork-kscreensaver/Manifest
kde-base/kdm/Manifest
kde-base/kscreensaver/Manifest
kde-base/pykde4/Manifest
kde-base/rocs/Manifest
media-plugins/kipi-plugins/Manifest
Diffstat (limited to 'kde-base/pykde4/pykde4-4.6.9999.ebuild')
| -rw-r--r-- | kde-base/pykde4/pykde4-4.6.9999.ebuild | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/kde-base/pykde4/pykde4-4.6.9999.ebuild b/kde-base/pykde4/pykde4-4.6.9999.ebuild index 6162be7caa7..04c6de414c0 100644 --- a/kde-base/pykde4/pykde4-4.6.9999.ebuild +++ b/kde-base/pykde4/pykde4-4.6.9999.ebuild @@ -18,10 +18,11 @@ IUSE="debug doc examples semantic-desktop" # blocker added due to compatibility issues and error during compile time DEPEND=" !dev-python/pykde + >=dev-python/sip-4.12 $(add_kdebase_dep kdelibs 'opengl,semantic-desktop?') semantic-desktop? ( $(add_kdebase_dep kdepimlibs 'semantic-desktop') ) - aqua? ( >=dev-python/PyQt4-4.8[dbus,declarative,sql,svg,webkit,aqua] ) - !aqua? ( >=dev-python/PyQt4-4.8[dbus,declarative,sql,svg,webkit,X] ) + 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] ) " RDEPEND="${DEPEND}" |
