Version bump

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

4 files changed, 242 insertions, 15 deletions

diff --git a/app-office/calligra/ChangeLog b/app-office/calligra/ChangeLog
index 3e8c191e30d9..b00344ea66b2 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.19 2012/01/22 22:26:53 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/calligra/ChangeLog,v 1.20 2012/02/07 23:19:33 dilfridge Exp $
+
+*calligra-2.3.87 (07 Feb 2012)
+
+  07 Feb 2012; Andreas K. Huettel <dilfridge@gentoo.org>
+  +calligra-2.3.87.ebuild, +files/calligra-2.3.87-marble.patch:
+  Version bump
 
   22 Jan 2012; Andreas K. Huettel <dilfridge@gentoo.org>
   -calligra-2.3.85.ebuild, calligra-2.3.86.ebuild, calligra-9999.ebuild:
diff --git a/app-office/calligra/Manifest b/app-office/calligra/Manifest
index 6b8f8eb5f584..142edfee3eae 100644
--- a/app-office/calligra/Manifest
+++ b/app-office/calligra/Manifest
@@ -2,25 +2,28 @@
 Hash: SHA512
 
 AUX calligra-2.3.85-asneeded.patch 603 RMD160 0164db10d2fa72422d3dc2a2c6a83994d0905e7a SHA1 4cc5eae6e718e9c4b26bdb1cd890b1333f8798e4 SHA256 9fe8d3a032dd8cfa99a1e2dec0a0667a4a14a0970b8d40b19c91a44a14e3d476
+AUX calligra-2.3.87-marble.patch 1169 RMD160 671458c9889b8f90bffc7d3e5e19e78d4ba31892 SHA1 10a73f5fb282cb03a995b59d0e155e633dca9e6f SHA256 523563109957fcdc72518961f86c6faadd9d8ef1dfeef4c32effe86d332c818d
 DIST calligra-2.3.86.tar.bz2 123497239 RMD160 1d9049da3491b2567fa3686d84ac580825bffc25 SHA1 719c7ed8293d27576ef178af621af89cddc5fab5 SHA256 3e8471e36ac492e00e80d65ad38446ce7c40eb03eece7b91adc492f3cdb78440
+DIST calligra-2.3.87.tar.bz2 123191120 RMD160 b10cbd7c553e34c014ad14f5e4272061ec3ad93d SHA1 d398e78c553c4d512c57236a92732765aa82abc5 SHA256 3bdda4c35eb467f7599eef3d4fd4712be157846dc16a873cd9d3afc1b99839ab
 EBUILD calligra-2.3.86.ebuild 5702 RMD160 a30379e971a22fe022e49bbefc9246301258f3c5 SHA1 843324e20dc4223edc6d58f90ed82540c3e6bdf6 SHA256 2298f6ee2bdd2bff378a54c5e3f1b35f2c4dd5a0145896674181c5ae463cb98f
+EBUILD calligra-2.3.87.ebuild 5747 RMD160 4a7e0adc59eb5634ee7e464a1e548ae1b1a54bc2 SHA1 e87c686efb80ab69ef37c977ad686352387d7ac6 SHA256 92cad10d5d94ab77db73d6898ecce3f8cfe00f395238324dd1dbc4b467c5160c
 EBUILD calligra-9999.ebuild 5700 RMD160 a09bec8b17aaddacb8578358db37ad181b1a1be4 SHA1 e0a160348f6c47bb0013531bc4504c69d13b77c3 SHA256 f97cf1eaffd929c34b07eac7ceb7d1e1e1fc02119db11bcb7addeb46a0a05903
