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

[Andreas Sturmlechner]

commit: 2c766ad37a861e2b023eae328772b188aad3b348
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Fri Mar 15 12:54:21 2024 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Fri Mar 15 13:19:00 2024 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=2c766ad3

kde-apps/konqueror: Add missing dev-qt/qtbase:6= slot op

Uses Qt6::GuiPrivate for qtx11extras_p.h

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

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

diff --git a/kde-apps/konqueror/konqueror-24.02.49..ebuild 
b/kde-apps/konqueror/konqueror-24.02.49..ebuild
index de3e1352c5..905fd6aa2b 100644
--- a/kde-apps/konqueror/konqueror-24.02.49..ebuild
+++ b/kde-apps/konqueror/konqueror-24.02.49..ebuild
@@ -20,8 +20,9 @@ IUSE="activities speech"
 # 4 of 4 tests fail. Last checked for 4.0.3
 RESTRICT="test"
 
+# slot op: Uses Qt6::GuiPrivate for qtx11extras_p.h
 COMMON_DEPEND="
-   >=dev-qt/qtbase-${QTMIN}:6[dbus,gui,widgets,xml]
+   >=dev-qt/qtbase-${QTMIN}:6=[dbus,gui,widgets,xml]
>=dev-qt/qtwebengine-${QTMIN}:6[widgets]
>=kde-frameworks/karchive-${KFMIN}:6
>=kde-frameworks/kbookmarks-${KFMIN}:6

diff --git a/kde-apps/konqueror/konqueror-.ebuild 
b/kde-apps/konqueror/konqueror-.ebuild
index de3e1352c5..905fd6aa2b 100644
--- a/kde-apps/konqueror/konqueror-.ebuild
+++ b/kde-apps/konqueror/konqueror-.ebuild
@@ -20,8 +20,9 @@ IUSE="activities speech"
 # 4 of 4 tests fail. Last checked for 4.0.3
 RESTRICT="test"
 
+# slot op: Uses Qt6::GuiPrivate for qtx11extras_p.h
 COMMON_DEPEND="
-   >=dev-qt/qtbase-${QTMIN}:6[dbus,gui,widgets,xml]
+   >=dev-qt/qtbase-${QTMIN}:6=[dbus,gui,widgets,xml]
>=dev-qt/qtwebengine-${QTMIN}:6[widgets]
>=kde-frameworks/karchive-${KFMIN}:6
>=kde-frameworks/kbookmarks-${KFMIN}:6

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

[Andreas Sturmlechner]

commit: 0c892640fe16bc944640267ff01440948b7efae3
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Sun Mar  3 09:33:34 2024 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Sun Mar  3 09:37:35 2024 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=0c892640

kde-apps/konqueror: Block kde-apps/kio-extras:5

File collision at /usr/share/kio_bookmarks/kio_bookmarks.css

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

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

diff --git a/kde-apps/konqueror/konqueror-24.02.49..ebuild 
b/kde-apps/konqueror/konqueror-24.02.49..ebuild
index cd367e7e04..e05b353683 100644
--- a/kde-apps/konqueror/konqueror-24.02.49..ebuild
+++ b/kde-apps/konqueror/konqueror-24.02.49..ebuild
@@ -55,6 +55,7 @@ DEPEND="${COMMON_DEPEND}
activities? ( kde-plasma/plasma-activities:6 )
 "
 RDEPEND="${COMMON_DEPEND}
+   !

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

[Sam James]

commit: c10f156f1f9c325c6bc988b8c8ee690d5d1d95fd
Author: Sam James  gentoo  org>
AuthorDate: Fri Feb 23 06:20:55 2024 +
Commit: Sam James  gentoo  org>
CommitDate: Fri Feb 23 06:20:55 2024 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=c10f156f

kde-apps/konqueror: sync <

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

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

diff --git a/kde-apps/konqueror/konqueror-24.02.0.ebuild 
b/kde-apps/konqueror/konqueror-24.02.0.ebuild
index 83e51f7f5a..9b69c036e6 100644
--- a/kde-apps/konqueror/konqueror-24.02.0.ebuild
+++ b/kde-apps/konqueror/konqueror-24.02.0.ebuild
@@ -42,10 +42,12 @@ COMMON_DEPEND="
>=kde-frameworks/kjobwidgets-${KFMIN}:6
>=kde-frameworks/kparts-${KFMIN}:6
>=kde-frameworks/kservice-${KFMIN}:6
+   >=kde-frameworks/ktextwidgets-${KFMIN}:6
>=kde-frameworks/kwallet-${KFMIN}:6
>=kde-frameworks/kwidgetsaddons-${KFMIN}:6
>=kde-frameworks/kwindowsystem-${KFMIN}:6
>=kde-frameworks/kxmlgui-${KFMIN}:6
+   >=kde-frameworks/sonnet-${KFMIN}:6
sys-libs/zlib
speech? ( >=dev-qt/qtspeech-${QTMIN}:6 )
 "

diff --git a/kde-apps/konqueror/konqueror-24.02.49..ebuild 
b/kde-apps/konqueror/konqueror-24.02.49..ebuild
index d3e627b308..cd367e7e04 100644
--- a/kde-apps/konqueror/konqueror-24.02.49..ebuild
+++ b/kde-apps/konqueror/konqueror-24.02.49..ebuild
@@ -42,10 +42,12 @@ COMMON_DEPEND="
>=kde-frameworks/kjobwidgets-${KFMIN}:6
>=kde-frameworks/kparts-${KFMIN}:6
>=kde-frameworks/kservice-${KFMIN}:6
+   >=kde-frameworks/ktextwidgets-${KFMIN}:6
>=kde-frameworks/kwallet-${KFMIN}:6
>=kde-frameworks/kwidgetsaddons-${KFMIN}:6
>=kde-frameworks/kwindowsystem-${KFMIN}:6
>=kde-frameworks/kxmlgui-${KFMIN}:6
+   >=kde-frameworks/sonnet-${KFMIN}:6
sys-libs/zlib
speech? ( >=dev-qt/qtspeech-${QTMIN}:6 )
 "

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

[Sam James]

commit: 1cc2a6d428397906e0b7e33a19c5baf8f334ba2e
Author: Sam James  gentoo  org>
AuthorDate: Thu Feb 22 10:10:20 2024 +
Commit: Sam James  gentoo  org>
CommitDate: Fri Feb 23 04:49:38 2024 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=1cc2a6d4

kde-apps/konqueror: refresh deps

Add ktextwidgets and sonnet. Upstream commit 
ba0e2cd9a408ebac2e900759192005d586d6c038.

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

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

diff --git a/kde-apps/konqueror/konqueror-.ebuild 
b/kde-apps/konqueror/konqueror-.ebuild
index d3e627b308..cd367e7e04 100644
--- a/kde-apps/konqueror/konqueror-.ebuild
+++ b/kde-apps/konqueror/konqueror-.ebuild
@@ -42,10 +42,12 @@ COMMON_DEPEND="
>=kde-frameworks/kjobwidgets-${KFMIN}:6
>=kde-frameworks/kparts-${KFMIN}:6
>=kde-frameworks/kservice-${KFMIN}:6
+   >=kde-frameworks/ktextwidgets-${KFMIN}:6
>=kde-frameworks/kwallet-${KFMIN}:6
>=kde-frameworks/kwidgetsaddons-${KFMIN}:6
>=kde-frameworks/kwindowsystem-${KFMIN}:6
>=kde-frameworks/kxmlgui-${KFMIN}:6
+   >=kde-frameworks/sonnet-${KFMIN}:6
sys-libs/zlib
speech? ( >=dev-qt/qtspeech-${QTMIN}:6 )
 "

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

[Andreas Sturmlechner]

commit: 329ed43170cadeb75da5ff3815289db9342c0ee2
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Thu Dec 21 11:45:58 2023 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Thu Dec 21 11:45:58 2023 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=329ed431

kde-apps/konqueror: Clear kde-plasma/plasma-activities min version

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

 kde-apps/konqueror/konqueror-.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/kde-apps/konqueror/konqueror-.ebuild 
b/kde-apps/konqueror/konqueror-.ebuild
index 383ea64ff6..1ab1efba5f 100644
--- a/kde-apps/konqueror/konqueror-.ebuild
+++ b/kde-apps/konqueror/konqueror-.ebuild
@@ -50,7 +50,7 @@ COMMON_DEPEND="
speech? ( >=dev-qt/qtspeech-${QTMIN}:6 )
 "
 DEPEND="${COMMON_DEPEND}
-   activities? ( >=kde-plasma/plasma-activities-${KFMIN}:6 )
+   activities? ( kde-plasma/plasma-activities:6 )
 "
 RDEPEND="${COMMON_DEPEND}
kde-apps/kfind:6

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

[Andreas Sturmlechner]

commit: 8771de8debf484c5f0006a73167bf8f8eab3f21d
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Sat Nov 11 19:47:48 2023 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Sat Nov 11 20:04:56 2023 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=8771de8d

kde-apps/konqueror: Drop unused cmake arg

Follow-up to kde overlay commit 151c1526dbd5c7f814ef8bd87d93b019da6fcc82

Dropped upstream in 94533411c5436a72225a18c5b9c459c03bee9a93

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

 kde-apps/konqueror/konqueror-23.08.49..ebuild | 1 -
 kde-apps/konqueror/konqueror-.ebuild  | 1 -
 2 files changed, 2 deletions(-)

diff --git a/kde-apps/konqueror/konqueror-23.08.49..ebuild 
b/kde-apps/konqueror/konqueror-23.08.49..ebuild
index ab6a2226ba..30cd2aaa00 100644
--- a/kde-apps/konqueror/konqueror-23.08.49..ebuild
+++ b/kde-apps/konqueror/konqueror-23.08.49..ebuild
@@ -72,7 +72,6 @@ src_configure() {
-DCMAKE_DISABLE_FIND_PACKAGE_Hunspell=ON # requires fixing bug 
634122
$(cmake_use_find_package activities KF5Activities)
$(cmake_use_find_package speech Qt5TextToSpeech)
-   -DWITHOUT_X11=OFF
)
ecm_src_configure
 }

diff --git a/kde-apps/konqueror/konqueror-.ebuild 
b/kde-apps/konqueror/konqueror-.ebuild
index ab6a2226ba..30cd2aaa00 100644
--- a/kde-apps/konqueror/konqueror-.ebuild
+++ b/kde-apps/konqueror/konqueror-.ebuild
@@ -72,7 +72,6 @@ src_configure() {
-DCMAKE_DISABLE_FIND_PACKAGE_Hunspell=ON # requires fixing bug 
634122
$(cmake_use_find_package activities KF5Activities)
$(cmake_use_find_package speech Qt5TextToSpeech)
-   -DWITHOUT_X11=OFF
)
ecm_src_configure
 }

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

[Andreas Sturmlechner]

commit: f2a31fabf681607adec362e2e6508178c9f9f65e
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Sat Oct 14 19:50:15 2023 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Sat Oct 14 19:50:15 2023 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=f2a31fab

kde-apps/konqueror: Drop unused dev-qt/qtscript

Dropped in upstream commit 72ddfa7dafa915e31c88511d541e7903219c4b9f

Also cleanup long obsolete optfeature.

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

 kde-apps/konqueror/konqueror-23.08.49..ebuild | 2 --
 kde-apps/konqueror/konqueror-.ebuild  | 2 --
 2 files changed, 4 deletions(-)

diff --git a/kde-apps/konqueror/konqueror-23.08.49..ebuild 
b/kde-apps/konqueror/konqueror-23.08.49..ebuild
index 930ca45b23..ab6a2226ba 100644
--- a/kde-apps/konqueror/konqueror-23.08.49..ebuild
+++ b/kde-apps/konqueror/konqueror-23.08.49..ebuild
@@ -23,7 +23,6 @@ RESTRICT="test"
 COMMON_DEPEND="
>=dev-qt/qtdbus-${QTMIN}:5
>=dev-qt/qtgui-${QTMIN}:5
-   >=dev-qt/qtscript-${QTMIN}:5
>=dev-qt/qtwebengine-${QTMIN}:5[widgets]
>=dev-qt/qtwidgets-${QTMIN}:5
>=dev-qt/qtx11extras-${QTMIN}:5
@@ -83,7 +82,6 @@ pkg_postinst() {
optfeature "bookmarks support" kde-apps/keditbookmarks:${SLOT}
optfeature "filemanager component" kde-apps/dolphin:${SLOT}
optfeature "SVG support" kde-apps/svg:${SLOT}
-   optfeature "Java support on webpages" virtual/jre
fi
ecm_pkg_postinst
 }

diff --git a/kde-apps/konqueror/konqueror-.ebuild 
b/kde-apps/konqueror/konqueror-.ebuild
index 930ca45b23..ab6a2226ba 100644
--- a/kde-apps/konqueror/konqueror-.ebuild
+++ b/kde-apps/konqueror/konqueror-.ebuild
@@ -23,7 +23,6 @@ RESTRICT="test"
 COMMON_DEPEND="
>=dev-qt/qtdbus-${QTMIN}:5
>=dev-qt/qtgui-${QTMIN}:5
-   >=dev-qt/qtscript-${QTMIN}:5
>=dev-qt/qtwebengine-${QTMIN}:5[widgets]
>=dev-qt/qtwidgets-${QTMIN}:5
>=dev-qt/qtx11extras-${QTMIN}:5
@@ -83,7 +82,6 @@ pkg_postinst() {
optfeature "bookmarks support" kde-apps/keditbookmarks:${SLOT}
optfeature "filemanager component" kde-apps/dolphin:${SLOT}
optfeature "SVG support" kde-apps/svg:${SLOT}
-   optfeature "Java support on webpages" virtual/jre
fi
ecm_pkg_postinst
 }

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

[Andreas Sturmlechner]

commit: 151c1526dbd5c7f814ef8bd87d93b019da6fcc82
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Thu Jul  6 10:28:27 2023 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Thu Jul  6 10:28:27 2023 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=151c1526

kde-apps/konqueror: Drop IUSE X, option unsupported upstream

See also:
https://invent.kde.org/network/konqueror/-/merge_requests/155
https://invent.kde.org/network/konqueror/-/merge_requests/163

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

 kde-apps/konqueror/konqueror-23.04.49..ebuild | 6 +++---
 kde-apps/konqueror/konqueror-.ebuild  | 6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/kde-apps/konqueror/konqueror-23.04.49..ebuild 
b/kde-apps/konqueror/konqueror-23.04.49..ebuild
index 912a4aef3f..930ca45b23 100644
--- a/kde-apps/konqueror/konqueror-23.04.49..ebuild
+++ b/kde-apps/konqueror/konqueror-23.04.49..ebuild
@@ -15,7 +15,7 @@ HOMEPAGE="https://apps.kde.org/konqueror/;
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
 KEYWORDS=""
-IUSE="activities speech X"
+IUSE="activities speech"
 
 # 4 of 4 tests fail. Last checked for 4.0.3
 RESTRICT="test"
@@ -26,6 +26,7 @@ COMMON_DEPEND="
>=dev-qt/qtscript-${QTMIN}:5
>=dev-qt/qtwebengine-${QTMIN}:5[widgets]
>=dev-qt/qtwidgets-${QTMIN}:5
+   >=dev-qt/qtx11extras-${QTMIN}:5
>=dev-qt/qtxml-${QTMIN}:5
>=kde-frameworks/karchive-${KFMIN}:5
>=kde-frameworks/kbookmarks-${KFMIN}:5
@@ -52,7 +53,6 @@ COMMON_DEPEND="
>=kde-frameworks/kxmlgui-${KFMIN}:5
sys-libs/zlib
speech? ( >=dev-qt/qtspeech-${QTMIN}:5 )
-   X? ( >=dev-qt/qtx11extras-${QTMIN}:5 )
 "
 DEPEND="${COMMON_DEPEND}
activities? ( >=kde-frameworks/kactivities-${KFMIN}:5 )
@@ -73,7 +73,7 @@ src_configure() {
-DCMAKE_DISABLE_FIND_PACKAGE_Hunspell=ON # requires fixing bug 
634122
$(cmake_use_find_package activities KF5Activities)
$(cmake_use_find_package speech Qt5TextToSpeech)
-   -DWITHOUT_X11=$(usex !X)
+   -DWITHOUT_X11=OFF
)
ecm_src_configure
 }

diff --git a/kde-apps/konqueror/konqueror-.ebuild 
b/kde-apps/konqueror/konqueror-.ebuild
index 912a4aef3f..930ca45b23 100644
--- a/kde-apps/konqueror/konqueror-.ebuild
+++ b/kde-apps/konqueror/konqueror-.ebuild
@@ -15,7 +15,7 @@ HOMEPAGE="https://apps.kde.org/konqueror/;
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
 KEYWORDS=""
-IUSE="activities speech X"
+IUSE="activities speech"
 
 # 4 of 4 tests fail. Last checked for 4.0.3
 RESTRICT="test"
@@ -26,6 +26,7 @@ COMMON_DEPEND="
>=dev-qt/qtscript-${QTMIN}:5
>=dev-qt/qtwebengine-${QTMIN}:5[widgets]
>=dev-qt/qtwidgets-${QTMIN}:5
+   >=dev-qt/qtx11extras-${QTMIN}:5
>=dev-qt/qtxml-${QTMIN}:5
>=kde-frameworks/karchive-${KFMIN}:5
>=kde-frameworks/kbookmarks-${KFMIN}:5
@@ -52,7 +53,6 @@ COMMON_DEPEND="
>=kde-frameworks/kxmlgui-${KFMIN}:5
sys-libs/zlib
speech? ( >=dev-qt/qtspeech-${QTMIN}:5 )
-   X? ( >=dev-qt/qtx11extras-${QTMIN}:5 )
 "
 DEPEND="${COMMON_DEPEND}
activities? ( >=kde-frameworks/kactivities-${KFMIN}:5 )
@@ -73,7 +73,7 @@ src_configure() {
-DCMAKE_DISABLE_FIND_PACKAGE_Hunspell=ON # requires fixing bug 
634122
$(cmake_use_find_package activities KF5Activities)
$(cmake_use_find_package speech Qt5TextToSpeech)
-   -DWITHOUT_X11=$(usex !X)
+   -DWITHOUT_X11=OFF
)
ecm_src_configure
 }

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

