Version bump

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

5 files changed, 48 insertions, 33 deletions

diff --git a/app-office/calligra/ChangeLog b/app-office/calligra/ChangeLog
index a451c4368b6d..affede9a86bc 100644
--- a/app-office/calligra/ChangeLog
+++ b/app-office/calligra/ChangeLog
@@ -1,6 +1,13 @@
 # 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.17 2011/12/22 22:25:01 dilfridge Exp $
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-office/calligra/ChangeLog,v 1.18 2012/01/07 23:38:31 dilfridge Exp $
+
+*calligra-2.3.86 (07 Jan 2012)
+
+  07 Jan 2012; Andreas K. Huettel <dilfridge@gentoo.org>
+  -calligra-2.3.84.ebuild, +calligra-2.3.86.ebuild, calligra-9999.ebuild,
+  metadata.xml:
+  Version bump
 
   22 Dec 2011; Andreas K. Huettel <dilfridge@gentoo.org>
   -calligra-2.3.83.ebuild:
diff --git a/app-office/calligra/Manifest b/app-office/calligra/Manifest
index 229c7a0496c5..4f05b4cd2788 100644
--- a/app-office/calligra/Manifest
+++ b/app-office/calligra/Manifest
@@ -2,27 +2,27 @@
 Hash: SHA512
 
 AUX calligra-2.3.85-asneeded.patch 603 RMD160 0164db10d2fa72422d3dc2a2c6a83994d0905e7a SHA1 4cc5eae6e718e9c4b26bdb1cd890b1333f8798e4 SHA256 9fe8d3a032dd8cfa99a1e2dec0a0667a4a14a0970b8d40b19c91a44a14e3d476
-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.84.ebuild 5603 RMD160 af7fd79efa22e3352db07c8503960d9aa66ed231 SHA1 a357189d4961741d2b8c9d809e3fc9b159676685 SHA256 ccd1683d968cdf9e5eda3db1229fa88b311aeae7407ea6ce2868ad534cef9896
+DIST calligra-2.3.86.tar.bz2 123497239 RMD160 1d9049da3491b2567fa3686d84ac580825bffc25 SHA1 719c7ed8293d27576ef178af621af89cddc5fab5 SHA256 3e8471e36ac492e00e80d65ad38446ce7c40eb03eece7b91adc492f3cdb78440
 EBUILD calligra-2.3.85.ebuild 5633 RMD160 a760429430ad583cd7438d4c222a011f123f8324 SHA1 3a9e2ddf377fd9484e5e4a9ae6d3d5c4bd72bcb8 SHA256 8ee64e29371e7835bb1ef3805afb311c75337405c503a0465f4e96bd5f89aa55
