commit: c0b6646eb4a7fd61d3df5dda1336a4ca7277ef15
Author: Andreas Sturmlechner <andreas.sturmlechner <AT> gmail <DOT> com>
AuthorDate: Mon Jan 4 17:50:17 2016 +0000
Commit: Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Mon Jan 4 18:12:13 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c0b6646e
kde-apps/konsolepart: Add it as alternative dependency to konsole:4
app-editors/kile/{kile-2.1.3-r1.ebuild => kile-2.1.3-r2.ebuild} | 2 +-
.../{kdevplatform-1.7.2.ebuild => kdevplatform-1.7.2-r1.ebuild} | 5 ++++-
.../{kdebase-meta-4.14.3-r1.ebuild => kdebase-meta-4.14.3-r2.ebuild} | 3 ++-
kde-misc/krcstat/{krcstat-0.7.6.ebuild => krcstat-0.7.6-r1.ebuild} | 2 +-
.../{quadkonsole-0.4.4.ebuild => quadkonsole-0.4.4-r1.ebuild} | 2 +-
.../yakuake/{yakuake-2.9.9-r2.ebuild => yakuake-2.9.9-r3.ebuild} | 2 +-
6 files changed, 10 insertions(+), 6 deletions(-)
diff --git a/app-editors/kile/kile-2.1.3-r1.ebuild
b/app-editors/kile/kile-2.1.3-r2.ebuild
similarity index 94%
rename from app-editors/kile/kile-2.1.3-r1.ebuild
rename to app-editors/kile/kile-2.1.3-r2.ebuild
index e6f2e9e..88bf977 100644
--- a/app-editors/kile/kile-2.1.3-r1.ebuild
+++ b/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/dev-util/kdevplatform/kdevplatform-1.7.2.ebuild
b/dev-util/kdevplatform/kdevplatform-1.7.2-r1.ebuild
similarity index 93%
rename from dev-util/kdevplatform/kdevplatform-1.7.2.ebuild
rename to dev-util/kdevplatform/kdevplatform-1.7.2-r1.ebuild
index 8fe0854..bc2e18f 100644
--- a/dev-util/kdevplatform/kdevplatform-1.7.2.ebuild
+++ b/dev-util/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/kde-apps/kdebase-meta/kdebase-meta-4.14.3-r1.ebuild
b/kde-apps/kdebase-meta/kdebase-meta-4.14.3-r2.ebuild
similarity index 95%
rename from kde-apps/kdebase-meta/kdebase-meta-4.14.3-r1.ebuild
rename to kde-apps/kdebase-meta/kdebase-meta-4.14.3-r2.ebuild
index dc2139f..38d17cf 100644
--- a/kde-apps/kdebase-meta/kdebase-meta-4.14.3-r1.ebuild
+++ b/kde-apps/kdebase-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
b/kde-misc/krcstat/krcstat-0.7.6-r1.ebuild
similarity index 84%
rename from kde-misc/krcstat/krcstat-0.7.6.ebuild
rename to kde-misc/krcstat/krcstat-0.7.6-r1.ebuild
index 002e49b..0f95b2d 100644
--- a/kde-misc/krcstat/krcstat-0.7.6.ebuild
+++ b/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/kde-misc/quadkonsole/quadkonsole-0.4.4.ebuild
b/kde-misc/quadkonsole/quadkonsole-0.4.4-r1.ebuild
similarity index 91%
rename from kde-misc/quadkonsole/quadkonsole-0.4.4.ebuild
rename to kde-misc/quadkonsole/quadkonsole-0.4.4-r1.ebuild
index 9fa3d55..85711aa 100644
--- a/kde-misc/quadkonsole/quadkonsole-0.4.4.ebuild
+++ b/kde-misc/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
b/kde-misc/yakuake/yakuake-2.9.9-r3.ebuild
similarity index 91%
rename from kde-misc/yakuake/yakuake-2.9.9-r2.ebuild
rename to kde-misc/yakuake/yakuake-2.9.9-r3.ebuild
index 9f4c3b9..c6719a0 100644
--- a/kde-misc/yakuake/yakuake-2.9.9-r2.ebuild
+++ b/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}
