From c0b6646eb4a7fd61d3df5dda1336a4ca7277ef15 Mon Sep 17 00:00:00 2001
From: Andreas Sturmlechner <andreas.sturmlechner@gmail.com>
Date: Mon, 4 Jan 2016 18:50:17 +0100
Subject: kde-apps/konsolepart: Add it as alternative dependency to konsole:4

---
 kde-misc/krcstat/krcstat-0.7.6-r1.ebuild         | 21 ++++++++++++
 kde-misc/krcstat/krcstat-0.7.6.ebuild            | 21 ------------
 kde-misc/quadkonsole/quadkonsole-0.4.4-r1.ebuild | 42 ++++++++++++++++++++++++
 kde-misc/quadkonsole/quadkonsole-0.4.4.ebuild    | 42 ------------------------
 kde-misc/yakuake/yakuake-2.9.9-r2.ebuild         | 31 -----------------
 kde-misc/yakuake/yakuake-2.9.9-r3.ebuild         | 31 +++++++++++++++++
 6 files changed, 94 insertions(+), 94 deletions(-)
 create mode 100644 kde-misc/krcstat/krcstat-0.7.6-r1.ebuild
 delete mode 100644 kde-misc/krcstat/krcstat-0.7.6.ebuild
 create mode 100644 kde-misc/quadkonsole/quadkonsole-0.4.4-r1.ebuild
 delete mode 100644 kde-misc/quadkonsole/quadkonsole-0.4.4.ebuild
 delete mode 100644 kde-misc/yakuake/yakuake-2.9.9-r2.ebuild
 create mode 100644 kde-misc/yakuake/yakuake-2.9.9-r3.ebuild

(limited to 'kde-misc')

