Adjust use dependencies to handle >=app-crypt/qca-2.1.

Package-Manager: portage-2.2.15/cvs/Linux x86_64
Manifest-Sign-Key: 0xF3CFD2BD

7 files changed, 37 insertions, 255 deletions

diff --git a/app-office/calligra/ChangeLog b/app-office/calligra/ChangeLog
index 2024120d04d1..6468ead4678b 100644
--- a/app-office/calligra/ChangeLog
+++ b/app-office/calligra/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-office/calligra
-# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/calligra/ChangeLog,v 1.118 2014/12/28 14:55:07 titanofold Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-office/calligra/ChangeLog,v 1.119 2015/01/28 22:40:16 johu Exp $
+
+  28 Jan 2015; Johannes Huber <johu@gentoo.org> -calligra-2.8.6.ebuild,
+  calligra-2.7.5.ebuild, calligra-2.8.5.ebuild, calligra-2.8.7.ebuild,
+  calligra-9999.ebuild:
+  Adjust use dependencies to handle >=app-crypt/qca-2.1.
 
   28 Dec 2014; Aaron W. Swenson <titanofold@gentoo.org> calligra-2.7.5.ebuild,
   calligra-2.8.5.ebuild, calligra-2.8.6.ebuild, calligra-2.8.7.ebuild,
diff --git a/app-office/calligra/Manifest b/app-office/calligra/Manifest
index 969fdc969754..2aefd1e8e78d 100644
--- a/app-office/calligra/Manifest
+++ b/app-office/calligra/Manifest
@@ -3,19 +3,27 @@ Hash: SHA256
 
 DIST calligra-2.7.5.tar.xz 119293708 SHA256 b1d1237606fd5113e13156192a4c4833b189825628fc40abeedc77109842cf5e SHA512 2438add98f173732b93ccd5ad1f237fa6982e220521b2c64056cfb5e14f16cd3859ff2e64926a657b51454154f255a46f3ad6aaebb67532a31ec98d366672dad WHIRLPOOL 3865f86333d878581bdbc9c1bb39c0bd626e11aa84e535b704f832eabfdf1ef054fd0f7b5324b109bfea9132a59c9b7d76bf20ab3b18921ed6a8a429a27ca99d
 DIST calligra-2.8.5.tar.xz 138928992 SHA256 92b8828ec64b46124b29a03bae13c143e3ed771adf3186fa938c765e5eac2fbd SHA512 09e32b7ce2415daae2ac3c1871fc1bc270210cbf5bc774f622922f8adb20e639db3dfb16c2974404b4395b30f8367a7ddd0016363a8b3e46fa24ff3fde1e4c14 WHIRLPOOL b4cc14353b7f9a457510a745b711283481f969e10ffee2847253b123ba2ea03f61d8abfdda2bcdb463c6bba8f2d8634e1536259f5be3d44778104bc8f28f79fe
-DIST calligra-2.8.6.tar.xz 138955072 SHA256 587dda4a340f46e28fe69de8f292fa33a3cf237445013f6ce5ceafa191cb3694 SHA512 ab09e121121aa7fb14687e644f3c23840775f42f050726cb87894d295e6d987ff636d94c92488727b5161e0b7967cca9fe64bdd4e976d75f1f25323d69ea8ef4 WHIRLPOOL 9711d3252932e0ee18257cf7d152b72dc67f99684a4fd554ab0b7142e3f5d0c9b230c350d45cba08614b9644df0195a4a27736183b5c326dedd212dd1ee86350
 DIST calligra-2.8.7.tar.xz 138966248 SHA256 af6b8b74ea077e5bbfa398e3ae96866b9a3ccfbc10224e9f341e59643be80eb5 SHA512 e09fcbb6708d73db3b31027c4393a138fbf5c47d1b777dd4a3b94f6e668d67ac963cfadb320350c63f1b2d1173edc67dc2100704899176c196865fb4d2ce7442 WHIRLPOOL ce082f04cfb7947219e317ba9a4a6ce436a3aa0784f1cad6206f3febd072f177961111ccbb89227d3c8dede1eafc647409b26f1f4fb304b1d482db0fe8c758b9
