commit: c8589142937aee7a9d9f96bd11796624239c91d4
Author: Andreas Sturmlechner <andreas.sturmlechner <AT> gmail <DOT> com>
AuthorDate: Fri Sep 25 22:57:28 2015 +0000
Commit: Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Sat Sep 26 15:45:08 2015 +0000
URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=c8589142
kde-apps: Relax blockers on kde-base (limit to slot 4)
Package-Manager: portage-2.2.20.1
kde-apps/kdepim-l10n/kdepim-l10n-15.08.1.ebuild | 2 +-
.../kdepim-runtime/kdepim-runtime-15.08.1.ebuild | 2 +-
.../kdepim-runtime-15.08.49.9999.ebuild | 2 +-
kde-apps/kdepim-runtime/kdepim-runtime-9999.ebuild | 2 +-
kde-apps/kdepim/kdepim-15.08.1.ebuild | 46 +++++++++++-----------
kde-apps/kdepim/kdepim-15.08.49.9999.ebuild | 46 +++++++++++-----------
kde-apps/kdepim/kdepim-9999.ebuild | 46 +++++++++++-----------
kde-apps/kdepimlibs/kdepimlibs-15.08.1.ebuild | 2 +-
.../kdepimlibs/kdepimlibs-15.08.49.9999.ebuild | 2 +-
kde-apps/kdepimlibs/kdepimlibs-9999.ebuild | 2 +-
10 files changed, 76 insertions(+), 76 deletions(-)
diff --git a/kde-apps/kdepim-l10n/kdepim-l10n-15.08.1.ebuild
b/kde-apps/kdepim-l10n/kdepim-l10n-15.08.1.ebuild
index 04bfd75..9d75d3d 100644
--- a/kde-apps/kdepim-l10n/kdepim-l10n-15.08.1.ebuild
+++ b/kde-apps/kdepim-l10n/kdepim-l10n-15.08.1.ebuild
@@ -18,7 +18,7 @@ DEPEND="
RDEPEND="
!<kde-apps/kde-l10n-15.08.0-r1
!<kde-apps/kde4-l10n-4.14.3-r1
- !kde-base/kdepim-l10n
+ !kde-base/kdepim-l10n:4
"
KEYWORDS="~amd64 ~x86"
diff --git a/kde-apps/kdepim-runtime/kdepim-runtime-15.08.1.ebuild
b/kde-apps/kdepim-runtime/kdepim-runtime-15.08.1.ebuild
index 0e204f9..a33fb24 100644
--- a/kde-apps/kdepim-runtime/kdepim-runtime-15.08.1.ebuild
+++ b/kde-apps/kdepim-runtime/kdepim-runtime-15.08.1.ebuild
@@ -65,7 +65,7 @@ DEPEND="${CDEPEND}
google? ( net-libs/libkgapi:5 )
"
RDEPEND="${CDEPEND}
- !kde-base/kdepim-runtime
+ !kde-base/kdepim-runtime:4
"
PATCHES=( "${FILESDIR}/${PN}-15.08.0-GID-based-merge.patch" )
diff --git a/kde-apps/kdepim-runtime/kdepim-runtime-15.08.49.9999.ebuild
b/kde-apps/kdepim-runtime/kdepim-runtime-15.08.49.9999.ebuild
index ce5c065..dd6037f 100644
--- a/kde-apps/kdepim-runtime/kdepim-runtime-15.08.49.9999.ebuild
+++ b/kde-apps/kdepim-runtime/kdepim-runtime-15.08.49.9999.ebuild
@@ -65,7 +65,7 @@ DEPEND="${CDEPEND}
google? ( net-libs/libkgapi:5 )
"
RDEPEND="${CDEPEND}
- !kde-base/kdepim-runtime
+ !kde-base/kdepim-runtime:4
"
src_configure() {
diff --git a/kde-apps/kdepim-runtime/kdepim-runtime-9999.ebuild
b/kde-apps/kdepim-runtime/kdepim-runtime-9999.ebuild
index 6a5c040..7bf0f34 100644
--- a/kde-apps/kdepim-runtime/kdepim-runtime-9999.ebuild
+++ b/kde-apps/kdepim-runtime/kdepim-runtime-9999.ebuild
@@ -64,7 +64,7 @@ DEPEND="${CDEPEND}
google? ( net-libs/libkgapi:5 )
"
RDEPEND="${CDEPEND}
- !kde-base/kdepim-runtime
+ !kde-base/kdepim-runtime:4
"
src_configure() {
diff --git a/kde-apps/kdepim/kdepim-15.08.1.ebuild
b/kde-apps/kdepim/kdepim-15.08.1.ebuild
index a73a25e..9ed11a3 100644
--- a/kde-apps/kdepim/kdepim-15.08.1.ebuild
+++ b/kde-apps/kdepim/kdepim-15.08.1.ebuild
@@ -95,29 +95,29 @@ DEPEND="
)
"
RDEPEND="${DEPEND}
- !kde-base/akonadiconsole
- !kde-base/akregator
- !kde-base/blogilo
- !kde-base/calendarjanitor
- !kde-base/kabcclient
- !kde-base/kaddressbook
- !kde-base/kalarm
- !kde-base/kdepim-common-libs
- !kde-base/kdepim-icons
- !kde-base/kdepim-kresources
- !kde-base/kdepim-l10n
- !kde-base/kdepim-meta
- !kde-base/kdepim-runtime
- !kde-base/kjots
- !kde-base/kleopatra
- !kde-base/kmail
- !kde-base/knode
- !kde-base/knotes
- !kde-base/konsolekalendar
- !kde-base/kontact
- !kde-base/korganizer
- !kde-base/ktimetracker
- !kde-base/ktnef
+ !kde-base/akonadiconsole:4
+ !kde-base/akregator:4
+ !kde-base/blogilo:4
+ !kde-base/calendarjanitor:4
+ !kde-base/kabcclient:4
+ !kde-base/kaddressbook:4
+ !kde-base/kalarm:4
+ !kde-base/kdepim-common-libs:4
+ !kde-base/kdepim-icons:4
+ !kde-base/kdepim-kresources:4
+ !kde-base/kdepim-l10n:4
+ !kde-base/kdepim-meta:4
+ !kde-base/kdepim-runtime:4
+ !kde-base/kjots:4
+ !kde-base/kleopatra:4
+ !kde-base/kmail:4
+ !kde-base/knode:4
+ !kde-base/knotes:4
+ !kde-base/konsolekalendar:4
+ !kde-base/kontact:4
+ !kde-base/korganizer:4
+ !kde-base/ktimetracker:4
+ !kde-base/ktnef:4
$(add_kdeapps_dep kdepim-runtime)
kdepim_features_kleopatra? ( app-crypt/gnupg )
"
diff --git a/kde-apps/kdepim/kdepim-15.08.49.9999.ebuild
b/kde-apps/kdepim/kdepim-15.08.49.9999.ebuild
index c1d3dfb..e631641 100644
--- a/kde-apps/kdepim/kdepim-15.08.49.9999.ebuild
+++ b/kde-apps/kdepim/kdepim-15.08.49.9999.ebuild
@@ -95,29 +95,29 @@ DEPEND="
)
"
RDEPEND="${DEPEND}
- !kde-base/akonadiconsole
- !kde-base/akregator
- !kde-base/blogilo
- !kde-base/calendarjanitor
- !kde-base/kabcclient
- !kde-base/kaddressbook
- !kde-base/kalarm
- !kde-base/kdepim-common-libs
- !kde-base/kdepim-icons
- !kde-base/kdepim-kresources
- !kde-base/kdepim-l10n
- !kde-base/kdepim-meta
- !kde-base/kdepim-runtime
- !kde-base/kjots
- !kde-base/kleopatra
- !kde-base/kmail
- !kde-base/knode
- !kde-base/knotes
- !kde-base/konsolekalendar
- !kde-base/kontact
- !kde-base/korganizer
- !kde-base/ktimetracker
- !kde-base/ktnef
+ !kde-base/akonadiconsole:4
+ !kde-base/akregator:4
+ !kde-base/blogilo:4
+ !kde-base/calendarjanitor:4
+ !kde-base/kabcclient:4
+ !kde-base/kaddressbook:4
+ !kde-base/kalarm:4
+ !kde-base/kdepim-common-libs:4
+ !kde-base/kdepim-icons:4
+ !kde-base/kdepim-kresources:4
+ !kde-base/kdepim-l10n:4
+ !kde-base/kdepim-meta:4
+ !kde-base/kdepim-runtime:4
+ !kde-base/kjots:4
+ !kde-base/kleopatra:4
+ !kde-base/kmail:4
+ !kde-base/knode:4
+ !kde-base/knotes:4
+ !kde-base/konsolekalendar:4
+ !kde-base/kontact:4
+ !kde-base/korganizer:4
+ !kde-base/ktimetracker:4
+ !kde-base/ktnef:4
$(add_kdeapps_dep kdepim-runtime)
kdepim_features_kleopatra? ( app-crypt/gnupg )
"
diff --git a/kde-apps/kdepim/kdepim-9999.ebuild
b/kde-apps/kdepim/kdepim-9999.ebuild
index e6c5b98..d5f20c1 100644
--- a/kde-apps/kdepim/kdepim-9999.ebuild
+++ b/kde-apps/kdepim/kdepim-9999.ebuild
@@ -93,29 +93,29 @@ DEPEND="
)
"
RDEPEND="${DEPEND}
- !kde-base/akonadiconsole
- !kde-base/akregator
- !kde-base/blogilo
- !kde-base/calendarjanitor
- !kde-base/kabcclient
- !kde-base/kaddressbook
- !kde-base/kalarm
- !kde-base/kdepim-common-libs
- !kde-base/kdepim-icons
- !kde-base/kdepim-kresources
- !kde-base/kdepim-l10n
- !kde-base/kdepim-meta
- !kde-base/kdepim-runtime
- !kde-base/kjots
- !kde-base/kleopatra
- !kde-base/kmail
- !kde-base/knode
- !kde-base/knotes
- !kde-base/konsolekalendar
- !kde-base/kontact
- !kde-base/korganizer
- !kde-base/ktimetracker
- !kde-base/ktnef
+ !kde-base/akonadiconsole:4
+ !kde-base/akregator:4
+ !kde-base/blogilo:4
+ !kde-base/calendarjanitor:4
+ !kde-base/kabcclient:4
+ !kde-base/kaddressbook:4
+ !kde-base/kalarm:4
+ !kde-base/kdepim-common-libs:4
+ !kde-base/kdepim-icons:4
+ !kde-base/kdepim-kresources:4
+ !kde-base/kdepim-l10n:4
+ !kde-base/kdepim-meta:4
+ !kde-base/kdepim-runtime:4
+ !kde-base/kjots:4
+ !kde-base/kleopatra:4
+ !kde-base/kmail:4
+ !kde-base/knode:4
+ !kde-base/knotes:4
+ !kde-base/konsolekalendar:4
+ !kde-base/kontact:4
+ !kde-base/korganizer:4
+ !kde-base/ktimetracker:4
+ !kde-base/ktnef:4
$(add_kdeapps_dep kdepim-runtime)
kdepim_features_kleopatra? ( app-crypt/gnupg )
"
diff --git a/kde-apps/kdepimlibs/kdepimlibs-15.08.1.ebuild
b/kde-apps/kdepimlibs/kdepimlibs-15.08.1.ebuild
index b2f7d46..8f05846 100644
--- a/kde-apps/kdepimlibs/kdepimlibs-15.08.1.ebuild
+++ b/kde-apps/kdepimlibs/kdepimlibs-15.08.1.ebuild
@@ -61,7 +61,7 @@ DEPEND="${COMMON_DEPEND}
dev-libs/boost
"
RDEPEND="${COMMON_DEPEND}
- !kde-base/kdepimlibs
+ !kde-base/kdepimlibs:4
"
src_prepare() {
diff --git a/kde-apps/kdepimlibs/kdepimlibs-15.08.49.9999.ebuild
b/kde-apps/kdepimlibs/kdepimlibs-15.08.49.9999.ebuild
index e661cb9..1aeb6f1 100644
--- a/kde-apps/kdepimlibs/kdepimlibs-15.08.49.9999.ebuild
+++ b/kde-apps/kdepimlibs/kdepimlibs-15.08.49.9999.ebuild
@@ -61,7 +61,7 @@ DEPEND="${COMMON_DEPEND}
dev-libs/boost
"
RDEPEND="${COMMON_DEPEND}
- !kde-base/kdepimlibs
+ !kde-base/kdepimlibs:4
"
src_prepare() {
diff --git a/kde-apps/kdepimlibs/kdepimlibs-9999.ebuild
b/kde-apps/kdepimlibs/kdepimlibs-9999.ebuild
index e661cb9..1aeb6f1 100644
--- a/kde-apps/kdepimlibs/kdepimlibs-9999.ebuild
+++ b/kde-apps/kdepimlibs/kdepimlibs-9999.ebuild
@@ -61,7 +61,7 @@ DEPEND="${COMMON_DEPEND}
dev-libs/boost
"
RDEPEND="${COMMON_DEPEND}
- !kde-base/kdepimlibs
+ !kde-base/kdepimlibs:4
"
src_prepare() {
