kde-apps/konsolepart: Add it as alternative dependency to konsole:4

johu · Jan 4, 2016 · c0b6646 · c0b6646
1 parent 86bf6b7
commit c0b6646
Show file tree

Hide file tree

Showing 6 changed files with 10 additions and 6 deletions.
diff --git a/app-editors/kile/kile-2.1.3-r1.ebuild → app-editors/kile/kile-2.1.3-r2.ebuild b/app-editors/kile/kile-2.1.3-r1.ebuild → app-editors/kile/kile-2.1.3-r2.ebuild
@@ -23,7 +23,7 @@ DEPEND="
 "
 RDEPEND="${DEPEND}
 	$(add_kdeapps_dep kdebase-data)
-	$(add_kdeapps_dep konsole)
+	|| ( $(add_kdeapps_dep konsolepart) $(add_kdeapps_dep konsole) )
 	|| (
 		$(add_kdeapps_dep okular 'pdf?,postscript')
 		app-text/acroread

diff --git a/...il/kdevplatform/kdevplatform-1.7.2.ebuild → ...kdevplatform/kdevplatform-1.7.2-r1.ebuild b/...il/kdevplatform/kdevplatform-1.7.2.ebuild → ...kdevplatform/kdevplatform-1.7.2-r1.ebuild
@@ -37,7 +37,10 @@ DEPEND="${COMMON_DEPEND}
 	classbrowser? ( dev-libs/boost )
 "
 RDEPEND="${COMMON_DEPEND}
-	konsole? ( $(add_kdeapps_dep konsole) )
+	konsole? ( || (
+		$(add_kdeapps_dep konsolepart)
+		$(add_kdeapps_dep konsole)
+	) )
 	cvs? ( dev-vcs/cvs )
 	!<dev-util/kdevelop-${KDEVELOP_VERSION}:4
 "

diff --git a/...debase-meta/kdebase-meta-4.14.3-r1.ebuild → ...debase-meta/kdebase-meta-4.14.3-r2.ebuild b/...debase-meta/kdebase-meta-4.14.3-r1.ebuild → ...debase-meta/kdebase-meta-4.14.3-r2.ebuild
@@ -19,7 +19,8 @@ RDEPEND="
 	$(add_kdeapps_dep kfmclient)
 	$(add_kdeapps_dep konq-plugins)
 	$(add_kdeapps_dep konqueror)
-	$(add_kdeapps_dep konsole '' 4.14.3-r1)
+	$(add_kdeapps_dep konsolepart)
+	|| ( $(add_kdeapps_dep konsole '' 4.14.3-r2) kde-apps/konsole:5 )
 	$(add_kdeapps_dep kwrite)
 	$(add_kdeapps_dep libkonq)
 	$(add_kdeapps_dep nsplugins)

diff --git a/kde-misc/krcstat/krcstat-0.7.6.ebuild → kde-misc/krcstat/krcstat-0.7.6-r1.ebuild b/kde-misc/krcstat/krcstat-0.7.6.ebuild → kde-misc/krcstat/krcstat-0.7.6-r1.ebuild
@@ -16,6 +16,6 @@ KEYWORDS="~amd64 ~x86"
 IUSE="debug"
 
 DEPEND="
-	$(add_kdeapps_dep konsole)
+	|| ( $(add_kdeapps_dep konsolepart) $(add_kdeapps_dep konsole) )
 "
 RDEPEND="${DEPEND}"
diff --git a/...misc/quadkonsole/quadkonsole-0.4.4.ebuild → ...c/quadkonsole/quadkonsole-0.4.4-r1.ebuild b/...misc/quadkonsole/quadkonsole-0.4.4.ebuild → ...c/quadkonsole/quadkonsole-0.4.4-r1.ebuild
@@ -21,7 +21,7 @@ KEYWORDS="~amd64 ~x86"
 IUSE="debug"
 
 RDEPEND="
-	$(add_kdeapps_dep konsole)
+	|| ( $(add_kdeapps_dep konsolepart) $(add_kdeapps_dep konsole) )
 	$(add_kdeapps_dep libkonq)
 "
 DEPEND="${RDEPEND}"

diff --git a/kde-misc/yakuake/yakuake-2.9.9-r2.ebuild → kde-misc/yakuake/yakuake-2.9.9-r3.ebuild b/kde-misc/yakuake/yakuake-2.9.9-r2.ebuild → kde-misc/yakuake/yakuake-2.9.9-r3.ebuild
@@ -19,7 +19,7 @@ SLOT="4"
 IUSE="debug"
 
 RDEPEND="
-	$(add_kdeapps_dep konsole)
+	|| ( $(add_kdeapps_dep konsolepart) $(add_kdeapps_dep konsole) )
 	x11-libs/libX11
 "
 DEPEND="${RDEPEND}