gentoo resync : 25.04.2020

3 files changed, 221 insertions, 0 deletions

diff --git a/app-office/calligra/Manifest b/app-office/calligra/Manifest
index 6a7a825f501b..dfa0f67c2055 100644
--- a/app-office/calligra/Manifest
+++ b/app-office/calligra/Manifest
@@ -10,6 +10,9 @@ AUX calligra-3.1.0-poppler-0.82.patch 1601 BLAKE2B abfa73ee6c675f644ac62f6601fa1
 AUX calligra-3.1.0-poppler-0.83.patch 2617 BLAKE2B 52c493fcaf6e01ad7095a2625def03392699c3d1183aab16bdd2a54ba419237948026ae6a9a1b2ef004d826442b051552e59c4700f8fe32b48d5bf68078d9fd4 SHA512 3683ce8c657ff63a89a2a083c70bcbd8c46583a2c7f9797ca81bdd4bdb0d93866cf4b6eb43fd88358c2a033e93f78bf2257d34eff7b8661dc01a2034bd665116
 AUX calligra-3.1.0-qt-5.11.patch 3537 BLAKE2B 25aa9f832eb49876e0ee28d3af945658f9e93610fa894cb73dc274083febf5d62c97de427c10277f07aa7ef8054f4e0c811c70d4b0c4068cd018a3475c9a7e80 SHA512 f895ee2b9999ab4ff6dae523e4f4ea6f72bd05a8f8163a33f05401b63c08cc3c987a1207d1008ae808db0564c0036194e3d6ab5806c681b793c5191f9e585a7e
 AUX calligra-3.1.0-stage-qt-5.11.patch 656 BLAKE2B 1a4d8f005fd03395617ba0b225302e40b4aaf75c2a838a3009a3b3b6df7e75afdc798f27f08e76b7ad0ea60766612912d06eebe87c209ad9cab45db4bb3ccf54 SHA512 685bfca658404dc9920c805b97832b0a481a0ec0614bf142978c4ae03329e5e93b28d5af09d021b53c6d7a1316404f87612ab316f6a47c3f174572b50c65989b
+AUX calligra-3.1.89-no-arch-detection.patch 404 BLAKE2B ef2ea38d3fdabedd98eafd4b9526a3dd5a7c02f4af8109301f3535969475034795483cfb0fa1f1ddad9fa41ef81409d39bf3a06fb781016217355be646d1affd SHA512 d97d2a26622f43987446ac87b14952b9e46f3b919c84c6ada4b18ebde5aa94e6f69b931ec5d61ab391f9a4811e81eb11f2136f0a3384f644679c0db87943102a
 DIST calligra-3.1.0.tar.xz 58037392 BLAKE2B b933012fe0031f4d6eac626054e7fb248f85635e5873224328d30f9aed31dce0a0a49f99cf6eea9c232477400af1d16ffc4dae483cdfd5081720434e95684e50 SHA512 ad1b689a5b36deafcf6985d4a0a1e8148d10e19fb4a0be8343c6e1d24146b9a8ffa0890ab5bbb21816b3134d21150b57f6159db1a30cc54c0fde5bf7bdf4537b
+DIST calligra-3.2.0.tar.xz 55205468 BLAKE2B 4e59e0e22195894ccd11db4e54841079ec4225ab3e35c166af3bf7a55e96db92a1e9818affa34bc4d99743257569abebc6c14db07dc8e3ac9f62e8e30f944c9e SHA512 625886ae6f0e81eb4c489a9f6bd45b57fdb35fd8131ddf9b59a6fe0a80e338b487f70a90bd28e138281309dbfeb23e49d7ef93856fe1815f4fa16fa37964c013
 EBUILD calligra-3.1.0-r4.ebuild 6221 BLAKE2B 8630aeac685fb914e46be46f4dfa33c92881af8ebed52aa838b3611532efacac93e2a0d0f5d78b142bfce08c368f03408935c2ca0900328b2d52b45237decf61 SHA512 a4785918d0f7e6c08e3524f2b8373ebf477dc0845d3c96d4749af53282ab343e19b25207340efe9d2c5d510af8ae09744047f97645affda26e01d2ef4dc12f89
