| 1 |
commit: ca596f8bfb5dccac2c74ba17d47a5574840ef3d5 |
| 2 |
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Thu Jan 7 23:46:02 2021 +0000 |
| 4 |
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Thu Jan 7 23:50:49 2021 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=ca596f8b |
| 7 |
|
| 8 |
kde-apps/spectacle: Add IUSE="+annotate" |
| 9 |
|
| 10 |
Bug: https://bugs.gentoo.org/760069 |
| 11 |
Package-Manager: Portage-3.0.12, Repoman-3.0.2 |
| 12 |
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> |
| 13 |
|
| 14 |
kde-apps/spectacle/metadata.xml | 1 + |
| 15 |
kde-apps/spectacle/spectacle-20.12.49.9999.ebuild | 20 ++++++++++++-------- |
| 16 |
kde-apps/spectacle/spectacle-9999.ebuild | 20 ++++++++++++-------- |
| 17 |
3 files changed, 25 insertions(+), 16 deletions(-) |
| 18 |
|
| 19 |
diff --git a/kde-apps/spectacle/metadata.xml b/kde-apps/spectacle/metadata.xml |
| 20 |
index 661377e45a..bc2d96259f 100644 |
| 21 |
--- a/kde-apps/spectacle/metadata.xml |
| 22 |
+++ b/kde-apps/spectacle/metadata.xml |
| 23 |
@@ -6,6 +6,7 @@ |
| 24 |
<name>Gentoo KDE Project</name> |
| 25 |
</maintainer> |
| 26 |
<use> |
| 27 |
+ <flag name="annotate">Enable support for screenshot annotations using <pkg>media-libs/kimageannotator</pkg></flag> |
| 28 |
<flag name="kipi">Enable support for the KDE Image Plugin Interface</flag> |
| 29 |
<flag name="share">Enable support for a share menu using <pkg>kde-frameworks/purpose</pkg></flag> |
| 30 |
</use> |
| 31 |
|
| 32 |
diff --git a/kde-apps/spectacle/spectacle-20.12.49.9999.ebuild b/kde-apps/spectacle/spectacle-20.12.49.9999.ebuild |
| 33 |
index 807e57548f..6749b4defc 100644 |
| 34 |
--- a/kde-apps/spectacle/spectacle-20.12.49.9999.ebuild |
| 35 |
+++ b/kde-apps/spectacle/spectacle-20.12.49.9999.ebuild |
| 36 |
@@ -16,19 +16,14 @@ HOMEPAGE="https://apps.kde.org/en/spectacle" |
| 37 |
LICENSE="LGPL-2+ handbook? ( FDL-1.3 ) kipi? ( GPL-2+ )" |
| 38 |
SLOT="5" |
| 39 |
KEYWORDS="" |
| 40 |
-IUSE="kipi share" |
| 41 |
- |
| 42 |
-# TODO: mv guru.git -> gentoo.git |
| 43 |
-# IUSE+=" annotate" |
| 44 |
-# DEPEND+=" |
| 45 |
-# dev-qt/qtsvg-${QTMIN}:5 |
| 46 |
-# x11-libs/kimageannotator |
| 47 |
-# " |
| 48 |
+IUSE="+annotate kipi share" |
| 49 |
|
| 50 |
+# TODO: Qt5Svg leaking from media-libs/kimageannotator |
| 51 |
DEPEND=" |
| 52 |
>=dev-qt/qdbus-${QTMIN}:5 |
| 53 |
>=dev-qt/qtdbus-${QTMIN}:5 |
| 54 |
>=dev-qt/qtgui-${QTMIN}:5 |
| 55 |
+ >=dev-qt/qtsvg-${QTMIN}:5 |
| 56 |
>=dev-qt/qtprintsupport-${QTMIN}:5 |
| 57 |
>=dev-qt/qtwidgets-${QTMIN}:5 |
| 58 |
>=dev-qt/qtx11extras-${QTMIN}:5 |
| 59 |
@@ -50,6 +45,7 @@ DEPEND=" |
| 60 |
x11-libs/xcb-util |
| 61 |
x11-libs/xcb-util-cursor |
| 62 |
x11-libs/xcb-util-image |
| 63 |
+ annotate? ( media-libs/kimageannotator ) |
| 64 |
kipi? ( >=kde-apps/libkipi-${PVCUT}:5= ) |
| 65 |
share? ( >=kde-frameworks/purpose-${KFMIN}:5 ) |
| 66 |
" |
| 67 |
@@ -57,8 +53,16 @@ RDEPEND="${DEPEND} |
| 68 |
kipi? ( >=kde-apps/kipi-plugins-${PVCUT}:5 ) |
| 69 |
" |
| 70 |
|
| 71 |
+src_prepare() { |
| 72 |
+ ecm_src_prepare |
| 73 |
+ # Unnecessary with >=media-libs/kimageannotator-0.4.0 |
| 74 |
+ sed -e "/find_package\s*(\s*X11/d" -e "/find_package\s*(\s*kColorPicker/d" \ |
| 75 |
+ -i CMakeLists.txt || die |
| 76 |
+} |
| 77 |
+ |
| 78 |
src_configure() { |
| 79 |
local mycmakeargs=( |
| 80 |
+ $(cmake_use_find_package annotate kImageAnnotator) |
| 81 |
$(cmake_use_find_package kipi KF5Kipi) |
| 82 |
$(cmake_use_find_package share KF5Purpose) |
| 83 |
) |
| 84 |
|
| 85 |
diff --git a/kde-apps/spectacle/spectacle-9999.ebuild b/kde-apps/spectacle/spectacle-9999.ebuild |
| 86 |
index 807e57548f..6749b4defc 100644 |
| 87 |
--- a/kde-apps/spectacle/spectacle-9999.ebuild |
| 88 |
+++ b/kde-apps/spectacle/spectacle-9999.ebuild |
| 89 |
@@ -16,19 +16,14 @@ HOMEPAGE="https://apps.kde.org/en/spectacle" |
| 90 |
LICENSE="LGPL-2+ handbook? ( FDL-1.3 ) kipi? ( GPL-2+ )" |
| 91 |
SLOT="5" |
| 92 |
KEYWORDS="" |
| 93 |
-IUSE="kipi share" |
| 94 |
- |
| 95 |
-# TODO: mv guru.git -> gentoo.git |
| 96 |
-# IUSE+=" annotate" |
| 97 |
-# DEPEND+=" |
| 98 |
-# dev-qt/qtsvg-${QTMIN}:5 |
| 99 |
-# x11-libs/kimageannotator |
| 100 |
-# " |
| 101 |
+IUSE="+annotate kipi share" |
| 102 |
|
| 103 |
+# TODO: Qt5Svg leaking from media-libs/kimageannotator |
| 104 |
DEPEND=" |
| 105 |
>=dev-qt/qdbus-${QTMIN}:5 |
| 106 |
>=dev-qt/qtdbus-${QTMIN}:5 |
| 107 |
>=dev-qt/qtgui-${QTMIN}:5 |
| 108 |
+ >=dev-qt/qtsvg-${QTMIN}:5 |
| 109 |
>=dev-qt/qtprintsupport-${QTMIN}:5 |
| 110 |
>=dev-qt/qtwidgets-${QTMIN}:5 |
| 111 |
>=dev-qt/qtx11extras-${QTMIN}:5 |
| 112 |
@@ -50,6 +45,7 @@ DEPEND=" |
| 113 |
x11-libs/xcb-util |
| 114 |
x11-libs/xcb-util-cursor |
| 115 |
x11-libs/xcb-util-image |
| 116 |
+ annotate? ( media-libs/kimageannotator ) |
| 117 |
kipi? ( >=kde-apps/libkipi-${PVCUT}:5= ) |
| 118 |
share? ( >=kde-frameworks/purpose-${KFMIN}:5 ) |
| 119 |
" |
| 120 |
@@ -57,8 +53,16 @@ RDEPEND="${DEPEND} |
| 121 |
kipi? ( >=kde-apps/kipi-plugins-${PVCUT}:5 ) |
| 122 |
" |
| 123 |
|
| 124 |
+src_prepare() { |
| 125 |
+ ecm_src_prepare |
| 126 |
+ # Unnecessary with >=media-libs/kimageannotator-0.4.0 |
| 127 |
+ sed -e "/find_package\s*(\s*X11/d" -e "/find_package\s*(\s*kColorPicker/d" \ |
| 128 |
+ -i CMakeLists.txt || die |
| 129 |
+} |
| 130 |
+ |
| 131 |
src_configure() { |
| 132 |
local mycmakeargs=( |
| 133 |
+ $(cmake_use_find_package annotate kImageAnnotator) |
| 134 |
$(cmake_use_find_package kipi KF5Kipi) |
| 135 |
$(cmake_use_find_package share KF5Purpose) |
| 136 |
) |
Archives