Get Gentoo!
gentoo.org sites
gentoo.org Wiki Bugs Forums Packages
Planet Archives Sources
Infra Status
summaryrefslogtreecommitdiff
path: root/app-office
diff options
context:
space:
mode:
Diffstat (limited to 'app-office')
-rw-r--r--app-office/calligra/ChangeLog9
-rw-r--r--app-office/calligra/Manifest32
-rw-r--r--app-office/calligra/calligra-2.5.49.9999.ebuild (renamed from app-office/calligra/calligra-2.4.49.9999.ebuild)49
-rw-r--r--app-office/calligra/calligra-9999.ebuild8
4 files changed, 65 insertions, 33 deletions
diff --git a/app-office/calligra/ChangeLog b/app-office/calligra/ChangeLog
index 9285335a8216..d7c6c702c62a 100644
--- a/app-office/calligra/ChangeLog
+++ b/app-office/calligra/ChangeLog
@@ -1,6 +1,13 @@
# 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.66 2012/08/30 11:20:05 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/calligra/ChangeLog,v 1.67 2012/08/30 11:30:45 dilfridge Exp $
+
+*calligra-2.5.49.9999 (30 Aug 2012)
+
+ 30 Aug 2012; Andreas K. Huettel <dilfridge@gentoo.org>
+ -calligra-2.4.49.9999.ebuild, +calligra-2.5.49.9999.ebuild,
+ calligra-9999.ebuild:
+ Clean up and sync live ebuilds
*calligra-2.5.1 (30 Aug 2012)
diff --git a/app-office/calligra/Manifest b/app-office/calligra/Manifest
index 09bdb163fcae..06a675c16eb9 100644
--- a/app-office/calligra/Manifest
+++ b/app-office/calligra/Manifest
@@ -8,26 +8,26 @@ DIST calligra-2.4.3.tar.bz2 119351575 SHA256 8a7dbefdd957217ca4280c1865b319f4fa6
DIST calligra-2.5.0.tar.bz2 119191980 SHA256 41b80d33970b9110c0f26fda11c9c5c87d41036c333e34d6c7fce70f4f6cde60 SHA512 965852ed8230e6742d94e7170351bc658cae8f015c368bc329e4ca7f80ed27d5a9749daee438ec42ec9123865eb88596928b31eef8edf12fff9e5de25ab3d5c0 WHIRLPOOL 7cb7cba2544f2b4476946060e70c654420387a36675621a988c8398a278eedd6b1e9278897cf280203b92645cf544e3223d72cd2b528033c307ba867ac21d85c
DIST calligra-2.5.1.tar.bz2 119275167 SHA256 325fd8b3540b1e07fbf04f32350f4535bcb101cf46a87879dff935cfcd87cd48 SHA512 e67b94aafe5c32461169729bb591c32495d3e1c8fec934044b19425d65f1a95398caf98588308074e2457ca6ee3608498ba14d3cc71c59bd371651af28bd8b38 WHIRLPOOL 26133ace859842e44282e5099eaca528ef5ed5cd162770fafe2f5e4118e6b44a558f9470d9617f1d39aed7172981483da20e1afeb76acc590268a2dfb673ac17
EBUILD calligra-2.4.3-r1.ebuild 6159 SHA256 bde60dff89b5879b129bd05cc9efb4d2ac6420493a6375700ad82830d02408c7 SHA512 77b63f062f165997b26e3ab4dd0f1d826c36d7629efa58acb2862a52b86105c08c47411d80a368de8553fdc473ee920a3940f3fd125fa77a0fc65b1999feee86 WHIRLPOOL 193a44b8d1fb745d4e62fc2cf6f5b78498b64d0ec6159f1e3009e773858e9df9b4518f1fd997d0d2553877c879ec5aed1e5aa47bb4e46b135f8aa793840cafcf
-EBUILD calligra-2.4.49.9999.ebuild 6101 SHA256 4b7688c4c43a4766c05e84c9dc583babfa7c86aa82126858ebb923ea360461be SHA512 0031e3897c67a8c91d995371eec0a31b246ef304c8823b721cc3b18fa0a0c4e0a5bf0b5239e23fc4e1d63f79fcff244a193acd2c9310a554f25be327164a7d3e WHIRLPOOL 1daa7f4ea13480e6e156a3d7e92a86e56a694283f1f9d259b3e727820cef72810828eb0eb61a914810b16b35f847b57086fe63f04d02333d95be73d2caccf6b0
EBUILD calligra-2.5.0.ebuild 6433 SHA256 b0fce5699c803144f608f7cce7e1f472eb1b180018b482080e777f324859df60 SHA512 cd2de6b135a89a84abe5462e41d67a48439ec404ec91232c02fe58375877f09c2331f3bf70103ccad759085929aab39a2061ea244160598633363f4ec593db47 WHIRLPOOL 0028e2b70246843d707ee47640bd82d1a3165ebf7f4ceac8f9f071a2d34a8f1c1458095a5264b397bddbb47442a5b1b7adf1409527ce481349816ce9571f6f1b
EBUILD calligra-2.5.1.ebuild 6653 SHA256 87178596840a17576c41fa74d3e185c503bb16ab71bda84909b28ae061ec5c75 SHA512 311b9a4375bec43d3c6d3ac51f6b49d5808b9f82183827d07b15484470b0b7267eb4986fa823a62986841ce5f44140ef63fece7977d2fc769bc36f5e0b541c25 WHIRLPOOL 37fad74838ac5417fa17c8e6359815de82d7d348a8bf5fe07bd3003d2db1fa30ad3b2cc0ff4dc7b410ad64c03e84843d7ebfc7db79e5ad67393cc21fb8c57f00
-EBUILD calligra-9999.ebuild 6422 SHA256 0509a7497409513f303f3a0ccd61a2c2255985d96d1d5b984cece543837b742a SHA512 0b909b67b95928892dadfcfbf48ebe9177d23cc58e50ff64fa209f14d8d03fdaaed52044e77d13ae04c3baa376287b0cee6967f40e464a4a15e3b5a9b3fdd6e3 WHIRLPOOL 973e356e159ad856475292997db13a5bf82c3ee2a782094b894ed2e286581216ab2561fff7df8fe9674ec4dfc4b252a43a3c820c5baa15acdce6f5a2475e8f4c
-MISC ChangeLog 11692 SHA256 75fdd94d7d9d07efb6d39f5eb20388dea0cfd2c5d1f22d0b809d10463dc296ad SHA512 6e8490335516f4931e09228a508cbf9bd67c7a3657e243d40d69f1feb848eac99e53e16b607d5a0b59da826ca9cb64adb94fa3c3a062d79e0bd8569be98f827e WHIRLPOOL 489b32c2a56d8fb9a405e64d0348d5c29ef17eb45aeac8efc8ce2a1ec69bc4b2470a542a487730f1948a1824943b92b32d54c41a5c3f3c8f8868f7439513b274
+EBUILD calligra-2.5.49.9999.ebuild 6621 SHA256 a5d529627f76b1a4014c70451e3cd2254f193c4d87d72bfda595fe386eb1d88e SHA512 b9db1c928a3dacad80b37487ee042772639310f4653578acf6713ed1b008c4eabe00539bc4b67b21dc2d4da0a300f2a40573741b2547a046c430db846a707822 WHIRLPOOL 938674e5a4e0dc77d8419c3f701eab40f4652b0e711b47e956796c5ebcdafc63d54e4bdeadb460f9a3b7fea9f467e53c22e49d4063024d2ab1aad6ebd2832fb1
+EBUILD calligra-9999.ebuild 6587 SHA256 9e1ebf81c73c06438062d4809dc3591ee2f599b493dcd9a29190a3ee50934b72 SHA512 41d5c040b74e4179290647b1fb4c308f2b13a8c7fce1d8f447c4f4a5989adbc8c75c3c8febf0d0b732b6236d1aaa68938e564468ef1863fc04161f597c3fe57a WHIRLPOOL 5e9f69b50cf34fe1bac625d714c70272277b9c73c502ee8b0e34d044b7d75b9519841a880f4c6e01546386a7eaf501bf48a1d1dd384f099fc902d3aae0a643dd
+MISC ChangeLog 11906 SHA256 101c466afca3fea37c76e6208611f74d932ebe93dafacde2e99f07819f2eea15 SHA512 37083d7e947f849b9c3ec9056ae5d85e9c16dfb567f86b5456002dcb39baa89717f6850d9244023dd38d882899fdc422b98898368b0b134d9968823167331562 WHIRLPOOL 4a1dd3e6da0c926561867ada8122617ccd852d272ec40cfbbb94c15f30af6483433a77c867c695b0c5927a98c5a8b4af762dfe528af7d8623751d89b2814cd1f
MISC metadata.xml 1721 SHA256 eeaac9b2f4dd1aed008ca51f681413ecfcc8ff4e3ff8d129f10ef9e83c450edd SHA512 517120ba7849b8aae187f06d5f58e9712d5de028504e138aa887ea9235db3feac9691dc53d26d0683b41dbd098138e2c8455206befa588eab1b09f5da148ca50 WHIRLPOOL 28954c32af667c514d460d7b078fabc62d1f9409b679b9ea05b3310c2a1af133e5eaffd0aaf728e463d94fdb2efeab73b7760c8fec4a5b36b86292c380f22dc8
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.19 (GNU/Linux)
-iQIcBAEBCAAGBQJQP0zhAAoJEEb+UGWnxTyHoHUP/iCDzAgOQcUY0T4T8KzolAvA
-yKBwwHtSLSxZZghLYRvdGSCwm8JPbK00RRvLwPuxlqv9Ox71MXkb0/5pgsdhQ7Ol
-wZ0zGaAu03V4hjT/4O5mrXkktQpiMl86wUfnIUkV/osuN+PnqVgp9hvbndi8BeRH
-Yx4aLUZaDGV5Fr8O2ZF0LzoWAdBl6sc63Qo8zq1ZSCdXapR9D/gVfaEfxQy6rHml
-vcHN+QuBIvTn0JmjZ1OAi2Kfv6ruTbLOMNB2ao7fmqWT8CxDZCamZ8/lUB6Jg/F0
-cAKz/MVMDVe7hw8LEhPWj4Qd6ECWw8LXuS4dfHV893yCGU5I85qbb3pWqM5gqPXi
-zpBJnIM03z+HUzrhW5zOMNMjYWKeEo6ys9l+2/VL6AorRQ5k2QHnOwQxcm93y/80
-DI5vkFoMAj5D+tk1cZr682yr8IhBrru6GjC/JVQnOVMb5Yt2LiAzKA8ZH0R/td//
-bxMEQD9dpk3A/axujy+zj9SHkYIU44/xv5hIB7EB0sm9a3/8hNFpQ0cxc/e0iY3c
-TEXUEVW3c8hs9rrdxIoX/6jaKm+grf3sFc0JKOZcH/VKga1zz43PvJUsSf5laUC6
-tgXwgcC4UNCGayx3zsoY0UWafHr2A0yWbsU5DhzQtEm6nC7HIc5gnVSYujbgtud/
-XPJKi/+2Y6COLkVD+FPX
-=6Qjt
+iQIcBAEBCAAGBQJQP09SAAoJEEb+UGWnxTyHWccQAJWDP/HnA825/T5FguhTvu9e
+RL1SElnYJRyM4BdduzstOdg3fc7qKE6j7lXX2bz6Zb01GE1sUDs92SQ2+KmCCH4M
+N+QcQLjD0YyX7dpURtJjv5SalMgl8sqPca7O+RISpsmn8AMzSb2PnBBMSrrGqM1x
+GNDrRYPD4vWyTR+AgWGMdrTW6x37rwO8hIkOQi+BrMucH6Qu1F8bziiFjLguOJYH
+a05nbMGQ1s0Jur6xMNVmv6BKmqDmAuWWqjOSLP5wxHbGhUSJBNm4FLhbMeiU1FqX
+gBh22pCL/BIGbeHURNfi0F7e103oPYmHPI5BcmHJlyA8eu6GQyq+iGdufTqbgdDc
+3dKCZi7Cllzazty0mwetNlbSxyM+tkm4yO1KudR/KaGZJ7RxvOzjQUFTcaWeGmrh
+z3mK3fEpc/9ygAiLF/LY5XpNq6Xoq7mZ/bMk9aS50UQdY8QLbJsEwGmi4UInKGaL
+5dPIDqs4NUYdfvdgL6C2Dyvf6S+1XRFZpye8WtAs8zcf5tX5It/3J8F3qpyrxQXx
+jbeFPdb9UfYg33T7Y/tB6TO9pwQIQSrf9nWM6gBRzYMLPbsYO6tn07JsNklKShso
+DJZ0OzkLXlOvRv8wDKtBD8Kr5gYf+bBJ10yQ5ZlYFq9yCnMHdVIyXjckll88dSl4
+1mh/xtlY49qud7ocl4+p
+=0665
-----END PGP SIGNATURE-----
diff --git a/app-office/calligra/calligra-2.4.49.9999.ebuild b/app-office/calligra/calligra-2.5.49.9999.ebuild
index 9c44f192a44b..1a59881b1342 100644
--- a/app-office/calligra/calligra-2.4.49.9999.ebuild
+++ b/app-office/calligra/calligra-2.5.49.9999.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.4.49.9999.ebuild,v 1.7 2012/08/20 21:01:45 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/calligra/calligra-2.5.49.9999.ebuild,v 1.1 2012/08/30 11:30:45 dilfridge Exp $
# note: files that need to be checked for dependencies etc:
# CMakeLists.txt, kexi/CMakeLists.txt kexi/migration/CMakeLists.txt
@@ -8,7 +8,7 @@
EAPI=4
-EGIT_BRANCH="calligra/2.4"
+EGIT_BRANCH="calligra/2.5"
KDE_SCM=git
KDE_MINIMAL=4.6.4
@@ -22,14 +22,30 @@ inherit kde4-base versionator
DESCRIPTION="KDE Office Suite"
HOMEPAGE="http://www.calligra.org/"
-[[ ${PV} == *9999 ]] || SRC_URI="mirror://kde/stable/${P}/${P}.tar.bz2"
+
+case ${PV} in
+ 2.[456789].[789]?)
+ # beta or rc releases
+ SRC_URI="mirror://kde/unstable/${P}/${P}.tar.bz2" ;;
+ 2.[456789].?)
+ # stable releases
+ SRC_URI="mirror://kde/stable/${P}/${P}.tar.bz2" ;;
+ 2.[456789].9999)
+ # stable branch live ebuild
+ SRC_URI="" ;;
+ 9999)
+ # master branch live ebuild
+ SRC_URI="" ;;
+esac
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
+gsl +jpeg jpeg2k +kdcraw kdepim +lcms marble mysql +okular opengtl openexr
++pdf postgres +semantic-desktop spacenav +ssl sybase test tiff +threads +truetype
word-perfect xbase +xml +xslt"
# please do not sort here, order is same as in CMakeLists.txt
@@ -88,7 +104,7 @@ RDEPEND="
marble? ( $(add_kdebase_dep marble) )
mysql? ( virtual/mysql )
okular? ( $(add_kdebase_dep okular) )
- openctl? ( >=media-libs/opengtl-0.9.15 )
+ opengtl? ( >=media-libs/opengtl-0.9.15 )
openexr? ( media-libs/openexr )
pdf? (
app-text/poppler
@@ -99,6 +115,7 @@ RDEPEND="
dev-libs/libpqxx
)
semantic-desktop? ( dev-libs/soprano $(add_kdebase_dep kdelibs semantic-desktop) )
+ spacenav? ( dev-libs/libspnav )
ssl? ( dev-libs/openssl )
sybase? ( dev-db/freetds )
tiff? ( media-libs/tiff )
@@ -116,13 +133,13 @@ RDEPEND="
)
"
DEPEND="${RDEPEND}"
-PDEPEND=">=app-office/calligra-l10n-$(get_version_component_range 1-2)"
+
+[[ ${PV} == 9999 ]] && LANGVERSION="2.4" || LANGVERSION="$(get_version_component_range 1-2)"
+PDEPEND=">=app-office/calligra-l10n-${LANGVERSION}"
RESTRICT=test
# bug 394273
-PATCHES=( "${FILESDIR}/${PN}-2.4.2-marble.patch" )
-
src_configure() {
local cal_ft
@@ -136,8 +153,9 @@ src_configure() {
"-DGHNS=ON"
"-DWITH_X11=ON"
"-DWITH_Qt4=ON"
- "-DWITH_Iconv=ON"
- "-DQT3SUPPORT=ON" # kde4-base.eclass pulls this in anyway
+ "-DBUILD_libmsooxml=ON" # only internal code, no deps
+ "-DWITH_Iconv=ON" # available on all supported arches and many more
+ "-DQT3SUPPORT=ON" # kde4-base.eclass pulls this in anyway
)
# default disablers
@@ -149,7 +167,6 @@ src_configure() {
"-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
@@ -174,25 +191,29 @@ src_configure() {
$(cmake-utils_use_with lcms LCMS2)
$(cmake-utils_use_with marble Marble)
$(cmake-utils_use_with mysql MySQL)
+ $(cmake-utils_use_build mysql)
$(cmake-utils_use_with okular Okular)
- $(cmake-utils_use_with openctl OpenCTL)
+ $(cmake-utils_use_with opengtl 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_build postgres pqxx)
$(cmake-utils_use_with semantic-desktop Soprano)
$(cmake-utils_use semantic-desktop NEPOMUK)
+ $(cmake-utils_use_with spacenav Spnav)
$(cmake-utils_use_with ssl OpenSSL)
$(cmake-utils_use_with sybase FreeTDS)
+ $(cmake-utils_use_build sybase sybase)
$(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_build xbase xbase)
$(cmake-utils_use_with xslt LibXslt)
- $(cmake-utils_use_build mso libmsooxml)
)
# applications
diff --git a/app-office/calligra/calligra-9999.ebuild b/app-office/calligra/calligra-9999.ebuild
index ab949a9ffb8e..ed7dcbb73d57 100644
--- a/app-office/calligra/calligra-9999.ebuild
+++ b/app-office/calligra/calligra-9999.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-9999.ebuild,v 1.28 2012/08/21 19:06:56 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/calligra/calligra-9999.ebuild,v 1.29 2012/08/30 11:30:45 dilfridge Exp $
# note: files that need to be checked for dependencies etc:
# CMakeLists.txt, kexi/CMakeLists.txt kexi/migration/CMakeLists.txt
@@ -153,7 +153,7 @@ src_configure() {
"-DWITH_Qt4=ON"
"-DBUILD_libmsooxml=ON" # only internal code, no deps
"-DWITH_Iconv=ON" # available on all supported arches and many more
- "-DQT3SUPPORT=ON" # kde4-base.eclass pulls this in anyway
+ "-DQT3SUPPORT=ON" # kde4-base.eclass pulls this in anyway
)
# default disablers
@@ -189,6 +189,7 @@ src_configure() {
$(cmake-utils_use_with lcms LCMS2)
$(cmake-utils_use_with marble Marble)
$(cmake-utils_use_with mysql MySQL)
+ $(cmake-utils_use_build mysql)
$(cmake-utils_use_with okular Okular)
$(cmake-utils_use_with opengtl OpenCTL)
$(cmake-utils_use_with openexr OpenEXR)
@@ -196,17 +197,20 @@ src_configure() {
$(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 semantic-desktop Soprano)
$(cmake-utils_use semantic-desktop NEPOMUK)
$(cmake-utils_use_with spacenav Spnav)
$(cmake-utils_use_with ssl OpenSSL)
$(cmake-utils_use_with sybase FreeTDS)
+ $(cmake-utils_use_build sybase sybase)
$(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_build xbase xbase)
$(cmake-utils_use_with xslt LibXslt)
)