commit: ca596f8bfb5dccac2c74ba17d47a5574840ef3d5 Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> AuthorDate: Thu Jan 7 23:46:02 2021 +0000 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> CommitDate: Thu Jan 7 23:50:49 2021 +0000 URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=ca596f8b
kde-apps/spectacle: Add IUSE="+annotate" Bug: https://bugs.gentoo.org/760069 Package-Manager: Portage-3.0.12, Repoman-3.0.2 Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> kde-apps/spectacle/metadata.xml | 1 + kde-apps/spectacle/spectacle-20.12.49.9999.ebuild | 20 ++++++++++++-------- kde-apps/spectacle/spectacle-9999.ebuild | 20 ++++++++++++-------- 3 files changed, 25 insertions(+), 16 deletions(-) diff --git a/kde-apps/spectacle/metadata.xml b/kde-apps/spectacle/metadata.xml index 661377e45a..bc2d96259f 100644 --- a/kde-apps/spectacle/metadata.xml +++ b/kde-apps/spectacle/metadata.xml @@ -6,6 +6,7 @@ <name>Gentoo KDE Project</name> </maintainer> <use> + <flag name="annotate">Enable support for screenshot annotations using <pkg>media-libs/kimageannotator</pkg></flag> <flag name="kipi">Enable support for the KDE Image Plugin Interface</flag> <flag name="share">Enable support for a share menu using <pkg>kde-frameworks/purpose</pkg></flag> </use> diff --git a/kde-apps/spectacle/spectacle-20.12.49.9999.ebuild b/kde-apps/spectacle/spectacle-20.12.49.9999.ebuild index 807e57548f..6749b4defc 100644 --- a/kde-apps/spectacle/spectacle-20.12.49.9999.ebuild +++ b/kde-apps/spectacle/spectacle-20.12.49.9999.ebuild @@ -16,19 +16,14 @@ HOMEPAGE="https://apps.kde.org/en/spectacle"; LICENSE="LGPL-2+ handbook? ( FDL-1.3 ) kipi? ( GPL-2+ )" SLOT="5" KEYWORDS="" -IUSE="kipi share" - -# TODO: mv guru.git -> gentoo.git -# IUSE+=" annotate" -# DEPEND+=" -# dev-qt/qtsvg-${QTMIN}:5 -# x11-libs/kimageannotator -# " +IUSE="+annotate kipi share" +# TODO: Qt5Svg leaking from media-libs/kimageannotator DEPEND=" >=dev-qt/qdbus-${QTMIN}:5 >=dev-qt/qtdbus-${QTMIN}:5 >=dev-qt/qtgui-${QTMIN}:5 + >=dev-qt/qtsvg-${QTMIN}:5 >=dev-qt/qtprintsupport-${QTMIN}:5 >=dev-qt/qtwidgets-${QTMIN}:5 >=dev-qt/qtx11extras-${QTMIN}:5 @@ -50,6 +45,7 @@ DEPEND=" x11-libs/xcb-util x11-libs/xcb-util-cursor x11-libs/xcb-util-image + annotate? ( media-libs/kimageannotator ) kipi? ( >=kde-apps/libkipi-${PVCUT}:5= ) share? ( >=kde-frameworks/purpose-${KFMIN}:5 ) " @@ -57,8 +53,16 @@ RDEPEND="${DEPEND} kipi? ( >=kde-apps/kipi-plugins-${PVCUT}:5 ) " +src_prepare() { + ecm_src_prepare + # Unnecessary with >=media-libs/kimageannotator-0.4.0 + sed -e "/find_package\s*(\s*X11/d" -e "/find_package\s*(\s*kColorPicker/d" \ + -i CMakeLists.txt || die +} + src_configure() { local mycmakeargs=( + $(cmake_use_find_package annotate kImageAnnotator) $(cmake_use_find_package kipi KF5Kipi) $(cmake_use_find_package share KF5Purpose) ) diff --git a/kde-apps/spectacle/spectacle-9999.ebuild b/kde-apps/spectacle/spectacle-9999.ebuild index 807e57548f..6749b4defc 100644 --- a/kde-apps/spectacle/spectacle-9999.ebuild +++ b/kde-apps/spectacle/spectacle-9999.ebuild @@ -16,19 +16,14 @@ HOMEPAGE="https://apps.kde.org/en/spectacle"; LICENSE="LGPL-2+ handbook? ( FDL-1.3 ) kipi? ( GPL-2+ )" SLOT="5" KEYWORDS="" -IUSE="kipi share" - -# TODO: mv guru.git -> gentoo.git -# IUSE+=" annotate" -# DEPEND+=" -# dev-qt/qtsvg-${QTMIN}:5 -# x11-libs/kimageannotator -# " +IUSE="+annotate kipi share" +# TODO: Qt5Svg leaking from media-libs/kimageannotator DEPEND=" >=dev-qt/qdbus-${QTMIN}:5 >=dev-qt/qtdbus-${QTMIN}:5 >=dev-qt/qtgui-${QTMIN}:5 + >=dev-qt/qtsvg-${QTMIN}:5 >=dev-qt/qtprintsupport-${QTMIN}:5 >=dev-qt/qtwidgets-${QTMIN}:5 >=dev-qt/qtx11extras-${QTMIN}:5 @@ -50,6 +45,7 @@ DEPEND=" x11-libs/xcb-util x11-libs/xcb-util-cursor x11-libs/xcb-util-image + annotate? ( media-libs/kimageannotator ) kipi? ( >=kde-apps/libkipi-${PVCUT}:5= ) share? ( >=kde-frameworks/purpose-${KFMIN}:5 ) " @@ -57,8 +53,16 @@ RDEPEND="${DEPEND} kipi? ( >=kde-apps/kipi-plugins-${PVCUT}:5 ) " +src_prepare() { + ecm_src_prepare + # Unnecessary with >=media-libs/kimageannotator-0.4.0 + sed -e "/find_package\s*(\s*X11/d" -e "/find_package\s*(\s*kColorPicker/d" \ + -i CMakeLists.txt || die +} + src_configure() { local mycmakeargs=( + $(cmake_use_find_package annotate kImageAnnotator) $(cmake_use_find_package kipi KF5Kipi) $(cmake_use_find_package share KF5Purpose) )
