Version bump

Package-Manager: portage-2.1.10.55/cvs/Linux x86_64

4 files changed, 229 insertions, 18 deletions

diff --git a/app-office/calligra/ChangeLog b/app-office/calligra/ChangeLog
index e9854b2080db..62a884575195 100644
--- a/app-office/calligra/ChangeLog
+++ b/app-office/calligra/ChangeLog
@@ -1,6 +1,12 @@
 # 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.28 2012/04/06 10:29:32 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/calligra/ChangeLog,v 1.29 2012/04/06 18:57:34 dilfridge Exp $
+
+*calligra-2.4.0 (06 Apr 2012)
+
+  06 Apr 2012; Andreas K. Huettel <dilfridge@gentoo.org>
+  +calligra-2.4.0.ebuild, calligra-9999.ebuild:
+  Version bump
 
   06 Apr 2012; Tomáš Chvátal <scarabeus@gentoo.org> -calligra-2.3.87.ebuild,
   -files/calligra-2.3.87-koabstr.patch, -files/calligra-2.3.87-marble.patch:
diff --git a/app-office/calligra/Manifest b/app-office/calligra/Manifest
index dfd9e2ea94e7..c22aa8cd14e3 100644
--- a/app-office/calligra/Manifest
+++ b/app-office/calligra/Manifest
@@ -1,25 +1,27 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA512
 
 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.ebuild 5836 RMD160 8327720c04b0c24fc685de3369c9e48ffe516818 SHA1 ff12bac1f651b812366a3da1e81b9fdfe84bdc32 SHA256 4c44b624f7d4d35eb2fd7e8d86dcb9471b8e0197cd279a642ac2710d525d7957
