diff options
| author | Michael Palimaka <kensington@gentoo.org> | 2013-07-11 21:43:25 +1000 |
|---|---|---|
| committer | Michael Palimaka <kensington@gentoo.org> | 2013-07-11 21:43:25 +1000 |
| commit | e647143ac2d7c40e7a180127ad5b5289c9c4dfa8 (patch) | |
| tree | bc6acff639ccee449a569a20dd3324b7693af7c6 | |
| parent | 060bc64e7533dcfad269f029c24f8ed28954c81b (diff) | |
| download | kde-e647143ac2d7c40e7a180127ad5b5289c9c4dfa8.tar.gz kde-e647143ac2d7c40e7a180127ad5b5289c9c4dfa8.tar.bz2 kde-e647143ac2d7c40e7a180127ad5b5289c9c4dfa8.zip | |
[kde-base/kdelibs] Avoid add_blocker.
Package-Manager: portage-2.1.12.13
| -rw-r--r-- | kde-base/kdelibs/kdelibs-4.10.90.ebuild | 8 | ||||
| -rw-r--r-- | kde-base/kdelibs/kdelibs-4.11.49.9999.ebuild | 8 | ||||
| -rw-r--r-- | kde-base/kdelibs/kdelibs-9999.ebuild | 8 |
3 files changed, 6 insertions, 18 deletions
diff --git a/kde-base/kdelibs/kdelibs-4.10.90.ebuild b/kde-base/kdelibs/kdelibs-4.10.90.ebuild index 5264b22c113..a454ac2d2a8 100644 --- a/kde-base/kdelibs/kdelibs-4.10.90.ebuild +++ b/kde-base/kdelibs/kdelibs-4.10.90.ebuild @@ -90,6 +90,8 @@ DEPEND="${COMMONDEPEND} " RDEPEND="${COMMONDEPEND} !dev-qt/qtphonon + !<=kde-base/plasma-workspace-4.7.1:4 + !<=kde-base/kcontrol-4.4.50:4 >=app-crypt/gnupg-2.0.11 app-misc/ca-certificates $(add_kdebase_dep kde-env) @@ -117,12 +119,6 @@ PDEPEND=" ) " -# Force the upgrade of plasma-workspace to a version that explicitly depends on kactivities -add_blocker plasma-workspace 4.7.1 - -# file collision, bug 394991 -add_blocker kcontrol 4.4.50 - PATCHES=( "${FILESDIR}/dist/01_gentoo_set_xdg_menu_prefix-1.patch" "${FILESDIR}/dist/02_gentoo_append_xdg_config_dirs-1.patch" diff --git a/kde-base/kdelibs/kdelibs-4.11.49.9999.ebuild b/kde-base/kdelibs/kdelibs-4.11.49.9999.ebuild index 9fe89d1fc11..bd00fd298f5 100644 --- a/kde-base/kdelibs/kdelibs-4.11.49.9999.ebuild +++ b/kde-base/kdelibs/kdelibs-4.11.49.9999.ebuild @@ -90,6 +90,8 @@ DEPEND="${COMMONDEPEND} " RDEPEND="${COMMONDEPEND} !dev-qt/qtphonon + !<=kde-base/plasma-workspace-4.7.1:4 + !<=kde-base/kcontrol-4.4.50:4 >=app-crypt/gnupg-2.0.11 app-misc/ca-certificates $(add_kdebase_dep kde-env) @@ -117,12 +119,6 @@ PDEPEND=" ) " -# Force the upgrade of plasma-workspace to a version that explicitly depends on kactivities -add_blocker plasma-workspace 4.7.1 - -# file collision, bug 394991 -add_blocker kcontrol 4.4.50 - PATCHES=( "${FILESDIR}/dist/01_gentoo_set_xdg_menu_prefix-1.patch" "${FILESDIR}/dist/02_gentoo_append_xdg_config_dirs-1.patch" diff --git a/kde-base/kdelibs/kdelibs-9999.ebuild b/kde-base/kdelibs/kdelibs-9999.ebuild index ec796e165fd..12a1d63887d 100644 --- a/kde-base/kdelibs/kdelibs-9999.ebuild +++ b/kde-base/kdelibs/kdelibs-9999.ebuild @@ -90,6 +90,8 @@ DEPEND="${COMMONDEPEND} " RDEPEND="${COMMONDEPEND} !dev-qt/qtphonon + !<=kde-base/plasma-workspace-4.7.1:4 + !<=kde-base/kcontrol-4.4.50:4 >=app-crypt/gnupg-2.0.11 app-misc/ca-certificates $(add_kdebase_dep kde-env) @@ -117,12 +119,6 @@ PDEPEND=" ) " -# Force the upgrade of plasma-workspace to a version that explicitly depends on kactivities -add_blocker plasma-workspace 4.7.1 - -# file collision, bug 394991 -add_blocker kcontrol 4.4.50 - PATCHES=( "${FILESDIR}/dist/01_gentoo_set_xdg_menu_prefix-1.patch" "${FILESDIR}/dist/02_gentoo_append_xdg_config_dirs-1.patch" |