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

public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed

* [gentoo-commits] dev/dilfridge:master commit in: app-office/calligra/, app-office/calligra/files/
@ 2011-08-19 18:56 Andreas Hüttel
  0 siblings, 0 replies; 3+ messages in thread
From: Andreas Hüttel @ 2011-08-19 18:56 UTC (permalink / raw
  To: gentoo-commits

commit:     dcdc8f9ddae5ddc0c4ba37abe04f7602bccca723
Author:     Andreas K. Huettel (dilfridge) <mail <AT> akhuettel <DOT> de>
AuthorDate: Fri Aug 19 18:56:30 2011 +0000
Commit:     Andreas Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Fri Aug 19 18:56:30 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=dev/dilfridge.git;a=commit;h=dcdc8f9d

Version bump; add lcms2 patch, bug 379431

(Portage version: 2.1.10.11/git/Linux x86_64, signed Manifest commit with key B6C5F7DE)

---
 app-office/calligra/ChangeLog                      |    6 +
 app-office/calligra/Manifest                       |   33 ++--
 app-office/calligra/calligra-2.3.74.ebuild         |  207 ++++++++++++++++++++
 .../calligra/files/calligra-2.3.74-jpeglcms.patch  |   26 +++
 app-office/calligra/metadata.xml                   |    1 +
 5 files changed, 258 insertions(+), 15 deletions(-)

diff --git a/app-office/calligra/ChangeLog b/app-office/calligra/ChangeLog
index 21e2eee..851c8d8 100644
--- a/app-office/calligra/ChangeLog
+++ b/app-office/calligra/ChangeLog
@@ -2,6 +2,12 @@
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
 # $Header: /var/cvsroot/gentoo-x86/app-office/calligra/ChangeLog,v 1.1 2011/07/22 15:10:36 dilfridge Exp $
 
+*calligra-2.3.74 (19 Aug 2011)
+
+  19 Aug 2011; Andreas K. Huettel <dilfridge@gentoo.org>
+  +calligra-2.3.74.ebuild, +files/calligra-2.3.74-jpeglcms.patch, metadata.xml:
+  Version bump; add lcms2 patch, bug 379431
+
   17 Aug 2011; Andreas K. Huettel <dilfridge@gentoo.org> calligra-9999.ebuild:
   Fix dependency
 

diff --git a/app-office/calligra/Manifest b/app-office/calligra/Manifest
index 6ce90f4..e9e2385 100644
--- a/app-office/calligra/Manifest
+++ b/app-office/calligra/Manifest
@@ -1,25 +1,28 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA512
 
+AUX calligra-2.3.74-jpeglcms.patch 723 RMD160 07b5d22e1e2e27dd658c7ec8e10e093e11108f17 SHA1 11cae52b535f8d665ae48d8fa32aa35f7e745ecc SHA256 5cfcb207b7d963fd3c593b5c43bff5774238c69da7a95df20aadd017fa7b6cc1
 DIST calligra-2.3.73.tar.bz2 106302430 RMD160 a9d91574efe3038dfec699734aa7980ac4d3dcac SHA1 ed69912f6570ad37e73ad24c966cab3f8018c00b SHA256 89b9045b47226c61877f521c0d2eb319fb4237bf0b8c86023663b7f435c1ea98
+DIST calligra-2.3.74.tar.bz2 105902759 RMD160 95154039344ac07ec75323821afff8d2e60159ed SHA1 b1ac9f3036f5d52aacd7a9caaa168f7ef5eae8dc SHA256 686a8f5f7eac49c40c53cbdb8cfbb102e765790dd0cfe2d1843975c55921e447
 EBUILD calligra-2.3.73.ebuild 6354 RMD160 a2dea25a05f976f9009cb8d0a1a356517044b4ca SHA1 7cf2e66e45dac685e8a152017ae04cc211ecfc26 SHA256 1415e2b43555e9ac9a7a635a14d151476e55c56e56a3a27d103cafcc7ceea8e2
+EBUILD calligra-2.3.74.ebuild 6409 RMD160 0018ffba31da8aba594477e53da95c9a280e20fe SHA1 c0ea84d69744efa559bdc3ff2c53c4bd7e691caf SHA256 674089160b298b7a024fdcfaf13dacd863330b80cd8f254eb228f9c8758c8d89
 EBUILD calligra-9999.ebuild 6354 RMD160 a2dea25a05f976f9009cb8d0a1a356517044b4ca SHA1 7cf2e66e45dac685e8a152017ae04cc211ecfc26 SHA256 1415e2b43555e9ac9a7a635a14d151476e55c56e56a3a27d103cafcc7ceea8e2
-MISC ChangeLog 749 RMD160 bbf90f26f2f724983d505a96c90486e26204a75f SHA1 0f0ae1fa132736b96493c1407438929edd59c88e SHA256 af15c0b1e9224bfcbdf9772acb5ac85eaf59a5252ed0d35494304ae340e9e67e
-MISC metadata.xml 1319 RMD160 40a3c0370a3631df6e920b49cbb3f7753904c195 SHA1 7a54ca53275e7ba95ba11f2ba203d88942ab60e9 SHA256 adafda1ba32b7b44dc15faf7d5c579cde16af55b058a035f84e82d943427be62
+MISC ChangeLog 963 RMD160 a5a021bcaa9df0256751bc8064b7161715a7cb23 SHA1 68014314dca14a01d76f8bc60751a7263ef089f7 SHA256 526d15bb00583542bf85d9d8d27a2d3713e66b485b75e7342e72866349490f26
+MISC metadata.xml 1344 RMD160 b53db0b6a69ec2f9af559f86fd4aac92fc1c2841 SHA1 f021b47fa8228bfe320098499fcb51cf6506688b SHA256 75c10ffe36493932c8bf9ccaa93301ca9b49e6939bf7be1a42788251deba7885
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iQIcBAEBCgAGBQJOTDbNAAoJENwGBM22xffeHGsP/RaTHbgoVkLoLIg0xqqtTbda
-M7e0fBJ6Cwf6/b+0IWx1rijUsE5rLeKj8NAReHY/bGQMd1+IyUjXpd6zDeAm1rrX
-yjYIEseUCY82PMxGRI0eXAB0ZEzreuDpNtBGwKxqcAa6eyvdHk5R5VTcPUhvAAXd
-OkPon2up20Fs073ZhzfLQTvGswHAE9ObpU54IGggN3n9K0uotVmDNPWs9qvNm7xW
-t2SOu9Z/dTfFpiZdwkWfvOMCsaN3Z+qiTxLfgWP60izGUSdzInpA+xAl0Dr914Dd
-bzjHCqxxPIsJ5SBNwtwu0Nim2KsvvQ6/OxkoRzsQOveg0u0td3agq+Hs4ZQPM/Uc
-rdJuSJIX6fZscXy0HWazcjxH+Btk64naKiVNqTXlprT4Kbnh2TsC1s/1rVLLLky6
-6HSUzfwrKUFEV0B6YRdi6YUsxxWC3OguHuTok3E1ZkF37LYtMSn5+OZLwNbFxJHm
-LJ4ihRQdyxKx6g4pZpImvW0ueuzQ42cbjjmwx1VWRmSrHsLXlXNgH2a4XXEhw0Gh
-so/M1sHn4zpmS8YoxRlN37XwOoJAZo6PCthaZZamFNRjnRGesIFqZoPMP1yre4jO
-RIsZ9uh8rYcHwm8lnbuzuG9pXk9zZLUzjHo3pX9BSHFv05ITSUxQqX7XY64HPdp1
-s+hy1xsVkol+elvpvWHG
-=qNJf
+iQIcBAEBCgAGBQJOTrHeAAoJENwGBM22xffeYwEP/1dhX65pSvC9qmaeDXq0LaIo
+Hxtn4qT//K2AywCH1duL5E6F+V9Gts9rByzwoGfgOn/EdWpN8tAwP1NEIEuXql7o
+AARmioe+Wu4/z7lZQSihgeVXM63CcHKhkryxQA5SA8ya+ZrXGagsZIxt4rKuDrnM
+S4gcmrm11MQXzOt6+AJVBuhZB2i5zy0tSPVyNHLIh0r2tMPqNzgfTY5T1YQHQvq0
+kIDoT9ZmPAaXaLxlMp7GmyWEjJ7tp7ihzs822nzPyMdgSw2Ufz/nJ3xoLsFXo9Mb
+fpPL6TzqAJzsaJtK9bSp0SY4ww5JSnM/7995YfHeYXyn6aJHHJt7T1XVmE/O3rP1
++Ehdm2wx+mOcw7HjOi0cwQ9jMAsn4UzmrNTM9MgepxtL3RU7x467YvKks6TK/nxB
+hmZfCjPdSkioNG5hEwjymRgGtRSOiDADVp7Orhs5EJor8r+N9hnwWWOPBByQGXzY
+loj4/Ws88fMFbZ8N5eoped+6X2rxrjuTDMLFZBGM4EZp0itJbEhgqAh8dD5Iqu5H
+gFO8cgSN+IWQZvSyJhO49yLzXt4xTuHvwTIEmTbIrwX8N9Q/tJtH0y242gM2mqKC
+oStSR4qEDpamQ7WE5ozxDMXR5hApe7jMCfzLXC2WlTFFW//bQDzUuWb2E3sUH9jj
+wMU9AnwHZnn1HTXH4kWH
+=WZHd
 -----END PGP SIGNATURE-----

diff --git a/app-office/calligra/calligra-2.3.74.ebuild b/app-office/calligra/calligra-2.3.74.ebuild
new file mode 100644
index 0000000..18634fa
--- /dev/null
+++ b/app-office/calligra/calligra-2.3.74.ebuild
@@ -0,0 +1,207 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-office/calligra/calligra-2.3.73.ebuild,v 1.2 2011/08/04 16:30:59 scarabeus Exp $
+
+EAPI=4
+
+KDE_SCM=git
+KDE_MINIMAL=4.6
+OPENGL_REQUIRED=optional
+KDE_HANDBOOK=optional
+KDE_LINGUAS_LIVE_OVERRIDE=true
+inherit kde4-base
+
+DESCRIPTION="KDE Office Suite"
+HOMEPAGE="http://www.calligra-suite.org/"
+[[ ${PV} == 9999 ]] || SRC_URI="mirror://kde/unstable/${P}/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="4"
+[[ ${PV} == 9999 ]] || KEYWORDS="~amd64 ~x86"
+IUSE="+boost +crypt +eigen +exif fftw +fontconfig freetds +gif glew +glib +gsf
+gsl +iconv +jpeg jpeg2k +kdcraw kdepim +lcms mysql +mso +okular openctl openexr
++pdf +png postgres +semantic-desktop +ssl tiff +threads +truetype
++wmf word-perfect +xml +xslt"
+
+CAL_FTS="braindump flow karbon kexi kpresenter krita tables words"
+for cal_ft in ${CAL_FTS}; do
+	IUSE+=" calligra_features_${cal_ft}"
+done
+unset cal_ft
+
+RDEPEND="
+	!app-office/koffice-libs
+	dev-db/sqlite:3
+	dev-lang/perl
+	dev-libs/libxml2
+	$(add_kdebase_dep knewstuff)
+	sys-libs/zlib
+	boost? ( dev-libs/boost )
+	crypt? ( app-crypt/qca:2 )
+	eigen? ( dev-cpp/eigen:2 )
+	exif? ( media-gfx/exiv2 )
+	fftw? ( sci-libs/fftw:3.0 )
+	fontconfig? ( media-libs/fontconfig )
+	freetds? ( dev-db/freetds )
+	gif? ( media-libs/giflib )
+	glew? ( media-libs/glew )
+	glib? ( dev-libs/glib:2 )
+	gsf? ( gnome-extra/libgsf )
+	gsl? ( sci-libs/gsl )
+	iconv? ( virtual/libiconv )
+	jpeg? ( virtual/jpeg )
+	jpeg2k? ( media-libs/openjpeg )
+	kdcraw? ( $(add_kdebase_dep libkdcraw) )
+	kdepim? ( $(add_kdebase_dep kdepimlibs) )
+	lcms? ( media-libs/lcms:2 )
+	mysql? ( virtual/mysql )
+	okular? ( $(add_kdebase_dep okular) )
+	openctl? ( >=media-libs/opengtl-0.9.15 )
+	openexr? ( media-libs/openexr )
+	pdf? (
+		app-text/poppler
+		media-gfx/pstoedit
+	)
+	png? ( media-libs/libpng )
+	postgres? ( dev-db/postgresql-base )
+	semantic-desktop? ( dev-libs/soprano )
+	ssl? ( dev-libs/openssl )
+	tiff? ( media-libs/tiff )
+	truetype? ( media-libs/freetype:2 )
+	word-perfect? (
+		app-text/libwpd
+		app-text/libwps
+		app-text/libwpg
+	)
+	xslt? ( dev-libs/libxslt )
+"
+DEPEND="${RDEPEND}"
+
+PATCHES=( "${FILESDIR}/${PN}-2.3.74-jpeglcms.patch" )
+
+# By default all bulds are enabled.
+# When you find out what some option does just describe it here and
+# make it optional if required.
+# The list is copied from ccmake output.
+#
+# BUILD_artistictextshape
+# BUILD_braindump - note collection app ; USE_EXPAND
+# BUILD_calligra - the generic "open file" office app ; default on
+# BUILD_chartshape
+# BUILD_colorengines
+# BUILD_commentshape
+# BUILD_converter
+# BUILD_cstester
+# BUILD_defaultTools
+# BUILD_divineProportion
+# BUILD_doc - handbook stuff, handled by KDE_HANDBOOK=optional
+# BUILD_dockers
+# BUILD_flow - flowcharting app ; used to be kivio ; USE_EXPAND
+# BUILD_generic_wrapper
+# BUILD_karbon - vector drawing app ; handled as USE_EXPAND
+# BUILD_kexi - database manager ; handled as USE_EXPAND
+# BUILD_kformula   << formula editor, should be part of base libs
+# BUILD_koabstraction << part of base libs
+# BUILD_koreport   << reporting library, should be part of base libs
+# BUILD_kounavail  << part of base libs
+# BUILD_kpresenter - presentation creator ; handled as USE_EXPAND (now stage ???)
+# BUILD_krita - image editor ; handled as USE_EXPAND
+# BUILD_kthesaurus << thesaurus framework, should be part of base libs
+# BUILD_libkowmf   << wmf filter ; handled as wmf useflag
+# BUILD_libmsooxml << msooxml filter ; handled as mso useflag
+# BUILD_mdb
+# BUILD_mobile << "Maemo 5 Office UI for KOffice" ; always off
+# BUILD_musicshape
+# BUILD_pathshapes
+# BUILD_pictureshape
+# BUILD_pluginshape
+# BUILD_quickprint
+# BUILD_reporting
+# BUILD_scan
+# BUILD_slidecompare
+# BUILD_staging
+# BUILD_tables - table editor ; handled as USE_EXPAND
+# BUILD_textediting
+# BUILD_textshape
+# BUILD_thumbnail
+# BUILD_treeshape
+# BUILD_variables
+# BUILD_vectorshape
+# BUILD_videoshape
+# BUILD_words - text editor ; handled as USE_EXPAND
+
+src_configure() {
+	local cal_ft
+
+	# first write out things we want to hard-enable
+	local mycmakeargs=(
+		"-DWITH_LibXml2=ON" # harddep for few parts
+		"-DWITH_ZLIB=ON"
+		"-DGHNS=ON"
+		"-DWITH_X11=ON"
+		"-DWITH_Qt4=ON"
+	)
+
+	# default disablers
+	mycmakeargs+=(
+		"-DBUILD_mobile=OFF" # we dont suppor mobile gui, maybe arm could
+		"-DWITH_LCMS=OFF" # we use lcms:2
+		"-DWITH_XBase=OFF" # i am not the one to support this
+		"-DCREATIVEONLY=OFF"
+		"-DWITH_TINY=OFF"
+		"-DWITH_CreateResources=OFF" # NOT PACKAGED: http://create.freedesktop.org/
+		"-DWITH_DCMTK=OFF" # NOT PACKAGED: http://www.dcmtk.org/dcmtk.php.en
+		"-DWITH_Spnav=OFF" # NOT PACKAGED: http://spacenav.sourceforge.net/
+	)
+
+	# regular options
+	mycmakeargs+=(
+		$(cmake-utils_use_with boost Boost)
+		$(cmake-utils_use_with crypt QCA2)
+		$(cmake-utils_use_with eigen Eigen2)
+		$(cmake-utils_use_with exif Exiv2)
+		$(cmake-utils_use_with fftw FFTW3)
+		$(cmake-utils_use_with fontconfig Fontconfig)
+		$(cmake-utils_use_with freetds FreeTDS)
+		$(cmake-utils_use_with gif GIF2)
+		$(cmake-utils_use_with glew GLEW)
+		$(cmake-utils_use_with glib GLIB2)
+		$(cmake-utils_use_with glib GObject)
+		$(cmake-utils_use_with gsf LIBGSF)
+		$(cmake-utils_use_with gsl GSL)
+		$(cmake-utils_use_with iconv Iconv)
+		$(cmake-utils_use_with jpeg JPEG)
+		$(cmake-utils_use_with jpeg2k OpenJPEG)
+		$(cmake-utils_use_with kdcraw Kdcraw)
+		$(cmake-utils_use_with kdepim KdepimLibs)
+		$(cmake-utils_use_with lcms LCMS2)
+		$(cmake-utils_use_with mysql MySQL)
+		$(cmake-utils_use_with okular Okular)
+		$(cmake-utils_use_with openctl OpenCTL)
+		$(cmake-utils_use_with openexr OpenEXR)
+		$(cmake-utils_use_with opengl OpenGL)
+		$(cmake-utils_use_with pdf Poppler)
+		$(cmake-utils_use_with pdf Pstoedit)
+		$(cmake-utils_use_with png PNG)
+		$(cmake-utils_use_with postgres PostgreSQL)
+		$(cmake-utils_use_with semantic-desktop Soprano)
+		$(cmake-utils_use_with ssl OpenSSL)
+		$(cmake-utils_use_with tiff TIFF)
+		$(cmake-utils_use_with threads Threads)
+		$(cmake-utils_use_with truetype Freetype)
+		$(cmake-utils_use_with word-perfect WPD)
+		$(cmake-utils_use_with word-perfect WPG)
+		$(cmake-utils_use_with xslt LibXslt)
+		$(cmake-utils_use_build wmf libkowmf)
+		$(cmake-utils_use_build mso libmsooxml)
+	)
+
+	# applications
+	for cal_ft in ${CAL_FTS}; do
+		mycmakeargs+=( $(cmake-utils_use_build calligra_features_${cal_ft} ${cal_ft}) )
+	done
+
+	# filters
+
+	kde4-base_src_configure
+}

diff --git a/app-office/calligra/files/calligra-2.3.74-jpeglcms.patch b/app-office/calligra/files/calligra-2.3.74-jpeglcms.patch
new file mode 100644
index 0000000..2f9810b
--- /dev/null
+++ b/app-office/calligra/files/calligra-2.3.74-jpeglcms.patch
@@ -0,0 +1,26 @@
+From: Boudewijn Rempt <boud@valdyas.org>
+Date: Tue, 16 Aug 2011 15:50:16 +0000
+Subject: Allow jpeg filter to build with both versions of lcms
+X-Git-Url: http://quickgit.kde.org/?p=calligra.git&amp;a=commitdiff&amp;h=0b4a019f25a7098c8899d3920db2e1901833aaf7
+---
+Allow jpeg filter to build with both versions of lcms
+
+Use HAVE_LCMS, not LCMS_FOUND.
+---
+
+
+--- a/krita/plugins/formats/CMakeLists.txt
++++ b/krita/plugins/formats/CMakeLists.txt
+@@ -31,9 +31,9 @@ if(KDCRAW_FOUND)
+     add_subdirectory( raw )
+ endif(KDCRAW_FOUND)
+ 
+-if(JPEG_FOUND AND LCMS_FOUND)
++if(JPEG_FOUND AND HAVE_LCMS)
+ 	add_subdirectory(jpeg)
+-endif(JPEG_FOUND AND LCMS_FOUND)
++endif(JPEG_FOUND AND HAVE_LCMS)
+ 
+ if(TIFF_FOUND)
+ 	add_subdirectory(tiff)
+

diff --git a/app-office/calligra/metadata.xml b/app-office/calligra/metadata.xml
index 21d5610..9a22140 100644
--- a/app-office/calligra/metadata.xml
+++ b/app-office/calligra/metadata.xml
@@ -5,6 +5,7 @@
 		<email>dilfridge@gentoo.org</email>
 	</maintainer>
 	<herd>kde</herd>
+	<herd>openoffice</herd>
 	<use>
 		<flag name="boost">Enable <pkg>dev-libs/boost</pkg> templating support</flag>
 		<flag name="eigen">Enable <pkg>dev-cpp/eigen</pkg> mathematical templates support</flag>



^ permalink raw reply related	[flat|nested] 3+ messages in thread

* [gentoo-commits] dev/dilfridge:master commit in: app-office/calligra/, app-office/calligra/files/
@ 2011-08-19 22:02 Andreas Hüttel
  0 siblings, 0 replies; 3+ messages in thread
From: Andreas Hüttel @ 2011-08-19 22:02 UTC (permalink / raw
  To: gentoo-commits

commit:     30cbb3c13c4b289b07df40debb9adf1308b7af8b
Author:     Andreas K. Huettel (dilfridge) <mail <AT> akhuettel <DOT> de>
AuthorDate: Fri Aug 19 22:02:19 2011 +0000
Commit:     Andreas Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Fri Aug 19 22:02:19 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=dev/dilfridge.git;a=commit;h=30cbb3c1

Finished overhaul

(Portage version: 2.1.10.11/git/Linux x86_64, RepoMan options: --force, signed Manifest commit with key B6C5F7DE)

---
 app-office/calligra/ChangeLog                      |    5 +
 app-office/calligra/Manifest                       |   33 +++---
 app-office/calligra/calligra-2.3.74.ebuild         |  105 +++++++------------
 .../files/calligra-2.3.74-jpeglcms-2.patch         |   21 ++++
 app-office/calligra/metadata.xml                   |    2 +
 5 files changed, 84 insertions(+), 82 deletions(-)

diff --git a/app-office/calligra/ChangeLog b/app-office/calligra/ChangeLog
index 851c8d8..7d6e8f3 100644
--- a/app-office/calligra/ChangeLog
+++ b/app-office/calligra/ChangeLog
@@ -2,6 +2,11 @@
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
 # $Header: /var/cvsroot/gentoo-x86/app-office/calligra/ChangeLog,v 1.1 2011/07/22 15:10:36 dilfridge Exp $
 
+  19 Aug 2011; Andreas K. Huettel <dilfridge@gentoo.org>
+  calligra-2.3.74.ebuild, +files/calligra-2.3.74-jpeglcms-2.patch,
+  metadata.xml:
+  Finished overhaul
+
 *calligra-2.3.74 (19 Aug 2011)
 
   19 Aug 2011; Andreas K. Huettel <dilfridge@gentoo.org>

diff --git a/app-office/calligra/Manifest b/app-office/calligra/Manifest
index e9e2385..959867e 100644
--- a/app-office/calligra/Manifest
+++ b/app-office/calligra/Manifest
@@ -1,28 +1,29 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA512
 
+AUX calligra-2.3.74-jpeglcms-2.patch 1014 RMD160 cd9532d322789aa655448fb89ffed5835d4e24ae SHA1 fd6770d6b88c360e6a5d0426d6ae0c1f19614720 SHA256 f4593796592cc5973685b1a9b25ca1e4f20b3ed3a64043582324eaa89b301de2
 AUX calligra-2.3.74-jpeglcms.patch 723 RMD160 07b5d22e1e2e27dd658c7ec8e10e093e11108f17 SHA1 11cae52b535f8d665ae48d8fa32aa35f7e745ecc SHA256 5cfcb207b7d963fd3c593b5c43bff5774238c69da7a95df20aadd017fa7b6cc1
 DIST calligra-2.3.73.tar.bz2 106302430 RMD160 a9d91574efe3038dfec699734aa7980ac4d3dcac SHA1 ed69912f6570ad37e73ad24c966cab3f8018c00b SHA256 89b9045b47226c61877f521c0d2eb319fb4237bf0b8c86023663b7f435c1ea98
 DIST calligra-2.3.74.tar.bz2 105902759 RMD160 95154039344ac07ec75323821afff8d2e60159ed SHA1 b1ac9f3036f5d52aacd7a9caaa168f7ef5eae8dc SHA256 686a8f5f7eac49c40c53cbdb8cfbb102e765790dd0cfe2d1843975c55921e447
 EBUILD calligra-2.3.73.ebuild 6354 RMD160 a2dea25a05f976f9009cb8d0a1a356517044b4ca SHA1 7cf2e66e45dac685e8a152017ae04cc211ecfc26 SHA256 1415e2b43555e9ac9a7a635a14d151476e55c56e56a3a27d103cafcc7ceea8e2
-EBUILD calligra-2.3.74.ebuild 6409 RMD160 0018ffba31da8aba594477e53da95c9a280e20fe SHA1 c0ea84d69744efa559bdc3ff2c53c4bd7e691caf SHA256 674089160b298b7a024fdcfaf13dacd863330b80cd8f254eb228f9c8758c8d89
+EBUILD calligra-2.3.74.ebuild 5280 RMD160 9571ca4410c9d106b718524495defcd87b79d7da SHA1 6d578417a67a40ef3b03231ab7ad991ff0937353 SHA256 cf0452d4486ba69d8e19e398e5d4b67344d10e91faf96e761a72859c6129d535
 EBUILD calligra-9999.ebuild 6354 RMD160 a2dea25a05f976f9009cb8d0a1a356517044b4ca SHA1 7cf2e66e45dac685e8a152017ae04cc211ecfc26 SHA256 1415e2b43555e9ac9a7a635a14d151476e55c56e56a3a27d103cafcc7ceea8e2
-MISC ChangeLog 963 RMD160 a5a021bcaa9df0256751bc8064b7161715a7cb23 SHA1 68014314dca14a01d76f8bc60751a7263ef089f7 SHA256 526d15bb00583542bf85d9d8d27a2d3713e66b485b75e7342e72866349490f26
-MISC metadata.xml 1344 RMD160 b53db0b6a69ec2f9af559f86fd4aac92fc1c2841 SHA1 f021b47fa8228bfe320098499fcb51cf6506688b SHA256 75c10ffe36493932c8bf9ccaa93301ca9b49e6939bf7be1a42788251deba7885
+MISC ChangeLog 1124 RMD160 699403f7a0925505b343f71eea9846519c90085f SHA1 0abca167175e6fa86e71b67eea692f7c72288dbe SHA256 70a23aa7dc3b7d8a865e7d3184ce2c43b71cfa2b811087fc14466535f61e9700
+MISC metadata.xml 1493 RMD160 5f1e1818172372ce04d3bf9c1812fbf99136b108 SHA1 517e3baf1c93ac56f14871bd86a2cdcaa323b3f9 SHA256 e67c6c2712484e6e0e0b64d607796b264bd7539e7a24e8a3cf410151a2330685
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iQIcBAEBCgAGBQJOTrHeAAoJENwGBM22xffeYwEP/1dhX65pSvC9qmaeDXq0LaIo
-Hxtn4qT//K2AywCH1duL5E6F+V9Gts9rByzwoGfgOn/EdWpN8tAwP1NEIEuXql7o
-AARmioe+Wu4/z7lZQSihgeVXM63CcHKhkryxQA5SA8ya+ZrXGagsZIxt4rKuDrnM
-S4gcmrm11MQXzOt6+AJVBuhZB2i5zy0tSPVyNHLIh0r2tMPqNzgfTY5T1YQHQvq0
-kIDoT9ZmPAaXaLxlMp7GmyWEjJ7tp7ihzs822nzPyMdgSw2Ufz/nJ3xoLsFXo9Mb
-fpPL6TzqAJzsaJtK9bSp0SY4ww5JSnM/7995YfHeYXyn6aJHHJt7T1XVmE/O3rP1
-+Ehdm2wx+mOcw7HjOi0cwQ9jMAsn4UzmrNTM9MgepxtL3RU7x467YvKks6TK/nxB
-hmZfCjPdSkioNG5hEwjymRgGtRSOiDADVp7Orhs5EJor8r+N9hnwWWOPBByQGXzY
-loj4/Ws88fMFbZ8N5eoped+6X2rxrjuTDMLFZBGM4EZp0itJbEhgqAh8dD5Iqu5H
-gFO8cgSN+IWQZvSyJhO49yLzXt4xTuHvwTIEmTbIrwX8N9Q/tJtH0y242gM2mqKC
-oStSR4qEDpamQ7WE5ozxDMXR5hApe7jMCfzLXC2WlTFFW//bQDzUuWb2E3sUH9jj
-wMU9AnwHZnn1HTXH4kWH
-=WZHd
+iQIcBAEBCgAGBQJOTt1rAAoJENwGBM22xffeKNYQAJgIwrzw6mMypOxijF4GYUTT
+j9tGxOIBQXjCDuuSe52+i3CmCvUN/oY3+MdAlRDsk4MgEXvGxg8sR/SuzXkNac1W
+BK45K6GRuZcDjMb4hplCOYHUkfExLp3vjStaBy1Ji202buNAAP3aHiMj9qiON5V7
+3aiOqXAbh9hOZ1EtadkuGzwnd+H5Ceh/Vhw5TZKRENY0M7pB3sxZItDsPXzahOqY
+afYmhNEzmc0tikQf+B71ftdVll/qkT5o9+Ymvhoy035uhNpYa06U1gc2BwBUBKR+
+cdiakdqUbB3Fl3Xz6LoT2pcgIwcy9BI3KfQebZQAS82yKZ4bfHK0wIC97vaQ/1fP
+/U439cKl1hAMQt0rEnvB0XHTZ2XrIfFDwoU9MYOT8KF0oh0Ma5UdJ/2miKPViigN
+mFzkSK1/UiBB6zR+Xhc6HPgXaVDtEf4cubUpSpI+rSMad99vJNzbihQyH+ZZ+8d5
+T9bkNafzTFDNgOGYa1pq+1NjH8L/KEEHl9S/B4RNyFX9dEkyMi1FEYHnmRxLjZKs
+1mBa3dDXOolsR2hh+hvPCVlmdM/jyuVsgeBcxIlYk9eopmpWAMC04d6948yfYYTs
+5bQxNFMSmR4he06NBxyw0WNa2YptmKl1pH5llLcaVT9SubcxmMPoMzxwk6mJePMc
+Os/GT2zvJ/bDKFGiRw0G
+=77Jo
 -----END PGP SIGNATURE-----

diff --git a/app-office/calligra/calligra-2.3.74.ebuild b/app-office/calligra/calligra-2.3.74.ebuild
index 18634fa..ef3b568 100644
--- a/app-office/calligra/calligra-2.3.74.ebuild
+++ b/app-office/calligra/calligra-2.3.74.ebuild
@@ -2,10 +2,14 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: /var/cvsroot/gentoo-x86/app-office/calligra/calligra-2.3.73.ebuild,v 1.2 2011/08/04 16:30:59 scarabeus Exp $
 
+# note: files that need to be checked for dependencies etc:
+# CMakeLists.txt, kexi/CMakeLists.txt kexi/migration/CMakeLists.txt
+# krita/CMakeLists.txt
+
 EAPI=4
 
 KDE_SCM=git
-KDE_MINIMAL=4.6
+KDE_MINIMAL=4.6.4
 OPENGL_REQUIRED=optional
 KDE_HANDBOOK=optional
 KDE_LINGUAS_LIVE_OVERRIDE=true
@@ -18,25 +22,33 @@ HOMEPAGE="http://www.calligra-suite.org/"
 LICENSE="GPL-2"
 SLOT="4"
 [[ ${PV} == 9999 ]] || KEYWORDS="~amd64 ~x86"
-IUSE="+boost +crypt +eigen +exif fftw +fontconfig freetds +gif glew +glib +gsf
-gsl +iconv +jpeg jpeg2k +kdcraw kdepim +lcms mysql +mso +okular openctl openexr
-+pdf +png postgres +semantic-desktop +ssl tiff +threads +truetype
-+wmf word-perfect +xml +xslt"
+IUSE="+crypt +eigen +exif fftw +fontconfig freetds +gif glew +glib +gsf
+gsl +iconv +jpeg jpeg2k +kdcraw kdepim +lcms marble mysql +mso +okular openctl openexr
++pdf postgres +semantic-desktop +ssl sybase tiff +threads +truetype
++wmf word-perfect xbase +xml +xslt"
 
-CAL_FTS="braindump flow karbon kexi kpresenter krita tables words"
+# please do not sort here, order is same as in CMakeLists.txt
+CAL_FTS="kexi words flow plan stage tables krita karbon braindump active"
 for cal_ft in ${CAL_FTS}; do
 	IUSE+=" calligra_features_${cal_ft}"
 done
 unset cal_ft
 
+REQUIRED_USE="
+	calligra_features_tables? ( eigen )
+	calligra_features_krita? ( eigen exif lcms )
+	calligra_features_plan? ( kdepim )
+"
+
 RDEPEND="
 	!app-office/koffice-libs
 	dev-db/sqlite:3
 	dev-lang/perl
+	dev-libs/boost
 	dev-libs/libxml2
 	$(add_kdebase_dep knewstuff)
+	media-libs/libpng
 	sys-libs/zlib
-	boost? ( dev-libs/boost )
 	crypt? ( app-crypt/qca:2 )
 	eigen? ( dev-cpp/eigen:2 )
 	exif? ( media-gfx/exiv2 )
@@ -54,6 +66,7 @@ RDEPEND="
 	kdcraw? ( $(add_kdebase_dep libkdcraw) )
 	kdepim? ( $(add_kdebase_dep kdepimlibs) )
 	lcms? ( media-libs/lcms:2 )
+	marble? ( $(add_kdebase_dep marble) )
 	mysql? ( virtual/mysql )
 	okular? ( $(add_kdebase_dep okular) )
 	openctl? ( >=media-libs/opengtl-0.9.15 )
@@ -62,10 +75,13 @@ RDEPEND="
 		app-text/poppler
 		media-gfx/pstoedit
 	)
-	png? ( media-libs/libpng )
-	postgres? ( dev-db/postgresql-base )
+	postgres? (
+		dev-db/postgresql-base
+		=dev-libs/libpqxx-3*
+	)
 	semantic-desktop? ( dev-libs/soprano )
 	ssl? ( dev-libs/openssl )
+	sybase? ( dev-db/freetds )
 	tiff? ( media-libs/tiff )
 	truetype? ( media-libs/freetype:2 )
 	word-perfect? (
@@ -73,69 +89,25 @@ RDEPEND="
 		app-text/libwps
 		app-text/libwpg
 	)
+	xbase? ( dev-db/xbase )
 	xslt? ( dev-libs/libxslt )
+	calligra_features_kexi? ( >=dev-db/sqlite-3.7.3 )
 "
 DEPEND="${RDEPEND}"
 
-PATCHES=( "${FILESDIR}/${PN}-2.3.74-jpeglcms.patch" )
-
-# By default all bulds are enabled.
-# When you find out what some option does just describe it here and
-# make it optional if required.
-# The list is copied from ccmake output.
-#
-# BUILD_artistictextshape
-# BUILD_braindump - note collection app ; USE_EXPAND
-# BUILD_calligra - the generic "open file" office app ; default on
-# BUILD_chartshape
-# BUILD_colorengines
-# BUILD_commentshape
-# BUILD_converter
-# BUILD_cstester
-# BUILD_defaultTools
-# BUILD_divineProportion
-# BUILD_doc - handbook stuff, handled by KDE_HANDBOOK=optional
-# BUILD_dockers
-# BUILD_flow - flowcharting app ; used to be kivio ; USE_EXPAND
-# BUILD_generic_wrapper
-# BUILD_karbon - vector drawing app ; handled as USE_EXPAND
-# BUILD_kexi - database manager ; handled as USE_EXPAND
-# BUILD_kformula   << formula editor, should be part of base libs
-# BUILD_koabstraction << part of base libs
-# BUILD_koreport   << reporting library, should be part of base libs
-# BUILD_kounavail  << part of base libs
-# BUILD_kpresenter - presentation creator ; handled as USE_EXPAND (now stage ???)
-# BUILD_krita - image editor ; handled as USE_EXPAND
-# BUILD_kthesaurus << thesaurus framework, should be part of base libs
-# BUILD_libkowmf   << wmf filter ; handled as wmf useflag
-# BUILD_libmsooxml << msooxml filter ; handled as mso useflag
-# BUILD_mdb
-# BUILD_mobile << "Maemo 5 Office UI for KOffice" ; always off
-# BUILD_musicshape
-# BUILD_pathshapes
-# BUILD_pictureshape
-# BUILD_pluginshape
-# BUILD_quickprint
-# BUILD_reporting
-# BUILD_scan
-# BUILD_slidecompare
-# BUILD_staging
-# BUILD_tables - table editor ; handled as USE_EXPAND
-# BUILD_textediting
-# BUILD_textshape
-# BUILD_thumbnail
-# BUILD_treeshape
-# BUILD_variables
-# BUILD_vectorshape
-# BUILD_videoshape
-# BUILD_words - text editor ; handled as USE_EXPAND
+PATCHES=(
+	"${FILESDIR}/${PN}-2.3.74-jpeglcms.patch"
+	"${FILESDIR}/${PN}-2.3.74-jpeglcms-2.patch"
+)
 
 src_configure() {
 	local cal_ft
 
 	# first write out things we want to hard-enable
 	local mycmakeargs=(
-		"-DWITH_LibXml2=ON" # harddep for few parts
+		"-DWITH_Boost=ON"
+		"-DWITH_LibXml2=ON"
+		"-DWITH_PNG=ON"
 		"-DWITH_ZLIB=ON"
 		"-DGHNS=ON"
 		"-DWITH_X11=ON"
@@ -150,13 +122,12 @@ src_configure() {
 		"-DCREATIVEONLY=OFF"
 		"-DWITH_TINY=OFF"
 		"-DWITH_CreateResources=OFF" # NOT PACKAGED: http://create.freedesktop.org/
-		"-DWITH_DCMTK=OFF" # NOT PACKAGED: http://www.dcmtk.org/dcmtk.php.en
-		"-DWITH_Spnav=OFF" # NOT PACKAGED: http://spacenav.sourceforge.net/
+		"-DWITH_DCMTK=OFF"           # NOT PACKAGED: http://www.dcmtk.org/dcmtk.php.en
+		"-DWITH_Spnav=OFF"           # NOT PACKAGED: http://spacenav.sourceforge.net/
 	)
 
 	# regular options
 	mycmakeargs+=(
-		$(cmake-utils_use_with boost Boost)
 		$(cmake-utils_use_with crypt QCA2)
 		$(cmake-utils_use_with eigen Eigen2)
 		$(cmake-utils_use_with exif Exiv2)
@@ -175,6 +146,7 @@ src_configure() {
 		$(cmake-utils_use_with kdcraw Kdcraw)
 		$(cmake-utils_use_with kdepim KdepimLibs)
 		$(cmake-utils_use_with lcms LCMS2)
+		$(cmake-utils_use_with marble Marble)
 		$(cmake-utils_use_with mysql MySQL)
 		$(cmake-utils_use_with okular Okular)
 		$(cmake-utils_use_with openctl OpenCTL)
@@ -182,15 +154,16 @@ src_configure() {
 		$(cmake-utils_use_with opengl OpenGL)
 		$(cmake-utils_use_with pdf Poppler)
 		$(cmake-utils_use_with pdf Pstoedit)
-		$(cmake-utils_use_with png PNG)
 		$(cmake-utils_use_with postgres PostgreSQL)
 		$(cmake-utils_use_with semantic-desktop Soprano)
 		$(cmake-utils_use_with ssl OpenSSL)
+		$(cmake-utils_use_with sybase FreeTDS)
 		$(cmake-utils_use_with tiff TIFF)
 		$(cmake-utils_use_with threads Threads)
 		$(cmake-utils_use_with truetype Freetype)
 		$(cmake-utils_use_with word-perfect WPD)
 		$(cmake-utils_use_with word-perfect WPG)
+		$(cmake-utils_use_with xbase XBase)
 		$(cmake-utils_use_with xslt LibXslt)
 		$(cmake-utils_use_build wmf libkowmf)
 		$(cmake-utils_use_build mso libmsooxml)

diff --git a/app-office/calligra/files/calligra-2.3.74-jpeglcms-2.patch b/app-office/calligra/files/calligra-2.3.74-jpeglcms-2.patch
new file mode 100644
index 0000000..986139f
--- /dev/null
+++ b/app-office/calligra/files/calligra-2.3.74-jpeglcms-2.patch
@@ -0,0 +1,21 @@
+diff -ruN calligra-2.3.74.orig/krita/plugins/formats/jpeg/CMakeLists.txt calligra-2.3.74/krita/plugins/formats/jpeg/CMakeLists.txt
+--- calligra-2.3.74.orig/krita/plugins/formats/jpeg/CMakeLists.txt	2011-08-12 15:51:32.000000000 +0200
++++ calligra-2.3.74/krita/plugins/formats/jpeg/CMakeLists.txt	2011-08-19 23:41:02.000000000 +0200
+@@ -16,7 +16,7 @@
+ 
+ kde4_add_plugin(kritajpegimport ${kritajpegimport_PART_SRCS})
+ 
+-target_link_libraries(kritajpegimport kritaui jpeg ${LCMS_LIBRARIES} ${EXIV2_LIBRARIES} )
++target_link_libraries(kritajpegimport kritaui jpeg ${LCMS2_LIBRARIES} ${EXIV2_LIBRARIES} )
+ 
+ install(TARGETS kritajpegimport  DESTINATION ${PLUGIN_INSTALL_DIR})
+ 
+@@ -31,7 +31,7 @@
+ 
+ kde4_add_plugin(kritajpegexport ${kritajpegexport_PART_SRCS})
+ 
+-target_link_libraries(kritajpegexport kritaui jpeg ${LCMS_LIBRARIES} ${EXIV2_LIBRARIES} )
++target_link_libraries(kritajpegexport kritaui jpeg ${LCMS2_LIBRARIES} ${EXIV2_LIBRARIES} )
+ 
+ install(TARGETS kritajpegexport  DESTINATION ${PLUGIN_INSTALL_DIR})
+ 

diff --git a/app-office/calligra/metadata.xml b/app-office/calligra/metadata.xml
index 9a22140..e37ab86 100644
--- a/app-office/calligra/metadata.xml
+++ b/app-office/calligra/metadata.xml
@@ -14,10 +14,12 @@
 		<flag name="gsf">Enable support for ODT structures extraction via <pkg>gnome-extra/libgsf</pkg></flag>
 		<flag name="kdcraw">Enable support for KDE image manipulating interface via <pkg>kde-base/libkdcraw</pkg></flag>
 		<flag name="kdepim">Enable support for KDEPIM resources integration</flag>
+		<flag name="marble">Enable displaying of maps using Marble</flag>
 		<flag name="mso">Enable support for various MS Office TM file formats</flag>
 		<flag name="okular">Enable bindings for <pkg>kde-base/okular</pkg></flag>
 		<flag name="openctl">Enable support for transformation algorithms via <pkg>media-libs/opengtl</pkg></flag>
 		<flag name="word-perfect">Enable support for various WordPerfect file formats</flag>
+		<flag name="xbase">Enable support for xbase compatible database formats</flag>
 		<flag name="xslt">Enable xslt and exslt support format support</flag>
 	</use>
 </pkgmetadata>



^ permalink raw reply related	[flat|nested] 3+ messages in thread

* [gentoo-commits] dev/dilfridge:master commit in: app-office/calligra/, app-office/calligra/files/
@ 2011-12-22 22:21 Andreas Hüttel
  0 siblings, 0 replies; 3+ messages in thread
From: Andreas Hüttel @ 2011-12-22 22:21 UTC (permalink / raw
  To: gentoo-commits

commit:     292f45023f411895f3f3866cd48ad619fe41ef6d
Author:     Andreas K. Huettel (dilfridge) <mail <AT> akhuettel <DOT> de>
AuthorDate: Thu Dec 22 22:21:49 2011 +0000
Commit:     Andreas Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Thu Dec 22 22:21:49 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=dev/dilfridge.git;a=commit;h=292f4502

[app-office/calligra] Not needed here anymore

---
 app-office/calligra/ChangeLog                      |   44 -----
 app-office/calligra/Manifest                       |   29 ---
 app-office/calligra/calligra-2.3.74.ebuild         |  192 --------------------
 app-office/calligra/calligra-2.3.81.ebuild         |  188 -------------------
 app-office/calligra/calligra-9999.ebuild           |  188 -------------------
 .../files/calligra-2.3.74-jpeglcms-2.patch         |   21 --
 .../calligra/files/calligra-2.3.74-jpeglcms.patch  |   26 ---
 app-office/calligra/metadata.xml                   |   25 ---
 8 files changed, 0 insertions(+), 713 deletions(-)

diff --git a/app-office/calligra/ChangeLog b/app-office/calligra/ChangeLog
deleted file mode 100644
index e883412..0000000
--- a/app-office/calligra/ChangeLog
+++ /dev/null
@@ -1,44 +0,0 @@
-# ChangeLog for app-office/calligra
-# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/calligra/ChangeLog,v 1.1 2011/07/22 15:10:36 dilfridge Exp $
-
-*calligra-2.3.81 (13 Sep 2011)
-
-  13 Sep 2011; Andreas K. Huettel <dilfridge@gentoo.org>
-  +calligra-2.3.81.ebuild, calligra-9999.ebuild:
-  Version bump, untested so far
-
-  26 Aug 2011; Andreas K. Huettel <dilfridge@gentoo.org>
-  -calligra-2.3.73.ebuild, calligra-2.3.74.ebuild, calligra-9999.ebuild:
-  Resync with main tree
-
-  19 Aug 2011; Andreas K. Huettel <dilfridge@gentoo.org>
-  calligra-2.3.74.ebuild, +files/calligra-2.3.74-jpeglcms-2.patch,
-  metadata.xml:
-  Finished overhaul
-
-*calligra-2.3.74 (19 Aug 2011)
-
-  19 Aug 2011; Andreas K. Huettel <dilfridge@gentoo.org>
-  +calligra-2.3.74.ebuild, +files/calligra-2.3.74-jpeglcms.patch, metadata.xml:
-  Version bump; add lcms2 patch, bug 379431
-
-  17 Aug 2011; Andreas K. Huettel <dilfridge@gentoo.org> calligra-9999.ebuild:
-  Fix dependency
-
-  17 Aug 2011; Andreas K. Huettel <dilfridge@gentoo.org>
-  calligra-2.3.73.ebuild:
-  Resync with main tree
-
-*calligra-9999 (22 Jul 2011)
-
-  22 Jul 2011; Andreas K. Huettel <dilfridge@gentoo.org>
-  +calligra-2.3.73.ebuild, +calligra-9999.ebuild, +metadata.xml:
-  Collected all stuff here
-
-*calligra-2.3.73 (22 Jul 2011)
-
-  22 Jul 2011; Andreas K. Huettel <dilfridge@gentoo.org>
-  +calligra-2.3.73.ebuild, +metadata.xml:
-  New application
-

diff --git a/app-office/calligra/Manifest b/app-office/calligra/Manifest
deleted file mode 100644
index a73c73f..0000000
--- a/app-office/calligra/Manifest
+++ /dev/null
@@ -1,29 +0,0 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
-
-AUX calligra-2.3.74-jpeglcms-2.patch 1014 RMD160 cd9532d322789aa655448fb89ffed5835d4e24ae SHA1 fd6770d6b88c360e6a5d0426d6ae0c1f19614720 SHA256 f4593796592cc5973685b1a9b25ca1e4f20b3ed3a64043582324eaa89b301de2
-AUX calligra-2.3.74-jpeglcms.patch 723 RMD160 07b5d22e1e2e27dd658c7ec8e10e093e11108f17 SHA1 11cae52b535f8d665ae48d8fa32aa35f7e745ecc SHA256 5cfcb207b7d963fd3c593b5c43bff5774238c69da7a95df20aadd017fa7b6cc1
-DIST calligra-2.3.74.tar.bz2 105902759 RMD160 95154039344ac07ec75323821afff8d2e60159ed SHA1 b1ac9f3036f5d52aacd7a9caaa168f7ef5eae8dc SHA256 686a8f5f7eac49c40c53cbdb8cfbb102e765790dd0cfe2d1843975c55921e447
-DIST calligra-2.3.81.tar.bz2 106703668 RMD160 6f1b272f6145cf7a8a42739ed41c684e28b0cdce SHA1 a5a6a15c1fc65d1076e3eb0b10a99ea0547f183d SHA256 accb7d0466037be9c58e24a397b75243e1ee83ce6621a2cbe1a8e197fd67a4b1
-EBUILD calligra-2.3.74.ebuild 5626 RMD160 e2d99aea615eab8c0baa2a019d15c4c663703c99 SHA1 878736ee9745290fdcf87634461bee10a0cdc48f SHA256 6b21cf35ae71a67adf795c598006af10ace2305f510414ba50e7d675808543a8
-EBUILD calligra-2.3.81.ebuild 5545 RMD160 a9735ed9f0d003a44992cd302d1aeb25ecfe1430 SHA1 c3fc9e1344cc8baf4a9ac9c0902a6d95325a63e6 SHA256 e3caae855ac3750a922416ef8b99db927a7d824c32d4cf0282a099720337ed08
-EBUILD calligra-9999.ebuild 5545 RMD160 a9735ed9f0d003a44992cd302d1aeb25ecfe1430 SHA1 c3fc9e1344cc8baf4a9ac9c0902a6d95325a63e6 SHA256 e3caae855ac3750a922416ef8b99db927a7d824c32d4cf0282a099720337ed08
-MISC ChangeLog 1450 RMD160 79a397515c55562ad7543207c2712898ca2189c0 SHA1 b7d4d513b2c2c185e221283b3beed75bda92c75e SHA256 34e3b7918b9acedfdeed65188a69922580eee0301c14f69f17fc9c9ce81440ae
-MISC metadata.xml 1493 RMD160 5f1e1818172372ce04d3bf9c1812fbf99136b108 SHA1 517e3baf1c93ac56f14871bd86a2cdcaa323b3f9 SHA256 e67c6c2712484e6e0e0b64d607796b264bd7539e7a24e8a3cf410151a2330685
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
-
-iQIcBAEBCgAGBQJOb9PbAAoJENwGBM22xffeKScP/i6SEZ/FT38yoNwGsbrWtodi
-PEQQugb74pWQ7QyuUiVIpL+z4V5kVslChYW8Q5GpT3fxae4EFjGCk3ddijPZAoAO
-B1E3RE1Ib8E+vM3Ql4DzASDQ7gN1YtAmFC7IPpI/fWos4QgTlqZjjzVsM1ir1yjo
-7qVt8SNBnXLAQRmi91tBuTfV/4BlT94vYEoFHTAWUUqznQ3vOOkNtPXYJIpJ7hvT
-iyBl2mLcJercN7s9Ra0n/I5BhECeiC6e1XpwUlGE3Ie8p9qyLqGq7cs+E/AYIh4/
-3uactmZDBB4XcQ0fVSr9uDS8FHFOqArRi+W6KH+DUiSMDwDM1I+jVEOEtbbZvyaX
-xRqQ6MfeSnaRjFWn1trY9w9frI1syG7jeHKJf4QsiLOWwQi5XryO10OKpQVz6eQt
-lz3bD3uH1scrjIBSkw9eY7gaakiTzJ1AdsqGvarNNOsoSg/xUosLarPPs/g4dil7
-Akeml2PaZkcIa6/FAbsZG48FWpnIb2dZShPugSDi00liIcAaQqj2ydevDaSJ/HVT
-+/LD0+ILVNGrPwrjDEhxi/Z/w/MPYpYsx9b1k/1nC9ZvHZdCOcYEFM0qWggCBggB
-KGPMo4GTizSESB90eufg3ewxaZ2Z4eKp8jSVFONDO/gCM8ESkOTiGPNf8zQyoxuj
-Cp4PLYxSJrF25OFeGHX0
-=oPxD
------END PGP SIGNATURE-----

diff --git a/app-office/calligra/calligra-2.3.74.ebuild b/app-office/calligra/calligra-2.3.74.ebuild
deleted file mode 100644
index 23ca37e..0000000
--- a/app-office/calligra/calligra-2.3.74.ebuild
+++ /dev/null
@@ -1,192 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/calligra/calligra-2.3.74.ebuild,v 1.5 2011/08/26 20:46:55 dilfridge Exp $
-
-# note: files that need to be checked for dependencies etc:
-# CMakeLists.txt, kexi/CMakeLists.txt kexi/migration/CMakeLists.txt
-# krita/CMakeLists.txt
-
-EAPI=4
-
-KDE_SCM=git
-KDE_MINIMAL=4.6.4
-OPENGL_REQUIRED=optional
-KDE_HANDBOOK=optional
-KDE_LINGUAS_LIVE_OVERRIDE=true
-inherit kde4-base
-
-DESCRIPTION="KDE Office Suite"
-HOMEPAGE="http://www.calligra-suite.org/"
-[[ ${PV} == 9999 ]] || SRC_URI="mirror://kde/unstable/${P}/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="4"
-[[ ${PV} == 9999 ]] || KEYWORDS="~amd64 ~x86"
-IUSE="+crypt +eigen +exif fftw +fontconfig freetds +gif glew +glib +gsf
-gsl +iconv +jpeg jpeg2k +kdcraw kdepim +lcms marble mysql +mso +okular openctl openexr
-+pdf postgres +semantic-desktop +ssl sybase test tiff +threads +truetype
-+wmf word-perfect xbase +xml +xslt"
-
-# please do not sort here, order is same as in CMakeLists.txt
-CAL_FTS="kexi words flow plan stage tables krita karbon braindump"
-for cal_ft in ${CAL_FTS}; do
-	IUSE+=" calligra_features_${cal_ft}"
-done
-unset cal_ft
-
-REQUIRED_USE="
-	calligra_features_kexi? ( calligra_features_tables )
-	calligra_features_krita? ( eigen exif lcms )
-	calligra_features_plan? ( kdepim )
-	calligra_features_tables? ( eigen )
-	test? ( calligra_features_karbon )
-"
-
-RDEPEND="
-	!app-office/karbon
-	!app-office/koffice-data
-	!app-office/koffice-l10n
-	!app-office/koffice-libs
-	!app-office/koffice-meta
-	!app-office/krita
-	!app-office/kplato
-	!app-office/kpresenter
-	!app-office/kspread
-	!app-office/kword
-	dev-db/sqlite:3
-	dev-lang/perl
-	dev-libs/boost
-	dev-libs/libxml2
-	$(add_kdebase_dep knewstuff)
-	media-libs/libpng
-	sys-libs/zlib
-	crypt? ( app-crypt/qca:2 )
-	eigen? ( dev-cpp/eigen:2 )
-	exif? ( media-gfx/exiv2 )
-	fftw? ( sci-libs/fftw:3.0 )
-	fontconfig? ( media-libs/fontconfig )
-	freetds? ( dev-db/freetds )
-	gif? ( media-libs/giflib )
-	glew? ( media-libs/glew )
-	glib? ( dev-libs/glib:2 )
-	gsf? ( gnome-extra/libgsf )
-	gsl? ( sci-libs/gsl )
-	iconv? ( virtual/libiconv )
-	jpeg? ( virtual/jpeg )
-	jpeg2k? ( media-libs/openjpeg )
-	kdcraw? ( $(add_kdebase_dep libkdcraw) )
-	kdepim? ( $(add_kdebase_dep kdepimlibs) )
-	lcms? ( media-libs/lcms:2 )
-	marble? ( $(add_kdebase_dep marble) )
-	mysql? ( virtual/mysql )
-	okular? ( $(add_kdebase_dep okular) )
-	openctl? ( >=media-libs/opengtl-0.9.15 )
-	openexr? ( media-libs/openexr )
-	pdf? (
-		app-text/poppler
-		media-gfx/pstoedit
-	)
-	postgres? (
-		dev-db/postgresql-base
-		=dev-libs/libpqxx-3*
-	)
-	semantic-desktop? ( dev-libs/soprano )
-	ssl? ( dev-libs/openssl )
-	sybase? ( dev-db/freetds )
-	tiff? ( media-libs/tiff )
-	truetype? ( media-libs/freetype:2 )
-	word-perfect? (
-		app-text/libwpd
-		app-text/libwps
-		app-text/libwpg
-	)
-	xbase? ( dev-db/xbase )
-	xslt? ( dev-libs/libxslt )
-	calligra_features_kexi? ( >=dev-db/sqlite-3.7.3 )
-"
-DEPEND="${RDEPEND}"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-2.3.74-jpeglcms.patch"
-	"${FILESDIR}/${PN}-2.3.74-jpeglcms-2.patch"
-)
-
-src_configure() {
-	local cal_ft
-
-	# first write out things we want to hard-enable
-	local mycmakeargs=(
-		"-DWITH_Boost=ON"
-		"-DWITH_LibXml2=ON"
-		"-DWITH_PNG=ON"
-		"-DWITH_ZLIB=ON"
-		"-DGHNS=ON"
-		"-DWITH_X11=ON"
-		"-DWITH_Qt4=ON"
-	)
-
-	# default disablers
-	mycmakeargs+=(
-		"-DBUILD_mobile=OFF" # we dont suppor mobile gui, maybe arm could
-		"-DWITH_LCMS=OFF" # we use lcms:2
-		"-DWITH_XBase=OFF" # i am not the one to support this
-		"-DCREATIVEONLY=OFF"
-		"-DWITH_TINY=OFF"
-		"-DWITH_CreateResources=OFF" # NOT PACKAGED: http://create.freedesktop.org/
-		"-DWITH_DCMTK=OFF"           # NOT PACKAGED: http://www.dcmtk.org/dcmtk.php.en
-		"-DWITH_Spnav=OFF"           # NOT PACKAGED: http://spacenav.sourceforge.net/
-	)
-
-	# regular options
-	mycmakeargs+=(
-		$(cmake-utils_use_with crypt QCA2)
-		$(cmake-utils_use_with eigen Eigen2)
-		$(cmake-utils_use_with exif Exiv2)
-		$(cmake-utils_use_with fftw FFTW3)
-		$(cmake-utils_use_with fontconfig Fontconfig)
-		$(cmake-utils_use_with freetds FreeTDS)
-		$(cmake-utils_use_with gif GIF2)
-		$(cmake-utils_use_with glew GLEW)
-		$(cmake-utils_use_with glib GLIB2)
-		$(cmake-utils_use_with glib GObject)
-		$(cmake-utils_use_with gsf LIBGSF)
-		$(cmake-utils_use_with gsl GSL)
-		$(cmake-utils_use_with iconv Iconv)
-		$(cmake-utils_use_with jpeg JPEG)
-		$(cmake-utils_use_with jpeg2k OpenJPEG)
-		$(cmake-utils_use_with kdcraw Kdcraw)
-		$(cmake-utils_use_with kdepim KdepimLibs)
-		$(cmake-utils_use_with lcms LCMS2)
-		$(cmake-utils_use_with marble Marble)
-		$(cmake-utils_use_with mysql MySQL)
-		$(cmake-utils_use_with okular Okular)
-		$(cmake-utils_use_with openctl OpenCTL)
-		$(cmake-utils_use_with openexr OpenEXR)
-		$(cmake-utils_use_with opengl OpenGL)
-		$(cmake-utils_use_with pdf Poppler)
-		$(cmake-utils_use_with pdf Pstoedit)
-		$(cmake-utils_use_with postgres PostgreSQL)
-		$(cmake-utils_use_with semantic-desktop Soprano)
-		$(cmake-utils_use_with ssl OpenSSL)
-		$(cmake-utils_use_with sybase FreeTDS)
-		$(cmake-utils_use_with tiff TIFF)
-		$(cmake-utils_use_with threads Threads)
-		$(cmake-utils_use_with truetype Freetype)
-		$(cmake-utils_use_with word-perfect WPD)
-		$(cmake-utils_use_with word-perfect WPG)
-		$(cmake-utils_use_with xbase XBase)
-		$(cmake-utils_use_with xslt LibXslt)
-		$(cmake-utils_use_build wmf libkowmf)
-		$(cmake-utils_use_build mso libmsooxml)
-	)
-
-	# applications
-	for cal_ft in ${CAL_FTS}; do
-		mycmakeargs+=( $(cmake-utils_use_build calligra_features_${cal_ft} ${cal_ft}) )
-	done
-	mycmakeargs+=( $(cmake-utils_use_build test cstester) )
-
-	# filters
-
-	kde4-base_src_configure
-}

diff --git a/app-office/calligra/calligra-2.3.81.ebuild b/app-office/calligra/calligra-2.3.81.ebuild
deleted file mode 100644
index 97cb13f..0000000
--- a/app-office/calligra/calligra-2.3.81.ebuild
+++ /dev/null
@@ -1,188 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/calligra/calligra-2.3.74.ebuild,v 1.5 2011/08/26 20:46:55 dilfridge Exp $
-
-# note: files that need to be checked for dependencies etc:
-# CMakeLists.txt, kexi/CMakeLists.txt kexi/migration/CMakeLists.txt
-# krita/CMakeLists.txt
-
-EAPI=4
-
-KDE_SCM=git
-KDE_MINIMAL=4.6.4
-OPENGL_REQUIRED=optional
-KDE_HANDBOOK=optional
-KDE_LINGUAS_LIVE_OVERRIDE=true
-inherit kde4-base
-
-DESCRIPTION="KDE Office Suite"
-HOMEPAGE="http://www.calligra-suite.org/"
-[[ ${PV} == 9999 ]] || SRC_URI="mirror://kde/unstable/${P}/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="4"
-[[ ${PV} == 9999 ]] || KEYWORDS="~amd64 ~x86"
-IUSE="+crypt +eigen +exif fftw +fontconfig freetds +gif glew +glib +gsf
-gsl +iconv +jpeg jpeg2k +kdcraw kdepim +lcms marble mysql +mso +okular openctl openexr
-+pdf postgres +semantic-desktop +ssl sybase test tiff +threads +truetype
-+wmf word-perfect xbase +xml +xslt"
-
-# please do not sort here, order is same as in CMakeLists.txt
-CAL_FTS="kexi words flow plan stage tables krita karbon braindump"
-for cal_ft in ${CAL_FTS}; do
-	IUSE+=" calligra_features_${cal_ft}"
-done
-unset cal_ft
-
-REQUIRED_USE="
-	calligra_features_kexi? ( calligra_features_tables )
-	calligra_features_krita? ( eigen exif lcms )
-	calligra_features_plan? ( kdepim )
-	calligra_features_tables? ( eigen )
-	test? ( calligra_features_karbon )
-"
-
-RDEPEND="
-	!app-office/karbon
-	!app-office/koffice-data
-	!app-office/koffice-l10n
-	!app-office/koffice-libs
-	!app-office/koffice-meta
-	!app-office/krita
-	!app-office/kplato
-	!app-office/kpresenter
-	!app-office/kspread
-	!app-office/kword
-	dev-db/sqlite:3
-	dev-lang/perl
-	dev-libs/boost
-	dev-libs/libxml2
-	$(add_kdebase_dep knewstuff)
-	media-libs/libpng
-	sys-libs/zlib
-	x11-libs/qt-webkit
-	crypt? ( app-crypt/qca:2 )
-	eigen? ( dev-cpp/eigen:2 )
-	exif? ( media-gfx/exiv2 )
-	fftw? ( sci-libs/fftw:3.0 )
-	fontconfig? ( media-libs/fontconfig )
-	freetds? ( dev-db/freetds )
-	gif? ( media-libs/giflib )
-	glew? ( media-libs/glew )
-	glib? ( dev-libs/glib:2 )
-	gsf? ( gnome-extra/libgsf )
-	gsl? ( sci-libs/gsl )
-	iconv? ( virtual/libiconv )
-	jpeg? ( virtual/jpeg )
-	jpeg2k? ( media-libs/openjpeg )
-	kdcraw? ( $(add_kdebase_dep libkdcraw) )
-	kdepim? ( $(add_kdebase_dep kdepimlibs) )
-	lcms? ( media-libs/lcms:2 )
-	marble? ( $(add_kdebase_dep marble) )
-	mysql? ( virtual/mysql )
-	okular? ( $(add_kdebase_dep okular) )
-	openctl? ( >=media-libs/opengtl-0.9.15 )
-	openexr? ( media-libs/openexr )
-	pdf? (
-		app-text/poppler
-		media-gfx/pstoedit
-	)
-	postgres? (
-		dev-db/postgresql-base
-		=dev-libs/libpqxx-3*
-	)
-	semantic-desktop? ( dev-libs/soprano )
-	ssl? ( dev-libs/openssl )
-	sybase? ( dev-db/freetds )
-	tiff? ( media-libs/tiff )
-	truetype? ( media-libs/freetype:2 )
-	word-perfect? (
-		app-text/libwpd
-		app-text/libwps
-		app-text/libwpg
-	)
-	xbase? ( dev-db/xbase )
-	xslt? ( dev-libs/libxslt )
-	calligra_features_kexi? ( >=dev-db/sqlite-3.7.3 )
-"
-DEPEND="${RDEPEND}"
-
-src_configure() {
-	local cal_ft
-
-	# first write out things we want to hard-enable
-	local mycmakeargs=(
-		"-DWITH_Boost=ON"
-		"-DWITH_LibXml2=ON"
-		"-DWITH_PNG=ON"
-		"-DWITH_ZLIB=ON"
-		"-DGHNS=ON"
-		"-DWITH_X11=ON"
-		"-DWITH_Qt4=ON"
-	)
-
-	# default disablers
-	mycmakeargs+=(
-		"-DBUILD_mobile=OFF" # we dont suppor mobile gui, maybe arm could
-		"-DWITH_LCMS=OFF" # we use lcms:2
-		"-DWITH_XBase=OFF" # i am not the one to support this
-		"-DCREATIVEONLY=OFF"
-		"-DWITH_TINY=OFF"
-		"-DWITH_CreateResources=OFF" # NOT PACKAGED: http://create.freedesktop.org/
-		"-DWITH_DCMTK=OFF"           # NOT PACKAGED: http://www.dcmtk.org/dcmtk.php.en
-		"-DWITH_Spnav=OFF"           # NOT PACKAGED: http://spacenav.sourceforge.net/
-	)
-
-	# regular options
-	mycmakeargs+=(
-		$(cmake-utils_use_with crypt QCA2)
-		$(cmake-utils_use_with eigen Eigen2)
-		$(cmake-utils_use_with exif Exiv2)
-		$(cmake-utils_use_with fftw FFTW3)
-		$(cmake-utils_use_with fontconfig Fontconfig)
-		$(cmake-utils_use_with freetds FreeTDS)
-		$(cmake-utils_use_with gif GIF2)
-		$(cmake-utils_use_with glew GLEW)
-		$(cmake-utils_use_with glib GLIB2)
-		$(cmake-utils_use_with glib GObject)
-		$(cmake-utils_use_with gsf LIBGSF)
-		$(cmake-utils_use_with gsl GSL)
-		$(cmake-utils_use_with iconv Iconv)
-		$(cmake-utils_use_with jpeg JPEG)
-		$(cmake-utils_use_with jpeg2k OpenJPEG)
-		$(cmake-utils_use_with kdcraw Kdcraw)
-		$(cmake-utils_use_with kdepim KdepimLibs)
-		$(cmake-utils_use_with lcms LCMS2)
-		$(cmake-utils_use_with marble Marble)
-		$(cmake-utils_use_with mysql MySQL)
-		$(cmake-utils_use_with okular Okular)
-		$(cmake-utils_use_with openctl OpenCTL)
-		$(cmake-utils_use_with openexr OpenEXR)
-		$(cmake-utils_use_with opengl OpenGL)
-		$(cmake-utils_use_with pdf Poppler)
-		$(cmake-utils_use_with pdf Pstoedit)
-		$(cmake-utils_use_with postgres PostgreSQL)
-		$(cmake-utils_use_with semantic-desktop Soprano)
-		$(cmake-utils_use_with ssl OpenSSL)
-		$(cmake-utils_use_with sybase FreeTDS)
-		$(cmake-utils_use_with tiff TIFF)
-		$(cmake-utils_use_with threads Threads)
-		$(cmake-utils_use_with truetype Freetype)
-		$(cmake-utils_use_with word-perfect WPD)
-		$(cmake-utils_use_with word-perfect WPG)
-		$(cmake-utils_use_with xbase XBase)
-		$(cmake-utils_use_with xslt LibXslt)
-		$(cmake-utils_use_build wmf libkowmf)
-		$(cmake-utils_use_build mso libmsooxml)
-	)
-
-	# applications
-	for cal_ft in ${CAL_FTS}; do
-		mycmakeargs+=( $(cmake-utils_use_build calligra_features_${cal_ft} ${cal_ft}) )
-	done
-	mycmakeargs+=( $(cmake-utils_use_build test cstester) )
-
-	# filters
-
-	kde4-base_src_configure
-}

diff --git a/app-office/calligra/calligra-9999.ebuild b/app-office/calligra/calligra-9999.ebuild
deleted file mode 100644
index 97cb13f..0000000
--- a/app-office/calligra/calligra-9999.ebuild
+++ /dev/null
@@ -1,188 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/calligra/calligra-2.3.74.ebuild,v 1.5 2011/08/26 20:46:55 dilfridge Exp $
-
-# note: files that need to be checked for dependencies etc:
-# CMakeLists.txt, kexi/CMakeLists.txt kexi/migration/CMakeLists.txt
-# krita/CMakeLists.txt
-
-EAPI=4
-
-KDE_SCM=git
-KDE_MINIMAL=4.6.4
-OPENGL_REQUIRED=optional
-KDE_HANDBOOK=optional
-KDE_LINGUAS_LIVE_OVERRIDE=true
-inherit kde4-base
-
-DESCRIPTION="KDE Office Suite"
-HOMEPAGE="http://www.calligra-suite.org/"
-[[ ${PV} == 9999 ]] || SRC_URI="mirror://kde/unstable/${P}/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="4"
-[[ ${PV} == 9999 ]] || KEYWORDS="~amd64 ~x86"
-IUSE="+crypt +eigen +exif fftw +fontconfig freetds +gif glew +glib +gsf
-gsl +iconv +jpeg jpeg2k +kdcraw kdepim +lcms marble mysql +mso +okular openctl openexr
-+pdf postgres +semantic-desktop +ssl sybase test tiff +threads +truetype
-+wmf word-perfect xbase +xml +xslt"
-
-# please do not sort here, order is same as in CMakeLists.txt
-CAL_FTS="kexi words flow plan stage tables krita karbon braindump"
-for cal_ft in ${CAL_FTS}; do
-	IUSE+=" calligra_features_${cal_ft}"
-done
-unset cal_ft
-
-REQUIRED_USE="
-	calligra_features_kexi? ( calligra_features_tables )
-	calligra_features_krita? ( eigen exif lcms )
-	calligra_features_plan? ( kdepim )
-	calligra_features_tables? ( eigen )
-	test? ( calligra_features_karbon )
-"
-
-RDEPEND="
-	!app-office/karbon
-	!app-office/koffice-data
-	!app-office/koffice-l10n
-	!app-office/koffice-libs
-	!app-office/koffice-meta
-	!app-office/krita
-	!app-office/kplato
-	!app-office/kpresenter
-	!app-office/kspread
-	!app-office/kword
-	dev-db/sqlite:3
-	dev-lang/perl
-	dev-libs/boost
-	dev-libs/libxml2
-	$(add_kdebase_dep knewstuff)
-	media-libs/libpng
-	sys-libs/zlib
-	x11-libs/qt-webkit
-	crypt? ( app-crypt/qca:2 )
-	eigen? ( dev-cpp/eigen:2 )
-	exif? ( media-gfx/exiv2 )
-	fftw? ( sci-libs/fftw:3.0 )
-	fontconfig? ( media-libs/fontconfig )
-	freetds? ( dev-db/freetds )
-	gif? ( media-libs/giflib )
-	glew? ( media-libs/glew )
-	glib? ( dev-libs/glib:2 )
-	gsf? ( gnome-extra/libgsf )
-	gsl? ( sci-libs/gsl )
-	iconv? ( virtual/libiconv )
-	jpeg? ( virtual/jpeg )
-	jpeg2k? ( media-libs/openjpeg )
-	kdcraw? ( $(add_kdebase_dep libkdcraw) )
-	kdepim? ( $(add_kdebase_dep kdepimlibs) )
-	lcms? ( media-libs/lcms:2 )
-	marble? ( $(add_kdebase_dep marble) )
-	mysql? ( virtual/mysql )
-	okular? ( $(add_kdebase_dep okular) )
-	openctl? ( >=media-libs/opengtl-0.9.15 )
-	openexr? ( media-libs/openexr )
-	pdf? (
-		app-text/poppler
-		media-gfx/pstoedit
-	)
-	postgres? (
-		dev-db/postgresql-base
-		=dev-libs/libpqxx-3*
-	)
-	semantic-desktop? ( dev-libs/soprano )
-	ssl? ( dev-libs/openssl )
-	sybase? ( dev-db/freetds )
-	tiff? ( media-libs/tiff )
-	truetype? ( media-libs/freetype:2 )
-	word-perfect? (
-		app-text/libwpd
-		app-text/libwps
-		app-text/libwpg
-	)
-	xbase? ( dev-db/xbase )
-	xslt? ( dev-libs/libxslt )
-	calligra_features_kexi? ( >=dev-db/sqlite-3.7.3 )
-"
-DEPEND="${RDEPEND}"
-
-src_configure() {
-	local cal_ft
-
-	# first write out things we want to hard-enable
-	local mycmakeargs=(
-		"-DWITH_Boost=ON"
-		"-DWITH_LibXml2=ON"
-		"-DWITH_PNG=ON"
-		"-DWITH_ZLIB=ON"
-		"-DGHNS=ON"
-		"-DWITH_X11=ON"
-		"-DWITH_Qt4=ON"
-	)
-
-	# default disablers
-	mycmakeargs+=(
-		"-DBUILD_mobile=OFF" # we dont suppor mobile gui, maybe arm could
-		"-DWITH_LCMS=OFF" # we use lcms:2
-		"-DWITH_XBase=OFF" # i am not the one to support this
-		"-DCREATIVEONLY=OFF"
-		"-DWITH_TINY=OFF"
-		"-DWITH_CreateResources=OFF" # NOT PACKAGED: http://create.freedesktop.org/
-		"-DWITH_DCMTK=OFF"           # NOT PACKAGED: http://www.dcmtk.org/dcmtk.php.en
-		"-DWITH_Spnav=OFF"           # NOT PACKAGED: http://spacenav.sourceforge.net/
-	)
-
-	# regular options
-	mycmakeargs+=(
-		$(cmake-utils_use_with crypt QCA2)
-		$(cmake-utils_use_with eigen Eigen2)
-		$(cmake-utils_use_with exif Exiv2)
-		$(cmake-utils_use_with fftw FFTW3)
-		$(cmake-utils_use_with fontconfig Fontconfig)
-		$(cmake-utils_use_with freetds FreeTDS)
-		$(cmake-utils_use_with gif GIF2)
-		$(cmake-utils_use_with glew GLEW)
-		$(cmake-utils_use_with glib GLIB2)
-		$(cmake-utils_use_with glib GObject)
-		$(cmake-utils_use_with gsf LIBGSF)
-		$(cmake-utils_use_with gsl GSL)
-		$(cmake-utils_use_with iconv Iconv)
-		$(cmake-utils_use_with jpeg JPEG)
-		$(cmake-utils_use_with jpeg2k OpenJPEG)
-		$(cmake-utils_use_with kdcraw Kdcraw)
-		$(cmake-utils_use_with kdepim KdepimLibs)
-		$(cmake-utils_use_with lcms LCMS2)
-		$(cmake-utils_use_with marble Marble)
-		$(cmake-utils_use_with mysql MySQL)
-		$(cmake-utils_use_with okular Okular)
-		$(cmake-utils_use_with openctl OpenCTL)
-		$(cmake-utils_use_with openexr OpenEXR)
-		$(cmake-utils_use_with opengl OpenGL)
-		$(cmake-utils_use_with pdf Poppler)
-		$(cmake-utils_use_with pdf Pstoedit)
-		$(cmake-utils_use_with postgres PostgreSQL)
-		$(cmake-utils_use_with semantic-desktop Soprano)
-		$(cmake-utils_use_with ssl OpenSSL)
-		$(cmake-utils_use_with sybase FreeTDS)
-		$(cmake-utils_use_with tiff TIFF)
-		$(cmake-utils_use_with threads Threads)
-		$(cmake-utils_use_with truetype Freetype)
-		$(cmake-utils_use_with word-perfect WPD)
-		$(cmake-utils_use_with word-perfect WPG)
-		$(cmake-utils_use_with xbase XBase)
-		$(cmake-utils_use_with xslt LibXslt)
-		$(cmake-utils_use_build wmf libkowmf)
-		$(cmake-utils_use_build mso libmsooxml)
-	)
-
-	# applications
-	for cal_ft in ${CAL_FTS}; do
-		mycmakeargs+=( $(cmake-utils_use_build calligra_features_${cal_ft} ${cal_ft}) )
-	done
-	mycmakeargs+=( $(cmake-utils_use_build test cstester) )
-
-	# filters
-
-	kde4-base_src_configure
-}

diff --git a/app-office/calligra/files/calligra-2.3.74-jpeglcms-2.patch b/app-office/calligra/files/calligra-2.3.74-jpeglcms-2.patch
deleted file mode 100644
index 986139f..0000000
--- a/app-office/calligra/files/calligra-2.3.74-jpeglcms-2.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-diff -ruN calligra-2.3.74.orig/krita/plugins/formats/jpeg/CMakeLists.txt calligra-2.3.74/krita/plugins/formats/jpeg/CMakeLists.txt
---- calligra-2.3.74.orig/krita/plugins/formats/jpeg/CMakeLists.txt	2011-08-12 15:51:32.000000000 +0200
-+++ calligra-2.3.74/krita/plugins/formats/jpeg/CMakeLists.txt	2011-08-19 23:41:02.000000000 +0200
-@@ -16,7 +16,7 @@
- 
- kde4_add_plugin(kritajpegimport ${kritajpegimport_PART_SRCS})
- 
--target_link_libraries(kritajpegimport kritaui jpeg ${LCMS_LIBRARIES} ${EXIV2_LIBRARIES} )
-+target_link_libraries(kritajpegimport kritaui jpeg ${LCMS2_LIBRARIES} ${EXIV2_LIBRARIES} )
- 
- install(TARGETS kritajpegimport  DESTINATION ${PLUGIN_INSTALL_DIR})
- 
-@@ -31,7 +31,7 @@
- 
- kde4_add_plugin(kritajpegexport ${kritajpegexport_PART_SRCS})
- 
--target_link_libraries(kritajpegexport kritaui jpeg ${LCMS_LIBRARIES} ${EXIV2_LIBRARIES} )
-+target_link_libraries(kritajpegexport kritaui jpeg ${LCMS2_LIBRARIES} ${EXIV2_LIBRARIES} )
- 
- install(TARGETS kritajpegexport  DESTINATION ${PLUGIN_INSTALL_DIR})
- 

diff --git a/app-office/calligra/files/calligra-2.3.74-jpeglcms.patch b/app-office/calligra/files/calligra-2.3.74-jpeglcms.patch
deleted file mode 100644
index 2f9810b..0000000
--- a/app-office/calligra/files/calligra-2.3.74-jpeglcms.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From: Boudewijn Rempt <boud@valdyas.org>
-Date: Tue, 16 Aug 2011 15:50:16 +0000
-Subject: Allow jpeg filter to build with both versions of lcms
-X-Git-Url: http://quickgit.kde.org/?p=calligra.git&amp;a=commitdiff&amp;h=0b4a019f25a7098c8899d3920db2e1901833aaf7
----
-Allow jpeg filter to build with both versions of lcms
-
-Use HAVE_LCMS, not LCMS_FOUND.
----
-
-
---- a/krita/plugins/formats/CMakeLists.txt
-+++ b/krita/plugins/formats/CMakeLists.txt
-@@ -31,9 +31,9 @@ if(KDCRAW_FOUND)
-     add_subdirectory( raw )
- endif(KDCRAW_FOUND)
- 
--if(JPEG_FOUND AND LCMS_FOUND)
-+if(JPEG_FOUND AND HAVE_LCMS)
- 	add_subdirectory(jpeg)
--endif(JPEG_FOUND AND LCMS_FOUND)
-+endif(JPEG_FOUND AND HAVE_LCMS)
- 
- if(TIFF_FOUND)
- 	add_subdirectory(tiff)
-

diff --git a/app-office/calligra/metadata.xml b/app-office/calligra/metadata.xml
deleted file mode 100644
index e37ab86..0000000
--- a/app-office/calligra/metadata.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer>
-		<email>dilfridge@gentoo.org</email>
-	</maintainer>
-	<herd>kde</herd>
-	<herd>openoffice</herd>
-	<use>
-		<flag name="boost">Enable <pkg>dev-libs/boost</pkg> templating support</flag>
-		<flag name="eigen">Enable <pkg>dev-cpp/eigen</pkg> mathematical templates support</flag>
-		<flag name="glew">Enable <pkg>media-libs/glew</pkg> opengl extension library support</flag>
-		<flag name="glib">Enable support for C library routines from <pkg>dev-libs/glib</pkg></flag>
-		<flag name="gsf">Enable support for ODT structures extraction via <pkg>gnome-extra/libgsf</pkg></flag>
-		<flag name="kdcraw">Enable support for KDE image manipulating interface via <pkg>kde-base/libkdcraw</pkg></flag>
-		<flag name="kdepim">Enable support for KDEPIM resources integration</flag>
-		<flag name="marble">Enable displaying of maps using Marble</flag>
-		<flag name="mso">Enable support for various MS Office TM file formats</flag>
-		<flag name="okular">Enable bindings for <pkg>kde-base/okular</pkg></flag>
-		<flag name="openctl">Enable support for transformation algorithms via <pkg>media-libs/opengtl</pkg></flag>
-		<flag name="word-perfect">Enable support for various WordPerfect file formats</flag>
-		<flag name="xbase">Enable support for xbase compatible database formats</flag>
-		<flag name="xslt">Enable xslt and exslt support format support</flag>
-	</use>
-</pkgmetadata>



^ permalink raw reply related	[flat|nested] 3+ messages in thread

end of thread, other threads:[~2011-12-22 22:21 UTC | newest]

Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-08-19 18:56 [gentoo-commits] dev/dilfridge:master commit in: app-office/calligra/, app-office/calligra/files/ Andreas Hüttel
  -- strict thread matches above, loose matches on Subject: below --
2011-08-19 22:02 Andreas Hüttel
2011-12-22 22:21 Andreas Hüttel

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox