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

["Andreas Sturmlechner" <asturm@gentoo.org>]

commit:     eab0160da05c97f4a7c663e2fc630d0a00cc513a
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sat Jan  7 10:41:34 2017 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sat Jan  7 10:59:04 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=eab0160d

app-office/calligra: Drop old

Package-Manager: portage-2.3.0

 app-office/calligra/calligra-3.0.0.1-r1.ebuild     | 253 ---------------------
 .../files/calligra-3.0.0.1-reenable-akonadi.patch  | 113 ---------
 2 files changed, 366 deletions(-)

diff --git a/app-office/calligra/calligra-3.0.0.1-r1.ebuild b/app-office/calligra/calligra-3.0.0.1-r1.ebuild
deleted file mode 100644
index 130d128..00000000
--- a/app-office/calligra/calligra-3.0.0.1-r1.ebuild
+++ /dev/null
@@ -1,253 +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-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 +eigen +fontconfig gsl import-filter jpeg2k +lcms okular openexr +pdf
-phonon pim marble 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 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] )
-	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/ilmbase:=
-		media-libs/lcms:2
-	)
-	marble? ( $(add_kdeapps_dep marble) )
-	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 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}
-	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
-	# pending upstream
-	"${FILESDIR}/${P}"-reenable-akonadi.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
-
-	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 jpeg2k OpenJPEG)
-		$(cmake-utils_use_find_package phonon Phonon4Qt5)
-		$(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)
-		-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-reenable-akonadi.patch b/app-office/calligra/files/calligra-3.0.0.1-reenable-akonadi.patch
deleted file mode 100644
index 0ce83b6..00000000
--- a/app-office/calligra/files/calligra-3.0.0.1-reenable-akonadi.patch
+++ /dev/null
@@ -1,113 +0,0 @@
-commit b8de9669eab6487387d76e3181e0d38df46205a5
-Author: Andreas Sturmlechner <andreas.sturmlechner@gmail.com>
-Date:   Wed Jan 4 13:55:13 2017 +0100
-
-    Revert "Workaround bug 311940: Plan crashes when typing a text in..."
-    
-    "...the filter textbox before the textbook is fully loaded when selecting
-     a contact from the adressbook"
-    
-    This reverts commit
-    1fb81d2e5fc2df149261c6fc20a13b4a6a03dd7a
-    and partially
-    b8d7a4034e5e85577e8a7eff523c226ca2d965c5
-
-diff --git a/plan/CMakeLists.txt b/plan/CMakeLists.txt
-index 25427da..119b23c 100644
---- a/plan/CMakeLists.txt
-+++ b/plan/CMakeLists.txt
-@@ -5,10 +5,7 @@ project(kplato)
- add_definitions( -DKDE_DEFAULT_DEBUG_AREA=42000 )
- 
- if (KF5AkonadiContact_FOUND)
--    # disable for now: there is a bug
--    # it only works if you use kde contacts (of course) but many use other stuff, so gets dissapointed
--    # add_definitions(-DPLAN_KDEPIMLIBS_FOUND)
--    message(WARNING "AkonadiContacs available, but funtion is disabled due to Bug 311940")
-+    add_definitions(-DPLAN_KDEPIMLIBS_FOUND)
- endif ()
- 
- if (PLANCHARTDEBUG)
-@@ -25,6 +22,7 @@ set( KPLATO_INCLUDES
-     ${CMAKE_BINARY_DIR}/plan
- 
-     ${KOMAIN_INCLUDES}
-+    ${KDEPIMLIBS_INCLUDE_DIR}
- )
- 
- add_subdirectory( libs )
-diff --git a/plan/kpttaskdefaultpanel.cpp b/plan/kpttaskdefaultpanel.cpp
-index 27eca57..6f119e5 100644
---- a/plan/kpttaskdefaultpanel.cpp
-+++ b/plan/kpttaskdefaultpanel.cpp
-@@ -55,10 +55,6 @@ ConfigTaskPanelImpl::ConfigTaskPanelImpl(QWidget *p )
-     chooseLeader->hide();
- #endif
- 
--    // FIXME
--    // [Bug 311940] New: Plan crashes when typing a text in the filter textbox before the textbook is fully loaded when selecting a contact from the adressbook
--    chooseLeader->hide();
--
-     initDescription();
- 
-     connect(chooseLeader, SIGNAL(clicked()), SLOT(changeLeader()));
-diff --git a/plan/libs/ui/kptmainprojectpanel.cpp b/plan/libs/ui/kptmainprojectpanel.cpp
-index ac7212b..2078d4d 100644
---- a/plan/libs/ui/kptmainprojectpanel.cpp
-+++ b/plan/libs/ui/kptmainprojectpanel.cpp
-@@ -48,10 +48,6 @@ MainProjectPanel::MainProjectPanel(Project &p, QWidget *parent)
-     chooseLeader->hide();
- #endif
- 
--    // FIXME
--    // [Bug 311940] New: Plan crashes when typing a text in the filter textbox before the textbook is fully loaded when selecting a contact from the adressbook
--    chooseLeader->hide();
--
-     QString s = i18n( "The Work Breakdown Structure introduces numbering for all tasks in the project, according to the task structure.\nThe WBS code is auto-generated.\nYou can define the WBS code pattern using the Define WBS Pattern command in the Tools menu." );
-     wbslabel->setWhatsThis( s );
-     wbs->setWhatsThis( s );
-diff --git a/plan/libs/ui/kptresourcedialog.cpp b/plan/libs/ui/kptresourcedialog.cpp
-index 5e092c4..ff9eae0 100644
---- a/plan/libs/ui/kptresourcedialog.cpp
-+++ b/plan/libs/ui/kptresourcedialog.cpp
-@@ -53,10 +53,6 @@ ResourceDialogImpl::ResourceDialogImpl( const Project &project, Resource &resour
-     chooseBtn->hide();
- #endif
- 
--    // FIXME
--    // [Bug 311940] New: Plan crashes when typing a text in the filter textbox before the textbook is fully loaded when selecting a contact from the adressbook
--    chooseBtn->hide();
--
-     QSortFilterProxyModel *pr = new QSortFilterProxyModel( ui_teamView );
-     QStandardItemModel *m = new QStandardItemModel( ui_teamView );
-     pr->setSourceModel( new QStandardItemModel( ui_teamView ) );
-diff --git a/plan/libs/ui/kptsummarytaskgeneralpanel.cpp b/plan/libs/ui/kptsummarytaskgeneralpanel.cpp
-index 1a2af87..dd66ca8 100644
---- a/plan/libs/ui/kptsummarytaskgeneralpanel.cpp
-+++ b/plan/libs/ui/kptsummarytaskgeneralpanel.cpp
-@@ -45,10 +45,6 @@ SummaryTaskGeneralPanel::SummaryTaskGeneralPanel(Task &task, QWidget *p, const c
-     chooseLeader->hide();
- #endif
- 
--    // FIXME
--    // [Bug 311940] New: Plan crashes when typing a text in the filter textbox before the textbook is fully loaded when selecting a contact from the adressbook
--    chooseLeader->hide();
--
-     m_description = new TaskDescriptionPanel( task, this );
-     m_description->namefield->hide();
-     m_description->namelabel->hide();
-diff --git a/plan/libs/ui/kpttaskgeneralpanel.cpp b/plan/libs/ui/kpttaskgeneralpanel.cpp
-index b3c2974..562ea9d 100644
---- a/plan/libs/ui/kpttaskgeneralpanel.cpp
-+++ b/plan/libs/ui/kpttaskgeneralpanel.cpp
-@@ -228,10 +228,6 @@ TaskGeneralPanelImpl::TaskGeneralPanelImpl(QWidget *p, const char *n)
-     chooseLeader->hide();
- #endif
- 
--    // FIXME
--    // [Bug 311940] New: Plan crashes when typing a text in the filter textbox before the textbook is fully loaded when selecting a contact from the adressbook
--    chooseLeader->hide();
--
-     connect(namefield, SIGNAL(textChanged(QString)), SLOT(checkAllFieldsFilled()));
-     connect(leaderfield, SIGNAL(textChanged(QString)), SLOT(checkAllFieldsFilled()));
-     connect(chooseLeader, SIGNAL(clicked()), SLOT(changeLeader()));