-EBUILD calligra-9999.ebuild 5835 RMD160 1058e9c34557847895cfa17aaa79f96881e769d7 SHA1 d069fdcc8ccace6c2a6539d3bf6f8c43fe6a60c9 SHA256 3189df2cc58d6285ca990b4079d94eb80739d0dfbff3da7641f4ce6a98a3e039
-MISC ChangeLog 4789 RMD160 4cb65992c0fbd4d3cf7de9e34ba92f410912e00c SHA1 025e5e3e52e03847a0c74a272f969807862f40d8 SHA256 8a3055d2b7b5052ecfe7ff3931f1e776a218f2844901ae8dcea2273b81593a5b
+EBUILD calligra-2.4.0.ebuild 5880 RMD160 7b352cc9d9b9979dc756d7d9c80b16b2c19a6bbb SHA1 88897f97c12f5d6d3d4581aa3ea36bb4def96104 SHA256 609b9eeb33cb7688ed04460577112f7b3ca30e192f0878a7346b69e0bc5ae45e
+EBUILD calligra-9999.ebuild 5880 RMD160 885b1997bd057ccb20a11ecadb8c84254632bfc6 SHA1 90b01d0381233f37525a98c6ccb6f1926da369b4 SHA256 f841a44a5f4763fada1500e76b27533b4a0ebff1f633f6a4da0c085635a5b988
+MISC ChangeLog 4941 RMD160 684654192a682db0c36fa653444408d671d5935c SHA1 80ffe471bfba516f2272bd4e77c7e48193ead08d SHA256 49cf95afb9ffbb2017fdebc1d86e246350090405149aa33cbcf6218e2d6027a1
 MISC metadata.xml 1491 RMD160 f8ff74f843ae8df2be457f5376f8d1ad08604c09 SHA1 56f2b25dfd6524b43aed66a177a515e80f04cde2 SHA256 9e6668563b25b690da423ea91dbac27e6289ee117cb6cb026c2657c476555c69
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iQIcBAEBAgAGBQJPfsWWAAoJEOSiRoyO7jvoW0gP/RRqnW734Rcu0xZE3s/pccnQ
-18oslzGP3BCW1prG1wxKNwaiU3H9J81gwAqrC8KmnTQ8Alf6CrPwwHtzjIdOtgDr
-d0toXpn6KlvvYFGH/M8Fs1cvVc1q3RXQSSPvwYJoHV9llrJYDZM9322WxlvZS/Wg
-WUC1/E6dUVFfaSENS6lXSKPWNiCkycII4LN3bYWkxAO9HrY9GEsEZkbNhyEMyCyu
-IEy3TBL7+1CzsMTtOMOhyapUeZ/TOTBRaepW1BRPoDuVgG6wx7g2S5WHdJdsDfZn
-6Xa0wScJeZs0OnkZEbkp3UVVhylAX9/Hv2MMJIxAxt4zcgWmDP3tAO+uwvHo96lL
-Ux4v4VFnNp2220rwZq06r/SWnC4HR9IUQB9s0B9yI6m5WAPsPhNtPAvtRiNZV5/X
-wxR4m0DnQu5JJmQjJ8IbePPLNOjk5PnyXaBEzvabpTLRmiLnU+P9Lq6Ew+olEuJm
-EePikT1SIR50e4iktGrAeFCiKdQ5v2YWzitk5GxJgkQE/wYxLdL6p5w0m2lMvVj6
-Azi3yROf9azn1/pm5+tcFQxstY0QC350aSDM+fvWTX+kT1JpOnq9gAbVnk5tDqsv
-GNQt6oK7v74gmzFfJc1aDOO6Xo5BeELI1Fc4l8xUYVtXRF3P+ZwMCXFJfPvf0NEu
-tmIhKEcr48lpOzoVICOa
-=jYx5
+iQIcBAEBCgAGBQJPfzyoAAoJENwGBM22xffec4IP/ipuiS7NRPT44x5M3IXXOPeF
+arTtc9cyvp7a3qrJ8mdyriv6SAPYCWX0kHUiowKUr34qRzXy1Gs2j7x3u0cCbtIE
+HLfLwojWUiHvXIWGWRKsBrVImrur0g+6PHAYo78FaoTCMsg+o8Mtqj7uHDoyswAR
+yI5u8/G312hkHcsgHfKyP0Q5GahW4piFXUHBOvanrHO8sFHVcA9+2o53dNs3Nm+1
+ceoq+3XbFW2teOzpRm+0jHH83U7mVfK8mTiBRIm+9T6+wGke6G7+1q438lUeRz72
+DWjNfWq73DRZeMpiLbae33ADKNLjfRhqC5Tzgj/iLaXTxeZPINWhch1N4JZw1yFz
+O+5tqHwVKxXYH4XrC2luf0qZJLMCQ5EGSzGq0lgapw2/7eibyTOH7ufaOs4u47N+
+tAvQxUBWfeGmeDFjaZRxA+eMEEo9lOVvhkvGmvtgM1I1Rlr6pukhtWnC2Q+hGfmU
+Kme27ID79n9JzWt2nx13Q0sZiFN7ldV3iOEulE2NmSG33RJ0ZR4DZabKcEERR5Xf
+eDKVE81vxN+hOxCs7H2WO9CWYQ4MlYeGSo0WpMsjFJGGZCQOB2F+1UW3whP1faVZ
+cj57Jt1OcvIb/3lJjVRASBOTTQWWhdcX8r4Lrls81rz+sJ8BmzPzMDfpBIUuRGyX
+1Zn09PADxozSEiHJ9816
+=47pJ
 -----END PGP SIGNATURE-----
diff --git a/app-office/calligra/calligra-2.4.0.ebuild b/app-office/calligra/calligra-2.4.0.ebuild
new file mode 100644
index 000000000000..b0d8d2717b71
--- /dev/null
+++ b/app-office/calligra/calligra-2.4.0.ebuild
@@ -0,0 +1,201 @@
+# 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.1 2012/04/06 18:57:34 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
+QT_MINIMAL=4.8.1
+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
+	>=x11-libs/qt-gui-4.8.1-r1
+	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}"
+
+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-9999.ebuild b/app-office/calligra/calligra-9999.ebuild
index 4528abc42cae..b10091dd4327 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.11 2012/03/25 08:48:33 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/calligra/calligra-9999.ebuild,v 1.12 2012/04/06 18:57:34 dilfridge Exp $
 
 # note: files that need to be checked for dependencies etc:
 # CMakeLists.txt, kexi/CMakeLists.txt kexi/migration/CMakeLists.txt
@@ -10,6 +10,7 @@ EAPI=4
 
 KDE_SCM=git
 KDE_MINIMAL=4.6.4
+QT_MINIMAL=4.8.1
 OPENGL_REQUIRED=optional
 
 KDE_HANDBOOK=optional
@@ -63,6 +64,7 @@ RDEPEND="
 	$(add_kdebase_dep knewstuff)
 	media-libs/libpng
 	sys-libs/zlib
+	>=x11-libs/qt-gui-4.8.1-r1
 	attica? ( dev-libs/libattica )
 	crypt? ( app-crypt/qca:2 )
 	eigen? ( dev-cpp/eigen:2 )