+EBUILD calligra-3.2.0.ebuild 5781 BLAKE2B 0b0c9530796f94d21717d456dbcb438d55c931649926df9a4227d1d3a4d62c3198a882fb77c061a96e8bdcdc0c2534e902378d64b59158b28aa8aee1f967d55f SHA512 613faa76d8e036ab887db9b4eb87b73fc8febd80ae973e2c5e57499694e1dfa93f04fea1165fe03c6312216fd3c46b5c4267e2bc124e3f538d8523a2fc4509dc
 MISC metadata.xml 1149 BLAKE2B e5461ec7fe1747ce0f4f1b68e3573bcad14183e9a6522f4e2a47fc14cb2a2c968f1bee6d6bf91304d23b981df8c2bdf086222f823ccc6abbe44ff3fcd630ceb0 SHA512 2c6b8ac3f48fa278faf079cfc42b6bdc8ecba994222adfe735489088e1fbb26c60f5f6ef4ff773a64e9a6e5026ef4dff368ec3c2c3c96cd6b0a38b6711b2d7a9
diff --git a/app-office/calligra/calligra-3.2.0.ebuild b/app-office/calligra/calligra-3.2.0.ebuild
new file mode 100644
index 000000000000..dc2f5fb9f55b
--- /dev/null
+++ b/app-office/calligra/calligra-3.2.0.ebuild
@@ -0,0 +1,201 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+CHECKREQS_DISK_BUILD="4G"
+ECM_HANDBOOK="forceoptional"
+ECM_TEST="forceoptional"
+KFMIN=5.60.0
+QTMIN=5.12.3
+inherit check-reqs ecm kde.org
+
+DESCRIPTION="KDE Office Suite"
+HOMEPAGE="https://www.calligra.org/"
+
+if [[ ${KDE_BUILD_TYPE} == release ]]; then
+	SRC_URI="mirror://kde/stable/${PN}/${PV}/${P}.tar.xz"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+CAL_FTS=( karbon sheets stage words )
+
+LICENSE="GPL-2"
+SLOT="5"
+IUSE="activities +charts +crypt +fontconfig gemini gsl import-filter +lcms okular openexr
+	+pdf phonon spacenav +truetype X $(printf 'calligra_features_%s ' ${CAL_FTS[@]})"
+
+# TODO: Not packaged: Cauchy (https://bitbucket.org/cyrille/cauchy)
+# Required for the matlab/octave formula tool
+BDEPEND="
+	sys-devel/gettext
+"
+COMMON_DEPEND="
+	dev-lang/perl
+	>=dev-qt/designer-${QTMIN}:5
+	>=dev-qt/qtdbus-${QTMIN}:5
+	>=dev-qt/qtdeclarative-${QTMIN}:5
+	>=dev-qt/qtgui-${QTMIN}:5
+	>=dev-qt/qtnetwork-${QTMIN}:5
+	>=dev-qt/qtprintsupport-${QTMIN}:5
+	>=dev-qt/qtscript-${QTMIN}:5
+	>=dev-qt/qtsvg-${QTMIN}:5
+	>=dev-qt/qtwidgets-${QTMIN}:5
+	>=dev-qt/qtxml-${QTMIN}:5
+	>=kde-frameworks/karchive-${KFMIN}:5
+	>=kde-frameworks/kcmutils-${KFMIN}:5
+	>=kde-frameworks/kcodecs-${KFMIN}:5
+	>=kde-frameworks/kcompletion-${KFMIN}:5
+	>=kde-frameworks/kconfig-${KFMIN}:5
+	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
+	>=kde-frameworks/kcoreaddons-${KFMIN}:5
+	>=kde-frameworks/kdelibs4support-${KFMIN}:5
+	>=kde-frameworks/kemoticons-${KFMIN}:5
+	>=kde-frameworks/kglobalaccel-${KFMIN}:5
+	>=kde-frameworks/kguiaddons-${KFMIN}:5
+	>=kde-frameworks/ki18n-${KFMIN}:5
+	>=kde-frameworks/kiconthemes-${KFMIN}:5
+	>=kde-frameworks/kio-${KFMIN}:5
+	>=kde-frameworks/kitemmodels-${KFMIN}:5
+	>=kde-frameworks/kitemviews-${KFMIN}:5
+	>=kde-frameworks/kjobwidgets-${KFMIN}:5
+	>=kde-frameworks/knotifications-${KFMIN}:5
+	>=kde-frameworks/knotifyconfig-${KFMIN}:5
+	>=kde-frameworks/kparts-${KFMIN}:5
+	>=kde-frameworks/kross-${KFMIN}:5
+	>=kde-frameworks/ktextwidgets-${KFMIN}:5
+	>=kde-frameworks/kwallet-${KFMIN}:5
+	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
+	>=kde-frameworks/kwindowsystem-${KFMIN}:5
+	>=kde-frameworks/kxmlgui-${KFMIN}:5
+	>=kde-frameworks/sonnet-${KFMIN}:5
+	sys-libs/zlib
+	virtual/libiconv
+	activities? ( >=kde-frameworks/kactivities-${KFMIN}:5 )
+	charts? ( dev-libs/kdiagram:5 )
+	crypt? ( app-crypt/qca:2[qt5(+)] )
+	fontconfig? ( media-libs/fontconfig )
+	gemini? ( >=dev-qt/qtdeclarative-${QTMIN}:5[widgets] )
+	gsl? ( sci-libs/gsl )
+	import-filter? (
+		app-text/libetonyek
+		app-text/libodfgen
+		app-text/libwpd:*
+		app-text/libwpg:*
+		>=app-text/libwps-0.4
+		dev-libs/librevenge
+		>=kde-frameworks/khtml-${KFMIN}:5
+		media-libs/libvisio
+	)
+	lcms? (
+		media-libs/ilmbase:=
+		media-libs/lcms:2
+	)
+	openexr? ( media-libs/openexr )
+	pdf? ( app-text/poppler:=[qt5] )
+	phonon? ( media-libs/phonon[qt5(+)] )
+	spacenav? ( dev-libs/libspnav )
+	truetype? ( media-libs/freetype:2 )
+	X? (
+		>=dev-qt/qtx11extras-${QTMIN}:5
+		x11-libs/libX11
+	)
+	calligra_features_sheets? ( dev-cpp/eigen:3 )
+	calligra_features_stage? ( okular? ( kde-apps/okular:5 ) )
+	calligra_features_words? (
+		dev-libs/libxslt
+		okular? ( kde-apps/okular:5 )
+	)
+"
+DEPEND="${COMMON_DEPEND}
+	dev-libs/boost
+	test? ( >=kde-frameworks/threadweaver-${KFMIN}:5 )
+"
+RDEPEND="${COMMON_DEPEND}
+	calligra_features_karbon? ( media-gfx/pstoedit[plotutils] )
+	gemini? (
+		>=dev-qt/qtquickcontrols2-${QTMIN}:5
+		>=kde-frameworks/kirigami-${KFMIN}:5
+	)
+"
+RESTRICT+=" test"
+
+PATCHES=( "${FILESDIR}"/${PN}-3.1.89-no-arch-detection.patch )
+
+pkg_pretend() {
+	check-reqs_pkg_pretend
+}
+
+pkg_setup() {
+	ecm_pkg_setup
+	check-reqs_pkg_setup
+}
+
+src_prepare() {
+	ecm_src_prepare
+
+	if ! use test; then
+		sed -e "/add_subdirectory( *benchmarks *)/s/^/#DONT/" \
+			-i libs/pigment/CMakeLists.txt || die
+	fi
+
+	# Unconditionally disable deprecated deps (required by QtQuick1)
+	ecm_punt_bogus_dep Qt5 Declarative
+	ecm_punt_bogus_dep Qt5 OpenGL
+
+	# 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_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
+
+	# applications
+	for cal_ft in ${CAL_FTS[@]}; do
+		use calligra_features_${cal_ft} && myproducts+=( "${cal_ft^^}" )
+	done
+
+	use lcms && myproducts+=( PLUGIN_COLORENGINES )
+	use spacenav && myproducts+=( PLUGIN_SPACENAVIGATOR )
+
+	local mycmakeargs=(
+		-DPACKAGERS_BUILD=OFF
+		-DRELEASE_BUILD=ON
+		-DWITH_Iconv=ON
+		-DPRODUCTSET="${myproducts[*]}"
+		$(cmake_use_find_package activities KF5Activities)
+		$(cmake_use_find_package charts KChart)
+		-DWITH_Qca-qt5=$(usex crypt)
+		-DWITH_Fontconfig=$(usex fontconfig)
+		$(cmake_use_find_package gemini Libgit2)
+		$(cmake_use_find_package gemini Qt5QuickWidgets)
+		-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_use_find_package phonon Phonon4Qt5)
+		-DCMAKE_DISABLE_FIND_PACKAGE_KF5CalendarCore=ON
+		-DWITH_LCMS2=$(usex lcms)
+		-DWITH_Okular5=$(usex okular)
+		-DWITH_OpenEXR=$(usex openexr)
+		-DWITH_Poppler=$(usex pdf)
+		-DWITH_Eigen3=$(usex calligra_features_sheets)
+		-DBUILD_UNMAINTAINED=$(usex calligra_features_stage)
+		-ENABLE_CSTESTER_TESTING=$(usex test)
+		-DWITH_Freetype=$(usex truetype)
+	)
+
+	ecm_src_configure
+}
diff --git a/app-office/calligra/files/calligra-3.1.89-no-arch-detection.patch b/app-office/calligra/files/calligra-3.1.89-no-arch-detection.patch
new file mode 100644
index 000000000000..f4efa3d81a48
--- /dev/null
+++ b/app-office/calligra/files/calligra-3.1.89-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} )
+