Version bump

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

4 files changed, 219 insertions, 19 deletions

diff --git a/app-office/calligra/ChangeLog b/app-office/calligra/ChangeLog
index b3a0771c1c57..420390867830 100644
--- a/app-office/calligra/ChangeLog
+++ b/app-office/calligra/ChangeLog
@@ -1,6 +1,12 @@
 # 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.14 2011/11/20 17:54:57 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/calligra/ChangeLog,v 1.15 2011/12/10 14:46:39 dilfridge Exp $
+
+*calligra-2.3.85 (10 Dec 2011)
+
+  10 Dec 2011; Andreas K. Huettel <dilfridge@gentoo.org>
+  +calligra-2.3.85.ebuild, calligra-9999.ebuild:
+  Version bump
 
 *calligra-2.3.84 (20 Nov 2011)
 
diff --git a/app-office/calligra/Manifest b/app-office/calligra/Manifest
index 053b0bc122ef..10f6eabd0692 100644
--- a/app-office/calligra/Manifest
+++ b/app-office/calligra/Manifest
@@ -3,25 +3,27 @@ Hash: SHA512
 
 DIST calligra-2.3.83.tar.bz2 101025152 RMD160 88e0489f02eaa1a5a54f2c00d749b2b6b53298e6 SHA1 ee07ba8d856d85955c8c8e811e666eb91b86e5f9 SHA256 538f126e1b2fc5c73fbfdba71d134f560a804acee2ea598e1c3fde8c92ae6570
 DIST calligra-2.3.84.tar.bz2 103848582 RMD160 7dc52e44ac2bb6a2cb838e7d188a55458718a0a9 SHA1 0af76057c1eca55fff2541be3d0c47b911a1063f SHA256 eb916fcaec549175b6e01b122dba576e61515348a483bbf97bb1149967d4f090
+DIST calligra-2.3.85.tar.bz2 103240902 RMD160 92ff5ee2969e106969ca86d35b3c6761224f10c1 SHA1 d7d5101a693d80cf641ae64a0aeca8806c33ee1d SHA256 ab84169cf07298b56825d495c86339e4457dc89741ffd6af9bbf7a0963802ac3
 EBUILD calligra-2.3.83.ebuild 5595 RMD160 83cc983d4be64fdb88367ee3467aad36e185d3e2 SHA1 f4e5c15aaa3208beaf3a0e5ced07c230d8e718b0 SHA256 7c6209a6ad626d744bcd4fd6a3ccc2a5b0177f6c5d69b8e889b3f95f9d9d1e89
 EBUILD calligra-2.3.84.ebuild 5603 RMD160 af7fd79efa22e3352db07c8503960d9aa66ed231 SHA1 a357189d4961741d2b8c9d809e3fc9b159676685 SHA256 ccd1683d968cdf9e5eda3db1229fa88b311aeae7407ea6ce2868ad534cef9896
