[gentoo-commits] proj/kde:master commit in: kde-apps/konsole/

2024-02-22 Thread Sam James 
commit: 24d15c796147a307c531d235aaf41f8eedf93521
Author: Sam James  gentoo  org>
AuthorDate: Fri Feb 23 06:21:19 2024 +
Commit: Sam James  gentoo  org>
CommitDate: Fri Feb 23 06:21:19 2024 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=24d15c79

kde-apps/konsole: sync <

Signed-off-by: Sam James  gentoo.org>

 kde-apps/konsole/konsole-24.02.0.ebuild   | 1 +
 kde-apps/konsole/konsole-24.02.49..ebuild | 1 +
 2 files changed, 2 insertions(+)

diff --git a/kde-apps/konsole/konsole-24.02.0.ebuild 
b/kde-apps/konsole/konsole-24.02.0.ebuild
index 7b4a559b14..0bb1b74c36 100644
--- a/kde-apps/konsole/konsole-24.02.0.ebuild
+++ b/kde-apps/konsole/konsole-24.02.0.ebuild
@@ -20,6 +20,7 @@ IUSE=""
 DEPEND="
dev-libs/icu:=
>=dev-qt/qtbase-${QTMIN}:6[dbus,gui,network,widgets,xml]
+   >=dev-qt/qt5compat-${QTMIN}:6
>=dev-qt/qtmultimedia-${QTMIN}:6
>=kde-frameworks/kbookmarks-${KFMIN}:6
>=kde-frameworks/kconfig-${KFMIN}:6

diff --git a/kde-apps/konsole/konsole-24.02.49..ebuild 
b/kde-apps/konsole/konsole-24.02.49..ebuild
index 9b62db46ed..f3a956b33e 100644
--- a/kde-apps/konsole/konsole-24.02.49..ebuild
+++ b/kde-apps/konsole/konsole-24.02.49..ebuild
@@ -20,6 +20,7 @@ IUSE=""
 DEPEND="
dev-libs/icu:=
>=dev-qt/qtbase-${QTMIN}:6[dbus,gui,network,widgets,xml]
+   >=dev-qt/qt5compat-${QTMIN}:6
>=dev-qt/qtmultimedia-${QTMIN}:6
>=kde-frameworks/kbookmarks-${KFMIN}:6
>=kde-frameworks/kconfig-${KFMIN}:6

[gentoo-commits] proj/kde:master commit in: kde-apps/konsole/

2024-02-22 Thread Sam James 
commit: 478643c96c61210c208d689d3796e675a1d4a40b
Author: Sam James  gentoo  org>
AuthorDate: Thu Feb 22 10:50:02 2024 +
Commit: Sam James  gentoo  org>
CommitDate: Fri Feb 23 04:49:38 2024 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=478643c9

kde-apps/konsole: refresh deps

Upstream commit 53d473cff30df53d9a0a6e676feaaf9b0f4fba4c for dev-qt/qt5compat.

Signed-off-by: Sam James  gentoo.org>

 kde-apps/konsole/konsole-.ebuild | 1 +
 1 file changed, 1 insertion(+)

diff --git a/kde-apps/konsole/konsole-.ebuild 
b/kde-apps/konsole/konsole-.ebuild
index 9b62db46ed..f3a956b33e 100644
--- a/kde-apps/konsole/konsole-.ebuild
+++ b/kde-apps/konsole/konsole-.ebuild
@@ -20,6 +20,7 @@ IUSE=""
 DEPEND="
dev-libs/icu:=
>=dev-qt/qtbase-${QTMIN}:6[dbus,gui,network,widgets,xml]
+   >=dev-qt/qt5compat-${QTMIN}:6
>=dev-qt/qtmultimedia-${QTMIN}:6
>=kde-frameworks/kbookmarks-${KFMIN}:6
>=kde-frameworks/kconfig-${KFMIN}:6

[gentoo-commits] proj/kde:master commit in: kde-apps/konsole/files/, kde-apps/konsole/

2023-09-15 Thread Andreas Sturmlechner 
commit: 6663a2bf1415d295444b5500d6911ee6e6f15727
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Fri Sep 15 14:25:59 2023 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Fri Sep 15 14:25:59 2023 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=6663a2bf

kde-apps/konsole: Drop unused dep, drop IUSE X

Closes: https://bugs.gentoo.org/914127
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 .../konsole-23.08.1-drop-unused-X11-dep.patch  | 30 ++
 kde-apps/konsole/konsole-23.08.49..ebuild  | 11 ++--
 kde-apps/konsole/konsole-.ebuild   | 11 ++--
 3 files changed, 34 insertions(+), 18 deletions(-)

diff --git a/kde-apps/konsole/files/konsole-23.08.1-drop-unused-X11-dep.patch 
b/kde-apps/konsole/files/konsole-23.08.1-drop-unused-X11-dep.patch
new file mode 100644
index 00..6719fbfac0
--- /dev/null
+++ b/kde-apps/konsole/files/konsole-23.08.1-drop-unused-X11-dep.patch
@@ -0,0 +1,30 @@
+From 68f6ef2ea203e047743a97fc17be23a4a964a05a Mon Sep 17 00:00:00 2001
+From: Andreas Sturmlechner 
+Date: Fri, 15 Sep 2023 09:47:42 +0200
+Subject: [PATCH] Drop unused X11 dependency
+
+It seems it is (no longer) needed and was only a leftover for feature 
selection.
+
+Signed-off-by: Andreas Sturmlechner 
+---
+ CMakeLists.txt | 4 +---
+ 1 file changed, 1 insertion(+), 3 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 9fd6f4f01..47c234498 100644
+--- a/CMakeLists.txt
 b/CMakeLists.txt
+@@ -105,9 +105,7 @@ find_package(ICU 61.0 COMPONENTS uc i18n REQUIRED)
+ if(NOT APPLE)
+ option(WITHOUT_X11 "Build without X11 integration (skips finding X11)" 
OFF)
+ if (NOT WITHOUT_X11)
+-find_package(X11)
+-set_package_properties(X11 PROPERTIES TYPE OPTIONAL)
+-set(HAVE_X11 ${X11_FOUND})
++set(HAVE_X11 1)
+ endif()
+ endif()
+ 
+-- 
+2.42.0
+

diff --git a/kde-apps/konsole/konsole-23.08.49..ebuild 
b/kde-apps/konsole/konsole-23.08.49..ebuild
index 2a1195cc09..497c0bb398 100644
--- a/kde-apps/konsole/konsole-23.08.49..ebuild
+++ b/kde-apps/konsole/konsole-23.08.49..ebuild
@@ -15,7 +15,7 @@ HOMEPAGE="https://apps.kde.org/konsole/ 
https://konsole.kde.org;
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
 KEYWORDS=""
-IUSE="X"
+IUSE=""
 
 DEPEND="
dev-libs/icu:=
@@ -48,17 +48,10 @@ DEPEND="
>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
>=kde-frameworks/kwindowsystem-${KFMIN}:5
>=kde-frameworks/kxmlgui-${KFMIN}:5
-   X? ( x11-libs/libX11 )
 "
 RDEPEND="${DEPEND}"
 
