summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTomas Chvatal <scarabeus@gentoo.org>2012-11-04 10:27:53 +0000
committerTomas Chvatal <scarabeus@gentoo.org>2012-11-04 10:27:53 +0000
commitce39ed5438cdb03872a941a526b38b2c2d7e9969 (patch)
tree2e4fa294be453a7c3bc007157ea8625e98954193 /app-office/calligra
parentVersion bump, bug #439856. Enable su replacement through pkexec, bug #425156. (diff)
downloadhistorical-ce39ed5438cdb03872a941a526b38b2c2d7e9969.tar.gz
historical-ce39ed5438cdb03872a941a526b38b2c2d7e9969.tar.bz2
historical-ce39ed5438cdb03872a941a526b38b2c2d7e9969.zip
Version bump to latest, only few bugfixes straight to stable, remove older.
Package-Manager: portage-2.2.0_alpha142/cvs/Linux x86_64 RepoMan-Options: --force Manifest-Sign-Key: 0x8EEE3BE8
Diffstat (limited to 'app-office/calligra')
-rw-r--r--app-office/calligra/ChangeLog8
-rw-r--r--app-office/calligra/Manifest28
-rw-r--r--app-office/calligra/calligra-2.4.3-r1.ebuild210
-rw-r--r--app-office/calligra/calligra-2.5.3.ebuild (renamed from app-office/calligra/calligra-2.5.2.ebuild)8
4 files changed, 27 insertions, 227 deletions
diff --git a/app-office/calligra/ChangeLog b/app-office/calligra/ChangeLog
index ca094d133bc3..0c0fb9b7b172 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.73 2012/09/21 07:16:55 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/calligra/ChangeLog,v 1.74 2012/11/04 10:27:49 scarabeus Exp $
+
+*calligra-2.5.3 (04 Nov 2012)
+
+ 04 Nov 2012; Tomáš Chvátal <scarabeus@gentoo.org> +calligra-2.5.3.ebuild,
+ -calligra-2.4.3-r1.ebuild, -calligra-2.5.2.ebuild:
+ Version bump to latest, only few bugfixes straight to stable, remove older.
21 Sep 2012; Johannes Huber <johu@gentoo.org> calligra-2.5.2.ebuild,
calligra-2.5.49.9999.ebuild, calligra-9999.ebuild:
diff --git a/app-office/calligra/Manifest b/app-office/calligra/Manifest
index 8d99fe9ad272..09d0a98a7475 100644
--- a/app-office/calligra/Manifest
+++ b/app-office/calligra/Manifest
@@ -5,22 +5,26 @@ AUX calligra-2.4.2-marble.patch 6663 SHA256 cf525eb2bc6f2e9f06b4f8376444bf22a137
AUX calligra-2.4.3-security-fix-buffer-overflow.patch 1117 SHA256 2c1bbff2695c4c3daa93bf6bd8f8a0b8e93dba911daa646e1c1cdab95814864e SHA512 61bfcb66b5e5628093bbc244e0b635ced96869d066ae083e83b4cf7efa6ea3532084f10c3bf9f9cf78889ab9bea3e98673b5eb2147d6d84de1cde391547a8f1e WHIRLPOOL bd73472213f51dfdcee5e3b21fa80c24c0db443185191d180ecfd0febddcf47e58faf7b18ef1cfb67b4ab1ed1c525722ce2349301dc16f9c143c8ca2f33cda67
AUX calligra-2.5.0-kexi-automagic.patch 953 SHA256 c0acf337441978b9098bd5fa8636d371f06638d9eacfd261c30365a85f6b735d SHA512 bd732cc5114d5f0ed219309d26c364d63fb812ddaf25b201e0e4260f46c3b4000b9db39147562922b9ab7ae85cd425ef058c6760cb3b576891acea56520210e6 WHIRLPOOL a17cd2853f23594041ae48361eef2a6c312ac9ee4ac1d64b4fe428be90ce125c3ed50ca547282ef792858fd698d9a6f4003227a0aedd5708fd8a9068ee9f1000
AUX calligra-2.5.2-lcms24.patch 615 SHA256 c8ce91acd7cfd35316a09ee04bb29c2112e314265073e69306a5035244e0f93e SHA512 c62b7ebbf879c3595d0ce953ae08c9f7f193b5a1e672262b68a653a2dc52eecac0bba3e43a0f5e3b3526000e4dcf7ee6f7d0608e3463331bb6cef8d9e4e84b5f WHIRLPOOL a1bf312f3924105410a6adbc09b0c69c6004b0d9f4d4d4f58bcc6d9fd2ef6e2e8e6ac1df0c550a0c8a9d93fbd7e27d93f2b5ef48911412c253cb23da7b1ed930
-DIST calligra-2.4.3.tar.bz2 119351575 SHA256 8a7dbefdd957217ca4280c1865b319f4fa6c3b38ec8f302e6131a21be8c5946a SHA512 7c8ab608a43d2f386086d4966462521c22d648e5e6f5d11cc88093c8d40d21b3c81d77f0b01ec3781c849560138c7c3d026c017c3653400c92ad8314d1615827 WHIRLPOOL fe5259c0ff220a9020647f686de5afecb7a9c0a2929259435d7f9b7c461a0da3c338d39fbd5bb7dcd53a0f79bab6ac312d68d46c241adab7916a89d86e869974
-DIST calligra-2.5.2.tar.bz2 119280741 SHA256 4ea50791891de621caba4ddf1484539ab50a6a770ad21cbb428c66fa685689ca SHA512 8bff1aa2cd6d785c575dfa38ef6d680026ea6634fb6d6a994fc133754412530048e70ab62ffeeadc417e37b644ff821ea75aeeaf31bcb99f11c0f706e79b792d WHIRLPOOL d51008c83ee2240a6b5827995f1564c0e0cc8740ae8c9756d044513160a2009b35e0f56bb97f8c27b384626f06de84f5f5db8fe8900337a9f489e4e884eb1961
-EBUILD calligra-2.4.3-r1.ebuild 6159 SHA256 bde60dff89b5879b129bd05cc9efb4d2ac6420493a6375700ad82830d02408c7 SHA512 77b63f062f165997b26e3ab4dd0f1d826c36d7629efa58acb2862a52b86105c08c47411d80a368de8553fdc473ee920a3940f3fd125fa77a0fc65b1999feee86 WHIRLPOOL 193a44b8d1fb745d4e62fc2cf6f5b78498b64d0ec6159f1e3009e773858e9df9b4518f1fd997d0d2553877c879ec5aed1e5aa47bb4e46b135f8aa793840cafcf
-EBUILD calligra-2.5.2.ebuild 6665 SHA256 dcaa9b698480dc67aa4e88b59fe9e0d87b13907ec2ff02d2f5def3c3ba051557 SHA512 383e32663fd8351e99be87c8a74ef875a03a8a4aaeb8eccaee9aec51dd021ac3dd96a264b413ec27aaf13de8f7eabf6283f0fcf4f6a4a154e4b39ef613a64edf WHIRLPOOL dc0563be72240e3dca5b2b4c9f4ee5adce8a82a52e1840805ec5603612abeb103e5a6d19abc355a36d87344f3c0437fc139db51b60fece5b1b637167c031d3d6
+DIST calligra-2.5.3.tar.bz2 119327013 SHA256 b147463d518b3f7380a61cf1f6621bdd04c0150598e1df2765a93203e51c3aca SHA512 67969088d323b181c243fd7c0e1548dc9fcecbd58d7ce5fa2fbbf8aaf57ad4e949ca324a91b146bbaa76d41621569b4c54f0355c557d7d3efb45d2810f368b23 WHIRLPOOL bc45b44823815f9cb833dbaf120e916b0a4628db827d1025193ab29df8eb6735372315ab2a1da4624dbc71dd141132efcf2116af559526e10adf9c2ecf05f09f
+EBUILD calligra-2.5.3.ebuild 6644 SHA256 aa52228600e473358040b79c1715f96bee4e65ae66d1b86ab235381377406357 SHA512 b8412c47b1dd0e490c3e4d8731a684c3e8cea6436db25b48e2d705676a5f9267c311bb72f6affcbd82e35bfe28182786a009745457b942a724119eeb5849fc00 WHIRLPOOL 194b8645868cc0eec4fdb31b1defa88e8e5df9845a86b5bfaf5126460073304df496cde7437a9185220c1488c8f9daeba20aba6e25cbff025ce8f27588d40f22
EBUILD calligra-2.5.49.9999.ebuild 6647 SHA256 cfed139aefddd013047b8dd9bf7d6ea5651e6dcf6b0c7ce33e7230fe20a44a8e SHA512 23e340278dfc5cbc6d24e2de65f7b1b7a945e7ed9166145e5e8a6c3a213773ffcf181f021b638cc74a85f83423bc8fc2045bc8e22735c974afb972e99175a948 WHIRLPOOL fd492fc87da805abf360a1024649419ca4cc52eb2dab9e1b8699cfd24e6f16a41abaac04ed73b004340c24811b9b4ee500c091350617ed6dcdcecbdb9b50ec73
EBUILD calligra-9999.ebuild 6613 SHA256 146d814cacc908752f449c537e937528ae44127d84d0f01ad055695c014bad0d SHA512 ef735ff3b3182b9856525f461c185ca4753c6f4f3f61ff27679e0b7e080f8c89ef8a18fda2f1a0f0cceab23f7fc1e60658dde896b33a2c7243add6a413851c9c WHIRLPOOL 2f235156cc54872dc7dcb13d8503707e2d96ba7cc8f54ae22816ee282dd1e39f389990bef3fe90c553a98dcc031ccb0f16e9ceca798983821c59304eda5a8cf1
-MISC ChangeLog 12951 SHA256 c7ae6522d0827334f944b3db637acce6c6c45606e26b16a7e7ce373fd9ad24de SHA512 ceb45421b5f805d4b2e899af06f5035ced348a19f190efc4884b7e6de1e929034e3bf728f91a881e207644c0db7e1053dcc86a85a9401c47e1a669e751e168e4 WHIRLPOOL 472d043671e1de8796880a5cb799051dbc59bc23577de825193814160fb6332c94e6c03400ff83befe6d1596574ed028a4dc0c502570a146b62f4284e1f70bb2
+MISC ChangeLog 13198 SHA256 b531bfbc023c09edf44016599e849709bf4c137f0b4a59fd12b0708c70ee54d1 SHA512 1a9c878023aa5eba80e84b9744db7242613f5edf3db9096482d0a4da18ec61970aec597e86f02cd04f9032c4c82e0cf4cea73520501ed95273067504903472fd WHIRLPOOL 1e04cc8fafd37bf7dbf4cfa25c36389ab5e3bcf4a50277957d9bc186ff28d764d4b5843ec514da5e2d347fddebe87d845ac3e56e74abaf4869092cd114086ace
MISC metadata.xml 1654 SHA256 af46ada2956a7b0ebccf1ccbb85508b2b7eb32068726e5a38c1438fe250568e7 SHA512 905f7624bc6125adc1b0d99ec02b3fb879643e053e2d7d459ed74b9fbfb82166a4f621afa51354d9baaef78d03ea1e1c279aea66e5bb8086bcfdd7b4bc2344c7 WHIRLPOOL 3ff4381e5f7f4ef5b478574a8a90b906a8be352b5336912ab106bb9c215afc13ac3517c22cfcc7796840cbf5ac8a184014915e25629320f2f307adc8747f5aaf
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.19 (GNU/Linux)
-iQEcBAEBCAAGBQJQXBR3AAoJEO+t9ga+3I3auzcH/1oSqOLKLpnapg2Nv5GF5HzA
-6G81X+yrdaMQGg2sfjKCjlqcoWlFMx73b8mxlhju66rcJE6Ztgtj4Yx5BTWAlzrN
-HAivq++db01yzHD/voqDHMm2cW9snI6mRT2O8DwYCel+rA6VLO4SMZ8sdLt7gHid
-YjL78OJjZjkzODF+pdPPIWs8y2cnT3vZON5ggDnX4I+azWRTe5TWf90K0bUJnzUQ
-VN5EYNFsXysotcL3nFTVHnSjoJP1h292gqnzLsv0f1VrZY+7Ycg9ewFubiqXSZnI
-JrcSjnqG2slHQxl+diVy9cg2UqcEVvOT3RT4KIyg8SRaNA1wtJmK9+KSHXoh29s=
-=GctK
+iQIcBAEBCAAGBQJQlkMmAAoJEOSiRoyO7jvoLjEP/00hcbSkhSC6AyJemCcP/ZEN
+KWYu/5ei59Lo3+Xxzr9vuO4GIbGNvn8p+Xks+shF96CnfPtZADejtZHWpy0UO09a
+DdIl/WSgVii0IvS78QMgR9XgJLxxOFE9GyxXMMi1nykTTp6EK35WZk9QBrbTXdkz
+V2Y6aQAtzI32S7KAoQ+3v62BU7A7SD+6XPZAjoWMiYj0rGJsE9dYoM5464T7k3b3
+dRzwt2FqxUuvvS6vOiccDj518FCmvCo6bCarYTPD42KtbeVBTij0nN1VmDJIX3mT
+aqZXr3O/ot6wqxJBkAiJkGm215gZVU/SzEkIi170ro3uHK+blbHhysDeKJMM9Mck
+/+vmAF300zBr6hW25w6zIPd8a1pRgN5EK+hoizaiNBcnEe4Uu/8yRVb1dDewCxVf
+QCztrajkYpO3B824/OIUvtONVyc65OmVWSBiXILX7mdRAVUiVblkph5nzgZ/bVT+
+x4MrGYkY1Yv1ZObIMeq5/NT0UU1Uqa8nz3Ypd/BIcUbrmkyibbSrHUmH6dK8aGos
+5uwtgYXWu51icB2IhYvgDHnXR7h8omHlb04S2wbz7ew/BRhN67NqqnH8flF+A/zd
+tPXPtyhe/e/qJ1Vdgo+sP6SycaO3ZbU1mOmQAdDq/t3YJrftx/BrFOu7Hipf9dFb
+7xdLJEi/4p+F3Lxg6axN
+=Ze0q
-----END PGP SIGNATURE-----
diff --git a/app-office/calligra/calligra-2.4.3-r1.ebuild b/app-office/calligra/calligra-2.4.3-r1.ebuild
deleted file mode 100644
index 477ab6a7eeb9..000000000000
--- a/app-office/calligra/calligra-2.4.3-r1.ebuild
+++ /dev/null
@@ -1,210 +0,0 @@
-# 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.3-r1.ebuild,v 1.4 2012/08/20 21:01:45 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
-
-EGIT_BRANCH="calligra/2.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 versionator
-
-DESCRIPTION="KDE Office Suite"
-HOMEPAGE="http://www.calligra.org/"
-[[ ${PV} == *9999 ]] || SRC_URI="mirror://kde/stable/${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 +jpeg jpeg2k +kdcraw kdepim +lcms marble mysql +mso +okular openctl openexr
-+pdf postgres +semantic-desktop +ssl sybase test tiff +threads +truetype
-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: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 )
- gif? ( media-libs/giflib )
- glew? ( media-libs/glew )
- glib? ( dev-libs/glib:2 )
- gsf? ( gnome-extra/libgsf )
- gsl? ( sci-libs/gsl )
- jpeg? ( virtual/jpeg )
- jpeg2k? ( media-libs/openjpeg )
- kdcraw? ( $(add_kdebase_dep libkdcraw) )
- kdepim? ( $(add_kdebase_dep kdepimlibs 'semantic-desktop') )
- 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
- )
- 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}"
-PDEPEND=">=app-office/calligra-l10n-$(get_version_component_range 1-2)"
-
-RESTRICT=test
-# bug 394273
-
-PATCHES=(
- "${FILESDIR}/${PN}-2.4.2-marble.patch"
- "${FILESDIR}/${PN}-2.4.3-security-fix-buffer-overflow.patch"
-)
-
-src_configure() {
- local cal_ft
-
- # first write out things we want to hard-enable
- local mycmakeargs=(
- "-DIHAVEPATCHEDQT=ON"
- "-DWITH_Boost=ON"
- "-DWITH_LibXml2=ON"
- "-DWITH_PNG=ON"
- "-DWITH_ZLIB=ON"
- "-DGHNS=ON"
- "-DWITH_X11=ON"
- "-DWITH_Qt4=ON"
- "-DWITH_Iconv=ON"
- "-DQT3SUPPORT=ON" # kde4-base.eclass pulls this in anyway
- )
-
- # default disablers
- mycmakeargs+=(
- "-DBUILD_mobile=OFF" # we dont support mobile gui, maybe arm could
- "-DBUILD_active=OFF" # we dont support active 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 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 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-2.5.2.ebuild b/app-office/calligra/calligra-2.5.3.ebuild
index 0dfdb6687df0..5b456cc3133c 100644
--- a/app-office/calligra/calligra-2.5.2.ebuild
+++ b/app-office/calligra/calligra-2.5.3.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-2.5.2.ebuild,v 1.5 2012/09/21 07:16:55 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/calligra/calligra-2.5.3.ebuild,v 1.1 2012/11/04 10:27:49 scarabeus Exp $
# note: files that need to be checked for dependencies etc:
# CMakeLists.txt, kexi/CMakeLists.txt kexi/migration/CMakeLists.txt
@@ -8,6 +8,8 @@
EAPI=4
+EGIT_BRANCH="calligra/2.5"
+
KDE_SCM=git
KDE_MINIMAL=4.6.4
QT_MINIMAL=4.8.1
@@ -39,7 +41,7 @@ esac
LICENSE="GPL-2"
SLOT="4"
-[[ ${PV} == *9999 ]] || KEYWORDS="~amd64 ~x86"
+[[ ${PV} == *9999 ]] || KEYWORDS="amd64 x86"
IUSE="attica +crypt +eigen +exif fftw +fontconfig freetds +gif glew +glib +gsf
gsl +jpeg jpeg2k +kdcraw kdepim +lcms marble mysql +okular opengtl openexr
@@ -139,8 +141,6 @@ PDEPEND=">=app-office/calligra-l10n-${LANGVERSION}"
RESTRICT=test
# bug 394273
-PATCHES=( "${FILESDIR}/${PN}-2.5.2-lcms24.patch" )
-
src_configure() {
local cal_ft