commit: cbf9fed3838960a561fb7285214499d1f9e449f5 Author: Andreas Sturmlechner <andreas.sturmlechner <AT> gmail <DOT> com> AuthorDate: Sat May 14 13:47:59 2016 +0000 Commit: Michael Palimaka <kensington <AT> gentoo <DOT> org> CommitDate: Sun Jun 5 18:56:56 2016 +0000 URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=cbf9fed3
kde-apps/akonadi: Use KDE_DESIGNERPLUGIN, force tests optional Package-Manager: portage-2.2.28 kde-apps/akonadi/akonadi-16.04.1.ebuild | 14 ++++++-------- kde-apps/akonadi/akonadi-16.04.49.9999.ebuild | 14 ++++++-------- kde-apps/akonadi/akonadi-9999.ebuild | 14 ++++++-------- 3 files changed, 18 insertions(+), 24 deletions(-) diff --git a/kde-apps/akonadi/akonadi-16.04.1.ebuild b/kde-apps/akonadi/akonadi-16.04.1.ebuild index 8327472..99ad093 100644 --- a/kde-apps/akonadi/akonadi-16.04.1.ebuild +++ b/kde-apps/akonadi/akonadi-16.04.1.ebuild @@ -4,17 +4,18 @@ EAPI=6 -KDE_DOXYGEN=true -KDE_TEST=true -VIRTUALDBUS_TEST=true -VIRTUALX_REQUIRED=test +KDE_DESIGNERPLUGIN="true" +KDE_DOXYGEN="true" +KDE_TEST="true" +VIRTUALDBUS_TEST="true" +VIRTUALX_REQUIRED="test" inherit kde5 DESCRIPTION="Storage service for PIM data and libraries for PIM apps" HOMEPAGE="https://pim.kde.org/akonadi"; KEYWORDS="~amd64 ~x86" LICENSE="LGPL-2.1" -IUSE="designer +mysql postgres sqlite tools xml" +IUSE="+mysql postgres sqlite tools xml" REQUIRED_USE="|| ( sqlite mysql postgres ) test? ( tools )" @@ -24,7 +25,6 @@ COMMON_DEPEND=" $(add_frameworks_dep kconfigwidgets) $(add_frameworks_dep kcoreaddons) $(add_frameworks_dep kdbusaddons) - $(add_frameworks_dep kdesignerplugin) $(add_frameworks_dep kguiaddons) $(add_frameworks_dep ki18n) $(add_frameworks_dep kiconthemes) @@ -41,7 +41,6 @@ COMMON_DEPEND=" $(add_qt_dep qtwidgets) $(add_qt_dep qtxml) x11-misc/shared-mime-info - designer? ( $(add_qt_dep designer) ) sqlite? ( dev-db/sqlite:3 ) tools? ( xml? ( dev-libs/libxml2 ) ) " @@ -96,7 +95,6 @@ pkg_setup() { src_configure() { local mycmakeargs=( - $(cmake-utils_use_find_package designer Qt5Designer) -DAKONADI_BUILD_QSQLITE=$(usex sqlite) -DBUILD_TOOLS=$(usex tools) -DKDE_INSTALL_USE_QT_SYS_PATHS=ON diff --git a/kde-apps/akonadi/akonadi-16.04.49.9999.ebuild b/kde-apps/akonadi/akonadi-16.04.49.9999.ebuild index 1333734..85b3060 100644 --- a/kde-apps/akonadi/akonadi-16.04.49.9999.ebuild +++ b/kde-apps/akonadi/akonadi-16.04.49.9999.ebuild @@ -4,17 +4,18 @@ EAPI=6 -KDE_DOXYGEN=true -KDE_TEST=true -VIRTUALDBUS_TEST=true -VIRTUALX_REQUIRED=test +KDE_DESIGNERPLUGIN="true" +KDE_DOXYGEN="true" +KDE_TEST="true" +VIRTUALDBUS_TEST="true" +VIRTUALX_REQUIRED="test" inherit kde5 DESCRIPTION="Storage service for PIM data and libraries for PIM apps" HOMEPAGE="https://pim.kde.org/akonadi"; KEYWORDS="" LICENSE="LGPL-2.1" -IUSE="designer +mysql postgres sqlite tools xml" +IUSE="+mysql postgres sqlite tools xml" REQUIRED_USE="|| ( sqlite mysql postgres ) test? ( tools )" @@ -24,7 +25,6 @@ COMMON_DEPEND=" $(add_frameworks_dep kconfigwidgets) $(add_frameworks_dep kcoreaddons) $(add_frameworks_dep kdbusaddons) - $(add_frameworks_dep kdesignerplugin) $(add_frameworks_dep kguiaddons) $(add_frameworks_dep ki18n) $(add_frameworks_dep kiconthemes) @@ -41,7 +41,6 @@ COMMON_DEPEND=" $(add_qt_dep qtwidgets) $(add_qt_dep qtxml) x11-misc/shared-mime-info - designer? ( $(add_qt_dep designer) ) sqlite? ( dev-db/sqlite:3 ) tools? ( xml? ( dev-libs/libxml2 ) ) " @@ -96,7 +95,6 @@ pkg_setup() { src_configure() { local mycmakeargs=( - $(cmake-utils_use_find_package designer Qt5Designer) -DAKONADI_BUILD_QSQLITE=$(usex sqlite) -DBUILD_TOOLS=$(usex tools) -DKDE_INSTALL_USE_QT_SYS_PATHS=ON diff --git a/kde-apps/akonadi/akonadi-9999.ebuild b/kde-apps/akonadi/akonadi-9999.ebuild index 849a687..7bc0012 100644 --- a/kde-apps/akonadi/akonadi-9999.ebuild +++ b/kde-apps/akonadi/akonadi-9999.ebuild @@ -4,18 +4,19 @@ EAPI=6 -KDE_DOXYGEN=true -KDE_TEST=true -VIRTUALDBUS_TEST=true -VIRTUALX_REQUIRED=test +KDE_DESIGNERPLUGIN="true" +KDE_DOXYGEN="true" +KDE_TEST="forceoptional" QT_MINIMAL="5.6.0" +VIRTUALDBUS_TEST="true" +VIRTUALX_REQUIRED="test" inherit kde5 DESCRIPTION="Storage service for PIM data and libraries for PIM apps" HOMEPAGE="https://pim.kde.org/akonadi"; KEYWORDS="" LICENSE="LGPL-2.1" -IUSE="designer +mysql postgres sqlite tools xml" +IUSE="+mysql postgres sqlite tools xml" REQUIRED_USE="|| ( sqlite mysql postgres ) test? ( tools )" @@ -25,7 +26,6 @@ COMMON_DEPEND=" $(add_frameworks_dep kconfigwidgets) $(add_frameworks_dep kcoreaddons) $(add_frameworks_dep kdbusaddons) - $(add_frameworks_dep kdesignerplugin) $(add_frameworks_dep ki18n) $(add_frameworks_dep kiconthemes) $(add_frameworks_dep kio) @@ -41,7 +41,6 @@ COMMON_DEPEND=" $(add_qt_dep qtwidgets) $(add_qt_dep qtxml) x11-misc/shared-mime-info - designer? ( $(add_qt_dep designer) ) sqlite? ( dev-db/sqlite:3 ) tools? ( xml? ( dev-libs/libxml2 ) ) " @@ -96,7 +95,6 @@ pkg_setup() { src_configure() { local mycmakeargs=( - $(cmake-utils_use_find_package designer Qt5Designer) -DAKONADI_BUILD_QSQLITE=$(usex sqlite) -DBUILD_TOOLS=$(usex tools) -DKDE_INSTALL_USE_QT_SYS_PATHS=ON
