[gentoo-commits] repo/gentoo:master commit in: app-office/calligra/, app-office/calligra/files/

[Andreas Sturmlechner]

commit:     d835f1db2c95dfbbb5b97d4d17eade2f89bf3a80
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Fri Mar 31 18:46:52 2017 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Fri Mar 31 20:22:31 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d835f1db

app-office/calligra: Drop old

Package-Manager: Portage-2.3.3, Repoman-2.3.1

 app-office/calligra/Manifest                       |   1 -
 app-office/calligra/calligra-3.0.0.1-r2.ebuild     | 248 ---------------------
 .../calligra/files/calligra-3.0.0.1-deps1.patch    |  31 ---
 .../calligra/files/calligra-3.0.0.1-deps2.patch    |  65 ------
 .../calligra/files/calligra-3.0.0.1-deps3.patch    |  31 ---
 .../files/calligra-3.0.0.1-nokdelibs4.patch        |  38 ----
 .../files/calligra-3.0.0.1-relax-deps.patch        |  34 ---
 7 files changed, 448 deletions(-)

diff --git a/app-office/calligra/Manifest b/app-office/calligra/Manifest
index 32aced423fd..dfb1872d714 100644
--- a/app-office/calligra/Manifest
+++ b/app-office/calligra/Manifest
@@ -1,3 +1,2 @@
 DIST calligra-2.9.11.tar.xz 196039892 SHA256 b18d2d0f87bc92753ec8b1eb780a596770a49141e3e60d811da51e752e54ea09 SHA512 69fbb38dbc3d59a744ed1fae5361f61bde15da298d28942f226d3d99d399a95f5ee67cca755996290c65943aa9babf6367c44f0d0199dacce22a9879346f82f8 WHIRLPOOL 973a17eb639ddfaa5a913b064c90957935ded7fe3fdb5237c27112b6686b3dbe3e411c168f920947ef98c4a3d951842220f849565503fac67ebe75784f339e74
-DIST calligra-3.0.0.1.tar.xz 61111072 SHA256 dedc51efc42f7dda37514d450cb772d9db37a658e0abbcf0f513712a04c1f011 SHA512 826495dfa843f51ecb1139ca8d6d19f6a3fd49e4ca186b4c6a5d1498cdecbfb38461a871153bf8b9944e729725e50918434849acc78c375591636d06ef5d5f6a WHIRLPOOL 085be69fbc32fe54b567e81727aaed7bf613d8c6f2fc9d6eaaac3348e5a4e116278b6da86be953d7d17ea8854dc94021c11c81eb29d8c9a68c517b31457d2242
 DIST calligra-3.0.1.tar.xz 60764344 SHA256 452bddc4e03cfbf48de508b991dc94209d386d86bf010ea9d10afed0f5694db2 SHA512 ec17d007262d598e16045c6c75f8a37dfdf73b980b02ae9bea20282cbd4dd53202f62fc4d8bd84484193a501859c2150079a76d83c1638d8449f41526df57ee0 WHIRLPOOL 6e1dfecb877ee57bf43a9d2ec597972f474b4acb7fe7acff5ad6f72bc81cae9484e4ac7ad425652d6a08051810a1ff99efd2b854ead20b9e437746e080c99397