-EBUILD calligra-2.7.5.ebuild 6928 SHA256 ea3414f13d806651fb85288573237c075b3c5685dbca3aa9b3f3432f0a41670e SHA512 7d95670077ffb52846fe9d5515b987e639065fdccda48e2f805e41c1e91c5ddb3223dcee049bb2e6aaeff0d7e5af5ddd240ff477a6a63c582169d55d144d0871 WHIRLPOOL ef72de39f9c763cb7186a8ab6e3f8c0922ab4d1e1ed16e64037aba84c14bd0e9c959e6a14e47b9b0e549bd9bd8dbb06844eb94aaff200763064143fb1abb591d
-EBUILD calligra-2.8.5.ebuild 6218 SHA256 2fafef89a93cdfe246b6bef3346ae542e3e3b6b16ebd77e8be160b19ae440987 SHA512 767bc4b4d922285db28161169d2535e65806fa054af7c8456617d0fa08528bca87aa384b9d15d60db55f6ac82dde7398f4e125d76804805d293f4d6f21725da5 WHIRLPOOL 1b2ac254ef0a2ea22cfe42953514465ee0848cd6f45f4049d022016ae7a09b8cdb05f9738a58b7ec40e22e2d9c4e8336577ccb02f4c554846a2e391b4c0f894f
-EBUILD calligra-2.8.6.ebuild 6219 SHA256 eee5e5cb24e186959fdf4c534f0f8235a299ee813dd7c194b4797cdc0243a907 SHA512 cdcf662ab10c38447dcce24efbbd20d2a23293d1227eb6908b15ab14c00f21d0120ae2a053a9ea92ed6e5c1c0b970f524180f3d5def1bb5f2f2ed5e07e3ba824 WHIRLPOOL ca1f7967f8fd74201e8bbd0b51bfdc4b1e079bf239766a976f59336c1c38742c03af991b6e72f5d10a24e68ae5737f43bfb38230135a15fafab13da25585a26c
-EBUILD calligra-2.8.7.ebuild 6219 SHA256 5ec7aa334a9f5c20bc978f81e834c67b1b4f37ce7c9f961f1ea09dd0d76581fd SHA512 4ea330976af45598b850f6fec7de8037e696a5fcfeabd620d5d36074c6e2289c6ae97e407b55b2876b6c41a6d251c75bde54c2f998be6b2d214e215b4acdc30f WHIRLPOOL e6d068f04d6b70973134e0e3d7ef9860691c8b4e5503d8a3d4430b9b5556d3e11d30f85661397b1702dd15717847feaaf5541e78997d2b9b77c17ee5bfac1be1
-EBUILD calligra-9999.ebuild 6219 SHA256 547ed774ed051385b2e3cf4e57898bcd3247b837ffe4c2a8265a3307f2fd7550 SHA512 1838d85a99b53bff1ececab5108bff78517ecd7164ae85e2eaef375ce7ddc6d9ab28b0e7dadbe75829ae379f38f0bb5c55b29b4b2296f5628782064a2a9b77da WHIRLPOOL d7f9bb4a0715f0a433618c5be8b263a0a4ee38749782e87ead8917833e686d15f28e0b660d60fae5e9020f82deb7b167f280d3947ad5fe88614d6001b373f5e2
-MISC ChangeLog 20025 SHA256 fe4fe5edd1bbe210bf7123c9212363d1e78fe51e661a2c5a6f52d9d398e3e53c SHA512 b19d6ffcf13502fa961997d9a38123015547da15b53f6d22b4d59dd004086088e1105c0ac30c39411e9bc6fd6ec3a66ad4f90e9addd1c850692198f66605f960 WHIRLPOOL 3cab113f9e0e0c132410de0647e3b477901e6254c0b0ba50c2719a5b0b193b1523ebe8097c00087d99f0e9e2e3f4dd5480935d19ab0e263913f1c9836e943e51
+EBUILD calligra-2.7.5.ebuild 6931 SHA256 7bd335c77c1500a2b269a46431f8e0cae3b7d02460c0400c098c5b4c48498fa8 SHA512 404391a35101f0b6a66ab562be5751c99447f0268593d32bfe692bf58129537dbe3cda134969152b0783ecbdd4f7ce60a2ed0250942ccb6bd26b07a2d7574bd7 WHIRLPOOL 1b0b74ac2c6742350f87f18eac38457ee9b8c8ff3969039ac790abf80512bfd5a8174d041716fae1cc38dea6869d322e3ee18b2dbd61a0c3968e3fdd082e7ba6
+EBUILD calligra-2.8.5.ebuild 6220 SHA256 b0a6d4a171862c5250a3b8119b2a724414eab619e396c1074f13246b91a19064 SHA512 abfb3f72c7cec5e016a68268b423f3697de08cfe4abd8b202ada7d28aa37d66e99f78fe65349b69917aeac63bcc8ca9c2bfd6b0e91816564127af7b5c817692e WHIRLPOOL a311a127092ae2232eeb24d75a2398e5739145fdfec6dacfc8d7f6563a1f834ea1385a4c50637b880a6eb627ade459ed13b84aa7fb8ccbe095d1d53d91879c61
+EBUILD calligra-2.8.7.ebuild 6221 SHA256 9e48350002905a8306f7b22a7c6a9458186ccba3ded113ae2c950e192df8bb2a SHA512 3e83f816558bec32d4b9265f0d3f25daff2a7006b6c4b98b611f3a4dc1c5d02ea91faf89b4156a26c2eca1c7cfe75294eddd90754b974e32b3670bf90371e83f WHIRLPOOL 142eb721f039695b642d12ce342d693d0002132152e3eda76f0382d2163e086b534dbae011886e56407093ae6972964e6c70b38c6036d1821f345c52b1b0e8d8
+EBUILD calligra-9999.ebuild 6221 SHA256 69d88cc46e7b205334a42934211ca40275a9a5d3444e2f2d9ab40326d4ccaec2 SHA512 56f45e96af1c501ccb7755701dabec65e0a4f59a4cc1dc8db2cbb8ff65f2ff7bee8f16d4967b900dda97eff3985723f75d10b1a2b4a06f98d3452e3f9fa1e32b WHIRLPOOL 2138d3a9831a30f671104890c8226bdca88bd6d8c56497070c7256a56fecc807432a485bfc5f6d4de835b620dc14e89c25d6dbd312f4740d58cd8ca6a2756c74
+MISC ChangeLog 20244 SHA256 c91a387f80441e94924e09605d1a548caf9af8c92b69361e61ec06f9b5333109 SHA512 abb256e9072eb2e8103c7581f26dc83f5d61a5cc2b7b1c15ace9db2a20fa40dd22674e51bfa916dcf8be6137e44a51425c04616d34202569ef075ce27e8ac34c WHIRLPOOL 902aa77316f708b6d493432ddbcaa54c197f9770c6e65f466ac4ab5ecb0b047c9799bb85d0efe525b7be06e144f151f00ea93ab45e40aa5daa4ea093277915b3
 MISC metadata.xml 1799 SHA256 9d92157dacff9ec1cffdea45db09a659596a2968cad9e02917c8a2e51278b0b5 SHA512 f42d542c2598960d46f45937b0f76a9e560ed8057a72162d5ab7525b2765cc3127e2321d33b030c9bd0b50862b3a191a60b6382396b921da8baa31a951460242 WHIRLPOOL 4ae5c169f00b96edb2a463815a49c79cb18f29e9b0f94a99b1f8aa145d8ec56bf5b7f44fad867af437af85e1581a1c69bc950ff6a1cb4e212f6aa71a7970cc87
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iF4EAREIAAYFAlSgGc8ACgkQVxOqA9G7/aCVoAD/XzAOsGA11dUzPJeLVRHcqTNO
-FfibWba+oE5Hm4JMcjUA/06n+GYXjbYWo+/t0UhUAgmSB7Vjzyr0rbDBp3ps5Psi
-=R8sF
+iQIcBAEBCAAGBQJUyWWMAAoJEGVpnaTzz9K97RQP+wcUwFVabNtzYeZuX7/X4ab3
+aMsiRnlq8zaqEHjAUJ7YlpyXW3S4VwLcfB5p7sAvqXdiL1z71uxUh0j3dOYKukly
+YXTa8cCuyojCO/LtCy6qtY5S0gEMSlUDZNp2ekWp5IiFW7E5xQ+r9HMRGAuc5UcL
+vNdMFxcMwQhajaGPyli3CkWe33v0641BkQ3Z9BJbKIB9eUXRHVP/2vzAZYcmZP+W
+1XCp+qe2jWRK/IVyH4764/a5bXXMgZgejHjTKlauz8rp70q5sTOeJaWqtysX3tOl
+QB4etB40D6hjaC4ua+HwVfpISA1M/Fz8D0A10heDK13/X81M5uzxMdjcChhGtzOl
+PIx7lRIZYe+kZizX30xPWK9VgHd/Kf5VBM/Ps3BVzdJkjbNbS+YWgKCnTDvjRNct
+3B/j+OvTcX1GES5WeDz69T9bflntnUwcs3g36XBPrwf+LD3WqwtzqRFYsVeRRxI0
+4pWrbcc3ldQFj1I9IIBjV9xucSxZLh9ntpPZDUPO6saHMlBcJiDhY/Z8CP/Ag03E
+JTEr0mbH0Z1bhW/37UdrhYKHU4KqTHTxfSusuRrL5UjOynSOlN6FpzmQec5qF9C7
+s6VdzekehQvXpeNrdRlOaPR5jSulHyuu7uHaR69km06LzxDAbBjwbREsZv2wk3J8
+NVhX2kGQ8DdPhBT0xCny
+=AGab
 -----END PGP SIGNATURE-----
