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

[Andreas Hüttel]

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@g.o>
-  +calligra-2.3.81.ebuild, calligra-9999.ebuild:
-  Version bump, untested so far
-
-  26 Aug 2011; Andreas K. Huettel <dilfridge@g.o>
-  -calligra-2.3.73.ebuild, calligra-2.3.74.ebuild, calligra-9999.ebuild:
-  Resync with main tree
-
-  19 Aug 2011; Andreas K. Huettel <dilfridge@g.o>
-  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@g.o>
-  +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@g.o> calligra-9999.ebuild:
-  Fix dependency
-
-  17 Aug 2011; Andreas K. Huettel <dilfridge@g.o>
-  calligra-2.3.73.ebuild:
-  Resync with main tree
-
-*calligra-9999 (22 Jul 2011)
-
-  22 Jul 2011; Andreas K. Huettel <dilfridge@g.o>
-  +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@g.o>
-  +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@×××××××.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@g.o</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>