Version bump, including kchart and kformula in koffice-libs

(Portage version: 2.1.8.3/cvs/Linux x86_64)

4 files changed, 105 insertions, 2 deletions

diff --git a/app-office/koffice-libs/ChangeLog b/app-office/koffice-libs/ChangeLog
index c2b0bc1c4126..f1b32b028f81 100644
--- a/app-office/koffice-libs/ChangeLog
+++ b/app-office/koffice-libs/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for app-office/koffice-libs
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/koffice-libs/ChangeLog,v 1.110 2010/06/21 13:50:53 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/koffice-libs/ChangeLog,v 1.111 2010/09/25 20:20:08 dilfridge Exp $
+
+*koffice-libs-2.2.2 (25 Sep 2010)
+
+  25 Sep 2010; Andreas K. Huettel <dilfridge@gentoo.org>
+  +koffice-libs-2.2.2.ebuild, +files/koffice-libs-2.2.2-kspreadcommon.patch:
+  Version bump, including kchart (temporarily) and kformula (likely
+  permanent) in koffice-libs
 
   21 Jun 2010; Samuli Suominen <ssuominen@gentoo.org>
   koffice-libs-2.1.2.ebuild:
diff --git a/app-office/koffice-libs/files/koffice-libs-2.2.2-kspreadcommon.patch b/app-office/koffice-libs/files/koffice-libs-2.2.2-kspreadcommon.patch
new file mode 100644
index 000000000000..828ffa6ecaac
--- /dev/null
+++ b/app-office/koffice-libs/files/koffice-libs-2.2.2-kspreadcommon.patch
@@ -0,0 +1,12 @@
+diff -r -u koffice-libs-2.2.0.orig/libs/koreport/CMakeLists.txt koffice-libs-2.2.0/libs/koreport/CMakeLists.txt
+--- koffice-libs-2.2.0.orig/libs/koreport/CMakeLists.txt	2010-05-23 08:21:05.000000000 +0200
++++ koffice-libs-2.2.0/libs/koreport/CMakeLists.txt	2010-06-02 22:56:18.104790383 +0200
+@@ -100,7 +100,7 @@
+ target_link_libraries(koreport ${KDE4_KDEUI_LIBS} ${QT_QTGUI_LIBRARY}
+   ${KOPROPERTY_LIBS} kdchart ${KDE4_KROSSCORE_LIBS} komain ${QT_QT3SUPPORT_LIBRARY})
+ if (SHOULD_BUILD_KSPREAD)
+-    target_link_libraries(koreport kspreadcommon)
++    target_link_libraries(koreport)
+ endif (SHOULD_BUILD_KSPREAD)
+ 
+ set_target_properties(koreport PROPERTIES VERSION ${GENERIC_KOFFICE_LIB_VERSION} SOVERSION ${GENERIC_KOFFICE_LIB_SOVERSION} )
diff --git a/app-office/koffice-libs/koffice-libs-2.2.2.ebuild b/app-office/koffice-libs/koffice-libs-2.2.2.ebuild
new file mode 100644
index 000000000000..4d81c28d8ea5
--- /dev/null
+++ b/app-office/koffice-libs/koffice-libs-2.2.2.ebuild
@@ -0,0 +1,81 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-office/koffice-libs/koffice-libs-2.2.2.ebuild,v 1.1 2010/09/25 20:20:08 dilfridge Exp $
+
+EAPI="2"
+
+KMNAME="koffice"
+KMMODULE="libs"
+OPENGL_REQUIRED="optional"
+CPPUNIT_REQUIRED="optional"
+inherit kde4-meta
+
+DESCRIPTION="Shared KOffice libraries."
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+IUSE="crypt openexr reports"
+
+# the contents of kchart have been _temporarily_ moved into koffice-libs in 2.2.0
+
+RDEPEND="
+	>=app-office/koffice-data-${PV}:${SLOT}
+	dev-libs/libxml2
+	dev-libs/libxslt
+	>=kde-base/kdepimlibs-${KDE_MINIMAL}
+	media-libs/lcms:0
+	crypt? ( app-crypt/qca:2 )
+	openexr? ( media-libs/openexr )
+	opengl? ( media-libs/mesa )
+	!<app-office/kchart-2.2.0
+"
+DEPEND="${RDEPEND}"
+#	doc? ( app-doc/doxygen )"
+
+PATCHES=( "${FILESDIR}/${P}-kspreadcommon.patch" )
+
+KMEXTRA="
+	doc/koffice/
+	doc/thesaurus/
+	filters/generic_wrapper/
+	filters/libkowmf/
+	filters/libmsooxml/
+	filters/xsltfilter/
+	filters/kchart/
+	filters/kformula/
+	interfaces/
+	kounavail/
+	plugins/
+	tools/
+	kchart/
+	kformula/
+"
+#	doc/api/"
+KMEXTRACTONLY="
+	doc/koffice.desktop
+	filters/
+"
+
+KMSAVELIBS="true"
+
+src_configure() {
+	mycmakeargs=(
+		$(cmake-utils_use_with crypt QCA2)
+		$(cmake-utils_use_with opengl OpenGL)
+		$(cmake-utils_use_with openexr OpenEXR)
+		-DBUILD_kchart=ON
+		-DBUILD_kformula=ON
+		$(cmake-utils_use_build reports koreport)
+	)
+	use crypt && \
+		mycmakeargs+=(-DQCA2_LIBRARIES=/usr/$(get_libdir)/qca2/libqca.so.2)
+
+	kde4-meta_src_configure
+}
+
+src_install() {
+	newdoc kounavail/README README.kounavail || die
+
+	kde4-meta_src_install
+
+	# this is already installed by koffice-data
+	rm -f "${D}/usr/include/config-opengl.h"
+}
diff --git a/app-office/koffice-libs/metadata.xml b/app-office/koffice-libs/metadata.xml
index 3399d0876645..c3404bd40b29 100644
--- a/app-office/koffice-libs/metadata.xml
+++ b/app-office/koffice-libs/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>kde</herd> 
+<herd>kde</herd>
+<use>
+<flag name="reports">Enable the reports koffice module in kchart, also used by kplato and kexi</flag>
+</use>
 </pkgmetadata>