diff --git a/app-office/calligra/calligra-2.7.5.ebuild b/app-office/calligra/calligra-2.7.5.ebuild
index fd7269264333..cade5e05cd82 100644
--- a/app-office/calligra/calligra-2.7.5.ebuild
+++ b/app-office/calligra/calligra-2.7.5.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/calligra/calligra-2.7.5.ebuild,v 1.9 2014/12/28 14:55:07 titanofold Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/calligra/calligra-2.7.5.ebuild,v 1.10 2015/01/28 22:40:16 johu Exp $
 
 # note: files that need to be checked for dependencies etc:
 # CMakeLists.txt, kexi/CMakeLists.txt kexi/migration/CMakeLists.txt
@@ -88,7 +88,7 @@ RDEPEND="
 	>=dev-qt/qtgui-4.8.1-r1:4
 	virtual/libiconv
 	attica? ( dev-libs/libattica )
-	crypt? ( app-crypt/qca:2 )
+	crypt? ( app-crypt/qca:2[qt4(+)] )
 	eigen? ( dev-cpp/eigen:2 )
 	exif? ( media-gfx/exiv2:= )
 	fftw? ( sci-libs/fftw:3.0 )
diff --git a/app-office/calligra/calligra-2.8.5.ebuild b/app-office/calligra/calligra-2.8.5.ebuild
index 053f4b75bc1a..f9be971b5e4f 100644
--- a/app-office/calligra/calligra-2.8.5.ebuild
+++ b/app-office/calligra/calligra-2.8.5.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/calligra/calligra-2.8.5.ebuild,v 1.5 2014/12/28 14:55:07 titanofold Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/calligra/calligra-2.8.5.ebuild,v 1.6 2015/01/28 22:40:16 johu Exp $
 
 # note: files that need to be checked for dependencies etc:
 # CMakeLists.txt, kexi/CMakeLists.txt kexi/migration/CMakeLists.txt