-MISC ChangeLog 3383 RMD160 0ba560dad8d0fb3cf80f42beb7f7548b16c639cb SHA1 008f2c115d4dfe9d1ef8f98d3c080df9721afbe7 SHA256 3a1153ef9f0db075b745a401a6d239a840311753a4c9ffa89a4256680e13e63c
+MISC ChangeLog 3552 RMD160 ff3dbbd5f31db3fd9d2424ddc56659c47346ba21 SHA1 1600e21adbcd7d3ed2b5959affda2dca46f1a61f SHA256 0a96cbadf7a44ba12b3ff476f92ffe33f2083d79d6657b558f0e342054fbc371
 MISC metadata.xml 1491 RMD160 f8ff74f843ae8df2be457f5376f8d1ad08604c09 SHA1 56f2b25dfd6524b43aed66a177a515e80f04cde2 SHA256 9e6668563b25b690da423ea91dbac27e6289ee117cb6cb026c2657c476555c69
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iQIcBAEBCgAGBQJPHI1pAAoJENwGBM22xffev/IQAKkI8ohC3Kz6jFydPenw4GLz
-pIK1Hxn3nozXXMdJxhFWDqmZeObcwNWniJa+LjGOI/Kfond0TU1RupFCGr5pGGlD
-rhYS5aFCaaCK60vN5NtgZMKnesVUhSvtmjiXcUK/VnggEzN751jJeMVh7HZO0gWY
-0HDr74JNBII+2Xs+R4kjAHOGcibRHglwnB60gW7QdrFWmBXXZKtdWnd/yq8wV2of
-y9nASt0PdVriX+EufMAsyiaCgAsRbIMuTo8GWiOJRRj/9+PczbtlSREGyG11dyJ6
-hLDlB4Nt0OgTTwUFgV++xymdqMd2cWfxyL6Vyjf8jOBoVvvqZ8PGxEcY/AwRJY0h
-E4oOESu4sT0kNGUB3i7iBhgIZltrz48qyX/EM6FlYHpnZyKXMEM568hoGl0/SFdK
-J265kf7OKAgSpN3jrMcB6X6yplOF5LFvSpq6F5Uz8H5myQvTohljmUsor/O7zFLT
-LGPQ+oq6F4kfIeIkXtgEkQzXsQGmESq9ZIRdnQIJyDSJQXd51lB0DsCVMJWSsSFx
-TxHJd96xRz4b2cU3mJSlHlJMBc1nsgUKbeWYqLFPXZrww52Y1tdJ6G8lQaX151PC
-HFxG8ygvbFnd2plcrK44p02f6F4B2j8JrINID1ElueiwqeMrfHAK4nTZPSG8IH7g
-FMl8peB2nIxEHEkqhy6E
-=S7OU
+iQIcBAEBCgAGBQJPMbHfAAoJENwGBM22xffeeF4QAJ98TW39XcT/Pd8e2eLfzNIP
+KwdT833Le4AkMBh4cpKLFFmetDTlbJovF/lzVw0rcpxswKjoXPrj8/75P/i3ig3x
+IAnLKIERCK1NH3/Yv2qLk2fuYWXlOa0kzaXXToHl+G2CaKRHg2aCXo/Q3TamNbfV
+j9gGf5ZD51rB9zOcK//GJbuknxScIP80iQAUIIcL548qp5eTee6jUunq7j4r5M/P
+5aL9T8WrX13aoTlHG8/XNcBKODC0GMt3jXvWRC5wUtrD9WHZwS5D5a/vAsCEo5BC
+fsLQbmtwAsH3pk1M7Eqpbjilpp9ZdeayeBJB/ZxvQ6s99cuQjDnCx8xOKifbML3J
++KtE4/SN4zNiwJqcF1DzvtWWakqCe6LEDW+g4qAKB/JwwGNJfs8pkHIMb4t72REZ
+ShVA8XaxnUaaKBDHF6ypwhZ4BWTdXIA0GxcVzAlbXr8HE8BIBqetqBsEMTXpTrqN
+d2NXZOsHBkWgOK7G2z1oi92iqWPTNXYaYvn/cBM1TNYaYPPXz4/hjLq2iRglzhRW
+kRBcRajHTTJXmoi6lgqpu8KxtR2+WWw1VNxzgdHTi/6zp+s3y6crZGjP4bAf9ajg
+V20JMHaR31W7XpJWRn1432qLXhCSXbDMd1OkTuJnyONLywrpfuYBqazVS7bMlKLe
+Uyum8ouAiOmr13nkH1XY
+=I00T
 -----END PGP SIGNATURE-----
diff --git a/app-office/calligra/calligra-2.3.87.ebuild b/app-office/calligra/calligra-2.3.87.ebuild
new file mode 100644
index 000000000000..ac43f9b0cfeb
--- /dev/null
+++ b/app-office/calligra/calligra-2.3.87.ebuild
@@ -0,0 +1,199 @@
+# 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.87.ebuild,v 1.1 2012/02/07 23:19:33 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 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-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 )
+	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
+
+PATCHES=( "${FILESDIR}/${P}-marble.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"
+		"-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/files/calligra-2.3.87-marble.patch b/app-office/calligra/files/calligra-2.3.87-marble.patch
new file mode 100644
index 000000000000..6f90f37edad6
--- /dev/null
+++ b/app-office/calligra/files/calligra-2.3.87-marble.patch
@@ -0,0 +1,19 @@
+diff -ruN calligra-2.3.87.orig/CMakeLists.txt calligra-2.3.87/CMakeLists.txt
+--- calligra-2.3.87.orig/CMakeLists.txt	2012-01-28 15:26:27.000000000 +0100
++++ calligra-2.3.87/CMakeLists.txt	2012-02-07 23:53:45.000000000 +0100
+@@ -264,12 +264,9 @@
+     ##
+     find_file(MARBLECONTROLBOX_H MarbleControlBox.h ${MARBLE_INCLUDE_DIR})
+     if( MARBLECONTROLBOX_H )
+-        INCLUDE(CheckCXXSourceCompiles)
+-        set(CMAKE_REQUIRED_LIBRARIES_SWAP ${CMAKE_REQUIRED_LIBRARIES})
+-        set(CMAKE_REQUIRED_LIBRARIES ${CMAKE_REQUIRED_LIBRARIES} ${QT_QTCORE_LIBRARY} ${QT_QTGUI_LIBRARY} ${MARBLE_LIBRARIES})
+-        CHECK_CXX_SOURCE_COMPILES ( "#include <${MARBLECONTROLBOX_H}>\nint main(){Marble::MarbleControlBox*p; p->setMarbleWidget(0); return 0;}" SETMARBLEWIDGET)
+-        # subsequent tests will fail if this is not set back.
+-        set(CMAKE_REQUIRED_LIBRARIES ${CMAKE_REQUIRED_LIBRARIES_SWAP})
++        execute_process(COMMAND grep -m 1 -e "setMarbleWidget" ${MARBLECONTROLBOX_H}
++                        OUTPUT_VARIABLE SETMARBLEWIDGET
++        )
+         if( SETMARBLEWIDGET )
+             add_definitions(-DHAVE_SETMARBLEWIDGET)
+         endif( SETMARBLEWIDGET)