subject:"\[gentoo\-commits\] proj\/kde\:master commit in\: kde\-apps\/gwenview\/"

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

2024-03-21 Thread Andreas Sturmlechner

commit: a03525abcbcd5eddf8d92d2b894eddfefdce09c7
Author: Alfred Wingate  protonmail  com>
AuthorDate: Sun Mar 17 23:40:42 2024 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Thu Mar 21 09:10:02 2024 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=a03525ab

kde-apps/gwenview: correct package KDcraw package name

https://invent.kde.org/graphics/gwenview/-/blob/b3b48aa51fa51cee30afde5c5a58d1ce60ac/CMakeLists.txt#L155

Signed-off-by: Alfred Wingate  protonmail.com>
Closes: https://github.com/gentoo/kde/pull/982
Signed-off-by: Andreas Sturmlechner  gentoo.org>

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

diff --git a/kde-apps/gwenview/gwenview-24.02.1.ebuild 
b/kde-apps/gwenview/gwenview-24.02.1.ebuild
index 781628d938..3caa848aaf 100644
--- a/kde-apps/gwenview/gwenview-24.02.1.ebuild
+++ b/kde-apps/gwenview/gwenview-24.02.1.ebuild
@@ -92,7 +92,7 @@ src_configure() {
local mycmakeargs=(
$(cmake_use_find_package activities PlasmaActivities)
$(cmake_use_find_package fits CFitsio)
-   $(cmake_use_find_package raw KF6KDcraw)
+   $(cmake_use_find_package raw KDcrawQt6)
-DGWENVIEW_SEMANTICINFO_BACKEND=$(usex semantic-desktop Baloo 
None)
$(cmake_use_find_package share KF6Purpose)
-DWITHOUT_X11=$(usex !X)

diff --git a/kde-apps/gwenview/gwenview-24.02.49..ebuild 
b/kde-apps/gwenview/gwenview-24.02.49..ebuild
index 747472aefe..2de3a48d58 100644
--- a/kde-apps/gwenview/gwenview-24.02.49..ebuild
+++ b/kde-apps/gwenview/gwenview-24.02.49..ebuild
@@ -92,7 +92,7 @@ src_configure() {
local mycmakeargs=(
$(cmake_use_find_package activities PlasmaActivities)
$(cmake_use_find_package fits CFitsio)
-   $(cmake_use_find_package raw KF6KDcraw)
+   $(cmake_use_find_package raw KDcrawQt6)
-DGWENVIEW_SEMANTICINFO_BACKEND=$(usex semantic-desktop Baloo 
None)
$(cmake_use_find_package share KF6Purpose)
-DWITHOUT_X11=$(usex !X)

diff --git a/kde-apps/gwenview/gwenview-.ebuild 
b/kde-apps/gwenview/gwenview-.ebuild
index 747472aefe..2de3a48d58 100644
--- a/kde-apps/gwenview/gwenview-.ebuild
+++ b/kde-apps/gwenview/gwenview-.ebuild
@@ -92,7 +92,7 @@ src_configure() {
local mycmakeargs=(
$(cmake_use_find_package activities PlasmaActivities)
$(cmake_use_find_package fits CFitsio)
-   $(cmake_use_find_package raw KF6KDcraw)
+   $(cmake_use_find_package raw KDcrawQt6)
-DGWENVIEW_SEMANTICINFO_BACKEND=$(usex semantic-desktop Baloo 
None)
$(cmake_use_find_package share KF6Purpose)
-DWITHOUT_X11=$(usex !X)

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

2024-03-21 Thread Andreas Sturmlechner

commit: b24de2757d8ec5b8e28b47deb95ee1f520f93303
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Thu Mar 21 09:14:00 2024 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Thu Mar 21 09:14:00 2024 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=b24de275

kde-apps/gwenview: Raise minimum kimageannotator/kcolorpicker versions

See also: https://github.com/gentoo/kde/pull/982

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

 kde-apps/gwenview/gwenview-24.02.1.ebuild   | 4 ++--
 kde-apps/gwenview/gwenview-24.02.49..ebuild | 4 ++--
 kde-apps/gwenview/gwenview-.ebuild  | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/kde-apps/gwenview/gwenview-24.02.1.ebuild 
b/kde-apps/gwenview/gwenview-24.02.1.ebuild
index 3caa848aaf..ebd99e8aa1 100644
--- a/kde-apps/gwenview/gwenview-24.02.1.ebuild
+++ b/kde-apps/gwenview/gwenview-24.02.1.ebuild
@@ -45,8 +45,8 @@ COMMON_DEPEND="
>=kde-frameworks/kxmlgui-${KFMIN}:6
>=kde-frameworks/solid-${KFMIN}:6
media-gfx/exiv2:=
-   >=media-libs/kcolorpicker-0.3.0
-   >=media-libs/kimageannotator-0.7.0
+   >=media-libs/kcolorpicker-0.3.1
+   >=media-libs/kimageannotator-0.7.1
media-libs/lcms:2
media-libs/libjpeg-turbo:=
media-libs/libpng:0=

diff --git a/kde-apps/gwenview/gwenview-24.02.49..ebuild 
b/kde-apps/gwenview/gwenview-24.02.49..ebuild
index 2de3a48d58..8194719b7d 100644
--- a/kde-apps/gwenview/gwenview-24.02.49..ebuild
+++ b/kde-apps/gwenview/gwenview-24.02.49..ebuild
@@ -45,8 +45,8 @@ COMMON_DEPEND="
>=kde-frameworks/kxmlgui-${KFMIN}:6
>=kde-frameworks/solid-${KFMIN}:6
media-gfx/exiv2:=
-   >=media-libs/kcolorpicker-0.3.0
-   >=media-libs/kimageannotator-0.7.0
+   >=media-libs/kcolorpicker-0.3.1
+   >=media-libs/kimageannotator-0.7.1
media-libs/lcms:2
media-libs/libjpeg-turbo:=
media-libs/libpng:0=

diff --git a/kde-apps/gwenview/gwenview-.ebuild 
b/kde-apps/gwenview/gwenview-.ebuild
index 2de3a48d58..8194719b7d 100644
--- a/kde-apps/gwenview/gwenview-.ebuild
+++ b/kde-apps/gwenview/gwenview-.ebuild
@@ -45,8 +45,8 @@ COMMON_DEPEND="
>=kde-frameworks/kxmlgui-${KFMIN}:6
>=kde-frameworks/solid-${KFMIN}:6
media-gfx/exiv2:=
-   >=media-libs/kcolorpicker-0.3.0
-   >=media-libs/kimageannotator-0.7.0
+   >=media-libs/kcolorpicker-0.3.1
+   >=media-libs/kimageannotator-0.7.1
media-libs/lcms:2
media-libs/libjpeg-turbo:=
media-libs/libpng:0=

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

2024-03-15 Thread Andreas Sturmlechner

commit: 259c8f258a5d2713e021bd25352cdca73ad24486
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Fri Mar 15 12:49:19 2024 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Fri Mar 15 13:18:27 2024 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=259c8f25

kde-apps/gwenview: Update slot op comment and copy to IUSE X

Not exclusive to IUSE X unfortunately.

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

 kde-apps/gwenview/gwenview-24.02.49..ebuild | 7 +--
 kde-apps/gwenview/gwenview-.ebuild  | 7 +--
 2 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/kde-apps/gwenview/gwenview-24.02.49..ebuild 
b/kde-apps/gwenview/gwenview-24.02.49..ebuild
index 0e47e8ecd6..747472aefe 100644
--- a/kde-apps/gwenview/gwenview-24.02.49..ebuild
+++ b/kde-apps/gwenview/gwenview-24.02.49..ebuild
@@ -21,7 +21,7 @@ IUSE="activities fits +mpris raw semantic-desktop share X"
 # requires running environment
 RESTRICT="test"
 
-# slot op: includes qpa/qplatformnativeinterface.h
+# slot op: includes qpa/qplatformnativeinterface.h, qtx11extras_p.h
 COMMON_DEPEND="
dev-libs/wayland
>=dev-qt/qtbase-${QTMIN}:6=[gui,opengl,widgets]
@@ -61,7 +61,10 @@ COMMON_DEPEND="
>=kde-frameworks/kfilemetadata-${KFMIN}:6
)
share? ( >=kde-frameworks/purpose-${KFMIN}:6 )
-   X? ( x11-libs/libX11 )
+   X? (
+   >=dev-qt/qtbase-${QTMIN}:6=[gui]
+   x11-libs/libX11
+   )
 "
 DEPEND="${COMMON_DEPEND}
dev-libs/wayland-protocols

diff --git a/kde-apps/gwenview/gwenview-.ebuild 
b/kde-apps/gwenview/gwenview-.ebuild
index 0e47e8ecd6..747472aefe 100644
--- a/kde-apps/gwenview/gwenview-.ebuild
+++ b/kde-apps/gwenview/gwenview-.ebuild
@@ -21,7 +21,7 @@ IUSE="activities fits +mpris raw semantic-desktop share X"
 # requires running environment
 RESTRICT="test"
 
-# slot op: includes qpa/qplatformnativeinterface.h
+# slot op: includes qpa/qplatformnativeinterface.h, qtx11extras_p.h
 COMMON_DEPEND="
dev-libs/wayland
>=dev-qt/qtbase-${QTMIN}:6=[gui,opengl,widgets]
@@ -61,7 +61,10 @@ COMMON_DEPEND="
>=kde-frameworks/kfilemetadata-${KFMIN}:6
)
share? ( >=kde-frameworks/purpose-${KFMIN}:6 )
-   X? ( x11-libs/libX11 )
+   X? (
+   >=dev-qt/qtbase-${QTMIN}:6=[gui]
+   x11-libs/libX11
+   )
 "
 DEPEND="${COMMON_DEPEND}
dev-libs/wayland-protocols

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

2024-02-25 Thread Sam James

commit: 7ce324b5175bf9a272087ee9e5030fb666d89f69
Author: Sam James  gentoo  org>
AuthorDate: Sun Feb 25 18:49:57 2024 +
Commit: Sam James  gentoo  org>
CommitDate: Sun Feb 25 18:52:43 2024 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=7ce324b5

kde-apps/gwenview: refresh deps

* Add qtbase[opengl] dep for upstream commit 
aa7fc379bc9169e6254172aff3a97ebcb8cf7364

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

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

diff --git a/kde-apps/gwenview/gwenview-24.02.0.ebuild 
b/kde-apps/gwenview/gwenview-24.02.0.ebuild
index c874ab204d..a6b99ed304 100644
--- a/kde-apps/gwenview/gwenview-24.02.0.ebuild
+++ b/kde-apps/gwenview/gwenview-24.02.0.ebuild
@@ -24,7 +24,7 @@ RESTRICT="test"
 # slot op: includes qpa/qplatformnativeinterface.h
 COMMON_DEPEND="
dev-libs/wayland
-   >=dev-qt/qtbase-${QTMIN}:6=[gui,widgets]
+   >=dev-qt/qtbase-${QTMIN}:6=[gui,opengl,widgets]
>=dev-qt/qtsvg-${QTMIN}:6
>=dev-qt/qtwayland-${QTMIN}:6
>=kde-frameworks/kcompletion-${KFMIN}:6

diff --git a/kde-apps/gwenview/gwenview-24.02.49..ebuild 
b/kde-apps/gwenview/gwenview-24.02.49..ebuild
index 34b117996e..9a8765b3eb 100644
--- a/kde-apps/gwenview/gwenview-24.02.49..ebuild
+++ b/kde-apps/gwenview/gwenview-24.02.49..ebuild
@@ -24,7 +24,7 @@ RESTRICT="test"
 # slot op: includes qpa/qplatformnativeinterface.h
 COMMON_DEPEND="
dev-libs/wayland
-   >=dev-qt/qtbase-${QTMIN}:6=[gui,widgets]
+   >=dev-qt/qtbase-${QTMIN}:6=[gui,opengl,widgets]
>=dev-qt/qtsvg-${QTMIN}:6
>=dev-qt/qtwayland-${QTMIN}:6
>=kde-frameworks/kcompletion-${KFMIN}:6

diff --git a/kde-apps/gwenview/gwenview-.ebuild 
b/kde-apps/gwenview/gwenview-.ebuild
index 34b117996e..9a8765b3eb 100644
--- a/kde-apps/gwenview/gwenview-.ebuild
+++ b/kde-apps/gwenview/gwenview-.ebuild
@@ -24,7 +24,7 @@ RESTRICT="test"
 # slot op: includes qpa/qplatformnativeinterface.h
 COMMON_DEPEND="
dev-libs/wayland
-   >=dev-qt/qtbase-${QTMIN}:6=[gui,widgets]
+   >=dev-qt/qtbase-${QTMIN}:6=[gui,opengl,widgets]
>=dev-qt/qtsvg-${QTMIN}:6
>=dev-qt/qtwayland-${QTMIN}:6
>=kde-frameworks/kcompletion-${KFMIN}:6

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

2024-02-24 Thread Andreas Sturmlechner

commit: 40caa50a1f9801e4c66f64902efd944b4878cc71
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Sat Feb 24 11:49:10 2024 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Sat Feb 24 11:49:10 2024 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=40caa50a

kde-apps/gwenview: Really sort dependencies

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

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

diff --git a/kde-apps/gwenview/gwenview-24.02.0.ebuild 
b/kde-apps/gwenview/gwenview-24.02.0.ebuild
index ca9a5380c4..c874ab204d 100644
--- a/kde-apps/gwenview/gwenview-24.02.0.ebuild
+++ b/kde-apps/gwenview/gwenview-24.02.0.ebuild
@@ -45,8 +45,8 @@ COMMON_DEPEND="
>=kde-frameworks/kxmlgui-${KFMIN}:6
>=kde-frameworks/solid-${KFMIN}:6
media-gfx/exiv2:=
-   >=media-libs/kimageannotator-0.7.0
>=media-libs/kcolorpicker-0.3.0
+   >=media-libs/kimageannotator-0.7.0
media-libs/lcms:2
media-libs/libjpeg-turbo:=
media-libs/libpng:0=

diff --git a/kde-apps/gwenview/gwenview-24.02.49..ebuild 
b/kde-apps/gwenview/gwenview-24.02.49..ebuild
index c89021abea..34b117996e 100644
--- a/kde-apps/gwenview/gwenview-24.02.49..ebuild
+++ b/kde-apps/gwenview/gwenview-24.02.49..ebuild
@@ -45,8 +45,8 @@ COMMON_DEPEND="
>=kde-frameworks/kxmlgui-${KFMIN}:6
>=kde-frameworks/solid-${KFMIN}:6
media-gfx/exiv2:=
-   >=media-libs/kimageannotator-0.7.0
>=media-libs/kcolorpicker-0.3.0
+   >=media-libs/kimageannotator-0.7.0
media-libs/lcms:2
media-libs/libjpeg-turbo:=
media-libs/libpng:0=

diff --git a/kde-apps/gwenview/gwenview-.ebuild 
b/kde-apps/gwenview/gwenview-.ebuild
index c89021abea..34b117996e 100644
--- a/kde-apps/gwenview/gwenview-.ebuild
+++ b/kde-apps/gwenview/gwenview-.ebuild
@@ -45,8 +45,8 @@ COMMON_DEPEND="
>=kde-frameworks/kxmlgui-${KFMIN}:6
>=kde-frameworks/solid-${KFMIN}:6
media-gfx/exiv2:=
-   >=media-libs/kimageannotator-0.7.0
>=media-libs/kcolorpicker-0.3.0
+   >=media-libs/kimageannotator-0.7.0
media-libs/lcms:2
media-libs/libjpeg-turbo:=
media-libs/libpng:0=

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

2024-02-24 Thread Alexey Shvetsov

commit: af905492fcde419994f0285a774ed9479b278f63
Author: Alexey Shvetsov  gentoo  org>
AuthorDate: Sat Feb 24 11:18:42 2024 +
Commit: Alexey Shvetsov  gentoo  org>
CommitDate: Sat Feb 24 11:18:42 2024 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=af905492

kde-apps/gwenview: sort deps

Signed-off-by: Alexey Shvetsov  gentoo.org>

 kde-apps/gwenview/gwenview-24.02.0.ebuild   | 5 ++---
 kde-apps/gwenview/gwenview-24.02.49..ebuild | 5 ++---
 kde-apps/gwenview/gwenview-.ebuild  | 5 ++---
 3 files changed, 6 insertions(+), 9 deletions(-)

diff --git a/kde-apps/gwenview/gwenview-24.02.0.ebuild 
b/kde-apps/gwenview/gwenview-24.02.0.ebuild
index 613641e365..ca9a5380c4 100644
--- a/kde-apps/gwenview/gwenview-24.02.0.ebuild
+++ b/kde-apps/gwenview/gwenview-24.02.0.ebuild
@@ -22,7 +22,6 @@ IUSE="activities fits +mpris raw semantic-desktop share X"
 RESTRICT="test"
 
 # slot op: includes qpa/qplatformnativeinterface.h
-# TODO: When Qt6 version available: >=media-libs/kimageannotator-0.5.0, 
media-libs/kcolorpicker
 COMMON_DEPEND="
dev-libs/wayland
>=dev-qt/qtbase-${QTMIN}:6=[gui,widgets]
@@ -46,11 +45,11 @@ COMMON_DEPEND="
>=kde-frameworks/kxmlgui-${KFMIN}:6
>=kde-frameworks/solid-${KFMIN}:6
media-gfx/exiv2:=
+   >=media-libs/kimageannotator-0.7.0
+   >=media-libs/kcolorpicker-0.3.0
media-libs/lcms:2
media-libs/libjpeg-turbo:=
media-libs/libpng:0=
-   >=media-libs/kimageannotator-0.7.0
-   >=media-libs/kcolorpicker-0.3.0
>=media-libs/phonon-4.12.0[qt6]
media-libs/tiff:=
activities? ( kde-plasma/plasma-activities:6 )

diff --git a/kde-apps/gwenview/gwenview-24.02.49..ebuild 
b/kde-apps/gwenview/gwenview-24.02.49..ebuild
index c21d67ba47..c89021abea 100644
--- a/kde-apps/gwenview/gwenview-24.02.49..ebuild
+++ b/kde-apps/gwenview/gwenview-24.02.49..ebuild
@@ -22,7 +22,6 @@ IUSE="activities fits +mpris raw semantic-desktop share X"
 RESTRICT="test"
 
 # slot op: includes qpa/qplatformnativeinterface.h
-# TODO: When Qt6 version available: >=media-libs/kimageannotator-0.5.0, 
media-libs/kcolorpicker
 COMMON_DEPEND="
dev-libs/wayland
>=dev-qt/qtbase-${QTMIN}:6=[gui,widgets]
@@ -46,11 +45,11 @@ COMMON_DEPEND="
>=kde-frameworks/kxmlgui-${KFMIN}:6
>=kde-frameworks/solid-${KFMIN}:6
media-gfx/exiv2:=
+   >=media-libs/kimageannotator-0.7.0
+   >=media-libs/kcolorpicker-0.3.0
media-libs/lcms:2
media-libs/libjpeg-turbo:=
media-libs/libpng:0=
-   >=media-libs/kimageannotator-0.7.0
-   >=media-libs/kcolorpicker-0.3.0
>=media-libs/phonon-4.12.0[qt6]
media-libs/tiff:=
activities? ( kde-plasma/plasma-activities:6 )

diff --git a/kde-apps/gwenview/gwenview-.ebuild 
b/kde-apps/gwenview/gwenview-.ebuild
index c21d67ba47..c89021abea 100644
--- a/kde-apps/gwenview/gwenview-.ebuild
+++ b/kde-apps/gwenview/gwenview-.ebuild
@@ -22,7 +22,6 @@ IUSE="activities fits +mpris raw semantic-desktop share X"
 RESTRICT="test"
 
 # slot op: includes qpa/qplatformnativeinterface.h
-# TODO: When Qt6 version available: >=media-libs/kimageannotator-0.5.0, 
media-libs/kcolorpicker
 COMMON_DEPEND="
dev-libs/wayland
>=dev-qt/qtbase-${QTMIN}:6=[gui,widgets]
@@ -46,11 +45,11 @@ COMMON_DEPEND="
>=kde-frameworks/kxmlgui-${KFMIN}:6
>=kde-frameworks/solid-${KFMIN}:6
media-gfx/exiv2:=
+   >=media-libs/kimageannotator-0.7.0
+   >=media-libs/kcolorpicker-0.3.0
media-libs/lcms:2
media-libs/libjpeg-turbo:=
media-libs/libpng:0=
-   >=media-libs/kimageannotator-0.7.0
-   >=media-libs/kcolorpicker-0.3.0
>=media-libs/phonon-4.12.0[qt6]
media-libs/tiff:=
activities? ( kde-plasma/plasma-activities:6 )

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

2024-02-24 Thread Alexey Shvetsov

commit: 54d0efc2e8f1ca6be53ddbaaccd40fa8846eb727
Author: Alexey Shvetsov  gentoo  org>
AuthorDate: Sat Feb 24 08:49:29 2024 +
Commit: Alexey Shvetsov  gentoo  org>
CommitDate: Sat Feb 24 08:49:29 2024 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=54d0efc2

kde-apps/gwenview: Add required dep kimageannotator

Signed-off-by: Alexey Shvetsov  gentoo.org>

 kde-apps/gwenview/gwenview-24.02.0.ebuild   | 2 ++
 kde-apps/gwenview/gwenview-24.02.49..ebuild | 2 ++
 kde-apps/gwenview/gwenview-.ebuild  | 2 ++
 3 files changed, 6 insertions(+)

diff --git a/kde-apps/gwenview/gwenview-24.02.0.ebuild 
b/kde-apps/gwenview/gwenview-24.02.0.ebuild
index 6504b5e1f9..613641e365 100644
--- a/kde-apps/gwenview/gwenview-24.02.0.ebuild
+++ b/kde-apps/gwenview/gwenview-24.02.0.ebuild
@@ -49,6 +49,8 @@ COMMON_DEPEND="
media-libs/lcms:2
media-libs/libjpeg-turbo:=
media-libs/libpng:0=
+   >=media-libs/kimageannotator-0.7.0
+   >=media-libs/kcolorpicker-0.3.0
>=media-libs/phonon-4.12.0[qt6]
media-libs/tiff:=
activities? ( kde-plasma/plasma-activities:6 )

diff --git a/kde-apps/gwenview/gwenview-24.02.49..ebuild 
b/kde-apps/gwenview/gwenview-24.02.49..ebuild
index 9d9d7a583b..c21d67ba47 100644
--- a/kde-apps/gwenview/gwenview-24.02.49..ebuild
+++ b/kde-apps/gwenview/gwenview-24.02.49..ebuild
@@ -49,6 +49,8 @@ COMMON_DEPEND="
media-libs/lcms:2
media-libs/libjpeg-turbo:=
media-libs/libpng:0=
+   >=media-libs/kimageannotator-0.7.0
+   >=media-libs/kcolorpicker-0.3.0
>=media-libs/phonon-4.12.0[qt6]
media-libs/tiff:=
activities? ( kde-plasma/plasma-activities:6 )

diff --git a/kde-apps/gwenview/gwenview-.ebuild 
b/kde-apps/gwenview/gwenview-.ebuild
index 9d9d7a583b..c21d67ba47 100644
--- a/kde-apps/gwenview/gwenview-.ebuild
+++ b/kde-apps/gwenview/gwenview-.ebuild
@@ -49,6 +49,8 @@ COMMON_DEPEND="
media-libs/lcms:2
media-libs/libjpeg-turbo:=
media-libs/libpng:0=
+   >=media-libs/kimageannotator-0.7.0
+   >=media-libs/kcolorpicker-0.3.0
>=media-libs/phonon-4.12.0[qt6]
media-libs/tiff:=
activities? ( kde-plasma/plasma-activities:6 )

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

2024-01-10 Thread Andreas Sturmlechner

commit: 46dc1b32050e89c2e89921d07cf4364d21a55771
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Wed Jan 10 10:08:37 2024 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Wed Jan 10 10:08:37 2024 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=46dc1b32

kde-apps/gwenview: 24.02 stable branch switched to KF6

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

 kde-apps/gwenview/gwenview-24.02.49..ebuild | 89 -
 1 file changed, 42 insertions(+), 47 deletions(-)

diff --git a/kde-apps/gwenview/gwenview-24.02.49..ebuild 
b/kde-apps/gwenview/gwenview-24.02.49..ebuild
index adf2346b99..b6223af607 100644
--- a/kde-apps/gwenview/gwenview-24.02.49..ebuild
+++ b/kde-apps/gwenview/gwenview-24.02.49..ebuild
@@ -5,15 +5,16 @@ EAPI=8
 
 ECM_HANDBOOK="optional"
 ECM_TEST="true"
-KFMIN=5.113.0
-QTMIN=5.15.9
+PVCUT=$(ver_cut 1-3)
+KFMIN=5.248.0
+QTMIN=6.6.0
 inherit ecm gear.kde.org optfeature
 
 DESCRIPTION="Image viewer by KDE"
 HOMEPAGE="https://apps.kde.org/gwenview/ https://userbase.kde.org/Gwenview;
 
 LICENSE="GPL-2+ handbook? ( FDL-1.2 )"
-SLOT="5"
+SLOT="6"
 KEYWORDS=""
 IUSE="activities fits +mpris raw semantic-desktop share X"
 
@@ -21,63 +22,57 @@ IUSE="activities fits +mpris raw semantic-desktop share X"
 RESTRICT="test"
 
 # slot op: includes qpa/qplatformnativeinterface.h
+# TODO: When Qt6 version available: >=media-libs/kimageannotator-0.5.0, 
media-libs/kcolorpicker
 COMMON_DEPEND="
dev-libs/wayland
-   >=dev-qt/qtgui-${QTMIN}:5=
-   >=dev-qt/qtprintsupport-${QTMIN}:5
-   >=dev-qt/qtsvg-${QTMIN}:5
-   >=dev-qt/qtwayland-${QTMIN}:5
-   >=dev-qt/qtwidgets-${QTMIN}:5
-   >=kde-frameworks/kcompletion-${KFMIN}:5
-   >=kde-frameworks/kconfig-${KFMIN}:5
-   >=kde-frameworks/kconfigwidgets-${KFMIN}:5
-   >=kde-frameworks/kcoreaddons-${KFMIN}:5
-   >=kde-frameworks/kguiaddons-${KFMIN}:5
-   >=kde-frameworks/ki18n-${KFMIN}:5
-   >=kde-frameworks/kiconthemes-${KFMIN}:5
-   >=kde-frameworks/kio-${KFMIN}:5
-   >=kde-frameworks/kitemmodels-${KFMIN}:5
-   >=kde-frameworks/kitemviews-${KFMIN}:5
-   >=kde-frameworks/kjobwidgets-${KFMIN}:5
-   >=kde-frameworks/knotifications-${KFMIN}:5
-   >=kde-frameworks/kparts-${KFMIN}:5
-   >=kde-frameworks/kservice-${KFMIN}:5
-   >=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-   >=kde-frameworks/kxmlgui-${KFMIN}:5
-   >=kde-frameworks/solid-${KFMIN}:5
+   >=dev-qt/qtbase-${QTMIN}:6=[gui,widgets]
+   >=dev-qt/qtsvg-${QTMIN}:6
+   >=dev-qt/qtwayland-${QTMIN}:6
+   >=kde-frameworks/kcompletion-${KFMIN}:6
+   >=kde-frameworks/kconfig-${KFMIN}:6
+   >=kde-frameworks/kconfigwidgets-${KFMIN}:6
+   >=kde-frameworks/kcoreaddons-${KFMIN}:6
+   >=kde-frameworks/kguiaddons-${KFMIN}:6
+   >=kde-frameworks/ki18n-${KFMIN}:6
+   >=kde-frameworks/kiconthemes-${KFMIN}:6
+   >=kde-frameworks/kio-${KFMIN}:6
+   >=kde-frameworks/kitemmodels-${KFMIN}:6
+   >=kde-frameworks/kitemviews-${KFMIN}:6
+   >=kde-frameworks/kjobwidgets-${KFMIN}:6
+   >=kde-frameworks/knotifications-${KFMIN}:6
+   >=kde-frameworks/kparts-${KFMIN}:6
+   >=kde-frameworks/kservice-${KFMIN}:6
+   >=kde-frameworks/kwidgetsaddons-${KFMIN}:6
+   >=kde-frameworks/kxmlgui-${KFMIN}:6
+   >=kde-frameworks/solid-${KFMIN}:6
media-gfx/exiv2:=
-   media-libs/kcolorpicker
-   >=media-libs/kimageannotator-0.5.0
media-libs/lcms:2
media-libs/libjpeg-turbo:=
media-libs/libpng:0=
-   >=media-libs/phonon-4.11.0[qt5(+)]
+   >=media-libs/phonon-4.12.0[qt6]
media-libs/tiff:=
-   activities? ( >=kde-plasma/plasma-activities-${KFMIN}:5 )
+   activities? ( kde-plasma/plasma-activities:6 )
fits? ( sci-libs/cfitsio )
-   mpris? ( >=dev-qt/qtdbus-${QTMIN}:5 )
-   raw? ( kde-apps/libkdcraw:5 )
+   mpris? ( >=dev-qt/qtbase-${QTMIN}:6[dbus] )
+   raw? ( >=kde-apps/libkdcraw-${PVCUT}:6 )
semantic-desktop? (
-   >=kde-frameworks/baloo-${KFMIN}:5
-   >=kde-frameworks/kfilemetadata-${KFMIN}:5
-   )
-   share? ( >=kde-frameworks/purpose-${KFMIN}:5 )
-   X? (
-   >=dev-qt/qtx11extras-${QTMIN}:5
-   x11-libs/libX11
+   >=kde-frameworks/baloo-${KFMIN}:6
+   >=kde-frameworks/kfilemetadata-${KFMIN}:6
)
+   share? ( >=kde-frameworks/purpose-${KFMIN}:6 )
+   X? ( x11-libs/libX11 )
 "
 DEPEND="${COMMON_DEPEND}
dev-libs/wayland-protocols
-   >=dev-qt/qtconcurrent-${QTMIN}:5
-   >=kde-frameworks/kwindowsystem-${KFMIN}:5
+   >=dev-qt/qtbase-${QTMIN}:6[concurrent]
+   >=kde-frameworks/kwindowsystem-${KFMIN}:6
 "
 RDEPEND="${COMMON_DEPEND}
-   >=dev-qt/qtimageformats-${QTMIN}:5
-   >=kde-frameworks/kimageformats-${KFMIN}:5
+   >=dev-qt/qtimageformats-${QTMIN}:6
+

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

2024-01-07 Thread Andreas Sturmlechner

commit: d57df899a5adb0a507b684c586db6cfbbb8f6929
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Sun Jan  7 13:04:26 2024 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Sun Jan  7 13:24:39 2024 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=d57df899

kde-apps/gwenview: Port to KF6

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

 kde-apps/gwenview/gwenview-.ebuild | 89 --
 1 file changed, 42 insertions(+), 47 deletions(-)

diff --git a/kde-apps/gwenview/gwenview-.ebuild 
b/kde-apps/gwenview/gwenview-.ebuild
index 43f62658a1..ca2e98a77b 100644
--- a/kde-apps/gwenview/gwenview-.ebuild
+++ b/kde-apps/gwenview/gwenview-.ebuild
@@ -5,15 +5,16 @@ EAPI=8
 
 ECM_HANDBOOK="optional"
 ECM_TEST="true"
-KFMIN=5.106.0
-QTMIN=5.15.9
+PVCUT=$(ver_cut 1-3)
+KFMIN=5.245.0
+QTMIN=6.6.0
 inherit ecm gear.kde.org optfeature
 
 DESCRIPTION="Image viewer by KDE"
 HOMEPAGE="https://apps.kde.org/gwenview/ https://userbase.kde.org/Gwenview;
 
 LICENSE="GPL-2+ handbook? ( FDL-1.2 )"
-SLOT="5"
+SLOT="6"
 KEYWORDS=""
 IUSE="activities fits +mpris raw semantic-desktop share X"
 
@@ -21,63 +22,57 @@ IUSE="activities fits +mpris raw semantic-desktop share X"
 RESTRICT="test"
 
 # slot op: includes qpa/qplatformnativeinterface.h
+# TODO: When Qt6 version available: >=media-libs/kimageannotator-0.5.0, 
media-libs/kcolorpicker
 COMMON_DEPEND="
dev-libs/wayland
-   >=dev-qt/qtgui-${QTMIN}:5=
-   >=dev-qt/qtprintsupport-${QTMIN}:5
-   >=dev-qt/qtsvg-${QTMIN}:5
-   >=dev-qt/qtwayland-${QTMIN}:5
-   >=dev-qt/qtwidgets-${QTMIN}:5
-   >=kde-frameworks/kcompletion-${KFMIN}:5
-   >=kde-frameworks/kconfig-${KFMIN}:5
-   >=kde-frameworks/kconfigwidgets-${KFMIN}:5
-   >=kde-frameworks/kcoreaddons-${KFMIN}:5
-   >=kde-frameworks/kguiaddons-${KFMIN}:5
-   >=kde-frameworks/ki18n-${KFMIN}:5
-   >=kde-frameworks/kiconthemes-${KFMIN}:5
-   >=kde-frameworks/kio-${KFMIN}:5
-   >=kde-frameworks/kitemmodels-${KFMIN}:5
-   >=kde-frameworks/kitemviews-${KFMIN}:5
-   >=kde-frameworks/kjobwidgets-${KFMIN}:5
-   >=kde-frameworks/knotifications-${KFMIN}:5
-   >=kde-frameworks/kparts-${KFMIN}:5
-   >=kde-frameworks/kservice-${KFMIN}:5
-   >=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-   >=kde-frameworks/kxmlgui-${KFMIN}:5
-   >=kde-frameworks/solid-${KFMIN}:5
+   >=dev-qt/qtbase-${QTMIN}:6=[gui,widgets]
+   >=dev-qt/qtsvg-${QTMIN}:6
+   >=dev-qt/qtwayland-${QTMIN}:6
+   >=kde-frameworks/kcompletion-${KFMIN}:6
+   >=kde-frameworks/kconfig-${KFMIN}:6
+   >=kde-frameworks/kconfigwidgets-${KFMIN}:6
+   >=kde-frameworks/kcoreaddons-${KFMIN}:6
+   >=kde-frameworks/kguiaddons-${KFMIN}:6
+   >=kde-frameworks/ki18n-${KFMIN}:6
+   >=kde-frameworks/kiconthemes-${KFMIN}:6
+   >=kde-frameworks/kio-${KFMIN}:6
+   >=kde-frameworks/kitemmodels-${KFMIN}:6
+   >=kde-frameworks/kitemviews-${KFMIN}:6
+   >=kde-frameworks/kjobwidgets-${KFMIN}:6
+   >=kde-frameworks/knotifications-${KFMIN}:6
+   >=kde-frameworks/kparts-${KFMIN}:6
+   >=kde-frameworks/kservice-${KFMIN}:6
+   >=kde-frameworks/kwidgetsaddons-${KFMIN}:6
+   >=kde-frameworks/kxmlgui-${KFMIN}:6
+   >=kde-frameworks/solid-${KFMIN}:6
media-gfx/exiv2:=
-   media-libs/kcolorpicker
-   >=media-libs/kimageannotator-0.5.0
media-libs/lcms:2
media-libs/libjpeg-turbo:=
media-libs/libpng:0=
-   >=media-libs/phonon-4.11.0[qt5(+)]
+   >=media-libs/phonon-4.12.0[qt6]
media-libs/tiff:=
-   activities? ( >=kde-plasma/plasma-activities-${KFMIN}:5 )
+   activities? ( kde-plasma/plasma-activities:6 )
fits? ( sci-libs/cfitsio )
-   mpris? ( >=dev-qt/qtdbus-${QTMIN}:5 )
-   raw? ( kde-apps/libkdcraw:5 )
+   mpris? ( >=dev-qt/qtbase-${QTMIN}:6[dbus] )
+   raw? ( >=kde-apps/libkdcraw-${PVCUT}:6 )
semantic-desktop? (
-   >=kde-frameworks/baloo-${KFMIN}:5
-   >=kde-frameworks/kfilemetadata-${KFMIN}:5
-   )
-   share? ( >=kde-frameworks/purpose-${KFMIN}:5 )
-   X? (
-   >=dev-qt/qtx11extras-${QTMIN}:5
-   x11-libs/libX11
+   >=kde-frameworks/baloo-${KFMIN}:6
+   >=kde-frameworks/kfilemetadata-${KFMIN}:6
)
+   share? ( >=kde-frameworks/purpose-${KFMIN}:6 )
+   X? ( x11-libs/libX11 )
 "
 DEPEND="${COMMON_DEPEND}
dev-libs/wayland-protocols
-   >=dev-qt/qtconcurrent-${QTMIN}:5
-   >=kde-frameworks/kwindowsystem-${KFMIN}:5
+   >=dev-qt/qtbase-${QTMIN}:6[concurrent]
+   >=kde-frameworks/kwindowsystem-${KFMIN}:6
 "
 RDEPEND="${COMMON_DEPEND}
-   >=dev-qt/qtimageformats-${QTMIN}:5
-   >=kde-frameworks/kimageformats-${KFMIN}:5
+   >=dev-qt/qtimageformats-${QTMIN}:6
+   >=kde-frameworks/kimageformats-${KFMIN}:6
 "
 BDEPEND="
-

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

2023-12-25 Thread Andreas Sturmlechner

commit: b98e0c7b85c226b6fd0b7ff1f1198d567c371440
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Mon Dec 25 19:02:17 2023 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Mon Dec 25 19:04:53 2023 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=b98e0c7b

kde-apps/gwenview: Do not enforce min kde-apps/libkdcraw version

 was ported to KF6, and build system does not require one anyway.

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

 kde-apps/gwenview/gwenview-.ebuild | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/kde-apps/gwenview/gwenview-.ebuild 
b/kde-apps/gwenview/gwenview-.ebuild
index fd00b793e9..8409ba007d 100644
--- a/kde-apps/gwenview/gwenview-.ebuild
+++ b/kde-apps/gwenview/gwenview-.ebuild
@@ -5,7 +5,6 @@ EAPI=8
 
 ECM_HANDBOOK="optional"
 ECM_TEST="true"
-PVCUT=$(ver_cut 1-3)
 KFMIN=5.106.0
 QTMIN=5.15.9
 inherit ecm gear.kde.org optfeature
@@ -57,7 +56,7 @@ COMMON_DEPEND="
activities? ( >=kde-plasma/plasma-activities-${KFMIN}:5 )
fits? ( sci-libs/cfitsio )
mpris? ( >=dev-qt/qtdbus-${QTMIN}:5 )
-   raw? ( >=kde-apps/libkdcraw-${PVCUT}:5 )
+   raw? ( kde-apps/libkdcraw:5 )
semantic-desktop? (
>=kde-frameworks/baloo-${KFMIN}:5
>=kde-frameworks/kfilemetadata-${KFMIN}:5

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

2023-03-23 Thread Andreas Sturmlechner

commit: 302921a3363235b925ebac936eaa9488c2da3291
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Thu Mar 23 22:07:14 2023 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Thu Mar 23 22:08:41 2023 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=302921a3

kde-apps/gwenview: Update dependencies

Upstream commit e39a0b2b9ddc84842e43cc45039e378008e3eb05

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

 kde-apps/gwenview/gwenview-.ebuild | 10 +-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/kde-apps/gwenview/gwenview-.ebuild 
b/kde-apps/gwenview/gwenview-.ebuild
index f6fa726ee2..9f07335d32 100644
--- a/kde-apps/gwenview/gwenview-.ebuild
+++ b/kde-apps/gwenview/gwenview-.ebuild
@@ -21,10 +21,13 @@ IUSE="activities fits +mpris raw semantic-desktop share X"
 # requires running environment
 RESTRICT="test"
 
+# slot op: includes qpa/qplatformnativeinterface.h
 COMMON_DEPEND="
-   >=dev-qt/qtgui-${QTMIN}:5
+   dev-libs/wayland
+   >=dev-qt/qtgui-${QTMIN}:5=
>=dev-qt/qtprintsupport-${QTMIN}:5
>=dev-qt/qtsvg-${QTMIN}:5
+   >=dev-qt/qtwayland-${QTMIN}:5
>=dev-qt/qtwidgets-${QTMIN}:5
>=kde-frameworks/kcompletion-${KFMIN}:5
>=kde-frameworks/kconfig-${KFMIN}:5
@@ -66,6 +69,7 @@ COMMON_DEPEND="
)
 "
 DEPEND="${COMMON_DEPEND}
+   dev-libs/wayland-protocols
>=dev-qt/qtconcurrent-${QTMIN}:5
>=kde-frameworks/kwindowsystem-${KFMIN}:5
 "
@@ -73,6 +77,10 @@ RDEPEND="${COMMON_DEPEND}
>=dev-qt/qtimageformats-${QTMIN}:5
>=kde-frameworks/kimageformats-${KFMIN}:5
 "
+BDEPEND="
+   >=dev-qt/qtwaylandscanner-${QTMIN}:5
+   dev-util/wayland-scanner
+"
 
 src_prepare() {
ecm_src_prepare

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

2022-12-16 Thread Andreas Sturmlechner

commit: c8f3a449355cf631c5e5e40c06d909f76d6c03b0
Author: Sam James  gentoo  org>
AuthorDate: Fri Dec 16 01:24:13 2022 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Fri Dec 16 19:29:49 2022 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=c8f3a449

kde-apps/gwenview: add media-libs/libtiff subslot dep

libtiff changed SONAME.

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

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

diff --git a/kde-apps/gwenview/gwenview-22.12.49..ebuild 
b/kde-apps/gwenview/gwenview-22.12.49..ebuild
index f7475fd3ad..30fe03ec58 100644
--- a/kde-apps/gwenview/gwenview-22.12.49..ebuild
+++ b/kde-apps/gwenview/gwenview-22.12.49..ebuild
@@ -50,7 +50,7 @@ COMMON_DEPEND="
media-libs/libjpeg-turbo:=
media-libs/libpng:0=
>=media-libs/phonon-4.11.0
-   media-libs/tiff
+   media-libs/tiff:=
activities? ( >=kde-frameworks/kactivities-${KFMIN}:5 )
fits? ( sci-libs/cfitsio )
mpris? ( >=dev-qt/qtdbus-${QTMIN}:5 )

diff --git a/kde-apps/gwenview/gwenview-.ebuild 
b/kde-apps/gwenview/gwenview-.ebuild
index f7475fd3ad..30fe03ec58 100644
--- a/kde-apps/gwenview/gwenview-.ebuild
+++ b/kde-apps/gwenview/gwenview-.ebuild
@@ -50,7 +50,7 @@ COMMON_DEPEND="
media-libs/libjpeg-turbo:=
media-libs/libpng:0=
>=media-libs/phonon-4.11.0
-   media-libs/tiff
+   media-libs/tiff:=
activities? ( >=kde-frameworks/kactivities-${KFMIN}:5 )
fits? ( sci-libs/cfitsio )
mpris? ( >=dev-qt/qtdbus-${QTMIN}:5 )

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

2022-11-02 Thread Andreas Sturmlechner

commit: 81f2e839b9e368282342bd8f4f3c360ed9ca4475
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Wed Nov  2 13:40:21 2022 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Wed Nov  2 13:40:21 2022 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=81f2e839

kde-apps/gwenview: Update cmake args

Upstream commit 2ffdf26b81a90c91abadbc8582f82d219dd19e90

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

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

diff --git a/kde-apps/gwenview/gwenview-.ebuild 
b/kde-apps/gwenview/gwenview-.ebuild
index c07be3ce77..7603f6a1df 100644
--- a/kde-apps/gwenview/gwenview-.ebuild
+++ b/kde-apps/gwenview/gwenview-.ebuild
@@ -89,14 +89,14 @@ src_configure() {
$(cmake_use_find_package raw KF5KDcraw)
-DGWENVIEW_SEMANTICINFO_BACKEND=$(usex semantic-desktop Baloo 
None)
$(cmake_use_find_package share KF5Purpose)
-   $(cmake_use_find_package X X11)
+   -DWITHOUT_X11=$(usex !X)
)
ecm_src_configure
 }
 
 pkg_postinst() {
if [[ -z "${REPLACING_VERSIONS}" ]]; then
-   optfeature "SVG support" kde-apps/svgpart:${SLOT}
+   optfeature "SVG support" "kde-apps/svgpart:${SLOT}"
fi
ecm_pkg_postinst
 }

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

2022-11-02 Thread Andreas Sturmlechner

commit: f8902579139556cd20f278d97e9cdef5cedd0b2a
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Wed Nov  2 12:05:39 2022 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Wed Nov  2 12:57:55 2022 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=f8902579

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

Backporting upstream(ed) commit 2ffdf26b81a90c91abadbc8582f82d219dd19e90

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

 .../files/gwenview-22.08.3-without_x11.patch   | 52 ++
 kde-apps/gwenview/gwenview-22.08.3.ebuild  |  4 +-
 2 files changed, 55 insertions(+), 1 deletion(-)

diff --git a/kde-apps/gwenview/files/gwenview-22.08.3-without_x11.patch 
b/kde-apps/gwenview/files/gwenview-22.08.3-without_x11.patch
new file mode 100644
index 00..89724ce4bb
--- /dev/null
+++ b/kde-apps/gwenview/files/gwenview-22.08.3-without_x11.patch
@@ -0,0 +1,52 @@
+From 2ffdf26b81a90c91abadbc8582f82d219dd19e90 Mon Sep 17 00:00:00 2001
+From: Andreas Sturmlechner 
+Date: Sat, 27 Nov 2021 12:49:09 +0100
+Subject: [PATCH] Add CMake option to build WITHOUT_X11
+
+We want to be able to build without X11 support even if some of the used
+libraries may not work w/o X11 themselves yet or need to be built with
+X11 support for other reverse dependencies.
+
+HAVE_X11 already exists and is set automagically so far, but using
+-DCMAKE_DISABLE_FIND_PACKAGE_X11 will break if any dependencies list X11
+as required in their cmake config.
+
+Introducing this option means there is no behavior change by default,
+cmake will just skip finding X11 or adding unwanted features if the
+option is enabled.
+
+Signed-off-by: Andreas Sturmlechner 
+---
+ CMakeLists.txt | 15 +--
+ 1 file changed, 9 insertions(+), 6 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 22ebcb42..d1b0b5fe 100644
+--- a/CMakeLists.txt
 b/CMakeLists.txt
+@@ -132,13 +132,16 @@ endif()
+ set_package_properties(KF5KDcraw PROPERTIES URL 
"https://invent.kde.org/graphics/libkdcraw/; DESCRIPTION "C++ interface around 
LibRaw library used to decode RAW picture files" TYPE OPTIONAL)
+ 
+ 
+-find_package(X11)
+-if(X11_FOUND)
+-if (QT_MAJOR_VERSION STREQUAL "5")
+-find_package(Qt5 ${QT_MIN_VERSION} CONFIG REQUIRED X11Extras)
++option(WITHOUT_X11 "Build without X11 integration (disables finding X11)" OFF)
++if(NOT WITHOUT_X11)
++find_package(X11)
++if(X11_FOUND)
++if (QT_MAJOR_VERSION STREQUAL "5")
++find_package(Qt5 ${QT_MIN_VERSION} CONFIG REQUIRED X11Extras)
++endif()
++# we need to add qt6 lib when we found x11
++set(HAVE_X11 TRUE)
+ endif()
+-# we need to add qt6 lib when we found x11
+-set(HAVE_X11 1)
+ endif()
+ 
+ if (QT_MAJOR_VERSION STREQUAL "5")
+-- 
+GitLab
+

diff --git a/kde-apps/gwenview/gwenview-22.08.3.ebuild 
b/kde-apps/gwenview/gwenview-22.08.3.ebuild
index d341db59c1..9f34c3cac0 100644
--- a/kde-apps/gwenview/gwenview-22.08.3.ebuild
+++ b/kde-apps/gwenview/gwenview-22.08.3.ebuild
@@ -74,6 +74,8 @@ RDEPEND="${COMMON_DEPEND}
>=kde-frameworks/kimageformats-${KFMIN}:5
 "
 
+PATCHES=( "${FILESDIR}/${P}-without_x11.patch" )
+
 src_prepare() {
ecm_src_prepare
if ! use mpris; then
@@ -89,7 +91,7 @@ src_configure() {
$(cmake_use_find_package raw KF5KDcraw)
-DGWENVIEW_SEMANTICINFO_BACKEND=$(usex semantic-desktop Baloo 
None)
$(cmake_use_find_package share KF5Purpose)
-   $(cmake_use_find_package X X11)
+   -DWITHOUT_X11=$(usex !X)
)
ecm_src_configure
 }

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

2022-07-09 Thread Andreas Sturmlechner

commit: 0af99b556a8a5c1b6aa37b70c7295d4278e4a329
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Sat Jul  9 11:34:38 2022 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Sat Jul  9 12:52:38 2022 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=0af99b55

kde-apps/gwenview: Add IUSE annotate

Upstream commit 8f3bf87bcda2f678a15a48a5cefdca912d80dff8

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

 kde-apps/gwenview/gwenview-.ebuild | 4 +++-
 kde-apps/gwenview/metadata.xml | 1 +
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/kde-apps/gwenview/gwenview-.ebuild 
b/kde-apps/gwenview/gwenview-.ebuild
index 1477c367c3..3b29d35a04 100644
--- a/kde-apps/gwenview/gwenview-.ebuild
+++ b/kde-apps/gwenview/gwenview-.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="https://apps.kde.org/gwenview/ 
https://userbase.kde.org/Gwenview;
 LICENSE="GPL-2+ handbook? ( FDL-1.2 )"
 SLOT="5"
 KEYWORDS=""
-IUSE="activities fits +mpris raw semantic-desktop share X"
+IUSE="activities +annotate fits +mpris raw semantic-desktop share X"
 
 # requires running environment
 RESTRICT="test"
@@ -50,6 +50,7 @@ COMMON_DEPEND="
>=media-libs/phonon-4.11.0
media-libs/tiff
activities? ( >=kde-frameworks/kactivities-${KFMIN}:5 )
+   annotate? ( >=media-libs/kimageannotator-0.5.0 )
fits? ( sci-libs/cfitsio )
mpris? ( >=dev-qt/qtdbus-${QTMIN}:5 )
raw? ( >=kde-apps/libkdcraw-${PVCUT}:5 )
@@ -83,6 +84,7 @@ src_prepare() {
 src_configure() {
local mycmakeargs=(
$(cmake_use_find_package activities KF5Activities)
+   $(cmake_use_find_package annotate kImageAnnotator)
$(cmake_use_find_package fits CFitsio)
$(cmake_use_find_package raw KF5KDcraw)
-DGWENVIEW_SEMANTICINFO_BACKEND=$(usex semantic-desktop Baloo 
None)

diff --git a/kde-apps/gwenview/metadata.xml b/kde-apps/gwenview/metadata.xml
index 4e5e4b8b85..b0e63c7843 100644
--- a/kde-apps/gwenview/metadata.xml
+++ b/kde-apps/gwenview/metadata.xml
@@ -10,6 +10,7 @@


Enable kactivities support
+   Enable support for image annotations 
using media-libs/kimageannotator
Enable support for NASA's 
sci-libs/cfitsio library
Enable support for MPRIS2 interface, 
requiring dev-qt/qtdbus as dependency.
Enable support for a share menu using 
kde-frameworks/purpose

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

2022-05-08 Thread Andreas Sturmlechner

commit: 29980990f923f66a6c17441199c62b94776cf12e
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Sun May  8 13:10:26 2022 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Sun May  8 13:10:26 2022 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=29980990

kde-apps/gwenview: Switch to media-libs/libjpeg-turbo:=

Away from deprecated virtual/jpeg.

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

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

diff --git a/kde-apps/gwenview/gwenview-22.04.49..ebuild 
b/kde-apps/gwenview/gwenview-22.04.49..ebuild
index 61dd6b6c5b..5b0e47b194 100644
--- a/kde-apps/gwenview/gwenview-22.04.49..ebuild
+++ b/kde-apps/gwenview/gwenview-22.04.49..ebuild
@@ -45,10 +45,10 @@ COMMON_DEPEND="
>=kde-frameworks/solid-${KFMIN}:5
media-gfx/exiv2:=
media-libs/lcms:2
+   media-libs/libjpeg-turbo:=
media-libs/libpng:0=
>=media-libs/phonon-4.11.0
media-libs/tiff
-   virtual/jpeg:0
activities? ( >=kde-frameworks/kactivities-${KFMIN}:5 )
fits? ( sci-libs/cfitsio )
mpris? ( >=dev-qt/qtdbus-${QTMIN}:5 )

diff --git a/kde-apps/gwenview/gwenview-.ebuild 
b/kde-apps/gwenview/gwenview-.ebuild
index 61dd6b6c5b..5b0e47b194 100644
--- a/kde-apps/gwenview/gwenview-.ebuild
+++ b/kde-apps/gwenview/gwenview-.ebuild
@@ -45,10 +45,10 @@ COMMON_DEPEND="
>=kde-frameworks/solid-${KFMIN}:5
media-gfx/exiv2:=
media-libs/lcms:2
+   media-libs/libjpeg-turbo:=
media-libs/libpng:0=
>=media-libs/phonon-4.11.0
media-libs/tiff
-   virtual/jpeg:0
activities? ( >=kde-frameworks/kactivities-${KFMIN}:5 )
fits? ( sci-libs/cfitsio )
mpris? ( >=dev-qt/qtdbus-${QTMIN}:5 )

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

2021-12-20 Thread Sam James

commit: cd68c8e4ed6b5f0bcbd5b0be82b29bbe74a8dc7d
Author: Sam James  gentoo  org>
AuthorDate: Tue Dec 21 03:58:55 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Tue Dec 21 03:59:41 2021 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=cd68c8e4

kde-apps/gwenview: fix kipi automagic typo

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

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

diff --git a/kde-apps/gwenview/gwenview-21.12.49..ebuild 
b/kde-apps/gwenview/gwenview-21.12.49..ebuild
index fdb83464a4..b06860b2b6 100644
--- a/kde-apps/gwenview/gwenview-21.12.49..ebuild
+++ b/kde-apps/gwenview/gwenview-21.12.49..ebuild
@@ -82,7 +82,7 @@ src_prepare() {
 
 src_configure() {
local mycmakeargs=(
-   -DCMAKE_DISABLE_FIND_PACKAGE_KF5Kipi=OFF
+   -DCMAKE_DISABLE_FIND_PACKAGE_KF5Kipi=ON
$(cmake_use_find_package activities KF5Activities)
$(cmake_use_find_package fits CFitsio)
$(cmake_use_find_package raw KF5KDcraw)

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

2021-12-09 Thread Andreas Sturmlechner

commit: 2730a35e7c36fe96ea25bef7266ab67d45a65f69
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Thu Dec  9 08:44:14 2021 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Thu Dec  9 08:44:14 2021 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=2730a35e

kde-apps/gwenview: Drop IUSE kipi

Disabling as well in 21.12, as there is no point in delaying its cleanup.

Upstream commit 0f39bcc72b9078f16e343749f56aa8dff55a14dc

Reported-by: Duncan <1i5t5.duncan  cox.net>
Closes: https://bugs.gentoo.org/828592
Package-Manager: Portage-3.0.28, Repoman-3.0.3
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 kde-apps/gwenview/gwenview-21.12.0.ebuild   | 6 ++
 kde-apps/gwenview/gwenview-21.12.49..ebuild | 6 ++
 kde-apps/gwenview/gwenview-.ebuild  | 5 +
 kde-apps/gwenview/metadata.xml  | 4 +---
 4 files changed, 6 insertions(+), 15 deletions(-)

diff --git a/kde-apps/gwenview/gwenview-21.12.0.ebuild 
b/kde-apps/gwenview/gwenview-21.12.0.ebuild
index 054d84b5a4..cfb6126ed5 100644
--- a/kde-apps/gwenview/gwenview-21.12.0.ebuild
+++ b/kde-apps/gwenview/gwenview-21.12.0.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="https://apps.kde.org/gwenview/ 
https://userbase.kde.org/Gwenview;
 LICENSE="GPL-2+ handbook? ( FDL-1.2 )"
 SLOT="5"
 KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
-IUSE="activities fits kipi +mpris raw semantic-desktop share X"
+IUSE="activities fits +mpris raw semantic-desktop share X"
 
 # requires running environment
 RESTRICT="test"
@@ -51,7 +51,6 @@ COMMON_DEPEND="
virtual/jpeg:0
activities? ( >=kde-frameworks/kactivities-${KFMIN}:5 )
fits? ( sci-libs/cfitsio )
-   kipi? ( >=kde-apps/libkipi-${PVCUT}:5= )
mpris? ( >=dev-qt/qtdbus-${QTMIN}:5 )
raw? ( >=kde-apps/libkdcraw-${PVCUT}:5 )
semantic-desktop? (
@@ -71,7 +70,6 @@ DEPEND="${COMMON_DEPEND}
 RDEPEND="${COMMON_DEPEND}
>=dev-qt/qtimageformats-${QTMIN}:5
>=kde-frameworks/kimageformats-${KFMIN}:5
-   kipi? ( >=kde-apps/kipi-plugins-${PVCUT}:5 )
 "
 
 src_prepare() {
@@ -84,9 +82,9 @@ src_prepare() {
 
 src_configure() {
local mycmakeargs=(
+   -DCMAKE_DISABLE_FIND_PACKAGE_KF5Kipi=OFF
$(cmake_use_find_package activities KF5Activities)
$(cmake_use_find_package fits CFitsio)
-   $(cmake_use_find_package kipi KF5Kipi)
$(cmake_use_find_package raw KF5KDcraw)
-DGWENVIEW_SEMANTICINFO_BACKEND=$(usex semantic-desktop Baloo 
None)
$(cmake_use_find_package share KF5Purpose)

diff --git a/kde-apps/gwenview/gwenview-21.12.49..ebuild 
b/kde-apps/gwenview/gwenview-21.12.49..ebuild
index 96f0c51cab..fdb83464a4 100644
--- a/kde-apps/gwenview/gwenview-21.12.49..ebuild
+++ b/kde-apps/gwenview/gwenview-21.12.49..ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="https://apps.kde.org/gwenview/ 
https://userbase.kde.org/Gwenview;
 LICENSE="GPL-2+ handbook? ( FDL-1.2 )"
 SLOT="5"
 KEYWORDS=""
-IUSE="activities fits kipi +mpris raw semantic-desktop share X"
+IUSE="activities fits +mpris raw semantic-desktop share X"
 
 # requires running environment
 RESTRICT="test"
@@ -51,7 +51,6 @@ COMMON_DEPEND="
virtual/jpeg:0
activities? ( >=kde-frameworks/kactivities-${KFMIN}:5 )
fits? ( sci-libs/cfitsio )
-   kipi? ( >=kde-apps/libkipi-${PVCUT}:5= )
mpris? ( >=dev-qt/qtdbus-${QTMIN}:5 )
raw? ( >=kde-apps/libkdcraw-${PVCUT}:5 )
semantic-desktop? (
@@ -71,7 +70,6 @@ DEPEND="${COMMON_DEPEND}
 RDEPEND="${COMMON_DEPEND}
>=dev-qt/qtimageformats-${QTMIN}:5
>=kde-frameworks/kimageformats-${KFMIN}:5
-   kipi? ( >=kde-apps/kipi-plugins-${PVCUT}:5 )
 "
 
 src_prepare() {
@@ -84,9 +82,9 @@ src_prepare() {
 
 src_configure() {
local mycmakeargs=(
+   -DCMAKE_DISABLE_FIND_PACKAGE_KF5Kipi=OFF
$(cmake_use_find_package activities KF5Activities)
$(cmake_use_find_package fits CFitsio)
-   $(cmake_use_find_package kipi KF5Kipi)
$(cmake_use_find_package raw KF5KDcraw)
-DGWENVIEW_SEMANTICINFO_BACKEND=$(usex semantic-desktop Baloo 
None)
$(cmake_use_find_package share KF5Purpose)

diff --git a/kde-apps/gwenview/gwenview-.ebuild 
b/kde-apps/gwenview/gwenview-.ebuild
index 96f0c51cab..afc98c8b9f 100644
--- a/kde-apps/gwenview/gwenview-.ebuild
+++ b/kde-apps/gwenview/gwenview-.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="https://apps.kde.org/gwenview/ 
https://userbase.kde.org/Gwenview;
 LICENSE="GPL-2+ handbook? ( FDL-1.2 )"
 SLOT="5"
 KEYWORDS=""
-IUSE="activities fits kipi +mpris raw semantic-desktop share X"
+IUSE="activities fits +mpris raw semantic-desktop share X"
 
 # requires running environment
 RESTRICT="test"
@@ -51,7 +51,6 @@ COMMON_DEPEND="
virtual/jpeg:0
activities? ( >=kde-frameworks/kactivities-${KFMIN}:5 )
fits? (

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

2021-04-11 Thread Andreas Sturmlechner

commit: f188004b6b46ba26bb8e96c88482ba99cef26723
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Sun Apr 11 19:24:18 2021 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Sun Apr 11 20:02:45 2021 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=f188004b

kde-apps/gwenview: Drop unused DEPEND

Upstream commit 7ed543b53a9fb6d11ef95e439425ed71f952e66b

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

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

diff --git a/kde-apps/gwenview/gwenview-.ebuild 
b/kde-apps/gwenview/gwenview-.ebuild
index 03ca1770c9..724cf1968c 100644
--- a/kde-apps/gwenview/gwenview-.ebuild
+++ b/kde-apps/gwenview/gwenview-.ebuild
@@ -23,7 +23,6 @@ RESTRICT+=" test"
 
 COMMON_DEPEND="
>=dev-qt/qtgui-${QTMIN}:5
-   >=dev-qt/qtopengl-${QTMIN}:5
>=dev-qt/qtprintsupport-${QTMIN}:5
>=dev-qt/qtsvg-${QTMIN}:5
>=dev-qt/qtwidgets-${QTMIN}:5

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

2021-04-04 Thread Andreas Sturmlechner

commit: 801a355ae800c73604cc0913d0e48ba8cd6fe828
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Sat Apr  3 11:07:29 2021 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Sun Apr  4 19:08:49 2021 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=801a355a

kde-apps/gwenview: Drop superfluous optfeature header

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

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

diff --git a/kde-apps/gwenview/gwenview-.ebuild 
b/kde-apps/gwenview/gwenview-.ebuild
index 52b827017f..03ca1770c9 100644
--- a/kde-apps/gwenview/gwenview-.ebuild
+++ b/kde-apps/gwenview/gwenview-.ebuild
@@ -103,7 +103,6 @@ src_configure() {
 
 pkg_postinst() {
if [[ -z "${REPLACING_VERSIONS}" ]]; then
-   elog "Optional dependencies:"
optfeature "SVG support" kde-apps/svgpart:${SLOT}
fi
ecm_pkg_postinst

[gentoo-commits] proj/kde:master commit in: kde-apps/gwenview/, kde-apps/okular/, media-gfx/kphotoalbum/, ...

2021-01-30 Thread Andreas Sturmlechner

commit: df8e8b4720c3aa258d743ac120a43cd8e846529c
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Sat Jan 30 17:45:34 2021 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Sat Jan 30 17:45:34 2021 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=df8e8b47

*/*: Revert "Switch from virtual/jpeg to media-libs/libjpeg-turbo:="

All packages checked were linking to libjpeg.so.

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

 kde-apps/gwenview/gwenview-20.12.49..ebuild | 2 +-
 kde-apps/gwenview/gwenview-.ebuild  | 2 +-
 kde-apps/okular/okular-20.12.49..ebuild | 2 +-
 kde-apps/okular/okular-.ebuild  | 2 +-
 kde-frameworks/khtml/khtml-.ebuild  | 2 +-
 media-gfx/digikam/digikam-.ebuild   | 2 +-
 media-gfx/kphotoalbum/kphotoalbum-.ebuild   | 2 +-
 media-gfx/krita/krita-.ebuild   | 2 +-
 8 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/kde-apps/gwenview/gwenview-20.12.49..ebuild 
b/kde-apps/gwenview/gwenview-20.12.49..ebuild
index c9b69f8b37..52b827017f 100644
--- a/kde-apps/gwenview/gwenview-20.12.49..ebuild
+++ b/kde-apps/gwenview/gwenview-20.12.49..ebuild
@@ -45,10 +45,10 @@ COMMON_DEPEND="
>=kde-frameworks/solid-${KFMIN}:5
media-gfx/exiv2:=
media-libs/lcms:2
-   media-libs/libjpeg-turbo:=
media-libs/libpng:0=
>=media-libs/phonon-4.11.0
media-libs/tiff
+   virtual/jpeg:0
activities? ( >=kde-frameworks/kactivities-${KFMIN}:5 )
fits? ( sci-libs/cfitsio )
kipi? ( >=kde-apps/libkipi-${PVCUT}:5= )

diff --git a/kde-apps/gwenview/gwenview-.ebuild 
b/kde-apps/gwenview/gwenview-.ebuild
index c9b69f8b37..52b827017f 100644
--- a/kde-apps/gwenview/gwenview-.ebuild
+++ b/kde-apps/gwenview/gwenview-.ebuild
@@ -45,10 +45,10 @@ COMMON_DEPEND="
>=kde-frameworks/solid-${KFMIN}:5
media-gfx/exiv2:=
media-libs/lcms:2
-   media-libs/libjpeg-turbo:=
media-libs/libpng:0=
>=media-libs/phonon-4.11.0
media-libs/tiff
+   virtual/jpeg:0
activities? ( >=kde-frameworks/kactivities-${KFMIN}:5 )
fits? ( sci-libs/cfitsio )
kipi? ( >=kde-apps/libkipi-${PVCUT}:5= )

diff --git a/kde-apps/okular/okular-20.12.49..ebuild 
b/kde-apps/okular/okular-20.12.49..ebuild
index 1098c59a9a..8f80cd0cd9 100644
--- a/kde-apps/okular/okular-20.12.49..ebuild
+++ b/kde-apps/okular/okular-20.12.49..ebuild
@@ -56,7 +56,7 @@ DEPEND="
markdown? ( app-text/discount )
mobi? ( >=kde-apps/kdegraphics-mobipocket-${PVCUT}:5 )
pdf? ( app-text/poppler[qt5] )
-   plucker? ( media-libs/libjpeg-turbo:= )
+   plucker? ( virtual/jpeg:0 )
postscript? ( app-text/libspectre )
share? ( >=kde-frameworks/purpose-${KFMIN}:5 )
speech? ( >=dev-qt/qtspeech-${QTMIN}:5 )

diff --git a/kde-apps/okular/okular-.ebuild 
b/kde-apps/okular/okular-.ebuild
index c306f66c13..fe8d00a846 100644
--- a/kde-apps/okular/okular-.ebuild
+++ b/kde-apps/okular/okular-.ebuild
@@ -56,7 +56,7 @@ DEPEND="
markdown? ( app-text/discount )
mobi? ( >=kde-apps/kdegraphics-mobipocket-${PVCUT}:5 )
pdf? ( app-text/poppler[nss,qt5] )
-   plucker? ( media-libs/libjpeg-turbo:= )
+   plucker? ( virtual/jpeg:0 )
postscript? ( app-text/libspectre )
share? ( >=kde-frameworks/purpose-${KFMIN}:5 )
speech? ( >=dev-qt/qtspeech-${QTMIN}:5 )

diff --git a/kde-frameworks/khtml/khtml-.ebuild 
b/kde-frameworks/khtml/khtml-.ebuild
index 6253c629e7..43c4e8901f 100644
--- a/kde-frameworks/khtml/khtml-.ebuild
+++ b/kde-frameworks/khtml/khtml-.ebuild
@@ -47,10 +47,10 @@ RDEPEND="
=kde-frameworks/kxmlgui-${PVCUT}*:5
=kde-frameworks/sonnet-${PVCUT}*:5
media-libs/giflib:=
-   media-libs/libjpeg-turbo:=
media-libs/libpng:0=
>=media-libs/phonon-4.11.0
sys-libs/zlib
+   virtual/jpeg:0
!libressl? ( dev-libs/openssl:0 )
libressl? ( dev-libs/libressl )
X? (

diff --git a/media-gfx/digikam/digikam-.ebuild 
b/media-gfx/digikam/digikam-.ebuild
index f09f9c4d12..73ceac0b60 100644
--- a/media-gfx/digikam/digikam-.ebuild
+++ b/media-gfx/digikam/digikam-.ebuild
@@ -61,11 +61,11 @@ COMMON_DEPEND="
>=kde-frameworks/solid-${KFMIN}:5
>=media-gfx/exiv2-0.27:=
media-libs/lcms:2
-   media-libs/libjpeg-turbo:=
media-libs/liblqr
media-libs/libpng:0=
>=media-libs/opencv-3.3.0:=[contrib,contribdnn]
media-libs/tiff:0
+   virtual/jpeg:0
addressbook? (
>=kde-apps/akonadi-contacts-19.04.3:5
>=kde-frameworks/kcontacts-${KFMIN}:5

diff --git a/media-gfx/kphotoalbum/kphotoalbum-.ebuild 
b/media-gfx/kphotoalbum/kphotoalbum-.ebuild
index b78fd50e3c..05d99b7e2d 100644
---

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

2020-09-07 Thread Andreas Sturmlechner

commit: 406bd75bd4d39c96405dab671dfbd7dc6821f5ca
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Mon Sep  7 13:37:56 2020 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Mon Sep  7 15:05:48 2020 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=406bd75b

kde-apps/gwenview: Use optfeature

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

 kde-apps/gwenview/gwenview-20.08.49..ebuild | 10 +-
 kde-apps/gwenview/gwenview-.ebuild  | 10 +-
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/kde-apps/gwenview/gwenview-20.08.49..ebuild 
b/kde-apps/gwenview/gwenview-20.08.49..ebuild
index 53829d300d..02cfa64a52 100644
--- a/kde-apps/gwenview/gwenview-20.08.49..ebuild
+++ b/kde-apps/gwenview/gwenview-20.08.49..ebuild
@@ -8,7 +8,7 @@ ECM_TEST="true"
 PVCUT=$(ver_cut 1-3)
 KFMIN=5.72.0
 QTMIN=5.14.2
-inherit ecm kde.org
+inherit ecm kde.org optfeature
 
 DESCRIPTION="Image viewer by KDE"
 HOMEPAGE="https://kde.org/applications/graphics/org.kde.gwenview
@@ -103,9 +103,9 @@ src_configure() {
 }
 
 pkg_postinst() {
-   ecm_pkg_postinst
-
-   if [[ -z "${REPLACING_VERSIONS}" ]] && ! has_version 
kde-apps/svgpart:${SLOT} ; then
-   elog "For SVG support, install kde-apps/svgpart:${SLOT}"
+   if [[ -z "${REPLACING_VERSIONS}" ]]; then
+   elog "Optional dependencies:"
+   optfeature "SVG support" kde-apps/svgpart:${SLOT}
fi
+   ecm_pkg_postinst
 }

diff --git a/kde-apps/gwenview/gwenview-.ebuild 
b/kde-apps/gwenview/gwenview-.ebuild
index da5e924a76..ec72ef6ee8 100644
--- a/kde-apps/gwenview/gwenview-.ebuild
+++ b/kde-apps/gwenview/gwenview-.ebuild
@@ -8,7 +8,7 @@ ECM_TEST="true"
 PVCUT=$(ver_cut 1-3)
 KFMIN=5.73.0
 QTMIN=5.14.2
-inherit ecm kde.org
+inherit ecm kde.org optfeature
 
 DESCRIPTION="Image viewer by KDE"
 HOMEPAGE="https://kde.org/applications/graphics/org.kde.gwenview
@@ -103,9 +103,9 @@ src_configure() {
 }
 
 pkg_postinst() {
-   ecm_pkg_postinst
-
-   if [[ -z "${REPLACING_VERSIONS}" ]] && ! has_version 
kde-apps/svgpart:${SLOT} ; then
-   elog "For SVG support, install kde-apps/svgpart:${SLOT}"
+   if [[ -z "${REPLACING_VERSIONS}" ]]; then
+   elog "Optional dependencies:"
+   optfeature "SVG support" kde-apps/svgpart:${SLOT}
fi
+   ecm_pkg_postinst
 }

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

2019-07-17 Thread Andreas Sturmlechner

commit: 54cd9fe11e3ffc8ed3b7f20a13e5c5adca4b3f8f
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Wed Jul 17 18:18:46 2019 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Wed Jul 17 18:18:46 2019 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=54cd9fe1

kde-apps/gwenview: Finish pkgmove to kde-apps/kipi-plugins

Closes: https://bugs.gentoo.org/690100
Package-Manager: Portage-2.3.69, Repoman-2.3.16
Signed-off-by: Andreas Sturmlechner  gentoo.org>

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

diff --git a/kde-apps/gwenview/gwenview-19.08.49..ebuild 
b/kde-apps/gwenview/gwenview-19.08.49..ebuild
index a0b25319a9..f28ee21351 100644
--- a/kde-apps/gwenview/gwenview-19.08.49..ebuild
+++ b/kde-apps/gwenview/gwenview-19.08.49..ebuild
@@ -69,7 +69,7 @@ DEPEND="${COMMON_DEPEND}
 RDEPEND="${COMMON_DEPEND}
$(add_frameworks_dep kimageformats)
$(add_qt_dep qtimageformats)
-   kipi? ( media-plugins/kipi-plugins:5 )
+   kipi? ( $(add_kdeapps_dep kipi-plugins) )
 "
 
 src_prepare() {

diff --git a/kde-apps/gwenview/gwenview-.ebuild 
b/kde-apps/gwenview/gwenview-.ebuild
index a0b25319a9..f28ee21351 100644
--- a/kde-apps/gwenview/gwenview-.ebuild
+++ b/kde-apps/gwenview/gwenview-.ebuild
@@ -69,7 +69,7 @@ DEPEND="${COMMON_DEPEND}
 RDEPEND="${COMMON_DEPEND}
$(add_frameworks_dep kimageformats)
$(add_qt_dep qtimageformats)
-   kipi? ( media-plugins/kipi-plugins:5 )
+   kipi? ( $(add_kdeapps_dep kipi-plugins) )
 "
 
 src_prepare() {

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

2019-07-07 Thread Andreas Sturmlechner

commit: 791f528f519417bd4f8e9618c26ed95467e04cbd
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Sat Jul  6 19:53:36 2019 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Sun Jul  7 11:35:27 2019 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=791f528f

kde-apps/gwenview: kde-frameworks/purpose is indeed now optional

Upstream commit 8284074a76f6ac4926d410f8358db743b8a858b1

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

 kde-apps/gwenview/gwenview-.ebuild | 5 +++--
 kde-apps/gwenview/metadata.xml | 1 +
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/kde-apps/gwenview/gwenview-.ebuild 
b/kde-apps/gwenview/gwenview-.ebuild
index d482baba51..a0b25319a9 100644
--- a/kde-apps/gwenview/gwenview-.ebuild
+++ b/kde-apps/gwenview/gwenview-.ebuild
@@ -15,7 +15,7 @@ HOMEPAGE="
 
 LICENSE="GPL-2+ handbook? ( FDL-1.2 )"
 KEYWORDS=""
-IUSE="activities fits kipi +mpris raw semantic-desktop X"
+IUSE="activities fits kipi +mpris raw semantic-desktop share X"
 
 # requires running environment
 RESTRICT+=" test"
@@ -36,7 +36,6 @@ COMMON_DEPEND="
$(add_frameworks_dep kservice)
$(add_frameworks_dep kwidgetsaddons)
$(add_frameworks_dep kxmlgui)
-   $(add_frameworks_dep purpose)
$(add_frameworks_dep solid)
$(add_qt_dep qtgui)
$(add_qt_dep qtopengl)
@@ -57,6 +56,7 @@ COMMON_DEPEND="
$(add_frameworks_dep baloo)
$(add_frameworks_dep kfilemetadata)
)
+   share? ( $(add_frameworks_dep purpose) )
X? (
$(add_qt_dep qtx11extras)
x11-libs/libX11
@@ -86,6 +86,7 @@ src_configure() {
$(cmake-utils_use_find_package fits CFitsio)
$(cmake-utils_use_find_package kipi KF5Kipi)
$(cmake-utils_use_find_package raw KF5KDcraw)
+   $(cmake-utils_use_find_package share KF5Purpose)
$(cmake-utils_use_find_package X X11)
)
 

diff --git a/kde-apps/gwenview/metadata.xml b/kde-apps/gwenview/metadata.xml
index 0bca8f5e65..b1994f4579 100644
--- a/kde-apps/gwenview/metadata.xml
+++ b/kde-apps/gwenview/metadata.xml
@@ -11,5 +11,6 @@
Enable support for the KDE Image Plugin 
Interface
Enable support for MPRIS2 interface, 
requiring dev-qt/qtdbus as dependency.

+   Enable support for a share menu using 
kde-frameworks/purpose

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

2019-06-23 Thread Andreas Sturmlechner

commit: 29edcc4353a71544d1dff19cfcbb6a7d253de6d6
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Sun Jun 23 07:58:32 2019 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Sun Jun 23 07:58:32 2019 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=29edcc43

kde-apps/gwenview: kde-frameworks/purpose is indeed not optional

Reported-by: Duncan <1i5t5.duncan  cox.net>
Closes: https://bugs.gentoo.org/688516
Package-Manager: Portage-2.3.67, Repoman-2.3.15
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 kde-apps/gwenview/gwenview-.ebuild | 5 ++---
 kde-apps/gwenview/metadata.xml | 1 -
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/kde-apps/gwenview/gwenview-.ebuild 
b/kde-apps/gwenview/gwenview-.ebuild
index a0b25319a9..d482baba51 100644
--- a/kde-apps/gwenview/gwenview-.ebuild
+++ b/kde-apps/gwenview/gwenview-.ebuild
@@ -15,7 +15,7 @@ HOMEPAGE="
 
 LICENSE="GPL-2+ handbook? ( FDL-1.2 )"
 KEYWORDS=""
-IUSE="activities fits kipi +mpris raw semantic-desktop share X"
+IUSE="activities fits kipi +mpris raw semantic-desktop X"
 
 # requires running environment
 RESTRICT+=" test"
@@ -36,6 +36,7 @@ COMMON_DEPEND="
$(add_frameworks_dep kservice)
$(add_frameworks_dep kwidgetsaddons)
$(add_frameworks_dep kxmlgui)
+   $(add_frameworks_dep purpose)
$(add_frameworks_dep solid)
$(add_qt_dep qtgui)
$(add_qt_dep qtopengl)
@@ -56,7 +57,6 @@ COMMON_DEPEND="
$(add_frameworks_dep baloo)
$(add_frameworks_dep kfilemetadata)
)
-   share? ( $(add_frameworks_dep purpose) )
X? (
$(add_qt_dep qtx11extras)
x11-libs/libX11
@@ -86,7 +86,6 @@ src_configure() {
$(cmake-utils_use_find_package fits CFitsio)
$(cmake-utils_use_find_package kipi KF5Kipi)
$(cmake-utils_use_find_package raw KF5KDcraw)
-   $(cmake-utils_use_find_package share KF5Purpose)
$(cmake-utils_use_find_package X X11)
)
 

diff --git a/kde-apps/gwenview/metadata.xml b/kde-apps/gwenview/metadata.xml
index b1994f4579..0bca8f5e65 100644
--- a/kde-apps/gwenview/metadata.xml
+++ b/kde-apps/gwenview/metadata.xml
@@ -11,6 +11,5 @@
Enable support for the KDE Image Plugin 
Interface
Enable support for MPRIS2 interface, 
requiring dev-qt/qtdbus as dependency.

-   Enable support for a share menu using 
kde-frameworks/purpose

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

2019-06-22 Thread Andreas Sturmlechner

commit: 6d2ad4860a0179b2fbfe1b2a67c69317b637661b
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Sat Jun 22 16:21:15 2019 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Sat Jun 22 16:21:15 2019 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=6d2ad486

kde-apps/gwenview: Add USE share

Upstream commit d20a1533d13cf502ebbab4913f3847254ebc68aa

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

 kde-apps/gwenview/gwenview-.ebuild | 4 +++-
 kde-apps/gwenview/metadata.xml | 1 +
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/kde-apps/gwenview/gwenview-.ebuild 
b/kde-apps/gwenview/gwenview-.ebuild
index 4708a315f4..a0b25319a9 100644
--- a/kde-apps/gwenview/gwenview-.ebuild
+++ b/kde-apps/gwenview/gwenview-.ebuild
@@ -15,7 +15,7 @@ HOMEPAGE="
 
 LICENSE="GPL-2+ handbook? ( FDL-1.2 )"
 KEYWORDS=""
-IUSE="activities fits kipi +mpris raw semantic-desktop X"
+IUSE="activities fits kipi +mpris raw semantic-desktop share X"
 
 # requires running environment
 RESTRICT+=" test"
@@ -56,6 +56,7 @@ COMMON_DEPEND="
$(add_frameworks_dep baloo)
$(add_frameworks_dep kfilemetadata)
)
+   share? ( $(add_frameworks_dep purpose) )
X? (
$(add_qt_dep qtx11extras)
x11-libs/libX11
@@ -85,6 +86,7 @@ src_configure() {
$(cmake-utils_use_find_package fits CFitsio)
$(cmake-utils_use_find_package kipi KF5Kipi)
$(cmake-utils_use_find_package raw KF5KDcraw)
+   $(cmake-utils_use_find_package share KF5Purpose)
$(cmake-utils_use_find_package X X11)
)
 

diff --git a/kde-apps/gwenview/metadata.xml b/kde-apps/gwenview/metadata.xml
index 0bca8f5e65..b1994f4579 100644
--- a/kde-apps/gwenview/metadata.xml
+++ b/kde-apps/gwenview/metadata.xml
@@ -11,5 +11,6 @@
Enable support for the KDE Image Plugin 
Interface
Enable support for MPRIS2 interface, 
requiring dev-qt/qtdbus as dependency.

+   Enable support for a share menu using 
kde-frameworks/purpose

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

2019-02-09 Thread Andreas Sturmlechner

commit: 7072d66372b3aa024a9fcc8bdb0b0ce20119822d
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Fri Feb  8 20:12:47 2019 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Sat Feb  9 09:55:41 2019 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=7072d663

kde-apps/gwenview: Set KDE_HANDBOOK to forceoptional

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

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

diff --git a/kde-apps/gwenview/gwenview-18.12.49..ebuild 
b/kde-apps/gwenview/gwenview-18.12.49..ebuild
index 89fd0d..4724693373 100644
--- a/kde-apps/gwenview/gwenview-18.12.49..ebuild
+++ b/kde-apps/gwenview/gwenview-18.12.49..ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-KDE_HANDBOOK="true"
+KDE_HANDBOOK="forceoptional"
 KDE_TEST="true"
 inherit kde5
 

diff --git a/kde-apps/gwenview/gwenview-.ebuild 
b/kde-apps/gwenview/gwenview-.ebuild
index a31983da6d..7947e70b4a 100644
--- a/kde-apps/gwenview/gwenview-.ebuild
+++ b/kde-apps/gwenview/gwenview-.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-KDE_HANDBOOK="true"
+KDE_HANDBOOK="forceoptional"
 KDE_TEST="true"
 inherit kde5

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

2019-02-06 Thread Andreas Sturmlechner

commit: 1b1df02aeee22cd215bf54ab45ba6b9947288641
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Wed Feb  6 23:49:13 2019 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Wed Feb  6 23:49:13 2019 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=1b1df02a

kde-apps/gwenview: Sync with Gentoo ebuild repo

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

 .../files/gwenview-18.12.1-exiv2-0.27.patch| 142 ++---
 1 file changed, 125 insertions(+), 17 deletions(-)

diff --git a/kde-apps/gwenview/files/gwenview-18.12.1-exiv2-0.27.patch 
b/kde-apps/gwenview/files/gwenview-18.12.1-exiv2-0.27.patch
index 66ed9ed834..3e528e4928 100644
--- a/kde-apps/gwenview/files/gwenview-18.12.1-exiv2-0.27.patch
+++ b/kde-apps/gwenview/files/gwenview-18.12.1-exiv2-0.27.patch
@@ -1,7 +1,7 @@
-From 61543b42289fc986e580f2e3443719f3334f17b5 Mon Sep 17 00:00:00 2001
+From 3637438dd1a772ee65e6b3091087bde89dc91db0 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Stefan=20Br=C3=BCns?= 
 Date: Sun, 30 Dec 2018 02:46:28 +0100
-Subject: [PATCH 1/2] Use forward declaration for Exiv2::Image, port to
+Subject: [PATCH 1/4] Use forward declaration for Exiv2::Image, port to
  std::unique_ptr
 
 Summary:
@@ -104,7 +104,7 @@ index d841ae5f..d3d0002c 100644
  
  void AbstractDocumentImpl::setDocumentDownSampledImage(const QImage& image, 
int invertedZoom)
 diff --git a/lib/document/abstractdocumentimpl.h 
b/lib/document/abstractdocumentimpl.h
-index 1f427e60..86e6bfd2 100644
+index 5d6862b8..6c6be825 100644
 --- a/lib/document/abstractdocumentimpl.h
 +++ b/lib/document/abstractdocumentimpl.h
 @@ -34,6 +34,11 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, 
MA 02110-1301, USA.
@@ -129,7 +129,7 @@ index 1f427e60..86e6bfd2 100644
  void setDocumentCmsProfile(Cms::Profile::Ptr profile);
  void setDocumentErrorString(const QString&);
 diff --git a/lib/document/document.cpp b/lib/document/document.cpp
-index 18756700..afa9ed03 100644
+index c760be96..27003b3e 100644
 --- a/lib/document/document.cpp
 +++ b/lib/document/document.cpp
 @@ -31,6 +31,9 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, 
MA  02110-1301, USA.
@@ -155,7 +155,7 @@ index 18756700..afa9ed03 100644
  emit metaInfoUpdated();
  }
 diff --git a/lib/document/document.h b/lib/document/document.h
-index c0bb454b..4b40a6e1 100644
+index 782111d9..4b2b3d48 100644
 --- a/lib/document/document.h
 +++ b/lib/document/document.h
 @@ -22,8 +22,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, 
MA  02110-1301, USA.
@@ -191,7 +191,7 @@ index c0bb454b..4b40a6e1 100644
  void switchToImpl(AbstractDocumentImpl* impl);
  void setErrorString(const QString&);
 diff --git a/lib/document/document_p.h b/lib/document/document_p.h
-index 78e0ac6e..4de25f15 100644
+index 00c6f7ff..2701440f 100644
 --- a/lib/document/document_p.h
 +++ b/lib/document/document_p.h
 @@ -21,6 +21,9 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, 
Cambridge, MA 02110-1301, USA
@@ -226,7 +226,7 @@ index 78e0ac6e..4de25f15 100644
  QByteArray mFormat;
  ImageMetaInfoModel mImageMetaInfoModel;
 diff --git a/lib/document/loadingdocumentimpl.cpp 
b/lib/document/loadingdocumentimpl.cpp
-index 07675783..766a1831 100644
+index 713ef32c..3bcf613a 100644
 --- a/lib/document/loadingdocumentimpl.cpp
 +++ b/lib/document/loadingdocumentimpl.cpp
 @@ -24,6 +24,9 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, 
MA 02110-1301, USA.
@@ -248,7 +248,7 @@ index 07675783..766a1831 100644
  std::unique_ptr mJpegContent;
  QImage mImage;
  Cms::Profile::Ptr mCmsProfile;
-@@ -486,7 +489,7 @@ void LoadingDocumentImpl::slotMetaInfoLoaded()
+@@ -488,7 +491,7 @@ void LoadingDocumentImpl::slotMetaInfoLoaded()
  
  setDocumentFormat(d->mFormat);
  setDocumentImageSize(d->mImageSize);
@@ -258,7 +258,7 @@ index 07675783..766a1831 100644
  
  d->mMetaInfoLoaded = true;
 diff --git a/lib/exiv2imageloader.cpp b/lib/exiv2imageloader.cpp
-index f2830f81..f13dff7a 100644
+index c298c9c3..49bdf2c8 100644
 --- a/lib/exiv2imageloader.cpp
 +++ b/lib/exiv2imageloader.cpp
 @@ -29,8 +29,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, 
MA 02110-1301, USA.
@@ -288,7 +288,7 @@ index f2830f81..f13dff7a 100644
 +
d->mImage.reset(Exiv2::ImageFactory::open(filePathByteArray.constData()).release());
  d->mImage->readMetadata();
  } catch (const Exiv2::Error& error) {
- d->mErrorMessage = QString::fromUtf8(error.what());
+ d->mErrorMessage = error.what();
 @@ -69,7 +68,7 @@ bool Exiv2ImageLoader::load(const QString& filePath)
  bool Exiv2ImageLoader::load(const QByteArray& data)
  {
@@ -297,7 +297,7 @@ index f2830f81..f13dff7a 100644
 +d->mImage.reset(Exiv2::ImageFactory::open((unsigned 
char*)data.constData(), data.size()).release());
  d->mImage->readMetadata();
  } catch (const Exiv2::Error&

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

2019-01-07 Thread Andreas Sturmlechner

commit: fbf59947c68f017aedc0d5dff30d823301261565
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Mon Jan  7 23:59:43 2019 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Mon Jan  7 23:59:43 2019 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=fbf59947

kde-apps/gwenview: Fix build with exiv2-0.27

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

 .../files/gwenview-18.12.1-exiv2-0.27.patch| 523 +
 kde-apps/gwenview/gwenview-18.12.49..ebuild|   4 +-
 2 files changed, 526 insertions(+), 1 deletion(-)

diff --git a/kde-apps/gwenview/files/gwenview-18.12.1-exiv2-0.27.patch 
b/kde-apps/gwenview/files/gwenview-18.12.1-exiv2-0.27.patch
new file mode 100644
index 00..66ed9ed834
--- /dev/null
+++ b/kde-apps/gwenview/files/gwenview-18.12.1-exiv2-0.27.patch
@@ -0,0 +1,523 @@
+From 61543b42289fc986e580f2e3443719f3334f17b5 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Stefan=20Br=C3=BCns?= 
+Date: Sun, 30 Dec 2018 02:46:28 +0100
+Subject: [PATCH 1/2] Use forward declaration for Exiv2::Image, port to
+ std::unique_ptr
+
+Summary:
+Instead of the Exiv2::Image::AutoPtr typedef just use a forward declaration
+for Exiv2::Image, and use std::unique_ptr instead of std::auto_ptr.
+
+The forward declaration avoids pulling in Exiv2 declarations everywhere,
+e.g. via document.h.
+
+Although it would be possible to use std::auto_ptr, unique_ptr is
+preferable for two reasons:
+- ownership transfer is explicit (std::move, release()/reset())
+- Exiv2 0.28 will use std::unique_ptr as well, i.e. the code is forward
+compatible.
+
+Reviewers: #gwenview, cfeck, ngraham
+
+Reviewed By: #gwenview, ngraham
+
+Subscribers: lbeltrame, ngraham, asturmlechner, shubham
+
+Tags: #gwenview
+
+Differential Revision: https://phabricator.kde.org/D17872
+---
+ lib/cms/cmsprofile.cpp|  3 +++
+ lib/cms/cmsprofile.h  |  8 +---
+ lib/document/abstractdocumentimpl.cpp |  5 +++--
+ lib/document/abstractdocumentimpl.h   |  7 ++-
+ lib/document/document.cpp |  7 +--
+ lib/document/document.h   | 11 ---
+ lib/document/document_p.h | 10 +-
+ lib/document/loadingdocumentimpl.cpp  |  7 +--
+ lib/exiv2imageloader.cpp  | 13 ++---
+ lib/exiv2imageloader.h| 11 ---
+ lib/jpegcontent.cpp   | 10 +-
+ lib/timeutils.cpp |  8 +---
+ tests/auto/cmsprofiletest.cpp |  4 ++--
+ tests/auto/imagemetainfomodeltest.cpp |  9 +++--
+ 14 files changed, 77 insertions(+), 36 deletions(-)
+
+diff --git a/lib/cms/cmsprofile.cpp b/lib/cms/cmsprofile.cpp
+index 188b90a4..7d2b753e 100644
+--- a/lib/cms/cmsprofile.cpp
 b/lib/cms/cmsprofile.cpp
+@@ -42,6 +42,9 @@ extern "C" {
+ // lcms
+ #include 
+ 
++// Exiv2
++#include 
++
+ // X11
+ #ifdef HAVE_X11
+ #include 
+diff --git a/lib/cms/cmsprofile.h b/lib/cms/cmsprofile.h
+index a2a38a87..06c7672d 100644
+--- a/lib/cms/cmsprofile.h
 b/lib/cms/cmsprofile.h
+@@ -29,12 +29,14 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, 
Cambridge, MA 02110-1301, USA
+ #include 
+ #include 
+ 
+-// Exiv2
+-#include 
+-
+ class QByteArray;
+ class QString;
+ 
++namespace Exiv2
++{
++class Image;
++}
++
+ typedef void* cmsHPROFILE;
+ 
+ namespace Gwenview
+diff --git a/lib/document/abstractdocumentimpl.cpp 
b/lib/document/abstractdocumentimpl.cpp
+index d841ae5f..d3d0002c 100644
+--- a/lib/document/abstractdocumentimpl.cpp
 b/lib/document/abstractdocumentimpl.cpp
+@@ -21,6 +21,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, 
MA 02110-1301, USA.
+ // Self
+ #include "abstractdocumentimpl.h"
+ 
++#include 
+ // Qt
+ 
+ // KDE
+@@ -77,9 +78,9 @@ void 
AbstractDocumentImpl::setDocumentKind(MimeTypeUtils::Kind kind)
+ d->mDocument->setKind(kind);
+ }
+ 
+-void AbstractDocumentImpl::setDocumentExiv2Image(Exiv2::Image::AutoPtr image)
++void 
AbstractDocumentImpl::setDocumentExiv2Image(std::unique_ptr image)
+ {
+-d->mDocument->setExiv2Image(image);
++d->mDocument->setExiv2Image(std::move(image));
+ }
+ 
+ void AbstractDocumentImpl::setDocumentDownSampledImage(const QImage& image, 
int invertedZoom)
+diff --git a/lib/document/abstractdocumentimpl.h 
b/lib/document/abstractdocumentimpl.h
+index 1f427e60..86e6bfd2 100644
+--- a/lib/document/abstractdocumentimpl.h
 b/lib/document/abstractdocumentimpl.h
+@@ -34,6 +34,11 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, 
MA 02110-1301, USA.
+ class QImage;
+ class QRect;
+ 
++namespace Exiv2
++{
++class Image;
++}
++
+ namespace Gwenview
+ {
+ 
+@@ -108,7 +113,7 @@ protected:
+ void setDocumentImageSize(const QSize& size);
+ void setDocumentKind(MimeTypeUtils::Kind);
+ void setDocumentFormat(const QByteArray& format);
+-void setDocumentExiv2Image(Exiv2::Image::AutoPtr);
++void

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

2018-12-13 Thread Andreas Sturmlechner

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

kde-apps/gwenview: Reduce pkg_postinst spam

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

 kde-apps/gwenview/gwenview-18.12.49..ebuild | 7 ++-
 kde-apps/gwenview/gwenview-.ebuild  | 9 +++--
 2 files changed, 5 insertions(+), 11 deletions(-)

diff --git a/kde-apps/gwenview/gwenview-18.12.49..ebuild 
b/kde-apps/gwenview/gwenview-18.12.49..ebuild
index 6c992cb1d3..a826c85306 100644
--- a/kde-apps/gwenview/gwenview-18.12.49..ebuild
+++ b/kde-apps/gwenview/gwenview-18.12.49..ebuild
@@ -68,6 +68,7 @@ DEPEND="${COMMON_DEPEND}
 RDEPEND="${COMMON_DEPEND}
$(add_frameworks_dep kimageformats)
$(add_qt_dep qtimageformats)
+   kipi? ( media-plugins/kipi-plugins:5 )
 "
 
 src_prepare() {
@@ -99,11 +100,7 @@ src_configure() {
 pkg_postinst() {
kde5_pkg_postinst
 
-   if ! has_version kde-apps/svgpart:${SLOT} ; then
+   if [[ -z "${REPLACING_VERSIONS}" ]] && ! has_version 
kde-apps/svgpart:${SLOT} ; then
elog "For SVG support, install kde-apps/svgpart:${SLOT}"
fi
-
-   if use kipi && ! has_version media-plugins/kipi-plugins ; then
-   elog "Plugins for the KIPI interface can be found in 
media-plugins/kipi-plugins"
-   fi
 }

diff --git a/kde-apps/gwenview/gwenview-.ebuild 
b/kde-apps/gwenview/gwenview-.ebuild
index a0eb443c50..a826c85306 100644
--- a/kde-apps/gwenview/gwenview-.ebuild
+++ b/kde-apps/gwenview/gwenview-.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
@@ -68,6 +68,7 @@ DEPEND="${COMMON_DEPEND}
 RDEPEND="${COMMON_DEPEND}
$(add_frameworks_dep kimageformats)
$(add_qt_dep qtimageformats)
+   kipi? ( media-plugins/kipi-plugins:5 )
 "
 
 src_prepare() {
@@ -99,11 +100,7 @@ src_configure() {
 pkg_postinst() {
kde5_pkg_postinst
 
-   if ! has_version kde-apps/svgpart:${SLOT} ; then
+   if [[ -z "${REPLACING_VERSIONS}" ]] && ! has_version 
kde-apps/svgpart:${SLOT} ; then
elog "For SVG support, install kde-apps/svgpart:${SLOT}"
fi
-
-   if use kipi && ! has_version media-plugins/kipi-plugins ; then
-   elog "Plugins for the KIPI interface can be found in 
media-plugins/kipi-plugins"
-   fi
 }

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

2018-09-12 Thread Andreas Sturmlechner

commit: 64478fbba66e1ff6a31b26351bd6ba38a2e35b61
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Wed Sep 12 10:05:03 2018 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Wed Sep 12 10:09:45 2018 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=64478fbb

kde-apps/gwenview: Fix USE=-mpris

Use a workaround, but this should be fixed upstream.

Closes: https://bugs.gentoo.org/663340
Package-Manager: Portage-2.3.49, Repoman-2.3.10

 kde-apps/gwenview/gwenview-18.08.49..ebuild | 9 -
 kde-apps/gwenview/gwenview-.ebuild  | 9 -
 2 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/kde-apps/gwenview/gwenview-18.08.49..ebuild 
b/kde-apps/gwenview/gwenview-18.08.49..ebuild
index b9e1acde2a..c1bbff3d8d 100644
--- a/kde-apps/gwenview/gwenview-18.08.49..ebuild
+++ b/kde-apps/gwenview/gwenview-18.08.49..ebuild
@@ -72,12 +72,19 @@ RDEPEND="${COMMON_DEPEND}
 
 PATCHES=( "${FILESDIR}/${PN}-18.07.90-activities-optional.patch" )
 
+src_prepare() {
+   kde5_src_prepare
+   if ! use mpris; then
+   # FIXME: upstream a better solution
+   sed -e "/set(HAVE_QTDBUS/s/\${Qt5DBus_FOUND}/0/" -i 
CMakeLists.txt || die
+   fi
+}
+
 src_configure() {
local mycmakeargs=(
$(cmake-utils_use_find_package activities KF5Activities)
$(cmake-utils_use_find_package fits CFitsio)
$(cmake-utils_use_find_package kipi KF5Kipi)
-   $(cmake-utils_use_find_package mpris Qt5DBus)
$(cmake-utils_use_find_package raw KF5KDcraw)
$(cmake-utils_use_find_package X X11)
)

diff --git a/kde-apps/gwenview/gwenview-.ebuild 
b/kde-apps/gwenview/gwenview-.ebuild
index b6342a3478..a0eb443c50 100644
--- a/kde-apps/gwenview/gwenview-.ebuild
+++ b/kde-apps/gwenview/gwenview-.ebuild
@@ -70,12 +70,19 @@ RDEPEND="${COMMON_DEPEND}
$(add_qt_dep qtimageformats)
 "
 
+src_prepare() {
+   kde5_src_prepare
+   if ! use mpris; then
+   # FIXME: upstream a better solution
+   sed -e "/set(HAVE_QTDBUS/s/\${Qt5DBus_FOUND}/0/" -i 
CMakeLists.txt || die
+   fi
+}
+
 src_configure() {
local mycmakeargs=(
$(cmake-utils_use_find_package activities KF5Activities)
$(cmake-utils_use_find_package fits CFitsio)
$(cmake-utils_use_find_package kipi KF5Kipi)
-   $(cmake-utils_use_find_package mpris Qt5DBus)
$(cmake-utils_use_find_package raw KF5KDcraw)
$(cmake-utils_use_find_package X X11)
)

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

2018-08-09 Thread Andreas Sturmlechner

commit: de09c4a8a222f6ade032cc9df00358b48c5a12b3
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Thu Aug  9 18:36:28 2018 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Thu Aug  9 18:36:28 2018 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=de09c4a8

kde-apps/gwenview: ccache option is obsolete already

Upstream commit b883cb894c11acf9a43fe3ccbe0d60ead61dc671

Package-Manager: Portage-2.3.45, Repoman-2.3.10

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

diff --git a/kde-apps/gwenview/gwenview-.ebuild 
b/kde-apps/gwenview/gwenview-.ebuild
index 7d906ff06e..b6342a3478 100644
--- a/kde-apps/gwenview/gwenview-.ebuild
+++ b/kde-apps/gwenview/gwenview-.ebuild
@@ -72,7 +72,6 @@ RDEPEND="${COMMON_DEPEND}
 
 src_configure() {
local mycmakeargs=(
-   -DCCACHE_SUPPORT=OFF
$(cmake-utils_use_find_package activities KF5Activities)
$(cmake-utils_use_find_package fits CFitsio)
$(cmake-utils_use_find_package kipi KF5Kipi)

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

2018-08-08 Thread Andreas Sturmlechner

commit: 16e6bf7955d9c04568c553d6ae9aac1b8fd4c05c
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Tue Aug  7 22:16:00 2018 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Wed Aug  8 08:09:47 2018 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=16e6bf79

kde-apps/gwenview: Add USE=mpris

Upstream commit 9631043c110dba485db5deea120e8b13116c3ac7

Package-Manager: Portage-2.3.44, Repoman-2.3.10

 kde-apps/gwenview/gwenview-.ebuild | 8 +---
 kde-apps/gwenview/metadata.xml | 4 +++-
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/kde-apps/gwenview/gwenview-.ebuild 
b/kde-apps/gwenview/gwenview-.ebuild
index b1f045f429..3e69f9ea24 100644
--- a/kde-apps/gwenview/gwenview-.ebuild
+++ b/kde-apps/gwenview/gwenview-.ebuild
@@ -15,7 +15,7 @@ HOMEPAGE="
 
 LICENSE="GPL-2+ handbook? ( FDL-1.2 )"
 KEYWORDS=""
-IUSE="fits kipi raw semantic-desktop X"
+IUSE="fits kipi +mpris raw semantic-desktop X"
 
 # requires running environment
 RESTRICT+=" test"
@@ -50,6 +50,7 @@ COMMON_DEPEND="
virtual/jpeg:0
fits? ( sci-libs/cfitsio )
kipi? ( $(add_kdeapps_dep libkipi '' '' '5=') )
+   mpris? ( $(add_qt_dep qtdbus) )
raw? ( $(add_kdeapps_dep libkdcraw) )
semantic-desktop? (
$(add_frameworks_dep baloo)
@@ -73,14 +74,15 @@ src_configure() {
local mycmakeargs=(
$(cmake-utils_use_find_package fits CFitsio)
$(cmake-utils_use_find_package kipi KF5Kipi)
+   $(cmake-utils_use_find_package mpris Qt5DBus)
$(cmake-utils_use_find_package raw KF5KDcraw)
$(cmake-utils_use_find_package X X11)
)
 
if use semantic-desktop; then
-   mycmakeargs+=(-DGWENVIEW_SEMANTICINFO_BACKEND=Baloo)
+   mycmakeargs+=( -DGWENVIEW_SEMANTICINFO_BACKEND=Baloo )
else
-   mycmakeargs+=(-DGWENVIEW_SEMANTICINFO_BACKEND=None)
+   mycmakeargs+=( -DGWENVIEW_SEMANTICINFO_BACKEND=None )
fi
 
kde5_src_configure

diff --git a/kde-apps/gwenview/metadata.xml b/kde-apps/gwenview/metadata.xml
index 5ac564950d..fe2dcfdf86 100644
--- a/kde-apps/gwenview/metadata.xml
+++ b/kde-apps/gwenview/metadata.xml
@@ -7,6 +7,8 @@


Enable support for NASA's 
sci-libs/cfitsio library
-   Support for the KDE Image Plugin 
Interface
+   Enable support for the KDE Image Plugin 
Interface
+   Enable support for MPRIS2 interface, 
requiring dev-qt/qtdbus as dependency.
+

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

2018-08-08 Thread Andreas Sturmlechner

commit: beaf3af980898835d9621fe796abfdd1b8fac212
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Tue Aug  7 22:23:47 2018 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Wed Aug  8 08:09:50 2018 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=beaf3af9

kde-apps/gwenview: Update DESCRIPTION

Package-Manager: Portage-2.3.44, Repoman-2.3.10

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

diff --git a/kde-apps/gwenview/gwenview-.ebuild 
b/kde-apps/gwenview/gwenview-.ebuild
index 3e69f9ea24..fdd3a2a2e2 100644
--- a/kde-apps/gwenview/gwenview-.ebuild
+++ b/kde-apps/gwenview/gwenview-.ebuild
@@ -7,7 +7,7 @@ KDE_HANDBOOK="true"
 KDE_TEST="true"
 inherit kde5
 
-DESCRIPTION="KDE image viewer"
+DESCRIPTION="Image viewer by KDE"
 HOMEPAGE="
https://www.kde.org/applications/graphics/gwenview/
https://userbase.kde.org/Gwenview

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

2018-08-08 Thread Andreas Sturmlechner

commit: 848f5fbd70cf6f0018de4549e83c32c997e6a4f9
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Tue Aug  7 23:15:23 2018 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Wed Aug  8 08:10:11 2018 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=848f5fbd

kde-apps/gwenview: Disable ccache support in cmake

Package-Manager: Portage-2.3.44, Repoman-2.3.10

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

diff --git a/kde-apps/gwenview/gwenview-.ebuild 
b/kde-apps/gwenview/gwenview-.ebuild
index b6342a3478..7d906ff06e 100644
--- a/kde-apps/gwenview/gwenview-.ebuild
+++ b/kde-apps/gwenview/gwenview-.ebuild
@@ -72,6 +72,7 @@ RDEPEND="${COMMON_DEPEND}
 
 src_configure() {
local mycmakeargs=(
+   -DCCACHE_SUPPORT=OFF
$(cmake-utils_use_find_package activities KF5Activities)
$(cmake-utils_use_find_package fits CFitsio)
$(cmake-utils_use_find_package kipi KF5Kipi)

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

2018-08-08 Thread Andreas Sturmlechner

commit: e34c58f4e48f372c26d7a0a898f62d313b234cab
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Tue Aug  7 22:28:11 2018 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Wed Aug  8 08:10:10 2018 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=e34c58f4

kde-apps/gwenview: Add USE=activities

Upstream commit a00eecc78507f48843f719f32e80ae8805a34c15
Package-Manager: Portage-2.3.44, Repoman-2.3.10

 kde-apps/gwenview/gwenview-.ebuild | 5 +++--
 kde-apps/gwenview/metadata.xml | 1 +
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/kde-apps/gwenview/gwenview-.ebuild 
b/kde-apps/gwenview/gwenview-.ebuild
index fdd3a2a2e2..b6342a3478 100644
--- a/kde-apps/gwenview/gwenview-.ebuild
+++ b/kde-apps/gwenview/gwenview-.ebuild
@@ -15,13 +15,12 @@ HOMEPAGE="
 
 LICENSE="GPL-2+ handbook? ( FDL-1.2 )"
 KEYWORDS=""
-IUSE="fits kipi +mpris raw semantic-desktop X"
+IUSE="activities fits kipi +mpris raw semantic-desktop X"
 
 # requires running environment
 RESTRICT+=" test"
 
 COMMON_DEPEND="
-   $(add_frameworks_dep kactivities)
$(add_frameworks_dep kcompletion)
$(add_frameworks_dep kconfig)
$(add_frameworks_dep kconfigwidgets)
@@ -48,6 +47,7 @@ COMMON_DEPEND="
media-libs/libpng:0=
media-libs/phonon[qt5(+)]
virtual/jpeg:0
+   activities? ( $(add_frameworks_dep kactivities) )
fits? ( sci-libs/cfitsio )
kipi? ( $(add_kdeapps_dep libkipi '' '' '5=') )
mpris? ( $(add_qt_dep qtdbus) )
@@ -72,6 +72,7 @@ RDEPEND="${COMMON_DEPEND}
 
 src_configure() {
local mycmakeargs=(
+   $(cmake-utils_use_find_package activities KF5Activities)
$(cmake-utils_use_find_package fits CFitsio)
$(cmake-utils_use_find_package kipi KF5Kipi)
$(cmake-utils_use_find_package mpris Qt5DBus)

diff --git a/kde-apps/gwenview/metadata.xml b/kde-apps/gwenview/metadata.xml
index fe2dcfdf86..0bca8f5e65 100644
--- a/kde-apps/gwenview/metadata.xml
+++ b/kde-apps/gwenview/metadata.xml
@@ -6,6 +6,7 @@
Gentoo KDE Project


+   Enable kactivities support
Enable support for NASA's 
sci-libs/cfitsio library
Enable support for the KDE Image Plugin 
Interface
Enable support for MPRIS2 interface, 
requiring dev-qt/qtdbus as dependency.

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

2017-12-25 Thread Michael Palimaka

commit: 82a82db0e84662dd5604983a8d1df0a93bf8d8f4
Author: Michael Palimaka  gentoo  org>
AuthorDate: Mon Dec 25 10:23:18 2017 +
Commit: Michael Palimaka  gentoo  org>
CommitDate: Mon Dec 25 10:30:25 2017 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=82a82db0

kde-apps/gwenview: update dependencies

Package-Manager: Portage-2.3.14, Repoman-2.3.6

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

diff --git a/kde-apps/gwenview/gwenview-17.12.49..ebuild 
b/kde-apps/gwenview/gwenview-17.12.49..ebuild
index c0b1fd7a3f..1bd9116a05 100644
--- a/kde-apps/gwenview/gwenview-17.12.49..ebuild
+++ b/kde-apps/gwenview/gwenview-17.12.49..ebuild
@@ -35,9 +35,9 @@ COMMON_DEPEND="
$(add_frameworks_dep knotifications)
$(add_frameworks_dep kparts)
$(add_frameworks_dep kservice)
-   $(add_frameworks_dep ktextwidgets)
$(add_frameworks_dep kwidgetsaddons)
$(add_frameworks_dep kxmlgui)
+   $(add_frameworks_dep solid)
$(add_qt_dep qtgui)
$(add_qt_dep qtopengl)
$(add_qt_dep qtprintsupport)

diff --git a/kde-apps/gwenview/gwenview-.ebuild 
b/kde-apps/gwenview/gwenview-.ebuild
index c0b1fd7a3f..1bd9116a05 100644
--- a/kde-apps/gwenview/gwenview-.ebuild
+++ b/kde-apps/gwenview/gwenview-.ebuild
@@ -35,9 +35,9 @@ COMMON_DEPEND="
$(add_frameworks_dep knotifications)
$(add_frameworks_dep kparts)
$(add_frameworks_dep kservice)
-   $(add_frameworks_dep ktextwidgets)
$(add_frameworks_dep kwidgetsaddons)
$(add_frameworks_dep kxmlgui)
+   $(add_frameworks_dep solid)
$(add_qt_dep qtgui)
$(add_qt_dep qtopengl)
$(add_qt_dep qtprintsupport)

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

2017-10-28 Thread Andreas Sturmlechner

commit: 795d21efcf99d0edd0b3626b36f8ae815bca260d
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Sat Oct 28 11:05:28 2017 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Sat Oct 28 12:35:34 2017 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=795d21ef

kde-apps/gwenview: Patch upstreamed

Package-Manager: Portage-2.3.13, Repoman-2.3.4

 .../gwenview/files/gwenview-17.11.80-cfitsio.patch | 172 -
 kde-apps/gwenview/gwenview-.ebuild |   2 -
 2 files changed, 174 deletions(-)

diff --git a/kde-apps/gwenview/files/gwenview-17.11.80-cfitsio.patch 
b/kde-apps/gwenview/files/gwenview-17.11.80-cfitsio.patch
deleted file mode 100644
index aa56d94755..00
--- a/kde-apps/gwenview/files/gwenview-17.11.80-cfitsio.patch
+++ /dev/null
@@ -1,172 +0,0 @@
-From 48f0fa32a451bd25378a63d7caa39b7a13a78f49 Mon Sep 17 00:00:00 2001
-From: Andreas Sturmlechner 
-Date: Sun, 22 Oct 2017 14:23:41 +0200
-Subject: [PATCH] Make CFitsio optional
-

- CMakeLists.txt |  5 -
- app/main.cpp   |  6 +-
- config-gwenview.h.cmake|  1 +
- lib/CMakeLists.txt | 29 ++---
- lib/imagemetainfomodel.cpp |  7 +--
- 5 files changed, 37 insertions(+), 11 deletions(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 8dd8d5e1..2ddb8c10 100644
 a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -99,7 +99,10 @@ find_package(Exiv2)
- set_package_properties(Exiv2 PROPERTIES URL "http://www.exiv2.org; 
DESCRIPTION "image metadata support" TYPE REQUIRED)
- 
- find_package(CFitsio)
--set_package_properties(CFitsio PROPERTIES URL 
"http://heasarc.gsfc.nasa.gov/fitsio/fitsio.html; DESCRIPTION "FITS format 
support" TYPE REQUIRED)
-+set_package_properties(CFitsio PROPERTIES URL 
"http://heasarc.gsfc.nasa.gov/fitsio/fitsio.html; DESCRIPTION "FITS format 
support" TYPE OPTIONAL)
-+if(CFITSIO_FOUND)
-+set(HAVE_FITS true)
-+endif()
- 
- find_package(KF5Kipi)
- if (KF5Kipi_FOUND)
-diff --git a/app/main.cpp b/app/main.cpp
-index 662dcd7b..e844668c 100644
 a/app/main.cpp
-+++ b/app/main.cpp
-@@ -40,12 +40,14 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, 
MA  02110-1301, USA.
- #include 
- #include "mainwindow.h"
- 
-+#ifdef HAVE_FITS
- // This hack is needed to include the fitsplugin moc file in main.cpp
- // Otherwise the linker complains about: undefined reference to 
`qt_static_plugin_FitsPlugin()'
- // This symbol is defined in the moc file, but it is not a visible symbol 
after libgwenview is linked.
- // If Q_IMPORT_PLUGIN(FitsPlugin) is moved to the library, gwenview crashes 
on the first call to FitsPlugin()
- // when the vtable is looked up in the plugin registration.
- #include <../lib/imageformats/moc_fitsplugin.cpp>
-+#endif
- 
- class StartHelper
- {
-@@ -165,4 +167,6 @@ int main(int argc, char *argv[])
- return app.exec();
- }
- 
--Q_IMPORT_PLUGIN(FitsPlugin)
-+#ifdef HAVE_FITS
-+Q_IMPORT_PLUGIN(FitsPlugin)
-+#endif
-diff --git a/config-gwenview.h.cmake b/config-gwenview.h.cmake
-index 21e7ca98..80dc9cac 100644
 a/config-gwenview.h.cmake
-+++ b/config-gwenview.h.cmake
-@@ -4,3 +4,4 @@
- #cmakedefine KIPI_FOUND 1
- #define GV_TEST_DATA_DIR "@CMAKE_CURRENT_SOURCE_DIR@/tests/data"
- #cmakedefine HAVE_X11 ${HAVE_X11}
-+#cmakedefine HAVE_FITS ${HAVE_FITS}
-diff --git a/lib/CMakeLists.txt b/lib/CMakeLists.txt
-index e1893d71..2f5ce417 100644
 a/lib/CMakeLists.txt
-+++ b/lib/CMakeLists.txt
-@@ -56,9 +56,14 @@ include_directories(
- ${EXIV2_INCLUDE_DIR}
- ${JPEG_INCLUDE_DIR}
- ${PNG_INCLUDE_DIRS}
--${CFITSIO_INCLUDE_DIR}
- )
- 
-+if(HAVE_FITS)
-+include_directories(
-+${CFITSIO_INCLUDE_DIR}
-+)
-+endif()
-+
- # For config-gwenview.h
- include_directories(
- ${CMAKE_CURRENT_BINARY_DIR}/..
-@@ -124,11 +129,6 @@ set(gwenviewlib_SRCS
- imageformats/imageformats.cpp
- # imageformats/jpegplugin.cpp
- # imageformats/jpeghandler.cpp
--imageformats/fitsplugin.cpp
--imageformats/fitsplugin.h
--imageformats/fitshandler.cpp
--imageformats/fitsformat/bayer.c
--imageformats/fitsformat/fitsdata.cpp
- imagemetainfomodel.cpp
- imagescaler.cpp
- imageutils.cpp
-@@ -175,6 +175,17 @@ set(gwenviewlib_SRCS
- ${GV_JPEG_DIR}/transupp.c
- )
- 
-+if(HAVE_FITS)
-+set(gwenviewlib_SRCS
-+${gwenviewlib_SRCS}
-+imageformats/fitsplugin.cpp
-+imageformats/fitsplugin.h
-+imageformats/fitshandler.cpp
-+imageformats/fitsformat/bayer.c
-+imageformats/fitsformat/fitsdata.cpp
-+)
-+endif()
-+
- if (NOT GWENVIEW_SEMANTICINFO_BACKEND_NONE)
- set(gwenviewlib_SRCS
- ${gwenviewlib_SRCS}
-@@ -241,8 +252,12 @@ target_link_libraries(gwenviewlib
- ${PNG_LIBRARIES}
- ${LCMS2_LIBRARIES}
- ${PHONON_LIBRARY}
--${CFITSIO_LIBRARIES}
- )
-+
-+if(HAVE_FITS)
-+target_link_libraries(gwenviewlib

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

2017-10-22 Thread Andreas Sturmlechner

commit: ae4172895d1de98be7727abff3171cd7d226498f
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Sun Oct 22 13:58:41 2017 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Sun Oct 22 13:58:41 2017 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=ae417289

kde-apps/gwenview: Add USE=fits, bug #632200

Package-Manager: Portage-2.3.12, Repoman-2.3.3

 .../gwenview/files/gwenview-17.11.80-cfitsio.patch | 172 +
 kde-apps/gwenview/gwenview-.ebuild |   6 +-
 kde-apps/gwenview/metadata.xml |   1 +
 3 files changed, 178 insertions(+), 1 deletion(-)

diff --git a/kde-apps/gwenview/files/gwenview-17.11.80-cfitsio.patch 
b/kde-apps/gwenview/files/gwenview-17.11.80-cfitsio.patch
new file mode 100644
index 00..aa56d94755
--- /dev/null
+++ b/kde-apps/gwenview/files/gwenview-17.11.80-cfitsio.patch
@@ -0,0 +1,172 @@
+From 48f0fa32a451bd25378a63d7caa39b7a13a78f49 Mon Sep 17 00:00:00 2001
+From: Andreas Sturmlechner 
+Date: Sun, 22 Oct 2017 14:23:41 +0200
+Subject: [PATCH] Make CFitsio optional
+
+---
+ CMakeLists.txt |  5 -
+ app/main.cpp   |  6 +-
+ config-gwenview.h.cmake|  1 +
+ lib/CMakeLists.txt | 29 ++---
+ lib/imagemetainfomodel.cpp |  7 +--
+ 5 files changed, 37 insertions(+), 11 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 8dd8d5e1..2ddb8c10 100644
+--- a/CMakeLists.txt
 b/CMakeLists.txt
+@@ -99,7 +99,10 @@ find_package(Exiv2)
+ set_package_properties(Exiv2 PROPERTIES URL "http://www.exiv2.org; 
DESCRIPTION "image metadata support" TYPE REQUIRED)
+ 
+ find_package(CFitsio)
+-set_package_properties(CFitsio PROPERTIES URL 
"http://heasarc.gsfc.nasa.gov/fitsio/fitsio.html; DESCRIPTION "FITS format 
support" TYPE REQUIRED)
++set_package_properties(CFitsio PROPERTIES URL 
"http://heasarc.gsfc.nasa.gov/fitsio/fitsio.html; DESCRIPTION "FITS format 
support" TYPE OPTIONAL)
++if(CFITSIO_FOUND)
++set(HAVE_FITS true)
++endif()
+ 
+ find_package(KF5Kipi)
+ if (KF5Kipi_FOUND)
+diff --git a/app/main.cpp b/app/main.cpp
+index 662dcd7b..e844668c 100644
+--- a/app/main.cpp
 b/app/main.cpp
+@@ -40,12 +40,14 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, 
MA  02110-1301, USA.
+ #include 
+ #include "mainwindow.h"
+ 
++#ifdef HAVE_FITS
+ // This hack is needed to include the fitsplugin moc file in main.cpp
+ // Otherwise the linker complains about: undefined reference to 
`qt_static_plugin_FitsPlugin()'
+ // This symbol is defined in the moc file, but it is not a visible symbol 
after libgwenview is linked.
+ // If Q_IMPORT_PLUGIN(FitsPlugin) is moved to the library, gwenview crashes 
on the first call to FitsPlugin()
+ // when the vtable is looked up in the plugin registration.
+ #include <../lib/imageformats/moc_fitsplugin.cpp>
++#endif
+ 
+ class StartHelper
+ {
+@@ -165,4 +167,6 @@ int main(int argc, char *argv[])
+ return app.exec();
+ }
+ 
+-Q_IMPORT_PLUGIN(FitsPlugin)
++#ifdef HAVE_FITS
++Q_IMPORT_PLUGIN(FitsPlugin)
++#endif
+diff --git a/config-gwenview.h.cmake b/config-gwenview.h.cmake
+index 21e7ca98..80dc9cac 100644
+--- a/config-gwenview.h.cmake
 b/config-gwenview.h.cmake
+@@ -4,3 +4,4 @@
+ #cmakedefine KIPI_FOUND 1
+ #define GV_TEST_DATA_DIR "@CMAKE_CURRENT_SOURCE_DIR@/tests/data"
+ #cmakedefine HAVE_X11 ${HAVE_X11}
++#cmakedefine HAVE_FITS ${HAVE_FITS}
+diff --git a/lib/CMakeLists.txt b/lib/CMakeLists.txt
+index e1893d71..2f5ce417 100644
+--- a/lib/CMakeLists.txt
 b/lib/CMakeLists.txt
+@@ -56,9 +56,14 @@ include_directories(
+ ${EXIV2_INCLUDE_DIR}
+ ${JPEG_INCLUDE_DIR}
+ ${PNG_INCLUDE_DIRS}
+-${CFITSIO_INCLUDE_DIR}
+ )
+ 
++if(HAVE_FITS)
++include_directories(
++${CFITSIO_INCLUDE_DIR}
++)
++endif()
++
+ # For config-gwenview.h
+ include_directories(
+ ${CMAKE_CURRENT_BINARY_DIR}/..
+@@ -124,11 +129,6 @@ set(gwenviewlib_SRCS
+ imageformats/imageformats.cpp
+ # imageformats/jpegplugin.cpp
+ # imageformats/jpeghandler.cpp
+-imageformats/fitsplugin.cpp
+-imageformats/fitsplugin.h
+-imageformats/fitshandler.cpp
+-imageformats/fitsformat/bayer.c
+-imageformats/fitsformat/fitsdata.cpp
+ imagemetainfomodel.cpp
+ imagescaler.cpp
+ imageutils.cpp
+@@ -175,6 +175,17 @@ set(gwenviewlib_SRCS
+ ${GV_JPEG_DIR}/transupp.c
+ )
+ 
++if(HAVE_FITS)
++set(gwenviewlib_SRCS
++${gwenviewlib_SRCS}
++imageformats/fitsplugin.cpp
++imageformats/fitsplugin.h
++imageformats/fitshandler.cpp
++imageformats/fitsformat/bayer.c
++imageformats/fitsformat/fitsdata.cpp
++)
++endif()
++
+ if (NOT GWENVIEW_SEMANTICINFO_BACKEND_NONE)
+ set(gwenviewlib_SRCS
+ ${gwenviewlib_SRCS}
+@@ -241,8 +252,12 @@ target_link_libraries(gwenviewlib
+ ${PNG_LIBRARIES}
+ ${LCMS2_LIBRARIES}
+ ${PHONON_LIBRARY}
+-

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

2017-02-05 Thread Andreas Sturmlechner

commit: 6cf40c5757760efbb5abb2c28d386c6ccf9948bb
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Sun Feb  5 15:21:00 2017 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Sun Feb  5 15:21:00 2017 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=6cf40c57

kde-apps/gwenview: Re-add pkg_postinst info about kipi-plugins,svgpart

Gentoo-bug: 608308

Package-Manager: portage-2.3.3

 kde-apps/gwenview/gwenview-16.12.49..ebuild | 12 
 kde-apps/gwenview/gwenview-.ebuild  | 12 
 2 files changed, 24 insertions(+)

diff --git a/kde-apps/gwenview/gwenview-16.12.49..ebuild 
b/kde-apps/gwenview/gwenview-16.12.49..ebuild
index 258b53a..e85f409 100644
--- a/kde-apps/gwenview/gwenview-16.12.49..ebuild
+++ b/kde-apps/gwenview/gwenview-16.12.49..ebuild
@@ -84,3 +84,15 @@ src_configure() {
 
kde5_src_configure
 }
+
+pkg_postinst() {
+   kde5_pkg_postinst
+
+   if ! has_version kde-apps/svgpart:${SLOT} ; then
+   elog "For SVG support, install kde-apps/svgpart:${SLOT}"
+   fi
+
+   if use kipi && ! has_version media-plugins/kipi-plugins ; then
+   elog "Plugins for the KIPI interface can be found in 
media-plugins/kipi-plugins"
+   fi
+}

diff --git a/kde-apps/gwenview/gwenview-.ebuild 
b/kde-apps/gwenview/gwenview-.ebuild
index 483763d..8bac9e0 100644
--- a/kde-apps/gwenview/gwenview-.ebuild
+++ b/kde-apps/gwenview/gwenview-.ebuild
@@ -84,3 +84,15 @@ src_configure() {
 
kde5_src_configure
 }
+
+pkg_postinst() {
+   kde5_pkg_postinst
+
+   if ! has_version kde-apps/svgpart:${SLOT} ; then
+   elog "For SVG support, install kde-apps/svgpart:${SLOT}"
+   fi
+
+   if use kipi && ! has_version media-plugins/kipi-plugins ; then
+   elog "Plugins for the KIPI interface can be found in 
media-plugins/kipi-plugins"
+   fi
+}

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

2017-01-22 Thread Andreas Sturmlechner

commit: 31886180c47a1e7001d2134b42c55a8439298a75
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Sun Jan 22 20:30:42 2017 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Sun Jan 22 20:30:54 2017 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=31886180

kde-apps/gwenview: Fix DEPENDs

Package-Manager: portage-2.3.0

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

diff --git a/kde-apps/gwenview/gwenview-.ebuild 
b/kde-apps/gwenview/gwenview-.ebuild
index 258b53a..483763d 100644
--- a/kde-apps/gwenview/gwenview-.ebuild
+++ b/kde-apps/gwenview/gwenview-.ebuild
@@ -27,7 +27,6 @@ COMMON_DEPEND="
$(add_frameworks_dep kconfig)
$(add_frameworks_dep kconfigwidgets)
$(add_frameworks_dep kcoreaddons)
-   $(add_frameworks_dep kdelibs4support)
$(add_frameworks_dep ki18n)
$(add_frameworks_dep kiconthemes)
$(add_frameworks_dep kio)
@@ -62,6 +61,7 @@ COMMON_DEPEND="
)
 "
 DEPEND="${COMMON_DEPEND}
+   $(add_frameworks_dep kwindowsystem)
$(add_qt_dep qtconcurrent)
 "
 RDEPEND="${COMMON_DEPEND}

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

2016-12-03 Thread Johannes Huber

commit: 4c50a04da2ce4c06a656b0813df30f622589615a
Author: Andreas Sturmlechner  gmail  com>
AuthorDate: Sat Dec  3 11:06:11 2016 +
Commit: Johannes Huber  gentoo  org>
CommitDate: Sat Dec  3 12:50:37 2016 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=4c50a04d

kde-apps/gwenview: Drop back min Qt dep to 5.6

Upstream commit 304e496a87d3a9268f52b1d5875179c0fbee2c19

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

 kde-apps/gwenview/gwenview-16.12.49..ebuild | 1 -
 kde-apps/gwenview/gwenview-.ebuild  | 1 -
 2 files changed, 2 deletions(-)

diff --git a/kde-apps/gwenview/gwenview-16.12.49..ebuild 
b/kde-apps/gwenview/gwenview-16.12.49..ebuild
index d6698f1..18ad026 100644
--- a/kde-apps/gwenview/gwenview-16.12.49..ebuild
+++ b/kde-apps/gwenview/gwenview-16.12.49..ebuild
@@ -6,7 +6,6 @@ EAPI=6
 
 KDE_HANDBOOK="true"
 KDE_TEST="true"
-QT_MINIMAL="5.7.0"
 inherit kde5
 
 DESCRIPTION="KDE image viewer"

diff --git a/kde-apps/gwenview/gwenview-.ebuild 
b/kde-apps/gwenview/gwenview-.ebuild
index d6698f1..18ad026 100644
--- a/kde-apps/gwenview/gwenview-.ebuild
+++ b/kde-apps/gwenview/gwenview-.ebuild
@@ -6,7 +6,6 @@ EAPI=6
 
 KDE_HANDBOOK="true"
 KDE_TEST="true"
-QT_MINIMAL="5.7.0"
 inherit kde5
 
 DESCRIPTION="KDE image viewer"

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

2016-11-26 Thread Michael Palimaka

commit: 04292b031e4e7bbf18758cf83df9123bd278119d
Author: Andreas Sturmlechner  gmail  com>
AuthorDate: Fri Nov 25 11:02:04 2016 +
Commit: Michael Palimaka  gentoo  org>
CommitDate: Sat Nov 26 16:30:52 2016 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=04292b03

kde-apps/gwenview: Drop unused cmake variable

KDE-bug: 343105
Upstream-commit: b73a9272688ca64c8f98c3d47a211ab3ccbfbaef
Upstrema-commit: 4dc18b994558cbc88d8f1a701247ece3868682a8

Package-Manager: portage-2.3.0

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

diff --git a/kde-apps/gwenview/gwenview-16.12.49..ebuild 
b/kde-apps/gwenview/gwenview-16.12.49..ebuild
index d55041e..d6698f1 100644
--- a/kde-apps/gwenview/gwenview-16.12.49..ebuild
+++ b/kde-apps/gwenview/gwenview-16.12.49..ebuild
@@ -20,7 +20,7 @@ KEYWORDS=""
 IUSE="kipi raw semantic-desktop X"
 
 # requires running environment
-RESTRICT="test"
+RESTRICT+=" test"
 
 COMMON_DEPEND="
$(add_frameworks_dep kactivities)
@@ -77,11 +77,6 @@ src_configure() {
$(cmake-utils_use_find_package X X11)
)
 
-   # Workaround for bug #479510
-   if [[ -e ${EPREFIX}/usr/include/${CHOST}/jconfig.h ]]; then
-   mycmakeargs+=( 
-DJCONFIG_H="${EPREFIX}/usr/include/${CHOST}/jconfig.h" )
-   fi
-
if use semantic-desktop; then
mycmakeargs+=(-DGWENVIEW_SEMANTICINFO_BACKEND=Baloo)
else

diff --git a/kde-apps/gwenview/gwenview-.ebuild 
b/kde-apps/gwenview/gwenview-.ebuild
index d55041e..d6698f1 100644
--- a/kde-apps/gwenview/gwenview-.ebuild
+++ b/kde-apps/gwenview/gwenview-.ebuild
@@ -20,7 +20,7 @@ KEYWORDS=""
 IUSE="kipi raw semantic-desktop X"
 
 # requires running environment
-RESTRICT="test"
+RESTRICT+=" test"
 
 COMMON_DEPEND="
$(add_frameworks_dep kactivities)
@@ -77,11 +77,6 @@ src_configure() {
$(cmake-utils_use_find_package X X11)
)
 
-   # Workaround for bug #479510
-   if [[ -e ${EPREFIX}/usr/include/${CHOST}/jconfig.h ]]; then
-   mycmakeargs+=( 
-DJCONFIG_H="${EPREFIX}/usr/include/${CHOST}/jconfig.h" )
-   fi
-
if use semantic-desktop; then
mycmakeargs+=(-DGWENVIEW_SEMANTICINFO_BACKEND=Baloo)
else

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

2016-09-14 Thread Michael Palimaka

commit: 4430f3f4ec5804f5501d721ae452abfce4fdaef9
Author: Michael Palimaka  gentoo  org>
AuthorDate: Wed Sep 14 17:15:15 2016 +
Commit: Michael Palimaka  gentoo  org>
CommitDate: Wed Sep 14 17:15:38 2016 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=4430f3f4

kde-apps/gwenview: raise minimum Qt dependency

Upstream-commit: b8d109cc19f06b1711ad7a82dde6ccf703e93691

Package-Manager: portage-2.3.0

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

diff --git a/kde-apps/gwenview/gwenview-.ebuild 
b/kde-apps/gwenview/gwenview-.ebuild
index b76c08d..d55041e 100644
--- a/kde-apps/gwenview/gwenview-.ebuild
+++ b/kde-apps/gwenview/gwenview-.ebuild
@@ -6,6 +6,7 @@ EAPI=6
 
 KDE_HANDBOOK="true"
 KDE_TEST="true"
+QT_MINIMAL="5.7.0"
 inherit kde5
 
 DESCRIPTION="KDE image viewer"

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

2016-08-25 Thread Michael Palimaka

commit: 08f001047c3e2d27a34332a6767d32162bacd252
Author: Michael Palimaka  gentoo  org>
AuthorDate: Thu Aug 25 19:21:29 2016 +
Commit: Michael Palimaka  gentoo  org>
CommitDate: Thu Aug 25 19:21:33 2016 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=08f00104

kde-apps/gwenview: add LICENSE

Package-Manager: portage-2.3.0

 kde-apps/gwenview/gwenview-16.08.0.ebuild   | 2 ++
 kde-apps/gwenview/gwenview-16.08.49..ebuild | 2 ++
 kde-apps/gwenview/gwenview-.ebuild  | 2 ++
 3 files changed, 6 insertions(+)

diff --git a/kde-apps/gwenview/gwenview-16.08.0.ebuild 
b/kde-apps/gwenview/gwenview-16.08.0.ebuild
index d9eb570..514599b 100644
--- a/kde-apps/gwenview/gwenview-16.08.0.ebuild
+++ b/kde-apps/gwenview/gwenview-16.08.0.ebuild
@@ -13,6 +13,8 @@ HOMEPAGE="
https://www.kde.org/applications/graphics/gwenview/
https://userbase.kde.org/Gwenview
 "
+
+LICENSE="GPL-2+ handbook? ( FDL-1.2 )"
 KEYWORDS="~amd64 ~x86"
 IUSE="kipi raw semantic-desktop X"
 

diff --git a/kde-apps/gwenview/gwenview-16.08.49..ebuild 
b/kde-apps/gwenview/gwenview-16.08.49..ebuild
index 730bb6b..b76c08d 100644
--- a/kde-apps/gwenview/gwenview-16.08.49..ebuild
+++ b/kde-apps/gwenview/gwenview-16.08.49..ebuild
@@ -13,6 +13,8 @@ HOMEPAGE="
https://www.kde.org/applications/graphics/gwenview/
https://userbase.kde.org/Gwenview
 "
+
+LICENSE="GPL-2+ handbook? ( FDL-1.2 )"
 KEYWORDS=""
 IUSE="kipi raw semantic-desktop X"
 

diff --git a/kde-apps/gwenview/gwenview-.ebuild 
b/kde-apps/gwenview/gwenview-.ebuild
index 730bb6b..b76c08d 100644
--- a/kde-apps/gwenview/gwenview-.ebuild
+++ b/kde-apps/gwenview/gwenview-.ebuild
@@ -13,6 +13,8 @@ HOMEPAGE="
https://www.kde.org/applications/graphics/gwenview/
https://userbase.kde.org/Gwenview
 "
+
+LICENSE="GPL-2+ handbook? ( FDL-1.2 )"
 KEYWORDS=""
 IUSE="kipi raw semantic-desktop X"

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

2016-03-25 Thread Michael Palimaka

commit: 196a560908f9da08facafc7cac27931fc5cfe431
Author: Andreas Sturmlechner  gmail  com>
AuthorDate: Thu Mar 24 10:40:23 2016 +
Commit: Michael Palimaka  gentoo  org>
CommitDate: Fri Mar 25 13:21:47 2016 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=196a5609

kde-apps/gwenview: Add subslot operator on kde-apps/libkipi

Package-Manager: portage-2.2.27

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

diff --git a/kde-apps/gwenview/gwenview-16.04.49..ebuild 
b/kde-apps/gwenview/gwenview-16.04.49..ebuild
index d228f7e..730bb6b 100644
--- a/kde-apps/gwenview/gwenview-16.04.49..ebuild
+++ b/kde-apps/gwenview/gwenview-16.04.49..ebuild
@@ -48,7 +48,7 @@ COMMON_DEPEND="
media-libs/libpng:0=
media-libs/phonon[qt5]
virtual/jpeg:0
-   kipi? ( $(add_kdeapps_dep libkipi) )
+   kipi? ( $(add_kdeapps_dep libkipi '' '' '5=') )
raw? ( $(add_kdeapps_dep libkdcraw) )
semantic-desktop? (
$(add_frameworks_dep baloo)

diff --git a/kde-apps/gwenview/gwenview-.ebuild 
b/kde-apps/gwenview/gwenview-.ebuild
index d228f7e..730bb6b 100644
--- a/kde-apps/gwenview/gwenview-.ebuild
+++ b/kde-apps/gwenview/gwenview-.ebuild
@@ -48,7 +48,7 @@ COMMON_DEPEND="
media-libs/libpng:0=
media-libs/phonon[qt5]
virtual/jpeg:0
-   kipi? ( $(add_kdeapps_dep libkipi) )
+   kipi? ( $(add_kdeapps_dep libkipi '' '' '5=') )
raw? ( $(add_kdeapps_dep libkdcraw) )
semantic-desktop? (
$(add_frameworks_dep baloo)

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

2015-10-11 Thread Michael Palimaka

commit: fccba6ae3a4d2d65ebdd917926ec3654b6ddbe1a
Author: Andreas Sturmlechner  gmail  com>
AuthorDate: Sat Oct 10 12:51:00 2015 +
Commit: Michael Palimaka  gentoo  org>
CommitDate: Sun Oct 11 06:54:17 2015 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=fccba6ae

kde-apps/gwenview: Drop upstreamed patch

Package-Manager: portage-2.2.20.1

 kde-apps/gwenview/gwenview-15.08.49..ebuild | 2 --
 kde-apps/gwenview/gwenview-.ebuild  | 2 --
 2 files changed, 4 deletions(-)

diff --git a/kde-apps/gwenview/gwenview-15.08.49..ebuild 
b/kde-apps/gwenview/gwenview-15.08.49..ebuild
index 96305e4..1e883a2 100644
--- a/kde-apps/gwenview/gwenview-15.08.49..ebuild
+++ b/kde-apps/gwenview/gwenview-15.08.49..ebuild
@@ -60,8 +60,6 @@ RDEPEND="${COMMON_DEPEND}
dev-qt/qtimageformats:5
 "
 
-PATCHES=( "${FILESDIR}/${PN}-15.08.1-fix-menu-items.patch" )
-
 src_configure() {
local mycmakeargs=(
$(cmake-utils_use_find_package kipi KF5Kipi)

diff --git a/kde-apps/gwenview/gwenview-.ebuild 
b/kde-apps/gwenview/gwenview-.ebuild
index 96305e4..1e883a2 100644
--- a/kde-apps/gwenview/gwenview-.ebuild
+++ b/kde-apps/gwenview/gwenview-.ebuild
@@ -60,8 +60,6 @@ RDEPEND="${COMMON_DEPEND}
dev-qt/qtimageformats:5
 "
 
-PATCHES=( "${FILESDIR}/${PN}-15.08.1-fix-menu-items.patch" )
-
 src_configure() {
local mycmakeargs=(
$(cmake-utils_use_find_package kipi KF5Kipi)

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

2015-10-05 Thread Manuel Rüger

commit: a4b9c392c7247251e93221b40679c4cea3f004dd
Author: Andreas Sturmlechner  gmail  com>
AuthorDate: Sun Oct  4 16:23:48 2015 +
Commit: Manuel Rüger  gentoo  org>
CommitDate: Mon Oct  5 20:26:27 2015 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=a4b9c392

kde-apps/gwenview: Add missing RDEPENDs

dev-qt/qtimageformats required for TIFF, TGA, MNG, ...
kde-frameworks/kimageformats required for EPS, PCX, XCF, ...

Package-Manager: portage-2.2.20.1

 .../{gwenview-15.08.1.ebuild => gwenview-15.08.1-r1.ebuild}  | 9 ++---
 kde-apps/gwenview/gwenview-15.08.49..ebuild  | 9 ++---
 kde-apps/gwenview/gwenview-.ebuild   | 9 ++---
 3 files changed, 18 insertions(+), 9 deletions(-)

diff --git a/kde-apps/gwenview/gwenview-15.08.1.ebuild 
b/kde-apps/gwenview/gwenview-15.08.1-r1.ebuild
similarity index 93%
rename from kde-apps/gwenview/gwenview-15.08.1.ebuild
rename to kde-apps/gwenview/gwenview-15.08.1-r1.ebuild
index 6de3e1f..52904c4 100644
--- a/kde-apps/gwenview/gwenview-15.08.1.ebuild
+++ b/kde-apps/gwenview/gwenview-15.08.1-r1.ebuild
@@ -16,7 +16,7 @@ IUSE="kipi raw semantic-desktop X"
 # requires running environment
 RESTRICT="test"
 
-RDEPEND="
+COMMON_DEPEND="
$(add_frameworks_dep kactivities)
$(add_frameworks_dep kcompletion)
$(add_frameworks_dep kconfig)
@@ -52,10 +52,13 @@ RDEPEND="
x11-libs/libX11
)
 "
-
-DEPEND="${RDEPEND}
+DEPEND="${COMMON_DEPEND}
dev-qt/qtconcurrent:5
 "
+RDEPEND="${COMMON_DEPEND}
+   $(add_frameworks_dep kimageformats)
+   dev-qt/qtimageformats:5
+"
 
 PATCHES=( "${FILESDIR}/${PN}-15.08.1-fix-menu-items.patch" )
 

diff --git a/kde-apps/gwenview/gwenview-15.08.49..ebuild 
b/kde-apps/gwenview/gwenview-15.08.49..ebuild
index 6a65d05..96305e4 100644
--- a/kde-apps/gwenview/gwenview-15.08.49..ebuild
+++ b/kde-apps/gwenview/gwenview-15.08.49..ebuild
@@ -16,7 +16,7 @@ IUSE="kipi raw semantic-desktop X"
 # requires running environment
 RESTRICT="test"
 
-RDEPEND="
+COMMON_DEPEND="
$(add_frameworks_dep kactivities)
$(add_frameworks_dep kcompletion)
$(add_frameworks_dep kconfig)
@@ -52,10 +52,13 @@ RDEPEND="
x11-libs/libX11
)
 "
-
-DEPEND="${RDEPEND}
+DEPEND="${COMMON_DEPEND}
dev-qt/qtconcurrent:5
 "
+RDEPEND="${COMMON_DEPEND}
+   $(add_frameworks_dep kimageformats)
+   dev-qt/qtimageformats:5
+"
 
 PATCHES=( "${FILESDIR}/${PN}-15.08.1-fix-menu-items.patch" )
 

diff --git a/kde-apps/gwenview/gwenview-.ebuild 
b/kde-apps/gwenview/gwenview-.ebuild
index 6a65d05..96305e4 100644
--- a/kde-apps/gwenview/gwenview-.ebuild
+++ b/kde-apps/gwenview/gwenview-.ebuild
@@ -16,7 +16,7 @@ IUSE="kipi raw semantic-desktop X"
 # requires running environment
 RESTRICT="test"
 
-RDEPEND="
+COMMON_DEPEND="
$(add_frameworks_dep kactivities)
$(add_frameworks_dep kcompletion)
$(add_frameworks_dep kconfig)
@@ -52,10 +52,13 @@ RDEPEND="
x11-libs/libX11
)
 "
-
-DEPEND="${RDEPEND}
+DEPEND="${COMMON_DEPEND}
dev-qt/qtconcurrent:5
 "
+RDEPEND="${COMMON_DEPEND}
+   $(add_frameworks_dep kimageformats)
+   dev-qt/qtimageformats:5
+"
 
 PATCHES=( "${FILESDIR}/${PN}-15.08.1-fix-menu-items.patch" )

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

2015-09-19 Thread Manuel Rüger

commit: 027e9b6b0d347cb91cf445c725d09548b48a45af
Author: Andreas Sturmlechner  gmail  com>
AuthorDate: Fri Sep 18 21:22:36 2015 +
Commit: Manuel Rüger  gentoo  org>
CommitDate: Sat Sep 19 14:02:14 2015 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=027e9b6b

kde-apps/gwenview: Fix missing menu items

Upstream bug: https://bugs.kde.org/show_bug.cgi?id=351431
Bad commit: 
https://quickgit.kde.org/?p=gwenview.git=commit=78e4e57af3a5476dd949797c559a3d25d8ce50a1

Package-Manager: portage-2.2.20.1

 .../gwenview/files/gwenview-15.08.1-fix-menu-items.patch | 12 
 kde-apps/gwenview/gwenview-15.08.1.ebuild|  2 ++
 kde-apps/gwenview/gwenview-15.08.49..ebuild  |  2 ++
 kde-apps/gwenview/gwenview-.ebuild   |  2 ++
 4 files changed, 18 insertions(+)

diff --git a/kde-apps/gwenview/files/gwenview-15.08.1-fix-menu-items.patch 
b/kde-apps/gwenview/files/gwenview-15.08.1-fix-menu-items.patch
new file mode 100644
index 000..2433fb8
--- /dev/null
+++ b/kde-apps/gwenview/files/gwenview-15.08.1-fix-menu-items.patch
@@ -0,0 +1,12 @@
+--- a/app/CMakeLists.txt   2015-09-18 23:08:00.449716542 +0200
 b/app/CMakeLists.txt   2015-09-18 23:11:31.939072561 +0200
+@@ -88,7 +88,8 @@
+ ${KDE_INSTALL_TARGETS_DEFAULT_ARGS})
+ 
+ install(FILES gwenviewui.rc
+-DESTINATION ${KDE_INSTALL_KXMLGUI5DIR}/gwenview)
++DESTINATION ${KDE_INSTALL_KXMLGUI5DIR}/org.kde.gwenview
++RENAME org.kde.gwenviewui.rc)
+ 
+ install(PROGRAMS org.kde.gwenview.desktop
+ DESTINATION ${KDE_INSTALL_APPDIR})

diff --git a/kde-apps/gwenview/gwenview-15.08.1.ebuild 
b/kde-apps/gwenview/gwenview-15.08.1.ebuild
index ddcbb9b..6de3e1f 100644
--- a/kde-apps/gwenview/gwenview-15.08.1.ebuild
+++ b/kde-apps/gwenview/gwenview-15.08.1.ebuild
@@ -57,6 +57,8 @@ DEPEND="${RDEPEND}
dev-qt/qtconcurrent:5
 "
 
+PATCHES=( "${FILESDIR}/${PN}-15.08.1-fix-menu-items.patch" )
+
 src_configure() {
local mycmakeargs=(
$(cmake-utils_use_find_package kipi KF5Kipi)

diff --git a/kde-apps/gwenview/gwenview-15.08.49..ebuild 
b/kde-apps/gwenview/gwenview-15.08.49..ebuild
index f6cfc66..6a65d05 100644
--- a/kde-apps/gwenview/gwenview-15.08.49..ebuild
+++ b/kde-apps/gwenview/gwenview-15.08.49..ebuild
@@ -57,6 +57,8 @@ DEPEND="${RDEPEND}
dev-qt/qtconcurrent:5
 "
 
+PATCHES=( "${FILESDIR}/${PN}-15.08.1-fix-menu-items.patch" )
+
 src_configure() {
local mycmakeargs=(
$(cmake-utils_use_find_package kipi KF5Kipi)

diff --git a/kde-apps/gwenview/gwenview-.ebuild 
b/kde-apps/gwenview/gwenview-.ebuild
index f6cfc66..6a65d05 100644
--- a/kde-apps/gwenview/gwenview-.ebuild
+++ b/kde-apps/gwenview/gwenview-.ebuild
@@ -57,6 +57,8 @@ DEPEND="${RDEPEND}
dev-qt/qtconcurrent:5
 "
 
+PATCHES=( "${FILESDIR}/${PN}-15.08.1-fix-menu-items.patch" )
+
 src_configure() {
local mycmakeargs=(
$(cmake-utils_use_find_package kipi KF5Kipi)

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

2015-09-09 Thread Michael Palimaka

commit: 3e057f954122daf498a3f3d6b2941cb6fa080025
Author: Michael Palimaka  gentoo  org>
AuthorDate: Wed Sep  9 11:24:35 2015 +
Commit: Michael Palimaka  gentoo  org>
CommitDate: Wed Sep  9 11:26:08 2015 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=3e057f95

kde-apps/gwenview: restrict tests.

Gentoo-bug: 559966

Package-Manager: portage-2.2.20.1

 kde-apps/gwenview/gwenview-15.04.3.ebuild   | 3 +++
 kde-apps/gwenview/gwenview-15.08.0.ebuild   | 4 
 kde-apps/gwenview/gwenview-15.08.49..ebuild | 3 +++
 kde-apps/gwenview/gwenview-.ebuild  | 3 +++
 4 files changed, 13 insertions(+)

diff --git a/kde-apps/gwenview/gwenview-15.04.3.ebuild 
b/kde-apps/gwenview/gwenview-15.04.3.ebuild
index 3fb0251..1248f81 100644
--- a/kde-apps/gwenview/gwenview-15.04.3.ebuild
+++ b/kde-apps/gwenview/gwenview-15.04.3.ebuild
@@ -13,6 +13,9 @@ HOMEPAGE="https://www.kde.org/applications/graphics/gwenview/;
 KEYWORDS="~amd64 ~x86"
 IUSE="semantic-desktop X"
 
+# requires running environment
+RESTRICT="test"
+
 # Not released: USE="kipi raw"
 # kipi? ( $(add_kdeapps_dep libkipi '' 5.) )
 # raw? ( $(add_kdeapps_dep libkdcraw '' 5.) )

diff --git a/kde-apps/gwenview/gwenview-15.08.0.ebuild 
b/kde-apps/gwenview/gwenview-15.08.0.ebuild
index 5c50ab2..03ef6be 100644
--- a/kde-apps/gwenview/gwenview-15.08.0.ebuild
+++ b/kde-apps/gwenview/gwenview-15.08.0.ebuild
@@ -6,6 +6,7 @@ EAPI=5
 
 KDE_HANDBOOK="true"
 KDE_TEST="true"
+VIRTUALX_REQUIRED="test"
 inherit kde5
 
 DESCRIPTION="KDE image viewer"
@@ -13,6 +14,9 @@ HOMEPAGE="https://www.kde.org/applications/graphics/gwenview/;
 KEYWORDS="~amd64 ~x86"
 IUSE="kipi raw semantic-desktop X"
 
+# requires running environment
+RESTRICT="test"
+
 RDEPEND="
$(add_frameworks_dep kactivities)
$(add_frameworks_dep kcompletion)

diff --git a/kde-apps/gwenview/gwenview-15.08.49..ebuild 
b/kde-apps/gwenview/gwenview-15.08.49..ebuild
index bb0d140..f6cfc66 100644
--- a/kde-apps/gwenview/gwenview-15.08.49..ebuild
+++ b/kde-apps/gwenview/gwenview-15.08.49..ebuild
@@ -13,6 +13,9 @@ HOMEPAGE="https://www.kde.org/applications/graphics/gwenview/;
 KEYWORDS=""
 IUSE="kipi raw semantic-desktop X"
 
+# requires running environment
+RESTRICT="test"
+
 RDEPEND="
$(add_frameworks_dep kactivities)
$(add_frameworks_dep kcompletion)

diff --git a/kde-apps/gwenview/gwenview-.ebuild 
b/kde-apps/gwenview/gwenview-.ebuild
index bb0d140..f6cfc66 100644
--- a/kde-apps/gwenview/gwenview-.ebuild
+++ b/kde-apps/gwenview/gwenview-.ebuild
@@ -13,6 +13,9 @@ HOMEPAGE="https://www.kde.org/applications/graphics/gwenview/;
 KEYWORDS=""
 IUSE="kipi raw semantic-desktop X"
 
+# requires running environment
+RESTRICT="test"
+
 RDEPEND="
$(add_frameworks_dep kactivities)
$(add_frameworks_dep kcompletion)

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

2015-08-27 Thread Michael Palimaka

commit: ce0323ceab1f09fb81053a456fb61e22bf1bd7dc
Author: Michael Palimaka kensington AT gentoo DOT org
AuthorDate: Thu Aug 27 11:57:22 2015 +
Commit: Michael Palimaka kensington AT gentoo DOT org
CommitDate: Thu Aug 27 11:57:22 2015 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=ce0323ce

kde-apps/gwenview: remove sourceforge from HOMEPAGE.

It just redirects to userbase, which is already linked to from the main page.

Package-Manager: portage-2.2.20.1

 kde-apps/gwenview/gwenview-15.04.3.ebuild   | 5 +
 kde-apps/gwenview/gwenview-15.08.0.ebuild   | 5 +
 kde-apps/gwenview/gwenview-15.08.49..ebuild | 5 +
 kde-apps/gwenview/gwenview-.ebuild  | 5 +
 4 files changed, 4 insertions(+), 16 deletions(-)

diff --git a/kde-apps/gwenview/gwenview-15.04.3.ebuild 
b/kde-apps/gwenview/gwenview-15.04.3.ebuild
index b63c782..3fb0251 100644
--- a/kde-apps/gwenview/gwenview-15.04.3.ebuild
+++ b/kde-apps/gwenview/gwenview-15.04.3.ebuild
@@ -9,10 +9,7 @@ KDE_TEST=true
 inherit kde5
 
 DESCRIPTION=KDE image viewer
-HOMEPAGE=
-   https://www.kde.org/applications/graphics/gwenview/
-   http://gwenview.sourceforge.net/
-
+HOMEPAGE=https://www.kde.org/applications/graphics/gwenview/;
 KEYWORDS=~amd64 ~x86
 IUSE=semantic-desktop X
 

diff --git a/kde-apps/gwenview/gwenview-15.08.0.ebuild 
b/kde-apps/gwenview/gwenview-15.08.0.ebuild
index 8546885..5c50ab2 100644
--- a/kde-apps/gwenview/gwenview-15.08.0.ebuild
+++ b/kde-apps/gwenview/gwenview-15.08.0.ebuild
@@ -9,10 +9,7 @@ KDE_TEST=true
 inherit kde5
 
 DESCRIPTION=KDE image viewer
-HOMEPAGE=
-   https://www.kde.org/applications/graphics/gwenview/
-   http://gwenview.sourceforge.net/
-
+HOMEPAGE=https://www.kde.org/applications/graphics/gwenview/;
 KEYWORDS=~amd64 ~x86
 IUSE=kipi raw semantic-desktop X
 

diff --git a/kde-apps/gwenview/gwenview-15.08.49..ebuild 
b/kde-apps/gwenview/gwenview-15.08.49..ebuild
index 324862b..bb0d140 100644
--- a/kde-apps/gwenview/gwenview-15.08.49..ebuild
+++ b/kde-apps/gwenview/gwenview-15.08.49..ebuild
@@ -9,10 +9,7 @@ KDE_TEST=true
 inherit kde5
 
 DESCRIPTION=KDE image viewer
-HOMEPAGE=
-   https://www.kde.org/applications/graphics/gwenview/
-   http://gwenview.sourceforge.net/
-
+HOMEPAGE=https://www.kde.org/applications/graphics/gwenview/;
 KEYWORDS=
 IUSE=kipi raw semantic-desktop X
 

diff --git a/kde-apps/gwenview/gwenview-.ebuild 
b/kde-apps/gwenview/gwenview-.ebuild
index 324862b..bb0d140 100644
--- a/kde-apps/gwenview/gwenview-.ebuild
+++ b/kde-apps/gwenview/gwenview-.ebuild
@@ -9,10 +9,7 @@ KDE_TEST=true
 inherit kde5
 
 DESCRIPTION=KDE image viewer
-HOMEPAGE=
-   https://www.kde.org/applications/graphics/gwenview/
-   http://gwenview.sourceforge.net/
-
+HOMEPAGE=https://www.kde.org/applications/graphics/gwenview/;
 KEYWORDS=
 IUSE=kipi raw semantic-desktop X

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

2015-07-31 Thread Alexey Shvetsov

commit: 8d8a5c3fee9fe5029ece903b84111c08a4c14f16
Author: Alexey Shvetsov alexxy AT gentoo DOT org
AuthorDate: Fri Jul 31 22:07:50 2015 +
Commit: Alexey Shvetsov alexxy AT gentoo DOT org
CommitDate: Fri Jul 31 22:07:50 2015 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=8d8a5c3f

[kde-apps/gwenview] Fix deps

Package-Manager: portage-2.2.20

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

diff --git a/kde-apps/gwenview/gwenview-15.07.80.ebuild 
b/kde-apps/gwenview/gwenview-15.07.80.ebuild
index 85d33d1..bb46ae3 100644
--- a/kde-apps/gwenview/gwenview-15.07.80.ebuild
+++ b/kde-apps/gwenview/gwenview-15.07.80.ebuild
@@ -44,8 +44,8 @@ RDEPEND=
media-libs/libpng:0=
media-libs/phonon[qt5]
virtual/jpeg:0
-   kipi? ( $(add_kdeapps_dep libkipi '' 5.) )
-   raw? ( $(add_kdeapps_dep libkdcraw '' 5.) )
+   kipi? ( $(add_kdeapps_dep libkipi) )
+   raw? ( $(add_kdeapps_dep libkdcraw) )
semantic-desktop? ( $(add_plasma_dep baloo) )
X? (
dev-qt/qtx11extras:5

diff --git a/kde-apps/gwenview/gwenview-15.08.49..ebuild 
b/kde-apps/gwenview/gwenview-15.08.49..ebuild
index 69066b0..a1e5f75 100644
--- a/kde-apps/gwenview/gwenview-15.08.49..ebuild
+++ b/kde-apps/gwenview/gwenview-15.08.49..ebuild
@@ -44,8 +44,8 @@ RDEPEND=
media-libs/libpng:0=
media-libs/phonon[qt5]
virtual/jpeg:0
-   kipi? ( $(add_kdeapps_dep libkipi '' 5.) )
-   raw? ( $(add_kdeapps_dep libkdcraw '' 5.) )
+   kipi? ( $(add_kdeapps_dep libkipi) )
+   raw? ( $(add_kdeapps_dep libkdcraw) )
semantic-desktop? ( $(add_plasma_dep baloo) )
X? (
dev-qt/qtx11extras:5

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

2015-07-31 Thread Manuel Rüger

commit: 7cbe11fca2a559490772a0d977924b8c93c323aa
Author: Manuel Rüger mrueg AT gentoo DOT org
AuthorDate: Fri Jul 31 22:22:38 2015 +
Commit: Manuel Rüger mrueg AT gentoo DOT org
CommitDate: Fri Jul 31 22:22:38 2015 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=7cbe11fc

Revert [kde-apps/gwenview] Fix deps

This reverts commit 8d8a5c3fee9fe5029ece903b84111c08a4c14f16.

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

diff --git a/kde-apps/gwenview/gwenview-15.07.80.ebuild 
b/kde-apps/gwenview/gwenview-15.07.80.ebuild
index bb46ae3..85d33d1 100644
--- a/kde-apps/gwenview/gwenview-15.07.80.ebuild
+++ b/kde-apps/gwenview/gwenview-15.07.80.ebuild
@@ -44,8 +44,8 @@ RDEPEND=
media-libs/libpng:0=
media-libs/phonon[qt5]
virtual/jpeg:0
-   kipi? ( $(add_kdeapps_dep libkipi) )
-   raw? ( $(add_kdeapps_dep libkdcraw) )
+   kipi? ( $(add_kdeapps_dep libkipi '' 5.) )
+   raw? ( $(add_kdeapps_dep libkdcraw '' 5.) )
semantic-desktop? ( $(add_plasma_dep baloo) )
X? (
dev-qt/qtx11extras:5

diff --git a/kde-apps/gwenview/gwenview-15.08.49..ebuild 
b/kde-apps/gwenview/gwenview-15.08.49..ebuild
index a1e5f75..69066b0 100644
--- a/kde-apps/gwenview/gwenview-15.08.49..ebuild
+++ b/kde-apps/gwenview/gwenview-15.08.49..ebuild
@@ -44,8 +44,8 @@ RDEPEND=
media-libs/libpng:0=
media-libs/phonon[qt5]
virtual/jpeg:0
-   kipi? ( $(add_kdeapps_dep libkipi) )
-   raw? ( $(add_kdeapps_dep libkdcraw) )
+   kipi? ( $(add_kdeapps_dep libkipi '' 5.) )
+   raw? ( $(add_kdeapps_dep libkdcraw '' 5.) )
semantic-desktop? ( $(add_plasma_dep baloo) )
X? (
dev-qt/qtx11extras:5

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

2015-06-12 Thread Michael Palimaka

commit: 931cdfeb518a8a5070f17434b3f06a005f00c2d9
Author: Michael Palimaka kensington AT gentoo DOT org
AuthorDate: Fri Jun 12 18:01:04 2015 +
Commit: Michael Palimaka kensington AT gentoo DOT org
CommitDate: Fri Jun 12 18:01:04 2015 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=931cdfeb

[kde-apps/gwenview] Introduce X USE flag.

Upstream commit: 9b4ce7bb0cb728762fb405f2a0cad1217818c993

Package-Manager: portage-2.2.20

 kde-apps/gwenview/gwenview-15.04.2.ebuild   | 10 --
 kde-apps/gwenview/gwenview-15.04.49..ebuild |  8 ++--
 kde-apps/gwenview/gwenview-.ebuild  |  8 ++--
 3 files changed, 20 insertions(+), 6 deletions(-)

diff --git a/kde-apps/gwenview/gwenview-15.04.2.ebuild 
b/kde-apps/gwenview/gwenview-15.04.2.ebuild
index e922a53..1d6f426 100644
--- a/kde-apps/gwenview/gwenview-15.04.2.ebuild
+++ b/kde-apps/gwenview/gwenview-15.04.2.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE=
http://gwenview.sourceforge.net/
 
 KEYWORDS=~amd64 ~x86
-IUSE=semantic-desktop
+IUSE=semantic-desktop X
 
 # Not released: USE=kipi raw
 # kipi? ( $(add_kdeapps_dep libkipi '' 5.) )
@@ -47,8 +47,11 @@ DEPEND=
media-libs/libpng:0=
media-libs/phonon[qt5]
virtual/jpeg:0
-   x11-libs/libX11
semantic-desktop? ( $(add_plasma_dep baloo) )
+   X? (
+   dev-qt/qtx11extras:5
+   x11-libs/libX11
+   )
 
 
 RDEPEND=${DEPEND}
@@ -59,6 +62,9 @@ src_configure() {
 #  $(cmake-utils_use_find_package kipi KF5Kipi)
 #  $(cmake-utils_use_find_package raw KF5KDcraw)
 #  )
+   local mycmakeargs=(
+   $(cmake-utils_use_find_package X X11)
+   )
 
# Workaround for bug #479510
if [[ -e ${EPREFIX}/usr/include/${CHOST}/jconfig.h ]]; then

diff --git a/kde-apps/gwenview/gwenview-15.04.49..ebuild 
b/kde-apps/gwenview/gwenview-15.04.49..ebuild
index 48fd099..8f2732f 100644
--- a/kde-apps/gwenview/gwenview-15.04.49..ebuild
+++ b/kde-apps/gwenview/gwenview-15.04.49..ebuild
@@ -14,7 +14,7 @@ HOMEPAGE=
http://gwenview.sourceforge.net/
 
 KEYWORDS=
-IUSE=kipi raw semantic-desktop
+IUSE=kipi raw semantic-desktop X
 
 DEPEND=
$(add_frameworks_dep kactivities)
@@ -44,10 +44,13 @@ DEPEND=
media-libs/libpng:0=
media-libs/phonon[qt5]
virtual/jpeg:0
-   x11-libs/libX11
kipi? ( $(add_kdeapps_dep libkipi '' 5.) )
raw? ( $(add_kdeapps_dep libkdcraw '' 5.) )
semantic-desktop? ( $(add_plasma_dep baloo) )
+   X? (
+   dev-qt/qtx11extras:5
+   x11-libs/libX11
+   )
 
 
 RDEPEND=${DEPEND}
@@ -56,6 +59,7 @@ src_configure() {
local mycmakeargs=(
$(cmake-utils_use_find_package kipi KF5Kipi)
$(cmake-utils_use_find_package raw KF5KDcraw)
+   $(cmake-utils_use_find_package X X11)
)
 
if use semantic-desktop; then

diff --git a/kde-apps/gwenview/gwenview-.ebuild 
b/kde-apps/gwenview/gwenview-.ebuild
index 48fd099..8f2732f 100644
--- a/kde-apps/gwenview/gwenview-.ebuild
+++ b/kde-apps/gwenview/gwenview-.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE=
http://gwenview.sourceforge.net/
 
 KEYWORDS=
-IUSE=kipi raw semantic-desktop
+IUSE=kipi raw semantic-desktop X
 
 DEPEND=
$(add_frameworks_dep kactivities)
@@ -44,10 +44,13 @@ DEPEND=
media-libs/libpng:0=
media-libs/phonon[qt5]
virtual/jpeg:0
-   x11-libs/libX11
kipi? ( $(add_kdeapps_dep libkipi '' 5.) )
raw? ( $(add_kdeapps_dep libkdcraw '' 5.) )
semantic-desktop? ( $(add_plasma_dep baloo) )
+   X? (
+   dev-qt/qtx11extras:5
+   x11-libs/libX11
+   )
 
 
 RDEPEND=${DEPEND}
@@ -56,6 +59,7 @@ src_configure() {
local mycmakeargs=(
$(cmake-utils_use_find_package kipi KF5Kipi)
$(cmake-utils_use_find_package raw KF5KDcraw)
+   $(cmake-utils_use_find_package X X11)
)
 
if use semantic-desktop; then

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

2015-06-12 Thread Michael Palimaka

commit: 044ce106910d7095125a2decf1e593ef98637585
Author: Michael Palimaka kensington AT gentoo DOT org
AuthorDate: Fri Jun 12 18:15:59 2015 +
Commit: Michael Palimaka kensington AT gentoo DOT org
CommitDate: Fri Jun 12 18:15:59 2015 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=044ce106

[kde-apps/gwenview] Update dependencies.

Package-Manager: portage-2.2.20

 kde-apps/gwenview/gwenview-15.04.2.ebuild   | 8 +---
 kde-apps/gwenview/gwenview-15.04.49..ebuild | 8 +---
 kde-apps/gwenview/gwenview-.ebuild  | 8 +---
 3 files changed, 15 insertions(+), 9 deletions(-)

diff --git a/kde-apps/gwenview/gwenview-15.04.2.ebuild 
b/kde-apps/gwenview/gwenview-15.04.2.ebuild
index 1d6f426..48e89e4 100644
--- a/kde-apps/gwenview/gwenview-15.04.2.ebuild
+++ b/kde-apps/gwenview/gwenview-15.04.2.ebuild
@@ -19,7 +19,7 @@ IUSE=semantic-desktop X
 # Not released: USE=kipi raw
 # kipi? ( $(add_kdeapps_dep libkipi '' 5.) )
 # raw? ( $(add_kdeapps_dep libkdcraw '' 5.) )
-DEPEND=
+RDEPEND=
$(add_frameworks_dep kactivities)
$(add_frameworks_dep kcompletion)
$(add_frameworks_dep kconfig)
@@ -33,8 +33,8 @@ DEPEND=
$(add_frameworks_dep kitemviews)
$(add_frameworks_dep kjobwidgets)
$(add_frameworks_dep knotifications)
+   $(add_frameworks_dep kparts)
$(add_frameworks_dep kservice)
-   $(add_frameworks_dep ktextwidgets)
$(add_frameworks_dep kwidgetsaddons)
$(add_frameworks_dep kxmlgui)
dev-qt/qtgui:5
@@ -54,7 +54,9 @@ DEPEND=
)
 
 
-RDEPEND=${DEPEND}
+DEPEND=${RDEPEND}
+   dev-qt/qtconcurrent:5
+
 
 src_configure() {
 #  Not released:

diff --git a/kde-apps/gwenview/gwenview-15.04.49..ebuild 
b/kde-apps/gwenview/gwenview-15.04.49..ebuild
index 8f2732f..767884a 100644
--- a/kde-apps/gwenview/gwenview-15.04.49..ebuild
+++ b/kde-apps/gwenview/gwenview-15.04.49..ebuild
@@ -16,7 +16,7 @@ HOMEPAGE=
 KEYWORDS=
 IUSE=kipi raw semantic-desktop X
 
-DEPEND=
+RDEPEND=
$(add_frameworks_dep kactivities)
$(add_frameworks_dep kcompletion)
$(add_frameworks_dep kconfig)
@@ -30,8 +30,8 @@ DEPEND=
$(add_frameworks_dep kitemviews)
$(add_frameworks_dep kjobwidgets)
$(add_frameworks_dep knotifications)
+   $(add_frameworks_dep kparts)
$(add_frameworks_dep kservice)
-   $(add_frameworks_dep ktextwidgets)
$(add_frameworks_dep kwidgetsaddons)
$(add_frameworks_dep kxmlgui)
dev-qt/qtgui:5
@@ -53,7 +53,9 @@ DEPEND=
)
 
 
-RDEPEND=${DEPEND}
+DEPEND=${RDEPEND}
+   dev-qt/qtconcurrent:5
+
 
 src_configure() {
local mycmakeargs=(

diff --git a/kde-apps/gwenview/gwenview-.ebuild 
b/kde-apps/gwenview/gwenview-.ebuild
index 8f2732f..767884a 100644
--- a/kde-apps/gwenview/gwenview-.ebuild
+++ b/kde-apps/gwenview/gwenview-.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE=
 KEYWORDS=
 IUSE=kipi raw semantic-desktop X
 
-DEPEND=
+RDEPEND=
$(add_frameworks_dep kactivities)
$(add_frameworks_dep kcompletion)
$(add_frameworks_dep kconfig)
@@ -30,8 +30,8 @@ DEPEND=
$(add_frameworks_dep kitemviews)
$(add_frameworks_dep kjobwidgets)
$(add_frameworks_dep knotifications)
+   $(add_frameworks_dep kparts)
$(add_frameworks_dep kservice)
-   $(add_frameworks_dep ktextwidgets)
$(add_frameworks_dep kwidgetsaddons)
$(add_frameworks_dep kxmlgui)
dev-qt/qtgui:5
@@ -53,7 +53,9 @@ DEPEND=
)
 
 
-RDEPEND=${DEPEND}
+DEPEND=${RDEPEND}
+   dev-qt/qtconcurrent:5
+
 
 src_configure() {
local mycmakeargs=(

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

2015-05-30 Thread Manuel Rüger

commit: 6b93ba7019fbbfda8f672372e05375b83cd7ddfb
Author: Manuel Rüger mrueg AT gentoo DOT org
AuthorDate: Sat May 30 16:07:01 2015 +
Commit: Manuel Rüger mrueg AT gentoo DOT org
CommitDate: Sat May 30 16:07:01 2015 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=6b93ba70

[kde-apps/gwenview] Don't depend on unreleased kipi/kdcraw. Thanks to Andreas 
Sturmlechner for noticing this.

Package-Manager: portage-2.2.20

 kde-apps/gwenview/gwenview-15.04.2.ebuild | 21 ++---
 1 file changed, 14 insertions(+), 7 deletions(-)

diff --git a/kde-apps/gwenview/gwenview-15.04.2.ebuild 
b/kde-apps/gwenview/gwenview-15.04.2.ebuild
index a5447ed..e922a53 100644
--- a/kde-apps/gwenview/gwenview-15.04.2.ebuild
+++ b/kde-apps/gwenview/gwenview-15.04.2.ebuild
@@ -14,8 +14,11 @@ HOMEPAGE=
http://gwenview.sourceforge.net/
 
 KEYWORDS=~amd64 ~x86
-IUSE=kipi raw semantic-desktop
+IUSE=semantic-desktop
 
+# Not released: USE=kipi raw
+# kipi? ( $(add_kdeapps_dep libkipi '' 5.) )
+# raw? ( $(add_kdeapps_dep libkdcraw '' 5.) )
 DEPEND=
$(add_frameworks_dep kactivities)
$(add_frameworks_dep kcompletion)
@@ -45,18 +48,22 @@ DEPEND=
media-libs/phonon[qt5]
virtual/jpeg:0
x11-libs/libX11
-   kipi? ( $(add_kdeapps_dep libkipi '' 5.) )
-   raw? ( $(add_kdeapps_dep libkdcraw '' 5.) )
semantic-desktop? ( $(add_plasma_dep baloo) )
 
 
 RDEPEND=${DEPEND}
 
 src_configure() {
-   local mycmakeargs=(
-   $(cmake-utils_use_find_package kipi KF5Kipi)
-   $(cmake-utils_use_find_package raw KF5KDcraw)
-   )
+#  Not released:
+#  local mycmakeargs=(
+#  $(cmake-utils_use_find_package kipi KF5Kipi)
+#  $(cmake-utils_use_find_package raw KF5KDcraw)
+#  )
+
+   # Workaround for bug #479510
+   if [[ -e ${EPREFIX}/usr/include/${CHOST}/jconfig.h ]]; then
+   mycmakeargs+=( 
-DJCONFIG_H=${EPREFIX}/usr/include/${CHOST}/jconfig.h )
+   fi
 
if use semantic-desktop; then
mycmakeargs+=(-DGWENVIEW_SEMANTICINFO_BACKEND=Baloo)

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

2015-05-29 Thread Michael Palimaka

commit: c36c116f2873e15e81058bb3a54b925ac112bb08
Author: Michael Palimaka kensington AT gentoo DOT org
AuthorDate: Fri May 29 14:50:14 2015 +
Commit: Michael Palimaka kensington AT gentoo DOT org
CommitDate: Fri May 29 14:50:14 2015 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=c36c116f

[kde-apps/gwenview] Remove workaround that is no longer required.

Upstream commit: b73a9272688ca64c8f98c3d47a211ab3ccbfbaef

Package-Manager: portage-2.2.20

 kde-apps/gwenview/gwenview-15.04.49..ebuild | 5 -
 kde-apps/gwenview/gwenview-.ebuild  | 5 -
 2 files changed, 10 deletions(-)

diff --git a/kde-apps/gwenview/gwenview-15.04.49..ebuild 
b/kde-apps/gwenview/gwenview-15.04.49..ebuild
index 3b4ac99..48fd099 100644
--- a/kde-apps/gwenview/gwenview-15.04.49..ebuild
+++ b/kde-apps/gwenview/gwenview-15.04.49..ebuild
@@ -58,11 +58,6 @@ src_configure() {
$(cmake-utils_use_find_package raw KF5KDcraw)
)
 
-   # Workaround for bug #479510
-   if [[ -e ${EPREFIX}/usr/include/${CHOST}/jconfig.h ]]; then
-   mycmakeargs+=( 
-DJCONFIG_H=${EPREFIX}/usr/include/${CHOST}/jconfig.h )
-   fi
-
if use semantic-desktop; then
mycmakeargs+=(-DGWENVIEW_SEMANTICINFO_BACKEND=Baloo)
else

diff --git a/kde-apps/gwenview/gwenview-.ebuild 
b/kde-apps/gwenview/gwenview-.ebuild
index 3b4ac99..48fd099 100644
--- a/kde-apps/gwenview/gwenview-.ebuild
+++ b/kde-apps/gwenview/gwenview-.ebuild
@@ -58,11 +58,6 @@ src_configure() {
$(cmake-utils_use_find_package raw KF5KDcraw)
)
 
-   # Workaround for bug #479510
-   if [[ -e ${EPREFIX}/usr/include/${CHOST}/jconfig.h ]]; then
-   mycmakeargs+=( 
-DJCONFIG_H=${EPREFIX}/usr/include/${CHOST}/jconfig.h )
-   fi
-
if use semantic-desktop; then
mycmakeargs+=(-DGWENVIEW_SEMANTICINFO_BACKEND=Baloo)
else

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

2015-05-06 Thread Michael Palimaka

commit: 121942733f1f6291260f0efb8b344d679fc828e5
Author: Andreas Sturmlechner andreas.sturmlechner AT gmail DOT com
AuthorDate: Mon May  4 20:07:51 2015 +
Commit: Michael Palimaka kensington AT gentoo DOT org
CommitDate: Wed May  6 13:35:01 2015 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=12194273

[kde-apps/gwenview] Drop DEPENDs without release

Package-Manager: portage-2.2.18

 kde-apps/gwenview/gwenview-15.04.0.ebuild | 16 +---
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/kde-apps/gwenview/gwenview-15.04.0.ebuild 
b/kde-apps/gwenview/gwenview-15.04.0.ebuild
index e4729f2..a49c506 100644
--- a/kde-apps/gwenview/gwenview-15.04.0.ebuild
+++ b/kde-apps/gwenview/gwenview-15.04.0.ebuild
@@ -14,8 +14,11 @@ HOMEPAGE=
http://gwenview.sourceforge.net/
 
 KEYWORDS= ~amd64
-IUSE=kipi raw semantic-desktop
+IUSE=semantic-desktop
 
+# Not released: USE=kipi raw
+# kipi? ( $(add_kdeapps_dep libkipi '' 5.) )
+# raw? ( $(add_kdeapps_dep libkdcraw '' 5.) )
 DEPEND=
$(add_frameworks_dep kactivities)
$(add_frameworks_dep kcompletion)
@@ -45,18 +48,17 @@ DEPEND=
media-libs/phonon[qt5]
virtual/jpeg:0
x11-libs/libX11
-   kipi? ( $(add_kdeapps_dep libkipi '' 5.) )
-   raw? ( $(add_kdeapps_dep libkdcraw '' 5.) )
semantic-desktop? ( $(add_plasma_dep baloo) )
 
 
 RDEPEND=${DEPEND}
 
 src_configure() {
-   local mycmakeargs=(
-   $(cmake-utils_use_find_package kipi KF5Kipi)
-   $(cmake-utils_use_find_package raw KF5KDcraw)
-   )
+#  Not released:
+#  local mycmakeargs=(
+#  $(cmake-utils_use_find_package kipi KF5Kipi)
+#  $(cmake-utils_use_find_package raw KF5KDcraw)
+#  )
 
# Workaround for bug #479510
if [[ -e ${EPREFIX}/usr/include/${CHOST}/jconfig.h ]]; then

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

2015-03-16 Thread Johannes Huber

commit: f7a2244ce5d89cb58690c42c7f026e2f36219513
Author: Johannes Huber johu AT gentoo DOT org
AuthorDate: Mon Mar 16 19:10:07 2015 +
Commit: Johannes Huber johu AT gentoo DOT org
CommitDate: Mon Mar 16 19:10:07 2015 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=f7a2244c

[kde-apps/gwenview] Remove failing patch

Should be handled by eclass.

Package-Manager: portage-2.2.18

 .../files/gwenview--tests-optional.patch   | 28 --
 kde-apps/gwenview/gwenview-.ebuild |  2 --
 2 files changed, 30 deletions(-)

diff --git a/kde-apps/gwenview/files/gwenview--tests-optional.patch 
b/kde-apps/gwenview/files/gwenview--tests-optional.patch
deleted file mode 100644
index b5d1248..000
--- a/kde-apps/gwenview/files/gwenview--tests-optional.patch
+++ /dev/null
@@ -1,28 +0,0 @@
 a/CMakeLists.txt   2015-01-29 00:15:10.245160459 +0100
-+++ b/CMakeLists.txt   2015-01-29 00:16:41.950314278 +0100
-@@ -36,7 +36,7 @@
- set(GWENVIEW_SEMANTICINFO_BACKEND_BALOO ON)
- endif()
- 
--find_package(Qt5 ${QT_MIN_VERSION} CONFIG REQUIRED Core DBus Widgets Script 
Test Concurrent Svg OpenGL)
-+find_package(Qt5 ${QT_MIN_VERSION} CONFIG REQUIRED Core DBus Widgets Script 
Concurrent Svg OpenGL)
- 
- find_package(Phonon4Qt5 4.6.60 NO_MODULE)
- include_directories(BEFORE ${PHONON_INCLUDES})
-@@ -101,11 +101,15 @@
- add_subdirectory(app)
- # add_subdirectory(importer)
- add_subdirectory(part)
--add_subdirectory(tests)
- add_subdirectory(icons)
- add_subdirectory(images)
- add_subdirectory(cursors)
- add_subdirectory(color-schemes)
- add_subdirectory(doc)
- 
-+if(BUILD_TESTING)
-+   find_package(Qt5Test CONFIG REQUIRED)
-+   add_subdirectory(tests)
-+endif()
-+
- feature_summary(WHAT ALL INCLUDE_QUIET_PACKAGES 
FATAL_ON_MISSING_REQUIRED_PACKAGES)

diff --git a/kde-apps/gwenview/gwenview-.ebuild 
b/kde-apps/gwenview/gwenview-.ebuild
index 2e60db4..3b4ac99 100644
--- a/kde-apps/gwenview/gwenview-.ebuild
+++ b/kde-apps/gwenview/gwenview-.ebuild
@@ -52,8 +52,6 @@ DEPEND=
 
 RDEPEND=${DEPEND}
 
-PATCHES=( ${FILESDIR}/${PN}--tests-optional.patch )
-
 src_configure() {
local mycmakeargs=(
$(cmake-utils_use_find_package kipi KF5Kipi)

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

2015-01-30 Thread Johannes Huber

commit: 0b19a3560ef9962b6542342d55fa0edcada4f725
Author: Andreas Sturmlechner andreas.sturmlechner AT gmail DOT com
AuthorDate: Thu Jan 29 00:00:13 2015 +
Commit: Johannes Huber johu AT gentoo DOT org
CommitDate: Fri Jan 30 23:32:55 2015 +
URL:http://sources.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=0b19a356

[kde-apps/gwenview] Add US kipi + raw, make tests optional

Package-Manager: portage-2.2.15

---
 .../files/gwenview--tests-optional.patch   | 28 ++
 kde-apps/gwenview/gwenview-.ebuild | 18 ++
 kde-apps/gwenview/metadata.xml |  3 +++
 3 files changed, 45 insertions(+), 4 deletions(-)

diff --git a/kde-apps/gwenview/files/gwenview--tests-optional.patch 
b/kde-apps/gwenview/files/gwenview--tests-optional.patch
new file mode 100644
index 000..b5d1248
--- /dev/null
+++ b/kde-apps/gwenview/files/gwenview--tests-optional.patch
@@ -0,0 +1,28 @@
+--- a/CMakeLists.txt   2015-01-29 00:15:10.245160459 +0100
 b/CMakeLists.txt   2015-01-29 00:16:41.950314278 +0100
+@@ -36,7 +36,7 @@
+ set(GWENVIEW_SEMANTICINFO_BACKEND_BALOO ON)
+ endif()
+ 
+-find_package(Qt5 ${QT_MIN_VERSION} CONFIG REQUIRED Core DBus Widgets Script 
Test Concurrent Svg OpenGL)
++find_package(Qt5 ${QT_MIN_VERSION} CONFIG REQUIRED Core DBus Widgets Script 
Concurrent Svg OpenGL)
+ 
+ find_package(Phonon4Qt5 4.6.60 NO_MODULE)
+ include_directories(BEFORE ${PHONON_INCLUDES})
+@@ -101,11 +101,15 @@
+ add_subdirectory(app)
+ # add_subdirectory(importer)
+ add_subdirectory(part)
+-add_subdirectory(tests)
+ add_subdirectory(icons)
+ add_subdirectory(images)
+ add_subdirectory(cursors)
+ add_subdirectory(color-schemes)
+ add_subdirectory(doc)
+ 
++if(BUILD_TESTING)
++   find_package(Qt5Test CONFIG REQUIRED)
++   add_subdirectory(tests)
++endif()
++
+ feature_summary(WHAT ALL INCLUDE_QUIET_PACKAGES 
FATAL_ON_MISSING_REQUIRED_PACKAGES)

diff --git a/kde-apps/gwenview/gwenview-.ebuild 
b/kde-apps/gwenview/gwenview-.ebuild
index 88ae87c..5d176c0 100644
--- a/kde-apps/gwenview/gwenview-.ebuild
+++ b/kde-apps/gwenview/gwenview-.ebuild
@@ -4,6 +4,8 @@
 
 EAPI=5
 
+KDE_HANDBOOK=true
+KDE_TEST=true
 inherit kde5
 
 DESCRIPTION=KDE image viewer
@@ -12,7 +14,7 @@ HOMEPAGE=
http://gwenview.sourceforge.net/
 
 KEYWORDS=
-IUSE=semantic-desktop
+IUSE=kipi raw semantic-desktop
 
 DEPEND=
$(add_frameworks_dep kactivities)
@@ -43,13 +45,21 @@ DEPEND=
media-libs/phonon[qt5]
virtual/jpeg:0
x11-libs/libX11
+   kipi? ( $(add_kdeapps_dep libkipi '' 5.) )
+   raw? ( $(add_kdeapps_dep libkdcraw '' 5.) )
semantic-desktop? ( $(add_kdeplasma_dep baloo) )
 
-RDEPEND=${DEPEND}
-   !kde-base/gwenview:4
-
+
+RDEPEND=${DEPEND}
+
+PATCHES=( ${FILESDIR}/${PN}--tests-optional.patch )
 
 src_configure() {
+   local mycmakeargs=(
+   $(cmake-utils_use_find_package kipi KF5Kipi)
+   $(cmake-utils_use_find_package raw KF5KDcraw)
+   )
+
# Workaround for bug #479510
if [[ -e ${EPREFIX}/usr/include/${CHOST}/jconfig.h ]]; then
mycmakeargs+=( 
-DJCONFIG_H=${EPREFIX}/usr/include/${CHOST}/jconfig.h )

diff --git a/kde-apps/gwenview/metadata.xml b/kde-apps/gwenview/metadata.xml
index a23f444..0776135 100644
--- a/kde-apps/gwenview/metadata.xml
+++ b/kde-apps/gwenview/metadata.xml
@@ -1,5 +1,8 @@
 ?xml version=1.0 encoding=UTF-8?
 !DOCTYPE pkgmetadata SYSTEM http://www.gentoo.org/dtd/metadata.dtd;
 pkgmetadata
+   use
+   flag name=kipiSupport for the KDE Image Plugin 
Interface/flag
+   /use
herdkde/herd
 /pkgmetadata

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

2014-11-24 Thread Michael Palimaka

commit: de35c55e1ada50b921ca22a67a9160b7a47400c9
Author: Michael Palimaka kensington AT gentoo DOT org
AuthorDate: Sun Nov 23 17:28:05 2014 +
Commit: Michael Palimaka kensington AT gentoo DOT org
CommitDate: Mon Nov 24 12:11:54 2014 +
URL:http://sources.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=de35c55e

[kde-apps/gwenview] Update deps to reflect category rename.

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

diff --git a/kde-apps/gwenview/gwenview-14.11.95.ebuild 
b/kde-apps/gwenview/gwenview-14.11.95.ebuild
index e197c4f..6a40570 100644
--- a/kde-apps/gwenview/gwenview-14.11.95.ebuild
+++ b/kde-apps/gwenview/gwenview-14.11.95.ebuild
@@ -15,7 +15,7 @@ KEYWORDS=
 IUSE=semantic-desktop
 
 DEPEND=
-   $(add_kdebase_dep libkonq)
+   $(add_kdeapps_dep libkonq)
$(add_frameworks_dep kactivities)
$(add_frameworks_dep kcompletion)
$(add_frameworks_dep kconfig)

diff --git a/kde-apps/gwenview/gwenview-.ebuild 
b/kde-apps/gwenview/gwenview-.ebuild
index e197c4f..6a40570 100644
--- a/kde-apps/gwenview/gwenview-.ebuild
+++ b/kde-apps/gwenview/gwenview-.ebuild
@@ -15,7 +15,7 @@ KEYWORDS=
 IUSE=semantic-desktop
 
 DEPEND=
-   $(add_kdebase_dep libkonq)
+   $(add_kdeapps_dep libkonq)
$(add_frameworks_dep kactivities)
$(add_frameworks_dep kcompletion)
$(add_frameworks_dep kconfig)

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

2014-11-24 Thread Michael Palimaka

commit: d463eaac6b09d327b8f5bdbef5edd5d0c0ec773d
Author: Michael Palimaka kensington AT gentoo DOT org
AuthorDate: Mon Nov 24 12:14:53 2014 +
Commit: Michael Palimaka kensington AT gentoo DOT org
CommitDate: Mon Nov 24 12:14:53 2014 +
URL:http://sources.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=d463eaac

[kde-apps/gwenview] Remove unused local USE flag.

Package-Manager: portage-2.2.14

---
 kde-apps/gwenview/metadata.xml | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/kde-apps/gwenview/metadata.xml b/kde-apps/gwenview/metadata.xml
index 4881f13..a23f444 100644
--- a/kde-apps/gwenview/metadata.xml
+++ b/kde-apps/gwenview/metadata.xml
@@ -2,7 +2,4 @@
 !DOCTYPE pkgmetadata SYSTEM http://www.gentoo.org/dtd/metadata.dtd;
 pkgmetadata
herdkde/herd
-   use
-   flag name=kipiSupport for the KDE Image Plugin 
Interface./flag
-   /use
 /pkgmetadata

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

2014-11-24 Thread Michael Palimaka

commit: 2b14e408c7265427d5de960fa66046103c6fa28e
Author: Michael Palimaka kensington AT gentoo DOT org
AuthorDate: Mon Nov 24 12:57:00 2014 +
Commit: Michael Palimaka kensington AT gentoo DOT org
CommitDate: Mon Nov 24 12:57:09 2014 +
URL:http://sources.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=2b14e408

[kde-apps/gwenview] Remove unused dependency wrt bug #528890.

Upstream commit: ccfa1ea160bad7913c85998b1a2a438eacaf9a66

Package-Manager: portage-2.2.14

---
 kde-apps/gwenview/gwenview-14.11.95.ebuild | 1 -
 kde-apps/gwenview/gwenview-.ebuild | 1 -
 2 files changed, 2 deletions(-)

diff --git a/kde-apps/gwenview/gwenview-14.11.95.ebuild 
b/kde-apps/gwenview/gwenview-14.11.95.ebuild
index 6a40570..521989e 100644
--- a/kde-apps/gwenview/gwenview-14.11.95.ebuild
+++ b/kde-apps/gwenview/gwenview-14.11.95.ebuild
@@ -15,7 +15,6 @@ KEYWORDS=
 IUSE=semantic-desktop
 
 DEPEND=
-   $(add_kdeapps_dep libkonq)
$(add_frameworks_dep kactivities)
$(add_frameworks_dep kcompletion)
$(add_frameworks_dep kconfig)

diff --git a/kde-apps/gwenview/gwenview-.ebuild 
b/kde-apps/gwenview/gwenview-.ebuild
index 6a40570..521989e 100644
--- a/kde-apps/gwenview/gwenview-.ebuild
+++ b/kde-apps/gwenview/gwenview-.ebuild
@@ -15,7 +15,6 @@ KEYWORDS=
 IUSE=semantic-desktop
 
 DEPEND=
-   $(add_kdeapps_dep libkonq)
$(add_frameworks_dep kactivities)
$(add_frameworks_dep kcompletion)
$(add_frameworks_dep kconfig)

63 matches

Mail list logo