@@ -83,7 +83,7 @@ RDEPEND="
 	>=dev-qt/qtgui-4.8.1-r1:4
 	virtual/libiconv
 	attica? ( dev-libs/libattica )
-	crypt? ( app-crypt/qca:2 )
+	crypt? ( app-crypt/qca:2[qt4(+)] )
 	eigen? ( dev-cpp/eigen:2 )
 	exif? ( media-gfx/exiv2:= )
 	fftw? ( sci-libs/fftw:3.0 )
diff --git a/app-office/calligra/calligra-2.8.6.ebuild b/app-office/calligra/calligra-2.8.6.ebuild
deleted file mode 100644
index b9f65241e91b..000000000000
--- a/app-office/calligra/calligra-2.8.6.ebuild
+++ /dev/null
@@ -1,231 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/calligra/calligra-2.8.6.ebuild,v 1.3 2014/12/28 14:55:07 titanofold Exp $
-
-# note: files that need to be checked for dependencies etc:
-# CMakeLists.txt, kexi/CMakeLists.txt kexi/migration/CMakeLists.txt
-# krita/CMakeLists.txt
-
-EAPI=5
-
-CHECKREQS_DISK_BUILD="4G"
-KDE_HANDBOOK="optional"
-KDE_LINGUAS_LIVE_OVERRIDE="true"
-KDE_MINIMAL="4.13.1"
-OPENGL_REQUIRED="optional"
-inherit check-reqs kde4-base versionator
-
-DESCRIPTION="KDE Office Suite"
-HOMEPAGE="http://www.calligra.org/"
-
-case ${PV} in
-	2.[456789].[789]?)
-		# beta or rc releases
-		SRC_URI="mirror://kde/unstable/${P}/${P}.tar.xz" ;;
-	2.[456789].?)
-		# stable releases
-		SRC_URI="mirror://kde/stable/${P}/${P}.tar.xz" ;;
-	2.[456789].9999)
-		# stable branch live ebuild
-		SRC_URI="" ;;
-	9999)
-		# master branch live ebuild
-		SRC_URI="" ;;
-esac
-
-LICENSE="GPL-2"
-SLOT="4"
-
-if [[ ${KDE_BUILD_TYPE} == release ]] ; then
-	KEYWORDS="~amd64 ~arm ~x86"
-fi
-
-IUSE="attica +crypt +eigen +exif fftw +fontconfig freetds +glew +glib +gsf gsl
-import-filter +jpeg jpeg2k +kdcraw kde +kdepim +lcms marble mysql nepomuk
-+okular openexr +pdf postgres spacenav sybase test tiff +threads +truetype vc
-xbase +xml"
-
-# please do not sort here, order is same as in CMakeLists.txt
-CAL_FTS="words stage sheets author karbon krita kexi flow plan braindump"
-for cal_ft in ${CAL_FTS}; do
-	IUSE+=" calligra_features_${cal_ft}"
-done
-unset cal_ft
-
-REQUIRED_USE="
-	calligra_features_author? ( calligra_features_words )
-	calligra_features_krita? ( eigen exif lcms )
-	calligra_features_plan? ( kdepim )
-	calligra_features_sheets? ( eigen )
-	vc? ( calligra_features_krita )
-	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
-	$(add_kdebase_dep kdelibs 'nepomuk?')
-	$(add_kdebase_dep knewstuff)
-	dev-lang/perl
-	dev-libs/boost
-	dev-qt/qtcore:4[exceptions]
-	media-libs/libpng
-	sys-libs/zlib
-	>=dev-qt/qtgui-4.8.1-r1:4
-	virtual/libiconv
-	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 )
-	glew? ( media-libs/glew )
-	glib? ( dev-libs/glib:2 )
-	gsf? ( gnome-extra/libgsf )
-	gsl? ( sci-libs/gsl )
-	import-filter? (
-		app-text/libetonyek
-		app-text/libodfgen
-		app-text/libwpd
-		app-text/libwpg
-		app-text/libwps
-		media-libs/libvisio
-	)
-	jpeg? ( virtual/jpeg:0 )
-	jpeg2k? ( media-libs/openjpeg:0 )
-	kdcraw? ( $(add_kdebase_dep libkdcraw) )
-	kde? ( $(add_kdebase_dep kactivities) )
-	kdepim? ( $(add_kdebase_dep kdepimlibs) )
-	lcms? (
-		media-libs/lcms:2
-		x11-libs/libX11
-	)
-	marble? ( $(add_kdebase_dep marble) )
-	mysql? ( virtual/mysql )
-	nepomuk? ( dev-libs/soprano )
-	okular? ( $(add_kdebase_dep okular) )
-	opengl? ( virtual/glu )
-	openexr? ( media-libs/openexr )
-	pdf? (
-		app-text/poppler:=
-		media-gfx/pstoedit
-	)
-	postgres? (
-		dev-db/postgresql
-		dev-libs/libpqxx
-	)
-	spacenav? ( dev-libs/libspnav  )
-	sybase? ( dev-db/freetds )
-	tiff? ( media-libs/tiff )
-	truetype? ( media-libs/freetype:2 )
-	vc? ( dev-libs/vc )
-	xbase? ( dev-db/xbase )
-	calligra_features_kexi? (
-		>=dev-db/sqlite-3.7.9:3[extensions(+)]
-		dev-libs/icu:=
-	)
-	calligra_features_krita? (
-		dev-qt/qtdeclarative:4
-		x11-libs/libX11
-		x11-libs/libXi
-	)
-	calligra_features_words? ( dev-libs/libxslt )
-"
-DEPEND="${RDEPEND}"
-
-[[ ${PV} == 9999 ]] && LANGVERSION="2.4" || LANGVERSION="$(get_version_component_range 1-2)"
-PDEPEND=">=app-office/calligra-l10n-${LANGVERSION}"
-
-RESTRICT=test
-# bug 394273
-
-pkg_pretend() {
-	check-reqs_pkg_pretend
-}
-
-pkg_setup() {
-	kde4-base_pkg_setup
-	check-reqs_pkg_setup
-}
-
-src_configure() {
-	local cal_ft
-
-	# first write out things we want to hard-enable
-	local mycmakeargs=(
-		"-DWITH_PNG=ON"
-		"-DWITH_ZLIB=ON"
-		"-DGHNS=ON"
-		"-DWITH_Iconv=ON"            # available on all supported arches and many more
-	)
-
-	# default disablers
-	mycmakeargs+=(
-		"-DBUILD_active=OFF"         # we dont support active gui, maybe arm could
-		"-DCREATIVEONLY=OFF"
-		"-DPACKAGERS_BUILD=OFF"
-	)
-
-	# 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 glew GLEW)
-		$(cmake-utils_use_with glib GLIB2)
-		$(cmake-utils_use_with gsl GSL)
-		$(cmake-utils_use_with import-filter LibEtonyek)
-		$(cmake-utils_use_with import-filter LibOdfGen)
-		$(cmake-utils_use_with import-filter LibVisio)
-		$(cmake-utils_use_with import-filter LibWpd)
-		$(cmake-utils_use_with import-filter LibWpg)
-		$(cmake-utils_use_with import-filter LibWps)
-		$(cmake-utils_use_with jpeg JPEG)
-		$(cmake-utils_use_with jpeg2k OpenJPEG)
-		$(cmake-utils_use_with kdcraw Kdcraw)
-		$(cmake-utils_use_with kde KActivities)
-		$(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 nepomuk Soprano)
-		$(cmake-utils_use_with okular Okular)
-		$(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_build postgres pqxx)
-		$(cmake-utils_use_with spacenav Spnav)
-		$(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 vc Vc)
-		$(cmake-utils_use_with xbase XBase)
-	)
-
-	# 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.8.7.ebuild b/app-office/calligra/calligra-2.8.7.ebuild
index 708be59c2110..28898ee2a61a 100644
--- a/app-office/calligra/calligra-2.8.7.ebuild
+++ b/app-office/calligra/calligra-2.8.7.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/calligra/calligra-2.8.7.ebuild,v 1.3 2014/12/28 14:55:07 titanofold Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/calligra/calligra-2.8.7.ebuild,v 1.4 2015/01/28 22:40:16 johu Exp $
 
 # note: files that need to be checked for dependencies etc:
 # CMakeLists.txt, kexi/CMakeLists.txt kexi/migration/CMakeLists.txt
