commit: bc67da033112ad06b72a1eb5019f20e0fe987b89 Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> AuthorDate: Wed Jan 4 14:27:54 2017 +0000 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> CommitDate: Fri Jan 6 22:30:34 2017 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bc67da03
app-office/calligra: Drop old Package-Manager: portage-2.3.0 app-office/calligra/calligra-3.0.0.1.ebuild | 235 --------------------- .../files/calligra-3.0.0-optionaldeps.patch | 20 -- 2 files changed, 255 deletions(-) diff --git a/app-office/calligra/calligra-3.0.0.1.ebuild b/app-office/calligra/calligra-3.0.0.1.ebuild deleted file mode 100644 index 15bb5b9..00000000 --- a/app-office/calligra/calligra-3.0.0.1.ebuild +++ /dev/null @@ -1,235 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=6 - -CHECKREQS_DISK_BUILD="4G" -KDE_HANDBOOK="forceoptional" -KDE_TEST="forceoptional" -inherit check-reqs kde5 versionator - -DESCRIPTION="KDE Office Suite" -HOMEPAGE="http://www.calligra.org/"; -[[ ${KDE_BUILD_TYPE} == release ]] && SRC_URI="mirror://kde/stable/${PN}/${PV}/${P}.tar.xz" - -LICENSE="GPL-2" - -[[ ${KDE_BUILD_TYPE} == release ]] && \ -KEYWORDS="~amd64 ~x86" - -CAL_FTS=( karbon plan sheets words ) -CAL_EXP_FTS=( braindump stage ) - -IUSE="activities +crypt +eigen +fontconfig gsl import-filter +lcms pim marble okular - openexr +pdf spacenav +truetype vc +xml X $(printf 'calligra_features_%s ' ${CAL_FTS[@]}) - $(printf 'calligra_experimental_features_%s ' ${CAL_EXP_FTS[@]})" - -REQUIRED_USE="calligra_features_sheets? ( eigen )" - -# TODO: Not packaged: Cauchy (https://bitbucket.org/cyrille/cauchy) -# Required for the matlab/octave formula tool -# drop qtcore subslot operator when QT_MINIMAL >= 5.7.0 -COMMON_DEPEND=" - $(add_frameworks_dep karchive) - $(add_frameworks_dep kcmutils) - $(add_frameworks_dep kcodecs) - $(add_frameworks_dep kcompletion) - $(add_frameworks_dep kconfig) - $(add_frameworks_dep kconfigwidgets) - $(add_frameworks_dep kcoreaddons) - $(add_frameworks_dep kdelibs4support) - $(add_frameworks_dep kemoticons) - $(add_frameworks_dep kglobalaccel) - $(add_frameworks_dep kguiaddons) - $(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 ktexteditor) - $(add_frameworks_dep ktextwidgets) - $(add_frameworks_dep kwallet) - $(add_frameworks_dep kwidgetsaddons) - $(add_frameworks_dep kwindowsystem) - $(add_frameworks_dep kxmlgui) - $(add_frameworks_dep sonnet) - $(add_frameworks_dep threadweaver) - $(add_qt_dep designer) - $(add_qt_dep qtconcurrent) - $(add_qt_dep qtdbus) - $(add_qt_dep qtdeclarative) - $(add_qt_dep qtgui) - $(add_qt_dep qtnetwork) - $(add_qt_dep qtprintsupport) - $(add_qt_dep qtscript) - $(add_qt_dep qtsvg) - $(add_qt_dep qtwidgets) - $(add_qt_dep qtxml) - dev-lang/perl - dev-libs/boost - media-libs/libpng:0 - sys-libs/zlib - virtual/libiconv - activities? ( $(add_frameworks_dep kactivities) ) - crypt? ( app-crypt/qca:2[qt5] ) - eigen? ( dev-cpp/eigen:3 ) - fontconfig? ( media-libs/fontconfig ) - gsl? ( sci-libs/gsl ) - import-filter? ( - $(add_frameworks_dep khtml) - app-text/libetonyek - app-text/libodfgen - app-text/libwpd:* - app-text/libwpg:* - >=app-text/libwps-0.4 - dev-libs/librevenge - media-libs/libvisio - ) - lcms? ( media-libs/lcms:2 ) - marble? ( $(add_kdeapps_dep marble) ) - openexr? ( media-libs/openexr ) - pdf? ( app-text/poppler:=[qt5] ) - spacenav? ( dev-libs/libspnav ) - truetype? ( media-libs/freetype:2 ) - X? ( - $(add_qt_dep qtx11extras) - x11-libs/libX11 - ) - calligra_experimental_features_braindump? ( $(add_qt_dep qtwebkit) ) - calligra_experimental_features_stage? ( - $(add_qt_dep qtwebkit) - okular? ( $(add_kdeapps_dep okular) ) - ) - calligra_features_plan? ( - $(add_frameworks_dep khtml) - $(add_qt_dep qtcore '' '' '5=') - dev-libs/kdiagram:5 - dev-libs/kproperty:5 - dev-libs/kreport:5 - pim? ( - $(add_kdeapps_dep akonadi) - $(add_kdeapps_dep akonadi-contacts) - $(add_kdeapps_dep kcalcore) - $(add_kdeapps_dep kcontacts) - ) - ) - calligra_features_words? ( - dev-libs/libxslt - okular? ( $(add_kdeapps_dep okular) ) - ) -" -DEPEND="${COMMON_DEPEND} - sys-devel/gettext - x11-misc/shared-mime-info - vc? ( >=dev-libs/vc-1.1.0 ) -" -RDEPEND="${COMMON_DEPEND} - calligra_features_karbon? ( media-gfx/pstoedit[plotutils] ) - !app-office/calligra:4 -" -RESTRICT+=" test" - -PATCHES=( - "${FILESDIR}/${PN}-3.0.0-no-arch-detection.patch" - "${FILESDIR}/${PN}-3.0.0-optionaldeps.patch" -) - -pkg_pretend() { - check-reqs_pkg_pretend -} - -pkg_setup() { - kde5_pkg_setup - check-reqs_pkg_setup -} - -src_prepare() { - kde5_src_prepare - - # Unconditionally disable deprecated deps (required by QtQuick1) - punt_bogus_dep Qt5 Declarative - punt_bogus_dep Qt5 OpenGL - - if ! use calligra_experimental_features_stage && \ - ! use calligra_experimental_features_braindump; then - punt_bogus_dep Qt5 WebKitWidgets - punt_bogus_dep Qt5 WebKit - fi - - # Hack around the excessive use of CMake macros - if use okular && ! use calligra_features_words; then - sed -i -e "/add_subdirectory( *okularodtgenerator *)/ s/^/#DONT/" \ - extras/CMakeLists.txt || die "Failed to disable OKULAR_GENERATOR_ODT" - fi - - if use okular && ! use calligra_experimental_features_stage; then - sed -i -e "/add_subdirectory( *okularodpgenerator *)/ s/^/#DONT/" \ - extras/CMakeLists.txt || die "Failed to disable OKULAR_GENERATOR_ODP" - fi -} - -src_configure() { - local cal_ft myproducts experimental=OFF - - # applications - for cal_ft in ${CAL_FTS[@]}; do - if use calligra_features_${cal_ft} ; then - myproducts+=( "${cal_ft^^}" ) - fi - done - # experimental/unmaintained applications - for cal_ft in ${CAL_EXP_FTS[@]}; do - if use calligra_experimental_features_${cal_ft} ; then - experimental=ON - myproducts+=( "${cal_ft^^}" ) - fi - done - - local mycmakeargs=( -DPRODUCTSET="${myproducts[*]}" ) - - if [[ ${KDE_BUILD_TYPE} == release ]] ; then - mycmakeargs+=( - -DRELEASE_BUILD=ON - -DBUILD_UNMAINTAINED=${experimental} - ) - fi - - mycmakeargs+=( - -DPACKAGERS_BUILD=OFF - -DWITH_Iconv=ON - $(cmake-utils_use_find_package activities KF5Activities) - -DWITH_Qca-qt5=$(usex crypt) - -DWITH_Eigen3=$(usex eigen) - -DWITH_Fontconfig=$(usex fontconfig) - -DWITH_GSL=$(usex gsl) - -DWITH_LibEtonyek=$(usex import-filter) - -DWITH_LibOdfGen=$(usex import-filter) - -DWITH_LibRevenge=$(usex import-filter) - -DWITH_LibVisio=$(usex import-filter) - -DWITH_LibWpd=$(usex import-filter) - -DWITH_LibWpg=$(usex import-filter) - -DWITH_LibWps=$(usex import-filter) - $(cmake-utils_use_find_package pim KF5Akonadi) - $(cmake-utils_use_find_package pim KF5AkonadiContact) - $(cmake-utils_use_find_package pim KF5CalendarCore) - $(cmake-utils_use_find_package pim KF5Contacts) - -DWITH_LCMS2=$(usex lcms) - $(cmake-utils_use_find_package marble Marble) - -DWITH_Okular5=$(usex okular) - -DWITH_OpenEXR=$(usex openexr) - -DWITH_Poppler=$(usex pdf) - $(cmake-utils_use_find_package spacenav Spnav) - -ENABLE_CSTESTER_TESTING=$(usex test) - -DWITH_Freetype=$(usex truetype) - -DWITH_Vc=$(usex vc) - -DCMAKE_DISABLE_FIND_PACKAGE_Libgit2=ON - -DCMAKE_DISABLE_FIND_PACKAGE_Libqgit2=ON - ) - - kde5_src_configure -} diff --git a/app-office/calligra/files/calligra-3.0.0-optionaldeps.patch b/app-office/calligra/files/calligra-3.0.0-optionaldeps.patch deleted file mode 100644 index a36edee..00000000 --- a/app-office/calligra/files/calligra-3.0.0-optionaldeps.patch +++ /dev/null @@ -1,20 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 0394af4..e11d998 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -223,11 +223,10 @@ find_package(KF5 ${REQUIRED_KF5_VERSION} REQUIRED - Notifications - KCMUtils - ) --find_package(KF5 ${REQUIRED_KF5_VERSION} QUIET -- OPTIONAL_COMPONENTS -- Activities -- KHtml --) -+ -+find_package(KF5Activities) -+find_package(KF5KHtml) -+ - set_package_properties(KF5Activities PROPERTIES - TYPE OPTIONAL - )