-src_configure() {
-   local mycmakeargs=(
-   -DWITHOUT_X11=$(usex !X)
-   )
-
-   ecm_src_configure
-}
+PATCHES=( "${FILESDIR}/${PN}-23.08.1-drop-unused-X11-dep.patch" ) # FIXME 
properly upstream
 
 src_test() {
# DBusTest: drkonqi process interferes. bug 702690

diff --git a/kde-apps/konsole/konsole-.ebuild 
b/kde-apps/konsole/konsole-.ebuild
index 2a1195cc09..497c0bb398 100644
--- a/kde-apps/konsole/konsole-.ebuild
+++ b/kde-apps/konsole/konsole-.ebuild
@@ -15,7 +15,7 @@ HOMEPAGE="https://apps.kde.org/konsole/ 
https://konsole.kde.org;
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
 KEYWORDS=""
-IUSE="X"
+IUSE=""
 
 DEPEND="
dev-libs/icu:=
@@ -48,17 +48,10 @@ DEPEND="
>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
>=kde-frameworks/kwindowsystem-${KFMIN}:5
>=kde-frameworks/kxmlgui-${KFMIN}:5
-   X? ( x11-libs/libX11 )
 "
 RDEPEND="${DEPEND}"
 
-src_configure() {
-   local mycmakeargs=(
-   -DWITHOUT_X11=$(usex !X)
-   )
-
-   ecm_src_configure
-}
+PATCHES=( "${FILESDIR}/${PN}-23.08.1-drop-unused-X11-dep.patch" ) # FIXME 
properly upstream
 
 src_test() {
# DBusTest: drkonqi process interferes. bug 702690

[gentoo-commits] proj/kde:master commit in: kde-apps/konsole/

2023-09-14 Thread Andreas Sturmlechner 
commit: c533d4ddb542fcb3c71255bc359eb7d0e2afec58
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Thu Sep 14 20:56:11 2023 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Thu Sep 14 21:14:28 2023 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=c533d4dd

kde-apps/konsole: Add missing dependency

Bug: https://bugs.gentoo.org/914127
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 kde-apps/konsole/konsole-23.08.49..ebuild | 3 ++-
 kde-apps/konsole/konsole-.ebuild  | 3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/kde-apps/konsole/konsole-23.08.49..ebuild 
b/kde-apps/konsole/konsole-23.08.49..ebuild
index 738b0d3c34..2a1195cc09 100644
--- a/kde-apps/konsole/konsole-23.08.49..ebuild
+++ b/kde-apps/konsole/konsole-23.08.49..ebuild
@@ -32,11 +32,12 @@ DEPEND="
>=kde-frameworks/kcoreaddons-${KFMIN}:5
>=kde-frameworks/kcrash-${KFMIN}:5
>=kde-frameworks/kdbusaddons-${KFMIN}:5
+   >=kde-frameworks/kglobalaccel-${KFMIN}:5
>=kde-frameworks/kguiaddons-${KFMIN}:5
-   >=kde-frameworks/kjobwidgets-${KFMIN}:5
>=kde-frameworks/ki18n-${KFMIN}:5
>=kde-frameworks/kiconthemes-${KFMIN}:5
>=kde-frameworks/kio-${KFMIN}:5
+   >=kde-frameworks/kjobwidgets-${KFMIN}:5
>=kde-frameworks/knewstuff-${KFMIN}:5
>=kde-frameworks/knotifications-${KFMIN}:5
>=kde-frameworks/knotifyconfig-${KFMIN}:5

diff --git a/kde-apps/konsole/konsole-.ebuild 
b/kde-apps/konsole/konsole-.ebuild
index 738b0d3c34..2a1195cc09 100644
--- a/kde-apps/konsole/konsole-.ebuild
+++ b/kde-apps/konsole/konsole-.ebuild
@@ -32,11 +32,12 @@ DEPEND="
>=kde-frameworks/kcoreaddons-${KFMIN}:5
>=kde-frameworks/kcrash-${KFMIN}:5
>=kde-frameworks/kdbusaddons-${KFMIN}:5
+   >=kde-frameworks/kglobalaccel-${KFMIN}:5
>=kde-frameworks/kguiaddons-${KFMIN}:5
-   >=kde-frameworks/kjobwidgets-${KFMIN}:5
>=kde-frameworks/ki18n-${KFMIN}:5
>=kde-frameworks/kiconthemes-${KFMIN}:5
>=kde-frameworks/kio-${KFMIN}:5
+   >=kde-frameworks/kjobwidgets-${KFMIN}:5
>=kde-frameworks/knewstuff-${KFMIN}:5
>=kde-frameworks/knotifications-${KFMIN}:5
>=kde-frameworks/knotifyconfig-${KFMIN}:5

[gentoo-commits] proj/kde:master commit in: kde-apps/konsole/

2023-08-01 Thread Sam James 
commit: 7dd55c74bcf8fa7d3b47b31e083567be2f7b7030
Author: Sam James  gentoo  org>
AuthorDate: Wed Aug  2 05:47:33 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Wed Aug  2 05:48:09 2023 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=7dd55c74

kde-apps/konsole: skip extremely flaky TerminalInterfaceTest test

Closes: https://bugs.gentoo.org/862594
Closes: https://bugs.gentoo.org/662756
Signed-off-by: Sam James  gentoo.org>

 kde-apps/konsole/konsole-.ebuild | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/kde-apps/konsole/konsole-.ebuild 
b/kde-apps/konsole/konsole-.ebuild
index b059acebcc..738b0d3c34 100644
--- a/kde-apps/konsole/konsole-.ebuild
+++ b/kde-apps/konsole/konsole-.ebuild
@@ -60,9 +60,10 @@ src_configure() {
 }
 
 src_test() {
-   # drkonqi process interferes. bug 702690
+   # DBusTest: drkonqi process interferes. bug 702690
+   # TerminalInterfaceTest: unbelievably flaky, bug 862594 and bug 662756
local myctestargs=(
-   -E "(DBusTest)"
+   -E "(DBusTest|TerminalInterfaceTest)"
)
 
ecm_src_test

[gentoo-commits] proj/kde:master commit in: kde-apps/konsole/

2023-03-24 Thread Andreas Sturmlechner 
commit: 666990b5740a3a5db01b959d07836b4c02da744c
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Fri Mar 24 23:42:23 2023 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Fri Mar 24 23:43:26 2023 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=666990b5

kde-apps/konsole: Add new dependency

Upstream commit 752a8b2f81dfc6bd94ed20e94dd03b301216b563

Signed-off-by: Andreas Sturmlechner  gentoo.org>

 kde-apps/konsole/konsole-.ebuild | 1 +
 1 file changed, 1 insertion(+)

diff --git a/kde-apps/konsole/konsole-.ebuild 
b/kde-apps/konsole/konsole-.ebuild
index 21a3210b0a..17ecc1b8eb 100644
--- a/kde-apps/konsole/konsole-.ebuild
+++ b/kde-apps/konsole/konsole-.ebuild
@@ -22,6 +22,7 @@ DEPEND="
dev-libs/icu:=
>=dev-qt/qtdbus-${QTMIN}:5
>=dev-qt/qtgui-${QTMIN}:5
+   >=dev-qt/qtmultimedia-${QTMIN}:5
>=dev-qt/qtnetwork-${QTMIN}:5
>=dev-qt/qtprintsupport-${QTMIN}:5
>=dev-qt/qtwidgets-${QTMIN}:5

[gentoo-commits] proj/kde:master commit in: kde-apps/konsole/

2022-11-11 Thread Andreas Sturmlechner 
commit: c8f262b29eb1ad171c591a5964340cc5613c
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Fri Nov 11 23:00:57 2022 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Fri Nov 11 23:00:57 2022 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=c8f262b2

kde-apps/konsole: Add new dependency

Upstream commit 76f879cd70fb494ab2334d2660b34679546f3d9d

Signed-off-by: Andreas Sturmlechner  gentoo.org>

 kde-apps/konsole/konsole-.ebuild | 1 +
 1 file changed, 1 insertion(+)

diff --git a/kde-apps/konsole/konsole-.ebuild 
b/kde-apps/konsole/konsole-.ebuild
index 921dd3e02e..51eb87d9fa 100644
--- a/kde-apps/konsole/konsole-.ebuild
+++ b/kde-apps/konsole/konsole-.ebuild
@@ -19,6 +19,7 @@ KEYWORDS=""
 IUSE="X"
 
 DEPEND="
+   dev-libs/icu:=
>=dev-qt/qtdbus-${QTMIN}:5
>=dev-qt/qtgui-${QTMIN}:5
>=dev-qt/qtnetwork-${QTMIN}:5

[gentoo-commits] proj/kde:master commit in: kde-apps/konsole/files/, kde-apps/konsole/

2022-07-31 Thread Andreas Sturmlechner 
commit: de56cc11b5be214fba43b3c265aba76b4c69d280
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Sat Jul 30 08:33:05 2022 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Sun Jul 31 15:10:49 2022 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=de56cc11

kde-apps/konsole: Fix build with USE -X

Upstream commit 0aa39e22a2bb1bbcb8a02dfd6635ffe4d8a0bbb1

Bug: https://bugs.gentoo.org/813450
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 .../files/konsole-22.04.3-without_x11.patch| 46 ++
 kde-apps/konsole/konsole-22.07.80.ebuild   |  4 +-
 kde-apps/konsole/konsole-22.08.49..ebuild  |  4 +-
 3 files changed, 52 insertions(+), 2 deletions(-)

diff --git a/kde-apps/konsole/files/konsole-22.04.3-without_x11.patch 
b/kde-apps/konsole/files/konsole-22.04.3-without_x11.patch
new file mode 100644
index 00..ed396fcf20
--- /dev/null
+++ b/kde-apps/konsole/files/konsole-22.04.3-without_x11.patch
@@ -0,0 +1,46 @@
+From 0aa39e22a2bb1bbcb8a02dfd6635ffe4d8a0bbb1 Mon Sep 17 00:00:00 2001
+From: Andreas Sturmlechner 
+Date: Sat, 27 Nov 2021 14:43:18 +0100
+Subject: [PATCH] Add CMake option to build WITHOUT_X11
+
+We want to be able to build without X11 support even if some of the used
+libraries may not work w/o X11 themselves yet or need to be built with
+X11 support for other reverse dependencies.
+
+HAVE_X11 already exists and is set automagically so far, but using
+-DCMAKE_DISABLE_FIND_PACKAGE_X11 will break if any dependencies list X11
+as required in their cmake config.
+
+Introducing this option means there is no behavior change by default,
+cmake will just skip finding X11 or adding unwanted features if the
+option is enabled.
+
+Signed-off-by: Andreas Sturmlechner 
+---
+ CMakeLists.txt | 9 ++---
+ 1 file changed, 6 insertions(+), 3 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 61ed70cd7..565682848 100644
+--- a/CMakeLists.txt
 b/CMakeLists.txt
+@@ -103,10 +103,13 @@ set_package_properties(KF5DocTools PROPERTIES DESCRIPTION
+ )
+ 
+ if(NOT APPLE)
+-find_package(X11)
+-set_package_properties(X11 PROPERTIES TYPE OPTIONAL)
++option(WITHOUT_X11 "Build without X11 integration (skips finding X11)" 
OFF)
++if (NOT WITHOUT_X11)
++find_package(X11)
++set_package_properties(X11 PROPERTIES TYPE OPTIONAL)
++set(HAVE_X11 ${X11_FOUND})
++endif()
+ endif()
+-set(HAVE_X11 ${X11_FOUND})
+ 
+ # Check for function GETPWUID
+ check_symbol_exists(getpwuid "pwd.h" HAVE_GETPWUID)
+-- 
+GitLab
+

diff --git a/kde-apps/konsole/konsole-22.07.80.ebuild 
b/kde-apps/konsole/konsole-22.07.80.ebuild
index a0a71ba6f8..b2ba161347 100644
--- a/kde-apps/konsole/konsole-22.07.80.ebuild
+++ b/kde-apps/konsole/konsole-22.07.80.ebuild
@@ -50,9 +50,11 @@ DEPEND="
 "
 RDEPEND="${DEPEND}"
 
+PATCHES=( "${FILESDIR}/${PN}-22.04.3-without_x11.patch" )
+
 src_configure() {
local mycmakeargs=(
-   $(cmake_use_find_package X X11)
+   -DWITHOUT_X11=$(usex !X)
)
 
ecm_src_configure

diff --git a/kde-apps/konsole/konsole-22.08.49..ebuild 
b/kde-apps/konsole/konsole-22.08.49..ebuild
index 059873271c..0a92af7f86 100644
--- a/kde-apps/konsole/konsole-22.08.49..ebuild
+++ b/kde-apps/konsole/konsole-22.08.49..ebuild
@@ -50,9 +50,11 @@ DEPEND="
 "
 RDEPEND="${DEPEND}"
 
+PATCHES=( "${FILESDIR}/${PN}-22.04.3-without_x11.patch" )
+
 src_configure() {
local mycmakeargs=(
-   $(cmake_use_find_package X X11)
+   -DWITHOUT_X11=$(usex !X)
)
 
ecm_src_configure

[gentoo-commits] proj/kde:master commit in: kde-apps/konsole/

2021-05-12 Thread Andreas Sturmlechner 
commit: ec1f7790f906f1f18b0be80c8b3867e33ecac461
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Wed May 12 07:36:05 2021 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Wed May 12 07:36:05 2021 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=ec1f7790

kde-apps/konsole: 21.04.1 version bump

Signed-off-by: Andreas Sturmlechner  gentoo.org>

 kde-apps/konsole/konsole-21.04.1.ebuild | 74 +
 1 file changed, 74 insertions(+)

diff --git a/kde-apps/konsole/konsole-21.04.1.ebuild 
b/kde-apps/konsole/konsole-21.04.1.ebuild
new file mode 100644
index 00..701329615e
--- /dev/null
+++ b/kde-apps/konsole/konsole-21.04.1.ebuild
@@ -0,0 +1,74 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ECM_HANDBOOK="optional"
+ECM_TEST="true"
+KFMIN=5.80.0
+QTMIN=5.15.2
+VIRTUALX_REQUIRED="test"
+inherit ecm kde.org
+
+DESCRIPTION="KDE's terminal emulator"
+HOMEPAGE="https://apps.kde.org/en/konsole https://konsole.kde.org;
+
+LICENSE="GPL-2" # TODO: CHECK
+SLOT="5"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+IUSE="X"
+
+DEPEND="
+   >=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-frameworks/kbookmarks-${KFMIN}:5
+   >=kde-frameworks/kconfig-${KFMIN}:5
+   >=kde-frameworks/kconfigwidgets-${KFMIN}:5
+   >=kde-frameworks/kcoreaddons-${KFMIN}:5
+   >=kde-frameworks/kcrash-${KFMIN}:5
+   >=kde-frameworks/kdbusaddons-${KFMIN}:5
+   >=kde-frameworks/kguiaddons-${KFMIN}:5
+   >=kde-frameworks/kjobwidgets-${KFMIN}:5
+   >=kde-frameworks/ki18n-${KFMIN}:5
+   >=kde-frameworks/kinit-${KFMIN}:5
+   >=kde-frameworks/kiconthemes-${KFMIN}:5
+   >=kde-frameworks/kio-${KFMIN}:5
+   >=kde-frameworks/knewstuff-${KFMIN}:5
+   >=kde-frameworks/knotifications-${KFMIN}:5
+   >=kde-frameworks/knotifyconfig-${KFMIN}:5
+   >=kde-frameworks/kparts-${KFMIN}:5
+   >=kde-frameworks/kpty-${KFMIN}:5
+   >=kde-frameworks/kservice-${KFMIN}:5
+   >=kde-frameworks/ktextwidgets-${KFMIN}:5
+   >=kde-frameworks/kwidgetsaddons-${KFMIN}:5
+   >=kde-frameworks/kwindowsystem-${KFMIN}:5
+   >=kde-frameworks/kxmlgui-${KFMIN}:5
+   X? ( x11-libs/libX11 )
+"
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+   ecm_src_prepare
+   ecm_punt_bogus_dep KF5 Completion
+}
+
+src_configure() {
+   local mycmakeargs=(
+   $(cmake_use_find_package X X11)
+   )
+
+   ecm_src_configure
+}
+
+src_test() {
+   # drkonqi process interferes. bug 702690
+   local myctestargs=(
+   -E "(DBusTest)"
+   )
+
+   ecm_src_test
+}

[gentoo-commits] proj/kde:master commit in: kde-apps/konsole/

2021-04-16 Thread Andreas Sturmlechner 
commit: 7fe3e62881cffe612e282332433dcd310132be71
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Fri Apr 16 19:53:48 2021 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Fri Apr 16 19:53:48 2021 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=7fe3e628

kde-apps/konsole: Punt bogus kde-frameworks/kcompletion DEPEND

Upstream commit 8cd1dd056487551a6335371becbd2c689a507d7a

Package-Manager: Portage-3.0.18, Repoman-3.0.3
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 kde-apps/konsole/konsole-21.04.0.ebuild   | 6 +-
 kde-apps/konsole/konsole-21.04.49..ebuild | 6 +-
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/kde-apps/konsole/konsole-21.04.0.ebuild 
b/kde-apps/konsole/konsole-21.04.0.ebuild
index d67973a3bb..701329615e 100644
--- a/kde-apps/konsole/konsole-21.04.0.ebuild
+++ b/kde-apps/konsole/konsole-21.04.0.ebuild
@@ -26,7 +26,6 @@ DEPEND="
>=dev-qt/qtwidgets-${QTMIN}:5
>=dev-qt/qtxml-${QTMIN}:5
>=kde-frameworks/kbookmarks-${KFMIN}:5
-   >=kde-frameworks/kcompletion-${KFMIN}:5
>=kde-frameworks/kconfig-${KFMIN}:5
>=kde-frameworks/kconfigwidgets-${KFMIN}:5
>=kde-frameworks/kcoreaddons-${KFMIN}:5
@@ -52,6 +51,11 @@ DEPEND="
 "
 RDEPEND="${DEPEND}"
 
+src_prepare() {
+   ecm_src_prepare
+   ecm_punt_bogus_dep KF5 Completion
+}
+
 src_configure() {
local mycmakeargs=(
$(cmake_use_find_package X X11)

diff --git a/kde-apps/konsole/konsole-21.04.49..ebuild 
b/kde-apps/konsole/konsole-21.04.49..ebuild
index 360e7691af..68aaca34dd 100644
--- a/kde-apps/konsole/konsole-21.04.49..ebuild
+++ b/kde-apps/konsole/konsole-21.04.49..ebuild
@@ -26,7 +26,6 @@ DEPEND="
>=dev-qt/qtwidgets-${QTMIN}:5
>=dev-qt/qtxml-${QTMIN}:5
>=kde-frameworks/kbookmarks-${KFMIN}:5
-   >=kde-frameworks/kcompletion-${KFMIN}:5
>=kde-frameworks/kconfig-${KFMIN}:5
>=kde-frameworks/kconfigwidgets-${KFMIN}:5
>=kde-frameworks/kcoreaddons-${KFMIN}:5
@@ -52,6 +51,11 @@ DEPEND="
 "
 RDEPEND="${DEPEND}"
 
+src_prepare() {
+   ecm_src_prepare
+   ecm_punt_bogus_dep KF5 Completion
+}
+
 src_configure() {
local mycmakeargs=(
$(cmake_use_find_package X X11)

[gentoo-commits] proj/kde:master commit in: kde-apps/konsole/

2021-04-16 Thread Andreas Sturmlechner 
commit: bf96b90ddcb087890c3449477cd5c5c85ff64f1b
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Thu Apr 15 20:07:21 2021 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Fri Apr 16 19:32:20 2021 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=bf96b90d

kde-apps/konsole: Drop unused DEPENDs

Upstream commits:
4b3dca80f3425f0a16192df5a8ca27e97598a044
8cd1dd056487551a6335371becbd2c689a507d7a

Package-Manager: Portage-3.0.18, Repoman-3.0.3
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 kde-apps/konsole/konsole-.ebuild | 2 --
 1 file changed, 2 deletions(-)

diff --git a/kde-apps/konsole/konsole-.ebuild 
b/kde-apps/konsole/konsole-.ebuild
index 3a1ce8fbc4..ef76eb95fa 100644
--- a/kde-apps/konsole/konsole-.ebuild
+++ b/kde-apps/konsole/konsole-.ebuild
@@ -26,7 +26,6 @@ DEPEND="
>=dev-qt/qtwidgets-${QTMIN}:5
>=dev-qt/qtxml-${QTMIN}:5
>=kde-frameworks/kbookmarks-${KFMIN}:5
-   >=kde-frameworks/kcompletion-${KFMIN}:5
>=kde-frameworks/kconfig-${KFMIN}:5
>=kde-frameworks/kconfigwidgets-${KFMIN}:5
>=kde-frameworks/kcoreaddons-${KFMIN}:5
@@ -35,7 +34,6 @@ DEPEND="
>=kde-frameworks/kguiaddons-${KFMIN}:5
>=kde-frameworks/kjobwidgets-${KFMIN}:5
>=kde-frameworks/ki18n-${KFMIN}:5
-   >=kde-frameworks/kinit-${KFMIN}:5
>=kde-frameworks/kiconthemes-${KFMIN}:5
>=kde-frameworks/kio-${KFMIN}:5
>=kde-frameworks/knewstuff-${KFMIN}:5

[gentoo-commits] proj/kde:master commit in: kde-apps/konsole/

2020-05-30 Thread Andreas Sturmlechner 
commit: d3c5272da2bf6a622c85054e09798d59e21a9a90
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Sat May 30 10:53:41 2020 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Sat May 30 10:53:41 2020 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=d3c5272d

kde-apps/konsole: Disable hanging DBusTest

Bug: https://bugs.gentoo.org/702690
Package-Manager: Portage-2.3.100, Repoman-2.3.22
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 kde-apps/konsole/konsole-20.04.49..ebuild | 9 +
 kde-apps/konsole/konsole-.ebuild  | 9 +
 2 files changed, 18 insertions(+)

diff --git a/kde-apps/konsole/konsole-20.04.49..ebuild 
b/kde-apps/konsole/konsole-20.04.49..ebuild
index 08d1354a51..bfac7a913d 100644
--- a/kde-apps/konsole/konsole-20.04.49..ebuild
+++ b/kde-apps/konsole/konsole-20.04.49..ebuild
@@ -60,3 +60,12 @@ src_configure() {
 
ecm_src_configure
 }
+
+src_test() {
+   # drkonqi process interferes. bug 702690
+   local myctestargs=(
+   -E "(DBusTest)"
+   )
+
+   ecm_src_test
+}

diff --git a/kde-apps/konsole/konsole-.ebuild 
b/kde-apps/konsole/konsole-.ebuild
index 08d1354a51..bfac7a913d 100644
--- a/kde-apps/konsole/konsole-.ebuild
+++ b/kde-apps/konsole/konsole-.ebuild
@@ -60,3 +60,12 @@ src_configure() {
 
ecm_src_configure
 }
+
+src_test() {
+   # drkonqi process interferes. bug 702690
+   local myctestargs=(
+   -E "(DBusTest)"
+   )
+
+   ecm_src_test
+}

[gentoo-commits] proj/kde:master commit in: kde-apps/konsole/

2020-04-18 Thread Andreas Sturmlechner 
commit: f424dbc3bfa2f112e0b0c9f9b712f78f3095ea4d
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Sat Apr 18 07:57:54 2020 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Sat Apr 18 07:58:26 2020 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=f424dbc3

kde-apps/konsole: Sort DEPENDs

Package-Manager: Portage-2.3.99, Repoman-2.3.22
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 kde-apps/konsole/konsole-20.03.90.ebuild  | 12 ++--
 kde-apps/konsole/konsole-20.04.0.ebuild   | 12 ++--
 kde-apps/konsole/konsole-20.04.49..ebuild | 12 ++--
 kde-apps/konsole/konsole-.ebuild  | 12 ++--
 4 files changed, 24 insertions(+), 24 deletions(-)

diff --git a/kde-apps/konsole/konsole-20.03.90.ebuild 
b/kde-apps/konsole/konsole-20.03.90.ebuild
index 9aa67b1a2b..f91b50d929 100644
--- a/kde-apps/konsole/konsole-20.03.90.ebuild
+++ b/kde-apps/konsole/konsole-20.03.90.ebuild
@@ -20,6 +20,12 @@ KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
 IUSE="X"
 
 DEPEND="
+   >=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-frameworks/kbookmarks-${KFMIN}:5
>=kde-frameworks/kcompletion-${KFMIN}:5
>=kde-frameworks/kconfig-${KFMIN}:5
@@ -43,12 +49,6 @@ DEPEND="
>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
>=kde-frameworks/kwindowsystem-${KFMIN}:5
>=kde-frameworks/kxmlgui-${KFMIN}: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
X? ( x11-libs/libX11 )
 "
 RDEPEND="${DEPEND}"

diff --git a/kde-apps/konsole/konsole-20.04.0.ebuild 
b/kde-apps/konsole/konsole-20.04.0.ebuild
index 9aa67b1a2b..f91b50d929 100644
--- a/kde-apps/konsole/konsole-20.04.0.ebuild
+++ b/kde-apps/konsole/konsole-20.04.0.ebuild
@@ -20,6 +20,12 @@ KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
 IUSE="X"
 
 DEPEND="
+   >=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-frameworks/kbookmarks-${KFMIN}:5
>=kde-frameworks/kcompletion-${KFMIN}:5
>=kde-frameworks/kconfig-${KFMIN}:5
@@ -43,12 +49,6 @@ DEPEND="
>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
>=kde-frameworks/kwindowsystem-${KFMIN}:5
>=kde-frameworks/kxmlgui-${KFMIN}: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
X? ( x11-libs/libX11 )
 "
 RDEPEND="${DEPEND}"

diff --git a/kde-apps/konsole/konsole-20.04.49..ebuild 
b/kde-apps/konsole/konsole-20.04.49..ebuild
index dc3301093f..64adbc3047 100644
--- a/kde-apps/konsole/konsole-20.04.49..ebuild
+++ b/kde-apps/konsole/konsole-20.04.49..ebuild
@@ -20,6 +20,12 @@ KEYWORDS=""
 IUSE="X"
 
 DEPEND="
+   >=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-frameworks/kbookmarks-${KFMIN}:5
>=kde-frameworks/kcompletion-${KFMIN}:5
>=kde-frameworks/kconfig-${KFMIN}:5
@@ -43,12 +49,6 @@ DEPEND="
>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
>=kde-frameworks/kwindowsystem-${KFMIN}:5
>=kde-frameworks/kxmlgui-${KFMIN}: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
X? ( x11-libs/libX11 )
 "
 RDEPEND="${DEPEND}"

diff --git a/kde-apps/konsole/konsole-.ebuild 
b/kde-apps/konsole/konsole-.ebuild
index b6779fdc81..a01421245d 100644
--- a/kde-apps/konsole/konsole-.ebuild
+++ b/kde-apps/konsole/konsole-.ebuild
@@ -20,6 +20,12 @@ KEYWORDS=""
 IUSE="X"
 
 DEPEND="
+   >=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-frameworks/kbookmarks-${KFMIN}:5
>=kde-frameworks/kcompletion-${KFMIN}:5
>=kde-frameworks/kconfig-${KFMIN}:5
@@ -43,12 +49,6 @@ DEPEND="
>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
>=kde-frameworks/kwindowsystem-${KFMIN}:5
>=kde-frameworks/kxmlgui-${KFMIN}:5
-   >=dev-qt/qtdbus-${QTMIN}:5
-   >=dev-qt/qtgui-${QTMIN}:5
-   >=dev-qt/qtnetwork-${QTMIN}:5

[gentoo-commits] proj/kde:master commit in: kde-apps/konsole/, kde-apps/konsole/files/

2020-02-12 Thread Andreas Sturmlechner 
commit: 5feba2df29bcc25473f2a7b3b18f3256fee190ad
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Wed Feb 12 21:50:00 2020 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Wed Feb 12 23:10:47 2020 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=5feba2df

kde-apps/konsole: ColorScheme: Fix DarkBackground Detection

See also: https://invent.kde.org/kde/konsole/merge_requests/65
KDE-Bug: https://bugs.kde.org/show_bug.cgi?id=416638
Thanks-to: Manuel Rüger  gentoo.org>
Package-Manager: Portage-2.3.88, Repoman-2.3.20
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 .../konsole-19.12.2-darkbackground-detect.patch| 27 ++
 kde-apps/konsole/konsole-19.12.49..ebuild  |  2 ++
 2 files changed, 29 insertions(+)

diff --git a/kde-apps/konsole/files/konsole-19.12.2-darkbackground-detect.patch 
b/kde-apps/konsole/files/konsole-19.12.2-darkbackground-detect.patch
new file mode 100644
index 00..990bad142c
--- /dev/null
+++ b/kde-apps/konsole/files/konsole-19.12.2-darkbackground-detect.patch
@@ -0,0 +1,27 @@
+From e5b2ada1a6f06e0eea76af1f26ff4c0c4aad8497 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Manuel=20R=C3=BCger?= 
+Date: Thu, 23 Jan 2020 11:00:06 +0100
+Subject: ColorScheme: Fix DarkBackground Detection
+
+Luminance is a value between 0 and 100.
+
+https://bugs.kde.org/show_bug.cgi?id=416638
+---
+ src/ColorScheme.cpp | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/ColorScheme.cpp b/src/ColorScheme.cpp
+index 1693c22..5d6b408 100644
+--- a/src/ColorScheme.cpp
 b/src/ColorScheme.cpp
+@@ -403,7 +403,7 @@ bool ColorScheme::hasDarkBackground() const
+ const double g = backgroundColor().greenF();
+ const double b = backgroundColor().blueF();
+ rgb2hsluv(r, g, b, , , );
+-return l < 0.5;
++return l < 50;
+ }
+ 
+ void ColorScheme::setOpacity(qreal opacity)
+-- 
+cgit v1.1

diff --git a/kde-apps/konsole/konsole-19.12.49..ebuild 
b/kde-apps/konsole/konsole-19.12.49..ebuild
index c4c1bb90b5..8c4abf3812 100644
--- a/kde-apps/konsole/konsole-19.12.49..ebuild
+++ b/kde-apps/konsole/konsole-19.12.49..ebuild
@@ -53,6 +53,8 @@ DEPEND="
 "
 RDEPEND="${DEPEND}"
 
+PATCHES=( "${FILESDIR}/${PN}-19.12.2-darkbackground-detect.patch" )
+
 src_configure() {
local mycmakeargs=(
$(cmake_use_find_package X X11)

[gentoo-commits] proj/kde:master commit in: kde-apps/konsole/files/, kde-apps/konsole/

2019-03-06 Thread Andreas Sturmlechner 
commit: 42accedeeb919a0aeb10f67d4cbde001b8fee38f
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Wed Mar  6 14:32:32 2019 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Wed Mar  6 14:32:32 2019 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=42accede

kde-apps/konsole: Fix disappearing/non-moving cursor

KDE-Bug: https://bugs.kde.org/show_bug.cgi?id=402589
Bug: https://bugs.gentoo.org/673766
Signed-off-by: Andreas Sturmlechner  gentoo.org>
Package-Manager: Portage-2.3.51, Repoman-2.3.11

 .../konsole/files/konsole-18.12.3-cursor.patch | 84 ++
 kde-apps/konsole/konsole-18.12.3.ebuild|  2 +
 2 files changed, 86 insertions(+)

diff --git a/kde-apps/konsole/files/konsole-18.12.3-cursor.patch 
b/kde-apps/konsole/files/konsole-18.12.3-cursor.patch
new file mode 100644
index 00..f9960340b9
--- /dev/null
+++ b/kde-apps/konsole/files/konsole-18.12.3-cursor.patch
@@ -0,0 +1,84 @@
+From eccfb1f62bbf67ebffee11e241bd05757b826ff1 Mon Sep 17 00:00:00 2001
+From: Wolfgang Bauer 
+Date: Mon, 4 Mar 2019 09:59:45 -0500
+Subject: Fix ibeam and underline cursor rendering
+
+Summary:
+Since anti-aliasing was enabled in the painter, coordinates need to
+be shifted half a pixel so that they align with the pixel grid,
+otherwise the result gets "blurred" due to the anti-aliasing.
+And as parts of the blurred shape leak outside the cursor rectangle,
+this also leaves artifacts when the cursor moves or blinks as these
+parts are not cleared.
+
+This is basically the same as commit
+e7085310d6d594823d0ed491fa8bdbd99dec4932 for the
+standard block cursor.
+
+BUG: 402589
+
+Test Plan:
+- Switch cursor shape to "I-Beam" or "Underline" in the "Advanced"
+profile settings
+
+The cursors are a single line again now, before they were blurred by
+anti-aliasing.
+
+Screenshots:
+Before:
+{F6656366}
+{F6656370}
+
+After:
+{F6656371}
+{F6656373}
+
+Also, there are no more artifacts when the cursor is moved or
+cursor blinking is enabled.
+
+Reviewers: #konsole, hindenburg
+
+Reviewed By: #konsole, hindenburg
+
+Subscribers: hindenburg, konsole-devel
+
+Tags: #konsole
+
+Differential Revision: https://phabricator.kde.org/D19513
+---
+ src/TerminalDisplay.cpp | 18 ++
+ 1 file changed, 10 insertions(+), 8 deletions(-)
+
+diff --git a/src/TerminalDisplay.cpp b/src/TerminalDisplay.cpp
+index 543b897..397422c 100644
+--- a/src/TerminalDisplay.cpp
 b/src/TerminalDisplay.cpp
+@@ -716,16 +716,18 @@ void TerminalDisplay::drawCursor(QPainter& painter,
+ }
+ }
+ } else if (_cursorShape == Enum::UnderlineCursor) {
+-painter.drawLine(cursorRect.left(),
+- cursorRect.bottom(),
+- cursorRect.right(),
+- cursorRect.bottom());
++QLineF line(cursorRect.left() + 0.5,
++cursorRect.bottom() - 0.5,
++cursorRect.right() - 0.5,
++cursorRect.bottom() - 0.5);
++painter.drawLine(line);
+ 
+ } else if (_cursorShape == Enum::IBeamCursor) {
+-painter.drawLine(cursorRect.left(),
+- cursorRect.top(),
+- cursorRect.left(),
+- cursorRect.bottom());
++QLineF line(cursorRect.left() + 0.5,
++cursorRect.top() + 0.5,
++cursorRect.left() + 0.5,
++cursorRect.bottom() - 0.5);
++painter.drawLine(line);
+ }
+ }
+ 
+-- 
+cgit v1.1

diff --git a/kde-apps/konsole/konsole-18.12.3.ebuild 
b/kde-apps/konsole/konsole-18.12.3.ebuild
index 69ba89156d..65dd4d2ac6 100644
--- a/kde-apps/konsole/konsole-18.12.3.ebuild
+++ b/kde-apps/konsole/konsole-18.12.3.ebuild
@@ -55,3 +55,5 @@ src_configure() {
 
kde5_src_configure
 }
+
+PATCHES=( "${FILESDIR}/${P}-cursor.patch" ) # bug 673766

[gentoo-commits] proj/kde:master commit in: kde-apps/konsole/

2018-04-19 Thread Andreas Sturmlechner 
commit: ee16f373b25bc6809cdb1fbdc91d05ac16ddcfa8
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Fri Apr 20 00:42:54 2018 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Fri Apr 20 00:43:30 2018 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=ee16f373

kde-apps/konsole: Add missing DEPEND

Package-Manager: Portage-2.3.31, Repoman-2.3.9

 kde-apps/konsole/konsole-18.04.49..ebuild | 1 +
 kde-apps/konsole/konsole-.ebuild  | 1 +
 2 files changed, 2 insertions(+)

diff --git a/kde-apps/konsole/konsole-18.04.49..ebuild 
b/kde-apps/konsole/konsole-18.04.49..ebuild
index da3754de86..cedc5d57ee 100644
--- a/kde-apps/konsole/konsole-18.04.49..ebuild
+++ b/kde-apps/konsole/konsole-18.04.49..ebuild
@@ -28,6 +28,7 @@ DEPEND="
$(add_frameworks_dep kinit)
$(add_frameworks_dep kiconthemes)
$(add_frameworks_dep kio)
+   $(add_frameworks_dep knewstuff)
$(add_frameworks_dep knotifications)
$(add_frameworks_dep knotifyconfig)
$(add_frameworks_dep kparts)

diff --git a/kde-apps/konsole/konsole-.ebuild 
b/kde-apps/konsole/konsole-.ebuild
index da3754de86..cedc5d57ee 100644
--- a/kde-apps/konsole/konsole-.ebuild
+++ b/kde-apps/konsole/konsole-.ebuild
@@ -28,6 +28,7 @@ DEPEND="
$(add_frameworks_dep kinit)
$(add_frameworks_dep kiconthemes)
$(add_frameworks_dep kio)
+   $(add_frameworks_dep knewstuff)
$(add_frameworks_dep knotifications)
$(add_frameworks_dep knotifyconfig)
$(add_frameworks_dep kparts)

[gentoo-commits] proj/kde:master commit in: kde-apps/konsole/files/, kde-apps/konsole/

2018-02-07 Thread Andreas Sturmlechner 
commit: 140d0b7b372c6c9060be89e07959aa017869f7c7
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Wed Feb  7 16:02:45 2018 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Thu Feb  8 00:14:07 2018 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=140d0b7b

kde-apps/konsole: Fix mouse wheel scrolling w/ libinput

KDE-Bug: https://bugs.kde.org/show_bug.cgi?id=386762
Package-Manager: Portage-2.3.24, Repoman-2.3.6

 .../konsole-17.12.1-libinput-pixeldelta.patch  | 54 ++
 kde-apps/konsole/konsole-17.12.2.ebuild|  2 +
 kde-apps/konsole/konsole-17.12.49..ebuild  |  2 +
 3 files changed, 58 insertions(+)

diff --git a/kde-apps/konsole/files/konsole-17.12.1-libinput-pixeldelta.patch 
b/kde-apps/konsole/files/konsole-17.12.1-libinput-pixeldelta.patch
new file mode 100644
index 00..37049b9b2f
--- /dev/null
+++ b/kde-apps/konsole/files/konsole-17.12.1-libinput-pixeldelta.patch
@@ -0,0 +1,54 @@
+From d25e5ac7089f2c81cc5ffe8e155ba8b3dfb11b97 Mon Sep 17 00:00:00 2001
+From: Kurt Hindenburg 
+Date: Wed, 7 Feb 2018 10:38:09 -0500
+Subject: Fix mouse wheel scrolling with libinput
+
+If the Libinput X server input driver is used we get a value for
+pixelDelta for a physical mouse wheel scroll, so we check that the
+source of the wheel event is actually a mouse, this was fixed in
+Qt 5.9.5*
+https://bugreports.qt.io/browse/QTBUG-59261
+
+Patch by ahmadsamir
+
+* fixed in Gentoo: Qt 5.9.4
+
+BUG: 386762
+Differential Revision: https://phabricator.kde.org/D9008
+---
+ src/ScrollState.cpp | 19 +++
+ 1 file changed, 15 insertions(+), 4 deletions(-)
+
+diff --git a/src/ScrollState.cpp b/src/ScrollState.cpp
+index e5b486d..f71b142 100644
+--- a/src/ScrollState.cpp
 b/src/ScrollState.cpp
+@@ -25,10 +25,21 @@ using namespace Konsole;
+ 
+ void ScrollState::addWheelEvent(const QWheelEvent *wheel)
+ {
+-if ((wheel->angleDelta().y() != 0) && (wheel->pixelDelta().y() == 0)) {
+-_remainingScrollPixel = 0;
+-} else {
+-_remainingScrollPixel += wheel->pixelDelta().y();
++// If the Libinput X server input driver is used we get a value for
++// pixelDelta for a physical mouse wheel scroll, so we check that
++// the source of the wheel event is actually a mouse, this has been
++// fixed upstream in Qt 5.9.5: https://bugreports.qt.io/browse/QTBUG-59261
++// Fixes Konsole BUG: https://bugs.kde.org/show_bug.cgi?id=386762
++#if (QT_VERSION < QT_VERSION_CHECK(5, 9, 4))
++if (wheel->source() != Qt::MouseEventNotSynthesized) {
++#else
++if (true) {
++#endif
++if ((wheel->angleDelta().y() != 0) && (wheel->pixelDelta().y() == 0)) 
{
++_remainingScrollPixel = 0;
++} else {
++_remainingScrollPixel += wheel->pixelDelta().y();
++}
+ }
+ _remainingScrollAngle += wheel->angleDelta().y();
+ }
+-- 
+cgit v0.11.2
+

diff --git a/kde-apps/konsole/konsole-17.12.2.ebuild 
b/kde-apps/konsole/konsole-17.12.2.ebuild
index c091c44e38..13661d1d26 100644
--- a/kde-apps/konsole/konsole-17.12.2.ebuild
+++ b/kde-apps/konsole/konsole-17.12.2.ebuild
@@ -47,6 +47,8 @@ DEPEND="
 "
 RDEPEND="${DEPEND}"
 
+PATCHES=( "${FILESDIR}/${PN}-17.12.1-libinput-pixeldelta.patch" )
+
 src_configure() {
local mycmakeargs=(
$(cmake-utils_use_find_package X X11)

diff --git a/kde-apps/konsole/konsole-17.12.49..ebuild 
b/kde-apps/konsole/konsole-17.12.49..ebuild
index da3754de86..91bdb3a97d 100644
--- a/kde-apps/konsole/konsole-17.12.49..ebuild
+++ b/kde-apps/konsole/konsole-17.12.49..ebuild
@@ -47,6 +47,8 @@ DEPEND="
 "
 RDEPEND="${DEPEND}"
 
+PATCHES=( "${FILESDIR}/${PN}-17.12.1-libinput-pixeldelta.patch" )
+
 src_configure() {
local mycmakeargs=(
$(cmake-utils_use_find_package X X11)

[gentoo-commits] proj/kde:master commit in: kde-apps/konsole/

2017-08-03 Thread Andreas Sturmlechner 
commit: 94de697f2e71a158f8cd1d5a367c4aa4ec027440
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Thu Aug  3 18:01:35 2017 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Thu Aug  3 18:01:35 2017 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=94de697f

kde-apps/konsole: Drop unused DEPEND

Upstream commit b77e0a35a92a86dd1b9aa483e16af7e619a89237

Package-Manager: Portage-2.3.6, Repoman-2.3.1

 kde-apps/konsole/konsole-17.08.49..ebuild | 1 -
 kde-apps/konsole/konsole-.ebuild  | 1 -
 2 files changed, 2 deletions(-)

diff --git a/kde-apps/konsole/konsole-17.08.49..ebuild 
b/kde-apps/konsole/konsole-17.08.49..ebuild
index b7ca938785..208306c9b3 100644
--- a/kde-apps/konsole/konsole-17.08.49..ebuild
+++ b/kde-apps/konsole/konsole-17.08.49..ebuild
@@ -41,7 +41,6 @@ DEPEND="
$(add_qt_dep qtgui)
$(add_qt_dep qtnetwork)
$(add_qt_dep qtprintsupport)
-   $(add_qt_dep qtscript)
$(add_qt_dep qtwidgets)
$(add_qt_dep qtxml)
X? ( x11-libs/libX11 )

diff --git a/kde-apps/konsole/konsole-.ebuild 
b/kde-apps/konsole/konsole-.ebuild
index b7ca938785..208306c9b3 100644
--- a/kde-apps/konsole/konsole-.ebuild
+++ b/kde-apps/konsole/konsole-.ebuild
@@ -41,7 +41,6 @@ DEPEND="
$(add_qt_dep qtgui)
$(add_qt_dep qtnetwork)
$(add_qt_dep qtprintsupport)
-   $(add_qt_dep qtscript)
$(add_qt_dep qtwidgets)
$(add_qt_dep qtxml)
X? ( x11-libs/libX11 )

[gentoo-commits] proj/kde:master commit in: kde-apps/konsole/

2016-09-01 Thread Michael Palimaka 
commit: 1a35af70add7986e2372078627af208c4005ea22
Author: Andreas Sturmlechner  gmail  com>
AuthorDate: Wed Aug 31 17:42:44 2016 +
Commit: Michael Palimaka  gentoo  org>
CommitDate: Thu Sep  1 20:03:34 2016 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=1a35af70

kde-apps/konsole: Add missing kde-frameworks/kcrash DEPEND

Package-Manager: portage-2.2.28

 kde-apps/konsole/konsole-16.08.49..ebuild | 1 +
 kde-apps/konsole/konsole-.ebuild  | 1 +
 2 files changed, 2 insertions(+)

diff --git a/kde-apps/konsole/konsole-16.08.49..ebuild 
b/kde-apps/konsole/konsole-16.08.49..ebuild
index e370ce0..c366acb 100644
--- a/kde-apps/konsole/konsole-16.08.49..ebuild
+++ b/kde-apps/konsole/konsole-16.08.49..ebuild
@@ -21,6 +21,7 @@ DEPEND="
$(add_frameworks_dep kconfig)
$(add_frameworks_dep kconfigwidgets)
$(add_frameworks_dep kcoreaddons)
+   $(add_frameworks_dep kcrash)
$(add_frameworks_dep kdbusaddons)
$(add_frameworks_dep kguiaddons)
$(add_frameworks_dep kjobwidgets)

diff --git a/kde-apps/konsole/konsole-.ebuild 
b/kde-apps/konsole/konsole-.ebuild
index e370ce0..c366acb 100644
--- a/kde-apps/konsole/konsole-.ebuild
+++ b/kde-apps/konsole/konsole-.ebuild
@@ -21,6 +21,7 @@ DEPEND="
$(add_frameworks_dep kconfig)
$(add_frameworks_dep kconfigwidgets)
$(add_frameworks_dep kcoreaddons)
+   $(add_frameworks_dep kcrash)
$(add_frameworks_dep kdbusaddons)
$(add_frameworks_dep kguiaddons)
$(add_frameworks_dep kjobwidgets)

[gentoo-commits] proj/kde:master commit in: kde-apps/konsole/

2016-08-14 Thread Michael Palimaka 
commit: ae1747b8bb1a2cf26300d074cfce609f1771ab09
Author: Andreas Sturmlechner  gmail  com>
AuthorDate: Sun Aug 14 20:03:16 2016 +
Commit: Michael Palimaka  gentoo  org>
CommitDate: Sun Aug 14 20:04:23 2016 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=ae1747b8

kde-apps/konsole: Set KDE_HANDBOOK to optional, fix DEPENDs

Ported away from kdelibs4support in upstream commit
27dec8d02f705c77eef45a2533bed203eec9454f

Package-Manager: portage-2.2.28

 kde-apps/konsole/konsole-16.07.90.ebuild  | 4 ++--
 kde-apps/konsole/konsole-16.08.49..ebuild | 4 ++--
 kde-apps/konsole/konsole-.ebuild  | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/kde-apps/konsole/konsole-16.07.90.ebuild 
b/kde-apps/konsole/konsole-16.07.90.ebuild
index f47f16f..2d53050 100644
--- a/kde-apps/konsole/konsole-16.07.90.ebuild
+++ b/kde-apps/konsole/konsole-16.07.90.ebuild
@@ -4,7 +4,7 @@
 
 EAPI=6
 
-KDE_HANDBOOK="forceoptional"
+KDE_HANDBOOK="optional"
 KDE_TEST="true"
 VIRTUALX_REQUIRED="test"
 inherit kde5
@@ -21,7 +21,7 @@ DEPEND="
$(add_frameworks_dep kconfig)
$(add_frameworks_dep kconfigwidgets)
$(add_frameworks_dep kcoreaddons)
-   $(add_frameworks_dep kdelibs4support)
+   $(add_frameworks_dep kdbusaddons)
$(add_frameworks_dep kguiaddons)
$(add_frameworks_dep kjobwidgets)
$(add_frameworks_dep ki18n)

diff --git a/kde-apps/konsole/konsole-16.08.49..ebuild 
b/kde-apps/konsole/konsole-16.08.49..ebuild
index 0510cda..e370ce0 100644
--- a/kde-apps/konsole/konsole-16.08.49..ebuild
+++ b/kde-apps/konsole/konsole-16.08.49..ebuild
@@ -4,7 +4,7 @@
 
 EAPI=6
 
-KDE_HANDBOOK="forceoptional"
+KDE_HANDBOOK="optional"
 KDE_TEST="true"
 VIRTUALX_REQUIRED="test"
 inherit kde5
@@ -21,7 +21,7 @@ DEPEND="
$(add_frameworks_dep kconfig)
$(add_frameworks_dep kconfigwidgets)
$(add_frameworks_dep kcoreaddons)
-   $(add_frameworks_dep kdelibs4support)
+   $(add_frameworks_dep kdbusaddons)
$(add_frameworks_dep kguiaddons)
$(add_frameworks_dep kjobwidgets)
$(add_frameworks_dep ki18n)

diff --git a/kde-apps/konsole/konsole-.ebuild 
b/kde-apps/konsole/konsole-.ebuild
index 0510cda..e370ce0 100644
--- a/kde-apps/konsole/konsole-.ebuild
+++ b/kde-apps/konsole/konsole-.ebuild
@@ -4,7 +4,7 @@
 
 EAPI=6
 
-KDE_HANDBOOK="forceoptional"
+KDE_HANDBOOK="optional"
 KDE_TEST="true"
 VIRTUALX_REQUIRED="test"
 inherit kde5
@@ -21,7 +21,7 @@ DEPEND="
$(add_frameworks_dep kconfig)
$(add_frameworks_dep kconfigwidgets)
$(add_frameworks_dep kcoreaddons)
-   $(add_frameworks_dep kdelibs4support)
+   $(add_frameworks_dep kdbusaddons)
$(add_frameworks_dep kguiaddons)
$(add_frameworks_dep kjobwidgets)
$(add_frameworks_dep ki18n)

[gentoo-commits] proj/kde:master commit in: kde-apps/konsole/, kde-apps/konsolepart/

2016-01-09 Thread Michael Palimaka 
commit: 129d0bb8d550114379c3d9d4c963b2d5d205
Author: Andreas Sturmlechner  gmail  com>
AuthorDate: Thu Jan  7 18:43:23 2016 +
Commit: Michael Palimaka  gentoo  org>
CommitDate: Sat Jan  9 15:16:58 2016 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=129d0bb8

kde-apps/konsole: Drop split 4.14.3-r2 version, moved to tree

Package-Manager: portage-2.2.26

 ...le-15.12.0.ebuild => konsole-15.12.0-r1.ebuild} |  0
 kde-apps/konsole/konsole-4.14.3-r2.ebuild  | 45 ---
 kde-apps/konsolepart/konsolepart-4.14.3.ebuild | 65 --
 kde-apps/konsolepart/metadata.xml  |  5 --
 4 files changed, 115 deletions(-)

diff --git a/kde-apps/konsole/konsole-15.12.0.ebuild 
b/kde-apps/konsole/konsole-15.12.0-r1.ebuild
similarity index 100%
rename from kde-apps/konsole/konsole-15.12.0.ebuild
rename to kde-apps/konsole/konsole-15.12.0-r1.ebuild

diff --git a/kde-apps/konsole/konsole-4.14.3-r2.ebuild 
b/kde-apps/konsole/konsole-4.14.3-r2.ebuild
deleted file mode 100644
index f846dd7..000
--- a/kde-apps/konsole/konsole-4.14.3-r2.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-KDE_HANDBOOK="optional"
-KDE_DOC_DIRS="doc/manual"
-VIRTUALX_REQUIRED="test"
-VIRTUALDBUS_TEST="true"
-inherit kde4-base
-
-DESCRIPTION="X terminal for use with KDE"
-HOMEPAGE="https://www.kde.org/applications/system/konsole 
https://konsole.kde.org;
-KEYWORDS=""
-IUSE="debug"
-
-DEPEND=""
-RDEPEND="$(add_kdeapps_dep konsolepart)"
-
-# can't connect to a kded instance, fails to connect to dbus
-RESTRICT="test"
-
-src_prepare() {
-   comment_add_subdirectory data
-
-   kde4-base_src_prepare
-}
-
-src_configure() {
-   local mycmakeargs=(
-   -DWITH_LibKonq=OFF
-   )
-
-   kde4-base_src_configure
-}
-
-src_install() {
-   kde4-base_src_install
-
-   rm -r "${ED}"usr/$(get_libdir) || die
-   rm -r "${ED}"usr/share/apps || die
-   rm "${ED}"usr/share/kde4/services/konsolepart.desktop || die
-   rm -r "${ED}"usr/share/kde4/servicetypes || die
-}

diff --git a/kde-apps/konsolepart/konsolepart-4.14.3.ebuild 
b/kde-apps/konsolepart/konsolepart-4.14.3.ebuild
deleted file mode 100644
index af82f3d..000
--- a/kde-apps/konsolepart/konsolepart-4.14.3.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-KMNAME="konsole"
-KDE_HANDBOOK="never"
-VIRTUALX_REQUIRED="test"
-VIRTUALDBUS_TEST="true"
-inherit kde4-base
-
-DESCRIPTION="X terminal kpart for use by konsole and other KDE applications"
-HOMEPAGE="https://www.kde.org/applications/system/konsole 
https://konsole.kde.org;
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="debug minimal"
-
-COMMONDEPEND="
-   !aqua? (
-   x11-libs/libX11
-   x11-libs/libXext
-   >=x11-libs/libxklavier-3.2
-   x11-libs/libXrender
-   x11-libs/libXtst
-   !minimal? ( $(add_kdeapps_dep libkonq) )
-   )
-"
-DEPEND="${COMMONDEPEND}
-   !aqua? (
-   x11-apps/bdftopcf
-   x11-proto/kbproto
-   x11-proto/renderproto
-   )
-"
-RDEPEND="${COMMONDEPEND}
-   !
-http://www.gentoo.org/dtd/metadata.dtd;>
-
-   kde
-

[gentoo-commits] proj/kde:master commit in: kde-apps/konsole/

2016-01-09 Thread Michael Palimaka 
commit: 4d8dacd2e270ba3fb66e424e21e3cad4792236e8
Author: Andreas Sturmlechner  gmail  com>
AuthorDate: Thu Jan  7 18:46:30 2016 +
Commit: Michael Palimaka  gentoo  org>
CommitDate: Sat Jan  9 15:16:58 2016 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=4d8dacd2

kde-apps/konsole: Auto-block slot 4 again

Let us help portage pick the right enemy.

Package-Manager: portage-2.2.26

 kde-apps/konsole/konsole-15.12.0-r1.ebuild| 6 +-
 kde-apps/konsole/konsole-15.12.49..ebuild | 6 +-
 kde-apps/konsole/konsole-.ebuild  | 6 +-
 3 files changed, 3 insertions(+), 15 deletions(-)

diff --git a/kde-apps/konsole/konsole-15.12.0-r1.ebuild 
b/kde-apps/konsole/konsole-15.12.0-r1.ebuild
index a69253d..4af39ae 100644
--- a/kde-apps/konsole/konsole-15.12.0-r1.ebuild
+++ b/kde-apps/konsole/konsole-15.12.0-r1.ebuild
@@ -4,7 +4,6 @@
 
 EAPI=5
 
-KDE_BLOCK_SLOT4="false"
 KDE_HANDBOOK="forceoptional"
 KDE_TEST="true"
 VIRTUALX_REQUIRED="test"
@@ -47,10 +46,7 @@ DEPEND="
dev-qt/qtxml:5
X? ( x11-libs/libX11 )
 "
-RDEPEND="${DEPEND}
-   !kde-apps/konsole:4[handbook]
-   !kde-apps/konsole:4[-minimal(-)]
-"
+RDEPEND="${DEPEND}"
 
 src_configure() {
local mycmakeargs=(

diff --git a/kde-apps/konsole/konsole-15.12.49..ebuild 
b/kde-apps/konsole/konsole-15.12.49..ebuild
index da46c2a..b387ad8 100644
--- a/kde-apps/konsole/konsole-15.12.49..ebuild
+++ b/kde-apps/konsole/konsole-15.12.49..ebuild
@@ -4,7 +4,6 @@
 
 EAPI=5
 
-KDE_BLOCK_SLOT4="false"
 KDE_HANDBOOK="forceoptional"
 KDE_TEST="true"
 VIRTUALX_REQUIRED="test"
@@ -47,10 +46,7 @@ DEPEND="
dev-qt/qtxml:5
X? ( x11-libs/libX11 )
 "
-RDEPEND="${DEPEND}
-   !kde-apps/konsole:4[handbook]
-   !kde-apps/konsole:4[-minimal(-)]
-"
+RDEPEND="${DEPEND}"
 
 src_configure() {
local mycmakeargs=(

diff --git a/kde-apps/konsole/konsole-.ebuild 
b/kde-apps/konsole/konsole-.ebuild
index da46c2a..b387ad8 100644
--- a/kde-apps/konsole/konsole-.ebuild
+++ b/kde-apps/konsole/konsole-.ebuild
@@ -4,7 +4,6 @@
 
 EAPI=5
 
-KDE_BLOCK_SLOT4="false"
 KDE_HANDBOOK="forceoptional"
 KDE_TEST="true"
 VIRTUALX_REQUIRED="test"
@@ -47,10 +46,7 @@ DEPEND="
dev-qt/qtxml:5
X? ( x11-libs/libX11 )
 "
-RDEPEND="${DEPEND}
-   !kde-apps/konsole:4[handbook]
-   !kde-apps/konsole:4[-minimal(-)]
-"
+RDEPEND="${DEPEND}"
 
 src_configure() {
local mycmakeargs=(

[gentoo-commits] proj/kde:master commit in: kde-apps/konsole/

2016-01-04 Thread Michael Palimaka 
commit: 1f71ed1865b1c512a81a013984674a7e762782e5
Author: Andreas Sturmlechner  gmail  com>
AuthorDate: Mon Jan  4 00:17:52 2016 +
Commit: Michael Palimaka  gentoo  org>
CommitDate: Mon Jan  4 16:30:04 2016 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=1f71ed18

kde-apps/konsole: Drop USE=minimal, RDEPEND on konsolepart instead

Make konsole install the binaries you'd expect from it again, even when
plasma profile is selected. Dropping minimal flag, the existing blocker in
konsole:5 continues to work. All conflicting files are now in konsole:4.

Package-Manager: portage-2.2.26

 kde-apps/konsole/konsole-4.14.3-r2.ebuild | 45 +++
 1 file changed, 45 insertions(+)

diff --git a/kde-apps/konsole/konsole-4.14.3-r2.ebuild 
b/kde-apps/konsole/konsole-4.14.3-r2.ebuild
new file mode 100644
index 000..f846dd7
--- /dev/null
+++ b/kde-apps/konsole/konsole-4.14.3-r2.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+KDE_HANDBOOK="optional"
+KDE_DOC_DIRS="doc/manual"
+VIRTUALX_REQUIRED="test"
+VIRTUALDBUS_TEST="true"
+inherit kde4-base
+
+DESCRIPTION="X terminal for use with KDE"
+HOMEPAGE="https://www.kde.org/applications/system/konsole 
https://konsole.kde.org;
+KEYWORDS=""
+IUSE="debug"
+
+DEPEND=""
+RDEPEND="$(add_kdeapps_dep konsolepart)"
+
+# can't connect to a kded instance, fails to connect to dbus
+RESTRICT="test"
+
+src_prepare() {
+   comment_add_subdirectory data
+
+   kde4-base_src_prepare
+}
+
+src_configure() {
+   local mycmakeargs=(
+   -DWITH_LibKonq=OFF
+   )
+
+   kde4-base_src_configure
+}
+
+src_install() {
+   kde4-base_src_install
+
+   rm -r "${ED}"usr/$(get_libdir) || die
+   rm -r "${ED}"usr/share/apps || die
+   rm "${ED}"usr/share/kde4/services/konsolepart.desktop || die
+   rm -r "${ED}"usr/share/kde4/servicetypes || die
+}

[gentoo-commits] proj/kde:master commit in: kde-apps/konsole/

2015-12-06 Thread Michael Palimaka 
commit: de7c923319fe68650b72ed7bc976bd349a459984
Author: Andreas Sturmlechner  gmail  com>
AuthorDate: Thu Dec  3 19:48:41 2015 +
Commit: Michael Palimaka  gentoo  org>
CommitDate: Thu Dec  3 19:48:41 2015 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=de7c9233

kde-apps/konsole: Fix blocker, bug 567472

Package-Manager: portage-2.2.26

 kde-apps/konsole/konsole-15.12.49..ebuild | 3 ++-
 kde-apps/konsole/konsole-.ebuild  | 3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/kde-apps/konsole/konsole-15.12.49..ebuild 
b/kde-apps/konsole/konsole-15.12.49..ebuild
index e608340..e38451a 100644
--- a/kde-apps/konsole/konsole-15.12.49..ebuild
+++ b/kde-apps/konsole/konsole-15.12.49..ebuild
@@ -48,7 +48,8 @@ DEPEND="
X? ( x11-libs/libX11 )
 "
 RDEPEND="${DEPEND}
-   !kde-apps/konsole:4[-minimal(-),handbook]
+   !kde-apps/konsole:4[handbook]
+   !kde-apps/konsole:4[-minimal(-)]
 "
 
 src_configure() {

diff --git a/kde-apps/konsole/konsole-.ebuild 
b/kde-apps/konsole/konsole-.ebuild
index e608340..e38451a 100644
--- a/kde-apps/konsole/konsole-.ebuild
+++ b/kde-apps/konsole/konsole-.ebuild
@@ -48,7 +48,8 @@ DEPEND="
X? ( x11-libs/libX11 )
 "
 RDEPEND="${DEPEND}
-   !kde-apps/konsole:4[-minimal(-),handbook]
+   !kde-apps/konsole:4[handbook]
+   !kde-apps/konsole:4[-minimal(-)]
 "
 
 src_configure() {

[gentoo-commits] proj/kde:master commit in: kde-apps/konsole/

2015-11-04 Thread Michael Palimaka 
commit: 9c0d9f8d3f287787b75381dc4b99e73d3aca974c
Author: Michael Palimaka  gentoo  org>
AuthorDate: Wed Nov  4 18:45:02 2015 +
Commit: Michael Palimaka  gentoo  org>
CommitDate: Wed Nov  4 18:56:07 2015 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=9c0d9f8d

kde-apps/konsole: use KDE_HANDBOOK="forceoptional"

Package-Manager: portage-2.2.20.1

 kde-apps/konsole/konsole-15.08.49..ebuild | 3 +--
 kde-apps/konsole/konsole-.ebuild  | 3 +--
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/kde-apps/konsole/konsole-15.08.49..ebuild 
b/kde-apps/konsole/konsole-15.08.49..ebuild
index b79a479..e608340 100644
--- a/kde-apps/konsole/konsole-15.08.49..ebuild
+++ b/kde-apps/konsole/konsole-15.08.49..ebuild
@@ -5,8 +5,7 @@
 EAPI=5
 
 KDE_BLOCK_SLOT4="false"
-KDE_HANDBOOK="true"
-KDE_PUNT_BOGUS_DEPS="true"
+KDE_HANDBOOK="forceoptional"
 KDE_TEST="true"
 VIRTUALX_REQUIRED="test"
 inherit kde5

diff --git a/kde-apps/konsole/konsole-.ebuild 
b/kde-apps/konsole/konsole-.ebuild
index b79a479..e608340 100644
--- a/kde-apps/konsole/konsole-.ebuild
+++ b/kde-apps/konsole/konsole-.ebuild
@@ -5,8 +5,7 @@
 EAPI=5
 
 KDE_BLOCK_SLOT4="false"
-KDE_HANDBOOK="true"
-KDE_PUNT_BOGUS_DEPS="true"
+KDE_HANDBOOK="forceoptional"
 KDE_TEST="true"
 VIRTUALX_REQUIRED="test"
 inherit kde5

[gentoo-commits] proj/kde:master commit in: kde-apps/konsole/

2015-09-07 Thread Michael Palimaka 
commit: b3f4cd63856a19ec8eec209d6e328f0ea9abd67b
Author: Andreas Sturmlechner  gmail  com>
AuthorDate: Tue Sep  8 02:46:35 2015 +
Commit: Michael Palimaka  gentoo  org>
CommitDate: Tue Sep  8 02:47:34 2015 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=b3f4cd63

kde-apps/konsole: Fix blocker

Package-Manager: portage-2.2.20.1

 kde-apps/konsole/konsole-15.08.49..ebuild | 2 +-
 kde-apps/konsole/konsole-.ebuild  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/kde-apps/konsole/konsole-15.08.49..ebuild 
b/kde-apps/konsole/konsole-15.08.49..ebuild
index e33058e..b79a479 100644
--- a/kde-apps/konsole/konsole-15.08.49..ebuild
+++ b/kde-apps/konsole/konsole-15.08.49..ebuild
@@ -49,7 +49,7 @@ DEPEND="
X? ( x11-libs/libX11 )
 "
 RDEPEND="${DEPEND}
-   !kde-apps/konsole:4[-minimal(+),handbook]
+   !kde-apps/konsole:4[-minimal(-),handbook]
 "
 
 src_configure() {

diff --git a/kde-apps/konsole/konsole-.ebuild 
b/kde-apps/konsole/konsole-.ebuild
index e33058e..b79a479 100644
--- a/kde-apps/konsole/konsole-.ebuild
+++ b/kde-apps/konsole/konsole-.ebuild
@@ -49,7 +49,7 @@ DEPEND="
X? ( x11-libs/libX11 )
 "
 RDEPEND="${DEPEND}
-   !kde-apps/konsole:4[-minimal(+),handbook]
+   !kde-apps/konsole:4[-minimal(-),handbook]
 "
 
 src_configure() {

[gentoo-commits] proj/kde:master commit in: kde-apps/konsole/

2015-08-27 Thread Michael Palimaka 
commit: 2ecf860a2d64f51fad4ea105233a0c130e96b684
Author: Michael Palimaka kensington AT gentoo DOT org
AuthorDate: Thu Aug 27 17:59:13 2015 +
Commit: Michael Palimaka kensington AT gentoo DOT org
CommitDate: Thu Aug 27 17:59:13 2015 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=2ecf860a

kde-apps/konsole: moved to main repo.

Package-Manager: portage-2.2.20.1

 kde-apps/konsole/konsole-15.04.3.ebuild | 57 --
 kde-apps/konsole/konsole-15.08.0.ebuild | 61 -
 2 files changed, 118 deletions(-)

diff --git a/kde-apps/konsole/konsole-15.04.3.ebuild 
b/kde-apps/konsole/konsole-15.04.3.ebuild
deleted file mode 100644
index b2e7c23..000
--- a/kde-apps/konsole/konsole-15.04.3.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-KDE_HANDBOOK=true
-KDE_TEST=true
-VIRTUALX_REQUIRED=test
-inherit kde5
-
-DESCRIPTION=KDE's terminal emulator
-HOMEPAGE=https://www.kde.org/applications/system/konsole 
https://konsole.kde.org;
-
-KEYWORDS=~amd64 ~x86
-IUSE=X
-
-DEPEND=
-   $(add_frameworks_dep kbookmarks)
-   $(add_frameworks_dep kcompletion)
-   $(add_frameworks_dep kconfig)
-   $(add_frameworks_dep kconfigwidgets)
-   $(add_frameworks_dep kcoreaddons)
-   $(add_frameworks_dep kdelibs4support)
-   $(add_frameworks_dep kguiaddons)
-   $(add_frameworks_dep kjobwidgets)
-   $(add_frameworks_dep ki18n)
-   $(add_frameworks_dep kinit)
-   $(add_frameworks_dep kiconthemes)
-   $(add_frameworks_dep kio)
-   $(add_frameworks_dep knotifications)
-   $(add_frameworks_dep knotifyconfig)
-   $(add_frameworks_dep kparts)
-   $(add_frameworks_dep kpty)
-   $(add_frameworks_dep kservice)
-   $(add_frameworks_dep ktextwidgets)
-   $(add_frameworks_dep kwidgetsaddons)
-   $(add_frameworks_dep kwindowsystem)
-   $(add_frameworks_dep kxmlgui)
-   dev-qt/qtdbus:5
-   dev-qt/qtgui:5
-   dev-qt/qtnetwork:5
-   dev-qt/qtprintsupport:5
-   dev-qt/qtscript:5
-   dev-qt/qtwidgets:5
-   dev-qt/qtxml:5
-   X? ( x11-libs/libX11 )
-
-RDEPEND=${DEPEND}
-
-src_configure() {
-   local mycmakeargs=(
-   $(cmake-utils_use_find_package X X11)
-   )
-
-   kde5_src_configure
-}

diff --git a/kde-apps/konsole/konsole-15.08.0.ebuild 
b/kde-apps/konsole/konsole-15.08.0.ebuild
deleted file mode 100644
index ab75c48..000
--- a/kde-apps/konsole/konsole-15.08.0.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-KDE_BLOCK_SLOT4=false
-KDE_HANDBOOK=true
-KDE_TEST=true
-KDE_PUNT_BOGUS_DEPS=true
-VIRTUALX_REQUIRED=test
-inherit kde5
-
-DESCRIPTION=KDE's terminal emulator
-HOMEPAGE=https://www.kde.org/applications/system/konsole 
https://konsole.kde.org;
-
-KEYWORDS=~amd64 ~x86
-IUSE=X
-
-DEPEND=
-   $(add_frameworks_dep kbookmarks)
-   $(add_frameworks_dep kcompletion)
-   $(add_frameworks_dep kconfig)
-   $(add_frameworks_dep kconfigwidgets)
-   $(add_frameworks_dep kcoreaddons)
-   $(add_frameworks_dep kdelibs4support)
-   $(add_frameworks_dep kguiaddons)
-   $(add_frameworks_dep kjobwidgets)
-   $(add_frameworks_dep ki18n)
-   $(add_frameworks_dep kinit)
-   $(add_frameworks_dep kiconthemes)
-   $(add_frameworks_dep kio)
-   $(add_frameworks_dep knotifications)
-   $(add_frameworks_dep knotifyconfig)
-   $(add_frameworks_dep kparts)
-   $(add_frameworks_dep kpty)
-   $(add_frameworks_dep kservice)
-   $(add_frameworks_dep ktextwidgets)
-   $(add_frameworks_dep kwidgetsaddons)
-   $(add_frameworks_dep kwindowsystem)
-   $(add_frameworks_dep kxmlgui)
-   dev-qt/qtdbus:5
-   dev-qt/qtgui:5
-   dev-qt/qtnetwork:5
-   dev-qt/qtprintsupport:5
-   dev-qt/qtscript:5
-   dev-qt/qtwidgets:5
-   dev-qt/qtxml:5
-   X? ( x11-libs/libX11 )
-
-RDEPEND=${DEPEND}
-   !kde-apps/konsole:4[-minimal(+),handbook]
-
-
-src_configure() {
-   local mycmakeargs=(
-   $(cmake-utils_use_find_package X X11)
-   )
-
-   kde5_src_configure
-}

[gentoo-commits] proj/kde:master commit in: kde-apps/konsole/

2015-08-27 Thread Michael Palimaka 
commit: af4e285bb77865b3938577b28c77b64b0787
Author: Michael Palimaka kensington AT gentoo DOT org
AuthorDate: Thu Aug 27 17:50:29 2015 +
Commit: Michael Palimaka kensington AT gentoo DOT org
CommitDate: Thu Aug 27 17:50:29 2015 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=af4e285b

kde-apps/konsole: punt bogus deps.

Package-Manager: portage-2.2.20.1

 kde-apps/konsole/konsole-15.08.0.ebuild   | 1 +
 kde-apps/konsole/konsole-15.08.49..ebuild | 1 +
 kde-apps/konsole/konsole-.ebuild  | 1 +
 3 files changed, 3 insertions(+)

diff --git a/kde-apps/konsole/konsole-15.08.0.ebuild 
b/kde-apps/konsole/konsole-15.08.0.ebuild
index a620190..ab75c48 100644
--- a/kde-apps/konsole/konsole-15.08.0.ebuild
+++ b/kde-apps/konsole/konsole-15.08.0.ebuild
@@ -7,6 +7,7 @@ EAPI=5
 KDE_BLOCK_SLOT4=false
 KDE_HANDBOOK=true
 KDE_TEST=true
+KDE_PUNT_BOGUS_DEPS=true
 VIRTUALX_REQUIRED=test
 inherit kde5
 

diff --git a/kde-apps/konsole/konsole-15.08.49..ebuild 
b/kde-apps/konsole/konsole-15.08.49..ebuild
index eb16d70..e33058e 100644
--- a/kde-apps/konsole/konsole-15.08.49..ebuild
+++ b/kde-apps/konsole/konsole-15.08.49..ebuild
@@ -6,6 +6,7 @@ EAPI=5
 
 KDE_BLOCK_SLOT4=false
 KDE_HANDBOOK=true
+KDE_PUNT_BOGUS_DEPS=true
 KDE_TEST=true
 VIRTUALX_REQUIRED=test
 inherit kde5

diff --git a/kde-apps/konsole/konsole-.ebuild 
b/kde-apps/konsole/konsole-.ebuild
index eb16d70..e33058e 100644
--- a/kde-apps/konsole/konsole-.ebuild
+++ b/kde-apps/konsole/konsole-.ebuild
@@ -6,6 +6,7 @@ EAPI=5
 
 KDE_BLOCK_SLOT4=false
 KDE_HANDBOOK=true
+KDE_PUNT_BOGUS_DEPS=true
 KDE_TEST=true
 VIRTUALX_REQUIRED=test
 inherit kde5

[gentoo-commits] proj/kde:master commit in: kde-apps/konsole/

2015-08-25 Thread Michael Palimaka 
commit: 3feebb03e9024a2eca3bc5484bcd989a05ffa592
Author: Michael Palimaka kensington AT gentoo DOT org
AuthorDate: Tue Aug 25 13:29:43 2015 +
Commit: Michael Palimaka kensington AT gentoo DOT org
CommitDate: Tue Aug 25 13:29:43 2015 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=3feebb03

kde-apps/konsole: update blocker to account for new konsole:4[minimal] USE flag.

Package-Manager: portage-2.2.20.1

 kde-apps/konsole/konsole-15.08.0.ebuild   | 5 -
 kde-apps/konsole/konsole-15.08.49..ebuild | 5 -
 kde-apps/konsole/konsole-.ebuild  | 5 -
 3 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/kde-apps/konsole/konsole-15.08.0.ebuild 
b/kde-apps/konsole/konsole-15.08.0.ebuild
index 0e413ca..0006254 100644
--- a/kde-apps/konsole/konsole-15.08.0.ebuild
+++ b/kde-apps/konsole/konsole-15.08.0.ebuild
@@ -4,6 +4,7 @@
 
 EAPI=5
 
+KDE_BLOCK_SLOT4=false
 KDE_HANDBOOK=true
 KDE_TEST=true
 VIRTUALX_REQUIRED=test
@@ -46,7 +47,9 @@ DEPEND=
dev-qt/qtxml:5
X? ( x11-libs/libX11 )
 
-RDEPEND=${DEPEND}
+RDEPEND=${DEPEND}
+   !kde-apps/konsole:4[-minimal(+),handbook]
+
 
 src_configure() {
local mycmakeargs=(

diff --git a/kde-apps/konsole/konsole-15.08.49..ebuild 
b/kde-apps/konsole/konsole-15.08.49..ebuild
index 8678adf..f2dc5b7 100644
--- a/kde-apps/konsole/konsole-15.08.49..ebuild
+++ b/kde-apps/konsole/konsole-15.08.49..ebuild
@@ -4,6 +4,7 @@
 
 EAPI=5
 
+KDE_BLOCK_SLOT4=false
 KDE_HANDBOOK=true
 KDE_TEST=true
 VIRTUALX_REQUIRED=test
@@ -46,7 +47,9 @@ DEPEND=
dev-qt/qtxml:5
X? ( x11-libs/libX11 )
 
-RDEPEND=${DEPEND}
+RDEPEND=${DEPEND}
+   !kde-apps/konsole:4[-minimal(+),handbook]
+
 
 src_configure() {
local mycmakeargs=(

diff --git a/kde-apps/konsole/konsole-.ebuild 
b/kde-apps/konsole/konsole-.ebuild
index 8678adf..f2dc5b7 100644
--- a/kde-apps/konsole/konsole-.ebuild
+++ b/kde-apps/konsole/konsole-.ebuild
@@ -4,6 +4,7 @@
 
 EAPI=5
 
+KDE_BLOCK_SLOT4=false
 KDE_HANDBOOK=true
 KDE_TEST=true
 VIRTUALX_REQUIRED=test
@@ -46,7 +47,9 @@ DEPEND=
dev-qt/qtxml:5
X? ( x11-libs/libX11 )
 
-RDEPEND=${DEPEND}
+RDEPEND=${DEPEND}
+   !kde-apps/konsole:4[-minimal(+),handbook]
+
 
 src_configure() {
local mycmakeargs=(

[gentoo-commits] proj/kde:master commit in: kde-apps/konsole/

2015-04-28 Thread Michael Palimaka 
commit: cbfa283f655b1c73ec98ae6602d280773c20f9da
Author: Michael Palimaka kensington AT gentoo DOT org
AuthorDate: Tue Apr 28 14:05:50 2015 +
Commit: Michael Palimaka kensington AT gentoo DOT org
CommitDate: Tue Apr 28 14:05:50 2015 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=cbfa283f

[kde-apps/konsole] Add new dependencies.

Upstream commit: 506495b4772bebc32c1d6015f833b97a7b818911

Package-Manager: portage-2.2.18

 kde-apps/konsole/konsole-.ebuild | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/kde-apps/konsole/konsole-.ebuild 
b/kde-apps/konsole/konsole-.ebuild
index 8c9b069..eb41598 100644
--- a/kde-apps/konsole/konsole-.ebuild
+++ b/kde-apps/konsole/konsole-.ebuild
@@ -23,7 +23,9 @@ DEPEND=
$(add_frameworks_dep kcoreaddons)
$(add_frameworks_dep kdelibs4support)
$(add_frameworks_dep kguiaddons)
+   $(add_frameworks_dep kjobwidgets)
$(add_frameworks_dep ki18n)
+   $(add_frameworks_dep kinit)
$(add_frameworks_dep kiconthemes)
$(add_frameworks_dep kio)
$(add_frameworks_dep knotifications)

[gentoo-commits] proj/kde:master commit in: kde-apps/konsole/

2015-04-28 Thread Michael Palimaka 
commit: 04bc96eadb8b2a0e53fb38be507c29eb22848216
Author: Michael Palimaka kensington AT gentoo DOT org
AuthorDate: Tue Apr 28 14:06:48 2015 +
Commit: Michael Palimaka kensington AT gentoo DOT org
CommitDate: Tue Apr 28 14:06:48 2015 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=04bc96ea

[kde-apps/konsole] Version bump.

Package-Manager: portage-2.2.18

 kde-apps/konsole/konsole-15.04.0.ebuild | 60 +
 1 file changed, 60 insertions(+)

diff --git a/kde-apps/konsole/konsole-15.04.0.ebuild 
b/kde-apps/konsole/konsole-15.04.0.ebuild
new file mode 100644
index 000..24cc1bb
--- /dev/null
+++ b/kde-apps/konsole/konsole-15.04.0.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=5
+
+KDE_HANDBOOK=true
+KDE_TEST=true
+VIRTUALX_REQUIRED=test
+inherit kde5
+
+DESCRIPTION=KDE's terminal emulator
+HOMEPAGE=http://www.kde.org/applications/system/konsole 
http://konsole.kde.org;
+
+KEYWORDS= ~amd64
+IUSE=X
+
+DEPEND=
+   $(add_frameworks_dep kbookmarks)
+   $(add_frameworks_dep kcompletion)
+   $(add_frameworks_dep kconfig)
+   $(add_frameworks_dep kconfigwidgets)
+   $(add_frameworks_dep kcoreaddons)
+   $(add_frameworks_dep kdelibs4support)
+   $(add_frameworks_dep kguiaddons)
+   $(add_frameworks_dep kjobwidgets)
+   $(add_frameworks_dep ki18n)
+   $(add_frameworks_dep kinit)
+   $(add_frameworks_dep kiconthemes)
+   $(add_frameworks_dep kio)
+   $(add_frameworks_dep knotifications)
+   $(add_frameworks_dep knotifyconfig)
+   $(add_frameworks_dep kparts)
+   $(add_frameworks_dep kpty)
+   $(add_frameworks_dep kservice)
+   $(add_frameworks_dep ktextwidgets)
+   $(add_frameworks_dep kwidgetsaddons)
+   $(add_frameworks_dep kwindowsystem)
+   $(add_frameworks_dep kxmlgui)
+   dev-qt/qtdbus:5
+   dev-qt/qtgui:5
+   dev-qt/qtnetwork:5
+   dev-qt/qtprintsupport:5
+   dev-qt/qtscript:5
+   dev-qt/qtwidgets:5
+   dev-qt/qtxml:5
+   X? ( x11-libs/libX11 )
+
+RDEPEND=${DEPEND}
+   !kde-apps/konsole:4
+   !kde-base/konsole
+
+
+src_configure() {
+   local mycmakeargs=(
+   $(cmake-utils_use_find_package X X11)
+   )
+
+   kde5_src_configure
+}

[gentoo-commits] proj/kde:master commit in: kde-apps/konsole/, kde-apps/konsole/files/

2015-01-25 Thread Johannes Huber 
commit: 457d1927d8dae1074e4a446e496b67a3fa256915
Author: Andreas Sturmlechner andreas.sturmlechner AT gmail DOT com
AuthorDate: Sun Jan 25 12:28:48 2015 +
Commit: Johannes Huber johu AT gentoo DOT org
CommitDate: Sun Jan 25 19:25:23 2015 +
URL:http://sources.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=457d1927

[kde-apps/konsole] Remove upstreamed patch

---
 .../files/konsole--tests-optional.patch| 27 --
 kde-apps/konsole/konsole-.ebuild   |  2 --
 2 files changed, 29 deletions(-)

diff --git a/kde-apps/konsole/files/konsole--tests-optional.patch 
b/kde-apps/konsole/files/konsole--tests-optional.patch
deleted file mode 100644
index 99eaef8..000
--- a/kde-apps/konsole/files/konsole--tests-optional.patch
+++ /dev/null
@@ -1,27 +0,0 @@
 a/CMakeLists.txt   2015-01-19 01:06:41.388214548 +0100
-+++ b/CMakeLists.txt   2015-01-19 01:13:14.851202822 +0100
-@@ -26,7 +26,7 @@
- ecm_setup_version(${Konsole_VERSION} VARIABLE_PREFIX KONSOLEPRIVATE
-   SOVERSION ${Konsole_VERSION_MAJOR}
- )
--find_package(Qt5 ${QT_MIN_VERSION} CONFIG REQUIRED Core DBus Widgets Script 
Test)
-+find_package(Qt5 ${QT_MIN_VERSION} CONFIG REQUIRED Core DBus Widgets Script)
- 
- find_package(KF5 REQUIRED
- Bookmarks Completion Config ConfigWidgets
 a/src/CMakeLists.txt   2015-01-19 01:06:41.386214548 +0100
-+++ b/src/CMakeLists.txt   2015-01-19 01:15:51.963198139 +0100
-@@ -22,8 +22,11 @@
-   ${CMAKE_CURRENT_BINARY_DIR}/config-konsole.h)
- 
- ### Tests
--add_subdirectory(autotests)
--add_subdirectory(tests)
-+if(BUILD_TESTING)
-+  find_package(Qt5Test ${QT_MIN_VERSION} CONFIG REQUIRED)
-+  add_subdirectory(autotests)
-+  add_subdirectory(tests)
-+endif()
- 
- ### Font Embedder and LineFont.h
- option(KONSOLE_BUILD_FONTEMBEDDER Konsole: build fontembedder executable 
OFF)

diff --git a/kde-apps/konsole/konsole-.ebuild 
b/kde-apps/konsole/konsole-.ebuild
index 26b7ffe..8c9b069 100644
--- a/kde-apps/konsole/konsole-.ebuild
+++ b/kde-apps/konsole/konsole-.ebuild
@@ -49,8 +49,6 @@ RDEPEND=${DEPEND}
!kde-base/konsole
 
 
-PATCHES=( ${FILESDIR}/${PN}--tests-optional.patch )
-
 src_configure() {
local mycmakeargs=(
$(cmake-utils_use_find_package X X11)

[gentoo-commits] proj/kde:master commit in: kde-apps/konsole/

2015-01-23 Thread Johannes Huber 
commit: ed894b97748f958ce326c0fda23032cf74a235e9
Author: Johannes Huber johu AT gentoo DOT org
AuthorDate: Sat Jan 24 00:03:25 2015 +
Commit: Johannes Huber johu AT gentoo DOT org
CommitDate: Sat Jan 24 00:03:25 2015 +
URL:http://sources.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=ed894b97

[kde-apps/konsole] Fix blocker

Package-Manager: portage-2.2.15

---
 kde-apps/konsole/konsole-14.12.1.ebuild | 2 +-
 kde-apps/konsole/konsole-.ebuild| 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/kde-apps/konsole/konsole-14.12.1.ebuild 
b/kde-apps/konsole/konsole-14.12.1.ebuild
index bfc0b8e..777e099 100644
--- a/kde-apps/konsole/konsole-14.12.1.ebuild
+++ b/kde-apps/konsole/konsole-14.12.1.ebuild
@@ -43,7 +43,7 @@ DEPEND=
X? ( x11-libs/libX11 )
 
 RDEPEND=${DEPEND}
-   !kde-base/konsole:4
+   !kde-base/konsole
 
 
 src_configure() {

diff --git a/kde-apps/konsole/konsole-.ebuild 
b/kde-apps/konsole/konsole-.ebuild
index fe49ed6..26b7ffe 100644
--- a/kde-apps/konsole/konsole-.ebuild
+++ b/kde-apps/konsole/konsole-.ebuild
@@ -45,7 +45,8 @@ DEPEND=
X? ( x11-libs/libX11 )
 
 RDEPEND=${DEPEND}
-   !kde-base/konsole:4
+   !kde-apps/konsole:4
+   !kde-base/konsole
 
 
 PATCHES=( ${FILESDIR}/${PN}--tests-optional.patch )

[gentoo-commits] proj/kde:master commit in: kde-apps/konsole/files/, kde-apps/konsole/

2015-01-19 Thread Johannes Huber 
commit: 81a470b4a879e35b359566beb0d588b4ffa97d42
Author: Andreas Sturmlechner andreas.sturmlechner AT gmail DOT com
AuthorDate: Mon Jan 19 00:29:45 2015 +
Commit: Johannes Huber johu AT gentoo DOT org
CommitDate: Mon Jan 19 21:56:19 2015 +
URL:http://sources.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=81a470b4

[kde-apps/konsole] Make tests optional

---
 .../files/konsole--tests-optional.patch| 27 ++
 kde-apps/konsole/konsole-.ebuild   |  4 
 2 files changed, 31 insertions(+)

diff --git a/kde-apps/konsole/files/konsole--tests-optional.patch 
b/kde-apps/konsole/files/konsole--tests-optional.patch
new file mode 100644
index 000..99eaef8
--- /dev/null
+++ b/kde-apps/konsole/files/konsole--tests-optional.patch
@@ -0,0 +1,27 @@
+--- a/CMakeLists.txt   2015-01-19 01:06:41.388214548 +0100
 b/CMakeLists.txt   2015-01-19 01:13:14.851202822 +0100
+@@ -26,7 +26,7 @@
+ ecm_setup_version(${Konsole_VERSION} VARIABLE_PREFIX KONSOLEPRIVATE
+   SOVERSION ${Konsole_VERSION_MAJOR}
+ )
+-find_package(Qt5 ${QT_MIN_VERSION} CONFIG REQUIRED Core DBus Widgets Script 
Test)
++find_package(Qt5 ${QT_MIN_VERSION} CONFIG REQUIRED Core DBus Widgets Script)
+ 
+ find_package(KF5 REQUIRED
+ Bookmarks Completion Config ConfigWidgets
+--- a/src/CMakeLists.txt   2015-01-19 01:06:41.386214548 +0100
 b/src/CMakeLists.txt   2015-01-19 01:15:51.963198139 +0100
+@@ -22,8 +22,11 @@
+   ${CMAKE_CURRENT_BINARY_DIR}/config-konsole.h)
+ 
+ ### Tests
+-add_subdirectory(autotests)
+-add_subdirectory(tests)
++if(BUILD_TESTING)
++  find_package(Qt5Test ${QT_MIN_VERSION} CONFIG REQUIRED)
++  add_subdirectory(autotests)
++  add_subdirectory(tests)
++endif()
+ 
+ ### Font Embedder and LineFont.h
+ option(KONSOLE_BUILD_FONTEMBEDDER Konsole: build fontembedder executable 
OFF)

diff --git a/kde-apps/konsole/konsole-.ebuild 
b/kde-apps/konsole/konsole-.ebuild
index 76f56c9..fe49ed6 100644
--- a/kde-apps/konsole/konsole-.ebuild
+++ b/kde-apps/konsole/konsole-.ebuild
@@ -5,6 +5,8 @@
 EAPI=5
 
 KDE_HANDBOOK=true
+KDE_TEST=true
+VIRTUALX_REQUIRED=test
 inherit kde5
 
 DESCRIPTION=KDE's terminal emulator
@@ -46,6 +48,8 @@ RDEPEND=${DEPEND}
!kde-base/konsole:4
 
 
+PATCHES=( ${FILESDIR}/${PN}--tests-optional.patch )
+
 src_configure() {
local mycmakeargs=(
$(cmake-utils_use_find_package X X11)