summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTomas Chvatal <scarabeus@gentoo.org>2012-09-13 13:37:21 +0000
committerTomas Chvatal <scarabeus@gentoo.org>2012-09-13 13:37:21 +0000
commit029108e7ff899966cc1b031119d893f3f330a16a (patch)
tree61cc3fc29b64082bb4e64483d5059a1a66647cbb /app-office
parentFix testpack 2.1.2 build with quickcheck 2.5 (diff)
downloadhistorical-029108e7ff899966cc1b031119d893f3f330a16a.tar.gz
historical-029108e7ff899966cc1b031119d893f3f330a16a.tar.bz2
historical-029108e7ff899966cc1b031119d893f3f330a16a.zip
Fix the ebuild to base of live where in cvs i accidentaly copied from 2.5.1.
Package-Manager: portage-2.2.0_alpha125/cvs/Linux x86_64
Diffstat (limited to 'app-office')
-rw-r--r--app-office/calligra/ChangeLog5
-rw-r--r--app-office/calligra/Manifest30
-rw-r--r--app-office/calligra/calligra-2.5.2.ebuild6
3 files changed, 21 insertions, 20 deletions
diff --git a/app-office/calligra/ChangeLog b/app-office/calligra/ChangeLog
index a92b9fef2011..952acf0ec820 100644
--- a/app-office/calligra/ChangeLog
+++ b/app-office/calligra/ChangeLog
@@ -1,6 +1,9 @@
# 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.69 2012/09/13 12:01:57 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/calligra/ChangeLog,v 1.70 2012/09/13 13:37:21 scarabeus Exp $
+
+ 13 Sep 2012; Tomáš Chvátal <scarabeus@gentoo.org> calligra-2.5.2.ebuild:
+ Fix the ebuild to base of live where in cvs i accidentaly copied from 2.5.1.
*calligra-2.5.2 (13 Sep 2012)
diff --git a/app-office/calligra/Manifest b/app-office/calligra/Manifest
index c5b02b373abf..1a0769f2653d 100644
--- a/app-office/calligra/Manifest
+++ b/app-office/calligra/Manifest
@@ -7,25 +7,25 @@ AUX calligra-2.5.0-kexi-automagic.patch 953 SHA256 c0acf337441978b9098bd5fa8636d
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 6653 SHA256 8aa64dad3736f08cda0ddd9cc472a5ebee3c1c7daa2ad75dfe7586d92009d0ed SHA512 b9cda06c07f2b392d627f73f177b9701de2a6167289487b6d11a97d36da44ba47dee1a4536ac1227e13413ddab1ee03c23c8234b57d25e70984f8c1665b2e839 WHIRLPOOL 290fc192055aa3f82f71f5d537eb02aa324331f1051abab5a6ce8ee8af0d55a775d241a95e91bfee2c4c3caafa47c83a6273f98e399e20f7212de6fab23e210a
+EBUILD calligra-2.5.2.ebuild 6587 SHA256 54560b29f235c3b3f5d536563c16db5a37e1a616f09021818497ca8a32aed23a SHA512 1c25da248eac57b6d01a994a41c1a66a71f11ea82e4ab7e8b50edad54bde69089fcedb9d49eba1405cfa93312ce8404ec523d7d1a7976f74c23fa2d7ecf13e1b WHIRLPOOL 6f67775542ca5701d1f2dd99cdf60be6e255571304de9c0b0cc8c087ebfdfac27734391151f08f4989e701947673557e915300ae72738266e3d7f9d8a29a4fbc
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 12187 SHA256 1da1bd70661bcbdf2f0d996f47915f626cfd04936221d9df17d290c2bf8e46c4 SHA512 e47b29a98677d19b95bf09fd5c3bc0704c701797466f1a54b8f8db3c1257d605b38d9b9e02d10773dbe8a953a32b10a254ccd87c22b94b442fc118a7bde8f629 WHIRLPOOL d1dd1bd5a580432520be218ecdf251faea0d4a6b7db028140fbcc6be604709d90ede68fd488a455510c7f2078ab581d0f672188bb3c9fcec4b1ad33812c6e0e8
+MISC ChangeLog 12345 SHA256 97731b594af4c8af3dcf8d75059c949ad4154979a74cbf6abbd4c50b5968ce15 SHA512 3a9339f82cb358bd976cebea7e162fde79b9ae1abea68c1eb1c7358e882c13cc512deaa355271f47a728083b3501b60828f9d7aa7b27e19a5452c4f39693f8c9 WHIRLPOOL 0ff7ba93d480eb6722adffc0859f9f16653083ae94dc2b0e5fa7c449b3c7c6bd6156b45d43bef29b9ebddd09a056be4c68fbe21b352514be44fef6f16ca532a9
MISC metadata.xml 1654 SHA256 af46ada2956a7b0ebccf1ccbb85508b2b7eb32068726e5a38c1438fe250568e7 SHA512 905f7624bc6125adc1b0d99ec02b3fb879643e053e2d7d459ed74b9fbfb82166a4f621afa51354d9baaef78d03ea1e1c279aea66e5bb8086bcfdd7b4bc2344c7 WHIRLPOOL 3ff4381e5f7f4ef5b478574a8a90b906a8be352b5336912ab106bb9c215afc13ac3517c22cfcc7796840cbf5ac8a184014915e25629320f2f307adc8747f5aaf
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.19 (GNU/Linux)
-iQIcBAEBCAAGBQJQUcssAAoJEOSiRoyO7jvonXEP/jhdCUz9R0z1enj6wGm+r2FJ
-JyKLDggL6IzJGNwmJr90ClkNRF1MQdhaFXpULUBYPe7ZwiKpiLMSw6L31quIKl8y
-4ePUYThm2gtz+8lsA2UwD3nuASjcn7XOkp5Uuy68VQ2QTuh1u6zzEgvHK+Ixwm04
-YdeXUlq0ZUXcLnjSLOm6M7yaUx3AttU0V2kWfJ1GCWgh9fVpIEPUqjBjF4NzE693
-hr3sOgsp1WZMVFnhtduExNnTV5ZE3bBUWm3UlgXwVTm5tkGIKt9dpXl63ySSSr+9
-Tw7fN5mF08Jj4/sW7ReBU3wktKuMDG47QBWHu4r0cVaXl/plaEgsWYxLI0nwebXe
-gg1jm96oNdxNg4m4SCPinR8jIYESo0a8NpSOcNj1X5PgF8bPQdAEstNoAyaIFB7R
-YGxMCKdK5zEYGa1yEqwEUupbW0rV4jwUJBB1HO7hFhALymdeu9H6IzL0JgDzi4Xt
-fesRWZYbhn85d1acHQqsNWOewJQMcPzQM9/IoTyljw8cQa9zGl4iWvBspuvs1aHF
-EhRqYWB9L0gQzaqKWzqxIq2iPL1+DxLqIiPeJf41k0FP1vSkdXjL+KlLZQC4qve6
-r2ZHtsSkawWZN5YdnB3Tv60ZB9XYShpGbFfe2FXEUzxmrVUoWkj5nPe0Rchanwxv
-v0oDrCSI5H1o+0q3DuSe
-=zJoI
+iQIcBAEBCAAGBQJQUeGDAAoJEOSiRoyO7jvoXJMQAKK6Al7w43MXeVceUL8bKl3X
+q/2i42YqViD1IJYqODb4R1sgif/8MQ4AIEuoVCFS+Ff7+Nh0a8AxFHyEGa9vFciX
+2W5fTYksqlZ3dUrxojaoTj7/VtICBjUGKUWuLcEJwR+6cspyjYpaRUQppfPoOAPY
+OPeO/Tq+clhv9a5OIYlIn3WRYbCKaG70Xm3YGfyXxWh4T9YGlNddd2sQTv+8tfNp
+cjYvKfGv5MtgeCF4kIfPQnaPpVru3S4P8GSX+taLTZ7kX6Cm+E4y4T/9j8Ycr/UY
+syPWpnhFM/pnpnAzwd2oDqLJsa4bHkW+8K0o6VcBCKsEh6g6xxXA2J5l/fqAGoNn
+5nuzYrOKznkDo94OerLX1C0hs0Y+gd6JvFzUt0+vNDv9cdwgOckgw61nmETgfb6E
+HOEUC7hdOqgNEw7DeQtd58p9mkb8LE7HPsa8zCCK+Y2bK8q76C83DvhcdJimI3xL
+3lYc7Q10ZEs+4HslmXLTDNr29Lw+AKpO/icmsgg7U/Pn1DZtiYiERLrXvtZ1qeZP
+Ms3HmMZAyYQDWgwREcgm4gOUxYEqLmNcjMRNJAGGfsWzDSbFJfgAP5KgQQzUARS/
+j3t3DTy1kSCett7kOG24sE1bOcppuxaCI32M/jqHsL8ohJcHzNQamJg/hVR5CEDi
+r1Hr4iBuWM6BwUlB1INP
+=SPMM
-----END PGP SIGNATURE-----
diff --git a/app-office/calligra/calligra-2.5.2.ebuild b/app-office/calligra/calligra-2.5.2.ebuild
index abca00995068..39837524d52c 100644
--- a/app-office/calligra/calligra-2.5.2.ebuild
+++ b/app-office/calligra/calligra-2.5.2.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.1 2012/09/13 12:01:57 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/calligra/calligra-2.5.2.ebuild,v 1.2 2012/09/13 13:37:21 scarabeus Exp $
# note: files that need to be checked for dependencies etc:
# CMakeLists.txt, kexi/CMakeLists.txt kexi/migration/CMakeLists.txt
@@ -138,8 +138,6 @@ PDEPEND=">=app-office/calligra-l10n-${LANGVERSION}"
RESTRICT=test
# bug 394273
-PATCHES=( "${FILESDIR}/${PN}-2.5.0-kexi-automagic.patch" )
-
src_configure() {
local cal_ft
@@ -191,7 +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 mySQL)
+ $(cmake-utils_use_build mysql)
$(cmake-utils_use_with okular Okular)
$(cmake-utils_use_with opengtl OpenCTL)
$(cmake-utils_use_with openexr OpenEXR)