[Andreas Sturmlechner]

commit: 6ec6cd4b0303c4a1b8b2baa81481206428e70909
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Thu Oct  6 08:16:36 2022 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Thu Oct  6 09:01:57 2022 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=6ec6cd4b

kde-apps/konqueror: Add CPE to metadata

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

 kde-apps/konqueror/metadata.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/kde-apps/konqueror/metadata.xml b/kde-apps/konqueror/metadata.xml
index 78d20615f8..e4a1355e4b 100644
--- a/kde-apps/konqueror/metadata.xml
+++ b/kde-apps/konqueror/metadata.xml
@@ -7,6 +7,7 @@


https://bugs.kde.org/
+   cpe:/a:kde:konqueror


Enable kactivities support

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

[Andreas Sturmlechner]

commit: 244ecca795df21005193b05f7e6a14d1ddf1d636
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Thu Aug  4 09:34:49 2022 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Thu Aug  4 09:34:49 2022 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=244ecca7

kde-apps/konqueror: Use -DWITHOUT_X11 switch in  too

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

 kde-apps/konqueror/konqueror-.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/kde-apps/konqueror/konqueror-.ebuild 
b/kde-apps/konqueror/konqueror-.ebuild
index 506d072949..80be78bc84 100644
--- a/kde-apps/konqueror/konqueror-.ebuild
+++ b/kde-apps/konqueror/konqueror-.ebuild
@@ -74,7 +74,7 @@ src_configure() {
-DCMAKE_DISABLE_FIND_PACKAGE_Hunspell=ON # requires fixing bug 
634122
$(cmake_use_find_package activities KF5Activities)
$(cmake_use_find_package speech Qt5TextToSpeech)
-   $(cmake_use_find_package X X11)
+   -DWITHOUT_X11=$(usex !X)
)
ecm_src_configure
 }

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

[Andreas Sturmlechner]

commit: 3723a92870f4c0f3737a173cc77de598c34de305
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Sun Jul 31 12:26:53 2022 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Thu Aug  4 09:12:26 2022 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=3723a928

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

Upstream commit ff0e19961f8345faea54e4f85057312b7ad7007d

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

 .../files/konqueror-22.04.3-without_x11.patch  | 126 +
 kde-apps/konqueror/konqueror-22.07.80.ebuild   |   4 +-
 kde-apps/konqueror/konqueror-22.08.49..ebuild  |   4 +-
 3 files changed, 132 insertions(+), 2 deletions(-)

diff --git a/kde-apps/konqueror/files/konqueror-22.04.3-without_x11.patch 
b/kde-apps/konqueror/files/konqueror-22.04.3-without_x11.patch
new file mode 100644
index 00..ff1de8680e
--- /dev/null
+++ b/kde-apps/konqueror/files/konqueror-22.04.3-without_x11.patch
@@ -0,0 +1,126 @@
+From 503557c54c6162970072f31cb84b0eb934d409d4 Mon Sep 17 00:00:00 2001
+From: Andreas Sturmlechner 
+Date: Sun, 31 Jul 2022 14:47:48 +0200
+Subject: [PATCH 1/2] Drop unused X11 dependency
+
+Signed-off-by: Andreas Sturmlechner 
+---
+ CMakeLists.txt | 8 ++--
+ src/CMakeLists.txt | 4 
+ 2 files changed, 2 insertions(+), 10 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 838197be7..d9218ae06 100644
+--- a/CMakeLists.txt
 b/CMakeLists.txt
