Patch Failed Patch: calligra-2.9.6-ghns-linking.patch ! Brakes emerge Reproducible: Always
Created attachment 414780 [details] build.log
Created attachment 414782 [details] patch.out
calligra git master has switched to frameworks, so it'll stay that way until someone is porting the ebuild.
--- calligra-9999.ebuild +++ @@ -9,22 +9,22 @@ EAPI=5 CHECKREQS_DISK_BUILD="4G" +KDE_DOXYGEN="true" KDE_HANDBOOK="optional" -KDE_LINGUAS_LIVE_OVERRIDE="true" -OPENGL_REQUIRED="optional" -inherit check-reqs kde4-base versionator +KDE_TEST="optional" +inherit check-reqs kde5 versionator DESCRIPTION="KDE Office Suite" HOMEPAGE="http://www.calligra.org/" case ${PV} in - 2.[456789].[789]?) + 3.[0123456789].[789]?) # beta or rc releases SRC_URI="mirror://kde/unstable/${P}/${P}.tar.xz" ;; - 2.[456789].?) + 3.[0123456789].?) # stable releases SRC_URI="mirror://kde/stable/${P}/${P}.tar.xz" ;; - 2.[456789].9999) + 3.[0123456789].9999) # stable branch live ebuild SRC_URI="" ;; 9999) @@ -33,19 +33,19 @@ esac LICENSE="GPL-2" -SLOT="4" +SLOT="5" if [[ ${KDE_BUILD_TYPE} == release ]] ; then KEYWORDS="~amd64 ~arm ~x86" fi IUSE="attica color-management +crypt +eigen +exif fftw +fontconfig freetds -+glew +glib +gsf gsl import-filter +jpeg jpeg2k +kdcraw kde +kdepim +lcms -marble mysql +okular openexr +pdf postgres spacenav sybase test tiff +threads -+truetype vc xbase +xml" + +glew +glib +gsf gsl import-filter +jpeg jpeg2k +lcms mysql openexr + opengl +pdf postgres spacenav sybase test tiff +threads +truetype + xbase +xml" # Don't use Active, it's broken on desktops. -CAL_FTS="author braindump flow gemini karbon kexi krita plan sheets stage words" +CAL_FTS="author braindump flow gemini karbon kexi plan sheets stage words" for cal_ft in ${CAL_FTS}; do IUSE+=" calligra_features_${cal_ft}" done @@ -54,18 +54,58 @@ REQUIRED_USE=" calligra_features_author? ( calligra_features_words ) calligra_features_gemini? ( opengl ) - calligra_features_krita? ( eigen exif lcms opengl ) - calligra_features_plan? ( kdepim ) calligra_features_sheets? ( eigen ) - vc? ( calligra_features_krita ) test? ( calligra_features_karbon ) " + #calligra_features_plan? ( kdepim ) +# cmake warnings: not found (optional): kf5: calendarcore contacts akonadicontact akonadi gantt chart qca-qt5 (see below: property kdb report) +# kde4: newstuff + RDEPEND=" - $(add_kdeapps_dep knewstuff) + $(add_frameworks_dep kdelibs4support) + $(add_frameworks_dep kactivities) + $(add_frameworks_dep karchive) + $(add_frameworks_dep kcodecs) + $(add_frameworks_dep kcompletion) + $(add_frameworks_dep kconfig) + $(add_frameworks_dep kconfigwidgets) + $(add_frameworks_dep kcoreaddons) + $(add_frameworks_dep kemoticons) + $(add_frameworks_dep kglobalaccel) + $(add_frameworks_dep kguiaddons) + $(add_frameworks_dep khtml) + $(add_frameworks_dep ki18n) + $(add_frameworks_dep kiconthemes) + $(add_frameworks_dep kio) + $(add_frameworks_dep kitemmodels) + $(add_frameworks_dep kitemviews) + $(add_frameworks_dep knotifications) + $(add_frameworks_dep knotifyconfig) + $(add_frameworks_dep kparts) + $(add_frameworks_dep kross) + $(add_frameworks_dep sonnet) + $(add_frameworks_dep ktexteditor) + $(add_frameworks_dep ktextwidgets) + $(add_frameworks_dep kwallet) + $(add_frameworks_dep kwidgetsaddons) + $(add_frameworks_dep kwindowsystem) + $(add_frameworks_dep kxmlgui) + $(add_frameworks_dep threadweaver) dev-lang/perl dev-libs/boost - dev-qt/qtcore:4[exceptions] + dev-qt/designer:5 + dev-qt/qtconcurrent:5 + dev-qt/qtdbus:5 + dev-qt/qtdeclarative:5 + dev-qt/qtgui:5 + dev-qt/qtnetwork:5 + dev-qt/qtprintsupport:5 + dev-qt/qtscript:5 + dev-qt/qtsvg:5 + dev-qt/qtwidgets:5 + dev-qt/qtx11extras:5 + dev-qt/qtxml:5 media-libs/libpng:0 sys-libs/zlib virtual/libiconv @@ -91,17 +131,13 @@ ) jpeg? ( virtual/jpeg:0 ) jpeg2k? ( media-libs/openjpeg:0 ) - kdcraw? ( $(add_kdeapps_dep libkdcraw) ) - kde? ( $(add_kdebase_dep kactivities) ) - kdepim? ( $(add_kdebase_dep kdepimlibs) ) lcms? ( media-libs/lcms:2 x11-libs/libX11 ) - marble? ( $(add_kdeapps_dep marble) ) mysql? ( virtual/mysql ) - okular? ( $(add_kdeapps_dep okular) ) opengl? ( + dev-qt/qtopengl:5 media-libs/glew virtual/glu ) @@ -118,37 +154,40 @@ sybase? ( dev-db/freetds ) tiff? ( media-libs/tiff:0 ) truetype? ( media-libs/freetype:2 ) - vc? ( dev-libs/vc ) xbase? ( dev-db/xbase ) calligra_features_kexi? ( + $(add_frameworks_dep kdb) + $(add_frameworks_dep kdelibs4support) + $(add_frameworks_dep kproperty) + $(add_frameworks_dep kreport) >=dev-db/sqlite-3.8.7:3[extensions(+)] dev-libs/icu:= ) - calligra_features_krita? ( - dev-qt/qtdeclarative:4 - x11-libs/libX11 - x11-libs/libXi + calligra_features_plan? ( + $(add_frameworks_dep kdelibs4support) + $(add_frameworks_dep kproperty) + $(add_frameworks_dep kreport) + ) + calligra_features_sheets? ( + $(add_frameworks_dep kdelibs4support) ) calligra_features_words? ( dev-libs/libxslt ) " + DEPEND="${RDEPEND} + sys-devel/gettext x11-misc/shared-mime-info " -[[ ${PV} == 9999 ]] && LANGVERSION="2.9" || LANGVERSION="$(get_version_component_range 1-2)" -PDEPEND=">=app-office/calligra-l10n-${LANGVERSION}" - -# bug 394273 -RESTRICT=test - -PATCHES=( "${FILESDIR}/${PN}-2.9.6-ghns-linking.patch" ) +#[[ ${PV} == 9999 ]] && LANGVERSION="3.0" || LANGVERSION="$(get_version_component_range 1-2)" +#PDEPEND=">=app-office/calligra-l10n-${LANGVERSION}" pkg_pretend() { check-reqs_pkg_pretend } pkg_setup() { - kde4-base_pkg_setup + kde5-base_pkg_setup check-reqs_pkg_setup } @@ -199,13 +238,8 @@ $(cmake-utils_use_with import-filter LibWps) $(cmake-utils_use_with jpeg JPEG) $(cmake-utils_use_with jpeg2k OpenJPEG) - $(cmake-utils_use_with kdcraw Kdcraw) - $(cmake-utils_use_with kde KActivities) - $(cmake-utils_use_with kdepim KdepimLibs) $(cmake-utils_use_with lcms LCMS2) - $(cmake-utils_use_with marble CalligraMarble) $(cmake-utils_use_with mysql MySQL) - $(cmake-utils_use_with okular Okular) $(cmake-utils_use_with openexr OpenEXR) $(cmake-utils_use opengl USEOPENGL) $(cmake-utils_use_with pdf Poppler) @@ -217,11 +251,10 @@ $(cmake-utils_use_with tiff TIFF) $(cmake-utils_use_with threads Threads) $(cmake-utils_use_with truetype Freetype) - $(cmake-utils_use_with vc Vc) $(cmake-utils_use_with xbase XBase) ) mycmakeargs+=( $(cmake-utils_use_build test cstester) ) - kde4-base_src_configure + kde5_src_configure }
Thanks for your work, but no one can use the patch like that. Please attach it as file or add a pull request!
Created attachment 419016 [details] calligra-9999.ebuild Sorry, here you go!
Thanks for reporting. Live support is dropped in gentoo main tree. Pull request for KDE Frameworks based version applied in kde overlay. kde overlay is the correct place for experimental stuff. https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=63221ac85e2a09a4b06da22eb7e31dc4650b55b5 https://gitweb.gentoo.org/proj/kde.git/commit/?id=1985c2f94f7a77d1ff4dbb0c389bb017d9125acf
