2 files changed, 15 insertions, 23 deletions
diff --git a/kde-apps/pimcommon/pimcommon-19.12.49.9999.ebuild b/kde-apps/pimcommon/pimcommon-19.12.49.9999.ebuild
index 0a6d5e2375b..4ea604eecca 100644
--- a/kde-apps/pimcommon/pimcommon-19.12.49.9999.ebuild
+++ b/kde-apps/pimcommon/pimcommon-19.12.49.9999.ebuild
@@ -21,7 +21,7 @@ IUSE=""
 BDEPEND="
 	dev-libs/libxslt
 "
-COMMON_DEPEND="
+RDEPEND="
 	>=kde-frameworks/karchive-${KFMIN}:5
 	>=kde-frameworks/kcodecs-${KFMIN}:5
 	>=kde-frameworks/kcompletion-${KFMIN}:5
@@ -51,13 +51,9 @@ COMMON_DEPEND="
 	>=dev-qt/qtwidgets-${QTMIN}:5
 	>=dev-qt/qtxml-${QTMIN}:5
 "
-DEPEND="${COMMON_DEPEND}
+DEPEND="${RDEPEND}
 	test? ( >=kde-apps/kmime-${PVCUT}:5 )
 "
-RDEPEND="${COMMON_DEPEND}
-	!kde-apps/kdepim-common-libs:4
-	!kde-apps/kdepim-l10n
-"
 
 src_test() {
 	# bugs 641730, 661330
diff --git a/kde-apps/pimcommon/pimcommon-9999.ebuild b/kde-apps/pimcommon/pimcommon-9999.ebuild
index 8cc3847bad4..4778255c6ac 100644
--- a/kde-apps/pimcommon/pimcommon-9999.ebuild
+++ b/kde-apps/pimcommon/pimcommon-9999.ebuild
@@ -21,7 +21,18 @@ IUSE=""
 BDEPEND="
 	dev-libs/libxslt
 "
-COMMON_DEPEND="
+RDEPEND="
+	>=dev-qt/qtdbus-${QTMIN}:5
+	>=dev-qt/qtgui-${QTMIN}:5
+	>=dev-qt/qtnetwork-${QTMIN}:5
+	>=dev-qt/qtprintsupport-${QTMIN}:5
+	>=dev-qt/qtwidgets-${QTMIN}:5
+	>=dev-qt/qtxml-${QTMIN}:5
+	>=kde-apps/akonadi-${PVCUT}:5
+	>=kde-apps/akonadi-contacts-${PVCUT}:5
+	>=kde-apps/kimap-${PVCUT}:5
+	>=kde-apps/kpimtextedit-${PVCUT}:5
+	>=kde-apps/libkdepim-${PVCUT}:5
 	>=kde-frameworks/karchive-${KFMIN}:5
 	>=kde-frameworks/kcodecs-${KFMIN}:5
 	>=kde-frameworks/kcompletion-${KFMIN}:5
@@ -39,25 +50,10 @@ COMMON_DEPEND="
 	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
 	>=kde-frameworks/kxmlgui-${KFMIN}:5
 	>=kde-frameworks/purpose-${KFMIN}:5
-	>=kde-apps/akonadi-${PVCUT}:5
-	>=kde-apps/akonadi-contacts-${PVCUT}:5
-	>=kde-apps/kimap-${PVCUT}:5
-	>=kde-apps/kpimtextedit-${PVCUT}:5
-	>=kde-apps/libkdepim-${PVCUT}:5
-	>=dev-qt/qtdbus-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtnetwork-${QTMIN}:5
-	>=dev-qt/qtprintsupport-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=dev-qt/qtxml-${QTMIN}:5
 "
-DEPEND="${COMMON_DEPEND}
+DEPEND="${RDEPEND}
 	test? ( >=kde-apps/kmime-${PVCUT}:5 )
 "
-RDEPEND="${COMMON_DEPEND}
-	!kde-apps/kdepim-common-libs:4
-	!kde-apps/kdepim-l10n
-"
 
 src_test() {
 	# bugs 641730, 661330