+@@ -47,12 +47,8 @@ if(Qt5WebEngineWidgets_VERSION VERSION_LESS "5.14.0")
+   add_definitions(-DWEBENGINEDOWNLOADITEM_USE_PATH)
+ endif()
+ 
+-find_package(X11)
+-set(KONQ_HAVE_X11 ${X11_FOUND})
+-
+-if (X11_FOUND)
+-  find_package(Qt5 REQUIRED X11Extras)
+-endif(X11_FOUND)
++find_package(Qt5X11Extras)
++set(KONQ_HAVE_X11 ${Qt5X11Extras_FOUND})
+ 
+ add_definitions(
+ -DQT_USE_QSTRINGBUILDER
+diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
+index 9a1343e04..286bc7da8 100644
+--- a/src/CMakeLists.txt
 b/src/CMakeLists.txt
+@@ -113,10 +113,6 @@ target_link_libraries(kdeinit_konqueror
+KF5::SonnetUi
+ )
+ 
+-if (X11_FOUND)
+-  target_link_libraries(kdeinit_konqueror ${X11_LIBRARIES})
+-endif ()
+-
+ if (KActivities_FOUND)
+   target_link_libraries(kdeinit_konqueror KF5::Activities)
+ endif (KActivities_FOUND)
+-- 
+2.35.1
+
+
+From ff0e19961f8345faea54e4f85057312b7ad7007d Mon Sep 17 00:00:00 2001
+From: Andreas Sturmlechner 
+Date: Sat, 27 Nov 2021 14:36:20 +0100
+Subject: [PATCH 2/2] 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 Qt5X11Extras themselves yet or need
+to be built with X11 support for other reverse dependencies.
+
+KONQ_HAVE_X11 already exists and is set automagically so far, but
+using -DCMAKE_DISABLE_FIND_PACKAGE_Qt5X11Extras will break if any
+dependencies list Qt5X11Extras as required in their cmake config.
+
+Introducing this option means there is no behavior change by default,
+cmake will just skip finding Qt5X11Extras or adding unwanted features
+if the option is enabled.
+
+Signed-off-by: Andreas Sturmlechner 
+---
+ CMakeLists.txt| 7 +--
+ client/CMakeLists.txt | 4 ++--
+ src/CMakeLists.txt| 4 ++--
+ 3 files changed, 9 insertions(+), 6 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index d9218ae06..71bc03ecb 100644
+--- a/CMakeLists.txt
 b/CMakeLists.txt
+@@ -47,8 +47,11 @@ if(Qt5WebEngineWidgets_VERSION VERSION_LESS "5.14.0")
+   add_definitions(-DWEBENGINEDOWNLOADITEM_USE_PATH)
+ endif()
+ 
+-find_package(Qt5X11Extras)
+-set(KONQ_HAVE_X11 ${Qt5X11Extras_FOUND})
++option(WITHOUT_X11 "Build without X11 integration (skips finding 
Qt5X11Extras)" OFF)
++if(NOT WITHOUT_X11)
++find_package(Qt5X11Extras)
++set(KONQ_HAVE_X11 ${Qt5X11Extras_FOUND})
++endif()
+ 
+ add_definitions(
+ -DQT_USE_QSTRINGBUILDER
+diff --git a/client/CMakeLists.txt b/client/CMakeLists.txt
+index 24aedb14c..3c32c86f3 100644
+--- a/client/CMakeLists.txt
 b/client/CMakeLists.txt
+@@ -30,9 +30,9 @@ if (WIN32)
+ else (WIN32)
+ kf5_add_kdeinit_executable( kfmclient NOGUI ${kfmclient_SRCS})
+ target_link_libraries(kdeinit_kfmclient ${kfmclient_LIBS})
+-if(X11_FOUND)
++if(KONQ_HAVE_X11)
+   target_link_libraries(kdeinit_kfmclient Qt5::X11Extras)
+-endif(X11_FOUND)
++endif()
+ install(TARGETS kdeinit_kfmclient  ${KDE_INSTALL_TARGETS_DEFAULT_ARGS} )
+ endif (WIN32)
+ 
+diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
+index 286bc7da8..500b9750c 100644
+--- a/src/CMakeLists.txt
 b/src/CMakeLists.txt
+@@ -33,9 +33,9 @@ target_link_libraries(konquerorprivate
+KF5::KIOGui
+ )
+ 
+-if(X11_FOUND)
++if(KONQ_HAVE_X11)
+   target_link_libraries(konquerorprivate Qt5::X11Extras)
+-endif(X11_FOUND)
++endif()
+ 
+ 
+ set_target_properties(konquerorprivate PROPERTIES VERSION 
${KONQUEROR_LIB_VERSION} SOVERSION "5" )
+-- 
+2.35.1
+

diff --git 

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

[Andreas Sturmlechner]

commit: 026abe8b137fbfdedc47b30311158fa2e86263f1
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Thu Sep 16 18:46:36 2021 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Thu Sep 16 18:54:55 2021 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=026abe8b

kde-apps/konqueror: Add missing DEPEND for searchbar plugin

Upstream commits:
e17d92a3df75e61b7c8b24245940f2dc906bb644
7830a5a017428e6eeb8684196201811e94ad15b7

Bug: https://bugs.gentoo.org/813378
Package-Manager: Portage-3.0.23, Repoman-3.0.3
Signed-off-by: Andreas Sturmlechner  gentoo.org>

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

diff --git a/kde-apps/konqueror/konqueror-21.08.49..ebuild 
b/kde-apps/konqueror/konqueror-21.08.49..ebuild
index 9c987d0505..e81b1d5f6a 100644
--- a/kde-apps/konqueror/konqueror-21.08.49..ebuild
+++ b/kde-apps/konqueror/konqueror-21.08.49..ebuild
@@ -24,6 +24,7 @@ RESTRICT="test"
 COMMON_DEPEND="
>=dev-qt/qtdbus-${QTMIN}:5
>=dev-qt/qtgui-${QTMIN}:5
+   >=dev-qt/qtscript-${QTMIN}:5
>=dev-qt/qtwebengine-${QTMIN}:5[widgets]
>=dev-qt/qtwidgets-${QTMIN}:5
>=dev-qt/qtxml-${QTMIN}:5

diff --git a/kde-apps/konqueror/konqueror-.ebuild 
b/kde-apps/konqueror/konqueror-.ebuild
index 7b6bc4b2f1..7d6b78c56f 100644
--- a/kde-apps/konqueror/konqueror-.ebuild
+++ b/kde-apps/konqueror/konqueror-.ebuild
@@ -24,6 +24,7 @@ RESTRICT="test"
 COMMON_DEPEND="
>=dev-qt/qtdbus-${QTMIN}:5
>=dev-qt/qtgui-${QTMIN}:5
+   >=dev-qt/qtscript-${QTMIN}:5
>=dev-qt/qtwebengine-${QTMIN}:5[widgets]
>=dev-qt/qtwidgets-${QTMIN}:5
>=dev-qt/qtxml-${QTMIN}:5

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

[Andreas Sturmlechner]

commit: 27bb9c447496ae54a5a722ca03c5df8743011057
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=27bb9c44

kde-apps/konqueror: 21.04.1 version bump

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

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

diff --git a/kde-apps/konqueror/konqueror-21.04.1.ebuild 
b/kde-apps/konqueror/konqueror-21.04.1.ebuild
new file mode 100644
index 00..890e26b3fb
--- /dev/null
+++ b/kde-apps/konqueror/konqueror-21.04.1.ebuild
@@ -0,0 +1,88 @@
+# 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 flag-o-matic ecm kde.org optfeature
+
+DESCRIPTION="Web browser and file manager based on KDE Frameworks"
+HOMEPAGE="https://apps.kde.org/en/konqueror;
+
+LICENSE="GPL-2" # TODO: CHECK
+SLOT="5"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE="activities speech X"
+
+# 4 of 4 tests fail. Last checked for 4.0.3
+RESTRICT+=" test"
+
+COMMON_DEPEND="
+   >=dev-qt/qtdbus-${QTMIN}:5
+   >=dev-qt/qtgui-${QTMIN}:5
+   >=dev-qt/qtwebengine-${QTMIN}:5[widgets]
+   >=dev-qt/qtwidgets-${QTMIN}:5
+   >=dev-qt/qtxml-${QTMIN}:5
+   >=kde-frameworks/karchive-${KFMIN}:5
+   >=kde-frameworks/kbookmarks-${KFMIN}:5
+   >=kde-frameworks/kcmutils-${KFMIN}:5
+   >=kde-frameworks/kcodecs-${KFMIN}:5
+   >=kde-frameworks/kcompletion-${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/kdesu-${KFMIN}:5
+   >=kde-frameworks/kguiaddons-${KFMIN}:5
+   >=kde-frameworks/ki18n-${KFMIN}:5
+   >=kde-frameworks/kiconthemes-${KFMIN}:5
+   >=kde-frameworks/kio-${KFMIN}:5
+   >=kde-frameworks/kitemviews-${KFMIN}:5
+   >=kde-frameworks/kjobwidgets-${KFMIN}:5
+   >=kde-frameworks/kparts-${KFMIN}:5
+   >=kde-frameworks/kservice-${KFMIN}:5
+   >=kde-frameworks/kwallet-${KFMIN}:5
+   >=kde-frameworks/kwidgetsaddons-${KFMIN}:5
+   >=kde-frameworks/kwindowsystem-${KFMIN}:5
+   >=kde-frameworks/kxmlgui-${KFMIN}:5
+   sys-libs/zlib
+   speech? ( >=dev-qt/qtspeech-${QTMIN}:5 )
+   X? ( >=dev-qt/qtx11extras-${QTMIN}:5 )
+"
+DEPEND="${COMMON_DEPEND}
+   activities? ( >=kde-frameworks/kactivities-${KFMIN}:5 )
+"
+RDEPEND="${COMMON_DEPEND}
+   kde-apps/kfind:5
+   kde-plasma/kde-cli-tools:5
+"
+
+src_prepare() {
+   [[ ${CHOST} == *-solaris* ]] && append-ldflags -lmalloc
+
+   ecm_src_prepare
+}
+
+src_configure() {
+   local mycmakeargs=(
+   $(cmake_use_find_package activities KF5Activities)
+   $(cmake_use_find_package speech Qt5TextToSpeech)
+   $(cmake_use_find_package X X11)
+   )
+   ecm_src_configure
+}
+
+pkg_postinst() {
+   if [[ -z "${REPLACING_VERSIONS}" ]]; then
+   optfeature "bookmarks support" kde-apps/keditbookmarks:${SLOT}
+   optfeature "filemanager component" kde-apps/dolphin:${SLOT}
+   optfeature "SVG support" kde-apps/svg:${SLOT}
+   optfeature "Java support on webpages" virtual/jre
+   fi
+   ecm_pkg_postinst
+}

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

[Andreas Sturmlechner]

commit: 151c8f473f1bf87f90927575a452ef110b46354f
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Thu Apr 15 19:30:41 2021 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Fri Apr 16 19:32:20 2021 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=151c8f47

kde-apps/konqueror: Disable re-added dictionary support

Upstream commit 7ecb04cda02e418fb62e83728a0a78f4bff32080

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

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

diff --git a/kde-apps/konqueror/konqueror-.ebuild 
b/kde-apps/konqueror/konqueror-.ebuild
index 7007a328a8..ef0fe5e2c3 100644
--- a/kde-apps/konqueror/konqueror-.ebuild
+++ b/kde-apps/konqueror/konqueror-.ebuild
@@ -70,6 +70,7 @@ src_prepare() {
 
 src_configure() {
local mycmakeargs=(
+   -DCMAKE_DISABLE_FIND_PACKAGE_Hunspell=ON # requires fixing bug 
634122
$(cmake_use_find_package activities KF5Activities)
$(cmake_use_find_package speech Qt5TextToSpeech)
$(cmake_use_find_package X X11)

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

[Andreas Sturmlechner]

commit: b1315745456dafe305b467563d7b7655ee90304c
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Sat Apr  3 11:07:23 2021 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Sun Apr  4 19:07:46 2021 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=b1315745

kde-apps/konqueror: Drop superfluous optfeature header

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

 kde-apps/konqueror/konqueror-.ebuild | 1 -
 1 file changed, 1 deletion(-)

diff --git a/kde-apps/konqueror/konqueror-.ebuild 
b/kde-apps/konqueror/konqueror-.ebuild
index 977a21ce9a..ae3cea4546 100644
--- a/kde-apps/konqueror/konqueror-.ebuild
+++ b/kde-apps/konqueror/konqueror-.ebuild
@@ -79,7 +79,6 @@ src_configure() {
 
 pkg_postinst() {
if [[ -z "${REPLACING_VERSIONS}" ]]; then
-   elog "Optional dependencies:"
optfeature "bookmarks support" kde-apps/keditbookmarks:${SLOT}
optfeature "filemanager component" kde-apps/dolphin:${SLOT}
optfeature "SVG support" kde-apps/svg:${SLOT}

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

[Andreas Sturmlechner]

commit: 3acabde8a7aa0d278e8aa0d3f48a57b467fecd27
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Mon Sep  7 13:35:40 2020 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Mon Sep  7 15:05:49 2020 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=3acabde8

kde-apps/konqueror: Use optfeature

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

 kde-apps/konqueror/konqueror-20.08.49..ebuild | 28 ++---
 kde-apps/konqueror/konqueror-.ebuild  | 30 ++-
 2 files changed, 15 insertions(+), 43 deletions(-)

diff --git a/kde-apps/konqueror/konqueror-20.08.49..ebuild 
b/kde-apps/konqueror/konqueror-20.08.49..ebuild
index 10ebf1d25b..16d9aaeb6c 100644
--- a/kde-apps/konqueror/konqueror-20.08.49..ebuild
+++ b/kde-apps/konqueror/konqueror-20.08.49..ebuild
@@ -8,7 +8,7 @@ ECM_TEST="true"
 KFMIN=5.72.0
 QTMIN=5.14.2
 VIRTUALX_REQUIRED="test"
-inherit flag-o-matic ecm kde.org
+inherit flag-o-matic ecm kde.org optfeature
 
 DESCRIPTION="Web browser and file manager based on KDE Frameworks"
 HOMEPAGE="https://kde.org/applications/internet/org.kde.konqueror;
@@ -79,26 +79,12 @@ src_configure() {
 }
 
 pkg_postinst() {
-   ecm_pkg_postinst
-
if [[ -z "${REPLACING_VERSIONS}" ]]; then
-   if ! has_version kde-apps/keditbookmarks:${SLOT} ; then
-   elog "For bookmarks support, install keditbookmarks:"
-   elog "kde-apps/keditbookmarks:${SLOT}"
-   fi
-
-   if ! has_version kde-apps/dolphin:${SLOT} ; then
-   elog "If you want to use konqueror as a filemanager, 
install the dolphin kpart:"
-   elog "kde-apps/dolphin:${SLOT}"
-   fi
-
-   if ! has_version kde-apps/svg:${SLOT} ; then
-   elog "For konqueror to view SVGs, install the svg 
kpart:"
-   elog "kde-apps/svgpart:${SLOT}"
-   fi
-
-   if ! has_version virtual/jre ; then
-   elog "To use Java on webpages install virtual/jre."
-   fi
+   elog "Optional dependencies:"
+   optfeature "bookmarks support" kde-apps/keditbookmarks:${SLOT}
+   optfeature "filemanager component" kde-apps/dolphin:${SLOT}
+   optfeature "SVG support" kde-apps/svg:${SLOT}
+   optfeature "Java support on webpages" virtual/jre
fi
+   ecm_pkg_postinst
 }

diff --git a/kde-apps/konqueror/konqueror-.ebuild 
b/kde-apps/konqueror/konqueror-.ebuild
index d967f89e00..0538477c16 100644
--- a/kde-apps/konqueror/konqueror-.ebuild
+++ b/kde-apps/konqueror/konqueror-.ebuild
@@ -3,12 +3,12 @@
 
 EAPI=7
 
-ECM_HANDBOOK="optional" # not optional until !kdelibs4support
+ECM_HANDBOOK="optional"
 ECM_TEST="true"
 KFMIN=5.73.0
 QTMIN=5.14.2
 VIRTUALX_REQUIRED="test"
-inherit flag-o-matic ecm kde.org
+inherit flag-o-matic ecm kde.org optfeature
 
 DESCRIPTION="Web browser and file manager based on KDE Frameworks"
 HOMEPAGE="https://kde.org/applications/internet/org.kde.konqueror;
@@ -78,26 +78,12 @@ src_configure() {
 }
 
 pkg_postinst() {
-   ecm_pkg_postinst
-
if [[ -z "${REPLACING_VERSIONS}" ]]; then
-   if ! has_version kde-apps/keditbookmarks:${SLOT} ; then
-   elog "For bookmarks support, install keditbookmarks:"
-   elog "kde-apps/keditbookmarks:${SLOT}"
-   fi
-
-   if ! has_version kde-apps/dolphin:${SLOT} ; then
-   elog "If you want to use konqueror as a filemanager, 
install the dolphin kpart:"
-   elog "kde-apps/dolphin:${SLOT}"
-   fi
-
-   if ! has_version kde-apps/svg:${SLOT} ; then
-   elog "For konqueror to view SVGs, install the svg 
kpart:"
-   elog "kde-apps/svgpart:${SLOT}"
-   fi
-
-   if ! has_version virtual/jre ; then
-   elog "To use Java on webpages install virtual/jre."
-   fi
+   elog "Optional dependencies:"
+   optfeature "bookmarks support" kde-apps/keditbookmarks:${SLOT}
+   optfeature "filemanager component" kde-apps/dolphin:${SLOT}
+   optfeature "SVG support" kde-apps/svg:${SLOT}
+   optfeature "Java support on webpages" virtual/jre
fi
+   ecm_pkg_postinst
 }

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

[Andreas Sturmlechner]

commit: 106a6c884b047392b5e2f3beaf9c3232c7cfe13f
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Sun Jul 19 11:52:03 2020 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Tue Jul 21 11:17:21 2020 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=106a6c88

kde-apps/konqueror: Update DEPENDs, kdelibs4support--

Upstream commit 1a62207ca32406c9c5717ee254bef2f4749e0c34

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

 kde-apps/konqueror/konqueror-.ebuild | 1 -
 1 file changed, 1 deletion(-)

diff --git a/kde-apps/konqueror/konqueror-.ebuild 
b/kde-apps/konqueror/konqueror-.ebuild
index 10ebf1d25b..1bf909e01b 100644
--- a/kde-apps/konqueror/konqueror-.ebuild
+++ b/kde-apps/konqueror/konqueror-.ebuild
@@ -37,7 +37,6 @@ COMMON_DEPEND="
>=kde-frameworks/kcoreaddons-${KFMIN}:5
>=kde-frameworks/kcrash-${KFMIN}:5
>=kde-frameworks/kdbusaddons-${KFMIN}:5
-   >=kde-frameworks/kdelibs4support-${KFMIN}:5
>=kde-frameworks/kdesu-${KFMIN}:5
>=kde-frameworks/kguiaddons-${KFMIN}:5
>=kde-frameworks/ki18n-${KFMIN}:5

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

[Andreas Sturmlechner]

commit: d8c8c94e539f9ff6f45cf6f33488ee69e997acaf
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Tue Jan 14 19:08:34 2020 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Tue Jan 14 19:20:48 2020 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=d8c8c94e

kde-apps/konqueror: Drop USE tidy

HTML/CSS validation plugin was dropped in 19.12 cycle already.

Upstream commit c36237c4f2fca0efc9b5f01f9d32567468fdd698

Closes: https://bugs.gentoo.org/705426
Package-Manager: Portage-2.3.84, Repoman-2.3.20
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 kde-apps/konqueror/konqueror-19.12.49..ebuild | 4 +---
 kde-apps/konqueror/konqueror-.ebuild  | 4 +---
 2 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/kde-apps/konqueror/konqueror-19.12.49..ebuild 
b/kde-apps/konqueror/konqueror-19.12.49..ebuild
index 41c2577e7d..8a6b26838b 100644
--- a/kde-apps/konqueror/konqueror-19.12.49..ebuild
+++ b/kde-apps/konqueror/konqueror-19.12.49..ebuild
@@ -16,7 +16,7 @@ 
HOMEPAGE="https://kde.org/applications/internet/org.kde.konqueror;
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
 KEYWORDS=""
-IUSE="activities speech tidy X"
+IUSE="activities speech X"
 
 # 4 of 4 tests fail. Last checked for 4.0.3
 RESTRICT+=" test"
@@ -54,7 +54,6 @@ COMMON_DEPEND="
>=kde-frameworks/kxmlgui-${KFMIN}:5
sys-libs/zlib
speech? ( >=dev-qt/qtspeech-${QTMIN}:5 )
-   tidy? ( app-text/tidy-html5 )
X? ( >=dev-qt/qtx11extras-${QTMIN}:5 )
 "
 DEPEND="${COMMON_DEPEND}
@@ -75,7 +74,6 @@ src_configure() {
local mycmakeargs=(
$(cmake_use_find_package activities KF5Activities)
$(cmake_use_find_package speech Qt5TextToSpeech)
-   $(cmake_use_find_package tidy LibTidy)
$(cmake_use_find_package X X11)
)
ecm_src_configure

diff --git a/kde-apps/konqueror/konqueror-.ebuild 
b/kde-apps/konqueror/konqueror-.ebuild
index 8c6bff8f33..43044f0dc8 100644
--- a/kde-apps/konqueror/konqueror-.ebuild
+++ b/kde-apps/konqueror/konqueror-.ebuild
@@ -16,7 +16,7 @@ 
HOMEPAGE="https://kde.org/applications/internet/org.kde.konqueror;
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
 KEYWORDS=""
-IUSE="activities speech tidy X"
+IUSE="activities speech X"
 
 # 4 of 4 tests fail. Last checked for 4.0.3
 RESTRICT+=" test"
@@ -53,7 +53,6 @@ COMMON_DEPEND="
>=kde-frameworks/kxmlgui-${KFMIN}:5
sys-libs/zlib
speech? ( >=dev-qt/qtspeech-${QTMIN}:5 )
-   tidy? ( app-text/tidy-html5 )
X? ( >=dev-qt/qtx11extras-${QTMIN}:5 )
 "
 DEPEND="${COMMON_DEPEND}
@@ -74,7 +73,6 @@ src_configure() {
local mycmakeargs=(
$(cmake_use_find_package activities KF5Activities)
$(cmake_use_find_package speech Qt5TextToSpeech)
-   $(cmake_use_find_package tidy LibTidy)
$(cmake_use_find_package X X11)
)
ecm_src_configure

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

[Andreas Sturmlechner]

commit: 1daa6fea2756974c1ad28974241e0bf73871f0ca
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Tue Jan  7 19:12:37 2020 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Tue Jan  7 19:12:37 2020 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=1daa6fea

kde-apps/konqueror: Rollover recent stable branch changes to 19.12.1

Bump was based on old checkout.

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

 kde-apps/konqueror/konqueror-19.12.1.ebuild | 26 +-
 1 file changed, 9 insertions(+), 17 deletions(-)

diff --git a/kde-apps/konqueror/konqueror-19.12.1.ebuild 
b/kde-apps/konqueror/konqueror-19.12.1.ebuild
index b1965f2279..41c2577e7d 100644
--- a/kde-apps/konqueror/konqueror-19.12.1.ebuild
+++ b/kde-apps/konqueror/konqueror-19.12.1.ebuild
@@ -5,9 +5,7 @@ EAPI=7
 
 ECM_HANDBOOK="forceoptional" # not optional until !kdelibs4support
 ECM_TEST="true"
-PVCUT=$(ver_cut 1-3)
 KFMIN=5.63.0
-PLASMA_MINIMAL=5.16.5
 QTMIN=5.12.3
 VIRTUALX_REQUIRED="test"
 inherit flag-o-matic ecm kde.org
@@ -17,13 +15,18 @@ 
HOMEPAGE="https://kde.org/applications/internet/org.kde.konqueror;
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
-IUSE="activities speech tidy +webengine X"
+KEYWORDS=""
+IUSE="activities speech tidy X"
 
 # 4 of 4 tests fail. Last checked for 4.0.3
 RESTRICT+=" test"
 
 COMMON_DEPEND="
+   >=dev-qt/qtdbus-${QTMIN}:5
+   >=dev-qt/qtgui-${QTMIN}:5
+   >=dev-qt/qtwebengine-${QTMIN}:5[widgets]
+   >=dev-qt/qtwidgets-${QTMIN}:5
+   >=dev-qt/qtxml-${QTMIN}:5
>=kde-frameworks/karchive-${KFMIN}:5
>=kde-frameworks/kbookmarks-${KFMIN}:5
>=kde-frameworks/kcmutils-${KFMIN}:5
@@ -49,33 +52,22 @@ COMMON_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/qtwidgets-${QTMIN}:5
-   >=dev-qt/qtxml-${QTMIN}:5
sys-libs/zlib
speech? ( >=dev-qt/qtspeech-${QTMIN}:5 )
tidy? ( app-text/tidy-html5 )
-   webengine? ( >=dev-qt/qtwebengine-${QTMIN}:5[widgets] )
X? ( >=dev-qt/qtx11extras-${QTMIN}:5 )
 "
 DEPEND="${COMMON_DEPEND}
activities? ( >=kde-frameworks/kactivities-${KFMIN}:5 )
 "
 RDEPEND="${COMMON_DEPEND}
-   >=kde-apps/kfind-${PVCUT}:5
-   >=kde-plasma/kde-cli-tools-${PLASMA_MINIMAL}:5
-   !webengine? ( kde-misc/kwebkitpart:5 )
+   kde-apps/kfind:5
+   kde-plasma/kde-cli-tools:5
 "
 
 src_prepare() {
[[ ${CHOST} == *-solaris* ]] && append-ldflags -lmalloc
 
-   if ! use webengine; then
-   ecm_punt_bogus_dep Qt5 WebEngineWidgets
-   cmake_comment_add_subdirectory webenginepart
-   fi
-
ecm_src_prepare
 }
 

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

[Andreas Sturmlechner]

commit: 27c028d4dd7755a43b0eea4fbc4be60aa071d1a9
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Mon Jan  6 20:13:27 2020 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Mon Jan  6 20:13:27 2020 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=27c028d4

kde-apps/konqueror: Drop unused DEPEND

Upstream commit 430c4c9f411cd1c6da436745512974c65bdf686e

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

 kde-apps/konqueror/konqueror-.ebuild | 1 -
 1 file changed, 1 deletion(-)

diff --git a/kde-apps/konqueror/konqueror-.ebuild 
b/kde-apps/konqueror/konqueror-.ebuild
index 432b4fe380..096aa82b20 100644
--- a/kde-apps/konqueror/konqueror-.ebuild
+++ b/kde-apps/konqueror/konqueror-.ebuild
@@ -40,7 +40,6 @@ COMMON_DEPEND="
>=kde-frameworks/kdelibs4support-${KFMIN}:5
>=kde-frameworks/kdesu-${KFMIN}:5
>=kde-frameworks/kguiaddons-${KFMIN}:5
-   >=kde-frameworks/khtml-${KFMIN}:5
>=kde-frameworks/ki18n-${KFMIN}:5
>=kde-frameworks/kiconthemes-${KFMIN}:5
>=kde-frameworks/kio-${KFMIN}:5

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

[Andreas Sturmlechner]

commit: 333496a37c2c53ebcef2b8284bab47d0dedd5fbc
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Sun Jan  5 12:22:08 2020 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Sun Jan  5 12:22:08 2020 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=333496a3

kde-apps/konqueror: Drop USE webengine from stable branch

Drop a hack to disable QtWebEngine dependency. On master it is already gone,
QtWebKit is deprecated anyway, kwebkitpart is practically unmaintained.

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

 kde-apps/konqueror/konqueror-19.12.49..ebuild | 24 ---
 kde-apps/konqueror/metadata.xml   |  1 -
 2 files changed, 8 insertions(+), 17 deletions(-)

diff --git a/kde-apps/konqueror/konqueror-19.12.49..ebuild 
b/kde-apps/konqueror/konqueror-19.12.49..ebuild
index 7501ed4f81..41c2577e7d 100644
--- a/kde-apps/konqueror/konqueror-19.12.49..ebuild
+++ b/kde-apps/konqueror/konqueror-19.12.49..ebuild
@@ -5,9 +5,7 @@ EAPI=7
 
 ECM_HANDBOOK="forceoptional" # not optional until !kdelibs4support
 ECM_TEST="true"
-PVCUT=$(ver_cut 1-3)
 KFMIN=5.63.0
-PLASMA_MINIMAL=5.16.5
 QTMIN=5.12.3
 VIRTUALX_REQUIRED="test"
 inherit flag-o-matic ecm kde.org
@@ -18,12 +16,17 @@ 
HOMEPAGE="https://kde.org/applications/internet/org.kde.konqueror;
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
 KEYWORDS=""
-IUSE="activities speech tidy +webengine X"
+IUSE="activities speech tidy X"
 
 # 4 of 4 tests fail. Last checked for 4.0.3
 RESTRICT+=" test"
 
 COMMON_DEPEND="
+   >=dev-qt/qtdbus-${QTMIN}:5
+   >=dev-qt/qtgui-${QTMIN}:5
+   >=dev-qt/qtwebengine-${QTMIN}:5[widgets]
+   >=dev-qt/qtwidgets-${QTMIN}:5
+   >=dev-qt/qtxml-${QTMIN}:5
>=kde-frameworks/karchive-${KFMIN}:5
>=kde-frameworks/kbookmarks-${KFMIN}:5
>=kde-frameworks/kcmutils-${KFMIN}:5
@@ -49,33 +52,22 @@ COMMON_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/qtwidgets-${QTMIN}:5
-   >=dev-qt/qtxml-${QTMIN}:5
sys-libs/zlib
speech? ( >=dev-qt/qtspeech-${QTMIN}:5 )
tidy? ( app-text/tidy-html5 )
-   webengine? ( >=dev-qt/qtwebengine-${QTMIN}:5[widgets] )
X? ( >=dev-qt/qtx11extras-${QTMIN}:5 )
 "
 DEPEND="${COMMON_DEPEND}
activities? ( >=kde-frameworks/kactivities-${KFMIN}:5 )
 "
 RDEPEND="${COMMON_DEPEND}
-   >=kde-apps/kfind-${PVCUT}:5
-   >=kde-plasma/kde-cli-tools-${PLASMA_MINIMAL}:5
-   !webengine? ( kde-misc/kwebkitpart:5 )
+   kde-apps/kfind:5
+   kde-plasma/kde-cli-tools:5
 "
 
 src_prepare() {
[[ ${CHOST} == *-solaris* ]] && append-ldflags -lmalloc
 
-   if ! use webengine; then
-   ecm_punt_bogus_dep Qt5 WebEngineWidgets
-   cmake_comment_add_subdirectory webenginepart
-   fi
-
ecm_src_prepare
 }
 

diff --git a/kde-apps/konqueror/metadata.xml b/kde-apps/konqueror/metadata.xml
index 462e8ca374..a198affb54 100644
--- a/kde-apps/konqueror/metadata.xml
+++ b/kde-apps/konqueror/metadata.xml
@@ -8,6 +8,5 @@

Enable kactivities support
Build text-to-speech plugin
-   Enable dev-qt/qtwebengine as 
web browser engine (fallback is kde-misc/kwebkitpart)

 

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

[Andreas Sturmlechner]

commit: 442d20e0e8736be338aa4d5077297b302c5be780
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Sat Jan  4 13:43:33 2020 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Sat Jan  4 13:46:22 2020 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=442d20e0

kde-apps/konqueror: Drop USE webengine, no longer optional

Drop minimum versions for kde-apps/kfind and kde-plasma/kde-cli-tools,
they are simple runtime binary dependencies.

Upstream commit 64f94b6b78312506f34a302e3e4b79d4a97f88eb

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

 kde-apps/konqueror/konqueror-.ebuild | 24 
 1 file changed, 8 insertions(+), 16 deletions(-)

diff --git a/kde-apps/konqueror/konqueror-.ebuild 
b/kde-apps/konqueror/konqueror-.ebuild
index 4760b6fdae..8a62475f7c 100644
--- a/kde-apps/konqueror/konqueror-.ebuild
+++ b/kde-apps/konqueror/konqueror-.ebuild
@@ -5,9 +5,7 @@ EAPI=7
 
 ECM_HANDBOOK="forceoptional" # not optional until !kdelibs4support
 ECM_TEST="true"
-PVCUT=$(ver_cut 1-3)
 KFMIN=5.64.0
-PLASMA_MINIMAL=5.16.5
 QTMIN=5.12.3
 VIRTUALX_REQUIRED="test"
 inherit flag-o-matic ecm kde.org
@@ -18,12 +16,17 @@ 
HOMEPAGE="https://kde.org/applications/internet/org.kde.konqueror;
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
 KEYWORDS=""
-IUSE="activities speech tidy +webengine X"
+IUSE="activities speech tidy X"
 
 # 4 of 4 tests fail. Last checked for 4.0.3
 RESTRICT+=" test"
 
 COMMON_DEPEND="
+   >=dev-qt/qtdbus-${QTMIN}:5
+   >=dev-qt/qtgui-${QTMIN}:5
+   >=dev-qt/qtwebengine-${QTMIN}:5[widgets]
+   >=dev-qt/qtwidgets-${QTMIN}:5
+   >=dev-qt/qtxml-${QTMIN}:5
>=kde-frameworks/karchive-${KFMIN}:5
>=kde-frameworks/kbookmarks-${KFMIN}:5
>=kde-frameworks/kcmutils-${KFMIN}:5
@@ -49,33 +52,22 @@ COMMON_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/qtwidgets-${QTMIN}:5
-   >=dev-qt/qtxml-${QTMIN}:5
sys-libs/zlib
speech? ( >=dev-qt/qtspeech-${QTMIN}:5 )
tidy? ( app-text/tidy-html5 )
-   webengine? ( >=dev-qt/qtwebengine-${QTMIN}:5[widgets] )
X? ( >=dev-qt/qtx11extras-${QTMIN}:5 )
 "
 DEPEND="${COMMON_DEPEND}
activities? ( >=kde-frameworks/kactivities-${KFMIN}:5 )
 "
 RDEPEND="${COMMON_DEPEND}
-   >=kde-apps/kfind-${PVCUT}:5
-   >=kde-plasma/kde-cli-tools-${PLASMA_MINIMAL}:5
-   !webengine? ( kde-misc/kwebkitpart:5 )
+   kde-apps/kfind:5
+   kde-plasma/kde-cli-tools:5
 "
 
 src_prepare() {
[[ ${CHOST} == *-solaris* ]] && append-ldflags -lmalloc
 
-   if ! use webengine; then
-   ecm_punt_bogus_dep Qt5 WebEngineWidgets
-   cmake_comment_add_subdirectory webenginepart
-   fi
-
ecm_src_prepare
 }
 

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

[Michael Palimaka]

commit: a602b9855357fa12335c7becff05c066555a2553
Author: Michael Mair-Keimberger  gmail  com>
AuthorDate: Wed Mar 13 18:36:42 2019 +
Commit: Michael Palimaka  gentoo  org>
CommitDate: Sat Mar 16 06:00:15 2019 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=a602b985

kde-apps/konqueror: remove unused patch(es)

Closes: https://github.com/gentoo/kde/pull/876
Signed-off-by: Michael Mair-Keimberger  gmail.com>

 .../files/konqueror-18.08.3-tidyhtml5.patch| 46 --
 1 file changed, 46 deletions(-)

diff --git a/kde-apps/konqueror/files/konqueror-18.08.3-tidyhtml5.patch 
b/kde-apps/konqueror/files/konqueror-18.08.3-tidyhtml5.patch
deleted file mode 100644
index dae1486d58..00
--- a/kde-apps/konqueror/files/konqueror-18.08.3-tidyhtml5.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-From 29955abce07526d01f3298da9d2f15bd9eb5e6f4 Mon Sep 17 00:00:00 2001
-From: Andreas Sturmlechner 
-Date: Sun, 18 Nov 2018 18:07:32 +0100
-Subject: [PATCH] Switch to tidy-html5 and use tidybuffio.h instead of buffio.h
-
-Summary: Header was renamed a few years ago.
-
-Test Plan: Builds and validates fine.
-
-Reviewers: #konqueror
-
-Differential Revision: https://phabricator.kde.org/D16982

- plugins/validators/CMakeLists.txt | 2 +-
- plugins/validators/tidy_validator.cpp | 2 +-
- 2 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/plugins/validators/CMakeLists.txt 
b/plugins/validators/CMakeLists.txt
-index cf3b70694..7f6060e9c 100644
 a/plugins/validators/CMakeLists.txt
-+++ b/plugins/validators/CMakeLists.txt
-@@ -4,7 +4,7 @@ set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} 
${CMAKE_CURRENT_SOURCE_DIR})
- find_package(LibTidy)
- find_package(KF5 REQUIRED KHtml WidgetsAddons IconThemes)
- set_package_properties(LibTidy PROPERTIES DESCRIPTION "HTML Tidy"
--   URL "http://tidy.sourceforge.net;
-+   URL "http://www.html-tidy.org/;
-TYPE OPTIONAL
-PURPOSE "Gives the Konqueror validators plugin the 
ability to validate HTML"
-   )
-diff --git a/plugins/validators/tidy_validator.cpp 
b/plugins/validators/tidy_validator.cpp
-index 3247199f9..ac22429d0 100644
 a/plugins/validators/tidy_validator.cpp
-+++ b/plugins/validators/tidy_validator.cpp
-@@ -25,7 +25,7 @@
- 
- #include 
- 
--#include 
-+#include 
- #include 
- 
- #include 
--- 
-2.19.1
-

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

[Andreas Sturmlechner]

commit: 8783a8d8499f24bb09f18b3dbfb64745de6e3206
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Sun Jan 13 23:47:34 2019 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Sat Jan 19 12:21:44 2019 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=8783a8d8

kde-apps/konqueror: Patch upstreamed

Upstream commit 63b6a7435646295eba7391e49c4964c3b3f7231b

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

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

diff --git a/kde-apps/konqueror/konqueror-.ebuild 
b/kde-apps/konqueror/konqueror-.ebuild
index 9e76874a1a..8f1a2d9ca3 100644
--- a/kde-apps/konqueror/konqueror-.ebuild
+++ b/kde-apps/konqueror/konqueror-.ebuild
@@ -66,8 +66,6 @@ RDEPEND="${COMMON_DEPEND}
!webengine? ( kde-misc/kwebkitpart:5 )
 "
 
-PATCHES=( "${FILESDIR}/${PN}-18.08.3-tidyhtml5.patch" )
-
 src_prepare() {
[[ ${CHOST} == *-solaris* ]] && append-ldflags -lmalloc
 

[gentoo-commits] proj/kde:master commit in: kde-apps/konqueror/, kde-apps/korganizer/, kde-apps/kleopatra/, kde-apps/minuet/, ...

[Andreas Sturmlechner]

commit: 58aaed8538c56bafb25d1b4b1d132cafd3c043f2
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Wed Jan  9 01:41:37 2019 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Wed Jan  9 01:52:28 2019 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=58aaed85

kde-apps: Move remaining slot 4 blockers where they belong

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

 kde-apps/akonadi/akonadi-18.12.1.ebuild   | 1 +
 kde-apps/akonadi/akonadi-18.12.49..ebuild | 1 +
 kde-apps/akregator/akregator-18.12.1.ebuild   | 1 +
 kde-apps/akregator/akregator-18.12.49..ebuild | 1 +
 kde-apps/audiocd-kio/audiocd-kio-18.12.1.ebuild   | 4 +++-
 kde-apps/audiocd-kio/audiocd-kio-18.12.49..ebuild | 4 +++-
 kde-apps/kaddressbook/kaddressbook-18.12.1.ebuild | 1 +
 kde-apps/kaddressbook/kaddressbook-18.12.49..ebuild   | 1 +
 kde-apps/kalarm/kalarm-18.12.1.ebuild | 1 +
 kde-apps/kalarm/kalarm-18.12.49..ebuild   | 1 +
 kde-apps/kjots/kjots-.ebuild  | 6 +++---
 kde-apps/kleopatra/kleopatra-18.12.1.ebuild   | 1 +
 kde-apps/kleopatra/kleopatra-18.12.49..ebuild | 1 +
 kde-apps/kmail/kmail-18.12.1.ebuild   | 1 +
 kde-apps/kmail/kmail-18.12.49..ebuild | 1 +
 kde-apps/knotes/knotes-18.12.1.ebuild | 1 +
 kde-apps/knotes/knotes-18.12.49..ebuild   | 1 +
 kde-apps/konqueror/konqueror-18.12.1.ebuild   | 1 +
 kde-apps/konqueror/konqueror-18.12.49..ebuild | 1 +
 kde-apps/konsolekalendar/konsolekalendar-18.12.1.ebuild   | 1 +
 kde-apps/konsolekalendar/konsolekalendar-18.12.49..ebuild | 1 +
 kde-apps/kontact/kontact-18.12.1.ebuild   | 1 +
 kde-apps/kontact/kontact-18.12.49..ebuild | 1 +
 kde-apps/kopete/kopete-18.12.1.ebuild | 1 +
 kde-apps/kopete/kopete-18.12.49..ebuild   | 1 +
 kde-apps/korganizer/korganizer-18.12.1.ebuild | 1 +
 kde-apps/korganizer/korganizer-18.12.49..ebuild   | 1 +
 kde-apps/minuet/minuet-18.12.1.ebuild | 7 +--
 kde-apps/minuet/minuet-18.12.49..ebuild   | 7 +--
 29 files changed, 43 insertions(+), 9 deletions(-)

diff --git a/kde-apps/akonadi/akonadi-18.12.1.ebuild 
b/kde-apps/akonadi/akonadi-18.12.1.ebuild
index 1a0a2c2243..e80a4b6a95 100644
--- a/kde-apps/akonadi/akonadi-18.12.1.ebuild
+++ b/kde-apps/akonadi/akonadi-18.12.1.ebuild
@@ -49,6 +49,7 @@ DEPEND="${COMMON_DEPEND}
test? ( sys-apps/dbus )
 "
 RDEPEND="${COMMON_DEPEND}
+   !kde-apps/akonadi:4
!https://www.kde.org/applications/utilities/kjots/;
 KEYWORDS=""
 IUSE=""
 
-RDEPEND="
+DEPEND="
$(add_frameworks_dep kbookmarks)
$(add_frameworks_dep kcmutils)
$(add_frameworks_dep kconfig)
@@ -36,6 +36,6 @@ RDEPEND="
dev-libs/grantlee:5
dev-libs/libxslt
 "
-DEPEND="${RDEPEND}
-   sys-devel/gettext
+RDEPEND="${DEPEND}
+   !kde-apps/kjots:4
 "

diff --git a/kde-apps/kleopatra/kleopatra-18.12.1.ebuild 
b/kde-apps/kleopatra/kleopatra-18.12.1.ebuild
index 9d50875fbf..f846276c10 100644
--- a/kde-apps/kleopatra/kleopatra-18.12.1.ebuild
+++ b/kde-apps/kleopatra/kleopatra-18.12.1.ebuild
@@ -44,6 +44,7 @@ DEPEND="
 "
 RDEPEND="${DEPEND}
!kde-apps/kdepim-l10n
+   !kde-apps/kleopatra:4
>=app-crypt/gnupg-2.1
app-crypt/paperkey
 "

diff --git a/kde-apps/kleopatra/kleopatra-18.12.49..ebuild 
b/kde-apps/kleopatra/kleopatra-18.12.49..ebuild
index a0bbc2a40a..7e48839bcd 100644
--- a/kde-apps/kleopatra/kleopatra-18.12.49..ebuild
+++ b/kde-apps/kleopatra/kleopatra-18.12.49..ebuild
@@ -44,6 +44,7 @@ DEPEND="
 "
 RDEPEND="${DEPEND}
!kde-apps/kdepim-l10n
+   !kde-apps/kleopatra:4
>=app-crypt/gnupg-2.1
app-crypt/paperkey
 "

diff --git a/kde-apps/kmail/kmail-18.12.1.ebuild 
b/kde-apps/kmail/kmail-18.12.1.ebuild
index 14e6f0ac94..4827eb3089 100644
--- a/kde-apps/kmail/kmail-18.12.1.ebuild
+++ b/kde-apps/kmail/kmail-18.12.1.ebuild
@@ -75,6 +75,7 @@ DEPEND="${COMMON_DEPEND}
 RDEPEND="${COMMON_DEPEND}
!kde-apps/kdepim-common-libs:4
!kde-apps/kdepim-l10n
+   !kde-apps/kmail:4
!kde-apps/ktnef
$(add_kdeapps_dep kdepim-runtime)
$(add_kdeapps_dep kmail-account-wizard)

diff --git a/kde-apps/kmail/kmail-18.12.49..ebuild 
b/kde-apps/kmail/kmail-18.12.49..ebuild
index 45fb30d520..ff8a7efea7 100644
--- a/kde-apps/kmail/kmail-18.12.49..ebuild
+++ b/kde-apps/kmail/kmail-18.12.49..ebuild
@@ -75,6 +75,7 @@ DEPEND="${COMMON_DEPEND}
 RDEPEND="${COMMON_DEPEND}
!kde-apps/kdepim-common-libs:4

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

[Andreas Sturmlechner]

commit: cabec49f1b0caa55a5e38504ee26a3bf72176dfe
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Thu Dec 13 21:27:04 2018 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Thu Dec 13 22:23:59 2018 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=cabec49f

kde-apps/konqueror: Reduce pkg_postinst spam

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

 kde-apps/konqueror/konqueror-18.12.49..ebuild | 30 ---
 kde-apps/konqueror/konqueror-.ebuild  | 30 ---
 2 files changed, 32 insertions(+), 28 deletions(-)

diff --git a/kde-apps/konqueror/konqueror-18.12.49..ebuild 
b/kde-apps/konqueror/konqueror-18.12.49..ebuild
index bfb7b0b088..0bdfd6f984 100644
--- a/kde-apps/konqueror/konqueror-18.12.49..ebuild
+++ b/kde-apps/konqueror/konqueror-18.12.49..ebuild
@@ -92,22 +92,24 @@ src_configure() {
 pkg_postinst() {
kde5_pkg_postinst
 
-   if ! has_version kde-apps/keditbookmarks:${SLOT} ; then
-   elog "For bookmarks support, install keditbookmarks:"
-   elog "kde-apps/keditbookmarks:${SLOT}"
-   fi
+   if [[ -z "${REPLACING_VERSIONS}" ]]; then
+   if ! has_version kde-apps/keditbookmarks:${SLOT} ; then
+   elog "For bookmarks support, install keditbookmarks:"
+   elog "kde-apps/keditbookmarks:${SLOT}"
+   fi
 
-   if ! has_version kde-apps/dolphin:${SLOT} ; then
-   elog "If you want to use konqueror as a filemanager, install 
the dolphin kpart:"
-   elog "kde-apps/dolphin:${SLOT}"
-   fi
+   if ! has_version kde-apps/dolphin:${SLOT} ; then
+   elog "If you want to use konqueror as a filemanager, 
install the dolphin kpart:"
+   elog "kde-apps/dolphin:${SLOT}"
+   fi
 
-   if ! has_version kde-apps/svg:${SLOT} ; then
-   elog "For konqueror to view SVGs, install the svg kpart:"
-   elog "kde-apps/svgpart:${SLOT}"
-   fi
+   if ! has_version kde-apps/svg:${SLOT} ; then
+   elog "For konqueror to view SVGs, install the svg 
kpart:"
+   elog "kde-apps/svgpart:${SLOT}"
+   fi
 
-   if ! has_version virtual/jre ; then
-   elog "To use Java on webpages install virtual/jre."
+   if ! has_version virtual/jre ; then
+   elog "To use Java on webpages install virtual/jre."
+   fi
fi
 }

diff --git a/kde-apps/konqueror/konqueror-.ebuild 
b/kde-apps/konqueror/konqueror-.ebuild
index bfb7b0b088..0bdfd6f984 100644
--- a/kde-apps/konqueror/konqueror-.ebuild
+++ b/kde-apps/konqueror/konqueror-.ebuild
@@ -92,22 +92,24 @@ src_configure() {
 pkg_postinst() {
kde5_pkg_postinst
 
-   if ! has_version kde-apps/keditbookmarks:${SLOT} ; then
-   elog "For bookmarks support, install keditbookmarks:"
-   elog "kde-apps/keditbookmarks:${SLOT}"
-   fi
+   if [[ -z "${REPLACING_VERSIONS}" ]]; then
+   if ! has_version kde-apps/keditbookmarks:${SLOT} ; then
+   elog "For bookmarks support, install keditbookmarks:"
+   elog "kde-apps/keditbookmarks:${SLOT}"
+   fi
 
-   if ! has_version kde-apps/dolphin:${SLOT} ; then
-   elog "If you want to use konqueror as a filemanager, install 
the dolphin kpart:"
-   elog "kde-apps/dolphin:${SLOT}"
-   fi
+   if ! has_version kde-apps/dolphin:${SLOT} ; then
+   elog "If you want to use konqueror as a filemanager, 
install the dolphin kpart:"
+   elog "kde-apps/dolphin:${SLOT}"
+   fi
 
-   if ! has_version kde-apps/svg:${SLOT} ; then
-   elog "For konqueror to view SVGs, install the svg kpart:"
-   elog "kde-apps/svgpart:${SLOT}"
-   fi
+   if ! has_version kde-apps/svg:${SLOT} ; then
+   elog "For konqueror to view SVGs, install the svg 
kpart:"
+   elog "kde-apps/svgpart:${SLOT}"
+   fi
 
-   if ! has_version virtual/jre ; then
-   elog "To use Java on webpages install virtual/jre."
+   if ! has_version virtual/jre ; then
+   elog "To use Java on webpages install virtual/jre."
+   fi
fi
 }

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

[Andreas Sturmlechner]

commit: 41a779b2691dc3410d384630767fe9670b7bc312
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Sun Nov 18 16:46:18 2018 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Sun Nov 18 18:00:00 2018 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=41a779b2

kde-apps/konqueror: Switch USE tidy to app-text/tidy-html5

Bug: https://bugs.gentoo.org/671450
Package-Manager: Portage-2.3.51, Repoman-2.3.12
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 .../files/konqueror-18.08.3-tidyhtml5.patch| 46 ++
 kde-apps/konqueror/konqueror-18.11.80.ebuild   |  4 +-
 kde-apps/konqueror/konqueror-18.12.49..ebuild  |  4 +-
 kde-apps/konqueror/konqueror-.ebuild   |  6 ++-
 4 files changed, 56 insertions(+), 4 deletions(-)

diff --git a/kde-apps/konqueror/files/konqueror-18.08.3-tidyhtml5.patch 
b/kde-apps/konqueror/files/konqueror-18.08.3-tidyhtml5.patch
new file mode 100644
index 00..dae1486d58
--- /dev/null
+++ b/kde-apps/konqueror/files/konqueror-18.08.3-tidyhtml5.patch
@@ -0,0 +1,46 @@
+From 29955abce07526d01f3298da9d2f15bd9eb5e6f4 Mon Sep 17 00:00:00 2001
+From: Andreas Sturmlechner 
+Date: Sun, 18 Nov 2018 18:07:32 +0100
+Subject: [PATCH] Switch to tidy-html5 and use tidybuffio.h instead of buffio.h
+
+Summary: Header was renamed a few years ago.
+
+Test Plan: Builds and validates fine.
+
+Reviewers: #konqueror
+
+Differential Revision: https://phabricator.kde.org/D16982
+---
+ plugins/validators/CMakeLists.txt | 2 +-
+ plugins/validators/tidy_validator.cpp | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/plugins/validators/CMakeLists.txt 
b/plugins/validators/CMakeLists.txt
+index cf3b70694..7f6060e9c 100644
+--- a/plugins/validators/CMakeLists.txt
 b/plugins/validators/CMakeLists.txt
+@@ -4,7 +4,7 @@ set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} 
${CMAKE_CURRENT_SOURCE_DIR})
+ find_package(LibTidy)
+ find_package(KF5 REQUIRED KHtml WidgetsAddons IconThemes)
+ set_package_properties(LibTidy PROPERTIES DESCRIPTION "HTML Tidy"
+-   URL "http://tidy.sourceforge.net;
++   URL "http://www.html-tidy.org/;
+TYPE OPTIONAL
+PURPOSE "Gives the Konqueror validators plugin the 
ability to validate HTML"
+   )
+diff --git a/plugins/validators/tidy_validator.cpp 
b/plugins/validators/tidy_validator.cpp
+index 3247199f9..ac22429d0 100644
+--- a/plugins/validators/tidy_validator.cpp
 b/plugins/validators/tidy_validator.cpp
+@@ -25,7 +25,7 @@
+ 
+ #include 
+ 
+-#include 
++#include 
+ #include 
+ 
+ #include 
+-- 
+2.19.1
+

diff --git a/kde-apps/konqueror/konqueror-18.11.80.ebuild 
b/kde-apps/konqueror/konqueror-18.11.80.ebuild
index 9d8010e340..503376e9dc 100644
--- a/kde-apps/konqueror/konqueror-18.11.80.ebuild
+++ b/kde-apps/konqueror/konqueror-18.11.80.ebuild
@@ -50,7 +50,7 @@ COMMON_DEPEND="
$(add_qt_dep qtxml)
sys-libs/zlib
speech? ( $(add_qt_dep qtspeech) )
-   tidy? ( app-text/htmltidy )
+   tidy? ( app-text/tidy-html5 )
webengine? ( $(add_qt_dep qtwebengine 'widgets') )
X? ( $(add_qt_dep qtx11extras) )
 "
@@ -66,6 +66,8 @@ RDEPEND="${COMMON_DEPEND}
!webengine? ( kde-misc/kwebkitpart:5 )
 "
 
+PATCHES=( "${FILESDIR}/${PN}-18.08.3-tidyhtml5.patch" )
+
 src_prepare() {
[[ ${CHOST} == *-solaris* ]] && append-ldflags -lmalloc
 

diff --git a/kde-apps/konqueror/konqueror-18.12.49..ebuild 
b/kde-apps/konqueror/konqueror-18.12.49..ebuild
index 7b98ce350e..bfb7b0b088 100644
--- a/kde-apps/konqueror/konqueror-18.12.49..ebuild
+++ b/kde-apps/konqueror/konqueror-18.12.49..ebuild
@@ -50,7 +50,7 @@ COMMON_DEPEND="
$(add_qt_dep qtxml)
sys-libs/zlib
speech? ( $(add_qt_dep qtspeech) )
-   tidy? ( app-text/htmltidy )
+   tidy? ( app-text/tidy-html5 )
webengine? ( $(add_qt_dep qtwebengine 'widgets') )
X? ( $(add_qt_dep qtx11extras) )
 "
@@ -66,6 +66,8 @@ RDEPEND="${COMMON_DEPEND}
!webengine? ( kde-misc/kwebkitpart:5 )
 "
 
+PATCHES=( "${FILESDIR}/${PN}-18.08.3-tidyhtml5.patch" )
+
 src_prepare() {
[[ ${CHOST} == *-solaris* ]] && append-ldflags -lmalloc
 

diff --git a/kde-apps/konqueror/konqueror-.ebuild 
b/kde-apps/konqueror/konqueror-.ebuild
index d25778697b..bfb7b0b088 100644
--- a/kde-apps/konqueror/konqueror-.ebuild
+++ b/kde-apps/konqueror/konqueror-.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -50,7 +50,7 @@ COMMON_DEPEND="
$(add_qt_dep qtxml)
sys-libs/zlib
speech? ( $(add_qt_dep qtspeech) )
-   tidy? ( app-text/htmltidy )
+   tidy? ( app-text/tidy-html5 )
webengine? ( $(add_qt_dep qtwebengine 'widgets') )
X? ( $(add_qt_dep qtx11extras) )
 "
@@ -66,6 

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

[Andreas Sturmlechner]

commit: 1fe04886f6d85f66ba6cd9eed3c929aa3116d841
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Mon Aug  6 23:27:29 2018 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Mon Aug  6 23:27:29 2018 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=1fe04886

kde-apps/konqueror: Fix build with USE=-webengine

Reported-by: Tupone Alfredo  gentoo.org>
Closes: https://bugs.gentoo.org/662466
Package-Manager: Portage-2.3.44, Repoman-2.3.10

 kde-apps/konqueror/konqueror-.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/kde-apps/konqueror/konqueror-.ebuild 
b/kde-apps/konqueror/konqueror-.ebuild
index ad0cc0383f..d25778697b 100644
--- a/kde-apps/konqueror/konqueror-.ebuild
+++ b/kde-apps/konqueror/konqueror-.ebuild
@@ -71,7 +71,7 @@ src_prepare() {
 
if ! use webengine; then
punt_bogus_dep Qt5 WebEngineWidgets
-   cmake_comment_add_subdirectory webenginepartexit
+   cmake_comment_add_subdirectory webenginepart
fi
 
kde5_src_prepare

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

[Andreas Sturmlechner]

commit: 0a0962fb6f9399f7dbba8e2231e1ff7b83f12c15
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Thu May  3 10:43:05 2018 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Thu May  3 10:43:05 2018 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=0a0962fb

kde-apps/konqueror: Add USE=webengine

Package-Manager: Portage-2.3.33, Repoman-2.3.9

 kde-apps/konqueror/konqueror-18.04.49..ebuild | 14 ++
 kde-apps/konqueror/konqueror-.ebuild  | 14 ++
 kde-apps/konqueror/metadata.xml   |  1 +
 3 files changed, 21 insertions(+), 8 deletions(-)

diff --git a/kde-apps/konqueror/konqueror-18.04.49..ebuild 
b/kde-apps/konqueror/konqueror-18.04.49..ebuild
index 49e5bd7b70..ad0cc0383f 100644
--- a/kde-apps/konqueror/konqueror-18.04.49..ebuild
+++ b/kde-apps/konqueror/konqueror-18.04.49..ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="
https://konqueror.org/
 "
 KEYWORDS=""
-IUSE="activities speech tidy X"
+IUSE="activities speech tidy +webengine X"
 # 4 of 4 tests fail. Last checked for 4.0.3
 RESTRICT+=" test"
 
@@ -46,28 +46,34 @@ COMMON_DEPEND="
$(add_frameworks_dep kxmlgui)
$(add_qt_dep qtdbus)
$(add_qt_dep qtgui)
-   $(add_qt_dep qtwebengine 'widgets')
$(add_qt_dep qtwidgets)
$(add_qt_dep qtxml)
sys-libs/zlib
speech? ( $(add_qt_dep qtspeech) )
tidy? ( app-text/htmltidy )
+   webengine? ( $(add_qt_dep qtwebengine 'widgets') )
X? ( $(add_qt_dep qtx11extras) )
 "
 DEPEND="${COMMON_DEPEND}
activities? ( $(add_frameworks_dep kactivities) )
 "
 RDEPEND="${COMMON_DEPEND}
-   $(add_kdeapps_dep kfind)
-   $(add_plasma_dep kde-cli-tools)
!kde-apps/kfmclient:4
!kde-apps/konq-plugins
!kde-apps/libkonq:5
+   $(add_kdeapps_dep kfind)
+   $(add_plasma_dep kde-cli-tools)
+   !webengine? ( kde-misc/kwebkitpart:5 )
 "
 
 src_prepare() {
[[ ${CHOST} == *-solaris* ]] && append-ldflags -lmalloc
 
+   if ! use webengine; then
+   punt_bogus_dep Qt5 WebEngineWidgets
+   cmake_comment_add_subdirectory webenginepartexit
+   fi
+
kde5_src_prepare
 }
 

diff --git a/kde-apps/konqueror/konqueror-.ebuild 
b/kde-apps/konqueror/konqueror-.ebuild
index 49e5bd7b70..ad0cc0383f 100644
--- a/kde-apps/konqueror/konqueror-.ebuild
+++ b/kde-apps/konqueror/konqueror-.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="
https://konqueror.org/
 "
 KEYWORDS=""
-IUSE="activities speech tidy X"
+IUSE="activities speech tidy +webengine X"
 # 4 of 4 tests fail. Last checked for 4.0.3
 RESTRICT+=" test"
 
@@ -46,28 +46,34 @@ COMMON_DEPEND="
$(add_frameworks_dep kxmlgui)
$(add_qt_dep qtdbus)
$(add_qt_dep qtgui)
-   $(add_qt_dep qtwebengine 'widgets')
$(add_qt_dep qtwidgets)
$(add_qt_dep qtxml)
sys-libs/zlib
speech? ( $(add_qt_dep qtspeech) )
tidy? ( app-text/htmltidy )
+   webengine? ( $(add_qt_dep qtwebengine 'widgets') )
X? ( $(add_qt_dep qtx11extras) )
 "
 DEPEND="${COMMON_DEPEND}
activities? ( $(add_frameworks_dep kactivities) )
 "
 RDEPEND="${COMMON_DEPEND}
-   $(add_kdeapps_dep kfind)
-   $(add_plasma_dep kde-cli-tools)
!kde-apps/kfmclient:4
!kde-apps/konq-plugins
!kde-apps/libkonq:5
+   $(add_kdeapps_dep kfind)
+   $(add_plasma_dep kde-cli-tools)
+   !webengine? ( kde-misc/kwebkitpart:5 )
 "
 
 src_prepare() {
[[ ${CHOST} == *-solaris* ]] && append-ldflags -lmalloc
 
+   if ! use webengine; then
+   punt_bogus_dep Qt5 WebEngineWidgets
+   cmake_comment_add_subdirectory webenginepartexit
+   fi
+
kde5_src_prepare
 }
 

diff --git a/kde-apps/konqueror/metadata.xml b/kde-apps/konqueror/metadata.xml
index a198affb54..462e8ca374 100644
--- a/kde-apps/konqueror/metadata.xml
+++ b/kde-apps/konqueror/metadata.xml
@@ -8,5 +8,6 @@

Enable kactivities support
Build text-to-speech plugin
+   Enable dev-qt/qtwebengine as 
web browser engine (fallback is kde-misc/kwebkitpart)

 

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

[Andreas Sturmlechner]

commit: c090c65d831afc3866e798df19bceb3fad5515bd
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Sun Feb  4 21:14:44 2018 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Sun Feb  4 21:14:44 2018 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=c090c65d

kde-apps/konqueror: Add new kwallet DEPEND

Upstream commit 56ea2a32d2f1d9f4e6c97b27080cf8144a932ee3

Package-Manager: Portage-2.3.24, Repoman-2.3.6

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

diff --git a/kde-apps/konqueror/konqueror-.ebuild 
b/kde-apps/konqueror/konqueror-.ebuild
index 10869b7f04..49e5bd7b70 100644
--- a/kde-apps/konqueror/konqueror-.ebuild
+++ b/kde-apps/konqueror/konqueror-.ebuild
@@ -40,6 +40,7 @@ COMMON_DEPEND="
$(add_frameworks_dep kjobwidgets)
$(add_frameworks_dep kparts)
$(add_frameworks_dep kservice)
+   $(add_frameworks_dep kwallet)
$(add_frameworks_dep kwidgetsaddons)
$(add_frameworks_dep kwindowsystem)
$(add_frameworks_dep kxmlgui)

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

[Michael Palimaka]

commit: 3724abaf62d6d2855e1cb0a387694c864ea4ba0b
Author: Andreas Sturmlechner  gmail  com>
AuthorDate: Tue Nov 22 20:02:40 2016 +
Commit: Michael Palimaka  gentoo  org>
CommitDate: Tue Nov 22 20:02:40 2016 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=3724abaf

kde-apps/konqueror: Fix build with USE=-handbook

Package-Manager: portage-2.3.0

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

diff --git a/kde-apps/konqueror/konqueror-16.12.49..ebuild 
b/kde-apps/konqueror/konqueror-16.12.49..ebuild
index 1b068c1..3597945 100644
--- a/kde-apps/konqueror/konqueror-16.12.49..ebuild
+++ b/kde-apps/konqueror/konqueror-16.12.49..ebuild
@@ -4,7 +4,7 @@
 
 EAPI=6
 
-KDE_HANDBOOK="optional"
+KDE_HANDBOOK="forceoptional" # not optional until !kdelibs4support
 KDE_TEST="true"
 VIRTUALX_REQUIRED="test"
 inherit flag-o-matic kde5

diff --git a/kde-apps/konqueror/konqueror-.ebuild 
b/kde-apps/konqueror/konqueror-.ebuild
index f799192..10e0f1c 100644
--- a/kde-apps/konqueror/konqueror-.ebuild
+++ b/kde-apps/konqueror/konqueror-.ebuild
@@ -4,7 +4,7 @@
 
 EAPI=6
 
-KDE_HANDBOOK="optional"
+KDE_HANDBOOK="forceoptional" # not optional until !kdelibs4support
 KDE_TEST="true"
 VIRTUALX_REQUIRED="test"
 inherit flag-o-matic kde5

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

[Michael Palimaka]

commit: 6764ceba6d6539c227bb1abb2f47932a7e9f97c5
Author: Andreas Sturmlechner  gmail  com>
AuthorDate: Fri Nov 18 19:10:34 2016 +
Commit: Michael Palimaka  gentoo  org>
CommitDate: Sat Nov 19 10:47:23 2016 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=6764ceba

kde-apps/konqueror: Drop unused DEPEND

Upstream commit bca1425fe6dc2fd334742fc3e6560bfcc2440e80

Package-Manager: portage-2.3.0

 kde-apps/konqueror/konqueror-.ebuild | 1 -
 1 file changed, 1 deletion(-)

diff --git a/kde-apps/konqueror/konqueror-.ebuild 
b/kde-apps/konqueror/konqueror-.ebuild
index 1b068c1..f799192 100644
--- a/kde-apps/konqueror/konqueror-.ebuild
+++ b/kde-apps/konqueror/konqueror-.ebuild
@@ -31,7 +31,6 @@ COMMON_DEPEND="
$(add_frameworks_dep kcoreaddons)
$(add_frameworks_dep kcrash)
$(add_frameworks_dep kdbusaddons)
-   $(add_frameworks_dep kded)
$(add_frameworks_dep kdelibs4support)
$(add_frameworks_dep kdesu)
$(add_frameworks_dep kguiaddons)

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

[Michael Palimaka]

commit: f8342777880abef3d27d5fa997fbf2e88c9e2f8a
Author: Andreas Sturmlechner  gmail  com>
AuthorDate: Sat Nov 12 19:44:51 2016 +
Commit: Michael Palimaka  gentoo  org>
CommitDate: Sat Nov 12 19:44:51 2016 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=f8342777

kde-apps/konqueror: Set KDE_HANDBOOK optional

Package-Manager: portage-2.3.0

 kde-apps/konqueror/konqueror-.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/kde-apps/konqueror/konqueror-.ebuild 
b/kde-apps/konqueror/konqueror-.ebuild
index 193ef31..1b068c1 100644
--- a/kde-apps/konqueror/konqueror-.ebuild
+++ b/kde-apps/konqueror/konqueror-.ebuild
@@ -4,7 +4,7 @@
 
 EAPI=6
 
-KDE_HANDBOOK="forceoptional"
+KDE_HANDBOOK="optional"
 KDE_TEST="true"
 VIRTUALX_REQUIRED="test"
 inherit flag-o-matic kde5

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

[Michael Palimaka]

commit: 95fadeee4a0c42bb65fd73731e26ed6619cbd5a1
Author: Andreas Sturmlechner  gmail  com>
AuthorDate: Thu Nov 10 22:33:41 2016 +
Commit: Michael Palimaka  gentoo  org>
CommitDate: Sat Nov 12 10:55:01 2016 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=95fadeee

kde-apps/konqueror: Add new DEPEND, temporary Qt subslot operator

Upstream commit e2de5a6af0b850a129a26308505961645ac3191e

Package-Manager: portage-2.3.0

 kde-apps/konqueror/konqueror-.ebuild | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/kde-apps/konqueror/konqueror-.ebuild 
b/kde-apps/konqueror/konqueror-.ebuild
index d3151f5..193ef31 100644
--- a/kde-apps/konqueror/konqueror-.ebuild
+++ b/kde-apps/konqueror/konqueror-.ebuild
@@ -19,6 +19,7 @@ IUSE="activities speech tidy X"
 # 4 of 4 tests fail. Last checked for 4.0.3
 RESTRICT+=" test"
 
+# drop qtwebengine subslot operator when QT_MINIMAL >= 5.8.0
 COMMON_DEPEND="
$(add_frameworks_dep karchive)
$(add_frameworks_dep kbookmarks)
@@ -33,6 +34,7 @@ COMMON_DEPEND="
$(add_frameworks_dep kded)
$(add_frameworks_dep kdelibs4support)
$(add_frameworks_dep kdesu)
+   $(add_frameworks_dep kguiaddons)
$(add_frameworks_dep khtml)
$(add_frameworks_dep ki18n)
$(add_frameworks_dep kiconthemes)
@@ -46,7 +48,7 @@ COMMON_DEPEND="
$(add_frameworks_dep kxmlgui)
$(add_qt_dep qtdbus)
$(add_qt_dep qtgui)
-   $(add_qt_dep qtwebengine 'widgets')
+   $(add_qt_dep qtwebengine 'widgets' '' '5=')
$(add_qt_dep qtwidgets)
$(add_qt_dep qtxml)
sys-libs/zlib

[gentoo-commits] proj/kde:master commit in: kde-apps/konqueror/, kde-apps/keditbookmarks/, kde-apps/kfind/, ...

[Michael Palimaka]

commit: e8e0a52699b4eb738f2df42c0c0977fce3cc468f
Author: Andreas Sturmlechner  gmail  com>
AuthorDate: Sat Nov  5 13:26:37 2016 +
Commit: Michael Palimaka  gentoo  org>
CommitDate: Sat Nov  5 14:22:28 2016 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=e8e0a526

kde-apps: baseapps packages were split upstream

- kdialog
- keditbookmarks
- kfind
- konqueror

Package-Manager: portage-2.3.0

 kde-apps/kdialog/kdialog-.ebuild   | 3 ---
 kde-apps/keditbookmarks/keditbookmarks-.ebuild | 3 ---
 kde-apps/kfind/kfind-.ebuild   | 4 
 kde-apps/konqueror/konqueror-.ebuild   | 3 ---
 4 files changed, 13 deletions(-)

diff --git a/kde-apps/kdialog/kdialog-.ebuild 
b/kde-apps/kdialog/kdialog-.ebuild
index 0ec37bd..8d25fdc 100644
--- a/kde-apps/kdialog/kdialog-.ebuild
+++ b/kde-apps/kdialog/kdialog-.ebuild
@@ -4,7 +4,6 @@
 
 EAPI=6
 
-KMNAME="kde-baseapps"
 inherit kde5
 
 DESCRIPTION="Can be used to show nice dialog boxes from shell scripts"
@@ -29,8 +28,6 @@ DEPEND="
 "
 RDEPEND="${DEPEND}"
 
-S="${S}/${PN}"
-
 src_configure() {
local mycmakeargs=(
$(cmake-utils_use_find_package X X11)

diff --git a/kde-apps/keditbookmarks/keditbookmarks-.ebuild 
b/kde-apps/keditbookmarks/keditbookmarks-.ebuild
index 278952c..a17a466 100644
--- a/kde-apps/keditbookmarks/keditbookmarks-.ebuild
+++ b/kde-apps/keditbookmarks/keditbookmarks-.ebuild
@@ -5,7 +5,6 @@
 EAPI=6
 
 KDE_TEST="true"
-KMNAME="kde-baseapps"
 VIRTUALX_REQUIRED="test"
 inherit kde5
 
@@ -33,5 +32,3 @@ DEPEND="
$(add_qt_dep qtxml)
 "
 RDEPEND="${DEPEND}"
-
-S="${S}/${PN}"

diff --git a/kde-apps/kfind/kfind-.ebuild b/kde-apps/kfind/kfind-.ebuild
index 32a2758..0c467ff 100644
--- a/kde-apps/kfind/kfind-.ebuild
+++ b/kde-apps/kfind/kfind-.ebuild
@@ -4,9 +4,7 @@
 
 EAPI=6
 
-KDE_DOC_DIR="docs"
 KDE_HANDBOOK="forceoptional"
-KMNAME="kde-baseapps"
 inherit kde5
 
 DESCRIPTION="File finder utility based on KDE Frameworks"
@@ -31,5 +29,3 @@ DEPEND="
$(add_qt_dep qtwidgets)
 "
 RDEPEND="${DEPEND}"
-
-S="${S}/${PN}"

diff --git a/kde-apps/konqueror/konqueror-.ebuild 
b/kde-apps/konqueror/konqueror-.ebuild
index 6020dad..d3151f5 100644
--- a/kde-apps/konqueror/konqueror-.ebuild
+++ b/kde-apps/konqueror/konqueror-.ebuild
@@ -6,7 +6,6 @@ EAPI=6
 
 KDE_HANDBOOK="forceoptional"
 KDE_TEST="true"
-KMNAME="kde-baseapps"
 VIRTUALX_REQUIRED="test"
 inherit flag-o-matic kde5
 
@@ -66,8 +65,6 @@ RDEPEND="${COMMON_DEPEND}
!kde-apps/libkonq:5
 "
 
-S="${S}/${PN}"
-
 src_prepare() {
[[ ${CHOST} == *-solaris* ]] && append-ldflags -lmalloc
 

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

[Michael Palimaka]

commit: 2ebd169819329ebe7272374c9078f54247f039c2
Author: Andreas Sturmlechner  gmail  com>
AuthorDate: Sat Oct 22 12:36:10 2016 +
Commit: Michael Palimaka  gentoo  org>
CommitDate: Sat Oct 22 12:36:10 2016 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=2ebd1698

kde-apps/konqueror: Add missing DEPEND

Upstream commit: 179e924e31113caf36293d494f07a51fc790ade1

Package-Manager: portage-2.3.0

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

diff --git a/kde-apps/konqueror/konqueror-.ebuild 
b/kde-apps/konqueror/konqueror-.ebuild
index f28bda0..6020dad 100644
--- a/kde-apps/konqueror/konqueror-.ebuild
+++ b/kde-apps/konqueror/konqueror-.ebuild
@@ -47,6 +47,7 @@ COMMON_DEPEND="
$(add_frameworks_dep kxmlgui)
$(add_qt_dep qtdbus)
$(add_qt_dep qtgui)
+   $(add_qt_dep qtwebengine 'widgets')
$(add_qt_dep qtwidgets)
$(add_qt_dep qtxml)
sys-libs/zlib

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

[Michael Palimaka]

commit: df29c3a41766288721905378f4997be2e3b117db
Author: Andreas Sturmlechner  gmail  com>
AuthorDate: Sat Sep 24 21:43:37 2016 +
Commit: Michael Palimaka  gentoo  org>
CommitDate: Sun Sep 25 17:39:25 2016 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=df29c3a4

kde-apps/konqueror: Add libkonq dependencies

Package-Manager: portage-2.3.0

 kde-apps/konqueror/konqueror-.ebuild | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/kde-apps/konqueror/konqueror-.ebuild 
b/kde-apps/konqueror/konqueror-.ebuild
index 2b08513..f28bda0 100644
--- a/kde-apps/konqueror/konqueror-.ebuild
+++ b/kde-apps/konqueror/konqueror-.ebuild
@@ -7,6 +7,7 @@ EAPI=6
 KDE_HANDBOOK="forceoptional"
 KDE_TEST="true"
 KMNAME="kde-baseapps"
+VIRTUALX_REQUIRED="test"
 inherit flag-o-matic kde5
 
 DESCRIPTION="Web browser and file manager based on KDE Frameworks"
@@ -44,11 +45,11 @@ COMMON_DEPEND="
$(add_frameworks_dep kwidgetsaddons)
$(add_frameworks_dep kwindowsystem)
$(add_frameworks_dep kxmlgui)
-   $(add_kdeapps_dep libkonq)
$(add_qt_dep qtdbus)
$(add_qt_dep qtgui)
$(add_qt_dep qtwidgets)
$(add_qt_dep qtxml)
+   sys-libs/zlib
speech? ( $(add_qt_dep qtspeech) )
tidy? ( app-text/htmltidy )
X? ( $(add_qt_dep qtx11extras) )
@@ -61,6 +62,7 @@ RDEPEND="${COMMON_DEPEND}
$(add_plasma_dep kde-cli-tools)
!kde-apps/kfmclient:4
!kde-apps/konq-plugins
+   !kde-apps/libkonq:5
 "
 
 S="${S}/${PN}"

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

[Michael Palimaka]

commit: bee37d8a95c708e273b20f8f400ffeb7373c4f85
Author: Andreas Sturmlechner  gmail  com>
AuthorDate: Sun Sep 18 21:14:12 2016 +
Commit: Michael Palimaka  gentoo  org>
CommitDate: Wed Sep 21 14:36:51 2016 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=bee37d8a

kde-apps/konqueror: Add konq-plugins dependencies, USE=activities

Package-Manager: portage-2.3.0

 kde-apps/konqueror/konqueror-.ebuild | 27 ++-
 kde-apps/konqueror/metadata.xml  |  6 --
 2 files changed, 22 insertions(+), 11 deletions(-)

diff --git a/kde-apps/konqueror/konqueror-.ebuild 
b/kde-apps/konqueror/konqueror-.ebuild
index cb3ab5c..2b08513 100644
--- a/kde-apps/konqueror/konqueror-.ebuild
+++ b/kde-apps/konqueror/konqueror-.ebuild
@@ -15,11 +15,11 @@ HOMEPAGE="
https://konqueror.org/
 "
 KEYWORDS=""
-IUSE="X"
+IUSE="activities speech tidy X"
 # 4 of 4 tests fail. Last checked for 4.0.3
-RESTRICT="test"
+RESTRICT+=" test"
 
-DEPEND="
+COMMON_DEPEND="
$(add_frameworks_dep karchive)
$(add_frameworks_dep kbookmarks)
$(add_frameworks_dep kcmutils)
@@ -30,7 +30,9 @@ DEPEND="
$(add_frameworks_dep kcoreaddons)
$(add_frameworks_dep kcrash)
$(add_frameworks_dep kdbusaddons)
+   $(add_frameworks_dep kded)
$(add_frameworks_dep kdelibs4support)
+   $(add_frameworks_dep kdesu)
$(add_frameworks_dep khtml)
$(add_frameworks_dep ki18n)
$(add_frameworks_dep kiconthemes)
@@ -47,11 +49,18 @@ DEPEND="
$(add_qt_dep qtgui)
$(add_qt_dep qtwidgets)
$(add_qt_dep qtxml)
+   speech? ( $(add_qt_dep qtspeech) )
+   tidy? ( app-text/htmltidy )
X? ( $(add_qt_dep qtx11extras) )
 "
-RDEPEND="${DEPEND}
+DEPEND="${COMMON_DEPEND}
+   activities? ( $(add_frameworks_dep kactivities) )
+"
+RDEPEND="${COMMON_DEPEND}
$(add_kdeapps_dep kfind)
+   $(add_plasma_dep kde-cli-tools)
!kde-apps/kfmclient:4
+   !kde-apps/konq-plugins
 "
 
 S="${S}/${PN}"
@@ -59,14 +68,14 @@ S="${S}/${PN}"
 src_prepare() {
[[ ${CHOST} == *-solaris* ]] && append-ldflags -lmalloc
 
-   mv ../doc/${PN} "${S}"/doc || die
-   echo "add_subdirectory( doc )" >> CMakeLists.txt || die
-
kde5_src_prepare
 }
 
 src_configure() {
local mycmakeargs=(
+   $(cmake-utils_use_find_package activities KF5Activities)
+   $(cmake-utils_use_find_package speech Qt5TextToSpeech)
+   $(cmake-utils_use_find_package tidy LibTidy)
$(cmake-utils_use_find_package X X11)
)
kde5_src_configure
@@ -76,7 +85,7 @@ pkg_postinst() {
kde5_pkg_postinst
 
if ! has_version kde-apps/keditbookmarks:${SLOT} ; then
-   elog "For bookmarks support, install the keditbookmarks:"
+   elog "For bookmarks support, install keditbookmarks:"
elog "kde-apps/keditbookmarks:${SLOT}"
fi
 
@@ -87,7 +96,7 @@ pkg_postinst() {
 
if ! has_version kde-apps/svg:${SLOT} ; then
elog "For konqueror to view SVGs, install the svg kpart:"
-   elog "kde-apps/svg:${SLOT}"
+   elog "kde-apps/svgpart:${SLOT}"
fi
 
if ! has_version virtual/jre ; then

diff --git a/kde-apps/konqueror/metadata.xml b/kde-apps/konqueror/metadata.xml
index 146bea6..e16d08a 100644
--- a/kde-apps/konqueror/metadata.xml
+++ b/kde-apps/konqueror/metadata.xml
@@ -6,7 +6,9 @@
Gentoo KDE Project


-   Add dependency on bookmark 
package.
-   Install the dolphin kpart for use as a 
file manager.
+   Enable kactivities support
+   Add dependency on bookmark package
+   Build the dolphin kpart for use as a 
file manager
+   Build text-to-speech plugin

 

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

[Michael Palimaka]

commit: 0c096c62ac3f12356ee75b5103f9d90093a6f80e
Author: Andreas Sturmlechner  gmail  com>
AuthorDate: Wed Aug 24 20:34:55 2016 +
Commit: Michael Palimaka  gentoo  org>
CommitDate: Wed Aug 24 20:58:04 2016 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=0c096c62

kde-apps/konqueror: Remove kde-base/kactivities dependency

Package-Manager: portage-2.2.28

 .../konqueror/files/konqueror-16.08.0-kactivities.patch   | 15 +++
 ...nqueror-16.08.0.ebuild => konqueror-16.08.0-r1.ebuild} |  4 +++-
 kde-apps/konqueror/konqueror-16.08.49..ebuild |  4 +++-
 3 files changed, 21 insertions(+), 2 deletions(-)

diff --git a/kde-apps/konqueror/files/konqueror-16.08.0-kactivities.patch 
b/kde-apps/konqueror/files/konqueror-16.08.0-kactivities.patch
new file mode 100644
index 000..9207fd6
--- /dev/null
+++ b/kde-apps/konqueror/files/konqueror-16.08.0-kactivities.patch
@@ -0,0 +1,15 @@
+Make sure KActivities headers aren't used either if disabled.
+
+--- a/dolphin/src/CMakeLists.txt   2016-08-24 22:25:42.603345565 +0200
 b/dolphin/src/CMakeLists.txt   2016-08-24 22:27:39.921317927 +0200
+@@ -27,7 +27,9 @@
+ macro_bool_to_01(X11_Xrender_FOUND HAVE_XRENDER)
+ configure_file(config-X11.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config-X11.h )
+ 
+-include_directories( ${KACTIVITIES_INCLUDE_DIRS} ${CMAKE_CURRENT_BINARY_DIR} )
++if (KActivities_FOUND)
++  include_directories( ${KACTIVITIES_INCLUDE_DIRS} 
${CMAKE_CURRENT_BINARY_DIR} )
++endif (KActivities_FOUND)
+ 
+ if(HAVE_BALOO)
+   include_directories(${BALOO_INCLUDE_DIR} ${BALOO_WIDGETS_INCLUDE_DIR} 
${KFILEMETADATA_INCLUDE_DIR})

diff --git a/kde-apps/konqueror/konqueror-16.08.0.ebuild 
b/kde-apps/konqueror/konqueror-16.08.0-r1.ebuild
similarity index 95%
rename from kde-apps/konqueror/konqueror-16.08.0.ebuild
rename to kde-apps/konqueror/konqueror-16.08.0-r1.ebuild
index 9a4f654..bc8892e 100644
--- a/kde-apps/konqueror/konqueror-16.08.0.ebuild
+++ b/kde-apps/konqueror/konqueror-16.08.0-r1.ebuild
@@ -21,7 +21,6 @@ RESTRICT="test"
 DEPEND="
$(add_kdeapps_dep libkonq)
filemanager? (
-   $(add_kdebase_dep kactivities '' 4.13)
media-libs/phonon[qt4]
x11-libs/libXrender
)
@@ -52,6 +51,8 @@ KMEXTRACTONLY="
lib/konq/
 "
 
+PATCHES=( "${FILESDIR}/${PN}-16.08.0-kactivities.patch" )
+
 src_prepare() {
[[ ${CHOST} == *-solaris* ]] && append-ldflags -lmalloc
 
@@ -78,6 +79,7 @@ src_configure() {
-DWITH_Baloo=OFF
-DWITH_BalooWidgets=OFF
-DWITH_KFileMetaData=OFF
+   -DCMAKE_DISABLE_FIND_PACKAGE_KActivities=ON
)
fi
 

diff --git a/kde-apps/konqueror/konqueror-16.08.49..ebuild 
b/kde-apps/konqueror/konqueror-16.08.49..ebuild
index fde7e07..8109e67 100644
--- a/kde-apps/konqueror/konqueror-16.08.49..ebuild
+++ b/kde-apps/konqueror/konqueror-16.08.49..ebuild
@@ -21,7 +21,6 @@ RESTRICT="test"
 DEPEND="
$(add_kdeapps_dep libkonq)
filemanager? (
-   $(add_kdebase_dep kactivities '' 4.13)
media-libs/phonon[qt4]
x11-libs/libXrender
)
@@ -52,6 +51,8 @@ KMEXTRACTONLY="
lib/konq/
 "
 
+PATCHES=( "${FILESDIR}/${PN}-16.08.0-kactivities.patch" )
+
 src_prepare() {
[[ ${CHOST} == *-solaris* ]] && append-ldflags -lmalloc
 
@@ -78,6 +79,7 @@ src_configure() {
-DWITH_Baloo=OFF
-DWITH_BalooWidgets=OFF
-DWITH_KFileMetaData=OFF
+   -DCMAKE_DISABLE_FIND_PACKAGE_KActivities=ON
)
fi
 

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

[Michael Palimaka]

commit: 95cd09d47a77be8667dbf1d535a86ffdc151ffdf
Author: Andreas Sturmlechner  gmail  com>
AuthorDate: Wed Aug  3 17:55:12 2016 +
Commit: Michael Palimaka  gentoo  org>
CommitDate: Thu Aug  4 12:27:55 2016 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=95cd09d4

kde-apps/konqueror: Add block against kde-apps/kfmclient:4

Package-Manager: portage-2.2.28

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

diff --git a/kde-apps/konqueror/konqueror-.ebuild 
b/kde-apps/konqueror/konqueror-.ebuild
index 2f11bde..cb3ab5c 100644
--- a/kde-apps/konqueror/konqueror-.ebuild
+++ b/kde-apps/konqueror/konqueror-.ebuild
@@ -51,6 +51,7 @@ DEPEND="
 "
 RDEPEND="${DEPEND}
$(add_kdeapps_dep kfind)
+   !kde-apps/kfmclient:4
 "
 
 S="${S}/${PN}"
@@ -58,7 +59,7 @@ S="${S}/${PN}"
 src_prepare() {
[[ ${CHOST} == *-solaris* ]] && append-ldflags -lmalloc
 
-   mv ../doc "${S}" || die
+   mv ../doc/${PN} "${S}"/doc || die
echo "add_subdirectory( doc )" >> CMakeLists.txt || die
 
kde5_src_prepare

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

[Johannes Huber]

commit: 05116252b706dfa8484c22196a973e596cb387be
Author: Andreas Sturmlechner  gmail  com>
AuthorDate: Sat Jan 31 00:22:32 2015 +
Commit: Johannes Huber  gentoo  org>
CommitDate: Tue Aug  2 21:21:52 2016 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=05116252

kde-apps/konqueror: Frameworks merged to master

Package-Manager: portage-2.2.28

Signed-off-by: Johannes Huber  gentoo.org>

 kde-apps/konqueror/konqueror-.ebuild | 95 +++-
 1 file changed, 45 insertions(+), 50 deletions(-)

diff --git a/kde-apps/konqueror/konqueror-.ebuild 
b/kde-apps/konqueror/konqueror-.ebuild
index fde7e07..b235417 100644
--- a/kde-apps/konqueror/konqueror-.ebuild
+++ b/kde-apps/konqueror/konqueror-.ebuild
@@ -4,91 +4,86 @@
 
 EAPI=6
 
-KDE_HANDBOOK="optional"
+KDE_HANDBOOK="forceoptional"
+KDE_TEST="true"
 KMNAME="kde-baseapps"
-inherit flag-o-matic kde4-meta
+inherit flag-o-matic kde5
 
-DESCRIPTION="Web browser and file manager"
+DESCRIPTION="Web browser and file manager based on KDE Frameworks"
 HOMEPAGE="
https://www.kde.org/applications/internet/konqueror/
https://konqueror.org/
 "
 KEYWORDS=""
-IUSE="+bookmarks debug +filemanager svg"
+IUSE="+bookmarks svg X"
 # 4 of 4 tests fail. Last checked for 4.0.3
 RESTRICT="test"
 
 DEPEND="
+   $(add_frameworks_dep karchive)
+   $(add_frameworks_dep kbookmarks)
+   $(add_frameworks_dep kcmutils)
+   $(add_frameworks_dep kcodecs)
+   $(add_frameworks_dep kcompletion)
+   $(add_frameworks_dep kconfig)
+   $(add_frameworks_dep kconfigwidgets)
+   $(add_frameworks_dep kcoreaddons)
+   $(add_frameworks_dep kdbusaddons)
+   $(add_frameworks_dep kdelibs4support)
+   $(add_frameworks_dep khtml)
+   $(add_frameworks_dep ki18n)
+   $(add_frameworks_dep kiconthemes)
+   $(add_frameworks_dep kio)
+   $(add_frameworks_dep kitemviews)
+   $(add_frameworks_dep kjobwidgets)
+   $(add_frameworks_dep kparts)
+   $(add_frameworks_dep kservice)
+   $(add_frameworks_dep kwidgetsaddons)
+   $(add_frameworks_dep kwindowsystem)
+   $(add_frameworks_dep kxmlgui)
$(add_kdeapps_dep libkonq)
-   filemanager? (
-   $(add_kdebase_dep kactivities '' 4.13)
-   media-libs/phonon[qt4]
-   x11-libs/libXrender
-   )
+   $(add_qt_dep qtdbus)
+   $(add_qt_dep qtgui)
+   $(add_qt_dep qtwidgets)
+   $(add_qt_dep qtxml)
+   X? ( $(add_qt_dep qtx11extras) )
 "
-
-# bug #544630: evince[nsplugin] crashes konqueror
 RDEPEND="${DEPEND}
$(add_kdeapps_dep kfind)
$(add_kdeapps_dep kfmclient)
$(add_kdeapps_dep kurifilter-plugins)
bookmarks? ( $(add_kdeapps_dep keditbookmarks) )
-   filemanager? (
-   $(add_kdeapps_dep kdebase-kioslaves)
-   $(add_kdeapps_dep kfind)
-   $(add_kdeapps_dep konsolepart)
-   !kde-apps/dolphin:4
-   )
-   svg? ( $(add_kdeapps_dep svgpart) )
-   !app-text/evince[nsplugin]
+   svg? ( $(add_kdeapps_dep svgpart '' 5.) )
 "
 
-KMEXTRA="
-   dolphin/
-"
-
-KMEXTRACTONLY="
-   konqueror/client/
-   lib/konq/
-"
+S="${S}/${PN}"
 
 src_prepare() {
[[ ${CHOST} == *-solaris* ]] && append-ldflags -lmalloc
 
-   # required for dolphin
-   sed -e "/konq_copytomenu.h/ s/# //" \
-   -e "/konq_copytomenu.h/ s/ - anyone needs it?//" \
-   -i lib/konq/CMakeLists.txt \
-   || die "Failed to fix libkonq CMakeLists.txt"
+   mv ../doc "${S}" || die
+   echo "add_subdirectory( doc )" >> CMakeLists.txt || die
 
-   kde4-meta_src_prepare
-
-   use filemanager || cmake_comment_add_subdirectory dolphin
+   kde5_src_prepare
 
# Do not install *.desktop files for kfmclient
-   sed -e "/kfmclient\.desktop/d" -i konqueror/CMakeLists.txt \
+   sed -e "/kfmclient\.desktop/d" -i CMakeLists.txt \
|| die "Failed to omit .desktop files"
 }
 
 src_configure() {
-   local mycmakeargs
-
-   if use filemanager ; then
-   mycmakeargs=(
-   -DWITH_Baloo=OFF
-   -DWITH_BalooWidgets=OFF
-   -DWITH_KFileMetaData=OFF
-   )
-   fi
-
-   kde4-meta_src_configure
+   local mycmakeargs=(
+   $(cmake-utils_use_find_package X X11)
+   )
+   kde5_src_configure
 }
 
 pkg_postinst() {
-   kde4-meta_pkg_postinst
+   kde5_pkg_postinst
 
-   if use filemanager && ! has_version media-gfx/icoutils ; then
-   elog "For .exe file preview support, install 
media-gfx/icoutils."
+   if ! has_version kde-apps/dolphin:${SLOT} ; then
+   elog "If you want to use konqueror as a filemanager, install 
the dolphin kpart:"
+   elog "kde-apps/dolphin:${SLOT}"
fi
 
if ! has_version virtual/jre ; then

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

[Johannes Huber]

commit: 7fa34631dcf25e4758cb3017ccffc8cc72617786
Author: Andreas Sturmlechner  gmail  com>
AuthorDate: Tue Aug  2 18:35:09 2016 +
Commit: Johannes Huber  gentoo  org>
CommitDate: Tue Aug  2 21:21:52 2016 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=7fa34631

kde-apps/konqueror: Frameworks merged to master

Package-Manager: portage-2.2.28

Signed-off-by: Johannes Huber  gentoo.org>

 kde-apps/konqueror/konqueror-.ebuild | 21 -
 1 file changed, 12 insertions(+), 9 deletions(-)

diff --git a/kde-apps/konqueror/konqueror-.ebuild 
b/kde-apps/konqueror/konqueror-.ebuild
index b235417..2f11bde 100644
--- a/kde-apps/konqueror/konqueror-.ebuild
+++ b/kde-apps/konqueror/konqueror-.ebuild
@@ -15,7 +15,7 @@ HOMEPAGE="
https://konqueror.org/
 "
 KEYWORDS=""
-IUSE="+bookmarks svg X"
+IUSE="X"
 # 4 of 4 tests fail. Last checked for 4.0.3
 RESTRICT="test"
 
@@ -28,6 +28,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 kdelibs4support)
$(add_frameworks_dep khtml)
@@ -50,10 +51,6 @@ DEPEND="
 "
 RDEPEND="${DEPEND}
$(add_kdeapps_dep kfind)
-   $(add_kdeapps_dep kfmclient)
-   $(add_kdeapps_dep kurifilter-plugins)
-   bookmarks? ( $(add_kdeapps_dep keditbookmarks) )
-   svg? ( $(add_kdeapps_dep svgpart '' 5.) )
 "
 
 S="${S}/${PN}"
@@ -65,10 +62,6 @@ src_prepare() {
echo "add_subdirectory( doc )" >> CMakeLists.txt || die
 
kde5_src_prepare
-
-   # Do not install *.desktop files for kfmclient
-   sed -e "/kfmclient\.desktop/d" -i CMakeLists.txt \
-   || die "Failed to omit .desktop files"
 }
 
 src_configure() {
@@ -81,11 +74,21 @@ src_configure() {
 pkg_postinst() {
kde5_pkg_postinst
 
+   if ! has_version kde-apps/keditbookmarks:${SLOT} ; then
+   elog "For bookmarks support, install the keditbookmarks:"
+   elog "kde-apps/keditbookmarks:${SLOT}"
+   fi
+
if ! has_version kde-apps/dolphin:${SLOT} ; then
elog "If you want to use konqueror as a filemanager, install 
the dolphin kpart:"
elog "kde-apps/dolphin:${SLOT}"
fi
 
+   if ! has_version kde-apps/svg:${SLOT} ; then
+   elog "For konqueror to view SVGs, install the svg kpart:"
+   elog "kde-apps/svg:${SLOT}"
+   fi
+
if ! has_version virtual/jre ; then
elog "To use Java on webpages install virtual/jre."
fi

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

[Michael Palimaka]

commit: 7a7a2176c23f882e4ea0b14bd61f02e7065b9243
Author: Coacher 
AuthorDate: Wed Jul 20 15:18:27 2016 +
Commit: Michael Palimaka  gentoo  org>
CommitDate: Wed Jul 20 15:18:45 2016 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=7a7a2176

kde-apps/konqueror: avoid installing dolphin stuff with USE="-filemanager"

Gentoo-bug: 589126

Package-Manager: portage-2.3.0

 kde-apps/konqueror/konqueror-16.08.49..ebuild | 4 ++--
 kde-apps/konqueror/konqueror-.ebuild  | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/kde-apps/konqueror/konqueror-16.08.49..ebuild 
b/kde-apps/konqueror/konqueror-16.08.49..ebuild
index 9771487..fde7e07 100644
--- a/kde-apps/konqueror/konqueror-16.08.49..ebuild
+++ b/kde-apps/konqueror/konqueror-16.08.49..ebuild
@@ -55,8 +55,6 @@ KMEXTRACTONLY="
 src_prepare() {
[[ ${CHOST} == *-solaris* ]] && append-ldflags -lmalloc
 
-   use filemanager || cmake_comment_add_subdirectory dolphin
-
# required for dolphin
sed -e "/konq_copytomenu.h/ s/# //" \
-e "/konq_copytomenu.h/ s/ - anyone needs it?//" \
@@ -65,6 +63,8 @@ src_prepare() {
 
kde4-meta_src_prepare
 
+   use filemanager || cmake_comment_add_subdirectory dolphin
+
# Do not install *.desktop files for kfmclient
sed -e "/kfmclient\.desktop/d" -i konqueror/CMakeLists.txt \
|| die "Failed to omit .desktop files"

diff --git a/kde-apps/konqueror/konqueror-.ebuild 
b/kde-apps/konqueror/konqueror-.ebuild
index 9771487..fde7e07 100644
--- a/kde-apps/konqueror/konqueror-.ebuild
+++ b/kde-apps/konqueror/konqueror-.ebuild
@@ -55,8 +55,6 @@ KMEXTRACTONLY="
 src_prepare() {
[[ ${CHOST} == *-solaris* ]] && append-ldflags -lmalloc
 
-   use filemanager || cmake_comment_add_subdirectory dolphin
-
# required for dolphin
sed -e "/konq_copytomenu.h/ s/# //" \
-e "/konq_copytomenu.h/ s/ - anyone needs it?//" \
@@ -65,6 +63,8 @@ src_prepare() {
 
kde4-meta_src_prepare
 
+   use filemanager || cmake_comment_add_subdirectory dolphin
+
# Do not install *.desktop files for kfmclient
sed -e "/kfmclient\.desktop/d" -i konqueror/CMakeLists.txt \
|| die "Failed to omit .desktop files"

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

[Johannes Huber]

commit: 409e6b46107360a731fdf61cb21a259f7a40246d
Author: Johannes Huber  gentoo  org>
AuthorDate: Mon Jul 18 20:39:46 2016 +
Commit: Johannes Huber  gentoo  org>
CommitDate: Mon Jul 18 20:39:46 2016 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=409e6b46

kde-apps/konqueror: Update blocker

Gentoo-bug: 589082

Package-Manager: portage-2.3.0

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

diff --git a/kde-apps/konqueror/konqueror-16.08.49..ebuild 
b/kde-apps/konqueror/konqueror-16.08.49..ebuild
index 8dd0e92..9771487 100644
--- a/kde-apps/konqueror/konqueror-16.08.49..ebuild
+++ b/kde-apps/konqueror/konqueror-16.08.49..ebuild
@@ -37,10 +37,10 @@ RDEPEND="${DEPEND}
$(add_kdeapps_dep kdebase-kioslaves)
$(add_kdeapps_dep kfind)
$(add_kdeapps_dep konsolepart)
+   !kde-apps/dolphin:4
)
svg? ( $(add_kdeapps_dep svgpart) )
!app-text/evince[nsplugin]
-   !kde-apps/dolphin:4
 "
 
 KMEXTRA="

diff --git a/kde-apps/konqueror/konqueror-.ebuild 
b/kde-apps/konqueror/konqueror-.ebuild
index 8dd0e92..9771487 100644
--- a/kde-apps/konqueror/konqueror-.ebuild
+++ b/kde-apps/konqueror/konqueror-.ebuild
@@ -37,10 +37,10 @@ RDEPEND="${DEPEND}
$(add_kdeapps_dep kdebase-kioslaves)
$(add_kdeapps_dep kfind)
$(add_kdeapps_dep konsolepart)
+   !kde-apps/dolphin:4
)
svg? ( $(add_kdeapps_dep svgpart) )
!app-text/evince[nsplugin]
-   !kde-apps/dolphin:4
 "
 
 KMEXTRA="

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

[Johannes Huber]

commit: 77a1463d2b54754a79129baa63dc14b0b0139459
Author: Andreas Sturmlechner  gmail  com>
AuthorDate: Mon May 16 23:39:09 2016 +
Commit: Johannes Huber  gentoo  org>
CommitDate: Sat Jul  9 18:06:12 2016 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=77a1463d

kde-apps/konqueror: Add KMEXTRA=dolphin for USE=filemanager

Gentoo-bug: 562224

Package-Manager: portage-2.2.28

Signed-off-by: Johannes Huber  gentoo.org>

 kde-apps/konqueror/konqueror-16.04.3.ebuild   | 44 ---
 kde-apps/konqueror/konqueror-16.04.49..ebuild | 44 ---
 kde-apps/konqueror/konqueror-.ebuild  | 44 ---
 kde-apps/konqueror/metadata.xml   |  1 +
 4 files changed, 121 insertions(+), 12 deletions(-)

diff --git a/kde-apps/konqueror/konqueror-16.04.3.ebuild 
b/kde-apps/konqueror/konqueror-16.04.3.ebuild
index 09426ea..38fe745 100644
--- a/kde-apps/konqueror/konqueror-16.04.3.ebuild
+++ b/kde-apps/konqueror/konqueror-16.04.3.ebuild
@@ -14,12 +14,17 @@ HOMEPAGE="
https://konqueror.org/
 "
 KEYWORDS="~amd64 ~arm ~x86"
-IUSE="+bookmarks debug svg"
+IUSE="+bookmarks debug +filemanager svg"
 # 4 of 4 tests fail. Last checked for 4.0.3
 RESTRICT="test"
 
 DEPEND="
$(add_kdeapps_dep libkonq)
+   filemanager? (
+   $(add_kdebase_dep kactivities '' 4.13)
+   media-libs/phonon[qt4]
+   x11-libs/libXrender
+   )
 "
 
 # bug #544630: evince[nsplugin] crashes konqueror
@@ -28,8 +33,18 @@ RDEPEND="${DEPEND}
$(add_kdeapps_dep kfmclient)
$(add_kdeapps_dep kurifilter-plugins)
bookmarks? ( $(add_kdeapps_dep keditbookmarks) )
+   filemanager? (
+   $(add_kdeapps_dep kdebase-kioslaves)
+   $(add_kdeapps_dep kfind)
+   $(add_kdeapps_dep konsolepart)
+   )
svg? ( $(add_kdeapps_dep svgpart) )
!app-text/evince[nsplugin]
+   !kde-apps/dolphin:4
+"
+
+KMEXTRA="
+   dolphin/
 "
 
 KMEXTRACTONLY="
@@ -40,6 +55,14 @@ KMEXTRACTONLY="
 src_prepare() {
[[ ${CHOST} == *-solaris* ]] && append-ldflags -lmalloc
 
+   use filemanager || cmake_comment_add_subdirectory dolphin
+
+   # required for dolphin
+   sed -e "/konq_copytomenu.h/ s/# //" \
+   -e "/konq_copytomenu.h/ s/ - anyone needs it?//" \
+   -i lib/konq/CMakeLists.txt \
+   || die "Failed to fix libkonq CMakeLists.txt"
+
kde4-meta_src_prepare
 
# Do not install *.desktop files for kfmclient
@@ -47,12 +70,25 @@ src_prepare() {
|| die "Failed to omit .desktop files"
 }
 
+src_configure() {
+   local mycmakeargs
+
+   if use filemanager ; then
+   mycmakeargs=(
+   -DWITH_Baloo=OFF
+   -DWITH_BalooWidgets=OFF
+   -DWITH_KFileMetaData=OFF
+   )
+   fi
+
+   kde4-meta_src_configure
+}
+
 pkg_postinst() {
kde4-meta_pkg_postinst
 
-   if ! has_version kde-apps/dolphin:${SLOT} ; then
-   elog "If you want to use konqueror as a filemanager, install 
the dolphin kpart:"
-   elog "kde-apps/dolphin:${SLOT}"
+   if use filemanager && ! has_version media-gfx/icoutils ; then
+   elog "For .exe file preview support, install 
media-gfx/icoutils."
fi
 
if ! has_version virtual/jre ; then

diff --git a/kde-apps/konqueror/konqueror-16.04.49..ebuild 
b/kde-apps/konqueror/konqueror-16.04.49..ebuild
index 4e181da..8dd0e92 100644
--- a/kde-apps/konqueror/konqueror-16.04.49..ebuild
+++ b/kde-apps/konqueror/konqueror-16.04.49..ebuild
@@ -14,12 +14,17 @@ HOMEPAGE="
https://konqueror.org/
 "
 KEYWORDS=""
-IUSE="+bookmarks debug svg"
+IUSE="+bookmarks debug +filemanager svg"
 # 4 of 4 tests fail. Last checked for 4.0.3
 RESTRICT="test"
 
 DEPEND="
$(add_kdeapps_dep libkonq)
+   filemanager? (
+   $(add_kdebase_dep kactivities '' 4.13)
+   media-libs/phonon[qt4]
+   x11-libs/libXrender
+   )
 "
 
 # bug #544630: evince[nsplugin] crashes konqueror
@@ -28,8 +33,18 @@ RDEPEND="${DEPEND}
$(add_kdeapps_dep kfmclient)
$(add_kdeapps_dep kurifilter-plugins)
bookmarks? ( $(add_kdeapps_dep keditbookmarks) )
+   filemanager? (
+   $(add_kdeapps_dep kdebase-kioslaves)
+   $(add_kdeapps_dep kfind)
+   $(add_kdeapps_dep konsolepart)
+   )
svg? ( $(add_kdeapps_dep svgpart) )
!app-text/evince[nsplugin]
+   !kde-apps/dolphin:4
+"
+
+KMEXTRA="
+   dolphin/
 "
 
 KMEXTRACTONLY="
@@ -40,6 +55,14 @@ KMEXTRACTONLY="
 src_prepare() {
[[ ${CHOST} == *-solaris* ]] && append-ldflags -lmalloc
 
+   use filemanager || cmake_comment_add_subdirectory dolphin
+
+   # required for dolphin
+   sed -e "/konq_copytomenu.h/ s/# //" \
+   -e 

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

[Johannes Huber]

commit: a98848e79b28561b1cb09db1b0b60a7d5d5b8a65
Author: Johannes Huber  gentoo  org>
AuthorDate: Mon Apr  4 22:41:45 2016 +
Commit: Johannes Huber  gentoo  org>
CommitDate: Mon Apr  4 22:41:45 2016 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=a98848e7

kde-apps/konqueror: EAPI 6

Package-Manager: portage-2.2.28

 kde-apps/konqueror/konqueror-15.12.3.ebuild   | 4 ++--
 kde-apps/konqueror/konqueror-16.04.49..ebuild | 4 ++--
 kde-apps/konqueror/konqueror-.ebuild  | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/kde-apps/konqueror/konqueror-15.12.3.ebuild 
b/kde-apps/konqueror/konqueror-15.12.3.ebuild
index e36d93a..8133d4a 100644
--- a/kde-apps/konqueror/konqueror-15.12.3.ebuild
+++ b/kde-apps/konqueror/konqueror-15.12.3.ebuild
@@ -2,13 +2,13 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI=5
+EAPI=6
 
 KDE_HANDBOOK="optional"
 KMNAME="kde-baseapps"
 inherit flag-o-matic kde4-meta
 
-DESCRIPTION="KDE: Web browser and file manager"
+DESCRIPTION="Web browser and file manager"
 HOMEPAGE="
https://www.kde.org/applications/internet/konqueror/
https://konqueror.org/

diff --git a/kde-apps/konqueror/konqueror-16.04.49..ebuild 
b/kde-apps/konqueror/konqueror-16.04.49..ebuild
index 902cd66..4e181da 100644
--- a/kde-apps/konqueror/konqueror-16.04.49..ebuild
+++ b/kde-apps/konqueror/konqueror-16.04.49..ebuild
@@ -2,13 +2,13 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI=5
+EAPI=6
 
 KDE_HANDBOOK="optional"
 KMNAME="kde-baseapps"
 inherit flag-o-matic kde4-meta
 
-DESCRIPTION="KDE: Web browser and file manager"
+DESCRIPTION="Web browser and file manager"
 HOMEPAGE="
https://www.kde.org/applications/internet/konqueror/
https://konqueror.org/

diff --git a/kde-apps/konqueror/konqueror-.ebuild 
b/kde-apps/konqueror/konqueror-.ebuild
index 902cd66..4e181da 100644
--- a/kde-apps/konqueror/konqueror-.ebuild
+++ b/kde-apps/konqueror/konqueror-.ebuild
@@ -2,13 +2,13 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI=5
+EAPI=6
 
 KDE_HANDBOOK="optional"
 KMNAME="kde-baseapps"
 inherit flag-o-matic kde4-meta
 
-DESCRIPTION="KDE: Web browser and file manager"
+DESCRIPTION="Web browser and file manager"
 HOMEPAGE="
https://www.kde.org/applications/internet/konqueror/
https://konqueror.org/

[gentoo-commits] proj/kde:master commit in: kde-apps/konqueror/, kde-apps/kdepasswd/, kde-apps/kfind/, kde-apps/kfmclient/, ...

[Michael Palimaka]

commit: 15674cf113f67389af7329651a77c48abe0d2db2
Author: Michael Palimaka kensington AT gentoo DOT org
AuthorDate: Thu Aug 27 15:07:12 2015 +
Commit: Michael Palimaka kensington AT gentoo DOT org
CommitDate: Thu Aug 27 15:07:12 2015 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=15674cf1

kde-apps: kde-baseapps moved to main repo.

 kde-apps/kdepasswd/kdepasswd-15.04.3.ebuild| 21 
 kde-apps/kdepasswd/kdepasswd-15.08.0.ebuild| 21 
 kde-apps/kdialog/kdialog-15.04.3.ebuild| 12 -
 kde-apps/kdialog/kdialog-15.08.0.ebuild| 12 -
 .../keditbookmarks/keditbookmarks-15.04.3.ebuild   | 22 
 .../keditbookmarks/keditbookmarks-15.08.0.ebuild   | 22 
 kde-apps/kfind/kfind-15.04.3.ebuild| 19 ---
 kde-apps/kfind/kfind-15.08.0.ebuild| 19 ---
 kde-apps/kfmclient/kfmclient-15.04.3.ebuild| 34 
 kde-apps/kfmclient/kfmclient-15.08.0.ebuild| 34 
 kde-apps/konq-plugins/konq-plugins-15.04.3.ebuild  | 32 
 kde-apps/konq-plugins/konq-plugins-15.08.0.ebuild  | 32 
 kde-apps/konqueror/konqueror-15.04.3.ebuild| 61 --
 kde-apps/konqueror/konqueror-15.08.0.ebuild| 61 --
 kde-apps/libkonq/libkonq-15.04.3.ebuild| 19 ---
 kde-apps/libkonq/libkonq-15.08.0.ebuild| 19 ---
 kde-apps/nsplugins/nsplugins-15.04.3.ebuild| 30 ---
 kde-apps/nsplugins/nsplugins-15.08.0.ebuild| 30 ---
 kde-apps/plasma-apps/plasma-apps-15.04.3.ebuild| 18 ---
 kde-apps/plasma-apps/plasma-apps-15.08.0.ebuild| 18 ---
 20 files changed, 536 deletions(-)

diff --git a/kde-apps/kdepasswd/kdepasswd-15.04.3.ebuild 
b/kde-apps/kdepasswd/kdepasswd-15.04.3.ebuild
deleted file mode 100644
index 428b65b..000
--- a/kde-apps/kdepasswd/kdepasswd-15.04.3.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
-
-KDE_HANDBOOK=optional
-KMNAME=kde-baseapps
-inherit kde4-meta
-
-DESCRIPTION=KDE GUI for passwd
-KEYWORDS=~amd64 ~x86
-IUSE=debug
-
-DEPEND=
-   $(add_kdeapps_dep libkonq)
-
-RDEPEND=${DEPEND}
-   $(add_kdeapps_dep kdesu)
-   sys-apps/accountsservice
-

diff --git a/kde-apps/kdepasswd/kdepasswd-15.08.0.ebuild 
b/kde-apps/kdepasswd/kdepasswd-15.08.0.ebuild
deleted file mode 100644
index 428b65b..000
--- a/kde-apps/kdepasswd/kdepasswd-15.08.0.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
-
-KDE_HANDBOOK=optional
-KMNAME=kde-baseapps
-inherit kde4-meta
-
-DESCRIPTION=KDE GUI for passwd
-KEYWORDS=~amd64 ~x86
-IUSE=debug
-
-DEPEND=
-   $(add_kdeapps_dep libkonq)
-
-RDEPEND=${DEPEND}
-   $(add_kdeapps_dep kdesu)
-   sys-apps/accountsservice
-

diff --git a/kde-apps/kdialog/kdialog-15.04.3.ebuild 
b/kde-apps/kdialog/kdialog-15.04.3.ebuild
deleted file mode 100644
index d0d9803..000
--- a/kde-apps/kdialog/kdialog-15.04.3.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-KMNAME=kde-baseapps
-inherit kde4-meta
-
-DESCRIPTION=KDialog can be used to show nice dialog boxes from shell scripts
-KEYWORDS=~amd64 ~x86
-IUSE=debug

diff --git a/kde-apps/kdialog/kdialog-15.08.0.ebuild 
b/kde-apps/kdialog/kdialog-15.08.0.ebuild
deleted file mode 100644
index d0d9803..000
--- a/kde-apps/kdialog/kdialog-15.08.0.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-KMNAME=kde-baseapps
-inherit kde4-meta
-
-DESCRIPTION=KDialog can be used to show nice dialog boxes from shell scripts
-KEYWORDS=~amd64 ~x86
-IUSE=debug

diff --git a/kde-apps/keditbookmarks/keditbookmarks-15.04.3.ebuild 
b/kde-apps/keditbookmarks/keditbookmarks-15.04.3.ebuild
deleted file mode 100644
index 2fbf13e..000
--- a/kde-apps/keditbookmarks/keditbookmarks-15.04.3.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-KMNAME=kde-baseapps
-VIRTUALX_REQUIRED=test
-inherit kde4-meta
-
-DESCRIPTION=KDE's bookmarks editor
-KEYWORDS=~amd64 ~x86
-IUSE=debug
-
-DEPEND=
-   $(add_kdeapps_dep libkonq)
-
-RDEPEND=${DEPEND}
-
-KMEXTRACTONLY=
-   lib/konq/
-

diff --git a/kde-apps/keditbookmarks/keditbookmarks-15.08.0.ebuild 
b/kde-apps/keditbookmarks/keditbookmarks-15.08.0.ebuild
deleted file mode 100644
index 2fbf13e..000
--- a/kde-apps/keditbookmarks/keditbookmarks-15.08.0.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the 

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

[Johannes Huber]

commit: 2b15f16ba14a2921868efb625e3b967921380e74
Author: Johannes Huber johu AT gentoo DOT org
AuthorDate: Wed Jul  1 20:03:35 2015 +
Commit: Johannes Huber johu AT gentoo DOT org
CommitDate: Wed Jul  1 20:09:12 2015 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=2b15f16b

[kde-apps/konqueror] Block app-text/evince[nsplugin], bug #544630

Package-Manager: portage-2.2.20

 kde-apps/konqueror/konqueror-15.04.2.ebuild   | 3 +++
 kde-apps/konqueror/konqueror-15.04.3.ebuild   | 3 +++
 kde-apps/konqueror/konqueror-15.04.49..ebuild | 3 +++
 kde-apps/konqueror/konqueror-.ebuild  | 3 +++
 4 files changed, 12 insertions(+)

diff --git a/kde-apps/konqueror/konqueror-15.04.2.ebuild 
b/kde-apps/konqueror/konqueror-15.04.2.ebuild
index cb10c42..7bd51c0 100644
--- a/kde-apps/konqueror/konqueror-15.04.2.ebuild
+++ b/kde-apps/konqueror/konqueror-15.04.2.ebuild
@@ -21,12 +21,15 @@ RESTRICT=test
 DEPEND=
$(add_kdeapps_dep libkonq)
 
+
+# bug #544630: evince[nsplugin] crashes konqueror
 RDEPEND=${DEPEND}
$(add_kdeapps_dep kfind)
$(add_kdeapps_dep kfmclient)
$(add_kdeapps_dep kurifilter-plugins)
bookmarks? ( $(add_kdeapps_dep keditbookmarks) )
svg? ( $(add_kdeapps_dep svgpart) )
+   !app-text/evince[nsplugin]
 
 
 KMEXTRACTONLY=

diff --git a/kde-apps/konqueror/konqueror-15.04.3.ebuild 
b/kde-apps/konqueror/konqueror-15.04.3.ebuild
index cb10c42..7bd51c0 100644
--- a/kde-apps/konqueror/konqueror-15.04.3.ebuild
+++ b/kde-apps/konqueror/konqueror-15.04.3.ebuild
@@ -21,12 +21,15 @@ RESTRICT=test
 DEPEND=
$(add_kdeapps_dep libkonq)
 
+
+# bug #544630: evince[nsplugin] crashes konqueror
 RDEPEND=${DEPEND}
$(add_kdeapps_dep kfind)
$(add_kdeapps_dep kfmclient)
$(add_kdeapps_dep kurifilter-plugins)
bookmarks? ( $(add_kdeapps_dep keditbookmarks) )
svg? ( $(add_kdeapps_dep svgpart) )
+   !app-text/evince[nsplugin]
 
 
 KMEXTRACTONLY=

diff --git a/kde-apps/konqueror/konqueror-15.04.49..ebuild 
b/kde-apps/konqueror/konqueror-15.04.49..ebuild
index 7fb5b5a..d2ef544 100644
--- a/kde-apps/konqueror/konqueror-15.04.49..ebuild
+++ b/kde-apps/konqueror/konqueror-15.04.49..ebuild
@@ -21,12 +21,15 @@ RESTRICT=test
 DEPEND=
$(add_kdeapps_dep libkonq)
 
+
+# bug #544630: evince[nsplugin] crashes konqueror
 RDEPEND=${DEPEND}
$(add_kdeapps_dep kfind)
$(add_kdeapps_dep kfmclient)
$(add_kdeapps_dep kurifilter-plugins)
bookmarks? ( $(add_kdeapps_dep keditbookmarks) )
svg? ( $(add_kdeapps_dep svgpart) )
+   !app-text/evince[nsplugin]
 
 
 KMEXTRACTONLY=

diff --git a/kde-apps/konqueror/konqueror-.ebuild 
b/kde-apps/konqueror/konqueror-.ebuild
index 7fb5b5a..d2ef544 100644
--- a/kde-apps/konqueror/konqueror-.ebuild
+++ b/kde-apps/konqueror/konqueror-.ebuild
@@ -21,12 +21,15 @@ RESTRICT=test
 DEPEND=
$(add_kdeapps_dep libkonq)
 
+
+# bug #544630: evince[nsplugin] crashes konqueror
 RDEPEND=${DEPEND}
$(add_kdeapps_dep kfind)
$(add_kdeapps_dep kfmclient)
$(add_kdeapps_dep kurifilter-plugins)
bookmarks? ( $(add_kdeapps_dep keditbookmarks) )
svg? ( $(add_kdeapps_dep svgpart) )
+   !app-text/evince[nsplugin]
 
 
 KMEXTRACTONLY=

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

[Michael Palimaka]

commit: c142612caf9339e3e89582ae696ee692e659b9d6
Author: Michael Palimaka kensington AT gentoo DOT org
AuthorDate: Fri Jun 12 19:07:29 2015 +
Commit: Michael Palimaka kensington AT gentoo DOT org
CommitDate: Fri Jun 12 19:07:29 2015 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=c142612c

[kde-apps/konqueror] kde-base - kde-apps.

Package-Manager: portage-2.2.20

 kde-apps/konqueror/konqueror-15.04.2.ebuild   | 4 ++--
 kde-apps/konqueror/konqueror-15.04.49..ebuild | 4 ++--
 kde-apps/konqueror/konqueror-.ebuild  | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/kde-apps/konqueror/konqueror-15.04.2.ebuild 
b/kde-apps/konqueror/konqueror-15.04.2.ebuild
index 14b7af0..cb10c42 100644
--- a/kde-apps/konqueror/konqueror-15.04.2.ebuild
+++ b/kde-apps/konqueror/konqueror-15.04.2.ebuild
@@ -47,9 +47,9 @@ src_prepare() {
 pkg_postinst() {
kde4-meta_pkg_postinst
 
-   if ! has_version kde-base/dolphin:${SLOT} ; then
+   if ! has_version kde-apps/dolphin:${SLOT} ; then
elog If you want to use konqueror as a filemanager, install 
the dolphin kpart:
-   elog kde-base/dolphin:${SLOT}
+   elog kde-apps/dolphin:${SLOT}
fi
 
if ! has_version virtual/jre ; then

diff --git a/kde-apps/konqueror/konqueror-15.04.49..ebuild 
b/kde-apps/konqueror/konqueror-15.04.49..ebuild
index 0845c3b..7fb5b5a 100644
--- a/kde-apps/konqueror/konqueror-15.04.49..ebuild
+++ b/kde-apps/konqueror/konqueror-15.04.49..ebuild
@@ -47,9 +47,9 @@ src_prepare() {
 pkg_postinst() {
kde4-meta_pkg_postinst
 
-   if ! has_version kde-base/dolphin:${SLOT} ; then
+   if ! has_version kde-apps/dolphin:${SLOT} ; then
elog If you want to use konqueror as a filemanager, install 
the dolphin kpart:
-   elog kde-base/dolphin:${SLOT}
+   elog kde-apps/dolphin:${SLOT}
fi
 
if ! has_version virtual/jre ; then

diff --git a/kde-apps/konqueror/konqueror-.ebuild 
b/kde-apps/konqueror/konqueror-.ebuild
index 0845c3b..7fb5b5a 100644
--- a/kde-apps/konqueror/konqueror-.ebuild
+++ b/kde-apps/konqueror/konqueror-.ebuild
@@ -47,9 +47,9 @@ src_prepare() {
 pkg_postinst() {
kde4-meta_pkg_postinst
 
-   if ! has_version kde-base/dolphin:${SLOT} ; then
+   if ! has_version kde-apps/dolphin:${SLOT} ; then
elog If you want to use konqueror as a filemanager, install 
the dolphin kpart:
-   elog kde-base/dolphin:${SLOT}
+   elog kde-apps/dolphin:${SLOT}
fi
 
if ! has_version virtual/jre ; then