diff --git a/kde-misc/krcstat/krcstat-0.7.6-r1.ebuild b/kde-misc/krcstat/krcstat-0.7.6-r1.ebuild
new file mode 100644
index 000000000000..0f95b2d38bd8
--- /dev/null
+++ b/kde-misc/krcstat/krcstat-0.7.6-r1.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit kde4-base
+
+DESCRIPTION="A Gentoo system management tool"
+HOMEPAGE="http://www.binro.org"
+SRC_URI="http://binro.org/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="4"
+KEYWORDS="~amd64 ~x86"
+IUSE="debug"
+
+DEPEND="
+	|| ( $(add_kdeapps_dep konsolepart) $(add_kdeapps_dep konsole) )
+"
+RDEPEND="${DEPEND}"
diff --git a/kde-misc/krcstat/krcstat-0.7.6.ebuild b/kde-misc/krcstat/krcstat-0.7.6.ebuild
deleted file mode 100644
index 002e49b78875..000000000000
--- a/kde-misc/krcstat/krcstat-0.7.6.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit kde4-base
-
-DESCRIPTION="A Gentoo system management tool"
-HOMEPAGE="http://www.binro.org"
-SRC_URI="http://binro.org/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="4"
-KEYWORDS="~amd64 ~x86"
-IUSE="debug"
-
-DEPEND="
-	$(add_kdeapps_dep konsole)
-"
-RDEPEND="${DEPEND}"
diff --git a/kde-misc/quadkonsole/quadkonsole-0.4.4-r1.ebuild b/kde-misc/quadkonsole/quadkonsole-0.4.4-r1.ebuild
new file mode 100644
index 000000000000..85711aab31d5
--- /dev/null
+++ b/kde-misc/quadkonsole/quadkonsole-0.4.4-r1.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+KDE_HANDBOOK=optional
+KDE_LINGUAS_DIR="i18n"
+KDE_LINGUAS="cs de sr sr@ijekavian sr@ijekavianlatin sr@latin"
+inherit kde4-base
+
+MY_P=${PN}4-${PV}
+
+DESCRIPTION="Grid of Konsole terminals"
+HOMEPAGE="http://kb.ccchl.de/quadkonsole4/"
+SRC_URI="http://kb.ccchl.de/${PN}4/${MY_P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="4"
+KEYWORDS="~amd64 ~x86"
+IUSE="debug"
+
+RDEPEND="
+	|| ( $(add_kdeapps_dep konsolepart) $(add_kdeapps_dep konsole) )
+	$(add_kdeapps_dep libkonq)
+"
+DEPEND="${RDEPEND}"
+
+DOCS=( AUTHORS ChangeLog )
+
+S=${WORKDIR}/${MY_P}
+
+src_prepare() {
+	local lang
+	for lang in ${KDE_LINGUAS} ; do
+		if ! use linguas_${lang} ; then
+			rm ${KDE_LINGUAS_DIR}/${PN}4_${lang}.po
+		fi
+	done
+
+	kde4-base_src_prepare
+}
diff --git a/kde-misc/quadkonsole/quadkonsole-0.4.4.ebuild b/kde-misc/quadkonsole/quadkonsole-0.4.4.ebuild
deleted file mode 100644
index 9fa3d550bc2e..000000000000
--- a/kde-misc/quadkonsole/quadkonsole-0.4.4.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-KDE_HANDBOOK=optional
-KDE_LINGUAS_DIR="i18n"
-KDE_LINGUAS="cs de sr sr@ijekavian sr@ijekavianlatin sr@latin"
-inherit kde4-base
-
-MY_P=${PN}4-${PV}
-
-DESCRIPTION="Grid of Konsole terminals"
-HOMEPAGE="http://kb.ccchl.de/quadkonsole4/"
-SRC_URI="http://kb.ccchl.de/${PN}4/${MY_P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="4"
-KEYWORDS="~amd64 ~x86"
-IUSE="debug"
-
-RDEPEND="
-	$(add_kdeapps_dep konsole)
-	$(add_kdeapps_dep libkonq)
-"
-DEPEND="${RDEPEND}"
-
-DOCS=( AUTHORS ChangeLog )
-
-S=${WORKDIR}/${MY_P}
-
-src_prepare() {
-	local lang
-	for lang in ${KDE_LINGUAS} ; do
-		if ! use linguas_${lang} ; then
-			rm ${KDE_LINGUAS_DIR}/${PN}4_${lang}.po
-		fi
-	done
-
-	kde4-base_src_prepare
-}
diff --git a/kde-misc/yakuake/yakuake-2.9.9-r2.ebuild b/kde-misc/yakuake/yakuake-2.9.9-r2.ebuild
deleted file mode 100644
index 9f4c3b92105b..000000000000
--- a/kde-misc/yakuake/yakuake-2.9.9-r2.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-KDE_LINGUAS="ca ca@valencia cs da de el en_GB es et fi fr ga gl hr hu it km ko
-nb nds nl nn pa pl pt pt_BR ro ru sk sr sr@ijekavian sr@ijekavianlatin sr@latin
-sv th tr uk wa zh_CN zh_TW"
-inherit kde4-base
-
-DESCRIPTION="A quake-style terminal emulator based on KDE konsole technology"
-HOMEPAGE="https://yakuake.kde.org/"
-SRC_URI="mirror://kde/stable/${PN}/${PV}/src/${P}.tar.xz"
-
-LICENSE="GPL-2 LGPL-2"
-KEYWORDS="amd64 ~arm ppc x86"
-SLOT="4"
-IUSE="debug"
-
-RDEPEND="
-	$(add_kdeapps_dep konsole)
-	x11-libs/libX11
-"
-DEPEND="${RDEPEND}
-	sys-devel/gettext
-"
-
-DOCS=( AUTHORS ChangeLog KDE4FAQ NEWS README TODO )
-
-PATCHES=( "${FILESDIR}/${P}-lastsession.patch" )
diff --git a/kde-misc/yakuake/yakuake-2.9.9-r3.ebuild b/kde-misc/yakuake/yakuake-2.9.9-r3.ebuild
new file mode 100644
index 000000000000..c6719a092342
--- /dev/null
+++ b/kde-misc/yakuake/yakuake-2.9.9-r3.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+KDE_LINGUAS="ca ca@valencia cs da de el en_GB es et fi fr ga gl hr hu it km ko
+nb nds nl nn pa pl pt pt_BR ro ru sk sr sr@ijekavian sr@ijekavianlatin sr@latin
+sv th tr uk wa zh_CN zh_TW"
+inherit kde4-base
+
+DESCRIPTION="A quake-style terminal emulator based on KDE konsole technology"
+HOMEPAGE="https://yakuake.kde.org/"
+SRC_URI="mirror://kde/stable/${PN}/${PV}/src/${P}.tar.xz"
+
+LICENSE="GPL-2 LGPL-2"
+KEYWORDS="amd64 ~arm ppc x86"
+SLOT="4"
+IUSE="debug"
+
+RDEPEND="
+	|| ( $(add_kdeapps_dep konsolepart) $(add_kdeapps_dep konsole) )
+	x11-libs/libX11
+"
+DEPEND="${RDEPEND}
+	sys-devel/gettext
+"
+
+DOCS=( AUTHORS ChangeLog KDE4FAQ NEWS README TODO )
+
+PATCHES=( "${FILESDIR}/${P}-lastsession.patch" )
-- 
cgit v1.2.3-18-g5258