-EBUILD calligra-9999.ebuild 5583 RMD160 dd183454c0426a0ea71fb08a3ac44d31cf733a60 SHA1 2765695cadfcc1ab9718f9bacd83c9f7a2f3a425 SHA256 fa7071207563a015be3cdbb5419f6ba5dfe0813137d5a4707e2c282f6451d2ef
-MISC ChangeLog 3016 RMD160 37d68159738b0f77ec9f72d2126ba4191fc58295 SHA1 362d8a3ac845bdb8f8bc029ba98c4cfe33f96a63 SHA256 2c34842a1ccdacee6b198306dc74a00c101ec7f971c66faeb711affccd474fce
-MISC metadata.xml 1413 RMD160 9e5d04607a8a3f6af1d9a4daa3a224d8baa6b772 SHA1 6db8d64d20d9af877e625e630e3a437651bee3a3 SHA256 5a28be7ce31d48f02f258becf5ebded580b0cf387bf353eb24ce2fccc5746659
+EBUILD calligra-2.3.86.ebuild 5674 RMD160 7074e9abc1d93f411423457397422479200165f0 SHA1 84b485b8f7cc5848af8c769dabea7b3f29eb0f14 SHA256 330616142a3abfc590d85af32c9b6078c5afbfd2d18d40b4b0d0ed9cbc3cc97c
+EBUILD calligra-9999.ebuild 5672 RMD160 d6284d2eafae8021640a8a5bbd49ec3974f66e17 SHA1 cfbf6e5265cc4d18e27db011945c6d6499fddc4a SHA256 057d86e22c74a171e467a3b94dd715df2e8f881c6b7473c713190c8dc8feda3a
+MISC ChangeLog 3211 RMD160 d427837f5f30262976d820cc29683b900d863830 SHA1 4e767e22509ec9fe3d0837281af207c7db215dfa SHA256 4e300ea4ed88363a9d35a81be4ed46c5e82db9f2933f1ffc850d9197482b6aa0
+MISC metadata.xml 1491 RMD160 f8ff74f843ae8df2be457f5376f8d1ad08604c09 SHA1 56f2b25dfd6524b43aed66a177a515e80f04cde2 SHA256 9e6668563b25b690da423ea91dbac27e6289ee117cb6cb026c2657c476555c69
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iQIcBAEBCgAGBQJO865mAAoJENwGBM22xffe0pgQAKNGkpAQNZf57nEPBQnKXJSZ
-vwSzAY2u35DVVb60k8ttwQwwRAQts/On9qoaRxsoWrtaTJ1No1LroaAB/fqrma7b
-ObA4lnUHZJT5zv21LONeA/sR3hQUlQek23w9Fsc7nOqt3BuYojymJLJd++782jX5
-sFB73wiKFs+kVOAPQ0D4cXNEr2YffKscpDZ/kGvUx3KkHifpzqfy3M13vpDMzM5a
-lz0gB54gnPR5k/vz6aKeBsdD2duG+6AVnsolWl9MwRtMDUBD1lqKDq1xWhiqRT9P
-TNT8+G5xCCZSeFTBV23xQ02tw9GIg0GHAWFq/Dw78CuzLkk46eTGAAqNcQMpfC/Q
-R58/9lkUHQssg1ZPFArza5Fwzd+pTzMiYSL0TewxiV/TWrr2DAmaJBMhpvYzqcTD
-3xb5vcN21xzyFr8VQHq2xv+M0d47NirWwUaU//IwoaCYpvZLnHG4xglK0CUU4tBQ
-qO2cCz1jrBwDpLq+6A9u+wgVt1ifcePhgs5XR6on3M7qfEypLGTDiwwzRnJdboqX
-gCv61DcMx9vlnZJZaxDfVhyhgSqv3BVeNkH15VtYJTjCsd6xzCRBgCg52XlFFdHp
-sKSRdXdCq/XpwANn53p8/pYS+QIfcZZHzeg44oCx0nLz4ICYBVXCFDEoQPzKLAlF
-Jvmer/wJ7qSdhrNHVO1X
-=QSRW
+iQIcBAEBCgAGBQJPCNe9AAoJENwGBM22xffe4dwQAJHwge62j8j6qVQw5qNLQoS2
+7L4F20MVR4lML6le3KWVYVW0cGS76QAMrPIR3YjRyCNvlix4c8mtS2Jv54t+H0VP
+ciY71X11NOgVHd/j68NqHOrMPxyhqwa58CYAFR3ow6+ftUzwuuCZZEr34gQM9WLe
+YYenWOWA5e99XA3CAYb6SIDm4ihJmDk05qrrsuMgivMfFH/B8bwvW1dUZgzNmiow
+3swB0UWh8W/d8slO5/asxeAfB1hoaujoP60L9t8QPeXKeyzzjyWoI02PFo6pvMkV
+BcFzmjVsA09Gq4xYvkUCI1vJ5Y9jfuF4CkjCdBG0XqTG/U/sTT37gOAtEA1nPtJS
+BAi7rqmMB1aq1TCRzBsQR0cheoYmhVQCnk9pX53LR7RxlNUEG81m4Fssnj2PPM9Q
+6N+02oAvZCOdPTm74oeLH3VanG4SGU5+NaIbdzx1wTSgGqsmwMCfsfG8s0ZoAQtU
+gt/XebG52Tb3565H01pp4h2eDz0CCih3NwXCLYvTPlyJPmvObcrXnxBKFXROe/6T
+MlDb5WeOasRnPkpfvnUlnjyf5TViFpsaPhuwKrNNy7pXhqvOD+Dt1cbRBODDZQqZ
+Mu8NJ7RX8NPv+EmzG1IRi8sdeUSUYQz9waudbg4rWFxS6rJpXW4O/P78K/dWtndf
+8q6k6Jb4F2hBBEE00NOf
+=NciM
 -----END PGP SIGNATURE-----
