commit: ee5e087cf6e0f07b7d5051417fe3379eb0e06564 Author: Andreas Sturmlechner <andreas.sturmlechner <AT> gmail <DOT> com> AuthorDate: Mon Apr 18 09:40:23 2016 +0000 Commit: Michael Palimaka <kensington <AT> gentoo <DOT> org> CommitDate: Sun Apr 24 17:30:43 2016 +0000 URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=ee5e087c
kde-apps/knotes: Split building upstream Package-Manager: portage-2.2.27 kde-apps/kdepim/kdepim-9999.ebuild | 1 + kde-apps/knotes/knotes-9999.ebuild | 32 ++++++++++++++++++++++---------- 2 files changed, 23 insertions(+), 10 deletions(-) diff --git a/kde-apps/kdepim/kdepim-9999.ebuild b/kde-apps/kdepim/kdepim-9999.ebuild index d9f25dc..43ced87 100644 --- a/kde-apps/kdepim/kdepim-9999.ebuild +++ b/kde-apps/kdepim/kdepim-9999.ebuild @@ -136,6 +136,7 @@ src_prepare() { fi sed -i \ + -e "/akonadi_notes_agent/ s/^/#DONT/" \ -e "/akregator/ s/^/#DONT/" \ -e "/blogilo/ s/^/#DONT/" \ -e "/knotes/ s/^/#DONT/" \ diff --git a/kde-apps/knotes/knotes-9999.ebuild b/kde-apps/knotes/knotes-9999.ebuild index b58a078..918b093 100644 --- a/kde-apps/knotes/knotes-9999.ebuild +++ b/kde-apps/knotes/knotes-9999.ebuild @@ -4,10 +4,9 @@ EAPI=6 -KDE_HANDBOOK="true" -KDE_PIM_KEEP_SUBDIR="noteshared" +KDE_HANDBOOK="forceoptional" KDE_PIM_KONTACTPLUGIN="true" -KDE_PUNT_BOGUS_DEPS="true" +KDE_TEST="forceoptional" KMNAME="kdepim" QT_MINIMAL="5.6.0" inherit kde5 @@ -65,20 +64,33 @@ RDEPEND="${DEPEND} " if [[ ${KDE_BUILD_TYPE} = live ]] ; then - S="${WORKDIR}/${P}" + S="${WORKDIR}/${P}/${PN}" else - S="${WORKDIR}/${KMNAME}-${PV}" + S="${WORKDIR}/${KMNAME}-${PV}/${PN}" fi +src_prepare() { + # knotes subproject does not contain doc + # at least until properly split upstream + echo "add_subdirectory(doc)" >> CMakeLists.txt || die "Failed to add doc dir" + + mkdir doc || die "Failed to create doc dir" + mv ../doc/${PN} doc || die "Failed to move handbook" + mv ../doc/akonadi_notes_agent doc || die "Failed to move handbook" + cat <<-EOF > doc/CMakeLists.txt +add_subdirectory(${PN}) +add_subdirectory(akonadi_notes_agent) +EOF + + kde5_src_prepare +} + src_configure() { - local mycmakeargs=( - -DCMAKE_DISABLE_FIND_PACKAGE_KF5GAPI=ON - -DCMAKE_DISABLE_FIND_PACKAGE_KF5Prison=ON - -DCMAKE_DISABLE_FIND_PACKAGE_Qt5Designer=ON - ) +# local mycmakeargs=( # # FIXME: Does not build (last checked 2016-02-17) # $(cmake-utils_use_find_package X Qt5X11Extras) # $(cmake-utils_use_find_package X X11) +# ) kde5_src_configure }