commit:     c4f7e87f3823e24991136f7570359fb99b4c9adb
Author:     Johannes Huber <johu <AT> gentoo <DOT> org>
AuthorDate: Fri Dec 23 08:47:31 2016 +0000
Commit:     Johannes Huber <johu <AT> gentoo <DOT> org>
CommitDate: Fri Dec 23 08:47:45 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c4f7e87f

app-office/calligra: Version bump 3.0.0

Package-Manager: Portage-2.3.3, Repoman-2.3.1

 app-office/calligra/Manifest                       |   1 +
 app-office/calligra/calligra-3.0.0.ebuild          | 232 +++++++++++++++++++++
 .../files/calligra-3.0.0-no-arch-detection.patch   |  17 ++
 app-office/calligra/metadata.xml                   |   1 +
 4 files changed, 251 insertions(+)

diff --git a/app-office/calligra/Manifest b/app-office/calligra/Manifest
index 22a983d..ddc8d3e 100644
--- a/app-office/calligra/Manifest
+++ b/app-office/calligra/Manifest
@@ -1 +1,2 @@
 DIST calligra-2.9.11.tar.xz 196039892 SHA256 
b18d2d0f87bc92753ec8b1eb780a596770a49141e3e60d811da51e752e54ea09 SHA512 
69fbb38dbc3d59a744ed1fae5361f61bde15da298d28942f226d3d99d399a95f5ee67cca755996290c65943aa9babf6367c44f0d0199dacce22a9879346f82f8
 WHIRLPOOL 
973a17eb639ddfaa5a913b064c90957935ded7fe3fdb5237c27112b6686b3dbe3e411c168f920947ef98c4a3d951842220f849565503fac67ebe75784f339e74
+DIST calligra-3.0.0.tar.gz 131474815 SHA256 
79490a61e876767cb10c9605f48104c3d8b91f76a607424d14ec4c73c0eff0b2 SHA512 
8bf93e1fd2b6d152c046c36c1386610d6607dd7846fd86a1d33bcf1d6bee9623c71b5eeb676ac272c8d8fc3843ce2681af2ba00e97a47e759b293aa58e73d5ca
 WHIRLPOOL 
3ffdc9c0ddc868c2e6632c47cbd9028c0212b293ec9317627757403873f2d84978d0e5a04675bf1d864f583ad40d0543657721d6b1ac3b4c80f8526f78c47e78

diff --git a/app-office/calligra/calligra-3.0.0.ebuild 
b/app-office/calligra/calligra-3.0.0.ebuild
new file mode 100644
index 00000000..9d1016c
--- /dev/null
+++ b/app-office/calligra/calligra-3.0.0.ebuild
@@ -0,0 +1,232 @@
+# Copyright 1999-2016 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/";
+
+case ${PV} in
+       3.[0123456789].[789]?)
+               # beta or rc releases
+               SRC_URI="mirror://kde/unstable/${P}/${P}.tar.gz" ;;
+       3.[0123456789].?)
+               # stable releases
+               SRC_URI="mirror://kde/stable/${P}/${P}.tar.gz"
+esac
+
+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_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}/${P}-no-arch-detection.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[*]}" )
+
+       mycmakeargs+=(
+               -DPACKAGERS_BUILD=OFF
+               -DBUILD_UNMAINTAINED=${experimental}
+               -DWITH_Iconv=ON
+               -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-no-arch-detection.patch 
b/app-office/calligra/files/calligra-3.0.0-no-arch-detection.patch
new file mode 100644
index 00000000..1c544e9
--- /dev/null
+++ b/app-office/calligra/files/calligra-3.0.0-no-arch-detection.patch
@@ -0,0 +1,17 @@
+Avoid automagic CXXFLAG detection courtesy of dev-libs/vc.
+
+Gentoo-bug: 584118
+
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -617,10 +617,6 @@
+     endif()
+     endmacro()
+ 
+-    if (NOT PACKAGERS_BUILD)
+-      # Optimize the whole Calligra for current architecture
+-      set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${Vc_DEFINITIONS}")
+-    endif ()
+ endif()
+ set(CMAKE_MODULE_PATH ${OLD_CMAKE_MODULE_PATH} )
+ 

diff --git a/app-office/calligra/metadata.xml b/app-office/calligra/metadata.xml
index 70bc199..f29d053 100644
--- a/app-office/calligra/metadata.xml
+++ b/app-office/calligra/metadata.xml
@@ -10,6 +10,7 @@
                <name>Gentoo Office project</name>
        </maintainer>
        <use>
+               <flag name="activities">Enable kactivities support</flag>
                <flag name="attica">Get hot stuff with 
<pkg>dev-libs/libattica</pkg></flag>
                <flag name="color-management">Enable color management via 
<pkg>media-libs/opencolorio</pkg></flag>
                <flag name="eigen">Enable <pkg>dev-cpp/eigen</pkg> mathematical 
templates support</flag>

Reply via email to