6 files changed, 32 insertions, 223 deletions
diff --git a/app-office/calligra/ChangeLog b/app-office/calligra/ChangeLog
index c8198d81d74b..27ea6cb2bbdf 100644
--- a/app-office/calligra/ChangeLog
+++ b/app-office/calligra/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for app-office/calligra
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/calligra/ChangeLog,v 1.34 2012/04/08 13:54:06 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/calligra/ChangeLog,v 1.35 2012/04/11 20:49:12 dilfridge Exp $
+
+*calligra-2.4.0-r1 (11 Apr 2012)
+
+  11 Apr 2012; Andreas K. Huettel <dilfridge@gentoo.org>
+  -calligra-2.3.92.ebuild, -calligra-2.4.0.ebuild, +calligra-2.4.0-r1.ebuild,
+  calligra-2.4.9999.ebuild, calligra-9999.ebuild:
+  calligra-2.4.0 needs additional confirmation that qt has been patched, bug
+  411629; remove old
 
 *calligra-2.3.92-r1 (08 Apr 2012)
 
diff --git a/app-office/calligra/Manifest b/app-office/calligra/Manifest
index e1368923b48e..cbb66a2030d6 100644
--- a/app-office/calligra/Manifest
+++ b/app-office/calligra/Manifest
@@ -7,26 +7,25 @@ AUX calligra-2.4.0-rdf.patch 7537 RMD160 4320fe29ab85791232665a7f2d717dab1b8505b
 DIST calligra-2.3.92.tar.bz2 123533771 RMD160 c55140a0d4e719140e8aff0cb7f5fb68dc376cf0 SHA1 460d01bbb454140e851f7ea251d3ac8e143215e5 SHA256 8faefc34428deb2ce07856e2f1a58a4d7f842faf04dda46147644f07dbdfa7a9
 DIST calligra-2.4.0.tar.bz2 123325347 RMD160 840efd6c7ff82b246950de591b9af762d37f9a95 SHA1 6026f4ddcf4bf647ea13dfb477233df472a5c007 SHA256 7c8cd1ec8cd2b26d5544f3b5a283052c5cd82f212749475b91cc340f7e4029b0
 EBUILD calligra-2.3.92-r1.ebuild 5972 RMD160 5f6f003bd2a96ff42536af68d7bd2f9485646efe SHA1 0ad24e878c4e94a5ba9e230b5a5507d803734e96 SHA256 380670ef75421868c5c739e02880a7f408d2076e92d2cdf416dc4e5ccbd9b1ed