diff --git a/app-office/calligra/calligra-2.3.84.ebuild b/app-office/calligra/calligra-2.3.86.ebuild
index 5ff085d2f69f..365fe93a39a2 100644
--- a/app-office/calligra/calligra-2.3.84.ebuild
+++ b/app-office/calligra/calligra-2.3.86.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# 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.84.ebuild,v 1.1 2011/11/20 17:54:57 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/calligra/calligra-2.3.86.ebuild,v 1.1 2012/01/07 23:38:31 dilfridge Exp $
 
 # note: files that need to be checked for dependencies etc:
 # CMakeLists.txt, kexi/CMakeLists.txt kexi/migration/CMakeLists.txt
@@ -12,8 +12,7 @@ KDE_SCM=git
 KDE_MINIMAL=4.6.4
 OPENGL_REQUIRED=optional
 
-# KDE_HANDBOOK=optional
-# no handbook in 83
+KDE_HANDBOOK=optional
 
 KDE_LINGUAS_LIVE_OVERRIDE=true
 inherit kde4-base
@@ -25,7 +24,7 @@ HOMEPAGE="http://www.calligra-suite.org/"
 LICENSE="GPL-2"
 SLOT="4"
 [[ ${PV} == 9999 ]] || KEYWORDS="~amd64 ~x86"
-IUSE="+crypt +eigen +exif fftw +fontconfig freetds +gif glew +glib +gsf
+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"
@@ -56,13 +55,13 @@ RDEPEND="
 	!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
+	attica? ( dev-libs/libattica )
 	crypt? ( app-crypt/qca:2 )
 	eigen? ( dev-cpp/eigen:2 )
 	exif? ( media-gfx/exiv2 )
@@ -105,7 +104,10 @@ RDEPEND="
 	)
 	xbase? ( dev-db/xbase )
 	xslt? ( dev-libs/libxslt )
-	calligra_features_kexi? ( >=dev-db/sqlite-3.7.3 )
+	calligra_features_kexi? (
+		>=dev-db/sqlite-3.7.9:3[extensions]
+		dev-libs/icu
+	)
 "
 DEPEND="${RDEPEND}"
 
@@ -121,13 +123,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/
@@ -137,6 +139,7 @@ src_configure() {
 
 	# 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)
diff --git a/app-office/calligra/calligra-9999.ebuild b/app-office/calligra/calligra-9999.ebuild
index a37398cc1abb..3befe4156d0a 100644
--- a/app-office/calligra/calligra-9999.ebuild
+++ b/app-office/calligra/calligra-9999.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# 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.5 2011/12/10 14:46:39 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/calligra/calligra-9999.ebuild,v 1.6 2012/01/07 23:38:31 dilfridge Exp $
 
 # note: files that need to be checked for dependencies etc:
 # CMakeLists.txt, kexi/CMakeLists.txt kexi/migration/CMakeLists.txt
@@ -24,7 +24,7 @@ HOMEPAGE="http://www.calligra-suite.org/"
 LICENSE="GPL-2"
 SLOT="4"
 [[ ${PV} == 9999 ]] || KEYWORDS="~amd64 ~x86"
-IUSE="+crypt +eigen +exif fftw +fontconfig freetds +gif glew +glib +gsf
+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"
@@ -55,13 +55,13 @@ RDEPEND="
 	!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
+	attica? ( dev-libs/libattica )
 	crypt? ( app-crypt/qca:2 )
 	eigen? ( dev-cpp/eigen:2 )
 	exif? ( media-gfx/exiv2 )
@@ -104,7 +104,10 @@ RDEPEND="
 	)
 	xbase? ( dev-db/xbase )
 	xslt? ( dev-libs/libxslt )
-	calligra_features_kexi? ( >=dev-db/sqlite-3.7.3 )
+	calligra_features_kexi? (
+		>=dev-db/sqlite-3.7.9:3[extensions]
+		dev-libs/icu
+	)
 "
 DEPEND="${RDEPEND}"
 
@@ -136,6 +139,7 @@ src_configure() {
 
 	# 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)
diff --git a/app-office/calligra/metadata.xml b/app-office/calligra/metadata.xml
index 608cd4656872..4f2f812324ca 100644
--- a/app-office/calligra/metadata.xml
+++ b/app-office/calligra/metadata.xml
@@ -7,6 +7,7 @@
 	<herd>kde</herd>
 	<herd>openoffice</herd>
 	<use>
+		<flag name="attica">Get hot stuff with <pkg>dev-libs/libattica</pkg></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>