@@ -83,7 +83,7 @@ RDEPEND="
 	>=dev-qt/qtgui-4.8.1-r1:4
 	virtual/libiconv
 	attica? ( dev-libs/libattica )
-	crypt? ( app-crypt/qca:2 )
+	crypt? ( app-crypt/qca:2[qt4(+)] )
 	eigen? ( dev-cpp/eigen:2 )
 	exif? ( media-gfx/exiv2:= )
 	fftw? ( sci-libs/fftw:3.0 )
diff --git a/app-office/calligra/calligra-9999.ebuild b/app-office/calligra/calligra-9999.ebuild
index 1922afacc057..708e5887ae18 100644
--- a/app-office/calligra/calligra-9999.ebuild
+++ b/app-office/calligra/calligra-9999.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 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.50 2014/12/28 14:55:07 titanofold Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/calligra/calligra-9999.ebuild,v 1.51 2015/01/28 22:40:16 johu Exp $
 
 # note: files that need to be checked for dependencies etc:
 # CMakeLists.txt, kexi/CMakeLists.txt kexi/migration/CMakeLists.txt
@@ -83,7 +83,7 @@ RDEPEND="
 	>=dev-qt/qtgui-4.8.1-r1:4
 	virtual/libiconv
 	attica? ( dev-libs/libattica )
-	crypt? ( app-crypt/qca:2 )
+	crypt? ( app-crypt/qca:2[qt4(+)] )
 	eigen? ( dev-cpp/eigen:2 )
 	exif? ( media-gfx/exiv2:= )
 	fftw? ( sci-libs/fftw:3.0 )