-EBUILD calligra-2.3.92.ebuild 5885 RMD160 b8b06ce33366b7431db184bacf256fc6daa95b46 SHA1 45f2e7aea0805770dd6d00de05485208781816b1 SHA256 0b627f9f67565aec603ce0032b734ad7a937f9b3175b4e3ea98c06771fbbb57b
-EBUILD calligra-2.4.0.ebuild 6054 RMD160 4b930f936ce000c488bae4e463febdf25d39c803 SHA1 b385be9e162e3602d655763478543a7763c1bcd6 SHA256 e8cb179b1ae689d6fc144f2714f43544d2168fc00f0a406e3111450842e895cc
-EBUILD calligra-2.4.9999.ebuild 6057 RMD160 fc1ffaa32a5385b0715f82191b5e913243cdb9b8 SHA1 a02353ee71ffd3f08faf7dbabcbbb54310dc8fed SHA256 bc2ed55b04baa571e4a360ce3fd76f52224eae37f996ae6b3ce1e074f5929965
-EBUILD calligra-9999.ebuild 5880 RMD160 6ca04f3e949b2ff00b9cfe9a7699ac47a175e318 SHA1 c1fd52436900f02360a0eae395f2aca4ed7c3122 SHA256 39b19296d0326875bd7b96ba7271e212ce4e67f2444333850d4c3d8a2f13800a
-MISC ChangeLog 5910 RMD160 9fde41553de873461cc5ec3aeb67d62635a55b9d SHA1 9ee2e8c43739a3bf4417b38140d441f25af3c1fe SHA256 7fb145419e67804f6454dcea996a36c7cb1184301e133c0f92c85241bdd17851
+EBUILD calligra-2.4.0-r1.ebuild 6081 RMD160 3ea1472cb0af30075fa2d44ada54ac9850d91fda SHA1 61e17d50c0a52214e534bf80d8b2313fdc5c40bb SHA256 39f5fdd6a593b4133c6aef21f3fa395f3de7c311f3d1599c9d58fc7a490b0e39
+EBUILD calligra-2.4.9999.ebuild 6081 RMD160 12766423785090924648d071347fc59b4de881c3 SHA1 4ec20f8483e67d3413c9e77af155bbc4587b495c SHA256 623052212040a130ac3ee67ca1a3cbb60e7770c6653abc978cc712e41d151ff8
+EBUILD calligra-9999.ebuild 5904 RMD160 456b69c0faf308283342473e5df9a4b770eca45c SHA1 aebb66076c7092e02bc75734aa9333b60ac76960 SHA256 f094d3209bdfcee8296ef16c54bae07f147766bef13e603c5d09385e8aabd5f8
+MISC ChangeLog 6228 RMD160 45908c55b805b59cc00891b1451a158acfca45db SHA1 bb4c4091be6df0c54a63379a1fe70d8e529259d2 SHA256 c966b893a2ec0c9a463811960aa11d159611ca8aa0aadb4e8ceb578ab8469f2d
 MISC metadata.xml 1491 RMD160 f8ff74f843ae8df2be457f5376f8d1ad08604c09 SHA1 56f2b25dfd6524b43aed66a177a515e80f04cde2 SHA256 9e6668563b25b690da423ea91dbac27e6289ee117cb6cb026c2657c476555c69
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iQIcBAEBCgAGBQJPgZiHAAoJENwGBM22xffeKqsP/1+F7YTd1jwMx/Lp151zIpdr
-NBZ5v+ddcq57jCbxsHKJof0xPwNZ/uK3TGh65Gjz8IzKGaigZaEsmSMJ6rWbQWb2
-0agz/Mkg7IrR+mw6i+Csa7arAZuxti1GdxzzKeVbWtbzXvXcljtlp7VlGv3/tFLT
-7pyu5BEkCZXnpp4K+6V44aYWlmHkO9V8MgRZqGDA709JVUHmmR+zWx4hGcURNOf3
-Y6uz2Mj7OJHuSM2xaG352AJSbL978Y+focr1DTAgToIg0Fbk7mcZoJpuw8l1qbUv
-ZxI7L9vQgg96AYsTzsMDPsrN0MdngTumkgdQKOxa+Eyjika0/wOnOq16BZByAJ74
-r6TbPyjBiPLQdH85A6vxTDde+MW+JAivtlGQxDSeuBiP+zaVv6LB3rq6BsZIqIt6
-MwGAttYLkt97fI8o6ZxwBWv7XnNmg2OayE2gTw0vnAYKdF9EyQbdP5AoWnKOVTaD
-leicGfmwtezNfyjAWAlx92hYaTym51WDCx+VtkRMuiUgnM5HPe9L5g6yInt//GOo
-tXOUZiY2Pp3JN+Ccgz1wyr7pWzgbZFLVZqVpbkw6SorN1xSgVRPYBsyw4Tu/BlAv
-7iiX/u5B3DU0d/HDyX8oipy/t0Wy6jZucweUV0DQye0c4dgdQhXicwfgY/IqpUcb
-/x+O78BB/49Hs+4oJAqQ
-=hnUx
+iQIcBAEBCgAGBQJPhe5dAAoJENwGBM22xffeLeAP/12fUvbxWgT3N7uvVWGVN5yF
+0QhBT8DEhg1S/OulWH/CdsT87UhO0emQqBkZ9PsyrsIt71dBfOoyz8vLET5xJO2p
+RUEk4qUnf9QgKAAiJ/aphXpxlUONpGA1Wdgk5JrX68axsNPSIw0D1ttCHlrWGJkq
+XELhtCq/vp/ZATBfk3ei9lVrR41ZbxNIAISTHt696hcChF+DzPV+1ndNKWeAxYde
+LCQGI2Pj7UX2uifcKGY0yRDS63VUTNnhTxA/TMesFMy1lC9EL4LUzS5hubI1wwu7
+G/voLqrIxkoRw5bRd5SCscIQsKhZDwa4DHWf2Am078hyaaYxM+eb+1fWV6RV0nBy
+JLQryMCcI/SZE8M/TvZv1goJ8ar/V7jF37aTXXoceiBlyqiTdg3JE5yCKYQ8MgqD
+kyecqAANftKsjC0H3r/sUGf3gkD2DkXLLqB5vQUzAS/QHFldse4PaX3QFqA3cSEn
+Vg+cCuXSZu9dVQg12ihPjj3rw7qrz8cdWylu7ueTZOT5XYPTfNavA+dt/E/RI1xx
+slVPywobJHrDyTuGkF8VEkzjdqQIV/zBZUMIzh58szVeBprRlEPH1rfTv44sZ1eV
+xTjpqd23rEl98zmQIWBREFDqjVtyWN8FH7MUzpVyQ4ThvtYMyWL4x8BVnv4rmjBS
+yZV1FVjRTR/+uY0/gjVj
+=9mQq
 -----END PGP SIGNATURE-----
