diff options
| author | Andreas Sturmlechner <andreas.sturmlechner@gmail.com> | 2016-04-18 11:40:23 +0200 |
|---|---|---|
| committer | Andreas Sturmlechner <andreas.sturmlechner@gmail.com> | 2016-04-24 19:30:43 +0200 |
| commit | ee5e087cf6e0f07b7d5051417fe3379eb0e06564 (patch) | |
| tree | 104cd183fafbf756b129bbc79f2dd67c5f17e2cb | |
| parent | f9e1e2608306800a970d46193e4f6e9985f5165f (diff) | |
| download | kde-ee5e087cf6e0f07b7d5051417fe3379eb0e06564.tar.gz kde-ee5e087cf6e0f07b7d5051417fe3379eb0e06564.tar.bz2 kde-ee5e087cf6e0f07b7d5051417fe3379eb0e06564.zip | |
kde-apps/knotes: Split building upstream
Package-Manager: portage-2.2.27
| -rw-r--r-- | kde-apps/kdepim/kdepim-9999.ebuild | 1 | ||||
| -rw-r--r-- | 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 d9f25dc86da..43ced87e89a 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 b58a078ba3b..918b093b3e0 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 } |