diff --git a/app-office/calligra/calligra-3.0.0.1-r2.ebuild b/app-office/calligra/calligra-3.0.0.1-r2.ebuild
deleted file mode 100644
index 745e657f988..00000000000
--- a/app-office/calligra/calligra-3.0.0.1-r2.ebuild
+++ /dev/null
@@ -1,248 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-CHECKREQS_DISK_BUILD="4G"
-KDE_HANDBOOK="forceoptional"
-KDE_TEST="forceoptional-recursive"
-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 +fontconfig gsl import-filter jpeg2k +lcms okular openexr +pdf
-	phonon pim spacenav +truetype vc X $(printf 'calligra_features_%s ' ${CAL_FTS[@]})
-	$(printf 'calligra_experimental_features_%s ' ${CAL_EXP_FTS[@]})"
-
-# 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
-# FIXME: Disabled by upstream for good reason
-# Crashes plan (https://bugs.kde.org/show_bug.cgi?id=311940)
-# $(add_kdeapps_dep akonadi)
-# $(add_kdeapps_dep akonadi-contacts)
-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 kjobwidgets)
-	$(add_frameworks_dep knotifications)
-	$(add_frameworks_dep knotifyconfig)
-	$(add_frameworks_dep kparts)
-	$(add_frameworks_dep kross)
-	$(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_qt_dep designer)
-	$(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
-	sys-libs/zlib
-	virtual/libiconv
-	activities? ( $(add_frameworks_dep kactivities) )
-	crypt? ( app-crypt/qca:2[qt5] )
-	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/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? (
-		$(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_karbon? ( jpeg2k? ( media-libs/openjpeg:= ) )
-	calligra_features_plan? (
-		$(add_frameworks_dep khtml)
-		$(add_qt_dep qtcore '' '' '5=')
-		dev-libs/kdiagram:5
-		=dev-libs/kproperty-3.0*:5
-		=dev-libs/kreport-3.0*:5
-		pim? (
-			$(add_kdeapps_dep kcalcore)
-			$(add_kdeapps_dep kcontacts)
-		)
-	)
-	calligra_features_sheets? ( dev-cpp/eigen:3 )
-	calligra_features_words? (
-		dev-libs/libxslt
-		okular? ( $(add_kdeapps_dep okular) )
-	)
-"
-DEPEND="${COMMON_DEPEND}
-	dev-libs/boost
-	sys-devel/gettext
-	x11-misc/shared-mime-info
-	test? ( $(add_frameworks_dep threadweaver) )
-	vc? ( >=dev-libs/vc-1.1.0 )
-"
-RDEPEND="${COMMON_DEPEND}
-	calligra_features_karbon? ( media-gfx/pstoedit[plotutils] )
-	!app-office/calligra:4
-	!app-office/calligra-l10n:4
-"
-RESTRICT+=" test"
-
-PATCHES=(
-	"${FILESDIR}/${PN}"-3.0.0-no-arch-detection.patch
-	# upstream master
-	"${FILESDIR}/${P}"-nokdelibs4.patch
-	"${FILESDIR}/${P}"-relax-deps.patch
-	"${FILESDIR}/${P}"-deps{1,2,3}.patch
-)
-
-pkg_pretend() {
-	check-reqs_pkg_pretend
-}
-
-pkg_setup() {
-	kde5_pkg_setup
-	check-reqs_pkg_setup
-}
-
-src_prepare() {
-	kde5_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)
-	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
-
-	use lcms && myproducts+=( PLUGIN_COLORENGINES )
-	use spacenav && myproducts+=( PLUGIN_SPACENAVIGATOR )
-
-	local mycmakeargs=( -DPRODUCTSET="${myproducts[*]}" )
-
-	if [[ ${KDE_BUILD_TYPE} == release ]] ; then
-		mycmakeargs+=(
-			-DRELEASE_BUILD=ON
-			-DBUILD_UNMAINTAINED=${experimental}
-		)
-	fi
-
-	use calligra_features_karbon && \
-		mycmakeargs+=( $(cmake-utils_use_find_package jpeg2k OpenJPEG) )
-
-	mycmakeargs+=(
-		-DPACKAGERS_BUILD=OFF
-		-DWITH_Iconv=ON
-		$(cmake-utils_use_find_package activities KF5Activities)
-		-DWITH_Qca-qt5=$(usex crypt)
-		-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 phonon Phonon4Qt5)
-		$(cmake-utils_use_find_package pim KF5CalendarCore)
-		$(cmake-utils_use_find_package pim KF5Contacts)
-		-DWITH_LCMS2=$(usex lcms)
-		-DWITH_Okular5=$(usex okular)
-		-DWITH_OpenEXR=$(usex openexr)
-		-DWITH_Poppler=$(usex pdf)
-		-DWITH_Eigen3=$(usex calligra_features_sheets)
-		-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.1-deps1.patch b/app-office/calligra/files/calligra-3.0.0.1-deps1.patch
deleted file mode 100644
index 9ee98ffff6c..00000000000
--- a/app-office/calligra/files/calligra-3.0.0.1-deps1.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-commit 3e3c3a16b9a8b114cc407da9152e20d5dfc422c6
-Author: Andreas Sturmlechner <andreas.sturmlechner@×××××.com>
-Date:   Wed Jan 4 14:10:56 2017 +0100
-
-    Make Activities and KF5Html really optional.
-    
-    Before, trying to use CMAKE_DISABLE_FIND_PACKAGE_KF5{Activities,KHtml}
-    errored out with:
-    
-    "if given arguments: "VERSION_LESS" "5.16.0" Unknown arguments specified"
-
-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
- )

diff --git a/app-office/calligra/files/calligra-3.0.0.1-deps2.patch b/app-office/calligra/files/calligra-3.0.0.1-deps2.patch
deleted file mode 100644
index c0e3587aee6..00000000000
--- a/app-office/calligra/files/calligra-3.0.0.1-deps2.patch
+++ /dev/null
@@ -1,65 +0,0 @@
-commit 511d4014beff9f79aeab1c0013470f21ac6b7df7
-Author: Andreas Sturmlechner <andreas.sturmlechner@×××××.com>
-Date:   Wed Jan 4 14:13:19 2017 +0100
-
-    Fix dependencies, sort and clean trailing whitespaces
-    
-    Add missing KF5JobWidgets
-    Drop unused KF5TextEditor
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index e11d998..6fab26b 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -195,33 +195,33 @@ set(REQUIRED_KF5_VERSION "5.7.0")
- 
- find_package(KF5 ${REQUIRED_KF5_VERSION} REQUIRED
-     COMPONENTS
--        Archive 
--        Codecs 
-+        Archive
-+        Codecs
-         Completion
--        Config 
--        ConfigWidgets 
-+        Config
-+        ConfigWidgets
-         CoreAddons
-         DBusAddons
-         DocTools
--        GuiAddons 
--        I18n 
--        IconThemes 
-+        GuiAddons
-+        I18n
-+        IconThemes
-         ItemViews
-+        JobWidgets
-+        KCMUtils
-         KDELibs4Support
--        KIO 
--        Kross 
--        Parts 
-+        KIO
-+        Kross
-+        Notifications
-+        NotifyConfig
-+        Parts
-         Sonnet
--        TextEditor 
--        TextWidgets 
-+        TextWidgets
-         ThreadWeaver
--        Wallet 
--        WidgetsAddons 
-+        Wallet
-+        WidgetsAddons
-         WindowSystem
--        XmlGui 
--        NotifyConfig
--        Notifications
--        KCMUtils
-+        XmlGui
- )
- 
- find_package(KF5Activities)

diff --git a/app-office/calligra/files/calligra-3.0.0.1-deps3.patch b/app-office/calligra/files/calligra-3.0.0.1-deps3.patch
deleted file mode 100644
index 24591789763..00000000000
--- a/app-office/calligra/files/calligra-3.0.0.1-deps3.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-commit 019f7e77a341661742b179c92cbce485b7ae361e
-Author: Andreas Sturmlechner <andreas.sturmlechner@×××××.com>
-Date:   Wed Jan 4 23:51:32 2017 +0100
-
-    Push KF5Threadweaver dep to the only place where it is used
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 6fab26b..ace6f52 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -217,7 +217,6 @@ find_package(KF5 ${REQUIRED_KF5_VERSION} REQUIRED
-         Parts
-         Sonnet
-         TextWidgets
--        ThreadWeaver
-         Wallet
-         WidgetsAddons
-         WindowSystem
-diff --git a/libs/widgets/tests/CMakeLists.txt b/libs/widgets/tests/CMakeLists.txt
-index 3934630..744828c 100644
---- a/libs/widgets/tests/CMakeLists.txt
-+++ b/libs/widgets/tests/CMakeLists.txt
-@@ -4,6 +4,8 @@ include_directories(  ${KOMAIN_INCLUDES}  ${CMAKE_SOURCE_DIR}/libs/widgets)
- add_definitions(-DFILES_DATA_DIR="${CMAKE_CURRENT_SOURCE_DIR}/data/")
- add_definitions(-DFILES_OUTPUT_DIR="${CMAKE_CURRENT_BINARY_DIR}")
- 
-+find_package(KF5ThreadWeaver ${REQUIRED_KF5_VERSION} REQUIRED)
-+
- #add_subdirectory(filedialogtester)
- 
- # call: kowidgets_add_unit_test(<test-name> <sources> LINK_LIBRARIES <library> [<library> [...]] [GUI])

diff --git a/app-office/calligra/files/calligra-3.0.0.1-nokdelibs4.patch b/app-office/calligra/files/calligra-3.0.0.1-nokdelibs4.patch
deleted file mode 100644
index faf4c87f247..00000000000
--- a/app-office/calligra/files/calligra-3.0.0.1-nokdelibs4.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-commit 8d2383d29beaaad1ebb0b9de2b73589a8b964cdc
-Author: Dag Andersen <danders@×××××××.dk>
-Date:   Thu Jan 5 09:32:12 2017 +0100
-
-    Plan does not depend on Kdelibs4Support
-
-diff --git a/plan/libs/kernel/CMakeLists.txt b/plan/libs/kernel/CMakeLists.txt
-index d85b537..fddb9c3 100644
---- a/plan/libs/kernel/CMakeLists.txt
-+++ b/plan/libs/kernel/CMakeLists.txt
-@@ -45,8 +45,6 @@ target_link_libraries(kplatokernel
-         kowidgetutils
-         kundo2
-         KF5::KIOWidgets
--    PRIVATE
--        KF5::KDELibs4Support
- )
- 
- set_target_properties(kplatokernel PROPERTIES VERSION ${GENERIC_CALLIGRA_LIB_VERSION} SOVERSION ${GENERIC_CALLIGRA_LIB_SOVERSION} )
-commit 3a3ee7863b65313f573593bf868584f829b725f2
-Author: Dag Andersen <danders@×××××××.dk>
-Date:   Thu Jan 5 12:15:04 2017 +0100
-
-    Plan: klocale.h is from kde4, so remove
-
-diff --git a/plan/libs/kernel/kptlocale.cpp b/plan/libs/kernel/kptlocale.cpp
-index 6bfc7d8..2145f7c 100644
---- a/plan/libs/kernel/kptlocale.cpp
-+++ b/plan/libs/kernel/kptlocale.cpp
-@@ -22,8 +22,6 @@
- 
- #include "kptdebug.h"
- 
--#include <klocale.h>
--
- #include <QLocale>
- 
- 

diff --git a/app-office/calligra/files/calligra-3.0.0.1-relax-deps.patch b/app-office/calligra/files/calligra-3.0.0.1-relax-deps.patch
deleted file mode 100644
index 3eeb557239e..00000000000
--- a/app-office/calligra/files/calligra-3.0.0.1-relax-deps.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-From c769476b16068a82c20e195134e7c32ae7c7a081 Mon Sep 17 00:00:00 2001
-From: Dag Andersen <danders@×××××××.dk>
-Date: Thu, 5 Jan 2017 12:51:26 +0100
-Subject: We should accept all 3.0 versions of KReport/KProperty
-
----
- CMakeLists.txt | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 4de94a4..f963bde 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -480,7 +480,7 @@ set_package_properties(KChart PROPERTIES
- ##
- ## Test for KReport
- ##
--macro_optional_find_package(KReport 3.0.0 EXACT QUIET)
-+macro_optional_find_package(KReport 3.0 QUIET)
- set_package_properties(KReport PROPERTIES
-     DESCRIPTION "A framework for the creation and generation of reports in multiple formats"
-     URL "https://community.kde.org/KReport"
-@@ -491,7 +491,7 @@ set_package_properties(KReport PROPERTIES
- ##
- ## Test for KPropertyWidgets
- ##
--macro_optional_find_package(KPropertyWidgets 3.0.0 EXACT QUIET)
-+macro_optional_find_package(KPropertyWidgets 3.0 QUIET)
- set_package_properties(KPropertyWidgets PROPERTIES
-     DESCRIPTION "A property editing framework with editor widget"
-     URL "https://community.kde.org/KProperty"
--- 
-cgit v0.11.2
-