diff --git a/app-office/calligra/calligra-2.3.92.ebuild b/app-office/calligra/calligra-2.3.92.ebuild
deleted file mode 100644
index 086b74b97158..000000000000
--- a/app-office/calligra/calligra-2.3.92.ebuild
+++ /dev/null
@@ -1,201 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/calligra/calligra-2.3.92.ebuild,v 1.3 2012/04/08 13:39:59 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="attica +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 sheets 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_sheets )
-	calligra_features_words? ( calligra_features_sheets )
-	calligra_features_krita? ( eigen exif lcms )
-	calligra_features_plan? ( kdepim semantic-desktop )
-	calligra_features_sheets? ( eigen )
-	test? ( calligra_features_karbon )
-"
-
-RDEPEND="
-	!app-office/karbon
-	!app-office/kexi
-	!app-office/koffice-data
-	!app-office/koffice-l10n
-	!app-office/koffice-libs
-	!app-office/koffice-meta
-	!app-office/kplato
-	!app-office/kpresenter
-	!app-office/krita
-	!app-office/kspread
-	!app-office/kword
-	dev-lang/perl
-	dev-libs/boost
-	dev-libs/libxml2
-	$(add_kdebase_dep knewstuff)
-	media-libs/libpng
-	sys-libs/zlib
-	attica? ( dev-libs/libattica )
-	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 $(add_kdebase_dep kdelibs semantic-desktop) )
-	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.9:3[extensions]
-		dev-libs/icu
-	)
-"
-DEPEND="${RDEPEND}"
-
-PATCHES=( "${FILESDIR}/${PN}-2.4.0-rdf.patch" )
-
-RESTRICT=test
-# bug 394273
-
-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"
-		"-DQT3SUPPORT=ON" # kde4-base.eclass pulls this in anyway
-	)
-
-	# default disablers
-	mycmakeargs+=(
-		"-DBUILD_mobile=OFF" # we dont suppor mobile gui, maybe arm could
-		"-DWITH_LCMS=OFF" # we use lcms:2
-		"-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 attica LibAttica)
-		$(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 semantic-desktop NEPOMUK)
-		$(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.4.0.ebuild b/app-office/calligra/calligra-2.4.0-r1.ebuild
index cd8386080edb..3fa769fd0940 100644
--- a/app-office/calligra/calligra-2.4.0.ebuild
+++ b/app-office/calligra/calligra-2.4.0-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/calligra/calligra-2.4.0.ebuild,v 1.5 2012/04/08 13:39:59 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/calligra/calligra-2.4.0-r1.ebuild,v 1.1 2012/04/11 20:49:12 dilfridge Exp $
 
 # note: files that need to be checked for dependencies etc:
 # CMakeLists.txt, kexi/CMakeLists.txt kexi/migration/CMakeLists.txt
@@ -127,6 +127,7 @@ src_configure() {
 
 	# first write out things we want to hard-enable
 	local mycmakeargs=(
+		"-DIHAVEPATCHEDQT=ON"
 		"-DWITH_Boost=ON"
 		"-DWITH_LibXml2=ON"
 		"-DWITH_PNG=ON"
diff --git a/app-office/calligra/calligra-2.4.9999.ebuild b/app-office/calligra/calligra-2.4.9999.ebuild
index 265905139309..b84df635a2d9 100644
--- a/app-office/calligra/calligra-2.4.9999.ebuild
+++ b/app-office/calligra/calligra-2.4.9999.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/calligra/calligra-2.4.9999.ebuild,v 1.3 2012/04/08 13:39:59 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/calligra/calligra-2.4.9999.ebuild,v 1.4 2012/04/11 20:49:12 dilfridge Exp $
 
 # note: files that need to be checked for dependencies etc:
 # CMakeLists.txt, kexi/CMakeLists.txt kexi/migration/CMakeLists.txt
@@ -127,6 +127,7 @@ src_configure() {
 
 	# first write out things we want to hard-enable
 	local mycmakeargs=(
+		"-DIHAVEPATCHEDQT=ON"
 		"-DWITH_Boost=ON"
 		"-DWITH_LibXml2=ON"
 		"-DWITH_PNG=ON"
diff --git a/app-office/calligra/calligra-9999.ebuild b/app-office/calligra/calligra-9999.ebuild
index ce5c650b9d96..13b7f0e8ddd0 100644
--- a/app-office/calligra/calligra-9999.ebuild
+++ b/app-office/calligra/calligra-9999.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/calligra/calligra-9999.ebuild,v 1.14 2012/04/06 21:53:32 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/calligra/calligra-9999.ebuild,v 1.15 2012/04/11 20:49:12 dilfridge Exp $
 
 # note: files that need to be checked for dependencies etc:
 # CMakeLists.txt, kexi/CMakeLists.txt kexi/migration/CMakeLists.txt
@@ -123,6 +123,7 @@ src_configure() {
 
 	# first write out things we want to hard-enable
 	local mycmakeargs=(
+		"-DIHAVEPATCHEDQT=ON"
 		"-DWITH_Boost=ON"
 		"-DWITH_LibXml2=ON"
 		"-DWITH_PNG=ON"