-EBUILD calligra-9999.ebuild 5569 RMD160 1f322cbc471f041ad65800d2baa9b8e98a3acbb9 SHA1 d34e9d89a346fc4713113663a2a2fc6881e9296f SHA256 8e27927b80d79d4b07968362a0ed70f0bc46e0bcdc23b609692d558402fe0fa3
-MISC ChangeLog 2610 RMD160 cda043c2fefa4db4edf5cd886b25192bf528051d SHA1 713b690de1a7770ea117665c034712a23a3024d9 SHA256 bbe4d95b43c9e2cae5e91cbf8d7ad62e5f3c891c93a29c3040a96b27e06ed2bd
+EBUILD calligra-2.3.85.ebuild 5585 RMD160 daa102182c732994849781fa5185e5bf43a3a677 SHA1 228b34e6c8ea51e0b0f6cc563870767dd8d74a8b SHA256 e8a3bcd2fab51fbe9d3689078d2d8d8d5704253c80a4c19ee5356a54c8667be5
+EBUILD calligra-9999.ebuild 5583 RMD160 dd183454c0426a0ea71fb08a3ac44d31cf733a60 SHA1 2765695cadfcc1ab9718f9bacd83c9f7a2f3a425 SHA256 fa7071207563a015be3cdbb5419f6ba5dfe0813137d5a4707e2c282f6451d2ef
+MISC ChangeLog 2764 RMD160 923e5a93d206f548b8d979b40cfbda0e1aeb174b SHA1 0c6f24f1338dc593266c2e6f4c03f91b3032e3c0 SHA256 4a6c7b74484a11275c82e44b0d41381290c41d384a8cd412850c25ecd0245755
 MISC metadata.xml 1413 RMD160 9e5d04607a8a3f6af1d9a4daa3a224d8baa6b772 SHA1 6db8d64d20d9af877e625e630e3a437651bee3a3 SHA256 5a28be7ce31d48f02f258becf5ebded580b0cf387bf353eb24ce2fccc5746659
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iQIcBAEBCgAGBQJOyU1DAAoJENwGBM22xffeb1sP+wXM34Nfbn5uCG6zJfJE7XqC
-PUKJes8z6c+4UW1qD16/ek+Up/hm0DrjS+pkfuS+D1YrvNfyqbWgjOM2O8d+galJ
-3JUdUuOVn5NmLxa4EWdg7a5Po20Q/irBaKoB9Rox4VYkv7bs1PN+inQyxiz5Nvtx
-Yi1wpkrFK/ftKxfwv6ZBG6TBjuVKm8MPoVgg3rafO/d47X1hkhWAr8emRfsldbfj
-Ub/pTruxz6wXQklTquqIT/GAHrj/pgT8dGXRxwfI8+LVkr3XKSp3yd+G0pR3AnbE
-EImTLt53KhJit4aZhBjx8zFCUZVjKT0A6KbeZfDlXkEl+a8tXhomseCY81ltGDkB
-AqFrPDP6HeClhrShFF6gyoyuh5qYTEORn23havVD3Y1i0m1p/8rL+9J6WwUJRyso
-X/fHS4XDP+0oIrdR1uYroLnW72FkimiplQaB18f2o61WbBwLePAs2/TRutUu0Pfi
-O/1+VRz74hZc2vS8B2syABaxvuJK7BPOkt/a2AAxeZcSQdMz/xqJkSQGxp6NWvA/
-zM41IYmrinmLPypU/NIcPGYIIiM/XIfdDb+X5xOO41Tl6l2nDQDMMu5sBByHYfjx
-uCgYkX7VWNd6Zger0V79N9slZZ1TCMRedn/TWig8l6HwrMjlMPxhguUEviINj8ic
-hYozQnsYzJbLilhqz53E
-=dGcz
+iQIcBAEBCgAGBQJO43DdAAoJENwGBM22xffe7FwP/2M3BRfHexol2McVCtWXDY38
+p0561JINEwjbl7mx9+lOhvWlBhFVunah4itVKu2zm/0mwe5ShA8FAly4FeKsJFQh
+GwTCnkzgYFbHr04zdJ5UpGWPBRZXoKzM9RQX833I0Z+iZSCdytkQ5fIcuuX9+5Vb
+fBjI7EsXMvwUOyCcKMOp3mlXGw1uwtawn8AQmMd3lmAJkkRkZ+2+1cNLB0gdBJh/
+rSNumvv3xpJ+cV57GYBzG10bq6Inw/6O+eyglBR95M2kmHXFs4dLgwp8fXSWPNSR
+RyxvIYG7E22gLgyVDpBrgWCVI58jRHDCz/MqMQOG/FOC08r77JsPanGtenwBHkAm
+35wFAao9t4E2UApg0Wp0Ss4kKr8Vw8OD91TUdUXuRfF2KL713sglco55IQp1QhZ+
+bqFBYI5gFwaohMnb+L50XT8rSpnYrmYPArKpyQ0LMin7fZynVQnitsVIM3SA60vb
++uaSGpsxZ4/x4CBrFusWxkTqoocwqquHOIniYMGL88r/e73wWN5cph4GCo4rdm8D
+BQ8iMn8kWocwihP62WKzR2YRsyLjXMH7YS0ZNd18S9567JFHN23p9NdqjKhJvn1n
+SMpkgtbMwIaa4EO6DcsTozGlJAVZTpG2YPMSdRZmEcSjqRsz5KImD0ivRlDpfdNc
+zkSPzzTnaf1Vf4ij3ar3
+=tGb3
 -----END PGP SIGNATURE-----
diff --git a/app-office/calligra/calligra-2.3.85.ebuild b/app-office/calligra/calligra-2.3.85.ebuild
new file mode 100644
index 000000000000..aa578d19a18c
--- /dev/null
+++ b/app-office/calligra/calligra-2.3.85.ebuild
@@ -0,0 +1,190 @@
+# 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.85.ebuild,v 1.1 2011/12/10 14:46:39 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.7.9: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}"
+
+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 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 707e85da4373..a37398cc1abb 100644
--- a/app-office/calligra/calligra-9999.ebuild
+++ b/app-office/calligra/calligra-9999.ebuild
@@ -1,6 +1,6 @@
 # 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-9999.ebuild,v 1.4 2011/10/29 17:44:14 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/calligra/calligra-9999.ebuild,v 1.5 2011/12/10 14:46:39 dilfridge Exp $
 
 # note: files that need to be checked for dependencies etc:
 # CMakeLists.txt, kexi/CMakeLists.txt kexi/migration/CMakeLists.txt
@@ -11,7 +11,9 @@ EAPI=4
 KDE_SCM=git
 KDE_MINIMAL=4.6.4
 OPENGL_REQUIRED=optional
+
 KDE_HANDBOOK=optional
+
 KDE_LINGUAS_LIVE_OVERRIDE=true
 inherit kde4-base
 
@@ -53,7 +55,7 @@ RDEPEND="
 	!app-office/kpresenter
 	!app-office/kspread
 	!app-office/kword
-	dev-db/sqlite:3
+	>=dev-db/sqlite-3.7.9:3
 	dev-lang/perl
 	dev-libs/boost
 	dev-libs/libxml2
@@ -118,13 +120,13 @@ src_configure() {
 		"-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
-		"-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/